summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--EVENTS.txt2
-rw-r--r--README26
-rw-r--r--actions/apigrouplist.php9
-rw-r--r--actions/imsettings.php2
-rw-r--r--actions/shownotice.php2
-rw-r--r--actions/tag.php13
-rw-r--r--classes/File.php4
-rw-r--r--classes/Memcached_DataObject.php68
-rw-r--r--classes/Safe_DataObject.php24
-rw-r--r--classes/Subscription.php8
-rw-r--r--extlib/Net/IDNA.php100
-rw-r--r--extlib/Net/IDNA/php5.php3269
-rw-r--r--index.php2
-rw-r--r--install.php2
-rw-r--r--lib/authorizationplugin.php4
-rw-r--r--lib/default.php3
-rw-r--r--lib/httpclient.php21
-rw-r--r--lib/jabber.php179
-rw-r--r--lib/language.php16
-rw-r--r--lib/mediafile.php2
-rw-r--r--lib/profileaction.php12
-rw-r--r--lib/stompqueuemanager.php29
-rw-r--r--lib/util.php51
-rw-r--r--locale/af/LC_MESSAGES/statusnet.po6116
-rw-r--r--locale/ar/LC_MESSAGES/statusnet.po720
-rw-r--r--locale/arz/LC_MESSAGES/statusnet.po636
-rw-r--r--locale/bg/LC_MESSAGES/statusnet.po704
-rw-r--r--locale/br/LC_MESSAGES/statusnet.po1035
-rw-r--r--locale/ca/LC_MESSAGES/statusnet.po637
-rw-r--r--locale/cs/LC_MESSAGES/statusnet.po638
-rw-r--r--locale/de/LC_MESSAGES/statusnet.po814
-rw-r--r--locale/el/LC_MESSAGES/statusnet.po662
-rw-r--r--locale/en_GB/LC_MESSAGES/statusnet.po636
-rw-r--r--locale/es/LC_MESSAGES/statusnet.po1449
-rw-r--r--locale/fa/LC_MESSAGES/statusnet.po634
-rw-r--r--locale/fi/LC_MESSAGES/statusnet.po637
-rw-r--r--locale/fr/LC_MESSAGES/statusnet.po657
-rw-r--r--locale/ga/LC_MESSAGES/statusnet.po637
-rw-r--r--locale/he/LC_MESSAGES/statusnet.po638
-rw-r--r--locale/hsb/LC_MESSAGES/statusnet.po835
-rw-r--r--locale/ia/LC_MESSAGES/statusnet.po776
-rw-r--r--locale/is/LC_MESSAGES/statusnet.po637
-rw-r--r--locale/it/LC_MESSAGES/statusnet.po637
-rw-r--r--locale/ja/LC_MESSAGES/statusnet.po635
-rw-r--r--locale/ko/LC_MESSAGES/statusnet.po981
-rw-r--r--locale/mk/LC_MESSAGES/statusnet.po669
-rw-r--r--locale/nb/LC_MESSAGES/statusnet.po1247
-rw-r--r--locale/nl/LC_MESSAGES/statusnet.po655
-rw-r--r--locale/nn/LC_MESSAGES/statusnet.po637
-rw-r--r--locale/pl/LC_MESSAGES/statusnet.po656
-rw-r--r--locale/pt/LC_MESSAGES/statusnet.po641
-rw-r--r--locale/pt_BR/LC_MESSAGES/statusnet.po792
-rw-r--r--locale/ru/LC_MESSAGES/statusnet.po655
-rw-r--r--locale/statusnet.pot643
-rw-r--r--locale/sv/LC_MESSAGES/statusnet.po713
-rw-r--r--locale/te/LC_MESSAGES/statusnet.po880
-rw-r--r--locale/tr/LC_MESSAGES/statusnet.po634
-rw-r--r--locale/uk/LC_MESSAGES/statusnet.po698
-rw-r--r--locale/vi/LC_MESSAGES/statusnet.po638
-rw-r--r--locale/zh_CN/LC_MESSAGES/statusnet.po637
-rw-r--r--locale/zh_TW/LC_MESSAGES/statusnet.po634
-rw-r--r--plugins/AutoSandbox/AutoSandboxPlugin.php96
-rw-r--r--plugins/AutoSandbox/LICENSE21
-rw-r--r--plugins/AutoSandbox/README39
-rw-r--r--plugins/FirePHP/FirePHPPlugin.php4
-rw-r--r--plugins/LdapAuthentication/LdapAuthenticationPlugin.php279
-rw-r--r--plugins/LdapAuthorization/LdapAuthorizationPlugin.php133
-rw-r--r--plugins/LdapCommon/LdapCommon.php369
-rw-r--r--plugins/LdapCommon/MemcacheSchemaCache.php (renamed from plugins/LdapAuthentication/MemcacheSchemaCache.php)0
-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/OStatus/locale/fr/LC_MESSAGES/OStatus.po3
-rw-r--r--plugins/RSSCloud/RSSCloudPlugin.php2
-rw-r--r--plugins/SpotifyPlugin.php113
-rwxr-xr-xscripts/docgen.php84
-rw-r--r--scripts/doxygen.tmpl1516
-rwxr-xr-xscripts/update_translations.php4
-rw-r--r--tests/JidValidateTest.php146
86 files changed, 26488 insertions, 13349 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/README b/README
index c687cb240..1e244c448 100644
--- a/README
+++ b/README
@@ -942,6 +942,26 @@ stomp_password: password for connecting to the stomp server; defaults
to null.
stomp_persistent: keep items across queue server restart, if enabled.
+ Under ActiveMQ, the server configuration determines if and how
+ persistent storage is actually saved.
+
+ If using a message queue server other than ActiveMQ, you may
+ need to disable this if it does not support persistence.
+
+stomp_transactions: use transactions to aid in error detection.
+ A broken transaction will be seen quickly, allowing a message
+ to be redelivered immediately if a daemon crashes.
+
+ If using a message queue server other than ActiveMQ, you may
+ need to disable this if it does not support transactions.
+
+stomp_acks: send acknowledgements to aid in flow control.
+ An acknowledgement of successful processing tells the server
+ we're ready for more and can help keep things moving smoothly.
+
+ This should *not* be turned off when running with ActiveMQ, but
+ if using another message queue server that does not support
+ acknowledgements you might need to disable this.
softlimit: an absolute or relative "soft memory limit"; daemons will
restart themselves gracefully when they find they've hit
@@ -970,6 +990,12 @@ max_retries: for stomp, drop messages after N failed attempts to process.
dead_letter_dir: for stomp, optional directory to dump data on failed
queue processing events after discarding them.
+stomp_no_transactions: for stomp, the server does not support transactions,
+ so do not try to user them. This is needed for http://www.morbidq.com/.
+
+stomp_no_acks: for stomp, the server does not support acknowledgements.
+ so do not try to user them. This is needed for http://www.morbidq.com/.
+
license
-------
diff --git a/actions/apigrouplist.php b/actions/apigrouplist.php
index dd2a68c66..3ea2c30cb 100644
--- a/actions/apigrouplist.php
+++ b/actions/apigrouplist.php
@@ -93,6 +93,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 +101,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/imsettings.php b/actions/imsettings.php
index af4915843..c3360fb12 100644
--- a/actions/imsettings.php
+++ b/actions/imsettings.php
@@ -292,7 +292,7 @@ class ImsettingsAction extends ConnectSettingsAction
$this->showForm(_('Cannot normalize that Jabber ID'));
return;
}
- if (!jabber_valid_base_jid($jabber)) {
+ if (!jabber_valid_base_jid($jabber, common_config('email', 'domain_check'))) {
$this->showForm(_('Not a valid Jabber ID'));
return;
} else if ($user->jabber == $jabber) {
diff --git a/actions/shownotice.php b/actions/shownotice.php
index a23027f7c..ca6b60d1f 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/tag.php b/actions/tag.php
index ee9617b66..512dac63a 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/classes/File.php b/classes/File.php
index 33273bbdc..c9477f5f1 100644
--- a/classes/File.php
+++ b/classes/File.php
@@ -286,7 +286,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/Memcached_DataObject.php b/classes/Memcached_DataObject.php
index 920966b16..0836c2019 100644
--- a/classes/Memcached_DataObject.php
+++ b/classes/Memcached_DataObject.php
@@ -330,6 +330,10 @@ class Memcached_DataObject extends Safe_DataObject
*/
function _query($string)
{
+ if (common_config('db', 'annotate_queries')) {
+ $string = $this->annotateQuery($string);
+ }
+
$start = microtime(true);
$result = parent::_query($string);
$delta = microtime(true) - $start;
@@ -342,6 +346,70 @@ class Memcached_DataObject extends Safe_DataObject
return $result;
}
+ /**
+ * Find the first caller in the stack trace that's not a
+ * low-level database function and add a comment to the
+ * query string. This should then be visible in process lists
+ * and slow query logs, to help identify problem areas.
+ *
+ * Also marks whether this was a web GET/POST or which daemon
+ * was running it.
+ *
+ * @param string $string SQL query string
+ * @return string SQL query string, with a comment in it
+ */
+ function annotateQuery($string)
+ {
+ $ignore = array('annotateQuery',
+ '_query',
+ 'query',
+ 'get',
+ 'insert',
+ 'delete',
+ 'update',
+ 'find');
+ $ignoreStatic = array('staticGet',
+ 'pkeyGet',
+ 'cachedQuery');
+ $here = get_class($this); // if we get confused
+ $bt = debug_backtrace();
+
+ // Find the first caller that's not us?
+ foreach ($bt as $frame) {
+ $func = $frame['function'];
+ if (isset($frame['type']) && $frame['type'] == '::') {
+ if (in_array($func, $ignoreStatic)) {
+ continue;
+ }
+ $here = $frame['class'] . '::' . $func;
+ break;
+ } else if (isset($frame['type']) && $frame['type'] == '->') {
+ if ($frame['object'] === $this && in_array($func, $ignore)) {
+ continue;
+ }
+ if (in_array($func, $ignoreStatic)) {
+ continue; // @fixme this shouldn't be needed?
+ }
+ $here = get_class($frame['object']) . '->' . $func;
+ break;
+ }
+ $here = $func;
+ break;
+ }
+
+ if (php_sapi_name() == 'cli') {
+ $context = basename($_SERVER['PHP_SELF']);
+ } else {
+ $context = $_SERVER['REQUEST_METHOD'];
+ }
+
+ // Slip the comment in after the first command,
+ // or DB_DataObject gets confused about handling inserts and such.
+ $parts = explode(' ', $string, 2);
+ $parts[0] .= " /* $context $here */";
+ return implode(' ', $parts);
+ }
+
// Sanitize a query for logging
// @fixme don't trim spaces in string literals
function sanitizeQuery($string)
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/extlib/Net/IDNA.php b/extlib/Net/IDNA.php
new file mode 100644
index 000000000..987a37ef1
--- /dev/null
+++ b/extlib/Net/IDNA.php
@@ -0,0 +1,100 @@
+<?php
+
+// {{{ license
+
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4 foldmethod=marker: */
+//
+// +----------------------------------------------------------------------+
+// | This library is free software; you can redistribute it and/or modify |
+// | it under the terms of the GNU Lesser General Public License as |
+// | published by the Free Software Foundation; either version 2.1 of the |
+// | License, or (at your option) any later version. |
+// | |
+// | This library 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 |
+// | Lesser General Public License for more details. |
+// | |
+// | You should have received a copy of the GNU Lesser General Public |
+// | License along with this library; if not, write to the Free Software |
+// | Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 |
+// | USA. |
+// +----------------------------------------------------------------------+
+//
+
+// }}}
+
+
+/**
+ * Encode/decode Internationalized Domain Names.
+ * Factory class to get correct implementation either for php4 or php5.
+ *
+ * @author Markus Nix <mnix@docuverse.de>
+ * @author Matthias Sommerfeld <mso@phlylabs.de>
+ * @package Net
+ * @version $Id: IDNA.php 284681 2009-07-24 04:24:27Z clockwerx $
+ */
+
+class Net_IDNA
+{
+ // {{{ factory
+ /**
+ * Attempts to return a concrete IDNA instance for either php4 or php5.
+ *
+ * @param array $params Set of paramaters
+ * @return object IDNA The newly created concrete Log instance, or an
+ * false on an error.
+ * @access public
+ */
+ function getInstance($params = array())
+ {
+ $version = explode( '.', phpversion() );
+ $handler = ((int)$version[0] > 4) ? 'php5' : 'php4';
+ $class = 'Net_IDNA_' . $handler;
+ $classfile = 'Net/IDNA/' . $handler . '.php';
+
+ /*
+ * Attempt to include our version of the named class, but don't treat
+ * a failure as fatal. The caller may have already included their own
+ * version of the named class.
+ */
+ @include_once $classfile;
+
+ /* If the class exists, return a new instance of it. */
+ if (class_exists($class)) {
+ return new $class($params);
+ }
+
+ return false;
+ }
+ // }}}
+
+ // {{{ singleton
+ /**
+ * Attempts to return a concrete IDNA instance for either php4 or php5,
+ * only creating a new instance if no IDNA instance with the same
+ * parameters currently exists.
+ *
+ * @param array $params Set of paramaters
+ * @return object IDNA The newly created concrete Log instance, or an
+ * false on an error.
+ * @access public
+ */
+ function singleton($params = array())
+ {
+ static $instances;
+ if (!isset($instances)) {
+ $instances = array();
+ }
+
+ $signature = serialize($params);
+ if (!isset($instances[$signature])) {
+ $instances[$signature] = Net_IDNA::getInstance($params);
+ }
+
+ return $instances[$signature];
+ }
+ // }}}
+}
+
+?>
diff --git a/extlib/Net/IDNA/php5.php b/extlib/Net/IDNA/php5.php
new file mode 100644
index 000000000..d61772170
--- /dev/null
+++ b/extlib/Net/IDNA/php5.php
@@ -0,0 +1,3269 @@
+<?php
+
+// {{{ license
+
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4 foldmethod=marker: */
+//
+// +----------------------------------------------------------------------+
+// | This library is free software; you can redistribute it and/or modify |
+// | it under the terms of the GNU Lesser General Public License as |
+// | published by the Free Software Foundation; either version 2.1 of the |
+// | License, or (at your option) any later version. |
+// | |
+// | This library 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 |
+// | Lesser General Public License for more details. |
+// | |
+// | You should have received a copy of the GNU Lesser General Public |
+// | License along with this library; if not, write to the Free Software |
+// | Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 |
+// | USA. |
+// +----------------------------------------------------------------------+
+//
+
+// }}}
+
+
+/**
+ * Encode/decode Internationalized Domain Names.
+ *
+ * The class allows to convert internationalized domain names
+ * (see RFC 3490 for details) as they can be used with various registries worldwide
+ * to be translated between their original (localized) form and their encoded form
+ * as it will be used in the DNS (Domain Name System).
+ *
+ * The class provides two public methods, encode() and decode(), which do exactly
+ * what you would expect them to do. You are allowed to use complete domain names,
+ * simple strings and complete email addresses as well. That means, that you might
+ * use any of the following notations:
+ *
+ * - www.n�rgler.com
+ * - xn--nrgler-wxa
+ * - xn--brse-5qa.xn--knrz-1ra.info
+ *
+ * Unicode input might be given as either UTF-8 string, UCS-4 string or UCS-4
+ * array. Unicode output is available in the same formats.
+ * You can select your preferred format via {@link set_paramter()}.
+ *
+ * ACE input and output is always expected to be ASCII.
+ *
+ * @author Markus Nix <mnix@docuverse.de>
+ * @author Matthias Sommerfeld <mso@phlylabs.de>
+ * @author Stefan Neufeind <pear.neufeind@speedpartner.de>
+ * @package Net
+ * @version $Id: php5.php 284682 2009-07-24 04:27:35Z clockwerx $
+ */
+
+class Net_IDNA_php5
+{
+ // {{{ npdata
+ /**
+ * These Unicode codepoints are
+ * mapped to nothing, See RFC3454 for details
+ *
+ * @static
+ * @var array
+ * @access private
+ */
+ private static $_np_map_nothing = array(
+ 0xAD,
+ 0x34F,
+ 0x1806,
+ 0x180B,
+ 0x180C,
+ 0x180D,
+ 0x200B,
+ 0x200C,
+ 0x200D,
+ 0x2060,
+ 0xFE00,
+ 0xFE01,
+ 0xFE02,
+ 0xFE03,
+ 0xFE04,
+ 0xFE05,
+ 0xFE06,
+ 0xFE07,
+ 0xFE08,
+ 0xFE09,
+ 0xFE0A,
+ 0xFE0B,
+ 0xFE0C,
+ 0xFE0D,
+ 0xFE0E,
+ 0xFE0F,
+ 0xFEFF
+ );
+
+ /**
+ * Prohibited codepints
+ *
+ * @static
+ * @var array
+ * @access private
+ */
+ private static $_general_prohibited = array(
+ 0,
+ 1,
+ 2,
+ 3,
+ 4,
+ 5,
+ 6,
+ 7,
+ 8,
+ 9,
+ 0xA,
+ 0xB,
+ 0xC,
+ 0xD,
+ 0xE,
+ 0xF,
+ 0x10,
+ 0x11,
+ 0x12,
+ 0x13,
+ 0x14,
+ 0x15,
+ 0x16,
+ 0x17,
+ 0x18,
+ 0x19,
+ 0x1A,
+ 0x1B,
+ 0x1C,
+ 0x1D,
+ 0x1E,
+ 0x1F,
+ 0x20,
+ 0x21,
+ 0x22,
+ 0x23,
+ 0x24,
+ 0x25,
+ 0x26,
+ 0x27,
+ 0x28,
+ 0x29,
+ 0x2A,
+ 0x2B,
+ 0x2C,
+ 0x2F,
+ 0x3B,
+ 0x3C,
+ 0x3D,
+ 0x3E,
+ 0x3F,
+ 0x40,
+ 0x5B,
+ 0x5C,
+ 0x5D,
+ 0x5E,
+ 0x5F,
+ 0x60,
+ 0x7B,
+ 0x7C,
+ 0x7D,
+ 0x7E,
+ 0x7F,
+ 0x3002
+ );
+
+ /**
+ * Codepints prohibited by Nameprep
+ * @static
+ * @var array
+ * @access private
+ */
+ private static $_np_prohibit = array(
+ 0xA0,
+ 0x1680,
+ 0x2000,
+ 0x2001,
+ 0x2002,
+ 0x2003,
+ 0x2004,
+ 0x2005,
+ 0x2006,
+ 0x2007,
+ 0x2008,
+ 0x2009,
+ 0x200A,
+ 0x200B,
+ 0x202F,
+ 0x205F,
+ 0x3000,
+ 0x6DD,
+ 0x70F,
+ 0x180E,
+ 0x200C,
+ 0x200D,
+ 0x2028,
+ 0x2029,
+ 0xFEFF,
+ 0xFFF9,
+ 0xFFFA,
+ 0xFFFB,
+ 0xFFFC,
+ 0xFFFE,
+ 0xFFFF,
+ 0x1FFFE,
+ 0x1FFFF,
+ 0x2FFFE,
+ 0x2FFFF,
+ 0x3FFFE,
+ 0x3FFFF,
+ 0x4FFFE,
+ 0x4FFFF,
+ 0x5FFFE,
+ 0x5FFFF,
+ 0x6FFFE,
+ 0x6FFFF,
+ 0x7FFFE,
+ 0x7FFFF,
+ 0x8FFFE,
+ 0x8FFFF,
+ 0x9FFFE,
+ 0x9FFFF,
+ 0xAFFFE,
+ 0xAFFFF,
+ 0xBFFFE,
+ 0xBFFFF,
+ 0xCFFFE,
+ 0xCFFFF,
+ 0xDFFFE,
+ 0xDFFFF,
+ 0xEFFFE,
+ 0xEFFFF,
+ 0xFFFFE,
+ 0xFFFFF,
+ 0x10FFFE,
+ 0x10FFFF,
+ 0xFFF9,
+ 0xFFFA,
+ 0xFFFB,
+ 0xFFFC,
+ 0xFFFD,
+ 0x340,
+ 0x341,
+ 0x200E,
+ 0x200F,
+ 0x202A,
+ 0x202B,
+ 0x202C,
+ 0x202D,
+ 0x202E,
+ 0x206A,
+ 0x206B,
+ 0x206C,
+ 0x206D,
+ 0x206E,
+ 0x206F,
+ 0xE0001
+ );
+
+ /**
+ * Codepoint ranges prohibited by nameprep
+ *
+ * @static
+ * @var array
+ * @access private
+ */
+ private static $_np_prohibit_ranges = array(
+ array(0x80, 0x9F ),
+ array(0x2060, 0x206F ),
+ array(0x1D173, 0x1D17A ),
+ array(0xE000, 0xF8FF ),
+ array(0xF0000, 0xFFFFD ),
+ array(0x100000, 0x10FFFD),
+ array(0xFDD0, 0xFDEF ),
+ array(0xD800, 0xDFFF ),
+ array(0x2FF0, 0x2FFB ),
+ array(0xE0020, 0xE007F )
+ );
+
+ /**
+ * Replacement mappings (casemapping, replacement sequences, ...)
+ *
+ * @static
+ * @var array
+ * @access private
+ */
+ private static $_np_replacemaps = array(
+ 0x41 => array(0x61),
+ 0x42 => array(0x62),
+ 0x43 => array(0x63),
+ 0x44 => array(0x64),
+ 0x45 => array(0x65),
+ 0x46 => array(0x66),
+ 0x47 => array(0x67),
+ 0x48 => array(0x68),
+ 0x49 => array(0x69),
+ 0x4A => array(0x6A),
+ 0x4B => array(0x6B),
+ 0x4C => array(0x6C),
+ 0x4D => array(0x6D),
+ 0x4E => array(0x6E),
+ 0x4F => array(0x6F),
+ 0x50 => array(0x70),
+ 0x51 => array(0x71),
+ 0x52 => array(0x72),
+ 0x53 => array(0x73),
+ 0x54 => array(0x74),
+ 0x55 => array(0x75),
+ 0x56 => array(0x76),
+ 0x57 => array(0x77),
+ 0x58 => array(0x78),
+ 0x59 => array(0x79),
+ 0x5A => array(0x7A),
+ 0xB5 => array(0x3BC),
+ 0xC0 => array(0xE0),
+ 0xC1 => array(0xE1),
+ 0xC2 => array(0xE2),
+ 0xC3 => array(0xE3),
+ 0xC4 => array(0xE4),
+ 0xC5 => array(0xE5),
+ 0xC6 => array(0xE6),
+ 0xC7 => array(0xE7),
+ 0xC8 => array(0xE8),
+ 0xC9 => array(0xE9),
+ 0xCA => array(0xEA),
+ 0xCB => array(0xEB),
+ 0xCC => array(0xEC),
+ 0xCD => array(0xED),
+ 0xCE => array(0xEE),
+ 0xCF => array(0xEF),
+ 0xD0 => array(0xF0),
+ 0xD1 => array(0xF1),
+ 0xD2 => array(0xF2),
+ 0xD3 => array(0xF3),
+ 0xD4 => array(0xF4),
+ 0xD5 => array(0xF5),
+ 0xD6 => array(0xF6),
+ 0xD8 => array(0xF8),
+ 0xD9 => array(0xF9),
+ 0xDA => array(0xFA),
+ 0xDB => array(0xFB),
+ 0xDC => array(0xFC),
+ 0xDD => array(0xFD),
+ 0xDE => array(0xFE),
+ 0xDF => array(0x73, 0x73),
+ 0x100 => array(0x101),
+ 0x102 => array(0x103),
+ 0x104 => array(0x105),
+ 0x106 => array(0x107),
+ 0x108 => array(0x109),
+ 0x10A => array(0x10B),
+ 0x10C => array(0x10D),
+ 0x10E => array(0x10F),
+ 0x110 => array(0x111),
+ 0x112 => array(0x113),
+ 0x114 => array(0x115),
+ 0x116 => array(0x117),
+ 0x118 => array(0x119),
+ 0x11A => array(0x11B),
+ 0x11C => array(0x11D),
+ 0x11E => array(0x11F),
+ 0x120 => array(0x121),
+ 0x122 => array(0x123),
+ 0x124 => array(0x125),
+ 0x126 => array(0x127),
+ 0x128 => array(0x129),
+ 0x12A => array(0x12B),
+ 0x12C => array(0x12D),
+ 0x12E => array(0x12F),
+ 0x130 => array(0x69, 0x307),
+ 0x132 => array(0x133),
+ 0x134 => array(0x135),
+ 0x136 => array(0x137),
+ 0x139 => array(0x13A),
+ 0x13B => array(0x13C),
+ 0x13D => array(0x13E),
+ 0x13F => array(0x140),
+ 0x141 => array(0x142),
+ 0x143 => array(0x144),
+ 0x145 => array(0x146),
+ 0x147 => array(0x148),
+ 0x149 => array(0x2BC, 0x6E),
+ 0x14A => array(0x14B),
+ 0x14C => array(0x14D),
+ 0x14E => array(0x14F),
+ 0x150 => array(0x151),
+ 0x152 => array(0x153),
+ 0x154 => array(0x155),
+ 0x156 => array(0x157),
+ 0x158 => array(0x159),
+ 0x15A => array(0x15B),
+ 0x15C => array(0x15D),
+ 0x15E => array(0x15F),
+ 0x160 => array(0x161),
+ 0x162 => array(0x163),
+ 0x164 => array(0x165),
+ 0x166 => array(0x167),
+ 0x168 => array(0x169),
+ 0x16A => array(0x16B),
+ 0x16C => array(0x16D),
+ 0x16E => array(0x16F),
+ 0x170 => array(0x171),
+ 0x172 => array(0x173),
+ 0x174 => array(0x175),
+ 0x176 => array(0x177),
+ 0x178 => array(0xFF),
+ 0x179 => array(0x17A),
+ 0x17B => array(0x17C),
+ 0x17D => array(0x17E),
+ 0x17F => array(0x73),
+ 0x181 => array(0x253),
+ 0x182 => array(0x183),
+ 0x184 => array(0x185),
+ 0x186 => array(0x254),
+ 0x187 => array(0x188),
+ 0x189 => array(0x256),
+ 0x18A => array(0x257),
+ 0x18B => array(0x18C),
+ 0x18E => array(0x1DD),
+ 0x18F => array(0x259),
+ 0x190 => array(0x25B),
+ 0x191 => array(0x192),
+ 0x193 => array(0x260),
+ 0x194 => array(0x263),
+ 0x196 => array(0x269),
+ 0x197 => array(0x268),
+ 0x198 => array(0x199),
+ 0x19C => array(0x26F),
+ 0x19D => array(0x272),
+ 0x19F => array(0x275),
+ 0x1A0 => array(0x1A1),
+ 0x1A2 => array(0x1A3),
+ 0x1A4 => array(0x1A5),
+ 0x1A6 => array(0x280),
+ 0x1A7 => array(0x1A8),
+ 0x1A9 => array(0x283),
+ 0x1AC => array(0x1AD),
+ 0x1AE => array(0x288),
+ 0x1AF => array(0x1B0),
+ 0x1B1 => array(0x28A),
+ 0x1B2 => array(0x28B),
+ 0x1B3 => array(0x1B4),
+ 0x1B5 => array(0x1B6),
+ 0x1B7 => array(0x292),
+ 0x1B8 => array(0x1B9),
+ 0x1BC => array(0x1BD),
+ 0x1C4 => array(0x1C6),
+ 0x1C5 => array(0x1C6),
+ 0x1C7 => array(0x1C9),
+ 0x1C8 => array(0x1C9),
+ 0x1CA => array(0x1CC),
+ 0x1CB => array(0x1CC),
+ 0x1CD => array(0x1CE),
+ 0x1CF => array(0x1D0),
+ 0x1D1 => array(0x1D2),
+ 0x1D3 => array(0x1D4),
+ 0x1D5 => array(0x1D6),
+ 0x1D7 => array(0x1D8),
+ 0x1D9 => array(0x1DA),
+ 0x1DB => array(0x1DC),
+ 0x1DE => array(0x1DF),
+ 0x1E0 => array(0x1E1),
+ 0x1E2 => array(0x1E3),
+ 0x1E4 => array(0x1E5),
+ 0x1E6 => array(0x1E7),
+ 0x1E8 => array(0x1E9),
+ 0x1EA => array(0x1EB),
+ 0x1EC => array(0x1ED),
+ 0x1EE => array(0x1EF),
+ 0x1F0 => array(0x6A, 0x30C),
+ 0x1F1 => array(0x1F3),
+ 0x1F2 => array(0x1F3),
+ 0x1F4 => array(0x1F5),
+ 0x1F6 => array(0x195),
+ 0x1F7 => array(0x1BF),
+ 0x1F8 => array(0x1F9),
+ 0x1FA => array(0x1FB),
+ 0x1FC => array(0x1FD),
+ 0x1FE => array(0x1FF),
+ 0x200 => array(0x201),
+ 0x202 => array(0x203),
+ 0x204 => array(0x205),
+ 0x206 => array(0x207),
+ 0x208 => array(0x209),
+ 0x20A => array(0x20B),
+ 0x20C => array(0x20D),
+ 0x20E => array(0x20F),
+ 0x210 => array(0x211),
+ 0x212 => array(0x213),
+ 0x214 => array(0x215),
+ 0x216 => array(0x217),
+ 0x218 => array(0x219),
+ 0x21A => array(0x21B),
+ 0x21C => array(0x21D),
+ 0x21E => array(0x21F),
+ 0x220 => array(0x19E),
+ 0x222 => array(0x223),
+ 0x224 => array(0x225),
+ 0x226 => array(0x227),
+ 0x228 => array(0x229),
+ 0x22A => array(0x22B),
+ 0x22C => array(0x22D),
+ 0x22E => array(0x22F),
+ 0x230 => array(0x231),
+ 0x232 => array(0x233),
+ 0x345 => array(0x3B9),
+ 0x37A => array(0x20, 0x3B9),
+ 0x386 => array(0x3AC),
+ 0x388 => array(0x3AD),
+ 0x389 => array(0x3AE),
+ 0x38A => array(0x3AF),
+ 0x38C => array(0x3CC),
+ 0x38E => array(0x3CD),
+ 0x38F => array(0x3CE),
+ 0x390 => array(0x3B9, 0x308, 0x301),
+ 0x391 => array(0x3B1),
+ 0x392 => array(0x3B2),
+ 0x393 => array(0x3B3),
+ 0x394 => array(0x3B4),
+ 0x395 => array(0x3B5),
+ 0x396 => array(0x3B6),
+ 0x397 => array(0x3B7),
+ 0x398 => array(0x3B8),
+ 0x399 => array(0x3B9),
+ 0x39A => array(0x3BA),
+ 0x39B => array(0x3BB),
+ 0x39C => array(0x3BC),
+ 0x39D => array(0x3BD),
+ 0x39E => array(0x3BE),
+ 0x39F => array(0x3BF),
+ 0x3A0 => array(0x3C0),
+ 0x3A1 => array(0x3C1),
+ 0x3A3 => array(0x3C3),
+ 0x3A4 => array(0x3C4),
+ 0x3A5 => array(0x3C5),
+ 0x3A6 => array(0x3C6),
+ 0x3A7 => array(0x3C7),
+ 0x3A8 => array(0x3C8),
+ 0x3A9 => array(0x3C9),
+ 0x3AA => array(0x3CA),
+ 0x3AB => array(0x3CB),
+ 0x3B0 => array(0x3C5, 0x308, 0x301),
+ 0x3C2 => array(0x3C3),
+ 0x3D0 => array(0x3B2),
+ 0x3D1 => array(0x3B8),
+ 0x3D2 => array(0x3C5),
+ 0x3D3 => array(0x3CD),
+ 0x3D4 => array(0x3CB),
+ 0x3D5 => array(0x3C6),
+ 0x3D6 => array(0x3C0),
+ 0x3D8 => array(0x3D9),
+ 0x3DA => array(0x3DB),
+ 0x3DC => array(0x3DD),
+ 0x3DE => array(0x3DF),
+ 0x3E0 => array(0x3E1),
+ 0x3E2 => array(0x3E3),
+ 0x3E4 => array(0x3E5),
+ 0x3E6 => array(0x3E7),
+ 0x3E8 => array(0x3E9),
+ 0x3EA => array(0x3EB),
+ 0x3EC => array(0x3ED),
+ 0x3EE => array(0x3EF),
+ 0x3F0 => array(0x3BA),
+ 0x3F1 => array(0x3C1),
+ 0x3F2 => array(0x3C3),
+ 0x3F4 => array(0x3B8),
+ 0x3F5 => array(0x3B5),
+ 0x400 => array(0x450),
+ 0x401 => array(0x451),
+ 0x402 => array(0x452),
+ 0x403 => array(0x453),
+ 0x404 => array(0x454),
+ 0x405 => array(0x455),
+ 0x406 => array(0x456),
+ 0x407 => array(0x457),
+ 0x408 => array(0x458),
+ 0x409 => array(0x459),
+ 0x40A => array(0x45A),
+ 0x40B => array(0x45B),
+ 0x40C => array(0x45C),
+ 0x40D => array(0x45D),
+ 0x40E => array(0x45E),
+ 0x40F => array(0x45F),
+ 0x410 => array(0x430),
+ 0x411 => array(0x431),
+ 0x412 => array(0x432),
+ 0x413 => array(0x433),
+ 0x414 => array(0x434),
+ 0x415 => array(0x435),
+ 0x416 => array(0x436),
+ 0x417 => array(0x437),
+ 0x418 => array(0x438),
+ 0x419 => array(0x439),
+ 0x41A => array(0x43A),
+ 0x41B => array(0x43B),
+ 0x41C => array(0x43C),
+ 0x41D => array(0x43D),
+ 0x41E => array(0x43E),
+ 0x41F => array(0x43F),
+ 0x420 => array(0x440),
+ 0x421 => array(0x441),
+ 0x422 => array(0x442),
+ 0x423 => array(0x443),
+ 0x424 => array(0x444),
+ 0x425 => array(0x445),
+ 0x426 => array(0x446),
+ 0x427 => array(0x447),
+ 0x428 => array(0x448),
+ 0x429 => array(0x449),
+ 0x42A => array(0x44A),
+ 0x42B => array(0x44B),
+ 0x42C => array(0x44C),
+ 0x42D => array(0x44D),
+ 0x42E => array(0x44E),
+ 0x42F => array(0x44F),
+ 0x460 => array(0x461),
+ 0x462 => array(0x463),
+ 0x464 => array(0x465),
+ 0x466 => array(0x467),
+ 0x468 => array(0x469),
+ 0x46A => array(0x46B),
+ 0x46C => array(0x46D),
+ 0x46E => array(0x46F),
+ 0x470 => array(0x471),
+ 0x472 => array(0x473),
+ 0x474 => array(0x475),
+ 0x476 => array(0x477),
+ 0x478 => array(0x479),
+ 0x47A => array(0x47B),
+ 0x47C => array(0x47D),
+ 0x47E => array(0x47F),
+ 0x480 => array(0x481),
+ 0x48A => array(0x48B),
+ 0x48C => array(0x48D),
+ 0x48E => array(0x48F),
+ 0x490 => array(0x491),
+ 0x492 => array(0x493),
+ 0x494 => array(0x495),
+ 0x496 => array(0x497),
+ 0x498 => array(0x499),
+ 0x49A => array(0x49B),
+ 0x49C => array(0x49D),
+ 0x49E => array(0x49F),
+ 0x4A0 => array(0x4A1),
+ 0x4A2 => array(0x4A3),
+ 0x4A4 => array(0x4A5),
+ 0x4A6 => array(0x4A7),
+ 0x4A8 => array(0x4A9),
+ 0x4AA => array(0x4AB),
+ 0x4AC => array(0x4AD),
+ 0x4AE => array(0x4AF),
+ 0x4B0 => array(0x4B1),
+ 0x4B2 => array(0x4B3),
+ 0x4B4 => array(0x4B5),
+ 0x4B6 => array(0x4B7),
+ 0x4B8 => array(0x4B9),
+ 0x4BA => array(0x4BB),
+ 0x4BC => array(0x4BD),
+ 0x4BE => array(0x4BF),
+ 0x4C1 => array(0x4C2),
+ 0x4C3 => array(0x4C4),
+ 0x4C5 => array(0x4C6),
+ 0x4C7 => array(0x4C8),
+ 0x4C9 => array(0x4CA),
+ 0x4CB => array(0x4CC),
+ 0x4CD => array(0x4CE),
+ 0x4D0 => array(0x4D1),
+ 0x4D2 => array(0x4D3),
+ 0x4D4 => array(0x4D5),
+ 0x4D6 => array(0x4D7),
+ 0x4D8 => array(0x4D9),
+ 0x4DA => array(0x4DB),
+ 0x4DC => array(0x4DD),
+ 0x4DE => array(0x4DF),
+ 0x4E0 => array(0x4E1),
+ 0x4E2 => array(0x4E3),
+ 0x4E4 => array(0x4E5),
+ 0x4E6 => array(0x4E7),
+ 0x4E8 => array(0x4E9),
+ 0x4EA => array(0x4EB),
+ 0x4EC => array(0x4ED),
+ 0x4EE => array(0x4EF),
+ 0x4F0 => array(0x4F1),
+ 0x4F2 => array(0x4F3),
+ 0x4F4 => array(0x4F5),
+ 0x4F8 => array(0x4F9),
+ 0x500 => array(0x501),
+ 0x502 => array(0x503),
+ 0x504 => array(0x505),
+ 0x506 => array(0x507),
+ 0x508 => array(0x509),
+ 0x50A => array(0x50B),
+ 0x50C => array(0x50D),
+ 0x50E => array(0x50F),
+ 0x531 => array(0x561),
+ 0x532 => array(0x562),
+ 0x533 => array(0x563),
+ 0x534 => array(0x564),
+ 0x535 => array(0x565),
+ 0x536 => array(0x566),
+ 0x537 => array(0x567),
+ 0x538 => array(0x568),
+ 0x539 => array(0x569),
+ 0x53A => array(0x56A),
+ 0x53B => array(0x56B),
+ 0x53C => array(0x56C),
+ 0x53D => array(0x56D),
+ 0x53E => array(0x56E),
+ 0x53F => array(0x56F),
+ 0x540 => array(0x570),
+ 0x541 => array(0x571),
+ 0x542 => array(0x572),
+ 0x543 => array(0x573),
+ 0x544 => array(0x574),
+ 0x545 => array(0x575),
+ 0x546 => array(0x576),
+ 0x547 => array(0x577),
+ 0x548 => array(0x578),
+ 0x549 => array(0x579),
+ 0x54A => array(0x57A),
+ 0x54B => array(0x57B),
+ 0x54C => array(0x57C),
+ 0x54D => array(0x57D),
+ 0x54E => array(0x57E),
+ 0x54F => array(0x57F),
+ 0x550 => array(0x580),
+ 0x551 => array(0x581),
+ 0x552 => array(0x582),
+ 0x553 => array(0x583),
+ 0x554 => array(0x584),
+ 0x555 => array(0x585),
+ 0x556 => array(0x586),
+ 0x587 => array(0x565, 0x582),
+ 0x1E00 => array(0x1E01),
+ 0x1E02 => array(0x1E03),
+ 0x1E04 => array(0x1E05),
+ 0x1E06 => array(0x1E07),
+ 0x1E08 => array(0x1E09),
+ 0x1E0A => array(0x1E0B),
+ 0x1E0C => array(0x1E0D),
+ 0x1E0E => array(0x1E0F),
+ 0x1E10 => array(0x1E11),
+ 0x1E12 => array(0x1E13),
+ 0x1E14 => array(0x1E15),
+ 0x1E16 => array(0x1E17),
+ 0x1E18 => array(0x1E19),
+ 0x1E1A => array(0x1E1B),
+ 0x1E1C => array(0x1E1D),
+ 0x1E1E => array(0x1E1F),
+ 0x1E20 => array(0x1E21),
+ 0x1E22 => array(0x1E23),
+ 0x1E24 => array(0x1E25),
+ 0x1E26 => array(0x1E27),
+ 0x1E28 => array(0x1E29),
+ 0x1E2A => array(0x1E2B),
+ 0x1E2C => array(0x1E2D),
+ 0x1E2E => array(0x1E2F),
+ 0x1E30 => array(0x1E31),
+ 0x1E32 => array(0x1E33),
+ 0x1E34 => array(0x1E35),
+ 0x1E36 => array(0x1E37),
+ 0x1E38 => array(0x1E39),
+ 0x1E3A => array(0x1E3B),
+ 0x1E3C => array(0x1E3D),
+ 0x1E3E => array(0x1E3F),
+ 0x1E40 => array(0x1E41),
+ 0x1E42 => array(0x1E43),
+ 0x1E44 => array(0x1E45),
+ 0x1E46 => array(0x1E47),
+ 0x1E48 => array(0x1E49),
+ 0x1E4A => array(0x1E4B),
+ 0x1E4C => array(0x1E4D),
+ 0x1E4E => array(0x1E4F),
+ 0x1E50 => array(0x1E51),
+ 0x1E52 => array(0x1E53),
+ 0x1E54 => array(0x1E55),
+ 0x1E56 => array(0x1E57),
+ 0x1E58 => array(0x1E59),
+ 0x1E5A => array(0x1E5B),
+ 0x1E5C => array(0x1E5D),
+ 0x1E5E => array(0x1E5F),
+ 0x1E60 => array(0x1E61),
+ 0x1E62 => array(0x1E63),
+ 0x1E64 => array(0x1E65),
+ 0x1E66 => array(0x1E67),
+ 0x1E68 => array(0x1E69),
+ 0x1E6A => array(0x1E6B),
+ 0x1E6C => array(0x1E6D),
+ 0x1E6E => array(0x1E6F),
+ 0x1E70 => array(0x1E71),
+ 0x1E72 => array(0x1E73),
+ 0x1E74 => array(0x1E75),
+ 0x1E76 => array(0x1E77),
+ 0x1E78 => array(0x1E79),
+ 0x1E7A => array(0x1E7B),
+ 0x1E7C => array(0x1E7D),
+ 0x1E7E => array(0x1E7F),
+ 0x1E80 => array(0x1E81),
+ 0x1E82 => array(0x1E83),
+ 0x1E84 => array(0x1E85),
+ 0x1E86 => array(0x1E87),
+ 0x1E88 => array(0x1E89),
+ 0x1E8A => array(0x1E8B),
+ 0x1E8C => array(0x1E8D),
+ 0x1E8E => array(0x1E8F),
+ 0x1E90 => array(0x1E91),
+ 0x1E92 => array(0x1E93),
+ 0x1E94 => array(0x1E95),
+ 0x1E96 => array(0x68, 0x331),
+ 0x1E97 => array(0x74, 0x308),
+ 0x1E98 => array(0x77, 0x30A),
+ 0x1E99 => array(0x79, 0x30A),
+ 0x1E9A => array(0x61, 0x2BE),
+ 0x1E9B => array(0x1E61),
+ 0x1EA0 => array(0x1EA1),
+ 0x1EA2 => array(0x1EA3),
+ 0x1EA4 => array(0x1EA5),
+ 0x1EA6 => array(0x1EA7),
+ 0x1EA8 => array(0x1EA9),
+ 0x1EAA => array(0x1EAB),
+ 0x1EAC => array(0x1EAD),
+ 0x1EAE => array(0x1EAF),
+ 0x1EB0 => array(0x1EB1),
+ 0x1EB2 => array(0x1EB3),
+ 0x1EB4 => array(0x1EB5),
+ 0x1EB6 => array(0x1EB7),
+ 0x1EB8 => array(0x1EB9),
+ 0x1EBA => array(0x1EBB),
+ 0x1EBC => array(0x1EBD),
+ 0x1EBE => array(0x1EBF),
+ 0x1EC0 => array(0x1EC1),
+ 0x1EC2 => array(0x1EC3),
+ 0x1EC4 => array(0x1EC5),
+ 0x1EC6 => array(0x1EC7),
+ 0x1EC8 => array(0x1EC9),
+ 0x1ECA => array(0x1ECB),
+ 0x1ECC => array(0x1ECD),
+ 0x1ECE => array(0x1ECF),
+ 0x1ED0 => array(0x1ED1),
+ 0x1ED2 => array(0x1ED3),
+ 0x1ED4 => array(0x1ED5),
+ 0x1ED6 => array(0x1ED7),
+ 0x1ED8 => array(0x1ED9),
+ 0x1EDA => array(0x1EDB),
+ 0x1EDC => array(0x1EDD),
+ 0x1EDE => array(0x1EDF),
+ 0x1EE0 => array(0x1EE1),
+ 0x1EE2 => array(0x1EE3),
+ 0x1EE4 => array(0x1EE5),
+ 0x1EE6 => array(0x1EE7),
+ 0x1EE8 => array(0x1EE9),
+ 0x1EEA => array(0x1EEB),
+ 0x1EEC => array(0x1EED),
+ 0x1EEE => array(0x1EEF),
+ 0x1EF0 => array(0x1EF1),
+ 0x1EF2 => array(0x1EF3),
+ 0x1EF4 => array(0x1EF5),
+ 0x1EF6 => array(0x1EF7),
+ 0x1EF8 => array(0x1EF9),
+ 0x1F08 => array(0x1F00),
+ 0x1F09 => array(0x1F01),
+ 0x1F0A => array(0x1F02),
+ 0x1F0B => array(0x1F03),
+ 0x1F0C => array(0x1F04),
+ 0x1F0D => array(0x1F05),
+ 0x1F0E => array(0x1F06),
+ 0x1F0F => array(0x1F07),
+ 0x1F18 => array(0x1F10),
+ 0x1F19 => array(0x1F11),
+ 0x1F1A => array(0x1F12),
+ 0x1F1B => array(0x1F13),
+ 0x1F1C => array(0x1F14),
+ 0x1F1D => array(0x1F15),
+ 0x1F28 => array(0x1F20),
+ 0x1F29 => array(0x1F21),
+ 0x1F2A => array(0x1F22),
+ 0x1F2B => array(0x1F23),
+ 0x1F2C => array(0x1F24),
+ 0x1F2D => array(0x1F25),
+ 0x1F2E => array(0x1F26),
+ 0x1F2F => array(0x1F27),
+ 0x1F38 => array(0x1F30),
+ 0x1F39 => array(0x1F31),
+ 0x1F3A => array(0x1F32),
+ 0x1F3B => array(0x1F33),
+ 0x1F3C => array(0x1F34),
+ 0x1F3D => array(0x1F35),
+ 0x1F3E => array(0x1F36),
+ 0x1F3F => array(0x1F37),
+ 0x1F48 => array(0x1F40),
+ 0x1F49 => array(0x1F41),
+ 0x1F4A => array(0x1F42),
+ 0x1F4B => array(0x1F43),
+ 0x1F4C => array(0x1F44),
+ 0x1F4D => array(0x1F45),
+ 0x1F50 => array(0x3C5, 0x313),
+ 0x1F52 => array(0x3C5, 0x313, 0x300),
+ 0x1F54 => array(0x3C5, 0x313, 0x301),
+ 0x1F56 => array(0x3C5, 0x313, 0x342),
+ 0x1F59 => array(0x1F51),
+ 0x1F5B => array(0x1F53),
+ 0x1F5D => array(0x1F55),
+ 0x1F5F => array(0x1F57),
+ 0x1F68 => array(0x1F60),
+ 0x1F69 => array(0x1F61),
+ 0x1F6A => array(0x1F62),
+ 0x1F6B => array(0x1F63),
+ 0x1F6C => array(0x1F64),
+ 0x1F6D => array(0x1F65),
+ 0x1F6E => array(0x1F66),
+ 0x1F6F => array(0x1F67),
+ 0x1F80 => array(0x1F00, 0x3B9),
+ 0x1F81 => array(0x1F01, 0x3B9),
+ 0x1F82 => array(0x1F02, 0x3B9),
+ 0x1F83 => array(0x1F03, 0x3B9),
+ 0x1F84 => array(0x1F04, 0x3B9),
+ 0x1F85 => array(0x1F05, 0x3B9),
+ 0x1F86 => array(0x1F06, 0x3B9),
+ 0x1F87 => array(0x1F07, 0x3B9),
+ 0x1F88 => array(0x1F00, 0x3B9),
+ 0x1F89 => array(0x1F01, 0x3B9),
+ 0x1F8A => array(0x1F02, 0x3B9),
+ 0x1F8B => array(0x1F03, 0x3B9),
+ 0x1F8C => array(0x1F04, 0x3B9),
+ 0x1F8D => array(0x1F05, 0x3B9),
+ 0x1F8E => array(0x1F06, 0x3B9),
+ 0x1F8F => array(0x1F07, 0x3B9),
+ 0x1F90 => array(0x1F20, 0x3B9),
+ 0x1F91 => array(0x1F21, 0x3B9),
+ 0x1F92 => array(0x1F22, 0x3B9),
+ 0x1F93 => array(0x1F23, 0x3B9),
+ 0x1F94 => array(0x1F24, 0x3B9),
+ 0x1F95 => array(0x1F25, 0x3B9),
+ 0x1F96 => array(0x1F26, 0x3B9),
+ 0x1F97 => array(0x1F27, 0x3B9),
+ 0x1F98 => array(0x1F20, 0x3B9),
+ 0x1F99 => array(0x1F21, 0x3B9),
+ 0x1F9A => array(0x1F22, 0x3B9),
+ 0x1F9B => array(0x1F23, 0x3B9),
+ 0x1F9C => array(0x1F24, 0x3B9),
+ 0x1F9D => array(0x1F25, 0x3B9),
+ 0x1F9E => array(0x1F26, 0x3B9),
+ 0x1F9F => array(0x1F27, 0x3B9),
+ 0x1FA0 => array(0x1F60, 0x3B9),
+ 0x1FA1 => array(0x1F61, 0x3B9),
+ 0x1FA2 => array(0x1F62, 0x3B9),
+ 0x1FA3 => array(0x1F63, 0x3B9),
+ 0x1FA4 => array(0x1F64, 0x3B9),
+ 0x1FA5 => array(0x1F65, 0x3B9),
+ 0x1FA6 => array(0x1F66, 0x3B9),
+ 0x1FA7 => array(0x1F67, 0x3B9),
+ 0x1FA8 => array(0x1F60, 0x3B9),
+ 0x1FA9 => array(0x1F61, 0x3B9),
+ 0x1FAA => array(0x1F62, 0x3B9),
+ 0x1FAB => array(0x1F63, 0x3B9),
+ 0x1FAC => array(0x1F64, 0x3B9),
+ 0x1FAD => array(0x1F65, 0x3B9),
+ 0x1FAE => array(0x1F66, 0x3B9),
+ 0x1FAF => array(0x1F67, 0x3B9),
+ 0x1FB2 => array(0x1F70, 0x3B9),
+ 0x1FB3 => array(0x3B1, 0x3B9),
+ 0x1FB4 => array(0x3AC, 0x3B9),
+ 0x1FB6 => array(0x3B1, 0x342),
+ 0x1FB7 => array(0x3B1, 0x342, 0x3B9),
+ 0x1FB8 => array(0x1FB0),
+ 0x1FB9 => array(0x1FB1),
+ 0x1FBA => array(0x1F70),
+ 0x1FBB => array(0x1F71),
+ 0x1FBC => array(0x3B1, 0x3B9),
+ 0x1FBE => array(0x3B9),
+ 0x1FC2 => array(0x1F74, 0x3B9),
+ 0x1FC3 => array(0x3B7, 0x3B9),
+ 0x1FC4 => array(0x3AE, 0x3B9),
+ 0x1FC6 => array(0x3B7, 0x342),
+ 0x1FC7 => array(0x3B7, 0x342, 0x3B9),
+ 0x1FC8 => array(0x1F72),
+ 0x1FC9 => array(0x1F73),
+ 0x1FCA => array(0x1F74),
+ 0x1FCB => array(0x1F75),
+ 0x1FCC => array(0x3B7, 0x3B9),
+ 0x1FD2 => array(0x3B9, 0x308, 0x300),
+ 0x1FD3 => array(0x3B9, 0x308, 0x301),
+ 0x1FD6 => array(0x3B9, 0x342),
+ 0x1FD7 => array(0x3B9, 0x308, 0x342),
+ 0x1FD8 => array(0x1FD0),
+ 0x1FD9 => array(0x1FD1),
+ 0x1FDA => array(0x1F76),
+ 0x1FDB => array(0x1F77),
+ 0x1FE2 => array(0x3C5, 0x308, 0x300),
+ 0x1FE3 => array(0x3C5, 0x308, 0x301),
+ 0x1FE4 => array(0x3C1, 0x313),
+ 0x1FE6 => array(0x3C5, 0x342),
+ 0x1FE7 => array(0x3C5, 0x308, 0x342),
+ 0x1FE8 => array(0x1FE0),
+ 0x1FE9 => array(0x1FE1),
+ 0x1FEA => array(0x1F7A),
+ 0x1FEB => array(0x1F7B),
+ 0x1FEC => array(0x1FE5),
+ 0x1FF2 => array(0x1F7C, 0x3B9),
+ 0x1FF3 => array(0x3C9, 0x3B9),
+ 0x1FF4 => array(0x3CE, 0x3B9),
+ 0x1FF6 => array(0x3C9, 0x342),
+ 0x1FF7 => array(0x3C9, 0x342, 0x3B9),
+ 0x1FF8 => array(0x1F78),
+ 0x1FF9 => array(0x1F79),
+ 0x1FFA => array(0x1F7C),
+ 0x1FFB => array(0x1F7D),
+ 0x1FFC => array(0x3C9, 0x3B9),
+ 0x20A8 => array(0x72, 0x73),
+ 0x2102 => array(0x63),
+ 0x2103 => array(0xB0, 0x63),
+ 0x2107 => array(0x25B),
+ 0x2109 => array(0xB0, 0x66),
+ 0x210B => array(0x68),
+ 0x210C => array(0x68),
+ 0x210D => array(0x68),
+ 0x2110 => array(0x69),
+ 0x2111 => array(0x69),
+ 0x2112 => array(0x6C),
+ 0x2115 => array(0x6E),
+ 0x2116 => array(0x6E, 0x6F),
+ 0x2119 => array(0x70),
+ 0x211A => array(0x71),
+ 0x211B => array(0x72),
+ 0x211C => array(0x72),
+ 0x211D => array(0x72),
+ 0x2120 => array(0x73, 0x6D),
+ 0x2121 => array(0x74, 0x65, 0x6C),
+ 0x2122 => array(0x74, 0x6D),
+ 0x2124 => array(0x7A),
+ 0x2126 => array(0x3C9),
+ 0x2128 => array(0x7A),
+ 0x212A => array(0x6B),
+ 0x212B => array(0xE5),
+ 0x212C => array(0x62),
+ 0x212D => array(0x63),
+ 0x2130 => array(0x65),
+ 0x2131 => array(0x66),
+ 0x2133 => array(0x6D),
+ 0x213E => array(0x3B3),
+ 0x213F => array(0x3C0),
+ 0x2145 => array(0x64),
+ 0x2160 => array(0x2170),
+ 0x2161 => array(0x2171),
+ 0x2162 => array(0x2172),
+ 0x2163 => array(0x2173),
+ 0x2164 => array(0x2174),
+ 0x2165 => array(0x2175),
+ 0x2166 => array(0x2176),
+ 0x2167 => array(0x2177),
+ 0x2168 => array(0x2178),
+ 0x2169 => array(0x2179),
+ 0x216A => array(0x217A),
+ 0x216B => array(0x217B),
+ 0x216C => array(0x217C),
+ 0x216D => array(0x217D),
+ 0x216E => array(0x217E),
+ 0x216F => array(0x217F),
+ 0x24B6 => array(0x24D0),
+ 0x24B7 => array(0x24D1),
+ 0x24B8 => array(0x24D2),
+ 0x24B9 => array(0x24D3),
+ 0x24BA => array(0x24D4),
+ 0x24BB => array(0x24D5),
+ 0x24BC => array(0x24D6),
+ 0x24BD => array(0x24D7),
+ 0x24BE => array(0x24D8),
+ 0x24BF => array(0x24D9),
+ 0x24C0 => array(0x24DA),
+ 0x24C1 => array(0x24DB),
+ 0x24C2 => array(0x24DC),
+ 0x24C3 => array(0x24DD),
+ 0x24C4 => array(0x24DE),
+ 0x24C5 => array(0x24DF),
+ 0x24C6 => array(0x24E0),
+ 0x24C7 => array(0x24E1),
+ 0x24C8 => array(0x24E2),
+ 0x24C9 => array(0x24E3),
+ 0x24CA => array(0x24E4),
+ 0x24CB => array(0x24E5),
+ 0x24CC => array(0x24E6),
+ 0x24CD => array(0x24E7),
+ 0x24CE => array(0x24E8),
+ 0x24CF => array(0x24E9),
+ 0x3371 => array(0x68, 0x70, 0x61),
+ 0x3373 => array(0x61, 0x75),
+ 0x3375 => array(0x6F, 0x76),
+ 0x3380 => array(0x70, 0x61),
+ 0x3381 => array(0x6E, 0x61),
+ 0x3382 => array(0x3BC, 0x61),
+ 0x3383 => array(0x6D, 0x61),
+ 0x3384 => array(0x6B, 0x61),
+ 0x3385 => array(0x6B, 0x62),
+ 0x3386 => array(0x6D, 0x62),
+ 0x3387 => array(0x67, 0x62),
+ 0x338A => array(0x70, 0x66),
+ 0x338B => array(0x6E, 0x66),
+ 0x338C => array(0x3BC, 0x66),
+ 0x3390 => array(0x68, 0x7A),
+ 0x3391 => array(0x6B, 0x68, 0x7A),
+ 0x3392 => array(0x6D, 0x68, 0x7A),
+ 0x3393 => array(0x67, 0x68, 0x7A),
+ 0x3394 => array(0x74, 0x68, 0x7A),
+ 0x33A9 => array(0x70, 0x61),
+ 0x33AA => array(0x6B, 0x70, 0x61),
+ 0x33AB => array(0x6D, 0x70, 0x61),
+ 0x33AC => array(0x67, 0x70, 0x61),
+ 0x33B4 => array(0x70, 0x76),
+ 0x33B5 => array(0x6E, 0x76),
+ 0x33B6 => array(0x3BC, 0x76),
+ 0x33B7 => array(0x6D, 0x76),
+ 0x33B8 => array(0x6B, 0x76),
+ 0x33B9 => array(0x6D, 0x76),
+ 0x33BA => array(0x70, 0x77),
+ 0x33BB => array(0x6E, 0x77),
+ 0x33BC => array(0x3BC, 0x77),
+ 0x33BD => array(0x6D, 0x77),
+ 0x33BE => array(0x6B, 0x77),
+ 0x33BF => array(0x6D, 0x77),
+ 0x33C0 => array(0x6B, 0x3C9),
+ 0x33C1 => array(0x6D, 0x3C9), /*
+ 0x33C2 => array(0x61, 0x2E, 0x6D, 0x2E), */
+ 0x33C3 => array(0x62, 0x71),
+ 0x33C6 => array(0x63, 0x2215, 0x6B, 0x67),
+ 0x33C7 => array(0x63, 0x6F, 0x2E),
+ 0x33C8 => array(0x64, 0x62),
+ 0x33C9 => array(0x67, 0x79),
+ 0x33CB => array(0x68, 0x70),
+ 0x33CD => array(0x6B, 0x6B),
+ 0x33CE => array(0x6B, 0x6D),
+ 0x33D7 => array(0x70, 0x68),
+ 0x33D9 => array(0x70, 0x70, 0x6D),
+ 0x33DA => array(0x70, 0x72),
+ 0x33DC => array(0x73, 0x76),
+ 0x33DD => array(0x77, 0x62),
+ 0xFB00 => array(0x66, 0x66),
+ 0xFB01 => array(0x66, 0x69),
+ 0xFB02 => array(0x66, 0x6C),
+ 0xFB03 => array(0x66, 0x66, 0x69),
+ 0xFB04 => array(0x66, 0x66, 0x6C),
+ 0xFB05 => array(0x73, 0x74),
+ 0xFB06 => array(0x73, 0x74),
+ 0xFB13 => array(0x574, 0x576),
+ 0xFB14 => array(0x574, 0x565),
+ 0xFB15 => array(0x574, 0x56B),
+ 0xFB16 => array(0x57E, 0x576),
+ 0xFB17 => array(0x574, 0x56D),
+ 0xFF21 => array(0xFF41),
+ 0xFF22 => array(0xFF42),
+ 0xFF23 => array(0xFF43),
+ 0xFF24 => array(0xFF44),
+ 0xFF25 => array(0xFF45),
+ 0xFF26 => array(0xFF46),
+ 0xFF27 => array(0xFF47),
+ 0xFF28 => array(0xFF48),
+ 0xFF29 => array(0xFF49),
+ 0xFF2A => array(0xFF4A),
+ 0xFF2B => array(0xFF4B),
+ 0xFF2C => array(0xFF4C),
+ 0xFF2D => array(0xFF4D),
+ 0xFF2E => array(0xFF4E),
+ 0xFF2F => array(0xFF4F),
+ 0xFF30 => array(0xFF50),
+ 0xFF31 => array(0xFF51),
+ 0xFF32 => array(0xFF52),
+ 0xFF33 => array(0xFF53),
+ 0xFF34 => array(0xFF54),
+ 0xFF35 => array(0xFF55),
+ 0xFF36 => array(0xFF56),
+ 0xFF37 => array(0xFF57),
+ 0xFF38 => array(0xFF58),
+ 0xFF39 => array(0xFF59),
+ 0xFF3A => array(0xFF5A),
+ 0x10400 => array(0x10428),
+ 0x10401 => array(0x10429),
+ 0x10402 => array(0x1042A),
+ 0x10403 => array(0x1042B),
+ 0x10404 => array(0x1042C),
+ 0x10405 => array(0x1042D),
+ 0x10406 => array(0x1042E),
+ 0x10407 => array(0x1042F),
+ 0x10408 => array(0x10430),
+ 0x10409 => array(0x10431),
+ 0x1040A => array(0x10432),
+ 0x1040B => array(0x10433),
+ 0x1040C => array(0x10434),
+ 0x1040D => array(0x10435),
+ 0x1040E => array(0x10436),
+ 0x1040F => array(0x10437),
+ 0x10410 => array(0x10438),
+ 0x10411 => array(0x10439),
+ 0x10412 => array(0x1043A),
+ 0x10413 => array(0x1043B),
+ 0x10414 => array(0x1043C),
+ 0x10415 => array(0x1043D),
+ 0x10416 => array(0x1043E),
+ 0x10417 => array(0x1043F),
+ 0x10418 => array(0x10440),
+ 0x10419 => array(0x10441),
+ 0x1041A => array(0x10442),
+ 0x1041B => array(0x10443),
+ 0x1041C => array(0x10444),
+ 0x1041D => array(0x10445),
+ 0x1041E => array(0x10446),
+ 0x1041F => array(0x10447),
+ 0x10420 => array(0x10448),
+ 0x10421 => array(0x10449),
+ 0x10422 => array(0x1044A),
+ 0x10423 => array(0x1044B),
+ 0x10424 => array(0x1044C),
+ 0x10425 => array(0x1044D),
+ 0x1D400 => array(0x61),
+ 0x1D401 => array(0x62),
+ 0x1D402 => array(0x63),
+ 0x1D403 => array(0x64),
+ 0x1D404 => array(0x65),
+ 0x1D405 => array(0x66),
+ 0x1D406 => array(0x67),
+ 0x1D407 => array(0x68),
+ 0x1D408 => array(0x69),
+ 0x1D409 => array(0x6A),
+ 0x1D40A => array(0x6B),
+ 0x1D40B => array(0x6C),
+ 0x1D40C => array(0x6D),
+ 0x1D40D => array(0x6E),
+ 0x1D40E => array(0x6F),
+ 0x1D40F => array(0x70),
+ 0x1D410 => array(0x71),
+ 0x1D411 => array(0x72),
+ 0x1D412 => array(0x73),
+ 0x1D413 => array(0x74),
+ 0x1D414 => array(0x75),
+ 0x1D415 => array(0x76),
+ 0x1D416 => array(0x77),
+ 0x1D417 => array(0x78),
+ 0x1D418 => array(0x79),
+ 0x1D419 => array(0x7A),
+ 0x1D434 => array(0x61),
+ 0x1D435 => array(0x62),
+ 0x1D436 => array(0x63),
+ 0x1D437 => array(0x64),
+ 0x1D438 => array(0x65),
+ 0x1D439 => array(0x66),
+ 0x1D43A => array(0x67),
+ 0x1D43B => array(0x68),
+ 0x1D43C => array(0x69),
+ 0x1D43D => array(0x6A),
+ 0x1D43E => array(0x6B),
+ 0x1D43F => array(0x6C),
+ 0x1D440 => array(0x6D),
+ 0x1D441 => array(0x6E),
+ 0x1D442 => array(0x6F),
+ 0x1D443 => array(0x70),
+ 0x1D444 => array(0x71),
+ 0x1D445 => array(0x72),
+ 0x1D446 => array(0x73),
+ 0x1D447 => array(0x74),
+ 0x1D448 => array(0x75),
+ 0x1D449 => array(0x76),
+ 0x1D44A => array(0x77),
+ 0x1D44B => array(0x78),
+ 0x1D44C => array(0x79),
+ 0x1D44D => array(0x7A),
+ 0x1D468 => array(0x61),
+ 0x1D469 => array(0x62),
+ 0x1D46A => array(0x63),
+ 0x1D46B => array(0x64),
+ 0x1D46C => array(0x65),
+ 0x1D46D => array(0x66),
+ 0x1D46E => array(0x67),
+ 0x1D46F => array(0x68),
+ 0x1D470 => array(0x69),
+ 0x1D471 => array(0x6A),
+ 0x1D472 => array(0x6B),
+ 0x1D473 => array(0x6C),
+ 0x1D474 => array(0x6D),
+ 0x1D475 => array(0x6E),
+ 0x1D476 => array(0x6F),
+ 0x1D477 => array(0x70),
+ 0x1D478 => array(0x71),
+ 0x1D479 => array(0x72),
+ 0x1D47A => array(0x73),
+ 0x1D47B => array(0x74),
+ 0x1D47C => array(0x75),
+ 0x1D47D => array(0x76),
+ 0x1D47E => array(0x77),
+ 0x1D47F => array(0x78),
+ 0x1D480 => array(0x79),
+ 0x1D481 => array(0x7A),
+ 0x1D49C => array(0x61),
+ 0x1D49E => array(0x63),
+ 0x1D49F => array(0x64),
+ 0x1D4A2 => array(0x67),
+ 0x1D4A5 => array(0x6A),
+ 0x1D4A6 => array(0x6B),
+ 0x1D4A9 => array(0x6E),
+ 0x1D4AA => array(0x6F),
+ 0x1D4AB => array(0x70),
+ 0x1D4AC => array(0x71),
+ 0x1D4AE => array(0x73),
+ 0x1D4AF => array(0x74),
+ 0x1D4B0 => array(0x75),
+ 0x1D4B1 => array(0x76),
+ 0x1D4B2 => array(0x77),
+ 0x1D4B3 => array(0x78),
+ 0x1D4B4 => array(0x79),
+ 0x1D4B5 => array(0x7A),
+ 0x1D4D0 => array(0x61),
+ 0x1D4D1 => array(0x62),
+ 0x1D4D2 => array(0x63),
+ 0x1D4D3 => array(0x64),
+ 0x1D4D4 => array(0x65),
+ 0x1D4D5 => array(0x66),
+ 0x1D4D6 => array(0x67),
+ 0x1D4D7 => array(0x68),
+ 0x1D4D8 => array(0x69),
+ 0x1D4D9 => array(0x6A),
+ 0x1D4DA => array(0x6B),
+ 0x1D4DB => array(0x6C),
+ 0x1D4DC => array(0x6D),
+ 0x1D4DD => array(0x6E),
+ 0x1D4DE => array(0x6F),
+ 0x1D4DF => array(0x70),
+ 0x1D4E0 => array(0x71),
+ 0x1D4E1 => array(0x72),
+ 0x1D4E2 => array(0x73),
+ 0x1D4E3 => array(0x74),
+ 0x1D4E4 => array(0x75),
+ 0x1D4E5 => array(0x76),
+ 0x1D4E6 => array(0x77),
+ 0x1D4E7 => array(0x78),
+ 0x1D4E8 => array(0x79),
+ 0x1D4E9 => array(0x7A),
+ 0x1D504 => array(0x61),
+ 0x1D505 => array(0x62),
+ 0x1D507 => array(0x64),
+ 0x1D508 => array(0x65),
+ 0x1D509 => array(0x66),
+ 0x1D50A => array(0x67),
+ 0x1D50D => array(0x6A),
+ 0x1D50E => array(0x6B),
+ 0x1D50F => array(0x6C),
+ 0x1D510 => array(0x6D),
+ 0x1D511 => array(0x6E),
+ 0x1D512 => array(0x6F),
+ 0x1D513 => array(0x70),
+ 0x1D514 => array(0x71),
+ 0x1D516 => array(0x73),
+ 0x1D517 => array(0x74),
+ 0x1D518 => array(0x75),
+ 0x1D519 => array(0x76),
+ 0x1D51A => array(0x77),
+ 0x1D51B => array(0x78),
+ 0x1D51C => array(0x79),
+ 0x1D538 => array(0x61),
+ 0x1D539 => array(0x62),
+ 0x1D53B => array(0x64),
+ 0x1D53C => array(0x65),
+ 0x1D53D => array(0x66),
+ 0x1D53E => array(0x67),
+ 0x1D540 => array(0x69),
+ 0x1D541 => array(0x6A),
+ 0x1D542 => array(0x6B),
+ 0x1D543 => array(0x6C),
+ 0x1D544 => array(0x6D),
+ 0x1D546 => array(0x6F),
+ 0x1D54A => array(0x73),
+ 0x1D54B => array(0x74),
+ 0x1D54C => array(0x75),
+ 0x1D54D => array(0x76),
+ 0x1D54E => array(0x77),
+ 0x1D54F => array(0x78),
+ 0x1D550 => array(0x79),
+ 0x1D56C => array(0x61),
+ 0x1D56D => array(0x62),
+ 0x1D56E => array(0x63),
+ 0x1D56F => array(0x64),
+ 0x1D570 => array(0x65),
+ 0x1D571 => array(0x66),
+ 0x1D572 => array(0x67),
+ 0x1D573 => array(0x68),
+ 0x1D574 => array(0x69),
+ 0x1D575 => array(0x6A),
+ 0x1D576 => array(0x6B),
+ 0x1D577 => array(0x6C),
+ 0x1D578 => array(0x6D),
+ 0x1D579 => array(0x6E),
+ 0x1D57A => array(0x6F),
+ 0x1D57B => array(0x70),
+ 0x1D57C => array(0x71),
+ 0x1D57D => array(0x72),
+ 0x1D57E => array(0x73),
+ 0x1D57F => array(0x74),
+ 0x1D580 => array(0x75),
+ 0x1D581 => array(0x76),
+ 0x1D582 => array(0x77),
+ 0x1D583 => array(0x78),
+ 0x1D584 => array(0x79),
+ 0x1D585 => array(0x7A),
+ 0x1D5A0 => array(0x61),
+ 0x1D5A1 => array(0x62),
+ 0x1D5A2 => array(0x63),
+ 0x1D5A3 => array(0x64),
+ 0x1D5A4 => array(0x65),
+ 0x1D5A5 => array(0x66),
+ 0x1D5A6 => array(0x67),
+ 0x1D5A7 => array(0x68),
+ 0x1D5A8 => array(0x69),
+ 0x1D5A9 => array(0x6A),
+ 0x1D5AA => array(0x6B),
+ 0x1D5AB => array(0x6C),
+ 0x1D5AC => array(0x6D),
+ 0x1D5AD => array(0x6E),
+ 0x1D5AE => array(0x6F),
+ 0x1D5AF => array(0x70),
+ 0x1D5B0 => array(0x71),
+ 0x1D5B1 => array(0x72),
+ 0x1D5B2 => array(0x73),
+ 0x1D5B3 => array(0x74),
+ 0x1D5B4 => array(0x75),
+ 0x1D5B5 => array(0x76),
+ 0x1D5B6 => array(0x77),
+ 0x1D5B7 => array(0x78),
+ 0x1D5B8 => array(0x79),
+ 0x1D5B9 => array(0x7A),
+ 0x1D5D4 => array(0x61),
+ 0x1D5D5 => array(0x62),
+ 0x1D5D6 => array(0x63),
+ 0x1D5D7 => array(0x64),
+ 0x1D5D8 => array(0x65),
+ 0x1D5D9 => array(0x66),
+ 0x1D5DA => array(0x67),
+ 0x1D5DB => array(0x68),
+ 0x1D5DC => array(0x69),
+ 0x1D5DD => array(0x6A),
+ 0x1D5DE => array(0x6B),
+ 0x1D5DF => array(0x6C),
+ 0x1D5E0 => array(0x6D),
+ 0x1D5E1 => array(0x6E),
+ 0x1D5E2 => array(0x6F),
+ 0x1D5E3 => array(0x70),
+ 0x1D5E4 => array(0x71),
+ 0x1D5E5 => array(0x72),
+ 0x1D5E6 => array(0x73),
+ 0x1D5E7 => array(0x74),
+ 0x1D5E8 => array(0x75),
+ 0x1D5E9 => array(0x76),
+ 0x1D5EA => array(0x77),
+ 0x1D5EB => array(0x78),
+ 0x1D5EC => array(0x79),
+ 0x1D5ED => array(0x7A),
+ 0x1D608 => array(0x61),
+ 0x1D609 => array(0x62),
+ 0x1D60A => array(0x63),
+ 0x1D60B => array(0x64),
+ 0x1D60C => array(0x65),
+ 0x1D60D => array(0x66),
+ 0x1D60E => array(0x67),
+ 0x1D60F => array(0x68),
+ 0x1D610 => array(0x69),
+ 0x1D611 => array(0x6A),
+ 0x1D612 => array(0x6B),
+ 0x1D613 => array(0x6C),
+ 0x1D614 => array(0x6D),
+ 0x1D615 => array(0x6E),
+ 0x1D616 => array(0x6F),
+ 0x1D617 => array(0x70),
+ 0x1D618 => array(0x71),
+ 0x1D619 => array(0x72),
+ 0x1D61A => array(0x73),
+ 0x1D61B => array(0x74),
+ 0x1D61C => array(0x75),
+ 0x1D61D => array(0x76),
+ 0x1D61E => array(0x77),
+ 0x1D61F => array(0x78),
+ 0x1D620 => array(0x79),
+ 0x1D621 => array(0x7A),
+ 0x1D63C => array(0x61),
+ 0x1D63D => array(0x62),
+ 0x1D63E => array(0x63),
+ 0x1D63F => array(0x64),
+ 0x1D640 => array(0x65),
+ 0x1D641 => array(0x66),
+ 0x1D642 => array(0x67),
+ 0x1D643 => array(0x68),
+ 0x1D644 => array(0x69),
+ 0x1D645 => array(0x6A),
+ 0x1D646 => array(0x6B),
+ 0x1D647 => array(0x6C),
+ 0x1D648 => array(0x6D),
+ 0x1D649 => array(0x6E),
+ 0x1D64A => array(0x6F),
+ 0x1D64B => array(0x70),
+ 0x1D64C => array(0x71),
+ 0x1D64D => array(0x72),
+ 0x1D64E => array(0x73),
+ 0x1D64F => array(0x74),
+ 0x1D650 => array(0x75),
+ 0x1D651 => array(0x76),
+ 0x1D652 => array(0x77),
+ 0x1D653 => array(0x78),
+ 0x1D654 => array(0x79),
+ 0x1D655 => array(0x7A),
+ 0x1D670 => array(0x61),
+ 0x1D671 => array(0x62),
+ 0x1D672 => array(0x63),
+ 0x1D673 => array(0x64),
+ 0x1D674 => array(0x65),
+ 0x1D675 => array(0x66),
+ 0x1D676 => array(0x67),
+ 0x1D677 => array(0x68),
+ 0x1D678 => array(0x69),
+ 0x1D679 => array(0x6A),
+ 0x1D67A => array(0x6B),
+ 0x1D67B => array(0x6C),
+ 0x1D67C => array(0x6D),
+ 0x1D67D => array(0x6E),
+ 0x1D67E => array(0x6F),
+ 0x1D67F => array(0x70),
+ 0x1D680 => array(0x71),
+ 0x1D681 => array(0x72),
+ 0x1D682 => array(0x73),
+ 0x1D683 => array(0x74),
+ 0x1D684 => array(0x75),
+ 0x1D685 => array(0x76),
+ 0x1D686 => array(0x77),
+ 0x1D687 => array(0x78),
+ 0x1D688 => array(0x79),
+ 0x1D689 => array(0x7A),
+ 0x1D6A8 => array(0x3B1),
+ 0x1D6A9 => array(0x3B2),
+ 0x1D6AA => array(0x3B3),
+ 0x1D6AB => array(0x3B4),
+ 0x1D6AC => array(0x3B5),
+ 0x1D6AD => array(0x3B6),
+ 0x1D6AE => array(0x3B7),
+ 0x1D6AF => array(0x3B8),
+ 0x1D6B0 => array(0x3B9),
+ 0x1D6B1 => array(0x3BA),
+ 0x1D6B2 => array(0x3BB),
+ 0x1D6B3 => array(0x3BC),
+ 0x1D6B4 => array(0x3BD),
+ 0x1D6B5 => array(0x3BE),
+ 0x1D6B6 => array(0x3BF),
+ 0x1D6B7 => array(0x3C0),
+ 0x1D6B8 => array(0x3C1),
+ 0x1D6B9 => array(0x3B8),
+ 0x1D6BA => array(0x3C3),
+ 0x1D6BB => array(0x3C4),
+ 0x1D6BC => array(0x3C5),
+ 0x1D6BD => array(0x3C6),
+ 0x1D6BE => array(0x3C7),
+ 0x1D6BF => array(0x3C8),
+ 0x1D6C0 => array(0x3C9),
+ 0x1D6D3 => array(0x3C3),
+ 0x1D6E2 => array(0x3B1),
+ 0x1D6E3 => array(0x3B2),
+ 0x1D6E4 => array(0x3B3),
+ 0x1D6E5 => array(0x3B4),
+ 0x1D6E6 => array(0x3B5),
+ 0x1D6E7 => array(0x3B6),
+ 0x1D6E8 => array(0x3B7),
+ 0x1D6E9 => array(0x3B8),
+ 0x1D6EA => array(0x3B9),
+ 0x1D6EB => array(0x3BA),
+ 0x1D6EC => array(0x3BB),
+ 0x1D6ED => array(0x3BC),
+ 0x1D6EE => array(0x3BD),
+ 0x1D6EF => array(0x3BE),
+ 0x1D6F0 => array(0x3BF),
+ 0x1D6F1 => array(0x3C0),
+ 0x1D6F2 => array(0x3C1),
+ 0x1D6F3 => array(0x3B8),
+ 0x1D6F4 => array(0x3C3),
+ 0x1D6F5 => array(0x3C4),
+ 0x1D6F6 => array(0x3C5),
+ 0x1D6F7 => array(0x3C6),
+ 0x1D6F8 => array(0x3C7),
+ 0x1D6F9 => array(0x3C8),
+ 0x1D6FA => array(0x3C9),
+ 0x1D70D => array(0x3C3),
+ 0x1D71C => array(0x3B1),
+ 0x1D71D => array(0x3B2),
+ 0x1D71E => array(0x3B3),
+ 0x1D71F => array(0x3B4),
+ 0x1D720 => array(0x3B5),
+ 0x1D721 => array(0x3B6),
+ 0x1D722 => array(0x3B7),
+ 0x1D723 => array(0x3B8),
+ 0x1D724 => array(0x3B9),
+ 0x1D725 => array(0x3BA),
+ 0x1D726 => array(0x3BB),
+ 0x1D727 => array(0x3BC),
+ 0x1D728 => array(0x3BD),
+ 0x1D729 => array(0x3BE),
+ 0x1D72A => array(0x3BF),
+ 0x1D72B => array(0x3C0),
+ 0x1D72C => array(0x3C1),
+ 0x1D72D => array(0x3B8),
+ 0x1D72E => array(0x3C3),
+ 0x1D72F => array(0x3C4),
+ 0x1D730 => array(0x3C5),
+ 0x1D731 => array(0x3C6),
+ 0x1D732 => array(0x3C7),
+ 0x1D733 => array(0x3C8),
+ 0x1D734 => array(0x3C9),
+ 0x1D747 => array(0x3C3),
+ 0x1D756 => array(0x3B1),
+ 0x1D757 => array(0x3B2),
+ 0x1D758 => array(0x3B3),
+ 0x1D759 => array(0x3B4),
+ 0x1D75A => array(0x3B5),
+ 0x1D75B => array(0x3B6),
+ 0x1D75C => array(0x3B7),
+ 0x1D75D => array(0x3B8),
+ 0x1D75E => array(0x3B9),
+ 0x1D75F => array(0x3BA),
+ 0x1D760 => array(0x3BB),
+ 0x1D761 => array(0x3BC),
+ 0x1D762 => array(0x3BD),
+ 0x1D763 => array(0x3BE),
+ 0x1D764 => array(0x3BF),
+ 0x1D765 => array(0x3C0),
+ 0x1D766 => array(0x3C1),
+ 0x1D767 => array(0x3B8),
+ 0x1D768 => array(0x3C3),
+ 0x1D769 => array(0x3C4),
+ 0x1D76A => array(0x3C5),
+ 0x1D76B => array(0x3C6),
+ 0x1D76C => array(0x3C7),
+ 0x1D76D => array(0x3C8),
+ 0x1D76E => array(0x3C9),
+ 0x1D781 => array(0x3C3),
+ 0x1D790 => array(0x3B1),
+ 0x1D791 => array(0x3B2),
+ 0x1D792 => array(0x3B3),
+ 0x1D793 => array(0x3B4),
+ 0x1D794 => array(0x3B5),
+ 0x1D795 => array(0x3B6),
+ 0x1D796 => array(0x3B7),
+ 0x1D797 => array(0x3B8),
+ 0x1D798 => array(0x3B9),
+ 0x1D799 => array(0x3BA),
+ 0x1D79A => array(0x3BB),
+ 0x1D79B => array(0x3BC),
+ 0x1D79C => array(0x3BD),
+ 0x1D79D => array(0x3BE),
+ 0x1D79E => array(0x3BF),
+ 0x1D79F => array(0x3C0),
+ 0x1D7A0 => array(0x3C1),
+ 0x1D7A1 => array(0x3B8),
+ 0x1D7A2 => array(0x3C3),
+ 0x1D7A3 => array(0x3C4),
+ 0x1D7A4 => array(0x3C5),
+ 0x1D7A5 => array(0x3C6),
+ 0x1D7A6 => array(0x3C7),
+ 0x1D7A7 => array(0x3C8),
+ 0x1D7A8 => array(0x3C9),
+ 0x1D7BB => array(0x3C3),
+ 0x3F9 => array(0x3C3),
+ 0x1D2C => array(0x61),
+ 0x1D2D => array(0xE6),
+ 0x1D2E => array(0x62),
+ 0x1D30 => array(0x64),
+ 0x1D31 => array(0x65),
+ 0x1D32 => array(0x1DD),
+ 0x1D33 => array(0x67),
+ 0x1D34 => array(0x68),
+ 0x1D35 => array(0x69),
+ 0x1D36 => array(0x6A),
+ 0x1D37 => array(0x6B),
+ 0x1D38 => array(0x6C),
+ 0x1D39 => array(0x6D),
+ 0x1D3A => array(0x6E),
+ 0x1D3C => array(0x6F),
+ 0x1D3D => array(0x223),
+ 0x1D3E => array(0x70),
+ 0x1D3F => array(0x72),
+ 0x1D40 => array(0x74),
+ 0x1D41 => array(0x75),
+ 0x1D42 => array(0x77),
+ 0x213B => array(0x66, 0x61, 0x78),
+ 0x3250 => array(0x70, 0x74, 0x65),
+ 0x32CC => array(0x68, 0x67),
+ 0x32CE => array(0x65, 0x76),
+ 0x32CF => array(0x6C, 0x74, 0x64),
+ 0x337A => array(0x69, 0x75),
+ 0x33DE => array(0x76, 0x2215, 0x6D),
+ 0x33DF => array(0x61, 0x2215, 0x6D)
+ );
+
+ /**
+ * Normalization Combining Classes; Code Points not listed
+ * got Combining Class 0.
+ *
+ * @static
+ * @var array
+ * @access private
+ */
+ private static $_np_norm_combcls = array(
+ 0x334 => 1,
+ 0x335 => 1,
+ 0x336 => 1,
+ 0x337 => 1,
+ 0x338 => 1,
+ 0x93C => 7,
+ 0x9BC => 7,
+ 0xA3C => 7,
+ 0xABC => 7,
+ 0xB3C => 7,
+ 0xCBC => 7,
+ 0x1037 => 7,
+ 0x3099 => 8,
+ 0x309A => 8,
+ 0x94D => 9,
+ 0x9CD => 9,
+ 0xA4D => 9,
+ 0xACD => 9,
+ 0xB4D => 9,
+ 0xBCD => 9,
+ 0xC4D => 9,
+ 0xCCD => 9,
+ 0xD4D => 9,
+ 0xDCA => 9,
+ 0xE3A => 9,
+ 0xF84 => 9,
+ 0x1039 => 9,
+ 0x1714 => 9,
+ 0x1734 => 9,
+ 0x17D2 => 9,
+ 0x5B0 => 10,
+ 0x5B1 => 11,
+ 0x5B2 => 12,
+ 0x5B3 => 13,
+ 0x5B4 => 14,
+ 0x5B5 => 15,
+ 0x5B6 => 16,
+ 0x5B7 => 17,
+ 0x5B8 => 18,
+ 0x5B9 => 19,
+ 0x5BB => 20,
+ 0x5Bc => 21,
+ 0x5BD => 22,
+ 0x5BF => 23,
+ 0x5C1 => 24,
+ 0x5C2 => 25,
+ 0xFB1E => 26,
+ 0x64B => 27,
+ 0x64C => 28,
+ 0x64D => 29,
+ 0x64E => 30,
+ 0x64F => 31,
+ 0x650 => 32,
+ 0x651 => 33,
+ 0x652 => 34,
+ 0x670 => 35,
+ 0x711 => 36,
+ 0xC55 => 84,
+ 0xC56 => 91,
+ 0xE38 => 103,
+ 0xE39 => 103,
+ 0xE48 => 107,
+ 0xE49 => 107,
+ 0xE4A => 107,
+ 0xE4B => 107,
+ 0xEB8 => 118,
+ 0xEB9 => 118,
+ 0xEC8 => 122,
+ 0xEC9 => 122,
+ 0xECA => 122,
+ 0xECB => 122,
+ 0xF71 => 129,
+ 0xF72 => 130,
+ 0xF7A => 130,
+ 0xF7B => 130,
+ 0xF7C => 130,
+ 0xF7D => 130,
+ 0xF80 => 130,
+ 0xF74 => 132,
+ 0x321 => 202,
+ 0x322 => 202,
+ 0x327 => 202,
+ 0x328 => 202,
+ 0x31B => 216,
+ 0xF39 => 216,
+ 0x1D165 => 216,
+ 0x1D166 => 216,
+ 0x1D16E => 216,
+ 0x1D16F => 216,
+ 0x1D170 => 216,
+ 0x1D171 => 216,
+ 0x1D172 => 216,
+ 0x302A => 218,
+ 0x316 => 220,
+ 0x317 => 220,
+ 0x318 => 220,
+ 0x319 => 220,
+ 0x31C => 220,
+ 0x31D => 220,
+ 0x31E => 220,
+ 0x31F => 220,
+ 0x320 => 220,
+ 0x323 => 220,
+ 0x324 => 220,
+ 0x325 => 220,
+ 0x326 => 220,
+ 0x329 => 220,
+ 0x32A => 220,
+ 0x32B => 220,
+ 0x32C => 220,
+ 0x32D => 220,
+ 0x32E => 220,
+ 0x32F => 220,
+ 0x330 => 220,
+ 0x331 => 220,
+ 0x332 => 220,
+ 0x333 => 220,
+ 0x339 => 220,
+ 0x33A => 220,
+ 0x33B => 220,
+ 0x33C => 220,
+ 0x347 => 220,
+ 0x348 => 220,
+ 0x349 => 220,
+ 0x34D => 220,
+ 0x34E => 220,
+ 0x353 => 220,
+ 0x354 => 220,
+ 0x355 => 220,
+ 0x356 => 220,
+ 0x591 => 220,
+ 0x596 => 220,
+ 0x59B => 220,
+ 0x5A3 => 220,
+ 0x5A4 => 220,
+ 0x5A5 => 220,
+ 0x5A6 => 220,
+ 0x5A7 => 220,
+ 0x5AA => 220,
+ 0x655 => 220,
+ 0x656 => 220,
+ 0x6E3 => 220,
+ 0x6EA => 220,
+ 0x6ED => 220,
+ 0x731 => 220,
+ 0x734 => 220,
+ 0x737 => 220,
+ 0x738 => 220,
+ 0x739 => 220,
+ 0x73B => 220,
+ 0x73C => 220,
+ 0x73E => 220,
+ 0x742 => 220,
+ 0x744 => 220,
+ 0x746 => 220,
+ 0x748 => 220,
+ 0x952 => 220,
+ 0xF18 => 220,
+ 0xF19 => 220,
+ 0xF35 => 220,
+ 0xF37 => 220,
+ 0xFC6 => 220,
+ 0x193B => 220,
+ 0x20E8 => 220,
+ 0x1D17B => 220,
+ 0x1D17C => 220,
+ 0x1D17D => 220,
+ 0x1D17E => 220,
+ 0x1D17F => 220,
+ 0x1D180 => 220,
+ 0x1D181 => 220,
+ 0x1D182 => 220,
+ 0x1D18A => 220,
+ 0x1D18B => 220,
+ 0x59A => 222,
+ 0x5AD => 222,
+ 0x1929 => 222,
+ 0x302D => 222,
+ 0x302E => 224,
+ 0x302F => 224,
+ 0x1D16D => 226,
+ 0x5AE => 228,
+ 0x18A9 => 228,
+ 0x302B => 228,
+ 0x300 => 230,
+ 0x301 => 230,
+ 0x302 => 230,
+ 0x303 => 230,
+ 0x304 => 230,
+ 0x305 => 230,
+ 0x306 => 230,
+ 0x307 => 230,
+ 0x308 => 230,
+ 0x309 => 230,
+ 0x30A => 230,
+ 0x30B => 230,
+ 0x30C => 230,
+ 0x30D => 230,
+ 0x30E => 230,
+ 0x30F => 230,
+ 0x310 => 230,
+ 0x311 => 230,
+ 0x312 => 230,
+ 0x313 => 230,
+ 0x314 => 230,
+ 0x33D => 230,
+ 0x33E => 230,
+ 0x33F => 230,
+ 0x340 => 230,
+ 0x341 => 230,
+ 0x342 => 230,
+ 0x343 => 230,
+ 0x344 => 230,
+ 0x346 => 230,
+ 0x34A => 230,
+ 0x34B => 230,
+ 0x34C => 230,
+ 0x350 => 230,
+ 0x351 => 230,
+ 0x352 => 230,
+ 0x357 => 230,
+ 0x363 => 230,
+ 0x364 => 230,
+ 0x365 => 230,
+ 0x366 => 230,
+ 0x367 => 230,
+ 0x368 => 230,
+ 0x369 => 230,
+ 0x36A => 230,
+ 0x36B => 230,
+ 0x36C => 230,
+ 0x36D => 230,
+ 0x36E => 230,
+ 0x36F => 230,
+ 0x483 => 230,
+ 0x484 => 230,
+ 0x485 => 230,
+ 0x486 => 230,
+ 0x592 => 230,
+ 0x593 => 230,
+ 0x594 => 230,
+ 0x595 => 230,
+ 0x597 => 230,
+ 0x598 => 230,
+ 0x599 => 230,
+ 0x59C => 230,
+ 0x59D => 230,
+ 0x59E => 230,
+ 0x59F => 230,
+ 0x5A0 => 230,
+ 0x5A1 => 230,
+ 0x5A8 => 230,
+ 0x5A9 => 230,
+ 0x5AB => 230,
+ 0x5AC => 230,
+ 0x5AF => 230,
+ 0x5C4 => 230,
+ 0x610 => 230,
+ 0x611 => 230,
+ 0x612 => 230,
+ 0x613 => 230,
+ 0x614 => 230,
+ 0x615 => 230,
+ 0x653 => 230,
+ 0x654 => 230,
+ 0x657 => 230,
+ 0x658 => 230,
+ 0x6D6 => 230,
+ 0x6D7 => 230,
+ 0x6D8 => 230,
+ 0x6D9 => 230,
+ 0x6DA => 230,
+ 0x6DB => 230,
+ 0x6DC => 230,
+ 0x6DF => 230,
+ 0x6E0 => 230,
+ 0x6E1 => 230,
+ 0x6E2 => 230,
+ 0x6E4 => 230,
+ 0x6E7 => 230,
+ 0x6E8 => 230,
+ 0x6EB => 230,
+ 0x6EC => 230,
+ 0x730 => 230,
+ 0x732 => 230,
+ 0x733 => 230,
+ 0x735 => 230,
+ 0x736 => 230,
+ 0x73A => 230,
+ 0x73D => 230,
+ 0x73F => 230,
+ 0x740 => 230,
+ 0x741 => 230,
+ 0x743 => 230,
+ 0x745 => 230,
+ 0x747 => 230,
+ 0x749 => 230,
+ 0x74A => 230,
+ 0x951 => 230,
+ 0x953 => 230,
+ 0x954 => 230,
+ 0xF82 => 230,
+ 0xF83 => 230,
+ 0xF86 => 230,
+ 0xF87 => 230,
+ 0x170D => 230,
+ 0x193A => 230,
+ 0x20D0 => 230,
+ 0x20D1 => 230,
+ 0x20D4 => 230,
+ 0x20D5 => 230,
+ 0x20D6 => 230,
+ 0x20D7 => 230,
+ 0x20DB => 230,
+ 0x20DC => 230,
+ 0x20E1 => 230,
+ 0x20E7 => 230,
+ 0x20E9 => 230,
+ 0xFE20 => 230,
+ 0xFE21 => 230,
+ 0xFE22 => 230,
+ 0xFE23 => 230,
+ 0x1D185 => 230,
+ 0x1D186 => 230,
+ 0x1D187 => 230,
+ 0x1D189 => 230,
+ 0x1D188 => 230,
+ 0x1D1AA => 230,
+ 0x1D1AB => 230,
+ 0x1D1AC => 230,
+ 0x1D1AD => 230,
+ 0x315 => 232,
+ 0x31A => 232,
+ 0x302C => 232,
+ 0x35F => 233,
+ 0x362 => 233,
+ 0x35D => 234,
+ 0x35E => 234,
+ 0x360 => 234,
+ 0x361 => 234,
+ 0x345 => 240
+ );
+ // }}}
+
+ // {{{ properties
+ /**
+ * @var string
+ * @access private
+ */
+ private $_punycode_prefix = 'xn--';
+
+ /**
+ * @access private
+ */
+ private $_invalid_ucs = 0x80000000;
+
+ /**
+ * @access private
+ */
+ private $_max_ucs = 0x10FFFF;
+
+ /**
+ * @var int
+ * @access private
+ */
+ private $_base = 36;
+
+ /**
+ * @var int
+ * @access private
+ */
+ private $_tmin = 1;
+
+ /**
+ * @var int
+ * @access private
+ */
+ private $_tmax = 26;
+
+ /**
+ * @var int
+ * @access private
+ */
+ private $_skew = 38;
+
+ /**
+ * @var int
+ * @access private
+ */
+ private $_damp = 700;
+
+ /**
+ * @var int
+ * @access private
+ */
+ private $_initial_bias = 72;
+
+ /**
+ * @var int
+ * @access private
+ */
+ private $_initial_n = 0x80;
+
+ /**
+ * @var int
+ * @access private
+ */
+ private $_slast;
+
+ /**
+ * @access private
+ */
+ private $_sbase = 0xAC00;
+
+ /**
+ * @access private
+ */
+ private $_lbase = 0x1100;
+
+ /**
+ * @access private
+ */
+ private $_vbase = 0x1161;
+
+ /**
+ * @access private
+ */
+ private $_tbase = 0x11a7;
+
+ /**
+ * @var int
+ * @access private
+ */
+ private $_lcount = 19;
+
+ /**
+ * @var int
+ * @access private
+ */
+ private $_vcount = 21;
+
+ /**
+ * @var int
+ * @access private
+ */
+ private $_tcount = 28;
+
+ /**
+ * vcount * tcount
+ *
+ * @var int
+ * @access private
+ */
+ private $_ncount = 588;
+
+ /**
+ * lcount * tcount * vcount
+ *
+ * @var int
+ * @access private
+ */
+ private $_scount = 11172;
+
+ /**
+ * Default encoding for encode()'s input and decode()'s output is UTF-8;
+ * Other possible encodings are ucs4_string and ucs4_array
+ * See {@link setParams()} for how to select these
+ *
+ * @var bool
+ * @access private
+ */
+ private $_api_encoding = 'utf8';
+
+ /**
+ * Overlong UTF-8 encodings are forbidden
+ *
+ * @var bool
+ * @access private
+ */
+ private $_allow_overlong = false;
+
+ /**
+ * Behave strict or not
+ *
+ * @var bool
+ * @access private
+ */
+ private $_strict_mode = false;
+
+ /**
+ * Cached value indicating whether or not mbstring function overloading is
+ * on for strlen
+ *
+ * This is cached for optimal performance.
+ *
+ * @var boolean
+ * @see Net_IDNA_php5::_byteLength()
+ */
+ private static $_mb_string_overload = null;
+ // }}}
+
+
+ // {{{ constructor
+ /**
+ * Constructor
+ *
+ * @param array $options
+ * @access public
+ * @see setParams()
+ */
+ public function __construct($options = null)
+ {
+ $this->_slast = $this->_sbase + $this->_lcount * $this->_vcount * $this->_tcount;
+
+ if (is_array($options)) {
+ $this->setParams($options);
+ }
+
+ // populate mbstring overloading cache if not set
+ if (self::$_mb_string_overload === null) {
+ self::$_mb_string_overload = (extension_loaded('mbstring')
+ && (ini_get('mbstring.func_overload') & 0x02) === 0x02);
+ }
+ }
+ // }}}
+
+
+ /**
+ * Sets a new option value. Available options and values:
+ *
+ * [utf8 - Use either UTF-8 or ISO-8859-1 as input (true for UTF-8, false
+ * otherwise); The output is always UTF-8]
+ * [overlong - Unicode does not allow unnecessarily long encodings of chars,
+ * to allow this, set this parameter to true, else to false;
+ * default is false.]
+ * [strict - true: strict mode, good for registration purposes - Causes errors
+ * on failures; false: loose mode, ideal for "wildlife" applications
+ * by silently ignoring errors and returning the original input instead]
+ *
+ * @param mixed $option Parameter to set (string: single parameter; array of Parameter => Value pairs)
+ * @param string $value Value to use (if parameter 1 is a string)
+ * @return boolean true on success, false otherwise
+ * @access public
+ */
+ public function setParams($option, $value = false)
+ {
+ if (!is_array($option)) {
+ $option = array($option => $value);
+ }
+
+ foreach ($option as $k => $v) {
+ switch ($k) {
+ case 'encoding':
+ switch ($v) {
+ case 'utf8':
+ case 'ucs4_string':
+ case 'ucs4_array':
+ $this->_api_encoding = $v;
+ break;
+
+ default:
+ throw new Exception('Set Parameter: Unknown parameter '.$v.' for option '.$k);
+ }
+
+ break;
+
+ case 'overlong':
+ $this->_allow_overlong = ($v) ? true : false;
+ break;
+
+ case 'strict':
+ $this->_strict_mode = ($v) ? true : false;
+ break;
+
+ default:
+ return false;
+ }
+ }
+
+ return true;
+ }
+
+ /**
+ * Encode a given UTF-8 domain name.
+ *
+ * @param string $decoded Domain name (UTF-8 or UCS-4)
+ * [@param string $encoding Desired input encoding, see {@link set_parameter}]
+ * @return string Encoded Domain name (ACE string)
+ * @return mixed processed string
+ * @throws Exception
+ * @access public
+ */
+ public function encode($decoded, $one_time_encoding = false)
+ {
+ // Forcing conversion of input to UCS4 array
+ // If one time encoding is given, use this, else the objects property
+ switch (($one_time_encoding) ? $one_time_encoding : $this->_api_encoding) {
+ case 'utf8':
+ $decoded = $this->_utf8_to_ucs4($decoded);
+ break;
+ case 'ucs4_string':
+ $decoded = $this->_ucs4_string_to_ucs4($decoded);
+ case 'ucs4_array': // No break; before this line. Catch case, but do nothing
+ break;
+ default:
+ throw new Exception('Unsupported input format');
+ }
+
+ // No input, no output, what else did you expect?
+ if (empty($decoded)) return '';
+
+ // Anchors for iteration
+ $last_begin = 0;
+ // Output string
+ $output = '';
+
+ foreach ($decoded as $k => $v) {
+ // Make sure to use just the plain dot
+ switch($v) {
+ case 0x3002:
+ case 0xFF0E:
+ case 0xFF61:
+ $decoded[$k] = 0x2E;
+ // It's right, no break here
+ // The codepoints above have to be converted to dots anyway
+
+ // Stumbling across an anchoring character
+ case 0x2E:
+ case 0x2F:
+ case 0x3A:
+ case 0x3F:
+ case 0x40:
+ // Neither email addresses nor URLs allowed in strict mode
+ if ($this->_strict_mode) {
+ throw new Exception('Neither email addresses nor URLs are allowed in strict mode.');
+ } else {
+ // Skip first char
+ if ($k) {
+ $encoded = '';
+ $encoded = $this->_encode(array_slice($decoded, $last_begin, (($k)-$last_begin)));
+ if ($encoded) {
+ $output .= $encoded;
+ } else {
+ $output .= $this->_ucs4_to_utf8(array_slice($decoded, $last_begin, (($k)-$last_begin)));
+ }
+ $output .= chr($decoded[$k]);
+ }
+ $last_begin = $k + 1;
+ }
+ }
+ }
+ // Catch the rest of the string
+ if ($last_begin) {
+ $inp_len = sizeof($decoded);
+ $encoded = '';
+ $encoded = $this->_encode(array_slice($decoded, $last_begin, (($inp_len)-$last_begin)));
+ if ($encoded) {
+ $output .= $encoded;
+ } else {
+ $output .= $this->_ucs4_to_utf8(array_slice($decoded, $last_begin, (($inp_len)-$last_begin)));
+ }
+ return $output;
+ } else {
+ if ($output = $this->_encode($decoded)) {
+ return $output;
+ } else {
+ return $this->_ucs4_to_utf8($decoded);
+ }
+ }
+ }
+
+ /**
+ * Decode a given ACE domain name.
+ *
+ * @param string $encoded Domain name (ACE string)
+ * @param string $encoding Desired output encoding, see {@link set_parameter}
+ * @return string Decoded Domain name (UTF-8 or UCS-4)
+ * @throws Exception
+ * @access public
+ */
+ public function decode($input, $one_time_encoding = false)
+ {
+ // Optionally set
+ if ($one_time_encoding) {
+ switch ($one_time_encoding) {
+ case 'utf8':
+ case 'ucs4_string':
+ case 'ucs4_array':
+ break;
+ default:
+ throw new Exception('Unknown encoding '.$one_time_encoding);
+ return false;
+ }
+ }
+ // Make sure to drop any newline characters around
+ $input = trim($input);
+
+ // Negotiate input and try to determine, wether it is a plain string,
+ // an email address or something like a complete URL
+ if (strpos($input, '@')) { // Maybe it is an email address
+ // No no in strict mode
+ if ($this->_strict_mode) {
+ throw new Exception('Only simple domain name parts can be handled in strict mode');
+ }
+ list($email_pref, $input) = explode('@', $input, 2);
+ $arr = explode('.', $input);
+ foreach ($arr as $k => $v) {
+ $conv = $this->_decode($v);
+ if ($conv) $arr[$k] = $conv;
+ }
+ $return = $email_pref . '@' . join('.', $arr);
+ } elseif (preg_match('![:\./]!', $input)) { // Or a complete domain name (with or without paths / parameters)
+ // No no in strict mode
+ if ($this->_strict_mode) {
+ throw new Exception('Only simple domain name parts can be handled in strict mode');
+ }
+ $parsed = parse_url($input);
+ if (isset($parsed['host'])) {
+ $arr = explode('.', $parsed['host']);
+ foreach ($arr as $k => $v) {
+ $conv = $this->_decode($v);
+ if ($conv) $arr[$k] = $conv;
+ }
+ $parsed['host'] = join('.', $arr);
+ if (isset($parsed['scheme'])) {
+ $parsed['scheme'] .= (strtolower($parsed['scheme']) == 'mailto') ? ':' : '://';
+ }
+ $return = join('', $parsed);
+ } else { // parse_url seems to have failed, try without it
+ $arr = explode('.', $input);
+ foreach ($arr as $k => $v) {
+ $conv = $this->_decode($v);
+ if ($conv) $arr[$k] = $conv;
+ }
+ $return = join('.', $arr);
+ }
+ } else { // Otherwise we consider it being a pure domain name string
+ $return = $this->_decode($input);
+ }
+ // The output is UTF-8 by default, other output formats need conversion here
+ // If one time encoding is given, use this, else the objects property
+ switch (($one_time_encoding) ? $one_time_encoding : $this->_api_encoding) {
+ case 'utf8':
+ return $return;
+ break;
+ case 'ucs4_string':
+ return $this->_ucs4_to_ucs4_string($this->_utf8_to_ucs4($return));
+ break;
+ case 'ucs4_array':
+ return $this->_utf8_to_ucs4($return);
+ break;
+ default:
+ throw new Exception('Unsupported output format');
+ }
+ }
+
+
+ // {{{ private
+ /**
+ * The actual encoding algorithm.
+ *
+ * @return string
+ * @throws Exception
+ * @access private
+ */
+ private function _encode($decoded)
+ {
+ // We cannot encode a domain name containing the Punycode prefix
+ $extract = self::_byteLength($this->_punycode_prefix);
+ $check_pref = $this->_utf8_to_ucs4($this->_punycode_prefix);
+ $check_deco = array_slice($decoded, 0, $extract);
+
+ if ($check_pref == $check_deco) {
+ throw new Exception('This is already a punycode string');
+ }
+ // We will not try to encode strings consisting of basic code points only
+ $encodable = false;
+ foreach ($decoded as $k => $v) {
+ if ($v > 0x7a) {
+ $encodable = true;
+ break;
+ }
+ }
+ if (!$encodable) {
+ if ($this->_strict_mode) {
+ throw new Exception('The given string does not contain encodable chars');
+ } else {
+ return false;
+ }
+ }
+
+ // Do NAMEPREP
+ try {
+ $decoded = $this->_nameprep($decoded);
+ } catch (Exception $e) {
+ // hmm, serious - rethrow
+ throw $e;
+ }
+
+ $deco_len = count($decoded);
+
+ // Empty array
+ if (!$deco_len) {
+ return false;
+ }
+
+ // How many chars have been consumed
+ $codecount = 0;
+
+ // Start with the prefix; copy it to output
+ $encoded = $this->_punycode_prefix;
+
+ $encoded = '';
+ // Copy all basic code points to output
+ for ($i = 0; $i < $deco_len; ++$i) {
+ $test = $decoded[$i];
+ // Will match [0-9a-zA-Z-]
+ if ((0x2F < $test && $test < 0x40)
+ || (0x40 < $test && $test < 0x5B)
+ || (0x60 < $test && $test <= 0x7B)
+ || (0x2D == $test)) {
+ $encoded .= chr($decoded[$i]);
+ $codecount++;
+ }
+ }
+
+ // All codepoints were basic ones
+ if ($codecount == $deco_len) {
+ return $encoded;
+ }
+
+ // Start with the prefix; copy it to output
+ $encoded = $this->_punycode_prefix . $encoded;
+
+ // If we have basic code points in output, add an hyphen to the end
+ if ($codecount) {
+ $encoded .= '-';
+ }
+
+ // Now find and encode all non-basic code points
+ $is_first = true;
+ $cur_code = $this->_initial_n;
+ $bias = $this->_initial_bias;
+ $delta = 0;
+
+ while ($codecount < $deco_len) {
+ // Find the smallest code point >= the current code point and
+ // remember the last ouccrence of it in the input
+ for ($i = 0, $next_code = $this->_max_ucs; $i < $deco_len; $i++) {
+ if ($decoded[$i] >= $cur_code && $decoded[$i] <= $next_code) {
+ $next_code = $decoded[$i];
+ }
+ }
+
+ $delta += ($next_code - $cur_code) * ($codecount + 1);
+ $cur_code = $next_code;
+
+ // Scan input again and encode all characters whose code point is $cur_code
+ for ($i = 0; $i < $deco_len; $i++) {
+ if ($decoded[$i] < $cur_code) {
+ $delta++;
+ } else if ($decoded[$i] == $cur_code) {
+ for ($q = $delta, $k = $this->_base; 1; $k += $this->_base) {
+ $t = ($k <= $bias)?
+ $this->_tmin :
+ (($k >= $bias + $this->_tmax)? $this->_tmax : $k - $bias);
+
+ if ($q < $t) {
+ break;
+ }
+
+ $encoded .= $this->_encodeDigit(ceil($t + (($q - $t) % ($this->_base - $t))));
+ $q = ($q - $t) / ($this->_base - $t);
+ }
+
+ $encoded .= $this->_encodeDigit($q);
+ $bias = $this->_adapt($delta, $codecount + 1, $is_first);
+ $codecount++;
+ $delta = 0;
+ $is_first = false;
+ }
+ }
+
+ $delta++;
+ $cur_code++;
+ }
+
+ return $encoded;
+ }
+
+ /**
+ * The actual decoding algorithm.
+ *
+ * @return string
+ * @throws Exception
+ * @access private
+ */
+ private function _decode($encoded)
+ {
+ // We do need to find the Punycode prefix
+ if (!preg_match('!^' . preg_quote($this->_punycode_prefix, '!') . '!', $encoded)) {
+ return false;
+ }
+
+ $encode_test = preg_replace('!^' . preg_quote($this->_punycode_prefix, '!') . '!', '', $encoded);
+
+ // If nothing left after removing the prefix, it is hopeless
+ if (!$encode_test) {
+ return false;
+ }
+
+ // Find last occurence of the delimiter
+ $delim_pos = strrpos($encoded, '-');
+
+ if ($delim_pos > self::_byteLength($this->_punycode_prefix)) {
+ for ($k = self::_byteLength($this->_punycode_prefix); $k < $delim_pos; ++$k) {
+ $decoded[] = ord($encoded{$k});
+ }
+ } else {
+ $decoded = array();
+ }
+
+ $deco_len = count($decoded);
+ $enco_len = self::_byteLength($encoded);
+
+ // Wandering through the strings; init
+ $is_first = true;
+ $bias = $this->_initial_bias;
+ $idx = 0;
+ $char = $this->_initial_n;
+
+ for ($enco_idx = ($delim_pos)? ($delim_pos + 1) : 0; $enco_idx < $enco_len; ++$deco_len) {
+ for ($old_idx = $idx, $w = 1, $k = $this->_base; 1 ; $k += $this->_base) {
+ $digit = $this->_decodeDigit($encoded{$enco_idx++});
+ $idx += $digit * $w;
+
+ $t = ($k <= $bias) ?
+ $this->_tmin :
+ (($k >= $bias + $this->_tmax)? $this->_tmax : ($k - $bias));
+
+ if ($digit < $t) {
+ break;
+ }
+
+ $w = (int)($w * ($this->_base - $t));
+ }
+
+ $bias = $this->_adapt($idx - $old_idx, $deco_len + 1, $is_first);
+ $is_first = false;
+ $char += (int) ($idx / ($deco_len + 1));
+ $idx %= ($deco_len + 1);
+
+ if ($deco_len > 0) {
+ // Make room for the decoded char
+ for ($i = $deco_len; $i > $idx; $i--) {
+ $decoded[$i] = $decoded[($i - 1)];
+ }
+ }
+
+ $decoded[$idx++] = $char;
+ }
+
+ try {
+ return $this->_ucs4_to_utf8($decoded);
+ } catch (Exception $e) {
+ // rethrow
+ throw $e;
+ }
+ }
+
+ /**
+ * Adapt the bias according to the current code point and position.
+ *
+ * @access private
+ */
+ private function _adapt($delta, $npoints, $is_first)
+ {
+ $delta = (int) ($is_first ? ($delta / $this->_damp) : ($delta / 2));
+ $delta += (int) ($delta / $npoints);
+
+ for ($k = 0; $delta > (($this->_base - $this->_tmin) * $this->_tmax) / 2; $k += $this->_base) {
+ $delta = (int) ($delta / ($this->_base - $this->_tmin));
+ }
+
+ return (int) ($k + ($this->_base - $this->_tmin + 1) * $delta / ($delta + $this->_skew));
+ }
+
+ /**
+ * Encoding a certain digit.
+ *
+ * @access private
+ */
+ private function _encodeDigit($d)
+ {
+ return chr($d + 22 + 75 * ($d < 26));
+ }
+
+ /**
+ * Decode a certain digit.
+ *
+ * @access private
+ */
+ private function _decodeDigit($cp)
+ {
+ $cp = ord($cp);
+ return ($cp - 48 < 10)? $cp - 22 : (($cp - 65 < 26)? $cp - 65 : (($cp - 97 < 26)? $cp - 97 : $this->_base));
+ }
+
+ /**
+ * Do Nameprep according to RFC3491 and RFC3454.
+ *
+ * @param array $input Unicode Characters
+ * @return string Unicode Characters, Nameprep'd
+ * @throws Exception
+ * @access private
+ */
+ private function _nameprep($input)
+ {
+ $output = array();
+
+ // Walking through the input array, performing the required steps on each of
+ // the input chars and putting the result into the output array
+ // While mapping required chars we apply the cannonical ordering
+
+ foreach ($input as $v) {
+ // Map to nothing == skip that code point
+ if (in_array($v, self::$_np_map_nothing)) {
+ continue;
+ }
+
+ // Try to find prohibited input
+ if (in_array($v, self::$_np_prohibit) || in_array($v, self::$_general_prohibited)) {
+ throw new Exception('NAMEPREP: Prohibited input U+' . sprintf('%08X', $v));
+ }
+
+ foreach (self::$_np_prohibit_ranges as $range) {
+ if ($range[0] <= $v && $v <= $range[1]) {
+ throw new Exception('NAMEPREP: Prohibited input U+' . sprintf('%08X', $v));
+ }
+ }
+
+ // Hangul syllable decomposition
+ if (0xAC00 <= $v && $v <= 0xD7AF) {
+ foreach ($this->_hangulDecompose($v) as $out) {
+ $output[] = $out;
+ }
+ } else if (isset(self::$_np_replacemaps[$v])) { // There's a decomposition mapping for that code point
+ foreach ($this->_applyCannonicalOrdering(self::$_np_replacemaps[$v]) as $out) {
+ $output[] = $out;
+ }
+ } else {
+ $output[] = $v;
+ }
+ }
+
+ // Combine code points
+
+ $last_class = 0;
+ $last_starter = 0;
+ $out_len = count($output);
+
+ for ($i = 0; $i < $out_len; ++$i) {
+ $class = $this->_getCombiningClass($output[$i]);
+
+ if ((!$last_class || $last_class != $class) && $class) {
+ // Try to match
+ $seq_len = $i - $last_starter;
+ $out = $this->_combine(array_slice($output, $last_starter, $seq_len));
+
+ // On match: Replace the last starter with the composed character and remove
+ // the now redundant non-starter(s)
+ if ($out) {
+ $output[$last_starter] = $out;
+
+ if (count($out) != $seq_len) {
+ for ($j = $i + 1; $j < $out_len; ++$j) {
+ $output[$j - 1] = $output[$j];
+ }
+
+ unset($output[$out_len]);
+ }
+
+ // Rewind the for loop by one, since there can be more possible compositions
+ $i--;
+ $out_len--;
+ $last_class = ($i == $last_starter)? 0 : $this->_getCombiningClass($output[$i - 1]);
+
+ continue;
+ }
+ }
+
+ // The current class is 0
+ if (!$class) {
+ $last_starter = $i;
+ }
+
+ $last_class = $class;
+ }
+
+ return $output;
+ }
+
+ /**
+ * Decomposes a Hangul syllable
+ * (see http://www.unicode.org/unicode/reports/tr15/#Hangul).
+ *
+ * @param integer $char 32bit UCS4 code point
+ * @return array Either Hangul Syllable decomposed or original 32bit
+ * value as one value array
+ * @access private
+ */
+ private function _hangulDecompose($char)
+ {
+ $sindex = $char - $this->_sbase;
+
+ if ($sindex < 0 || $sindex >= $this->_scount) {
+ return array($char);
+ }
+
+ $result = array();
+ $T = $this->_tbase + $sindex % $this->_tcount;
+ $result[] = (int)($this->_lbase + $sindex / $this->_ncount);
+ $result[] = (int)($this->_vbase + ($sindex % $this->_ncount) / $this->_tcount);
+
+ if ($T != $this->_tbase) {
+ $result[] = $T;
+ }
+
+ return $result;
+ }
+
+ /**
+ * Ccomposes a Hangul syllable
+ * (see http://www.unicode.org/unicode/reports/tr15/#Hangul).
+ *
+ * @param array $input Decomposed UCS4 sequence
+ * @return array UCS4 sequence with syllables composed
+ * @access private
+ */
+ private function _hangulCompose($input)
+ {
+ $inp_len = count($input);
+
+ if (!$inp_len) {
+ return array();
+ }
+
+ $result = array();
+ $last = $input[0];
+ $result[] = $last; // copy first char from input to output
+
+ for ($i = 1; $i < $inp_len; ++$i) {
+ $char = $input[$i];
+
+ // Find out, wether two current characters from L and V
+ $lindex = $last - $this->_lbase;
+
+ if (0 <= $lindex && $lindex < $this->_lcount) {
+ $vindex = $char - $this->_vbase;
+
+ if (0 <= $vindex && $vindex < $this->_vcount) {
+ // create syllable of form LV
+ $last = ($this->_sbase + ($lindex * $this->_vcount + $vindex) * $this->_tcount);
+ $out_off = count($result) - 1;
+ $result[$out_off] = $last; // reset last
+
+ // discard char
+ continue;
+ }
+ }
+
+ // Find out, wether two current characters are LV and T
+ $sindex = $last - $this->_sbase;
+
+ if (0 <= $sindex && $sindex < $this->_scount && ($sindex % $this->_tcount) == 0) {
+ $tindex = $char - $this->_tbase;
+
+ if (0 <= $tindex && $tindex <= $this->_tcount) {
+ // create syllable of form LVT
+ $last += $tindex;
+ $out_off = count($result) - 1;
+ $result[$out_off] = $last; // reset last
+
+ // discard char
+ continue;
+ }
+ }
+
+ // if neither case was true, just add the character
+ $last = $char;
+ $result[] = $char;
+ }
+
+ return $result;
+ }
+
+ /**
+ * Returns the combining class of a certain wide char.
+ *
+ * @param integer $char Wide char to check (32bit integer)
+ * @return integer Combining class if found, else 0
+ * @access private
+ */
+ private function _getCombiningClass($char)
+ {
+ return isset(self::$_np_norm_combcls[$char])? self::$_np_norm_combcls[$char] : 0;
+ }
+
+ /**
+ * Apllies the cannonical ordering of a decomposed UCS4 sequence.
+ *
+ * @param array $input Decomposed UCS4 sequence
+ * @return array Ordered USC4 sequence
+ * @access private
+ */
+ private function _applyCannonicalOrdering($input)
+ {
+ $swap = true;
+ $size = count($input);
+
+ while ($swap) {
+ $swap = false;
+ $last = $this->_getCombiningClass($input[0]);
+
+ for ($i = 0; $i < $size - 1; ++$i) {
+ $next = $this->_getCombiningClass($input[$i + 1]);
+
+ if ($next != 0 && $last > $next) {
+ // Move item leftward until it fits
+ for ($j = $i + 1; $j > 0; --$j) {
+ if ($this->_getCombiningClass($input[$j - 1]) <= $next) {
+ break;
+ }
+
+ $t = $input[$j];
+ $input[$j] = $input[$j - 1];
+ $input[$j - 1] = $t;
+ $swap = 1;
+ }
+
+ // Reentering the loop looking at the old character again
+ $next = $last;
+ }
+
+ $last = $next;
+ }
+ }
+
+ return $input;
+ }
+
+ /**
+ * Do composition of a sequence of starter and non-starter.
+ *
+ * @param array $input UCS4 Decomposed sequence
+ * @return array Ordered USC4 sequence
+ * @access private
+ */
+ private function _combine($input)
+ {
+ $inp_len = count($input);
+
+ // Is it a Hangul syllable?
+ if (1 != $inp_len) {
+ $hangul = $this->_hangulCompose($input);
+
+ // This place is probably wrong
+ if (count($hangul) != $inp_len) {
+ return $hangul;
+ }
+ }
+
+ foreach (self::$_np_replacemaps as $np_src => $np_target) {
+ if ($np_target[0] != $input[0]) {
+ continue;
+ }
+
+ if (count($np_target) != $inp_len) {
+ continue;
+ }
+
+ $hit = false;
+
+ foreach ($input as $k2 => $v2) {
+ if ($v2 == $np_target[$k2]) {
+ $hit = true;
+ } else {
+ $hit = false;
+ break;
+ }
+ }
+
+ if ($hit) {
+ return $np_src;
+ }
+ }
+
+ return false;
+ }
+
+ /**
+ * This converts an UTF-8 encoded string to its UCS-4 (array) representation
+ * By talking about UCS-4 we mean arrays of 32bit integers representing
+ * each of the "chars". This is due to PHP not being able to handle strings with
+ * bit depth different from 8. This applies to the reverse method _ucs4_to_utf8(), too.
+ * The following UTF-8 encodings are supported:
+ *
+ * bytes bits representation
+ * 1 7 0xxxxxxx
+ * 2 11 110xxxxx 10xxxxxx
+ * 3 16 1110xxxx 10xxxxxx 10xxxxxx
+ * 4 21 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
+ * 5 26 111110xx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx
+ * 6 31 1111110x 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx
+ *
+ * Each x represents a bit that can be used to store character data.
+ *
+ * @access private
+ */
+ private function _utf8_to_ucs4($input)
+ {
+ $output = array();
+ $out_len = 0;
+ $inp_len = self::_byteLength($input, '8bit');
+ $mode = 'next';
+ $test = 'none';
+ for ($k = 0; $k < $inp_len; ++$k) {
+ $v = ord($input{$k}); // Extract byte from input string
+
+ if ($v < 128) { // We found an ASCII char - put into stirng as is
+ $output[$out_len] = $v;
+ ++$out_len;
+ if ('add' == $mode) {
+ throw new Exception('Conversion from UTF-8 to UCS-4 failed: malformed input at byte '.$k);
+ return false;
+ }
+ continue;
+ }
+ if ('next' == $mode) { // Try to find the next start byte; determine the width of the Unicode char
+ $start_byte = $v;
+ $mode = 'add';
+ $test = 'range';
+ if ($v >> 5 == 6) { // &110xxxxx 10xxxxx
+ $next_byte = 0; // Tells, how many times subsequent bitmasks must rotate 6bits to the left
+ $v = ($v - 192) << 6;
+ } elseif ($v >> 4 == 14) { // &1110xxxx 10xxxxxx 10xxxxxx
+ $next_byte = 1;
+ $v = ($v - 224) << 12;
+ } elseif ($v >> 3 == 30) { // &11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
+ $next_byte = 2;
+ $v = ($v - 240) << 18;
+ } elseif ($v >> 2 == 62) { // &111110xx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx
+ $next_byte = 3;
+ $v = ($v - 248) << 24;
+ } elseif ($v >> 1 == 126) { // &1111110x 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx
+ $next_byte = 4;
+ $v = ($v - 252) << 30;
+ } else {
+ throw new Exception('This might be UTF-8, but I don\'t understand it at byte '.$k);
+ return false;
+ }
+ if ('add' == $mode) {
+ $output[$out_len] = (int) $v;
+ ++$out_len;
+ continue;
+ }
+ }
+ if ('add' == $mode) {
+ if (!$this->_allow_overlong && $test == 'range') {
+ $test = 'none';
+ if (($v < 0xA0 && $start_byte == 0xE0) || ($v < 0x90 && $start_byte == 0xF0) || ($v > 0x8F && $start_byte == 0xF4)) {
+ throw new Exception('Bogus UTF-8 character detected (out of legal range) at byte '.$k);
+ return false;
+ }
+ }
+ if ($v >> 6 == 2) { // Bit mask must be 10xxxxxx
+ $v = ($v - 128) << ($next_byte * 6);
+ $output[($out_len - 1)] += $v;
+ --$next_byte;
+ } else {
+ throw new Exception('Conversion from UTF-8 to UCS-4 failed: malformed input at byte '.$k);
+ return false;
+ }
+ if ($next_byte < 0) {
+ $mode = 'next';
+ }
+ }
+ } // for
+ return $output;
+ }
+
+ /**
+ * Convert UCS-4 array into UTF-8 string.
+ *
+ * @throws Exception
+ * @access private
+ */
+ private function _ucs4_to_utf8($input)
+ {
+ $output = '';
+
+ foreach ($input as $v) {
+ // $v = ord($v);
+
+ if ($v < 128) {
+ // 7bit are transferred literally
+ $output .= chr($v);
+ } else if ($v < 1 << 11) {
+ // 2 bytes
+ $output .= chr(192 + ($v >> 6))
+ . chr(128 + ($v & 63));
+ } else if ($v < 1 << 16) {
+ // 3 bytes
+ $output .= chr(224 + ($v >> 12))
+ . chr(128 + (($v >> 6) & 63))
+ . chr(128 + ($v & 63));
+ } else if ($v < 1 << 21) {
+ // 4 bytes
+ $output .= chr(240 + ($v >> 18))
+ . chr(128 + (($v >> 12) & 63))
+ . chr(128 + (($v >> 6) & 63))
+ . chr(128 + ($v & 63));
+ } else if ($v < 1 << 26) {
+ // 5 bytes
+ $output .= chr(248 + ($v >> 24))
+ . chr(128 + (($v >> 18) & 63))
+ . chr(128 + (($v >> 12) & 63))
+ . chr(128 + (($v >> 6) & 63))
+ . chr(128 + ($v & 63));
+ } else if ($v < 1 << 31) {
+ // 6 bytes
+ $output .= chr(252 + ($v >> 30))
+ . chr(128 + (($v >> 24) & 63))
+ . chr(128 + (($v >> 18) & 63))
+ . chr(128 + (($v >> 12) & 63))
+ . chr(128 + (($v >> 6) & 63))
+ . chr(128 + ($v & 63));
+ } else {
+ throw new Exception('Conversion from UCS-4 to UTF-8 failed: malformed input at byte ' . $k);
+ }
+ }
+
+ return $output;
+ }
+
+ /**
+ * Convert UCS-4 array into UCS-4 string
+ *
+ * @throws Exception
+ * @access private
+ */
+ private function _ucs4_to_ucs4_string($input)
+ {
+ $output = '';
+ // Take array values and split output to 4 bytes per value
+ // The bit mask is 255, which reads &11111111
+ foreach ($input as $v) {
+ $output .= ($v & (255 << 24) >> 24) . ($v & (255 << 16) >> 16) . ($v & (255 << 8) >> 8) . ($v & 255);
+ }
+ return $output;
+ }
+
+ /**
+ * Convert UCS-4 strin into UCS-4 garray
+ *
+ * @throws Exception
+ * @access private
+ */
+ private function _ucs4_string_to_ucs4($input)
+ {
+ $output = array();
+
+ $inp_len = self::_byteLength($input);
+ // Input length must be dividable by 4
+ if ($inp_len % 4) {
+ throw new Exception('Input UCS4 string is broken');
+ return false;
+ }
+
+ // Empty input - return empty output
+ if (!$inp_len) return $output;
+
+ for ($i = 0, $out_len = -1; $i < $inp_len; ++$i) {
+ // Increment output position every 4 input bytes
+ if (!$i % 4) {
+ $out_len++;
+ $output[$out_len] = 0;
+ }
+ $output[$out_len] += ord($input{$i}) << (8 * (3 - ($i % 4) ) );
+ }
+ return $output;
+ }
+
+ /**
+ * Echo hex representation of UCS4 sequence.
+ *
+ * @param array $input UCS4 sequence
+ * @param boolean $include_bit Include bitmask in output
+ * @return void
+ * @static
+ * @access private
+ */
+ private static function _showHex($input, $include_bit = false)
+ {
+ foreach ($input as $k => $v) {
+ echo '[', $k, '] => ', sprintf('%X', $v);
+
+ if ($include_bit) {
+ echo ' (', Net_IDNA::_showBitmask($v), ')';
+ }
+
+ echo "\n";
+ }
+ }
+
+ /**
+ * Gives you a bit representation of given Byte (8 bits), Word (16 bits) or DWord (32 bits)
+ * Output width is automagically determined
+ *
+ * @static
+ * @access private
+ */
+ private static function _showBitmask($octet)
+ {
+ if ($octet >= (1 << 16)) {
+ $w = 31;
+ } else if ($octet >= (1 << 8)) {
+ $w = 15;
+ } else {
+ $w = 7;
+ }
+
+ $return = '';
+
+ for ($i = $w; $i > -1; $i--) {
+ $return .= ($octet & (1 << $i))? 1 : '0';
+ }
+
+ return $return;
+ }
+
+ /**
+ * Gets the length of a string in bytes even if mbstring function
+ * overloading is turned on
+ *
+ * @param string $string the string for which to get the length.
+ *
+ * @return integer the length of the string in bytes.
+ *
+ * @see Net_IDNA_php5::$_mb_string_overload
+ */
+ private static function _byteLength($string)
+ {
+ if (self::$_mb_string_overload) {
+ return mb_strlen($string, '8bit');
+ }
+ return strlen((binary)$string);
+ }
+
+ // }}}}
+}
+
+?>
diff --git a/index.php b/index.php
index ea5c80277..6bfbc11da 100644
--- a/index.php
+++ b/index.php
@@ -185,7 +185,7 @@ function checkMirror($action_obj, $args)
function isLoginAction($action)
{
- static $loginActions = array('login', 'recoverpassword', 'api', 'doc', 'register', 'publicxrds', 'otp');
+ static $loginActions = array('login', 'recoverpassword', 'api', 'doc', 'register', 'publicxrds', 'otp', 'opensearch');
$login = null;
diff --git a/install.php b/install.php
index 9a7e27fa2..8a299f897 100644
--- a/install.php
+++ b/install.php
@@ -904,7 +904,7 @@ function registerInitialUser($nickname, $password, $email, $adminUpdates)
if (class_exists('Ostatus_profile') && $adminUpdates) {
try {
- $oprofile = Ostatus_profile::ensureProfile('http://update.status.net/');
+ $oprofile = Ostatus_profile::ensureProfileURL('http://update.status.net/');
Subscription::start($user->getProfile(), $oprofile->localProfile());
updateStatus("Set up subscription to <a href='http://update.status.net/'>update@status.net</a>.");
} catch (Exception $e) {
diff --git a/lib/authorizationplugin.php b/lib/authorizationplugin.php
index 07da9b2d1..3790bccf4 100644
--- a/lib/authorizationplugin.php
+++ b/lib/authorizationplugin.php
@@ -67,7 +67,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 +84,7 @@ abstract class AuthorizationPlugin extends Plugin
}
}
- function onStartSetApiUser(&$user) {
+ function onStartSetApiUser($user) {
return $this->onStartSetUser($user);
}
diff --git a/lib/default.php b/lib/default.php
index ffeab70b3..fa4ece10a 100644
--- a/lib/default.php
+++ b/lib/default.php
@@ -72,6 +72,7 @@ $default =
'quote_identifiers' => false,
'type' => 'mysql',
'schemacheck' => 'runtime', // 'runtime' or 'script'
+ 'annotate_queries' => false, // true to add caller comments to queries, eg /* POST Notice::saveNew */
'log_queries' => false, // true to log all DB queries
'log_slow_queries' => 0), // if set, log queries taking over N seconds
'syslog' =>
@@ -87,6 +88,8 @@ $default =
'stomp_username' => null,
'stomp_password' => null,
'stomp_persistent' => true, // keep items across queue server restart, if persistence is enabled
+ 'stomp_transactions' => true, // use STOMP transactions to aid in detecting failures (supported by ActiveMQ, but not by all)
+ 'stomp_acks' => true, // send acknowledgements after successful processing (supported by ActiveMQ, but not by all)
'stomp_manual_failover' => true, // if multiple servers are listed, treat them as separate (enqueue on one randomly, listen on all)
'monitor' => null, // URL to monitor ping endpoint (work in progress)
'softlimit' => '90%', // total size or % of memory_limit at which to restart queue threads gracefully
diff --git a/lib/httpclient.php b/lib/httpclient.php
index 64a51353c..384626ae0 100644
--- a/lib/httpclient.php
+++ b/lib/httpclient.php
@@ -43,6 +43,9 @@ require_once 'HTTP/Request2/Response.php';
*
* This extends the HTTP_Request2_Response class with methods to get info
* about any followed redirects.
+ *
+ * Originally used the name 'HTTPResponse' to match earlier code, but
+ * this conflicts with a class in in the PECL HTTP extension.
*
* @category HTTP
* @package StatusNet
@@ -51,7 +54,7 @@ require_once 'HTTP/Request2/Response.php';
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*/
-class HTTPResponse extends HTTP_Request2_Response
+class StatusNet_HTTPResponse extends HTTP_Request2_Response
{
function __construct(HTTP_Request2_Response $response, $url, $redirects=0)
{
@@ -146,7 +149,7 @@ class HTTPClient extends HTTP_Request2
/**
* Convenience function to run a GET request.
*
- * @return HTTPResponse
+ * @return StatusNet_HTTPResponse
* @throws HTTP_Request2_Exception
*/
public function get($url, $headers=array())
@@ -157,7 +160,7 @@ class HTTPClient extends HTTP_Request2
/**
* Convenience function to run a HEAD request.
*
- * @return HTTPResponse
+ * @return StatusNet_HTTPResponse
* @throws HTTP_Request2_Exception
*/
public function head($url, $headers=array())
@@ -171,7 +174,7 @@ class HTTPClient extends HTTP_Request2
* @param string $url
* @param array $headers optional associative array of HTTP headers
* @param array $data optional associative array or blob of form data to submit
- * @return HTTPResponse
+ * @return StatusNet_HTTPResponse
* @throws HTTP_Request2_Exception
*/
public function post($url, $headers=array(), $data=array())
@@ -183,7 +186,7 @@ class HTTPClient extends HTTP_Request2
}
/**
- * @return HTTPResponse
+ * @return StatusNet_HTTPResponse
* @throws HTTP_Request2_Exception
*/
protected function doRequest($url, $method, $headers)
@@ -217,12 +220,12 @@ class HTTPClient extends HTTP_Request2
}
/**
- * Actually performs the HTTP request and returns an HTTPResponse object
- * with response body and header info.
+ * Actually performs the HTTP request and returns a
+ * StatusNet_HTTPResponse object with response body and header info.
*
* Wraps around parent send() to add logging and redirection processing.
*
- * @return HTTPResponse
+ * @return StatusNet_HTTPResponse
* @throw HTTP_Request2_Exception
*/
public function send()
@@ -265,6 +268,6 @@ class HTTPClient extends HTTP_Request2
}
break;
} while ($maxRedirs);
- return new HTTPResponse($response, $this->getUrl(), $redirs);
+ return new StatusNet_HTTPResponse($response, $this->getUrl(), $redirs);
}
}
diff --git a/lib/jabber.php b/lib/jabber.php
index db4e2e9a7..cdcfc4423 100644
--- a/lib/jabber.php
+++ b/lib/jabber.php
@@ -34,39 +34,198 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
require_once 'XMPPHP/XMPP.php';
/**
- * checks whether a string is a syntactically valid Jabber ID (JID)
+ * Splits a Jabber ID (JID) into node, domain, and resource portions.
+ *
+ * Based on validation routine submitted by:
+ * @copyright 2009 Patrick Georgi <patrick@georgi-clan.de>
+ * @license Licensed under ISC-L, which is compatible with everything else that keeps the copyright notice intact.
*
* @param string $jid string to check
*
+ * @return array with "node", "domain", and "resource" indices
+ * @throws Exception if input is not valid
+ */
+
+function jabber_split_jid($jid)
+{
+ $chars = '';
+ /* the following definitions come from stringprep, Appendix C,
+ which is used in its entirety by nodeprop, Chapter 5, "Prohibited Output" */
+ /* C1.1 ASCII space characters */
+ $chars .= "\x{20}";
+ /* C1.2 Non-ASCII space characters */
+ $chars .= "\x{a0}\x{1680}\x{2000}-\x{200b}\x{202f}\x{205f}\x{3000a}";
+ /* C2.1 ASCII control characters */
+ $chars .= "\x{00}-\x{1f}\x{7f}";
+ /* C2.2 Non-ASCII control characters */
+ $chars .= "\x{80}-\x{9f}\x{6dd}\x{70f}\x{180e}\x{200c}\x{200d}\x{2028}\x{2029}\x{2060}-\x{2063}\x{206a}-\x{206f}\x{feff}\x{fff9}-\x{fffc}\x{1d173}-\x{1d17a}";
+ /* C3 - Private Use */
+ $chars .= "\x{e000}-\x{f8ff}\x{f0000}-\x{ffffd}\x{100000}-\x{10fffd}";
+ /* C4 - Non-character code points */
+ $chars .= "\x{fdd0}-\x{fdef}\x{fffe}\x{ffff}\x{1fffe}\x{1ffff}\x{2fffe}\x{2ffff}\x{3fffe}\x{3ffff}\x{4fffe}\x{4ffff}\x{5fffe}\x{5ffff}\x{6fffe}\x{6ffff}\x{7fffe}\x{7ffff}\x{8fffe}\x{8ffff}\x{9fffe}\x{9ffff}\x{afffe}\x{affff}\x{bfffe}\x{bffff}\x{cfffe}\x{cffff}\x{dfffe}\x{dffff}\x{efffe}\x{effff}\x{ffffe}\x{fffff}\x{10fffe}\x{10ffff}";
+ /* C5 - Surrogate codes */
+ $chars .= "\x{d800}-\x{dfff}";
+ /* C6 - Inappropriate for plain text */
+ $chars .= "\x{fff9}-\x{fffd}";
+ /* C7 - Inappropriate for canonical representation */
+ $chars .= "\x{2ff0}-\x{2ffb}";
+ /* C8 - Change display properties or are deprecated */
+ $chars .= "\x{340}\x{341}\x{200e}\x{200f}\x{202a}-\x{202e}\x{206a}-\x{206f}";
+ /* C9 - Tagging characters */
+ $chars .= "\x{e0001}\x{e0020}-\x{e007f}";
+
+ /* Nodeprep forbids some more characters */
+ $nodeprepchars = $chars;
+ $nodeprepchars .= "\x{22}\x{26}\x{27}\x{2f}\x{3a}\x{3c}\x{3e}\x{40}";
+
+ $parts = explode("/", $jid, 2);
+ if (count($parts) > 1) {
+ $resource = $parts[1];
+ if ($resource == '') {
+ // Warning: empty resource isn't legit.
+ // But if we're normalizing, we may as well take it...
+ }
+ } else {
+ $resource = null;
+ }
+
+ $node = explode("@", $parts[0]);
+ if ((count($node) > 2) || (count($node) == 0)) {
+ throw new Exception("Invalid JID: too many @s");
+ } else if (count($node) == 1) {
+ $domain = $node[0];
+ $node = null;
+ } else {
+ $domain = $node[1];
+ $node = $node[0];
+ if ($node == '') {
+ throw new Exception("Invalid JID: @ but no node");
+ }
+ }
+
+ // Length limits per http://xmpp.org/rfcs/rfc3920.html#addressing
+ if ($node !== null) {
+ if (strlen($node) > 1023) {
+ throw new Exception("Invalid JID: node too long.");
+ }
+ if (preg_match("/[".$nodeprepchars."]/u", $node)) {
+ throw new Exception("Invalid JID node '$node'");
+ }
+ }
+
+ if (strlen($domain) > 1023) {
+ throw new Exception("Invalid JID: domain too long.");
+ }
+ if (!common_valid_domain($domain)) {
+ throw new Exception("Invalid JID domain name '$domain'");
+ }
+
+ if ($resource !== null) {
+ if (strlen($resource) > 1023) {
+ throw new Exception("Invalid JID: resource too long.");
+ }
+ if (preg_match("/[".$chars."]/u", $resource)) {
+ throw new Exception("Invalid JID resource '$resource'");
+ }
+ }
+
+ return array('node' => is_null($node) ? null : mb_strtolower($node),
+ 'domain' => is_null($domain) ? null : mb_strtolower($domain),
+ 'resource' => $resource);
+}
+
+/**
+ * Checks whether a string is a syntactically valid Jabber ID (JID),
+ * either with or without a resource.
+ *
+ * Note that a bare domain can be a valid JID.
+ *
+ * @param string $jid string to check
+ * @param bool $check_domain whether we should validate that domain...
+ *
* @return boolean whether the string is a valid JID
*/
+function jabber_valid_full_jid($jid, $check_domain=false)
+{
+ try {
+ $parts = jabber_split_jid($jid);
+ if ($check_domain) {
+ if (!jabber_check_domain($parts['domain'])) {
+ return false;
+ }
+ }
+ return $parts['resource'] !== ''; // missing or present; empty ain't kosher
+ } catch (Exception $e) {
+ return false;
+ }
+}
-function jabber_valid_base_jid($jid)
+/**
+ * Checks whether a string is a syntactically valid base Jabber ID (JID).
+ * A base JID won't include a resource specifier on the end; since we
+ * take it off when reading input we can't really use them reliably
+ * to direct outgoing messages yet (sorry guys!)
+ *
+ * Note that a bare domain can be a valid JID.
+ *
+ * @param string $jid string to check
+ * @param bool $check_domain whether we should validate that domain...
+ *
+ * @return boolean whether the string is a valid JID
+ */
+function jabber_valid_base_jid($jid, $check_domain=false)
{
- // Cheap but effective
- return Validate::email($jid);
+ try {
+ $parts = jabber_split_jid($jid);
+ if ($check_domain) {
+ if (!jabber_check_domain($parts['domain'])) {
+ return false;
+ }
+ }
+ return ($parts['resource'] === null); // missing; empty ain't kosher
+ } catch (Exception $e) {
+ return false;
+ }
}
/**
- * normalizes a Jabber ID for comparison
+ * Normalizes a Jabber ID for comparison, dropping the resource component if any.
*
* @param string $jid JID to check
+ * @param bool $check_domain if true, reject if the domain isn't findable
*
* @return string an equivalent JID in normalized (lowercase) form
*/
function jabber_normalize_jid($jid)
{
- if (preg_match("/(?:([^\@]+)\@)?([^\/]+)(?:\/(.*))?$/", $jid, $matches)) {
- $node = $matches[1];
- $server = $matches[2];
- return strtolower($node.'@'.$server);
- } else {
+ try {
+ $parts = jabber_split_jid($jid);
+ if ($parts['node'] !== null) {
+ return $parts['node'] . '@' . $parts['domain'];
+ } else {
+ return $parts['domain'];
+ }
+ } catch (Exception $e) {
return null;
}
}
/**
+ * Check if this domain's got some legit DNS record
+ */
+function jabber_check_domain($domain)
+{
+ if (checkdnsrr("_xmpp-server._tcp." . $domain, "SRV")) {
+ return true;
+ }
+ if (checkdnsrr($domain, "ANY")) {
+ return true;
+ }
+ return false;
+}
+
+/**
* the JID of the Jabber daemon for this StatusNet instance
*
* @return string JID of the Jabber daemon
diff --git a/lib/language.php b/lib/language.php
index 64b59e739..6fb6222a1 100644
--- a/lib/language.php
+++ b/lib/language.php
@@ -202,16 +202,19 @@ 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, '/');
}
- $cut = strpos($path, '/plugins/') + 9;
- $cut2 = strpos($path, '/', $cut);
- if ($cut && $cut2) {
- $cached[$path] = substr($path, $cut, $cut2 - $cut);
- } else {
- return null;
+ $cut = strpos($path, '/plugins/');
+ if ($cut) {
+ $cut += strlen('/plugins/');
+ $cut2 = strpos($path, '/', $cut);
+ if ($cut && $cut2) {
+ $final = substr($path, $cut, $cut2 - $cut);
+ }
}
+ $cached[$path] = $final;
}
return $cached[$path];
}
@@ -286,6 +289,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'),
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/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/stompqueuemanager.php b/lib/stompqueuemanager.php
index 9af8b2f48..5d5c7ccfb 100644
--- a/lib/stompqueuemanager.php
+++ b/lib/stompqueuemanager.php
@@ -39,7 +39,8 @@ class StompQueueManager extends QueueManager
protected $base;
protected $control;
- protected $useTransactions = true;
+ protected $useTransactions;
+ protected $useAcks;
protected $sites = array();
protected $subscriptions = array();
@@ -59,11 +60,13 @@ class StompQueueManager extends QueueManager
} else {
$this->servers = array($server);
}
- $this->username = common_config('queue', 'stomp_username');
- $this->password = common_config('queue', 'stomp_password');
- $this->base = common_config('queue', 'queue_basename');
- $this->control = common_config('queue', 'control_channel');
- $this->breakout = common_config('queue', 'breakout');
+ $this->username = common_config('queue', 'stomp_username');
+ $this->password = common_config('queue', 'stomp_password');
+ $this->base = common_config('queue', 'queue_basename');
+ $this->control = common_config('queue', 'control_channel');
+ $this->breakout = common_config('queue', 'breakout');
+ $this->useTransactions = common_config('queue', 'stomp_transactions');
+ $this->useAcks = common_config('queue', 'stomp_acks');
}
/**
@@ -703,13 +706,15 @@ class StompQueueManager extends QueueManager
protected function ack($idx, $frame)
{
- if ($this->useTransactions) {
- if (empty($this->transaction[$idx])) {
- throw new Exception("Tried to ack but not in a transaction");
+ if ($this->useAcks) {
+ if ($this->useTransactions) {
+ if (empty($this->transaction[$idx])) {
+ throw new Exception("Tried to ack but not in a transaction");
+ }
+ $this->cons[$idx]->ack($frame, $this->transaction[$idx]);
+ } else {
+ $this->cons[$idx]->ack($frame);
}
- $this->cons[$idx]->ack($frame, $this->transaction[$idx]);
- } else {
- $this->cons[$idx]->ack($frame);
}
}
diff --git a/lib/util.php b/lib/util.php
index 795997868..ec1f86703 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -803,7 +803,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;
@@ -1397,6 +1397,55 @@ function common_valid_tag($tag)
return false;
}
+/**
+ * Determine if given domain or address literal is valid
+ * eg for use in JIDs and URLs. Does not check if the domain
+ * exists!
+ *
+ * @param string $domain
+ * @return boolean valid or not
+ */
+function common_valid_domain($domain)
+{
+ $octet = "(?:25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9][0-9]|[0-9])";
+ $ipv4 = "(?:$octet(?:\.$octet){3})";
+ if (preg_match("/^$ipv4$/u", $domain)) return true;
+
+ $group = "(?:[0-9a-f]{1,4})";
+ $ipv6 = "(?:\[($group(?::$group){0,7})?(::)?($group(?::$group){0,7})?\])"; // http://tools.ietf.org/html/rfc3513#section-2.2
+
+ if (preg_match("/^$ipv6$/ui", $domain, $matches)) {
+ $before = explode(":", $matches[1]);
+ $zeroes = $matches[2];
+ $after = explode(":", $matches[3]);
+ if ($zeroes) {
+ $min = 0;
+ $max = 7;
+ } else {
+ $min = 1;
+ $max = 8;
+ }
+ $explicit = count($before) + count($after);
+ if ($explicit < $min || $explicit > $max) {
+ return false;
+ }
+ return true;
+ }
+
+ try {
+ require_once "Net/IDNA.php";
+ $idn = Net_IDNA::getInstance();
+ $domain = $idn->encode($domain);
+ } catch (Exception $e) {
+ return false;
+ }
+
+ $subdomain = "(?:[a-z0-9][a-z0-9-]*)"; // @fixme
+ $fqdn = "(?:$subdomain(?:\.$subdomain)*\.?)";
+
+ return preg_match("/^$fqdn$/ui", $domain);
+}
+
/* Following functions are copied from MediaWiki GlobalFunctions.php
* and written by Evan Prodromou. */
diff --git a/locale/af/LC_MESSAGES/statusnet.po b/locale/af/LC_MESSAGES/statusnet.po
new file mode 100644
index 000000000..67d6af42d
--- /dev/null
+++ b/locale/af/LC_MESSAGES/statusnet.po
@@ -0,0 +1,6116 @@
+# Translation of StatusNet to Afrikaans
+#
+# Author@translatewiki.net: Naudefj
+# --
+# 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-04-06 22:53+0000\n"
+"PO-Revision-Date: 2010-04-06 23:05:47+0000\n"
+"Language-Team: Afrikaans\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: MediaWiki 1.17alpha (r64665); Translate extension (2010-01-16)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: af\n"
+"X-Message-Group: out-statusnet\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Page title
+#. TRANS: Menu item for site administration
+#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:374
+msgid "Access"
+msgstr "Toegang"
+
+#. TRANS: Page notice
+#: actions/accessadminpanel.php:67
+msgid "Site access settings"
+msgstr "Instellings vir toegang tot webwerf"
+
+#. TRANS: Form legend for registration form.
+#: actions/accessadminpanel.php:161
+msgid "Registration"
+msgstr "Registratie"
+
+#. TRANS: Checkbox instructions for admin setting "Private"
+#: actions/accessadminpanel.php:165
+msgid "Prohibit anonymous users (not logged in) from viewing site?"
+msgstr "Mag anonieme gebruikers (nie aangeteken nie) die webwerf besigtig?"
+
+#. TRANS: Checkbox label for prohibiting anonymous users from viewing site.
+#: actions/accessadminpanel.php:167
+msgctxt "LABEL"
+msgid "Private"
+msgstr "Geen anonieme toegang"
+
+#. TRANS: Checkbox instructions for admin setting "Invite only"
+#: actions/accessadminpanel.php:174
+msgid "Make registration invitation only."
+msgstr "Registrasie slegs op uitnodiging."
+
+#. TRANS: Checkbox label for configuring site as invite only.
+#: actions/accessadminpanel.php:176
+msgid "Invite only"
+msgstr "Slegs op uitnodiging"
+
+#. TRANS: Checkbox instructions for admin setting "Closed" (no new registrations)
+#: actions/accessadminpanel.php:183
+msgid "Disable new registrations."
+msgstr "Deaktiveer nuwe registrasies."
+
+#. TRANS: Checkbox label for disabling new user registrations.
+#: actions/accessadminpanel.php:185
+msgid "Closed"
+msgstr "Gesluit"
+
+#. TRANS: Title / tooltip for button to save access settings in site admin panel
+#: actions/accessadminpanel.php:202
+msgid "Save access settings"
+msgstr "Stoor toegangsinstellings"
+
+#: actions/accessadminpanel.php:203
+msgctxt "BUTTON"
+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/showfavorites.php:138 actions/tag.php:52
+msgid "No such page"
+msgstr "Hierdie bladsy bestaan nie"
+
+#: actions/all.php:75 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:148 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
+#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
+#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
+#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
+#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
+#: actions/otp.php:76 actions/remotesubscribe.php:145
+#: actions/remotesubscribe.php:154 actions/replies.php:73
+#: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
+#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40
+#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: lib/mailbox.php:82 lib/profileaction.php:77
+msgid "No such user."
+msgstr "Onbekende gebruiker."
+
+#. TRANS: Page title. %1$s is user nickname, %2$d is page number
+#: actions/all.php:86
+#, php-format
+msgid "%1$s and friends, page %2$d"
+msgstr "%1$s en vriende, bladsy %2$d"
+
+#. TRANS: Page title. %1$s is user nickname
+#. TRANS: H1 text. %1$s is user nickname
+#: actions/all.php:89 actions/all.php:181 actions/allrss.php:115
+#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
+#: lib/personalgroupnav.php:100
+#, php-format
+msgid "%s and friends"
+msgstr "%s en vriende"
+
+#. TRANS: %1$s is user nickname
+#: actions/all.php:103
+#, 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
+#, 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
+#, 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
+#, php-format
+msgid ""
+"This is the timeline for %s and friends but no one has posted anything yet."
+msgstr ""
+"Hierdie is die tydslyn vir %s en vriende, maar niemand het nog iets gepos "
+"nie."
+
+#: actions/all.php:139
+#, php-format
+msgid ""
+"Try subscribing to more people, [join a group](%%action.groups%%) or post "
+"something yourself."
+msgstr ""
+
+#. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@"
+#: actions/all.php:142
+#, 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
+#, php-format
+msgid ""
+"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
+"post a notice to his or her attention."
+msgstr ""
+
+#. TRANS: H1 text
+#: actions/all.php:178
+msgid "You and friends"
+msgstr "U en vriende"
+
+#: actions/allrss.php:119 actions/apitimelinefriends.php:119
+#: actions/apitimelinehome.php:120
+#, php-format
+msgid "Updates from %1$s and friends on %2$s!"
+msgstr "Opdaterings van %1$s en vriende op %2$s."
+
+#: actions/apiaccountratelimitstatus.php:70
+#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofile.php:97
+#: actions/apiaccountupdateprofilebackgroundimage.php:94
+#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
+#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100
+#: actions/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:120 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/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:174
+#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173
+#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
+#: actions/apitimelineretweetedtome.php:121
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
+#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
+msgid "API method not found."
+msgstr "Die API-funksie is nie gevind nie."
+
+#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofile.php:89
+#: actions/apiaccountupdateprofilebackgroundimage.php:86
+#: actions/apiaccountupdateprofilecolors.php:110
+#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
+#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
+#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
+#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
+#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
+#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
+msgid "This method requires a POST."
+msgstr "Hierdie metode benodig 'n POST."
+
+#: actions/apiaccountupdatedeliverydevice.php:105
+msgid ""
+"You must specify a parameter named 'device' with a value of one of: sms, im, "
+"none"
+msgstr ""
+
+#: actions/apiaccountupdatedeliverydevice.php:132
+msgid "Could not update user."
+msgstr "Kon nie die gebruiker opdateer nie."
+
+#: actions/apiaccountupdateprofile.php:112
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74
+#: actions/replies.php:80 actions/usergroups.php:98 lib/galleryaction.php:66
+#: lib/profileaction.php:84
+msgid "User has no profile."
+msgstr "Hierdie gebruiker het nie 'n profiel nie."
+
+#: actions/apiaccountupdateprofile.php:147
+msgid "Could not save profile."
+msgstr "Kon nie die profiel stoor nie."
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:108
+#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
+#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/designadminpanel.php:122 actions/editapplication.php:118
+#: actions/newapplication.php:101 actions/newnotice.php:94
+#: lib/designsettings.php:283
+#, php-format
+msgid ""
+"The server was unable to handle that much POST data (%s bytes) due to its "
+"current configuration."
+msgstr ""
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:136
+#: actions/apiaccountupdateprofilebackgroundimage.php:146
+#: actions/apiaccountupdateprofilecolors.php:164
+#: actions/apiaccountupdateprofilecolors.php:174
+#: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
+#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
+#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+msgid "Unable to save your design settings."
+msgstr "Dit was nie moontlik om u ontwerp-instellings te stoor nie."
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:187
+#: actions/apiaccountupdateprofilecolors.php:142
+msgid "Could not update your design."
+msgstr "Dit was nie moontlik om u ontwerp by te werk nie."
+
+#: actions/apiblockcreate.php:105
+msgid "You cannot block yourself!"
+msgstr "U kan nie uself blokkeer nie!"
+
+#: actions/apiblockcreate.php:126
+msgid "Block user failed."
+msgstr "Die blokkering van die gebruiker het gefaal."
+
+#: actions/apiblockdestroy.php:114
+msgid "Unblock user failed."
+msgstr "Die deblokkering van die gebruiker het gefaal."
+
+#: actions/apidirectmessage.php:89
+#, php-format
+msgid "Direct messages from %s"
+msgstr "Direkte boodskappe vanaf %s"
+
+#: actions/apidirectmessage.php:93
+#, php-format
+msgid "All the direct messages sent from %s"
+msgstr "Alle direkte boodskappe deur %s gestuur"
+
+#: actions/apidirectmessage.php:101
+#, php-format
+msgid "Direct messages to %s"
+msgstr "Direkte boodskappe aan %s"
+
+#: actions/apidirectmessage.php:105
+#, php-format
+msgid "All the direct messages sent to %s"
+msgstr "Alle direkte boodskappe gestuur aan %s"
+
+#: actions/apidirectmessagenew.php:126
+msgid "No message text!"
+msgstr "Die boodskap bevat geen inhoud nie!"
+
+#: actions/apidirectmessagenew.php:135 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
+msgid "Recipient user not found."
+msgstr "Die ontvanger kon gevind word nie."
+
+#: actions/apidirectmessagenew.php:150
+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
+msgid "No status found with that ID."
+msgstr "Geen status met die ID gevind nie."
+
+#: actions/apifavoritecreate.php:119
+msgid "This status is already a favorite."
+msgstr ""
+
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
+msgid "Could not create favorite."
+msgstr "Dit was nie moontlik om 'n gunsteling te skep nie."
+
+#: actions/apifavoritedestroy.php:122
+msgid "That status is not a favorite."
+msgstr ""
+
+#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
+msgid "Could not delete favorite."
+msgstr ""
+"Dit was nie moontlik om die boodskap van u gunstelinge te verwyder nie."
+
+#: actions/apifriendshipscreate.php:109
+msgid "Could not follow user: User not found."
+msgstr "U kan nie die gebruiker volg nie: die gebruiker bestaan nie."
+
+#: actions/apifriendshipscreate.php:118
+#, php-format
+msgid "Could not follow user: %s is already on your list."
+msgstr "U kan nie die gebruiker volg nie: %1 is alreeds op u lys."
+
+#: actions/apifriendshipsdestroy.php:109
+msgid "Could not unfollow user: User not found."
+msgstr ""
+"U kan nie die gebruiker van u volglys verwyder nie: die gebruiker bestaan "
+"nie."
+
+#: actions/apifriendshipsdestroy.php:120
+msgid "You cannot unfollow yourself."
+msgstr ""
+
+#: actions/apifriendshipsexists.php:94
+msgid "Two user ids or screen_names must be supplied."
+msgstr ""
+
+#: actions/apifriendshipsshow.php:134
+msgid "Could not determine source user."
+msgstr ""
+
+#: actions/apifriendshipsshow.php:142
+msgid "Could not find target user."
+msgstr ""
+
+#: actions/apigroupcreate.php:166 actions/editgroup.php:186
+#: actions/newgroup.php:126 actions/profilesettings.php:215
+#: actions/register.php:205
+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/newgroup.php:130 actions/profilesettings.php:238
+#: actions/register.php:208
+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/newgroup.php:133 actions/profilesettings.php:218
+#: actions/register.php:210
+msgid "Not a valid nickname."
+msgstr "Nie 'n geldige gebruikersnaam nie."
+
+#: actions/apigroupcreate.php:198 actions/editapplication.php:215
+#: actions/editgroup.php:199 actions/newapplication.php:203
+#: actions/newgroup.php:139 actions/profilesettings.php:222
+#: actions/register.php:217
+msgid "Homepage is not a valid URL."
+msgstr "Tuisblad is nie 'n geldige URL nie."
+
+#: actions/apigroupcreate.php:207 actions/editgroup.php:202
+#: actions/newgroup.php:142 actions/profilesettings.php:225
+#: actions/register.php:220
+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/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/newgroup.php:148 actions/profilesettings.php:232
+#: actions/register.php:227
+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/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/editgroup.php:228
+#: actions/newgroup.php:168
+#, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "Ongeldige alias: \"%s\""
+
+#: actions/apigroupcreate.php:275 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/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
+msgid "Group not found!"
+msgstr "Groep nie gevind nie!"
+
+#: actions/apigroupjoin.php:110 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:321
+msgid "You have been blocked from that group by the admin."
+msgstr ""
+
+#: actions/apigroupjoin.php:138 actions/joingroup.php:134
+#, php-format
+msgid "Could not join user %1$s to group %2$s."
+msgstr ""
+
+#: actions/apigroupleave.php:114
+msgid "You are not a member of this group."
+msgstr ""
+
+#: actions/apigroupleave.php:124 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
+#, 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
+#, php-format
+msgid "%1$s groups %2$s is a member of."
+msgstr ""
+
+#: actions/apigrouplistall.php:90 actions/usergroups.php:62
+#, php-format
+msgid "%s groups"
+msgstr "%s groepe"
+
+#: actions/apigrouplistall.php:94
+#, php-format
+msgid "groups on %s"
+msgstr "groepe op %s"
+
+#: actions/apioauthauthorize.php:101
+msgid "No oauth_token parameter provided."
+msgstr ""
+
+#: actions/apioauthauthorize.php:106
+msgid "Invalid token."
+msgstr ""
+
+#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
+#: actions/deletenotice.php:157 actions/disfavor.php:74
+#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54
+#: actions/groupblock.php:66 actions/grouplogo.php:312
+#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/invite.php:56 actions/login.php:115 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/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/subscribe.php:86 actions/tagother.php:166
+#: actions/unsubscribe.php:69 actions/userauthorization.php:52
+#: lib/designsettings.php:294
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+
+#: actions/apioauthauthorize.php:135
+msgid "Invalid nickname / password!"
+msgstr ""
+
+#: actions/apioauthauthorize.php:159
+msgid "Database error deleting OAuth application user."
+msgstr ""
+
+#: actions/apioauthauthorize.php:185
+msgid "Database error inserting OAuth application user."
+msgstr ""
+
+#: actions/apioauthauthorize.php:214
+#, php-format
+msgid ""
+"The request token %s has been authorized. Please exchange it for an access "
+"token."
+msgstr ""
+
+#: actions/apioauthauthorize.php:227
+#, php-format
+msgid "The request token %s has been denied and revoked."
+msgstr ""
+
+#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
+#: actions/designadminpanel.php:103 actions/editapplication.php:139
+#: actions/emailsettings.php:256 actions/grouplogo.php:322
+#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: actions/smssettings.php:248 lib/designsettings.php:304
+msgid "Unexpected form submission."
+msgstr ""
+
+#: actions/apioauthauthorize.php:259
+msgid "An application would like to connect to your account"
+msgstr ""
+
+#: actions/apioauthauthorize.php:276
+msgid "Allow or deny access"
+msgstr "Toegang toelaat of weier"
+
+#: actions/apioauthauthorize.php:292
+#, php-format
+msgid ""
+"The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
+"the ability to <strong>%3$s</strong> your %4$s account data. You should only "
+"give access to your %4$s account to third parties you trust."
+msgstr ""
+
+#: actions/apioauthauthorize.php:310 lib/action.php:437
+msgid "Account"
+msgstr "Gebruiker"
+
+#: actions/apioauthauthorize.php:313 actions/login.php:230
+#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/showgroup.php:245 actions/tagother.php:94
+#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: lib/userprofile.php:132
+msgid "Nickname"
+msgstr "Bynaam"
+
+#: actions/apioauthauthorize.php:316 actions/login.php:233
+#: actions/register.php:429 lib/accountsettingsaction.php:116
+msgid "Password"
+msgstr "Wagwoord"
+
+#: actions/apioauthauthorize.php:328
+msgid "Deny"
+msgstr "Ontsê"
+
+#: actions/apioauthauthorize.php:334
+msgid "Allow"
+msgstr "Toestaan"
+
+#: actions/apioauthauthorize.php:351
+msgid "Allow or deny access to your account information."
+msgstr ""
+
+#: actions/apistatusesdestroy.php:107
+msgid "This method requires a POST or DELETE."
+msgstr ""
+
+#: actions/apistatusesdestroy.php:130
+msgid "You may not delete another user's status."
+msgstr ""
+
+#: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72
+#: actions/deletenotice.php:52 actions/shownotice.php:92
+msgid "No such notice."
+msgstr ""
+
+#: actions/apistatusesretweet.php:83
+msgid "Cannot repeat your own notice."
+msgstr ""
+
+#: actions/apistatusesretweet.php:91
+msgid "Already repeated that notice."
+msgstr ""
+
+#: actions/apistatusesshow.php:138
+msgid "Status deleted."
+msgstr "Die status is verwyder."
+
+#: actions/apistatusesshow.php:144
+msgid "No status with that ID found."
+msgstr ""
+
+#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
+#: lib/mailhandler.php:60
+#, php-format
+msgid "That's too long. Max notice size is %d chars."
+msgstr ""
+
+#: actions/apistatusesupdate.php:202
+msgid "Not found"
+msgstr "Nie gevind nie"
+
+#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
+#, php-format
+msgid "Max notice size is %d chars, including attachment URL."
+msgstr ""
+
+#: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261
+msgid "Unsupported format."
+msgstr "Nie-ondersteunde formaat."
+
+#: actions/apitimelinefavorites.php:109
+#, php-format
+msgid "%1$s / Favorites from %2$s"
+msgstr ""
+
+#: actions/apitimelinefavorites.php:118
+#, php-format
+msgid "%1$s updates favorited by %2$s / %2$s."
+msgstr ""
+
+#: actions/apitimelinementions.php:117
+#, php-format
+msgid "%1$s / Updates mentioning %2$s"
+msgstr ""
+
+#: actions/apitimelinementions.php:130
+#, php-format
+msgid "%1$s updates that reply to updates from %2$s / %3$s."
+msgstr ""
+
+#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#, php-format
+msgid "%s public timeline"
+msgstr ""
+
+#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
+#, php-format
+msgid "%s updates from everyone!"
+msgstr ""
+
+#: actions/apitimelineretweetedtome.php:111
+#, php-format
+msgid "Repeated to %s"
+msgstr "Na %s herhaal"
+
+#: actions/apitimelineretweetsofme.php:114
+#, php-format
+msgid "Repeats of %s"
+msgstr "Herhalings van %s"
+
+#: actions/apitimelinetag.php:104 actions/tag.php:67
+#, php-format
+msgid "Notices tagged with %s"
+msgstr ""
+
+#: actions/apitimelinetag.php:106 actions/tagrss.php:65
+#, php-format
+msgid "Updates tagged with %1$s on %2$s!"
+msgstr ""
+
+#: actions/apiusershow.php:96
+msgid "Not found."
+msgstr "Nie gevind nie."
+
+#: actions/attachment.php:73
+msgid "No such attachment."
+msgstr "Die aanhangsel bestaan nie."
+
+#: actions/avatarbynickname.php:59 actions/blockedfromgroup.php:73
+#: actions/editgroup.php:84 actions/groupdesignsettings.php:84
+#: actions/grouplogo.php:86 actions/groupmembers.php:76
+#: actions/grouprss.php:91 actions/showgroup.php:121
+msgid "No nickname."
+msgstr "Geen gebruikersnaam nie."
+
+#: actions/avatarbynickname.php:64
+msgid "No size."
+msgstr "Geen grootte nie."
+
+#: actions/avatarbynickname.php:69
+msgid "Invalid size."
+msgstr "Ongeldige grootte."
+
+#: actions/avatarsettings.php:67 actions/showgroup.php:230
+#: lib/accountsettingsaction.php:112
+msgid "Avatar"
+msgstr "Avatar"
+
+#: actions/avatarsettings.php:78
+#, php-format
+msgid "You can upload your personal avatar. The maximum file size is %s."
+msgstr ""
+
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:185
+#: actions/remotesubscribe.php:191 actions/userauthorization.php:72
+#: actions/userrss.php:106
+msgid "User without matching profile"
+msgstr ""
+
+#: actions/avatarsettings.php:119 actions/avatarsettings.php:197
+#: actions/grouplogo.php:254
+msgid "Avatar settings"
+msgstr "Avatar-instellings"
+
+#: actions/avatarsettings.php:127 actions/avatarsettings.php:205
+#: actions/grouplogo.php:202 actions/grouplogo.php:262
+msgid "Original"
+msgstr "Oorspronklik"
+
+#: actions/avatarsettings.php:142 actions/avatarsettings.php:217
+#: actions/grouplogo.php:213 actions/grouplogo.php:274
+msgid "Preview"
+msgstr "Voorskou"
+
+#: actions/avatarsettings.php:149 actions/showapplication.php:252
+#: lib/deleteuserform.php:66 lib/noticelist.php:659
+msgid "Delete"
+msgstr "Skrap"
+
+#: actions/avatarsettings.php:166 actions/grouplogo.php:236
+msgid "Upload"
+msgstr "Oplaai"
+
+#: actions/avatarsettings.php:231 actions/grouplogo.php:289
+msgid "Crop"
+msgstr "Uitsny"
+
+#: actions/avatarsettings.php:305
+msgid "No file uploaded."
+msgstr ""
+
+#: actions/avatarsettings.php:332
+msgid "Pick a square area of the image to be your avatar"
+msgstr ""
+
+#: actions/avatarsettings.php:347 actions/grouplogo.php:380
+msgid "Lost our file data."
+msgstr ""
+
+#: actions/avatarsettings.php:370
+msgid "Avatar updated."
+msgstr "Die avatar is opgedateer."
+
+#: actions/avatarsettings.php:373
+msgid "Failed updating avatar."
+msgstr "Die opdatering van die avatar het gefaal."
+
+#: actions/avatarsettings.php:397
+msgid "Avatar deleted."
+msgstr "Die avatar is verwyder."
+
+#: actions/block.php:69
+msgid "You already blocked that user."
+msgstr "U het reeds die gebruiker geblokkeer."
+
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
+msgid "Block user"
+msgstr "Blokkeer gebruiker"
+
+#: actions/block.php:130
+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 ""
+
+#: actions/block.php:143 actions/deleteapplication.php:153
+#: actions/deletenotice.php:145 actions/deleteuser.php:150
+#: actions/groupblock.php:178
+msgid "No"
+msgstr "Nee"
+
+#: actions/block.php:143 actions/deleteuser.php:150
+msgid "Do not block this user"
+msgstr "Moenie hierdie gebruiker blokkeer nie"
+
+#: actions/block.php:144 actions/deleteapplication.php:158
+#: actions/deletenotice.php:146 actions/deleteuser.php:151
+#: actions/groupblock.php:179 lib/repeatform.php:132
+msgid "Yes"
+msgstr "Ja"
+
+#: actions/block.php:144 actions/groupmembers.php:373 lib/blockform.php:80
+msgid "Block this user"
+msgstr "Blokkeer hierdie gebruiker"
+
+#: actions/block.php:167
+msgid "Failed to save block information."
+msgstr ""
+
+#: actions/blockedfromgroup.php:80 actions/blockedfromgroup.php:87
+#: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62
+#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:102
+#: actions/groupmembers.php:83 actions/groupmembers.php:90
+#: actions/grouprss.php:98 actions/grouprss.php:105
+#: actions/groupunblock.php:86 actions/joingroup.php:82
+#: actions/joingroup.php:93 actions/leavegroup.php:82
+#: actions/leavegroup.php:93 actions/makeadmin.php:86
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162
+#: lib/command.php:358
+msgid "No such group."
+msgstr "Die groep bestaan nie."
+
+#: actions/blockedfromgroup.php:97
+#, php-format
+msgid "%s blocked profiles"
+msgstr ""
+
+#: actions/blockedfromgroup.php:100
+#, php-format
+msgid "%1$s blocked profiles, page %2$d"
+msgstr ""
+
+#: actions/blockedfromgroup.php:115
+msgid "A list of the users blocked from joining this group."
+msgstr ""
+
+#: actions/blockedfromgroup.php:288
+msgid "Unblock user from group"
+msgstr ""
+
+#: actions/blockedfromgroup.php:320 lib/unblockform.php:69
+msgid "Unblock"
+msgstr ""
+
+#: actions/blockedfromgroup.php:320 lib/unblockform.php:80
+msgid "Unblock this user"
+msgstr ""
+
+#: actions/bookmarklet.php:50
+msgid "Post to "
+msgstr "Stuur aan "
+
+#: actions/confirmaddress.php:75
+msgid "No confirmation code."
+msgstr ""
+
+#: actions/confirmaddress.php:80
+msgid "Confirmation code not found."
+msgstr ""
+
+#: actions/confirmaddress.php:85
+msgid "That confirmation code is not for you!"
+msgstr ""
+
+#: actions/confirmaddress.php:90
+#, php-format
+msgid "Unrecognized address type %s"
+msgstr ""
+
+#: actions/confirmaddress.php:94
+msgid "That address has already been confirmed."
+msgstr ""
+
+#: actions/confirmaddress.php:114 actions/emailsettings.php:296
+#: actions/emailsettings.php:427 actions/imsettings.php:258
+#: actions/imsettings.php:401 actions/othersettings.php:174
+#: actions/profilesettings.php:283 actions/smssettings.php:278
+#: actions/smssettings.php:420
+msgid "Couldn't update user."
+msgstr "Kon nie gebruiker opdateer nie."
+
+#: actions/confirmaddress.php:126 actions/emailsettings.php:391
+#: actions/imsettings.php:363 actions/smssettings.php:382
+msgid "Couldn't delete email confirmation."
+msgstr ""
+
+#: actions/confirmaddress.php:144
+msgid "Confirm address"
+msgstr "Bevestig adres"
+
+#: actions/confirmaddress.php:159
+#, php-format
+msgid "The address \"%s\" has been confirmed for your account."
+msgstr ""
+
+#: actions/conversation.php:99
+msgid "Conversation"
+msgstr "Gesprek"
+
+#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
+#: lib/profileaction.php:229 lib/searchgroupnav.php:82
+msgid "Notices"
+msgstr "Kennisgewings"
+
+#: actions/deleteapplication.php:63
+msgid "You must be logged in to delete an application."
+msgstr ""
+
+#: actions/deleteapplication.php:71
+msgid "Application not found."
+msgstr "Die applikasie is nie gevind nie."
+
+#: actions/deleteapplication.php:78 actions/editapplication.php:77
+#: actions/showapplication.php:94
+msgid "You are not the owner of this application."
+msgstr "U is nie die eienaar van hierdie applikasie nie."
+
+#: actions/deleteapplication.php:102 actions/editapplication.php:127
+#: actions/newapplication.php:110 actions/showapplication.php:118
+#: lib/action.php:1219
+msgid "There was a problem with your session token."
+msgstr ""
+
+#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
+msgid "Delete application"
+msgstr "Skrap applikasie"
+
+#: actions/deleteapplication.php:149
+msgid ""
+"Are you sure you want to delete this application? This will clear all data "
+"about the application from the database, including all existing user "
+"connections."
+msgstr ""
+
+#: actions/deleteapplication.php:156
+msgid "Do not delete this application"
+msgstr "Moenie die applikasie verwyder nie"
+
+#: actions/deleteapplication.php:160
+msgid "Delete this application"
+msgstr "Skrap hierdie applikasie"
+
+#. TRANS: Client error message
+#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
+#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
+#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
+#: actions/tagother.php:33 actions/unsubscribe.php:52
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/settingsaction.php:72
+msgid "Not logged in."
+msgstr "Nie aangeteken nie."
+
+#: actions/deletenotice.php:71
+msgid "Can't delete this notice."
+msgstr ""
+
+#: actions/deletenotice.php:103
+msgid ""
+"You are about to permanently delete a notice. Once this is done, it cannot "
+"be undone."
+msgstr ""
+
+#: actions/deletenotice.php:109 actions/deletenotice.php:141
+msgid "Delete notice"
+msgstr ""
+
+#: actions/deletenotice.php:144
+msgid "Are you sure you want to delete this notice?"
+msgstr ""
+
+#: actions/deletenotice.php:145
+msgid "Do not delete this notice"
+msgstr ""
+
+#: actions/deletenotice.php:146 lib/noticelist.php:659
+msgid "Delete this notice"
+msgstr ""
+
+#: actions/deleteuser.php:67
+msgid "You cannot delete users."
+msgstr "U kan nie gebruikers verwyder nie."
+
+#: actions/deleteuser.php:74
+msgid "You can only delete local users."
+msgstr "U kan slegs lokale gebruikers verwyder."
+
+#: actions/deleteuser.php:110 actions/deleteuser.php:133
+msgid "Delete user"
+msgstr "Verwyder gebruiker"
+
+#: 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 ""
+
+#: actions/deleteuser.php:151 lib/deleteuserform.php:77
+msgid "Delete this user"
+msgstr "Verwyder die gebruiker"
+
+#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124
+#: lib/groupnav.php:119
+msgid "Design"
+msgstr "Ontwerp"
+
+#: actions/designadminpanel.php:73
+msgid "Design settings for this StatusNet site."
+msgstr ""
+
+#: actions/designadminpanel.php:275
+msgid "Invalid logo URL."
+msgstr "Die logo-URL is ongeldig."
+
+#: actions/designadminpanel.php:279
+#, php-format
+msgid "Theme not available: %s"
+msgstr "Tema is nie beskikbaar nie: %s"
+
+#: actions/designadminpanel.php:375
+msgid "Change logo"
+msgstr "Verander logo"
+
+#: actions/designadminpanel.php:380
+msgid "Site logo"
+msgstr "Webwerf-logo"
+
+#: actions/designadminpanel.php:387
+msgid "Change theme"
+msgstr "Verander tema"
+
+#: actions/designadminpanel.php:404
+msgid "Site theme"
+msgstr "Werf se tema"
+
+#: actions/designadminpanel.php:405
+msgid "Theme for the site."
+msgstr "Tema vir die werf."
+
+#: actions/designadminpanel.php:417 lib/designsettings.php:101
+msgid "Change background image"
+msgstr "Verander die agtergrond-prent"
+
+#: actions/designadminpanel.php:422 actions/designadminpanel.php:497
+#: lib/designsettings.php:178
+msgid "Background"
+msgstr "Agtergrond"
+
+#: actions/designadminpanel.php:427
+#, php-format
+msgid ""
+"You can upload a background image for the site. The maximum file size is %1"
+"$s."
+msgstr ""
+
+#: actions/designadminpanel.php:457 lib/designsettings.php:139
+msgid "On"
+msgstr "Aan"
+
+#: actions/designadminpanel.php:473 lib/designsettings.php:155
+msgid "Off"
+msgstr "Af"
+
+#: actions/designadminpanel.php:474 lib/designsettings.php:156
+msgid "Turn background image on or off."
+msgstr ""
+
+#: actions/designadminpanel.php:479 lib/designsettings.php:161
+msgid "Tile background image"
+msgstr ""
+
+#: actions/designadminpanel.php:488 lib/designsettings.php:170
+msgid "Change colours"
+msgstr "Verander kleure"
+
+#: actions/designadminpanel.php:510 lib/designsettings.php:191
+msgid "Content"
+msgstr "Inhoud"
+
+#: actions/designadminpanel.php:523 lib/designsettings.php:204
+msgid "Sidebar"
+msgstr "Kantstrook"
+
+#: actions/designadminpanel.php:536 lib/designsettings.php:217
+msgid "Text"
+msgstr "Text"
+
+#: actions/designadminpanel.php:549 lib/designsettings.php:230
+msgid "Links"
+msgstr "Skakels"
+
+#: actions/designadminpanel.php:577 lib/designsettings.php:247
+msgid "Use defaults"
+msgstr "Gebruik verstekwaardes"
+
+#: actions/designadminpanel.php:578 lib/designsettings.php:248
+msgid "Restore default designs"
+msgstr ""
+
+#: actions/designadminpanel.php:584 lib/designsettings.php:254
+msgid "Reset back to default"
+msgstr "Stel terug na standaard"
+
+#: actions/designadminpanel.php:586 actions/emailsettings.php:195
+#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
+#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
+#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
+#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
+#: actions/tagother.php:154 actions/useradminpanel.php:294
+#: lib/applicationeditform.php:333 lib/applicationeditform.php:334
+#: lib/designsettings.php:256 lib/groupeditform.php:202
+msgid "Save"
+msgstr "Stoor"
+
+#: actions/designadminpanel.php:587 lib/designsettings.php:257
+msgid "Save design"
+msgstr "Stoor ontwerp"
+
+#: actions/disfavor.php:81
+msgid "This notice is not a favorite!"
+msgstr ""
+
+#: actions/disfavor.php:94
+msgid "Add to favorites"
+msgstr "Voeg by gunstelinge"
+
+#: actions/doc.php:158
+#, php-format
+msgid "No such document \"%s\""
+msgstr "Onbekende dokument \"%s\""
+
+#: actions/editapplication.php:54
+msgid "Edit Application"
+msgstr "Wysig applikasie"
+
+#: actions/editapplication.php:66
+msgid "You must be logged in to edit an application."
+msgstr "U moet aangeteken wees alvorens u 'n applikasie kan wysig."
+
+#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:166
+#: actions/showapplication.php:87
+msgid "No such application."
+msgstr "Die applikasie bestaan nie."
+
+#: actions/editapplication.php:161
+msgid "Use this form to edit your application."
+msgstr "Gebruik die vorm om u applikasie te wysig."
+
+#: actions/editapplication.php:177 actions/newapplication.php:159
+msgid "Name is required."
+msgstr "'n Naam is verpligtend."
+
+#: actions/editapplication.php:180 actions/newapplication.php:165
+msgid "Name is too long (max 255 chars)."
+msgstr "Die naam is te lank (maksimum 255 karakters)."
+
+#: actions/editapplication.php:183 actions/newapplication.php:162
+msgid "Name already in use. Try another one."
+msgstr "Die naam is reeds in gebruik. Kies 'n ander een."
+
+#: actions/editapplication.php:186 actions/newapplication.php:168
+msgid "Description is required."
+msgstr "Beskrywing word vereis."
+
+#: actions/editapplication.php:194
+msgid "Source URL is too long."
+msgstr ""
+
+#: actions/editapplication.php:200 actions/newapplication.php:185
+msgid "Source URL is not valid."
+msgstr ""
+
+#: actions/editapplication.php:203 actions/newapplication.php:188
+msgid "Organization is required."
+msgstr "Organisasie is verpligtend."
+
+#: actions/editapplication.php:206 actions/newapplication.php:191
+msgid "Organization is too long (max 255 chars)."
+msgstr "Die organisasienaam is te lang (maksimum 255 karakters)."
+
+#: actions/editapplication.php:209 actions/newapplication.php:194
+msgid "Organization homepage is required."
+msgstr "Die tuisblad vir die organisasie is verpligtend."
+
+#: actions/editapplication.php:218 actions/newapplication.php:206
+msgid "Callback is too long."
+msgstr "Die \"callback\" is te lank."
+
+#: actions/editapplication.php:225 actions/newapplication.php:215
+msgid "Callback URL is not valid."
+msgstr "Die \"callback\"-URL is nie geldig nie."
+
+#: actions/editapplication.php:258
+msgid "Could not update application."
+msgstr "Dit was nie moontlik om die applikasie by te werk nie."
+
+#: actions/editgroup.php:56
+#, php-format
+msgid "Edit %s group"
+msgstr "Groep %s wysig"
+
+#: actions/editgroup.php:68 actions/grouplogo.php:70 actions/newgroup.php:65
+msgid "You must be logged in to create a group."
+msgstr "U moet aangeteken wees alvorens u 'n groep kan skep."
+
+#: 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 "U moet 'n administrateur wees alvorens u 'n groep kan wysig."
+
+#: actions/editgroup.php:158
+msgid "Use this form to edit the group."
+msgstr "Gebruik hierdie vorm om die groep te wysig."
+
+#: actions/editgroup.php:205 actions/newgroup.php:145
+#, php-format
+msgid "description is too long (max %d chars)."
+msgstr "Die beskrywing is te lank (die maksimum is %d karakters)."
+
+#: actions/editgroup.php:258
+msgid "Could not update group."
+msgstr "Dit was nie moontlik om die groep by te werk nie."
+
+#: actions/editgroup.php:264 classes/User_group.php:496
+msgid "Could not create aliases."
+msgstr "Dit was nie moontlik om die aliasse te skep nie."
+
+#: actions/editgroup.php:280
+msgid "Options saved."
+msgstr "Opsies is gestoor."
+
+#: actions/emailsettings.php:60
+msgid "Email settings"
+msgstr "E-posvoorkeure"
+
+#: actions/emailsettings.php:71
+#, php-format
+msgid "Manage how you get email from %%site.name%%."
+msgstr ""
+
+#: actions/emailsettings.php:100 actions/imsettings.php:100
+#: actions/smssettings.php:104
+msgid "Address"
+msgstr "Adres"
+
+#: actions/emailsettings.php:105
+msgid "Current confirmed email address."
+msgstr ""
+
+#: actions/emailsettings.php:107 actions/emailsettings.php:140
+#: actions/imsettings.php:108 actions/smssettings.php:115
+#: actions/smssettings.php:158
+msgid "Remove"
+msgstr "Verwyder"
+
+#: actions/emailsettings.php:113
+msgid ""
+"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
+"a message with further instructions."
+msgstr ""
+
+#: actions/emailsettings.php:117 actions/imsettings.php:120
+#: actions/smssettings.php:126 lib/applicationeditform.php:331
+#: lib/applicationeditform.php:332
+msgid "Cancel"
+msgstr "Kanselleer"
+
+#: actions/emailsettings.php:121
+msgid "Email address"
+msgstr "E-posadres"
+
+#: actions/emailsettings.php:123
+msgid "Email address, like \"UserName@example.org\""
+msgstr ""
+
+#: actions/emailsettings.php:126 actions/imsettings.php:133
+#: actions/smssettings.php:145
+msgid "Add"
+msgstr "Voeg by"
+
+#: actions/emailsettings.php:133 actions/smssettings.php:152
+msgid "Incoming email"
+msgstr "Inkomende e-pos"
+
+#: actions/emailsettings.php:138 actions/smssettings.php:157
+msgid "Send email to this address to post new notices."
+msgstr ""
+
+#: actions/emailsettings.php:145 actions/smssettings.php:162
+msgid "Make a new email address for posting to; cancels the old one."
+msgstr ""
+
+#: actions/emailsettings.php:148 actions/smssettings.php:164
+msgid "New"
+msgstr "Nuut"
+
+#: actions/emailsettings.php:153 actions/imsettings.php:139
+#: actions/smssettings.php:169
+msgid "Preferences"
+msgstr "Voorkeure"
+
+#: actions/emailsettings.php:158
+msgid "Send me notices of new subscriptions through email."
+msgstr ""
+
+#: actions/emailsettings.php:163
+msgid "Send me email when someone adds my notice as a favorite."
+msgstr ""
+
+#: actions/emailsettings.php:169
+msgid "Send me email when someone sends me a private message."
+msgstr ""
+
+#: actions/emailsettings.php:174
+msgid "Send me email when someone sends me an \"@-reply\"."
+msgstr ""
+
+#: actions/emailsettings.php:179
+msgid "Allow friends to nudge me and send me an email."
+msgstr ""
+
+#: actions/emailsettings.php:185
+msgid "I want to post notices by email."
+msgstr ""
+
+#: actions/emailsettings.php:191
+msgid "Publish a MicroID for my email address."
+msgstr ""
+
+#: actions/emailsettings.php:302 actions/imsettings.php:264
+#: actions/othersettings.php:180 actions/smssettings.php:284
+msgid "Preferences saved."
+msgstr "Voorkeure is gestoor."
+
+#: actions/emailsettings.php:320
+msgid "No email address."
+msgstr "Geen e-posadres."
+
+#: actions/emailsettings.php:327
+msgid "Cannot normalize that email address"
+msgstr ""
+
+#: actions/emailsettings.php:331 actions/register.php:201
+#: actions/siteadminpanel.php:144
+msgid "Not a valid email address."
+msgstr "Nie 'n geldige e-posadres nie."
+
+#: actions/emailsettings.php:334
+msgid "That is already your email address."
+msgstr "Dit is al reeds u e-posadres."
+
+#: actions/emailsettings.php:337
+msgid "That email address already belongs to another user."
+msgstr ""
+
+#: actions/emailsettings.php:353 actions/imsettings.php:319
+#: actions/smssettings.php:337
+msgid "Couldn't insert confirmation code."
+msgstr ""
+
+#: actions/emailsettings.php:359
+msgid ""
+"A confirmation code was sent to the email address you added. Check your "
+"inbox (and spam box!) for the code and instructions on how to use it."
+msgstr ""
+
+#: actions/emailsettings.php:379 actions/imsettings.php:351
+#: actions/smssettings.php:370
+msgid "No pending confirmation to cancel."
+msgstr ""
+
+#: actions/emailsettings.php:383 actions/imsettings.php:355
+msgid "That is the wrong IM address."
+msgstr ""
+
+#: actions/emailsettings.php:395 actions/imsettings.php:367
+#: actions/smssettings.php:386
+msgid "Confirmation cancelled."
+msgstr "Bevestiging gekanselleer."
+
+#: actions/emailsettings.php:413
+msgid "That is not your email address."
+msgstr "Dit is nie u e-posadres nie."
+
+#: actions/emailsettings.php:432 actions/imsettings.php:408
+#: actions/smssettings.php:425
+msgid "The address was removed."
+msgstr "Die adres is verwyder."
+
+#: actions/emailsettings.php:446 actions/smssettings.php:518
+msgid "No incoming email address."
+msgstr "Geen inkomende e-posadres."
+
+#: actions/emailsettings.php:456 actions/emailsettings.php:478
+#: actions/smssettings.php:528 actions/smssettings.php:552
+msgid "Couldn't update user record."
+msgstr "Kon nie gebruikersdata opdateer nie."
+
+#: actions/emailsettings.php:459 actions/smssettings.php:531
+msgid "Incoming email address removed."
+msgstr ""
+
+#: actions/emailsettings.php:481 actions/smssettings.php:555
+msgid "New incoming email address added."
+msgstr ""
+
+#: actions/favor.php:79
+msgid "This notice is already a favorite!"
+msgstr ""
+
+#: actions/favor.php:92 lib/disfavorform.php:140
+msgid "Disfavor favorite"
+msgstr ""
+
+#: actions/favorited.php:65 lib/popularnoticesection.php:91
+#: lib/publicgroupnav.php:93
+msgid "Popular notices"
+msgstr ""
+
+#: actions/favorited.php:67
+#, php-format
+msgid "Popular notices, page %d"
+msgstr ""
+
+#: actions/favorited.php:79
+msgid "The most popular notices on the site right now."
+msgstr ""
+
+#: actions/favorited.php:150
+msgid "Favorite notices appear on this page but no one has favorited one yet."
+msgstr ""
+
+#: actions/favorited.php:153
+msgid ""
+"Be the first to add a notice to your favorites by clicking the fave button "
+"next to any notice you like."
+msgstr ""
+
+#: actions/favorited.php:156
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to add a "
+"notice to your favorites!"
+msgstr ""
+
+#: actions/favoritesrss.php:111 actions/showfavorites.php:77
+#: lib/personalgroupnav.php:115
+#, php-format
+msgid "%s's favorite notices"
+msgstr ""
+
+#: actions/favoritesrss.php:115
+#, php-format
+msgid "Updates favored by %1$s on %2$s!"
+msgstr ""
+
+#: actions/featured.php:69 lib/featureduserssection.php:87
+#: lib/publicgroupnav.php:89
+msgid "Featured users"
+msgstr ""
+
+#: actions/featured.php:71
+#, php-format
+msgid "Featured users, page %d"
+msgstr ""
+
+#: actions/featured.php:99
+#, php-format
+msgid "A selection of some great users on %s"
+msgstr ""
+
+#: actions/file.php:34
+msgid "No notice ID."
+msgstr ""
+
+#: actions/file.php:38
+msgid "No notice."
+msgstr ""
+
+#: actions/file.php:42
+msgid "No attachments."
+msgstr "Geen aanhangsels."
+
+#: actions/file.php:51
+msgid "No uploaded attachments."
+msgstr ""
+
+#: actions/finishremotesubscribe.php:69
+msgid "Not expecting this response!"
+msgstr ""
+
+#: actions/finishremotesubscribe.php:80
+msgid "User being listened to does not exist."
+msgstr ""
+
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
+msgid "You can use the local subscription!"
+msgstr ""
+
+#: actions/finishremotesubscribe.php:99
+msgid "That user has blocked you from subscribing."
+msgstr ""
+
+#: actions/finishremotesubscribe.php:110
+msgid "You are not authorized."
+msgstr ""
+
+#: actions/finishremotesubscribe.php:113
+msgid "Could not convert request token to access token."
+msgstr ""
+
+#: actions/finishremotesubscribe.php:118
+msgid "Remote service uses unknown version of OMB protocol."
+msgstr ""
+
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
+msgid "Error updating remote profile"
+msgstr ""
+
+#: actions/getfile.php:79
+msgid "No such file."
+msgstr "Die lêer bestaan nie."
+
+#: actions/getfile.php:83
+msgid "Cannot read file."
+msgstr "Die lêer kan nie gelees word nie."
+
+#: actions/grantrole.php:62 actions/revokerole.php:62
+msgid "Invalid role."
+msgstr "Ongeldige rol."
+
+#: actions/grantrole.php:66 actions/revokerole.php:66
+msgid "This role is reserved and cannot be set."
+msgstr ""
+
+#: actions/grantrole.php:75
+msgid "You cannot grant user roles on this site."
+msgstr ""
+
+#: actions/grantrole.php:82
+msgid "User already has this role."
+msgstr ""
+
+#: actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71 actions/subedit.php:46
+#: lib/profileformaction.php:70
+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
+msgid "No profile with that ID."
+msgstr "Daar is geen profiel met daardie ID nie."
+
+#: actions/groupblock.php:81 actions/groupunblock.php:81
+#: actions/makeadmin.php:81
+msgid "No group specified."
+msgstr "Geen groep verskaf nie."
+
+#: actions/groupblock.php:91
+msgid "Only an admin can block group members."
+msgstr ""
+
+#: actions/groupblock.php:95
+msgid "User is already blocked from group."
+msgstr ""
+
+#: actions/groupblock.php:100
+msgid "User is not a member of group."
+msgstr ""
+
+#: actions/groupblock.php:136 actions/groupmembers.php:341
+msgid "Block user from group"
+msgstr "Blok gebruiker toegang tot die groep"
+
+#: actions/groupblock.php:162
+#, php-format
+msgid ""
+"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
+"will be removed from the group, unable to post, and unable to subscribe to "
+"the group in the future."
+msgstr ""
+
+#: actions/groupblock.php:178
+msgid "Do not block this user from this group"
+msgstr ""
+
+#: actions/groupblock.php:179
+msgid "Block this user from this group"
+msgstr ""
+
+#: actions/groupblock.php:196
+msgid "Database error blocking user from group."
+msgstr ""
+
+#: actions/groupbyid.php:74 actions/userbyid.php:70
+msgid "No ID."
+msgstr "Geen ID."
+
+#: actions/groupdesignsettings.php:68
+msgid "You must be logged in to edit a group."
+msgstr ""
+
+#: actions/groupdesignsettings.php:144
+msgid "Group design"
+msgstr ""
+
+#: actions/groupdesignsettings.php:155
+msgid ""
+"Customize the way your group looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
+
+#: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:186
+#: lib/designsettings.php:391 lib/designsettings.php:413
+msgid "Couldn't update your design."
+msgstr ""
+
+#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:231
+msgid "Design preferences saved."
+msgstr ""
+
+#: actions/grouplogo.php:142 actions/grouplogo.php:195
+msgid "Group logo"
+msgstr "Groepslogo"
+
+#: actions/grouplogo.php:153
+#, php-format
+msgid ""
+"You can upload a logo image for your group. The maximum file size is %s."
+msgstr ""
+
+#: actions/grouplogo.php:181
+msgid "User without matching profile."
+msgstr ""
+
+#: actions/grouplogo.php:365
+msgid "Pick a square area of the image to be the logo."
+msgstr ""
+
+#: actions/grouplogo.php:399
+msgid "Logo updated."
+msgstr "Logo opgedateer."
+
+#: actions/grouplogo.php:401
+msgid "Failed updating logo."
+msgstr "Die opdatering van die logo het gefaal."
+
+#: actions/groupmembers.php:100 lib/groupnav.php:92
+#, php-format
+msgid "%s group members"
+msgstr "lede van die groep %s"
+
+#: actions/groupmembers.php:103
+#, php-format
+msgid "%1$s group members, page %2$d"
+msgstr ""
+
+#: actions/groupmembers.php:118
+msgid "A list of the users in this group."
+msgstr ""
+
+#: actions/groupmembers.php:182 lib/groupnav.php:107
+msgid "Admin"
+msgstr "Administrateur"
+
+#: actions/groupmembers.php:373 lib/blockform.php:69
+msgid "Block"
+msgstr "Blokkeer"
+
+#: actions/groupmembers.php:468
+msgid "Make user an admin of the group"
+msgstr ""
+
+#: actions/groupmembers.php:500
+msgid "Make Admin"
+msgstr "Maak Admin"
+
+#: actions/groupmembers.php:500
+msgid "Make this user an admin"
+msgstr "Maak hierdie gebruiker 'n administrateur"
+
+#: actions/grouprss.php:138 actions/userrss.php:93
+#: lib/atomgroupnoticefeed.php:61 lib/atomusernoticefeed.php:67
+#, php-format
+msgid "%s timeline"
+msgstr "%s tydlyn"
+
+#: actions/grouprss.php:140
+#, php-format
+msgid "Updates from members of %1$s on %2$s!"
+msgstr ""
+
+#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+msgid "Groups"
+msgstr "Groepe"
+
+#: actions/groups.php:64
+#, php-format
+msgid "Groups, page %d"
+msgstr "Groepe, bladsy %d"
+
+#: actions/groups.php:90
+#, php-format
+msgid ""
+"%%%%site.name%%%% groups let you find and talk with people of similar "
+"interests. After you join a group you can send messages to all other members "
+"using the syntax \"!groupname\". Don't see a group you like? Try [searching "
+"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
+"%%%%)"
+msgstr ""
+
+#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
+msgid "Create a new group"
+msgstr "Skep 'n nuwe groep"
+
+#: actions/groupsearch.php:52
+#, php-format
+msgid ""
+"Search for groups on %%site.name%% by their name, location, or description. "
+"Separate the terms by spaces; they must be 3 characters or more."
+msgstr ""
+
+#: actions/groupsearch.php:58
+msgid "Group search"
+msgstr ""
+
+#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
+msgid "No results."
+msgstr "Geen resultate nie."
+
+#: actions/groupsearch.php:82
+#, php-format
+msgid ""
+"If you can't find the group you're looking for, you can [create it](%%action."
+"newgroup%%) yourself."
+msgstr ""
+
+#: actions/groupsearch.php:85
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and [create the group](%%"
+"action.newgroup%%) yourself!"
+msgstr ""
+
+#: actions/groupunblock.php:91
+msgid "Only an admin can unblock group members."
+msgstr ""
+
+#: actions/groupunblock.php:95
+msgid "User is not blocked from group."
+msgstr ""
+
+#: actions/groupunblock.php:128 actions/unblock.php:86
+msgid "Error removing the block."
+msgstr ""
+
+#: actions/imsettings.php:59
+msgid "IM settings"
+msgstr "IM-instellings"
+
+#: actions/imsettings.php:70
+#, php-format
+msgid ""
+"You can send and receive notices through Jabber/GTalk [instant messages](%%"
+"doc.im%%). Configure your address and settings below."
+msgstr ""
+
+#: actions/imsettings.php:89
+msgid "IM is not available."
+msgstr "IM is nie beskikbaar nie."
+
+#: actions/imsettings.php:106
+msgid "Current confirmed Jabber/GTalk address."
+msgstr ""
+
+#: actions/imsettings.php:114
+#, php-format
+msgid ""
+"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
+"message with further instructions. (Did you add %s to your buddy list?)"
+msgstr ""
+
+#: actions/imsettings.php:124
+msgid "IM address"
+msgstr "IP-adres"
+
+#: actions/imsettings.php:126
+#, php-format
+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 ""
+
+#: actions/imsettings.php:143
+msgid "Send me notices through Jabber/GTalk."
+msgstr ""
+
+#: actions/imsettings.php:148
+msgid "Post a notice when my Jabber/GTalk status changes."
+msgstr ""
+
+#: actions/imsettings.php:153
+msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+msgstr ""
+
+#: actions/imsettings.php:159
+msgid "Publish a MicroID for my Jabber/GTalk address."
+msgstr ""
+
+#: actions/imsettings.php:285
+msgid "No Jabber ID."
+msgstr ""
+
+#: actions/imsettings.php:292
+msgid "Cannot normalize that Jabber ID"
+msgstr ""
+
+#: actions/imsettings.php:296
+msgid "Not a valid Jabber ID"
+msgstr ""
+
+#: actions/imsettings.php:299
+msgid "That is already your Jabber ID."
+msgstr ""
+
+#: actions/imsettings.php:302
+msgid "Jabber ID already belongs to another user."
+msgstr ""
+
+#: actions/imsettings.php:327
+#, php-format
+msgid ""
+"A confirmation code was sent to the IM address you added. You must approve %"
+"s for sending messages to you."
+msgstr ""
+
+#: actions/imsettings.php:387
+msgid "That is not your Jabber ID."
+msgstr ""
+
+#: actions/inbox.php:59
+#, php-format
+msgid "Inbox for %1$s - page %2$d"
+msgstr ""
+
+#: actions/inbox.php:62
+#, php-format
+msgid "Inbox for %s"
+msgstr ""
+
+#: actions/inbox.php:115
+msgid "This is your inbox, which lists your incoming private messages."
+msgstr ""
+
+#: actions/invite.php:39
+msgid "Invites have been disabled."
+msgstr ""
+
+#: actions/invite.php:41
+#, php-format
+msgid "You must be logged in to invite other users to use %s"
+msgstr ""
+
+#: actions/invite.php:72
+#, php-format
+msgid "Invalid email address: %s"
+msgstr "Ongeldige e-posadres: %s"
+
+#: actions/invite.php:110
+msgid "Invitation(s) sent"
+msgstr ""
+
+#: actions/invite.php:112
+msgid "Invite new users"
+msgstr "Nooi nuwe gebruikers"
+
+#: actions/invite.php:128
+msgid "You are already subscribed to these users:"
+msgstr ""
+
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
+#, php-format
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
+#: actions/invite.php:136
+msgid ""
+"These people are already users and you were automatically subscribed to them:"
+msgstr ""
+
+#: actions/invite.php:144
+msgid "Invitation(s) sent to the following people:"
+msgstr ""
+
+#: actions/invite.php:150
+msgid ""
+"You will be notified when your invitees accept the invitation and register "
+"on the site. Thanks for growing the community!"
+msgstr ""
+
+#: actions/invite.php:162
+msgid ""
+"Use this form to invite your friends and colleagues to use this service."
+msgstr ""
+
+#: actions/invite.php:187
+msgid "Email addresses"
+msgstr "E-posadresse"
+
+#: actions/invite.php:189
+msgid "Addresses of friends to invite (one per line)"
+msgstr ""
+
+#: actions/invite.php:192
+msgid "Personal message"
+msgstr "Persoonlike boodskap"
+
+#: actions/invite.php:194
+msgid "Optionally add a personal message to the invitation."
+msgstr ""
+
+#. TRANS: Send button for inviting friends
+#: actions/invite.php:198
+msgctxt "BUTTON"
+msgid "Send"
+msgstr "Stuur"
+
+#: actions/invite.php:227
+#, php-format
+msgid "%1$s has invited you to join them on %2$s"
+msgstr ""
+
+#: actions/invite.php:229
+#, php-format
+msgid ""
+"%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. It's also great for meeting new people who "
+"share your interests.\n"
+"\n"
+"%1$s said:\n"
+"\n"
+"%4$s\n"
+"\n"
+"You can see %1$s's profile page on %2$s here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"If you'd like to try the service, click on the link below to accept the "
+"invitation.\n"
+"\n"
+"%6$s\n"
+"\n"
+"If not, you can ignore this message. Thanks for your patience and your "
+"time.\n"
+"\n"
+"Sincerely, %2$s\n"
+msgstr ""
+
+#: actions/joingroup.php:60
+msgid "You must be logged in to join a group."
+msgstr "U moet aanteken alvorens u by groep kan aansluit."
+
+#: actions/joingroup.php:88 actions/leavegroup.php:88
+msgid "No nickname or ID."
+msgstr ""
+
+#: actions/joingroup.php:141
+#, php-format
+msgid "%1$s joined group %2$s"
+msgstr "%1$s het by groep %2$s aangesluit"
+
+#: actions/leavegroup.php:60
+msgid "You must be logged in to leave a group."
+msgstr "U moet aanteken alvorens u 'n groep kan verlaat."
+
+#: actions/leavegroup.php:100 lib/command.php:363
+msgid "You are not a member of that group."
+msgstr "U is nie 'n lid van daardie groep nie."
+
+#: actions/leavegroup.php:137
+#, php-format
+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
+msgid "Already logged in."
+msgstr "U is reeds aangeteken."
+
+#: actions/login.php:126
+msgid "Incorrect username or password."
+msgstr "Verkeerde gebruikersnaam of wagwoord."
+
+#: actions/login.php:132 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
+msgid "Login"
+msgstr "Aanteken"
+
+#: actions/login.php:227
+msgid "Login to site"
+msgstr "Teken aan"
+
+#: actions/login.php:236 actions/register.php:478
+msgid "Remember me"
+msgstr "Onthou my"
+
+#: actions/login.php:237 actions/register.php:480
+msgid "Automatically login in the future; not for shared computers!"
+msgstr ""
+
+#: actions/login.php:247
+msgid "Lost or forgotten password?"
+msgstr "Wagwoord verloor of vergeet?"
+
+#: actions/login.php:266
+msgid ""
+"For security reasons, please re-enter your user name and password before "
+"changing your settings."
+msgstr ""
+
+#: actions/login.php:270
+#, php-format
+msgid ""
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account."
+msgstr ""
+
+#: actions/makeadmin.php:92
+msgid "Only an admin can make another user an admin."
+msgstr ""
+
+#: actions/makeadmin.php:96
+#, php-format
+msgid "%1$s is already an admin for group \"%2$s\"."
+msgstr ""
+
+#: actions/makeadmin.php:133
+#, php-format
+msgid "Can't get membership record for %1$s in group %2$s."
+msgstr ""
+
+#: actions/makeadmin.php:146
+#, php-format
+msgid "Can't make %1$s an admin for group %2$s."
+msgstr ""
+
+#: actions/microsummary.php:69
+msgid "No current status"
+msgstr "Geen huidige status"
+
+#: actions/newapplication.php:52
+msgid "New Application"
+msgstr "Nuwe appplikasie"
+
+#: actions/newapplication.php:64
+msgid "You must be logged in to register an application."
+msgstr ""
+
+#: actions/newapplication.php:143
+msgid "Use this form to register a new application."
+msgstr ""
+
+#: actions/newapplication.php:176
+msgid "Source URL is required."
+msgstr ""
+
+#: actions/newapplication.php:258 actions/newapplication.php:267
+msgid "Could not create application."
+msgstr ""
+
+#: actions/newgroup.php:53
+msgid "New group"
+msgstr "Nuwe groep"
+
+#: actions/newgroup.php:110
+msgid "Use this form to create a new group."
+msgstr ""
+
+#: actions/newmessage.php:71 actions/newmessage.php:231
+msgid "New message"
+msgstr "Nuwe boodskap"
+
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
+msgid "You can't send a message to this user."
+msgstr "U kan nie 'n boodskap aan hierdie gebruiker stuur nie."
+
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
+#: lib/command.php:529
+msgid "No content!"
+msgstr "Geen inhoud nie!"
+
+#: actions/newmessage.php:158
+msgid "No recipient specified."
+msgstr "Geen ontvanger gespesifiseer nie."
+
+#: actions/newmessage.php:164 lib/command.php:462
+msgid ""
+"Don't send a message to yourself; just say it to yourself quietly instead."
+msgstr ""
+
+#: actions/newmessage.php:181
+msgid "Message sent"
+msgstr "Boodskap is gestuur."
+
+#: actions/newmessage.php:185
+#, php-format
+msgid "Direct message to %s sent."
+msgstr ""
+
+#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189
+msgid "Ajax Error"
+msgstr "Ajax-fout"
+
+#: actions/newnotice.php:69
+msgid "New notice"
+msgstr ""
+
+#: actions/newnotice.php:217
+msgid "Notice posted"
+msgstr ""
+
+#: actions/noticesearch.php:68
+#, php-format
+msgid ""
+"Search for notices on %%site.name%% by their contents. Separate search terms "
+"by spaces; they must be 3 characters or more."
+msgstr ""
+
+#: actions/noticesearch.php:78
+msgid "Text search"
+msgstr "Teks soektog"
+
+#: actions/noticesearch.php:91
+#, php-format
+msgid "Search results for \"%1$s\" on %2$s"
+msgstr ""
+
+#: actions/noticesearch.php:121
+#, php-format
+msgid ""
+"Be the first to [post on this topic](%%%%action.newnotice%%%%?"
+"status_textarea=%s)!"
+msgstr ""
+
+#: actions/noticesearch.php:124
+#, php-format
+msgid ""
+"Why not [register an account](%%%%action.register%%%%) and be the first to "
+"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
+msgstr ""
+
+#: actions/noticesearchrss.php:96
+#, php-format
+msgid "Updates with \"%s\""
+msgstr "Opdaterings met \"%s\""
+
+#: actions/noticesearchrss.php:98
+#, php-format
+msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgstr ""
+
+#: actions/nudge.php:85
+msgid ""
+"This user doesn't allow nudges or hasn't confirmed or set his email yet."
+msgstr ""
+
+#: actions/nudge.php:94
+msgid "Nudge sent"
+msgstr "Die por is gestuur"
+
+#: actions/nudge.php:97
+msgid "Nudge sent!"
+msgstr "Die por is gestuur!"
+
+#: actions/oauthappssettings.php:59
+msgid "You must be logged in to list your applications."
+msgstr ""
+
+#: actions/oauthappssettings.php:74
+msgid "OAuth applications"
+msgstr ""
+
+#: actions/oauthappssettings.php:85
+msgid "Applications you have registered"
+msgstr ""
+
+#: actions/oauthappssettings.php:135
+#, php-format
+msgid "You have not registered any applications yet."
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:72
+msgid "Connected applications"
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:83
+msgid "You have allowed the following applications to access you account."
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:175
+msgid "You are not a user of that application."
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:186
+msgid "Unable to revoke access for app: "
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:198
+#, php-format
+msgid "You have not authorized any applications to use your account."
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:211
+msgid "Developers can edit the registration settings for their applications "
+msgstr ""
+
+#: actions/oembed.php:79 actions/shownotice.php:100
+msgid "Notice has no profile"
+msgstr ""
+
+#: actions/oembed.php:86 actions/shownotice.php:175
+#, php-format
+msgid "%1$s's status on %2$s"
+msgstr ""
+
+#: actions/oembed.php:157
+msgid "content type "
+msgstr ""
+
+#: actions/oembed.php:160
+msgid "Only "
+msgstr "Slegs "
+
+#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1068
+#: lib/apiaction.php:1096 lib/apiaction.php:1212
+msgid "Not a supported data format."
+msgstr ""
+
+#: actions/opensearch.php:64
+msgid "People Search"
+msgstr "Mense soek"
+
+#: actions/opensearch.php:67
+msgid "Notice Search"
+msgstr ""
+
+#: actions/othersettings.php:60
+msgid "Other settings"
+msgstr ""
+
+#: actions/othersettings.php:71
+msgid "Manage various other options."
+msgstr ""
+
+#: actions/othersettings.php:108
+msgid " (free service)"
+msgstr "(gratis diens)"
+
+#: actions/othersettings.php:116
+msgid "Shorten URLs with"
+msgstr ""
+
+#: actions/othersettings.php:117
+msgid "Automatic shortening service to use."
+msgstr ""
+
+#: actions/othersettings.php:122
+msgid "View profile designs"
+msgstr ""
+
+#: actions/othersettings.php:123
+msgid "Show or hide profile designs."
+msgstr ""
+
+#: actions/othersettings.php:153
+msgid "URL shortening service is too long (max 50 chars)."
+msgstr ""
+
+#: actions/otp.php:69
+msgid "No user ID specified."
+msgstr ""
+
+#: actions/otp.php:83
+msgid "No login token specified."
+msgstr ""
+
+#: actions/otp.php:90
+msgid "No login token requested."
+msgstr ""
+
+#: actions/otp.php:95
+msgid "Invalid login token specified."
+msgstr ""
+
+#: actions/otp.php:104
+msgid "Login token expired."
+msgstr ""
+
+#: actions/outbox.php:58
+#, php-format
+msgid "Outbox for %1$s - page %2$d"
+msgstr ""
+
+#: actions/outbox.php:61
+#, php-format
+msgid "Outbox for %s"
+msgstr ""
+
+#: actions/outbox.php:116
+msgid "This is your outbox, which lists private messages you have sent."
+msgstr ""
+
+#: actions/passwordsettings.php:58
+msgid "Change password"
+msgstr "Verander wagwoord"
+
+#: actions/passwordsettings.php:69
+msgid "Change your password."
+msgstr "Verander u wagwoord."
+
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+msgid "Password change"
+msgstr "Verander wagwoord"
+
+#: actions/passwordsettings.php:104
+msgid "Old password"
+msgstr "Ou wagwoord"
+
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+msgid "New password"
+msgstr "Nuwe wagwoord"
+
+#: actions/passwordsettings.php:109
+msgid "6 or more characters"
+msgstr "6 of meer karakters"
+
+#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
+#: actions/register.php:433 actions/smssettings.php:134
+msgid "Confirm"
+msgstr "Bevestig"
+
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+msgid "Same as password above"
+msgstr "Dieselfde as wagwoord hierbo"
+
+#: actions/passwordsettings.php:117
+msgid "Change"
+msgstr "Wysig"
+
+#: actions/passwordsettings.php:154 actions/register.php:230
+msgid "Password must be 6 or more characters."
+msgstr "Wagwoord moet 6 of meer karakters bevat."
+
+#: actions/passwordsettings.php:157 actions/register.php:233
+msgid "Passwords don't match."
+msgstr "Wagwoorde is nie dieselfde nie."
+
+#: actions/passwordsettings.php:165
+msgid "Incorrect old password"
+msgstr "Verkeerde ou wagwoord"
+
+#: actions/passwordsettings.php:181
+msgid "Error saving user; invalid."
+msgstr "Fout tydens stoor van gebruiker; ongeldig."
+
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
+msgid "Can't save new password."
+msgstr "Kon nie nuwe wagwoord stoor nie."
+
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+msgid "Password saved."
+msgstr "Wagwoord gestoor."
+
+#. TRANS: Menu item for site administration
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:382
+msgid "Paths"
+msgstr "Paaie"
+
+#: actions/pathsadminpanel.php:70
+msgid "Path and server settings for this StatusNet site."
+msgstr ""
+
+#: actions/pathsadminpanel.php:157
+#, php-format
+msgid "Theme directory not readable: %s"
+msgstr ""
+
+#: actions/pathsadminpanel.php:163
+#, php-format
+msgid "Avatar directory not writable: %s"
+msgstr ""
+
+#: actions/pathsadminpanel.php:169
+#, php-format
+msgid "Background directory not writable: %s"
+msgstr ""
+
+#: actions/pathsadminpanel.php:177
+#, php-format
+msgid "Locales directory not readable: %s"
+msgstr ""
+
+#: actions/pathsadminpanel.php:183
+msgid "Invalid SSL server. The maximum length is 255 characters."
+msgstr ""
+
+#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
+msgid "Site"
+msgstr "Webtuiste"
+
+#: actions/pathsadminpanel.php:238
+msgid "Server"
+msgstr "Bediener"
+
+#: actions/pathsadminpanel.php:238
+msgid "Site's server hostname."
+msgstr ""
+
+#: actions/pathsadminpanel.php:242
+msgid "Path"
+msgstr "Pad"
+
+#: actions/pathsadminpanel.php:242
+msgid "Site path"
+msgstr ""
+
+#: actions/pathsadminpanel.php:246
+msgid "Path to locales"
+msgstr ""
+
+#: actions/pathsadminpanel.php:246
+msgid "Directory path to locales"
+msgstr ""
+
+#: actions/pathsadminpanel.php:250
+msgid "Fancy URLs"
+msgstr ""
+
+#: actions/pathsadminpanel.php:252
+msgid "Use fancy (more readable and memorable) URLs?"
+msgstr ""
+
+#: actions/pathsadminpanel.php:259
+msgid "Theme"
+msgstr "Tema"
+
+#: actions/pathsadminpanel.php:264
+msgid "Theme server"
+msgstr "Tema-bediener"
+
+#: actions/pathsadminpanel.php:268
+msgid "Theme path"
+msgstr "Tema-pad"
+
+#: actions/pathsadminpanel.php:272
+msgid "Theme directory"
+msgstr "Tema-gids"
+
+#: actions/pathsadminpanel.php:279
+msgid "Avatars"
+msgstr "Avatars"
+
+#: actions/pathsadminpanel.php:284
+msgid "Avatar server"
+msgstr "Avatar-bediener"
+
+#: actions/pathsadminpanel.php:288
+msgid "Avatar path"
+msgstr "Avatar-pad"
+
+#: actions/pathsadminpanel.php:292
+msgid "Avatar directory"
+msgstr "Avatar-gids"
+
+#: actions/pathsadminpanel.php:301
+msgid "Backgrounds"
+msgstr "Agtergronde"
+
+#: actions/pathsadminpanel.php:305
+msgid "Background server"
+msgstr "Agtergrond-bediener"
+
+#: actions/pathsadminpanel.php:309
+msgid "Background path"
+msgstr "Agtergrond-pad"
+
+#: actions/pathsadminpanel.php:313
+msgid "Background directory"
+msgstr "Agtergrond-gids"
+
+#: actions/pathsadminpanel.php:320
+msgid "SSL"
+msgstr "SSL"
+
+#: actions/pathsadminpanel.php:323 actions/snapshotadminpanel.php:202
+msgid "Never"
+msgstr "Nooit"
+
+#: actions/pathsadminpanel.php:324
+msgid "Sometimes"
+msgstr "Soms"
+
+#: actions/pathsadminpanel.php:325
+msgid "Always"
+msgstr "Altyd"
+
+#: actions/pathsadminpanel.php:329
+msgid "Use SSL"
+msgstr "Gebruik SSL"
+
+#: actions/pathsadminpanel.php:330
+msgid "When to use SSL"
+msgstr ""
+
+#: actions/pathsadminpanel.php:335
+msgid "SSL server"
+msgstr "SSL-bediener"
+
+#: actions/pathsadminpanel.php:336
+msgid "Server to direct SSL requests to"
+msgstr ""
+
+#: actions/pathsadminpanel.php:352
+msgid "Save paths"
+msgstr ""
+
+#: actions/peoplesearch.php:52
+#, php-format
+msgid ""
+"Search for people on %%site.name%% by their name, location, or interests. "
+"Separate the terms by spaces; they must be 3 characters or more."
+msgstr ""
+
+#: actions/peoplesearch.php:58
+msgid "People search"
+msgstr ""
+
+#: actions/peopletag.php:68
+#, php-format
+msgid "Not a valid people tag: %s"
+msgstr ""
+
+#: actions/peopletag.php:142
+#, php-format
+msgid "Users self-tagged with %1$s - page %2$d"
+msgstr ""
+
+#: actions/postnotice.php:95
+msgid "Invalid notice content"
+msgstr ""
+
+#: actions/postnotice.php:101
+#, php-format
+msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
+msgstr ""
+
+#: actions/profilesettings.php:60
+msgid "Profile settings"
+msgstr ""
+
+#: actions/profilesettings.php:71
+msgid ""
+"You can update your personal profile info here so people know more about you."
+msgstr ""
+
+#: actions/profilesettings.php:99
+msgid "Profile information"
+msgstr ""
+
+#: actions/profilesettings.php:108 lib/groupeditform.php:154
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+msgstr ""
+
+#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/showgroup.php:256 actions/tagother.php:104
+#: lib/groupeditform.php:157 lib/userprofile.php:150
+msgid "Full name"
+msgstr "Volledige naam"
+
+#: actions/profilesettings.php:115 actions/register.php:453
+#: lib/applicationeditform.php:228 lib/groupeditform.php:161
+msgid "Homepage"
+msgstr "Tuisblad"
+
+#: actions/profilesettings.php:117 actions/register.php:455
+msgid "URL of your homepage, blog, or profile on another site"
+msgstr ""
+
+#: actions/profilesettings.php:122 actions/register.php:461
+#, php-format
+msgid "Describe yourself and your interests in %d chars"
+msgstr ""
+
+#: actions/profilesettings.php:125 actions/register.php:464
+msgid "Describe yourself and your interests"
+msgstr ""
+
+#: actions/profilesettings.php:127 actions/register.php:466
+msgid "Bio"
+msgstr "Bio"
+
+#: actions/profilesettings.php:132 actions/register.php:471
+#: 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
+msgid "Where you are, like \"City, State (or Region), Country\""
+msgstr ""
+
+#: actions/profilesettings.php:138
+msgid "Share my current location when posting notices"
+msgstr ""
+
+#: actions/profilesettings.php:145 actions/tagother.php:149
+#: actions/tagother.php:209 lib/subscriptionlist.php:106
+#: lib/subscriptionlist.php:108 lib/userprofile.php:210
+msgid "Tags"
+msgstr "Etikette"
+
+#: actions/profilesettings.php:147
+msgid ""
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+msgstr ""
+
+#: actions/profilesettings.php:151
+msgid "Language"
+msgstr "Taal"
+
+#: actions/profilesettings.php:152
+msgid "Preferred language"
+msgstr ""
+
+#: actions/profilesettings.php:161
+msgid "Timezone"
+msgstr "Tydsone"
+
+#: actions/profilesettings.php:162
+msgid "What timezone are you normally in?"
+msgstr ""
+
+#: actions/profilesettings.php:167
+msgid ""
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+msgstr ""
+
+#: actions/profilesettings.php:228 actions/register.php:223
+#, php-format
+msgid "Bio is too long (max %d chars)."
+msgstr ""
+
+#: actions/profilesettings.php:235 actions/siteadminpanel.php:151
+msgid "Timezone not selected."
+msgstr ""
+
+#: actions/profilesettings.php:241
+msgid "Language is too long (max 50 chars)."
+msgstr ""
+
+#: actions/profilesettings.php:253 actions/tagother.php:178
+#, php-format
+msgid "Invalid tag: \"%s\""
+msgstr "Ongeldige etiket: \"$s\""
+
+#: actions/profilesettings.php:306
+msgid "Couldn't update user for autosubscribe."
+msgstr ""
+
+#: actions/profilesettings.php:363
+msgid "Couldn't save location prefs."
+msgstr ""
+
+#: actions/profilesettings.php:375
+msgid "Couldn't save profile."
+msgstr ""
+
+#: actions/profilesettings.php:383
+msgid "Couldn't save tags."
+msgstr ""
+
+#. TRANS: Message after successful saving of administrative settings.
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:141
+msgid "Settings saved."
+msgstr "Voorkeure is gestoor."
+
+#: actions/public.php:83
+#, php-format
+msgid "Beyond the page limit (%s)"
+msgstr ""
+
+#: actions/public.php:92
+msgid "Could not retrieve public stream."
+msgstr ""
+
+#: actions/public.php:130
+#, php-format
+msgid "Public timeline, page %d"
+msgstr ""
+
+#: actions/public.php:132 lib/publicgroupnav.php:79
+msgid "Public timeline"
+msgstr ""
+
+#: actions/public.php:160
+msgid "Public Stream Feed (RSS 1.0)"
+msgstr ""
+
+#: actions/public.php:164
+msgid "Public Stream Feed (RSS 2.0)"
+msgstr ""
+
+#: actions/public.php:168
+msgid "Public Stream Feed (Atom)"
+msgstr ""
+
+#: actions/public.php:188
+#, php-format
+msgid ""
+"This is the public timeline for %%site.name%% but no one has posted anything "
+"yet."
+msgstr ""
+
+#: actions/public.php:191
+msgid "Be the first to post!"
+msgstr "U kan die eerste een wees om 'n boodskap te plaas!"
+
+#: actions/public.php:195
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post!"
+msgstr ""
+
+#: actions/public.php:242
+#, 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. [Join now](%%action.register%%) to share notices about yourself with "
+"friends, family, and colleagues! ([Read more](%%doc.help%%))"
+msgstr ""
+
+#: actions/public.php:247
+#, 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 ""
+
+#: actions/publictagcloud.php:57
+msgid "Public tag cloud"
+msgstr ""
+
+#: actions/publictagcloud.php:63
+#, php-format
+msgid "These are most popular recent tags on %s "
+msgstr ""
+
+#: actions/publictagcloud.php:69
+#, php-format
+msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
+msgstr ""
+
+#: actions/publictagcloud.php:72
+msgid "Be the first to post one!"
+msgstr ""
+
+#: actions/publictagcloud.php:75
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post "
+"one!"
+msgstr ""
+
+#: actions/publictagcloud.php:134
+msgid "Tag cloud"
+msgstr ""
+
+#: actions/recoverpassword.php:36
+msgid "You are already logged in!"
+msgstr ""
+
+#: actions/recoverpassword.php:62
+msgid "No such recovery code."
+msgstr ""
+
+#: actions/recoverpassword.php:66
+msgid "Not a recovery code."
+msgstr ""
+
+#: actions/recoverpassword.php:73
+msgid "Recovery code for unknown user."
+msgstr ""
+
+#: actions/recoverpassword.php:86
+msgid "Error with confirmation code."
+msgstr ""
+
+#: actions/recoverpassword.php:97
+msgid "This confirmation code is too old. Please start again."
+msgstr ""
+
+#: actions/recoverpassword.php:111
+msgid "Could not update user with confirmed email address."
+msgstr ""
+
+#: actions/recoverpassword.php:152
+msgid ""
+"If you have forgotten or lost your password, you can get a new one sent to "
+"the email address you have stored in your account."
+msgstr ""
+
+#: actions/recoverpassword.php:158
+msgid "You have been identified. Enter a new password below. "
+msgstr ""
+
+#: actions/recoverpassword.php:188
+msgid "Password recovery"
+msgstr ""
+
+#: actions/recoverpassword.php:191
+msgid "Nickname or email address"
+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
+msgid "Recover"
+msgstr ""
+
+#: actions/recoverpassword.php:208
+msgid "Reset password"
+msgstr ""
+
+#: actions/recoverpassword.php:209
+msgid "Recover password"
+msgstr ""
+
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
+msgid "Password recovery requested"
+msgstr ""
+
+#: actions/recoverpassword.php:213
+msgid "Unknown action"
+msgstr "Onbekende aksie"
+
+#: actions/recoverpassword.php:236
+msgid "6 or more characters, and don't forget it!"
+msgstr ""
+
+#: actions/recoverpassword.php:243
+msgid "Reset"
+msgstr "Herstel"
+
+#: actions/recoverpassword.php:252
+msgid "Enter a nickname or email address."
+msgstr ""
+
+#: actions/recoverpassword.php:282
+msgid "No user with that email address or username."
+msgstr ""
+
+#: actions/recoverpassword.php:299
+msgid "No registered email address for that user."
+msgstr ""
+
+#: actions/recoverpassword.php:313
+msgid "Error saving address confirmation."
+msgstr ""
+
+#: actions/recoverpassword.php:338
+msgid ""
+"Instructions for recovering your password have been sent to the email "
+"address registered to your account."
+msgstr ""
+
+#: actions/recoverpassword.php:357
+msgid "Unexpected password reset."
+msgstr ""
+
+#: actions/recoverpassword.php:365
+msgid "Password must be 6 chars or more."
+msgstr ""
+
+#: actions/recoverpassword.php:369
+msgid "Password and confirmation do not match."
+msgstr ""
+
+#: actions/recoverpassword.php:388 actions/register.php:248
+msgid "Error setting user."
+msgstr ""
+
+#: actions/recoverpassword.php:395
+msgid "New password successfully saved. You are now logged in."
+msgstr ""
+
+#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+msgid "Sorry, only invited people can register."
+msgstr ""
+
+#: actions/register.php:92
+msgid "Sorry, invalid invitation code."
+msgstr ""
+
+#: actions/register.php:112
+msgid "Registration successful"
+msgstr "Die registrasie is voltooi"
+
+#: actions/register.php:114 actions/register.php:503 lib/logingroupnav.php:85
+msgid "Register"
+msgstr "Registreer"
+
+#: actions/register.php:135
+msgid "Registration not allowed."
+msgstr "Registrasie nie toegelaat nie."
+
+#: actions/register.php:198
+msgid "You can't register if you don't agree to the license."
+msgstr ""
+
+#: actions/register.php:212
+msgid "Email address already exists."
+msgstr "Die E-posadres bestaan reeds."
+
+#: actions/register.php:243 actions/register.php:265
+msgid "Invalid username or password."
+msgstr "Ongeldige gebruikersnaam of wagwoord."
+
+#: actions/register.php:343
+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
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+msgstr ""
+
+#: actions/register.php:430
+msgid "6 or more characters. Required."
+msgstr ""
+
+#: actions/register.php:434
+msgid "Same as password above. Required."
+msgstr ""
+
+#: actions/register.php:438 actions/register.php:442
+#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:120
+msgid "Email"
+msgstr "E-pos"
+
+#: actions/register.php:439 actions/register.php:443
+msgid "Used only for updates, announcements, and password recovery"
+msgstr ""
+
+#: actions/register.php:450
+msgid "Longer name, preferably your \"real\" name"
+msgstr ""
+
+#: actions/register.php:494
+msgid "My text and files are available under "
+msgstr ""
+
+#: actions/register.php:496
+msgid "Creative Commons Attribution 3.0"
+msgstr ""
+
+#: actions/register.php:497
+msgid ""
+" except this private data: password, email address, IM address, and phone "
+"number."
+msgstr ""
+
+#: actions/register.php:538
+#, php-format
+msgid ""
+"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
+"want to...\n"
+"\n"
+"* Go to [your profile](%2$s) and post your first message.\n"
+"* Add a [Jabber/GTalk address](%%%%action.imsettings%%%%) so you can send "
+"notices through instant messages.\n"
+"* [Search for people](%%%%action.peoplesearch%%%%) that you may know or that "
+"share your interests. \n"
+"* Update your [profile settings](%%%%action.profilesettings%%%%) to tell "
+"others more about you. \n"
+"* Read over the [online docs](%%%%doc.help%%%%) for features you may have "
+"missed. \n"
+"\n"
+"Thanks for signing up and we hope you enjoy using this service."
+msgstr ""
+
+#: actions/register.php:562
+msgid ""
+"(You should receive a message by email momentarily, with instructions on how "
+"to confirm your email address.)"
+msgstr ""
+
+#: actions/remotesubscribe.php:98
+#, php-format
+msgid ""
+"To subscribe, you can [login](%%action.login%%), or [register](%%action."
+"register%%) a new account. If you already have an account on a [compatible "
+"microblogging site](%%doc.openmublog%%), enter your profile URL below."
+msgstr ""
+
+#: actions/remotesubscribe.php:112
+msgid "Remote subscribe"
+msgstr ""
+
+#: actions/remotesubscribe.php:124
+msgid "Subscribe to a remote user"
+msgstr ""
+
+#: actions/remotesubscribe.php:129
+msgid "User nickname"
+msgstr ""
+
+#: actions/remotesubscribe.php:130
+msgid "Nickname of the user you want to follow"
+msgstr ""
+
+#: actions/remotesubscribe.php:133
+msgid "Profile URL"
+msgstr ""
+
+#: actions/remotesubscribe.php:134
+msgid "URL of your profile on another compatible microblogging service"
+msgstr ""
+
+#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
+#: lib/userprofile.php:406
+msgid "Subscribe"
+msgstr ""
+
+#: actions/remotesubscribe.php:159
+msgid "Invalid profile URL (bad format)"
+msgstr ""
+
+#: actions/remotesubscribe.php:168
+msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
+msgstr ""
+
+#: actions/remotesubscribe.php:176
+msgid "That’s a local profile! Login to subscribe."
+msgstr ""
+
+#: actions/remotesubscribe.php:183
+msgid "Couldn’t get a request token."
+msgstr ""
+
+#: actions/repeat.php:57
+msgid "Only logged-in users can repeat notices."
+msgstr ""
+
+#: actions/repeat.php:64 actions/repeat.php:71
+msgid "No notice specified."
+msgstr ""
+
+#: actions/repeat.php:76
+msgid "You can't repeat your own notice."
+msgstr ""
+
+#: actions/repeat.php:90
+msgid "You already repeated that notice."
+msgstr ""
+
+#: actions/repeat.php:114 lib/noticelist.php:678
+msgid "Repeated"
+msgstr "Herhalend"
+
+#: actions/repeat.php:119
+msgid "Repeated!"
+msgstr "Herhaal!"
+
+#: actions/replies.php:126 actions/repliesrss.php:68
+#: lib/personalgroupnav.php:105
+#, php-format
+msgid "Replies to %s"
+msgstr ""
+
+#: actions/replies.php:128
+#, php-format
+msgid "Replies to %1$s, page %2$d"
+msgstr ""
+
+#: actions/replies.php:145
+#, php-format
+msgid "Replies feed for %s (RSS 1.0)"
+msgstr ""
+
+#: actions/replies.php:152
+#, php-format
+msgid "Replies feed for %s (RSS 2.0)"
+msgstr ""
+
+#: actions/replies.php:159
+#, php-format
+msgid "Replies feed for %s (Atom)"
+msgstr ""
+
+#: actions/replies.php:199
+#, 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 ""
+
+#: actions/replies.php:204
+#, php-format
+msgid ""
+"You can engage other users in a conversation, subscribe to more people or "
+"[join groups](%%action.groups%%)."
+msgstr ""
+
+#: actions/replies.php:206
+#, php-format
+msgid ""
+"You can try to [nudge %1$s](../%2$s) or [post something to his or her "
+"attention](%%%%action.newnotice%%%%?status_textarea=%3$s)."
+msgstr ""
+
+#: actions/repliesrss.php:72
+#, php-format
+msgid "Replies to %1$s on %2$s!"
+msgstr ""
+
+#: actions/revokerole.php:75
+msgid "You cannot revoke user roles on this site."
+msgstr ""
+
+#: actions/revokerole.php:82
+msgid "User doesn't have this role."
+msgstr ""
+
+#: actions/rsd.php:146 actions/version.php:157
+msgid "StatusNet"
+msgstr "StatusNet"
+
+#: actions/sandbox.php:65 actions/unsandbox.php:65
+msgid "You cannot sandbox users on this site."
+msgstr ""
+
+#: actions/sandbox.php:72
+msgid "User is already sandboxed."
+msgstr ""
+
+#. TRANS: Menu item for site administration
+#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
+#: lib/adminpanelaction.php:390
+msgid "Sessions"
+msgstr "Sessies"
+
+#: actions/sessionsadminpanel.php:65
+msgid "Session settings for this StatusNet site."
+msgstr ""
+
+#: actions/sessionsadminpanel.php:175
+msgid "Handle sessions"
+msgstr ""
+
+#: actions/sessionsadminpanel.php:177
+msgid "Whether to handle sessions ourselves."
+msgstr ""
+
+#: actions/sessionsadminpanel.php:181
+msgid "Session debugging"
+msgstr ""
+
+#: actions/sessionsadminpanel.php:183
+msgid "Turn on debugging output for sessions."
+msgstr ""
+
+#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
+#: actions/useradminpanel.php:294
+msgid "Save site settings"
+msgstr ""
+
+#: actions/showapplication.php:82
+msgid "You must be logged in to view an application."
+msgstr ""
+
+#: actions/showapplication.php:157
+msgid "Application profile"
+msgstr ""
+
+#: actions/showapplication.php:159 lib/applicationeditform.php:180
+msgid "Icon"
+msgstr "Ikoon"
+
+#: actions/showapplication.php:169 actions/version.php:195
+#: lib/applicationeditform.php:195
+msgid "Name"
+msgstr "Naam"
+
+#: actions/showapplication.php:178 lib/applicationeditform.php:222
+msgid "Organization"
+msgstr "Organisasie"
+
+#: actions/showapplication.php:187 actions/version.php:198
+#: lib/applicationeditform.php:209 lib/groupeditform.php:172
+msgid "Description"
+msgstr "Beskrywing"
+
+#: actions/showapplication.php:192 actions/showgroup.php:444
+#: lib/profileaction.php:187
+msgid "Statistics"
+msgstr "Statistieke"
+
+#: actions/showapplication.php:203
+#, php-format
+msgid "Created by %1$s - %2$s access by default - %3$d users"
+msgstr ""
+
+#: actions/showapplication.php:213
+msgid "Application actions"
+msgstr ""
+
+#: actions/showapplication.php:236
+msgid "Reset key & secret"
+msgstr ""
+
+#: actions/showapplication.php:261
+msgid "Application info"
+msgstr ""
+
+#: actions/showapplication.php:263
+msgid "Consumer key"
+msgstr ""
+
+#: actions/showapplication.php:268
+msgid "Consumer secret"
+msgstr ""
+
+#: actions/showapplication.php:273
+msgid "Request token URL"
+msgstr ""
+
+#: actions/showapplication.php:278
+msgid "Access token URL"
+msgstr ""
+
+#: actions/showapplication.php:283
+msgid "Authorize URL"
+msgstr ""
+
+#: actions/showapplication.php:288
+msgid ""
+"Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
+"signature method."
+msgstr ""
+
+#: actions/showapplication.php:309
+msgid "Are you sure you want to reset your consumer key and secret?"
+msgstr ""
+
+#: actions/showfavorites.php:79
+#, php-format
+msgid "%1$s's favorite notices, page %2$d"
+msgstr ""
+
+#: actions/showfavorites.php:132
+msgid "Could not retrieve favorite notices."
+msgstr ""
+
+#: actions/showfavorites.php:171
+#, php-format
+msgid "Feed for favorites of %s (RSS 1.0)"
+msgstr ""
+
+#: actions/showfavorites.php:178
+#, php-format
+msgid "Feed for favorites of %s (RSS 2.0)"
+msgstr ""
+
+#: actions/showfavorites.php:185
+#, php-format
+msgid "Feed for favorites of %s (Atom)"
+msgstr ""
+
+#: actions/showfavorites.php:206
+msgid ""
+"You haven't chosen any favorite notices yet. Click the fave button on "
+"notices you like to bookmark them for later or shed a spotlight on them."
+msgstr ""
+
+#: actions/showfavorites.php:208
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Post something interesting "
+"they would add to their favorites :)"
+msgstr ""
+
+#: actions/showfavorites.php:212
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Why not [register an "
+"account](%%%%action.register%%%%) and then post something interesting they "
+"would add to their favorites :)"
+msgstr ""
+
+#: actions/showfavorites.php:243
+msgid "This is a way to share what you like."
+msgstr ""
+
+#: actions/showgroup.php:82 lib/groupnav.php:86
+#, php-format
+msgid "%s group"
+msgstr "%s groep"
+
+#: actions/showgroup.php:84
+#, php-format
+msgid "%1$s group, page %2$d"
+msgstr "Groep %1$s, bladsy %2$d"
+
+#: actions/showgroup.php:227
+msgid "Group profile"
+msgstr "Groepsprofiel"
+
+#: actions/showgroup.php:272 actions/tagother.php:118
+#: actions/userauthorization.php:175 lib/userprofile.php:178
+msgid "URL"
+msgstr "URL"
+
+#: actions/showgroup.php:283 actions/tagother.php:128
+#: actions/userauthorization.php:187 lib/userprofile.php:195
+msgid "Note"
+msgstr "Nota"
+
+#: actions/showgroup.php:293 lib/groupeditform.php:184
+msgid "Aliases"
+msgstr "Aliasse"
+
+#: actions/showgroup.php:302
+msgid "Group actions"
+msgstr "Groepsaksies"
+
+#: actions/showgroup.php:338
+#, php-format
+msgid "Notice feed for %s group (RSS 1.0)"
+msgstr ""
+
+#: actions/showgroup.php:344
+#, php-format
+msgid "Notice feed for %s group (RSS 2.0)"
+msgstr ""
+
+#: actions/showgroup.php:350
+#, php-format
+msgid "Notice feed for %s group (Atom)"
+msgstr ""
+
+#: actions/showgroup.php:355
+#, php-format
+msgid "FOAF for %s group"
+msgstr "Vriend van 'n vriend vir die groep %s"
+
+#: actions/showgroup.php:393 actions/showgroup.php:453 lib/groupnav.php:91
+msgid "Members"
+msgstr "Lede"
+
+#: actions/showgroup.php:398 lib/profileaction.php:117
+#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95
+#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
+msgid "(None)"
+msgstr "(geen)"
+
+#: actions/showgroup.php:404
+msgid "All members"
+msgstr "Alle lede"
+
+#: actions/showgroup.php:447
+msgid "Created"
+msgstr "Geskep"
+
+#: actions/showgroup.php:463
+#, 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 "
+"[StatusNet](http://status.net/) tool. Its members share short messages about "
+"their life and interests. [Join now](%%%%action.register%%%%) to become part "
+"of this group and many more! ([Read more](%%%%doc.help%%%%))"
+msgstr ""
+
+#: actions/showgroup.php:469
+#, 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 "
+"[StatusNet](http://status.net/) tool. Its members share short messages about "
+"their life and interests. "
+msgstr ""
+
+#: actions/showgroup.php:497
+msgid "Admins"
+msgstr "Administrateurs"
+
+#: actions/showmessage.php:81
+msgid "No such message."
+msgstr "Die boodskap bestaan nie."
+
+#: actions/showmessage.php:98
+msgid "Only the sender and recipient may read this message."
+msgstr ""
+
+#: actions/showmessage.php:108
+#, php-format
+msgid "Message to %1$s on %2$s"
+msgstr ""
+
+#: actions/showmessage.php:113
+#, php-format
+msgid "Message from %1$s on %2$s"
+msgstr ""
+
+#: actions/shownotice.php:90
+msgid "Notice deleted."
+msgstr ""
+
+#: actions/showstream.php:73
+#, php-format
+msgid " tagged %s"
+msgstr ""
+
+#: actions/showstream.php:79
+#, php-format
+msgid "%1$s, page %2$d"
+msgstr ""
+
+#: actions/showstream.php:122
+#, php-format
+msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
+msgstr ""
+
+#: actions/showstream.php:129
+#, php-format
+msgid "Notice feed for %s (RSS 1.0)"
+msgstr ""
+
+#: actions/showstream.php:136
+#, php-format
+msgid "Notice feed for %s (RSS 2.0)"
+msgstr ""
+
+#: actions/showstream.php:143
+#, php-format
+msgid "Notice feed for %s (Atom)"
+msgstr ""
+
+#: actions/showstream.php:148
+#, php-format
+msgid "FOAF for %s"
+msgstr "Vriend van 'n vriend (FOAF) vir %s"
+
+#: actions/showstream.php:200
+#, php-format
+msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
+msgstr ""
+
+#: actions/showstream.php:205
+msgid ""
+"Seen anything interesting recently? You haven't posted any notices yet, now "
+"would be a good time to start :)"
+msgstr ""
+
+#: actions/showstream.php:207
+#, php-format
+msgid ""
+"You can try to nudge %1$s or [post something to his or her attention](%%%%"
+"action.newnotice%%%%?status_textarea=%2$s)."
+msgstr ""
+
+#: actions/showstream.php:243
+#, 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. [Join now](%%%%action.register%%%%) to "
+"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
+msgstr ""
+
+#: actions/showstream.php:248
+#, 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 ""
+
+#: actions/showstream.php:305
+#, php-format
+msgid "Repeat of %s"
+msgstr "Herhaling van %s"
+
+#: actions/silence.php:65 actions/unsilence.php:65
+msgid "You cannot silence users on this site."
+msgstr ""
+
+#: actions/silence.php:72
+msgid "User is already silenced."
+msgstr ""
+
+#: actions/siteadminpanel.php:69
+msgid "Basic settings for this StatusNet site"
+msgstr ""
+
+#: actions/siteadminpanel.php:133
+msgid "Site name must have non-zero length."
+msgstr ""
+
+#: actions/siteadminpanel.php:141
+msgid "You must have a valid contact email address."
+msgstr ""
+
+#: actions/siteadminpanel.php:159
+#, php-format
+msgid "Unknown language \"%s\"."
+msgstr "Onbekende taal \"%s\"."
+
+#: actions/siteadminpanel.php:165
+msgid "Minimum text limit is 0 (unlimited)."
+msgstr ""
+
+#: actions/siteadminpanel.php:171
+msgid "Dupe limit must 1 or more seconds."
+msgstr ""
+
+#: actions/siteadminpanel.php:221
+msgid "General"
+msgstr "Algemeen"
+
+#: actions/siteadminpanel.php:224
+msgid "Site name"
+msgstr ""
+
+#: actions/siteadminpanel.php:225
+msgid "The name of your site, like \"Yourcompany Microblog\""
+msgstr ""
+
+#: actions/siteadminpanel.php:229
+msgid "Brought by"
+msgstr ""
+
+#: actions/siteadminpanel.php:230
+msgid "Text used for credits link in footer of each page"
+msgstr ""
+
+#: actions/siteadminpanel.php:234
+msgid "Brought by URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:235
+msgid "URL used for credits link in footer of each page"
+msgstr ""
+
+#: actions/siteadminpanel.php:239
+msgid "Contact email address for your site"
+msgstr ""
+
+#: actions/siteadminpanel.php:245
+msgid "Local"
+msgstr "Lokaal"
+
+#: actions/siteadminpanel.php:256
+msgid "Default timezone"
+msgstr "Standaardtydsone"
+
+#: actions/siteadminpanel.php:257
+msgid "Default timezone for the site; usually UTC."
+msgstr ""
+
+#: actions/siteadminpanel.php:262
+msgid "Default language"
+msgstr ""
+
+#: actions/siteadminpanel.php:263
+msgid "Site language when autodetection from browser settings is not available"
+msgstr ""
+
+#: actions/siteadminpanel.php:271
+msgid "Limits"
+msgstr ""
+
+#: actions/siteadminpanel.php:274
+msgid "Text limit"
+msgstr ""
+
+#: actions/siteadminpanel.php:274
+msgid "Maximum number of characters for notices."
+msgstr ""
+
+#: actions/siteadminpanel.php:278
+msgid "Dupe limit"
+msgstr ""
+
+#: actions/siteadminpanel.php:278
+msgid "How long users must wait (in seconds) to post the same thing again."
+msgstr ""
+
+#: actions/sitenoticeadminpanel.php:56
+msgid "Site Notice"
+msgstr ""
+
+#: actions/sitenoticeadminpanel.php:67
+msgid "Edit site-wide message"
+msgstr ""
+
+#: actions/sitenoticeadminpanel.php:103
+msgid "Unable to save site notice."
+msgstr ""
+
+#: actions/sitenoticeadminpanel.php:113
+msgid "Max length for the site-wide notice is 255 chars"
+msgstr ""
+
+#: actions/sitenoticeadminpanel.php:176
+msgid "Site notice text"
+msgstr ""
+
+#: actions/sitenoticeadminpanel.php:178
+msgid "Site-wide notice text (255 chars max; HTML okay)"
+msgstr ""
+
+#: actions/sitenoticeadminpanel.php:198
+msgid "Save site notice"
+msgstr ""
+
+#: actions/smssettings.php:58
+msgid "SMS settings"
+msgstr "SMS-instellings"
+
+#: actions/smssettings.php:69
+#, php-format
+msgid "You can receive SMS messages through email from %%site.name%%."
+msgstr ""
+
+#: actions/smssettings.php:91
+msgid "SMS is not available."
+msgstr ""
+
+#: actions/smssettings.php:112
+msgid "Current confirmed SMS-enabled phone number."
+msgstr ""
+
+#: actions/smssettings.php:123
+msgid "Awaiting confirmation on this phone number."
+msgstr ""
+
+#: actions/smssettings.php:130
+msgid "Confirmation code"
+msgstr ""
+
+#: actions/smssettings.php:131
+msgid "Enter the code you received on your phone."
+msgstr ""
+
+#: actions/smssettings.php:138
+msgid "SMS phone number"
+msgstr ""
+
+#: actions/smssettings.php:140
+msgid "Phone number, no punctuation or spaces, with area code"
+msgstr ""
+
+#: actions/smssettings.php:174
+msgid ""
+"Send me notices through SMS; I understand I may incur exorbitant charges "
+"from my carrier."
+msgstr ""
+
+#: actions/smssettings.php:306
+msgid "No phone number."
+msgstr "Geen telefoonnommer."
+
+#: actions/smssettings.php:311
+msgid "No carrier selected."
+msgstr ""
+
+#: actions/smssettings.php:318
+msgid "That is already your phone number."
+msgstr ""
+
+#: actions/smssettings.php:321
+msgid "That phone number already belongs to another user."
+msgstr ""
+
+#: actions/smssettings.php:347
+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 ""
+
+#: actions/smssettings.php:374
+msgid "That is the wrong confirmation number."
+msgstr ""
+
+#: actions/smssettings.php:405
+msgid "That is not your phone number."
+msgstr ""
+
+#: actions/smssettings.php:465
+msgid "Mobile carrier"
+msgstr ""
+
+#: actions/smssettings.php:469
+msgid "Select a carrier"
+msgstr ""
+
+#: actions/smssettings.php:476
+#, php-format
+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 ""
+
+#: actions/smssettings.php:498
+msgid "No code entered"
+msgstr ""
+
+#. TRANS: Menu item for site administration
+#: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
+#: lib/adminpanelaction.php:406
+msgid "Snapshots"
+msgstr ""
+
+#: actions/snapshotadminpanel.php:65
+msgid "Manage snapshot configuration"
+msgstr ""
+
+#: actions/snapshotadminpanel.php:127
+msgid "Invalid snapshot run value."
+msgstr ""
+
+#: actions/snapshotadminpanel.php:133
+msgid "Snapshot frequency must be a number."
+msgstr ""
+
+#: actions/snapshotadminpanel.php:144
+msgid "Invalid snapshot report URL."
+msgstr ""
+
+#: actions/snapshotadminpanel.php:200
+msgid "Randomly during Web hit"
+msgstr ""
+
+#: actions/snapshotadminpanel.php:201
+msgid "In a scheduled job"
+msgstr ""
+
+#: actions/snapshotadminpanel.php:206
+msgid "Data snapshots"
+msgstr ""
+
+#: actions/snapshotadminpanel.php:208
+msgid "When to send statistical data to status.net servers"
+msgstr ""
+
+#: actions/snapshotadminpanel.php:217
+msgid "Frequency"
+msgstr "Frekwensie"
+
+#: actions/snapshotadminpanel.php:218
+msgid "Snapshots will be sent once every N web hits"
+msgstr ""
+
+#: actions/snapshotadminpanel.php:226
+msgid "Report URL"
+msgstr ""
+
+#: actions/snapshotadminpanel.php:227
+msgid "Snapshots will be sent to this URL"
+msgstr ""
+
+#: actions/snapshotadminpanel.php:248
+msgid "Save snapshot settings"
+msgstr ""
+
+#: actions/subedit.php:70
+msgid "You are not subscribed to that profile."
+msgstr ""
+
+#: actions/subedit.php:83 classes/Subscription.php:132
+msgid "Could not save subscription."
+msgstr ""
+
+#: actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr ""
+
+#: actions/subscribe.php:107
+msgid "No such profile."
+msgstr ""
+
+#: actions/subscribe.php:117
+msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
+msgstr ""
+
+#: actions/subscribe.php:145
+msgid "Subscribed"
+msgstr ""
+
+#: actions/subscribers.php:50
+#, php-format
+msgid "%s subscribers"
+msgstr ""
+
+#: actions/subscribers.php:52
+#, php-format
+msgid "%1$s subscribers, page %2$d"
+msgstr ""
+
+#: actions/subscribers.php:63
+msgid "These are the people who listen to your notices."
+msgstr ""
+
+#: actions/subscribers.php:67
+#, php-format
+msgid "These are the people who listen to %s's notices."
+msgstr ""
+
+#: actions/subscribers.php:108
+msgid ""
+"You have no subscribers. Try subscribing to people you know and they might "
+"return the favor"
+msgstr ""
+
+#: actions/subscribers.php:110
+#, php-format
+msgid "%s has no subscribers. Want to be the first?"
+msgstr ""
+
+#: actions/subscribers.php:114
+#, php-format
+msgid ""
+"%s has no subscribers. Why not [register an account](%%%%action.register%%%"
+"%) and be the first?"
+msgstr ""
+
+#: actions/subscriptions.php:52
+#, php-format
+msgid "%s subscriptions"
+msgstr ""
+
+#: actions/subscriptions.php:54
+#, php-format
+msgid "%1$s subscriptions, page %2$d"
+msgstr ""
+
+#: actions/subscriptions.php:65
+msgid "These are the people whose notices you listen to."
+msgstr ""
+
+#: actions/subscriptions.php:69
+#, php-format
+msgid "These are the people whose notices %s listens to."
+msgstr ""
+
+#: actions/subscriptions.php:126
+#, php-format
+msgid ""
+"You're not listening to anyone's notices right now, try subscribing to "
+"people you know. Try [people search](%%action.peoplesearch%%), look for "
+"members in groups you're interested in and in our [featured users](%%action."
+"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
+"automatically subscribe to people you already follow there."
+msgstr ""
+
+#: actions/subscriptions.php:128 actions/subscriptions.php:132
+#, php-format
+msgid "%s is not listening to anyone."
+msgstr ""
+
+#: actions/subscriptions.php:208
+msgid "Jabber"
+msgstr "Jabber"
+
+#: actions/subscriptions.php:222 lib/connectsettingsaction.php:115
+msgid "SMS"
+msgstr "SMS"
+
+#: actions/tag.php:69
+#, php-format
+msgid "Notices tagged with %1$s, page %2$d"
+msgstr ""
+
+#: actions/tag.php:87
+#, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr ""
+
+#: actions/tag.php:93
+#, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr ""
+
+#: actions/tag.php:99
+#, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr ""
+
+#: actions/tagother.php:39
+msgid "No ID argument."
+msgstr "Geen ID-argument."
+
+#: actions/tagother.php:65
+#, php-format
+msgid "Tag %s"
+msgstr "Etiket $s"
+
+#: actions/tagother.php:77 lib/userprofile.php:76
+msgid "User profile"
+msgstr "Gebruikersprofiel"
+
+#: actions/tagother.php:81 actions/userauthorization.php:132
+#: lib/userprofile.php:103
+msgid "Photo"
+msgstr "Foto"
+
+#: actions/tagother.php:141
+msgid "Tag user"
+msgstr "Etiketteer gebruiker"
+
+#: actions/tagother.php:151
+msgid ""
+"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
+"separated"
+msgstr ""
+
+#: actions/tagother.php:193
+msgid ""
+"You can only tag people you are subscribed to or who are subscribed to you."
+msgstr ""
+
+#: actions/tagother.php:200
+msgid "Could not save tags."
+msgstr ""
+
+#: actions/tagother.php:236
+msgid "Use this form to add tags to your subscribers or subscriptions."
+msgstr ""
+
+#: actions/tagrss.php:35
+msgid "No such tag."
+msgstr "Onbekende etiket."
+
+#: actions/twitapitrends.php:85
+msgid "API method under construction."
+msgstr ""
+
+#: actions/unblock.php:59
+msgid "You haven't blocked that user."
+msgstr ""
+
+#: actions/unsandbox.php:72
+msgid "User is not sandboxed."
+msgstr ""
+
+#: actions/unsilence.php:72
+msgid "User is not silenced."
+msgstr ""
+
+#: actions/unsubscribe.php:77
+msgid "No profile id in request."
+msgstr ""
+
+#: actions/unsubscribe.php:98
+msgid "Unsubscribed"
+msgstr ""
+
+#: actions/updateprofile.php:64 actions/userauthorization.php:337
+#, php-format
+msgid ""
+"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
+msgstr ""
+
+#. TRANS: User admin panel title
+#: actions/useradminpanel.php:59
+msgctxt "TITLE"
+msgid "User"
+msgstr "Gebruiker"
+
+#: actions/useradminpanel.php:70
+msgid "User settings for this StatusNet site."
+msgstr ""
+
+#: actions/useradminpanel.php:149
+msgid "Invalid bio limit. Must be numeric."
+msgstr ""
+
+#: actions/useradminpanel.php:155
+msgid "Invalid welcome text. Max length is 255 characters."
+msgstr ""
+
+#: actions/useradminpanel.php:165
+#, php-format
+msgid "Invalid default subscripton: '%1$s' is not user."
+msgstr ""
+
+#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108
+#: lib/personalgroupnav.php:109
+msgid "Profile"
+msgstr "Profiel"
+
+#: actions/useradminpanel.php:222
+msgid "Bio Limit"
+msgstr "Profiellimiet"
+
+#: actions/useradminpanel.php:223
+msgid "Maximum length of a profile bio in characters."
+msgstr ""
+
+#: actions/useradminpanel.php:231
+msgid "New users"
+msgstr "Nuwe gebruikers"
+
+#: actions/useradminpanel.php:235
+msgid "New user welcome"
+msgstr ""
+
+#: actions/useradminpanel.php:236
+msgid "Welcome text for new users (Max 255 chars)."
+msgstr ""
+
+#: actions/useradminpanel.php:241
+msgid "Default subscription"
+msgstr ""
+
+#: actions/useradminpanel.php:242
+msgid "Automatically subscribe new users to this user."
+msgstr ""
+
+#: actions/useradminpanel.php:251
+msgid "Invitations"
+msgstr "Uitnodigings"
+
+#: actions/useradminpanel.php:256
+msgid "Invitations enabled"
+msgstr ""
+
+#: actions/useradminpanel.php:258
+msgid "Whether to allow users to invite new users."
+msgstr ""
+
+#: actions/userauthorization.php:105
+msgid "Authorize subscription"
+msgstr ""
+
+#: actions/userauthorization.php:110
+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 ""
+
+#: actions/userauthorization.php:196 actions/version.php:165
+msgid "License"
+msgstr "Lisensie"
+
+#: actions/userauthorization.php:217
+msgid "Accept"
+msgstr "Aanvaar"
+
+#: actions/userauthorization.php:218 lib/subscribeform.php:115
+#: lib/subscribeform.php:139
+msgid "Subscribe to this user"
+msgstr ""
+
+#: actions/userauthorization.php:219
+msgid "Reject"
+msgstr "Verwerp"
+
+#: actions/userauthorization.php:220
+msgid "Reject this subscription"
+msgstr ""
+
+#: actions/userauthorization.php:232
+msgid "No authorization request!"
+msgstr ""
+
+#: actions/userauthorization.php:254
+msgid "Subscription authorized"
+msgstr ""
+
+#: actions/userauthorization.php:256
+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 ""
+
+#: actions/userauthorization.php:266
+msgid "Subscription rejected"
+msgstr ""
+
+#: actions/userauthorization.php:268
+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 ""
+
+#: actions/userauthorization.php:303
+#, php-format
+msgid "Listener URI ‘%s’ not found here."
+msgstr ""
+
+#: actions/userauthorization.php:308
+#, php-format
+msgid "Listenee URI ‘%s’ is too long."
+msgstr ""
+
+#: actions/userauthorization.php:314
+#, php-format
+msgid "Listenee URI ‘%s’ is a local user."
+msgstr ""
+
+#: actions/userauthorization.php:329
+#, php-format
+msgid "Profile URL ‘%s’ is for a local user."
+msgstr ""
+
+#: actions/userauthorization.php:345
+#, php-format
+msgid "Avatar URL ‘%s’ is not valid."
+msgstr ""
+
+#: actions/userauthorization.php:350
+#, php-format
+msgid "Can’t read avatar URL ‘%s’."
+msgstr ""
+
+#: actions/userauthorization.php:355
+#, php-format
+msgid "Wrong image type for avatar URL ‘%s’."
+msgstr ""
+
+#: actions/userdesignsettings.php:76 lib/designsettings.php:65
+msgid "Profile design"
+msgstr ""
+
+#: actions/userdesignsettings.php:87 lib/designsettings.php:76
+msgid ""
+"Customize the way your profile looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
+
+#: actions/userdesignsettings.php:282
+msgid "Enjoy your hotdog!"
+msgstr "Geniet u worsbroodjie!"
+
+#: actions/usergroups.php:64
+#, php-format
+msgid "%1$s groups, page %2$d"
+msgstr ""
+
+#: actions/usergroups.php:130
+msgid "Search for more groups"
+msgstr ""
+
+#: actions/usergroups.php:157
+#, php-format
+msgid "%s is not a member of any group."
+msgstr ""
+
+#: actions/usergroups.php:162
+#, php-format
+msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
+msgstr ""
+
+#: actions/userrss.php:95 lib/atomgroupnoticefeed.php:66
+#: lib/atomusernoticefeed.php:72
+#, php-format
+msgid "Updates from %1$s on %2$s!"
+msgstr "Opdaterings van %1$s op %2$s."
+
+#: actions/version.php:73
+#, php-format
+msgid "StatusNet %s"
+msgstr "StatusNet %s"
+
+#: actions/version.php:153
+#, 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
+msgid "Contributors"
+msgstr "Medewerkers"
+
+#: actions/version.php:168
+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 ""
+
+#: actions/version.php:174
+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 ""
+
+#: actions/version.php:180
+#, 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
+msgid "Plugins"
+msgstr ""
+
+#: actions/version.php:196 lib/action.php:766
+msgid "Version"
+msgstr "Weergawe"
+
+#: actions/version.php:197
+msgid "Author(s)"
+msgstr "Outeur(s)"
+
+#: classes/File.php:169
+#, 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
+#, php-format
+msgid "A file this large would exceed your user quota of %d bytes."
+msgstr ""
+
+#: classes/File.php:186
+#, php-format
+msgid "A file this large would exceed your monthly quota of %d bytes."
+msgstr ""
+
+#: classes/Group_member.php:41
+msgid "Group join failed."
+msgstr ""
+
+#: classes/Group_member.php:53
+msgid "Not part of group."
+msgstr "Nie lid van die groep nie."
+
+#: classes/Group_member.php:60
+msgid "Group leave failed."
+msgstr ""
+
+#: classes/Local_group.php:41
+msgid "Could not update local group."
+msgstr ""
+
+#: classes/Login_token.php:76
+#, php-format
+msgid "Could not create login token for %s"
+msgstr ""
+
+#: classes/Message.php:45
+msgid "You are banned from sending direct messages."
+msgstr ""
+
+#: classes/Message.php:61
+msgid "Could not insert message."
+msgstr ""
+
+#: classes/Message.php:71
+msgid "Could not update message with new URI."
+msgstr ""
+
+#: classes/Notice.php:175
+#, php-format
+msgid "DB error inserting hashtag: %s"
+msgstr ""
+
+#: classes/Notice.php:244
+msgid "Problem saving notice. Too long."
+msgstr ""
+
+#: classes/Notice.php:248
+msgid "Problem saving notice. Unknown user."
+msgstr ""
+
+#: classes/Notice.php:253
+msgid ""
+"Too many notices too fast; take a breather and post again in a few minutes."
+msgstr ""
+
+#: classes/Notice.php:259
+msgid ""
+"Too many duplicate messages too quickly; take a breather and post again in a "
+"few minutes."
+msgstr ""
+
+#: classes/Notice.php:265
+msgid "You are banned from posting notices on this site."
+msgstr ""
+
+#: classes/Notice.php:331 classes/Notice.php:357
+msgid "Problem saving notice."
+msgstr ""
+
+#: classes/Notice.php:943
+msgid "Problem saving group inbox."
+msgstr ""
+
+#: classes/Notice.php:1481
+#, php-format
+msgid "RT @%1$s %2$s"
+msgstr "RT @%1$s %2$s"
+
+#: classes/Subscription.php:74 lib/oauthstore.php:465
+msgid "You have been banned from subscribing."
+msgstr ""
+
+#: classes/Subscription.php:78
+msgid "Already subscribed!"
+msgstr ""
+
+#: classes/Subscription.php:82
+msgid "User has blocked you."
+msgstr ""
+
+#: classes/Subscription.php:167
+msgid "Not subscribed!"
+msgstr ""
+
+#: classes/Subscription.php:173
+msgid "Couldn't delete self-subscription."
+msgstr ""
+
+#: classes/Subscription.php:200
+msgid "Couldn't delete subscription OMB token."
+msgstr ""
+
+#: classes/Subscription.php:211
+msgid "Couldn't delete subscription."
+msgstr ""
+
+#: classes/User.php:363
+#, php-format
+msgid "Welcome to %1$s, @%2$s!"
+msgstr "Welkom by %1$s, @%2$s!"
+
+#: classes/User_group.php:480
+msgid "Could not create group."
+msgstr "Kon nie die groep skep nie."
+
+#: classes/User_group.php:489
+msgid "Could not set group URI."
+msgstr ""
+
+#: classes/User_group.php:510
+msgid "Could not set group membership."
+msgstr ""
+
+#: classes/User_group.php:524
+msgid "Could not save local group info."
+msgstr ""
+
+#: lib/accountsettingsaction.php:108
+msgid "Change your profile settings"
+msgstr "Verander u profiel gegewens"
+
+#: lib/accountsettingsaction.php:112
+msgid "Upload an avatar"
+msgstr ""
+
+#: lib/accountsettingsaction.php:116
+msgid "Change your password"
+msgstr "Verander u wagwoord"
+
+#: lib/accountsettingsaction.php:120
+msgid "Change email handling"
+msgstr ""
+
+#: lib/accountsettingsaction.php:124
+msgid "Design your profile"
+msgstr "Ontwerp u profiel"
+
+#: lib/accountsettingsaction.php:128
+msgid "Other"
+msgstr "Ander"
+
+#: lib/accountsettingsaction.php:128
+msgid "Other options"
+msgstr "Ander opsies"
+
+#: lib/action.php:144
+#, php-format
+msgid "%1$s - %2$s"
+msgstr "%1$s - %2$s"
+
+#: lib/action.php:159
+msgid "Untitled page"
+msgstr ""
+
+#: lib/action.php:423
+msgid "Primary site navigation"
+msgstr ""
+
+#. TRANS: Tooltip for main menu option "Personal"
+#: lib/action.php:429
+msgctxt "TOOLTIP"
+msgid "Personal profile and friends timeline"
+msgstr ""
+
+#: lib/action.php:432
+msgctxt "MENU"
+msgid "Personal"
+msgstr "Persoonlik"
+
+#. TRANS: Tooltip for main menu option "Account"
+#: lib/action.php:434
+msgctxt "TOOLTIP"
+msgid "Change your email, avatar, password, profile"
+msgstr ""
+
+#. TRANS: Tooltip for main menu option "Services"
+#: lib/action.php:439
+msgctxt "TOOLTIP"
+msgid "Connect to services"
+msgstr ""
+
+#: lib/action.php:442
+msgid "Connect"
+msgstr "Konnekteer"
+
+#. TRANS: Tooltip for menu option "Admin"
+#: lib/action.php:445
+msgctxt "TOOLTIP"
+msgid "Change site configuration"
+msgstr ""
+
+#: lib/action.php:448
+msgctxt "MENU"
+msgid "Admin"
+msgstr "Beheer"
+
+#. TRANS: Tooltip for main menu option "Invite"
+#: lib/action.php:452
+#, php-format
+msgctxt "TOOLTIP"
+msgid "Invite friends and colleagues to join you on %s"
+msgstr ""
+
+#: lib/action.php:455
+msgctxt "MENU"
+msgid "Invite"
+msgstr "Uitnodig"
+
+#. TRANS: Tooltip for main menu option "Logout"
+#: lib/action.php:461
+msgctxt "TOOLTIP"
+msgid "Logout from the site"
+msgstr ""
+
+#: lib/action.php:464
+msgctxt "MENU"
+msgid "Logout"
+msgstr "Teken uit"
+
+#. TRANS: Tooltip for main menu option "Register"
+#: lib/action.php:469
+msgctxt "TOOLTIP"
+msgid "Create an account"
+msgstr "Skep 'n gebruiker"
+
+#: lib/action.php:472
+msgctxt "MENU"
+msgid "Register"
+msgstr "Registreer"
+
+#. TRANS: Tooltip for main menu option "Login"
+#: lib/action.php:475
+msgctxt "TOOLTIP"
+msgid "Login to the site"
+msgstr "Meld by die webwerf aan"
+
+#: lib/action.php:478
+msgctxt "MENU"
+msgid "Login"
+msgstr "Teken in"
+
+#. TRANS: Tooltip for main menu option "Help"
+#: lib/action.php:481
+msgctxt "TOOLTIP"
+msgid "Help me!"
+msgstr "Help my!"
+
+#: lib/action.php:484
+msgctxt "MENU"
+msgid "Help"
+msgstr "Help"
+
+#. TRANS: Tooltip for main menu option "Search"
+#: lib/action.php:487
+msgctxt "TOOLTIP"
+msgid "Search for people or text"
+msgstr "Soek na mense of teks"
+
+#: lib/action.php:490
+msgctxt "MENU"
+msgid "Search"
+msgstr "Soek"
+
+#. TRANS: DT element for site notice. String is hidden in default CSS.
+#. TRANS: Menu item for site administration
+#: lib/action.php:512 lib/adminpanelaction.php:398
+msgid "Site notice"
+msgstr ""
+
+#: lib/action.php:578
+msgid "Local views"
+msgstr ""
+
+#: lib/action.php:644
+msgid "Page notice"
+msgstr ""
+
+#: lib/action.php:746
+msgid "Secondary site navigation"
+msgstr ""
+
+#: lib/action.php:751
+msgid "Help"
+msgstr "Help"
+
+#: lib/action.php:753
+msgid "About"
+msgstr "Aangaande"
+
+#: lib/action.php:755
+msgid "FAQ"
+msgstr "Gewilde vrae"
+
+#: lib/action.php:759
+msgid "TOS"
+msgstr "Gebruiksvoorwaardes"
+
+#: lib/action.php:762
+msgid "Privacy"
+msgstr "Privaatheid"
+
+#: lib/action.php:764
+msgid "Source"
+msgstr "Bron"
+
+#: lib/action.php:768
+msgid "Contact"
+msgstr "Kontak"
+
+#: lib/action.php:770
+msgid "Badge"
+msgstr ""
+
+#: lib/action.php:798
+msgid "StatusNet software license"
+msgstr ""
+
+#: lib/action.php:803
+#, php-format
+msgid ""
+"**%%site.name%%** is a microblogging service brought to you by [%%site."
+"broughtby%%](%%site.broughtbyurl%%). "
+msgstr ""
+
+#: lib/action.php:805
+#, php-format
+msgid "**%%site.name%%** is a microblogging service. "
+msgstr ""
+
+#: lib/action.php:808
+#, php-format
+msgid ""
+"It runs the [StatusNet](http://status.net/) microblogging software, version %"
+"s, available under the [GNU Affero General Public License](http://www.fsf."
+"org/licensing/licenses/agpl-3.0.html)."
+msgstr ""
+
+#: lib/action.php:823
+msgid "Site content license"
+msgstr ""
+
+#: lib/action.php:828
+#, php-format
+msgid "Content and data of %1$s are private and confidential."
+msgstr ""
+
+#: lib/action.php:833
+#, php-format
+msgid "Content and data copyright by %1$s. All rights reserved."
+msgstr ""
+
+#: lib/action.php:836
+msgid "Content and data copyright by contributors. All rights reserved."
+msgstr ""
+
+#: lib/action.php:849
+msgid "All "
+msgstr "Alle "
+
+#: lib/action.php:855
+msgid "license."
+msgstr "Lisensie."
+
+#: lib/action.php:1154
+msgid "Pagination"
+msgstr ""
+
+#: lib/action.php:1163
+msgid "After"
+msgstr "Na"
+
+#: lib/action.php:1171
+msgid "Before"
+msgstr "Voor"
+
+#: lib/activity.php:120
+msgid "Expecting a root feed element but got a whole XML document."
+msgstr ""
+
+#: lib/activityutils.php:208
+msgid "Can't handle remote content yet."
+msgstr ""
+
+#: lib/activityutils.php:236
+msgid "Can't handle embedded XML content yet."
+msgstr ""
+
+#: lib/activityutils.php:240
+msgid "Can't handle embedded Base64 content yet."
+msgstr ""
+
+#. TRANS: Client error message
+#: lib/adminpanelaction.php:98
+msgid "You cannot make changes to this site."
+msgstr ""
+
+#. TRANS: Client error message
+#: lib/adminpanelaction.php:110
+msgid "Changes to that panel are not allowed."
+msgstr ""
+
+#. TRANS: Client error message
+#: lib/adminpanelaction.php:229
+msgid "showForm() not implemented."
+msgstr ""
+
+#. TRANS: Client error message
+#: lib/adminpanelaction.php:259
+msgid "saveSettings() not implemented."
+msgstr ""
+
+#. TRANS: Client error message
+#: lib/adminpanelaction.php:283
+msgid "Unable to delete design setting."
+msgstr ""
+
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:348
+msgid "Basic site configuration"
+msgstr ""
+
+#. TRANS: Menu item for site administration
+#: lib/adminpanelaction.php:350
+msgctxt "MENU"
+msgid "Site"
+msgstr "Webtuiste"
+
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:356
+msgid "Design configuration"
+msgstr ""
+
+#. TRANS: Menu item for site administration
+#: lib/adminpanelaction.php:358
+msgctxt "MENU"
+msgid "Design"
+msgstr "Ontwerp"
+
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:364
+msgid "User configuration"
+msgstr ""
+
+#. TRANS: Menu item for site administration
+#: lib/adminpanelaction.php:366 lib/personalgroupnav.php:115
+msgid "User"
+msgstr "Gebruiker"
+
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:372
+msgid "Access configuration"
+msgstr ""
+
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:380
+msgid "Paths configuration"
+msgstr ""
+
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:388
+msgid "Sessions configuration"
+msgstr ""
+
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:396
+msgid "Edit site notice"
+msgstr ""
+
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:404
+msgid "Snapshots configuration"
+msgstr ""
+
+#: lib/apiauth.php:94
+msgid "API resource requires read-write access, but you only have read access."
+msgstr ""
+
+#: lib/apiauth.php:276
+#, php-format
+msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s"
+msgstr ""
+
+#: lib/applicationeditform.php:136
+msgid "Edit application"
+msgstr ""
+
+#: lib/applicationeditform.php:184
+msgid "Icon for this application"
+msgstr ""
+
+#: lib/applicationeditform.php:204
+#, php-format
+msgid "Describe your application in %d characters"
+msgstr ""
+
+#: lib/applicationeditform.php:207
+msgid "Describe your application"
+msgstr ""
+
+#: lib/applicationeditform.php:216
+msgid "Source URL"
+msgstr ""
+
+#: lib/applicationeditform.php:218
+msgid "URL of the homepage of this application"
+msgstr ""
+
+#: lib/applicationeditform.php:224
+msgid "Organization responsible for this application"
+msgstr ""
+
+#: lib/applicationeditform.php:230
+msgid "URL for the homepage of the organization"
+msgstr ""
+
+#: lib/applicationeditform.php:236
+msgid "URL to redirect to after authentication"
+msgstr ""
+
+#: lib/applicationeditform.php:258
+msgid "Browser"
+msgstr "Webblaaier"
+
+#: lib/applicationeditform.php:274
+msgid "Desktop"
+msgstr ""
+
+#: lib/applicationeditform.php:275
+msgid "Type of application, browser or desktop"
+msgstr ""
+
+#: lib/applicationeditform.php:297
+msgid "Read-only"
+msgstr "Lees-alleen"
+
+#: lib/applicationeditform.php:315
+msgid "Read-write"
+msgstr "Lees-skryf"
+
+#: lib/applicationeditform.php:316
+msgid "Default access for this application: read-only, or read-write"
+msgstr ""
+
+#: lib/applicationlist.php:154
+msgid "Revoke"
+msgstr "Herroep"
+
+#: lib/attachmentlist.php:87
+msgid "Attachments"
+msgstr "Aanhangsels"
+
+#: lib/attachmentlist.php:263
+msgid "Author"
+msgstr "Outeur"
+
+#: lib/attachmentlist.php:276
+msgid "Provider"
+msgstr "Verskaffer"
+
+#: lib/attachmentnoticesection.php:67
+msgid "Notices where this attachment appears"
+msgstr ""
+
+#: lib/attachmenttagcloudsection.php:48
+msgid "Tags for this attachment"
+msgstr ""
+
+#: lib/authenticationplugin.php:220 lib/authenticationplugin.php:225
+msgid "Password changing failed"
+msgstr ""
+
+#: lib/authenticationplugin.php:235
+msgid "Password changing is not allowed"
+msgstr ""
+
+#: lib/channel.php:157 lib/channel.php:177
+msgid "Command results"
+msgstr ""
+
+#: lib/channel.php:229 lib/mailhandler.php:142
+msgid "Command complete"
+msgstr ""
+
+#: lib/channel.php:240
+msgid "Command failed"
+msgstr ""
+
+#: lib/command.php:83 lib/command.php:105
+msgid "Notice with that id does not exist"
+msgstr ""
+
+#: lib/command.php:99 lib/command.php:570
+msgid "User has no last notice"
+msgstr ""
+
+#: lib/command.php:125
+#, php-format
+msgid "Could not find a user with nickname %s"
+msgstr ""
+
+#: lib/command.php:143
+#, php-format
+msgid "Could not find a local user with nickname %s"
+msgstr ""
+
+#: lib/command.php:176
+msgid "Sorry, this command is not yet implemented."
+msgstr ""
+
+#: lib/command.php:221
+msgid "It does not make a lot of sense to nudge yourself!"
+msgstr ""
+
+#: lib/command.php:228
+#, php-format
+msgid "Nudge sent to %s"
+msgstr ""
+
+#: lib/command.php:254
+#, php-format
+msgid ""
+"Subscriptions: %1$s\n"
+"Subscribers: %2$s\n"
+"Notices: %3$s"
+msgstr ""
+
+#: lib/command.php:296
+msgid "Notice marked as fave."
+msgstr ""
+
+#: lib/command.php:317
+msgid "You are already a member of that group"
+msgstr ""
+
+#: lib/command.php:331
+#, php-format
+msgid "Could not join user %s to group %s"
+msgstr ""
+
+#: lib/command.php:336
+#, php-format
+msgid "%s joined group %s"
+msgstr ""
+
+#: lib/command.php:373
+#, php-format
+msgid "Could not remove user %s to group %s"
+msgstr ""
+
+#: lib/command.php:378
+#, php-format
+msgid "%s left group %s"
+msgstr ""
+
+#: lib/command.php:401
+#, php-format
+msgid "Fullname: %s"
+msgstr "Volle naam: %s"
+
+#: lib/command.php:404 lib/mail.php:258
+#, php-format
+msgid "Location: %s"
+msgstr "Ligging: %s"
+
+#: lib/command.php:407 lib/mail.php:260
+#, php-format
+msgid "Homepage: %s"
+msgstr "Tuisblad: %s"
+
+#: lib/command.php:410
+#, php-format
+msgid "About: %s"
+msgstr "Oor: %s"
+
+#: lib/command.php:437
+#, php-format
+msgid ""
+"%s is a remote profile; you can only send direct messages to users on the "
+"same server."
+msgstr ""
+
+#: lib/command.php:450
+#, php-format
+msgid "Message too long - maximum is %d characters, you sent %d"
+msgstr ""
+
+#: lib/command.php:468
+#, php-format
+msgid "Direct message to %s sent"
+msgstr ""
+
+#: lib/command.php:470
+msgid "Error sending direct message."
+msgstr ""
+
+#: lib/command.php:490
+msgid "Cannot repeat your own notice"
+msgstr ""
+
+#: lib/command.php:495
+msgid "Already repeated that notice"
+msgstr ""
+
+#: lib/command.php:503
+#, php-format
+msgid "Notice from %s repeated"
+msgstr ""
+
+#: lib/command.php:505
+msgid "Error repeating notice."
+msgstr ""
+
+#: lib/command.php:536
+#, php-format
+msgid "Notice too long - maximum is %d characters, you sent %d"
+msgstr ""
+
+#: lib/command.php:545
+#, php-format
+msgid "Reply to %s sent"
+msgstr ""
+
+#: lib/command.php:547
+msgid "Error saving notice."
+msgstr ""
+
+#: lib/command.php:594
+msgid "Specify the name of the user to subscribe to"
+msgstr ""
+
+#: lib/command.php:602
+msgid "Can't subscribe to OMB profiles by command."
+msgstr ""
+
+#: lib/command.php:608
+#, php-format
+msgid "Subscribed to %s"
+msgstr ""
+
+#: lib/command.php:629 lib/command.php:728
+msgid "Specify the name of the user to unsubscribe from"
+msgstr ""
+
+#: lib/command.php:638
+#, php-format
+msgid "Unsubscribed from %s"
+msgstr ""
+
+#: lib/command.php:656 lib/command.php:679
+msgid "Command not yet implemented."
+msgstr ""
+
+#: lib/command.php:659
+msgid "Notification off."
+msgstr ""
+
+#: lib/command.php:661
+msgid "Can't turn off notification."
+msgstr ""
+
+#: lib/command.php:682
+msgid "Notification on."
+msgstr ""
+
+#: lib/command.php:684
+msgid "Can't turn on notification."
+msgstr ""
+
+#: lib/command.php:697
+msgid "Login command is disabled"
+msgstr ""
+
+#: lib/command.php:708
+#, php-format
+msgid "This link is useable only once, and is good for only 2 minutes: %s"
+msgstr ""
+
+#: lib/command.php:735
+#, php-format
+msgid "Unsubscribed %s"
+msgstr ""
+
+#: lib/command.php:752
+msgid "You are not subscribed to anyone."
+msgstr ""
+
+#: lib/command.php:754
+#, fuzzy
+msgid "You are subscribed to this person:"
+msgid_plural "You are subscribed to these people:"
+msgstr[0] "You are subscribed to this person:"
+msgstr[1] "You are subscribed to these people:"
+
+#: lib/command.php:774
+msgid "No one is subscribed to you."
+msgstr ""
+
+#: lib/command.php:776
+#, fuzzy
+msgid "This person is subscribed to you:"
+msgid_plural "These people are subscribed to you:"
+msgstr[0] "This person is subscribed to you:"
+msgstr[1] "These people are subscribed to you:"
+
+#: lib/command.php:796
+msgid "You are not a member of any groups."
+msgstr ""
+
+#: lib/command.php:798
+#, fuzzy
+msgid "You are a member of this group:"
+msgid_plural "You are a member of these groups:"
+msgstr[0] "You are a member of this group:"
+msgstr[1] "You are a member of these groups:"
+
+#: lib/command.php:812
+msgid ""
+"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"
+msgstr ""
+
+#: lib/common.php:135
+msgid "No configuration file found. "
+msgstr ""
+
+#: lib/common.php:136
+msgid "I looked for configuration files in the following places: "
+msgstr ""
+
+#: lib/common.php:138
+msgid "You may wish to run the installer to fix this."
+msgstr ""
+
+#: lib/common.php:139
+msgid "Go to the installer."
+msgstr "Gaan na die installeerder."
+
+#: lib/connectsettingsaction.php:110
+msgid "IM"
+msgstr "IM"
+
+#: lib/connectsettingsaction.php:111
+msgid "Updates by instant messenger (IM)"
+msgstr ""
+
+#: lib/connectsettingsaction.php:116
+msgid "Updates by SMS"
+msgstr ""
+
+#: lib/connectsettingsaction.php:120
+msgid "Connections"
+msgstr ""
+
+#: lib/connectsettingsaction.php:121
+msgid "Authorized connected applications"
+msgstr ""
+
+#: lib/dberroraction.php:60
+msgid "Database error"
+msgstr "Databasisfout"
+
+#: lib/designsettings.php:105
+msgid "Upload file"
+msgstr ""
+
+#: lib/designsettings.php:109
+msgid ""
+"You can upload your personal background image. The maximum file size is 2MB."
+msgstr ""
+
+#: lib/designsettings.php:418
+msgid "Design defaults restored."
+msgstr ""
+
+#: lib/disfavorform.php:114 lib/disfavorform.php:140
+msgid "Disfavor this notice"
+msgstr ""
+
+#: lib/favorform.php:114 lib/favorform.php:140
+msgid "Favor this notice"
+msgstr ""
+
+#: lib/favorform.php:140
+msgid "Favor"
+msgstr ""
+
+#: lib/feed.php:85
+msgid "RSS 1.0"
+msgstr "RSS 1.0"
+
+#: lib/feed.php:87
+msgid "RSS 2.0"
+msgstr "RSS 2.0"
+
+#: lib/feed.php:89
+msgid "Atom"
+msgstr "Atom"
+
+#: lib/feed.php:91
+msgid "FOAF"
+msgstr "Vriende van vriende (FOAF)"
+
+#: lib/feedlist.php:64
+msgid "Export data"
+msgstr ""
+
+#: lib/galleryaction.php:121
+msgid "Filter tags"
+msgstr ""
+
+#: lib/galleryaction.php:131
+msgid "All"
+msgstr "Alle"
+
+#: lib/galleryaction.php:139
+msgid "Select tag to filter"
+msgstr ""
+
+#: lib/galleryaction.php:140
+msgid "Tag"
+msgstr "Etiket"
+
+#: lib/galleryaction.php:141
+msgid "Choose a tag to narrow list"
+msgstr ""
+
+#: lib/galleryaction.php:143
+msgid "Go"
+msgstr "OK"
+
+#: lib/grantroleform.php:91
+#, php-format
+msgid "Grant this user the \"%s\" role"
+msgstr ""
+
+#: lib/groupeditform.php:163
+msgid "URL of the homepage or blog of the group or topic"
+msgstr ""
+
+#: lib/groupeditform.php:168
+msgid "Describe the group or topic"
+msgstr ""
+
+#: lib/groupeditform.php:170
+#, php-format
+msgid "Describe the group or topic in %d characters"
+msgstr ""
+
+#: lib/groupeditform.php:179
+msgid ""
+"Location for the group, if any, like \"City, State (or Region), Country\""
+msgstr ""
+
+#: lib/groupeditform.php:187
+#, php-format
+msgid "Extra nicknames for the group, comma- or space- separated, max %d"
+msgstr ""
+
+#: lib/groupnav.php:85
+msgid "Group"
+msgstr "Groep"
+
+#: lib/groupnav.php:101
+msgid "Blocked"
+msgstr "Geblokkeer"
+
+#: lib/groupnav.php:102
+#, php-format
+msgid "%s blocked users"
+msgstr "%s geblokkeerde gebruikers"
+
+#: lib/groupnav.php:108
+#, php-format
+msgid "Edit %s group properties"
+msgstr ""
+
+#: lib/groupnav.php:113
+msgid "Logo"
+msgstr "Logo"
+
+#: lib/groupnav.php:114
+#, php-format
+msgid "Add or edit %s logo"
+msgstr ""
+
+#: lib/groupnav.php:120
+#, php-format
+msgid "Add or edit %s design"
+msgstr ""
+
+#: lib/groupsbymemberssection.php:71
+msgid "Groups with most members"
+msgstr ""
+
+#: lib/groupsbypostssection.php:71
+msgid "Groups with most posts"
+msgstr ""
+
+#: lib/grouptagcloudsection.php:56
+#, php-format
+msgid "Tags in %s group's notices"
+msgstr ""
+
+#: lib/htmloutputter.php:103
+msgid "This page is not available in a media type you accept"
+msgstr ""
+
+#: lib/imagefile.php:72
+msgid "Unsupported image file format."
+msgstr ""
+
+#: lib/imagefile.php:88
+#, php-format
+msgid "That file is too big. The maximum file size is %s."
+msgstr ""
+
+#: lib/imagefile.php:93
+msgid "Partial upload."
+msgstr ""
+
+#: lib/imagefile.php:101 lib/mediafile.php:170
+msgid "System error uploading file."
+msgstr ""
+
+#: lib/imagefile.php:109
+msgid "Not an image or corrupt file."
+msgstr ""
+
+#: lib/imagefile.php:122
+msgid "Lost our file."
+msgstr ""
+
+#: lib/imagefile.php:163 lib/imagefile.php:224
+msgid "Unknown file type"
+msgstr ""
+
+#: lib/imagefile.php:244
+msgid "MB"
+msgstr "MB"
+
+#: lib/imagefile.php:246
+msgid "kB"
+msgstr "kB"
+
+#: lib/jabber.php:387
+#, php-format
+msgid "[%s]"
+msgstr "[%s]"
+
+#: lib/jabber.php:567
+#, php-format
+msgid "Unknown inbox source %d."
+msgstr ""
+
+#: lib/joinform.php:114
+msgid "Join"
+msgstr "Aansluit"
+
+#: lib/leaveform.php:114
+msgid "Leave"
+msgstr "Verlaat"
+
+#: lib/logingroupnav.php:80
+msgid "Login with a username and password"
+msgstr ""
+
+#: lib/logingroupnav.php:86
+msgid "Sign up for a new account"
+msgstr ""
+
+#: lib/mail.php:173
+msgid "Email address confirmation"
+msgstr ""
+
+#: lib/mail.php:175
+#, php-format
+msgid ""
+"Hey, %s.\n"
+"\n"
+"Someone just entered this email address on %s.\n"
+"\n"
+"If it was you, and you want to confirm your entry, use the URL below:\n"
+"\n"
+"\t%s\n"
+"\n"
+"If not, just ignore this message.\n"
+"\n"
+"Thanks for your time, \n"
+"%s\n"
+msgstr ""
+
+#: lib/mail.php:240
+#, php-format
+msgid "%1$s is now listening to your notices on %2$s."
+msgstr ""
+
+#: lib/mail.php:245
+#, php-format
+msgid ""
+"%1$s is now listening to your notices on %2$s.\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"%4$s%5$s%6$s\n"
+"Faithfully yours,\n"
+"%7$s.\n"
+"\n"
+"----\n"
+"Change your email address or notification options at %8$s\n"
+msgstr ""
+
+#: lib/mail.php:262
+#, php-format
+msgid "Bio: %s"
+msgstr "Beskrywing: %s"
+
+#: lib/mail.php:290
+#, php-format
+msgid "New email address for posting to %s"
+msgstr ""
+
+#: lib/mail.php:293
+#, php-format
+msgid ""
+"You have a new posting address on %1$s.\n"
+"\n"
+"Send email to %2$s to post new messages.\n"
+"\n"
+"More email instructions at %3$s.\n"
+"\n"
+"Faithfully yours,\n"
+"%4$s"
+msgstr ""
+
+#: lib/mail.php:417
+#, php-format
+msgid "%s status"
+msgstr ""
+
+#: lib/mail.php:443
+msgid "SMS confirmation"
+msgstr ""
+
+#: lib/mail.php:467
+#, php-format
+msgid "You've been nudged by %s"
+msgstr ""
+
+#: lib/mail.php:471
+#, php-format
+msgid ""
+"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
+"to post some news.\n"
+"\n"
+"So let's hear from you :)\n"
+"\n"
+"%3$s\n"
+"\n"
+"Don't reply to this email; it won't get to them.\n"
+"\n"
+"With kind regards,\n"
+"%4$s\n"
+msgstr ""
+
+#: lib/mail.php:517
+#, php-format
+msgid "New private message from %s"
+msgstr "Nuwe privaat boodskap vanaf %s"
+
+#: lib/mail.php:521
+#, php-format
+msgid ""
+"%1$s (%2$s) sent you a private message:\n"
+"\n"
+"------------------------------------------------------\n"
+"%3$s\n"
+"------------------------------------------------------\n"
+"\n"
+"You can reply to their message here:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Don't reply to this email; it won't get to them.\n"
+"\n"
+"With kind regards,\n"
+"%5$s\n"
+msgstr ""
+
+#: lib/mail.php:568
+#, php-format
+msgid "%s (@%s) added your notice as a favorite"
+msgstr ""
+
+#: lib/mail.php:570
+#, php-format
+msgid ""
+"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
+"\n"
+"The URL of your notice is:\n"
+"\n"
+"%3$s\n"
+"\n"
+"The text of your notice is:\n"
+"\n"
+"%4$s\n"
+"\n"
+"You can see the list of %1$s's favorites here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"Faithfully yours,\n"
+"%6$s\n"
+msgstr ""
+
+#: lib/mail.php:635
+#, php-format
+msgid "%s (@%s) sent a notice to your attention"
+msgstr ""
+
+#: lib/mail.php:637
+#, php-format
+msgid ""
+"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
+"\n"
+"The notice is here:\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"It reads:\n"
+"\n"
+"\t%4$s\n"
+"\n"
+msgstr ""
+
+#: lib/mailbox.php:89
+msgid "Only the user can read their own mailboxes."
+msgstr ""
+
+#: lib/mailbox.php:139
+msgid ""
+"You have no private messages. You can send private message to engage other "
+"users in conversation. People can send you messages for your eyes only."
+msgstr ""
+
+#: lib/mailbox.php:227 lib/noticelist.php:486
+msgid "from"
+msgstr "van"
+
+#: lib/mailhandler.php:37
+msgid "Could not parse message."
+msgstr "Kan nie boodskap verwerk nie."
+
+#: lib/mailhandler.php:42
+msgid "Not a registered user."
+msgstr "Nie 'n geregistreerde gebruiker nie."
+
+#: lib/mailhandler.php:46
+msgid "Sorry, that is not your incoming email address."
+msgstr "Jammer, dit is nie u inkomende e-posadres nie."
+
+#: lib/mailhandler.php:50
+msgid "Sorry, no incoming email allowed."
+msgstr "Jammer, inkomende e-pos word nie toegelaat nie."
+
+#: lib/mailhandler.php:228
+#, php-format
+msgid "Unsupported message type: %s"
+msgstr ""
+
+#: lib/mediafile.php:98 lib/mediafile.php:123
+msgid "There was a database error while saving your file. Please try again."
+msgstr ""
+
+#: lib/mediafile.php:142
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
+msgstr ""
+
+#: lib/mediafile.php:147
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form."
+msgstr ""
+
+#: lib/mediafile.php:152
+msgid "The uploaded file was only partially uploaded."
+msgstr ""
+
+#: lib/mediafile.php:159
+msgid "Missing a temporary folder."
+msgstr ""
+
+#: lib/mediafile.php:162
+msgid "Failed to write file to disk."
+msgstr ""
+
+#: lib/mediafile.php:165
+msgid "File upload stopped by extension."
+msgstr ""
+
+#: lib/mediafile.php:179 lib/mediafile.php:216
+msgid "File exceeds user's quota."
+msgstr ""
+
+#: lib/mediafile.php:196 lib/mediafile.php:233
+msgid "File could not be moved to destination directory."
+msgstr ""
+
+#: lib/mediafile.php:201 lib/mediafile.php:237
+msgid "Could not determine file's MIME type."
+msgstr ""
+
+#: lib/mediafile.php:270
+#, php-format
+msgid " Try using another %s format."
+msgstr ""
+
+#: lib/mediafile.php:275
+#, php-format
+msgid "%s is not a supported file type on this server."
+msgstr ""
+
+#: lib/messageform.php:120
+msgid "Send a direct notice"
+msgstr ""
+
+#: lib/messageform.php:146
+msgid "To"
+msgstr "Aan"
+
+#: lib/messageform.php:159 lib/noticeform.php:185
+msgid "Available characters"
+msgstr "Beskikbare karakters"
+
+#: lib/messageform.php:178 lib/noticeform.php:236
+msgctxt "Send button for sending notice"
+msgid "Send"
+msgstr "Stuur"
+
+#: lib/noticeform.php:160
+msgid "Send a notice"
+msgstr ""
+
+#: lib/noticeform.php:173
+#, php-format
+msgid "What's up, %s?"
+msgstr "Hallo, %s."
+
+#: lib/noticeform.php:192
+msgid "Attach"
+msgstr "Aanheg"
+
+#: lib/noticeform.php:196
+msgid "Attach a file"
+msgstr "Heg 'n lêer aan"
+
+#: lib/noticeform.php:212
+msgid "Share my location"
+msgstr ""
+
+#: lib/noticeform.php:215
+msgid "Do not share my location"
+msgstr ""
+
+#: lib/noticeform.php:216
+msgid ""
+"Sorry, retrieving your geo location is taking longer than expected, please "
+"try again later"
+msgstr ""
+
+#: lib/noticelist.php:430
+#, php-format
+msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
+msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
+
+#: lib/noticelist.php:431
+msgid "N"
+msgstr "N"
+
+#: lib/noticelist.php:431
+msgid "S"
+msgstr "S"
+
+#: lib/noticelist.php:432
+msgid "E"
+msgstr "O"
+
+#: lib/noticelist.php:432
+msgid "W"
+msgstr "W"
+
+#: lib/noticelist.php:439
+msgid "at"
+msgstr "op"
+
+#: lib/noticelist.php:570
+msgid "in context"
+msgstr "in konteks"
+
+#: lib/noticelist.php:605
+msgid "Repeated by"
+msgstr "Herhaal deur"
+
+#: lib/noticelist.php:632
+msgid "Reply to this notice"
+msgstr ""
+
+#: lib/noticelist.php:633
+msgid "Reply"
+msgstr "Antwoord"
+
+#: lib/noticelist.php:677
+msgid "Notice repeated"
+msgstr ""
+
+#: lib/nudgeform.php:116
+msgid "Nudge this user"
+msgstr ""
+
+#: lib/nudgeform.php:128
+msgid "Nudge"
+msgstr "Aanpor"
+
+#: lib/nudgeform.php:128
+msgid "Send a nudge to this user"
+msgstr ""
+
+#: lib/oauthstore.php:283
+msgid "Error inserting new profile"
+msgstr ""
+
+#: lib/oauthstore.php:291
+msgid "Error inserting avatar"
+msgstr ""
+
+#: lib/oauthstore.php:311
+msgid "Error inserting remote profile"
+msgstr ""
+
+#: lib/oauthstore.php:345
+msgid "Duplicate notice"
+msgstr ""
+
+#: lib/oauthstore.php:490
+msgid "Couldn't insert new subscription."
+msgstr ""
+
+#: lib/personalgroupnav.php:99
+msgid "Personal"
+msgstr "Persoonlik"
+
+#: lib/personalgroupnav.php:104
+msgid "Replies"
+msgstr "Antwoorde"
+
+#: lib/personalgroupnav.php:114
+msgid "Favorites"
+msgstr "Gunstelinge"
+
+#: lib/personalgroupnav.php:125
+msgid "Inbox"
+msgstr ""
+
+#: lib/personalgroupnav.php:126
+msgid "Your incoming messages"
+msgstr "U inkomende boodskappe"
+
+#: lib/personalgroupnav.php:130
+msgid "Outbox"
+msgstr ""
+
+#: lib/personalgroupnav.php:131
+msgid "Your sent messages"
+msgstr ""
+
+#: lib/personaltagcloudsection.php:56
+#, php-format
+msgid "Tags in %s's notices"
+msgstr ""
+
+#: lib/plugin.php:114
+msgid "Unknown"
+msgstr "Onbekend"
+
+#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82
+msgid "Subscriptions"
+msgstr ""
+
+#: lib/profileaction.php:126
+msgid "All subscriptions"
+msgstr ""
+
+#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90
+msgid "Subscribers"
+msgstr ""
+
+#: lib/profileaction.php:161
+msgid "All subscribers"
+msgstr ""
+
+#: lib/profileaction.php:191
+msgid "User ID"
+msgstr "Gebruikers-ID"
+
+#: lib/profileaction.php:196
+msgid "Member since"
+msgstr ""
+
+#. TRANS: Average count of posts made per day since account registration
+#: lib/profileaction.php:235
+msgid "Daily average"
+msgstr ""
+
+#: lib/profileaction.php:264
+msgid "All groups"
+msgstr ""
+
+#: lib/profileformaction.php:123
+msgid "No return-to arguments."
+msgstr ""
+
+#: lib/profileformaction.php:137
+msgid "Unimplemented method."
+msgstr ""
+
+#: lib/publicgroupnav.php:78
+msgid "Public"
+msgstr "Openbaar"
+
+#: lib/publicgroupnav.php:82
+msgid "User groups"
+msgstr "Gebruikersgroepe"
+
+#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
+msgid "Recent tags"
+msgstr "Onlangse etikette"
+
+#: lib/publicgroupnav.php:88
+msgid "Featured"
+msgstr "Uitgelig"
+
+#: lib/publicgroupnav.php:92
+msgid "Popular"
+msgstr "Gewild"
+
+#: lib/repeatform.php:107
+msgid "Repeat this notice?"
+msgstr ""
+
+#: lib/repeatform.php:132
+msgid "Repeat this notice"
+msgstr ""
+
+#: lib/revokeroleform.php:91
+#, php-format
+msgid "Revoke the \"%s\" role from this user"
+msgstr ""
+
+#: lib/router.php:704
+msgid "No single user defined for single-user mode."
+msgstr ""
+
+#: lib/sandboxform.php:67
+msgid "Sandbox"
+msgstr ""
+
+#: lib/sandboxform.php:78
+msgid "Sandbox this user"
+msgstr ""
+
+#: lib/searchaction.php:120
+msgid "Search site"
+msgstr ""
+
+#: lib/searchaction.php:126
+msgid "Keyword(s)"
+msgstr "Term(e)"
+
+#: lib/searchaction.php:127
+msgid "Search"
+msgstr "Soek"
+
+#: lib/searchaction.php:162
+msgid "Search help"
+msgstr ""
+
+#: lib/searchgroupnav.php:80
+msgid "People"
+msgstr "Gebruikers"
+
+#: lib/searchgroupnav.php:81
+msgid "Find people on this site"
+msgstr ""
+
+#: lib/searchgroupnav.php:83
+msgid "Find content of notices"
+msgstr ""
+
+#: lib/searchgroupnav.php:85
+msgid "Find groups on this site"
+msgstr ""
+
+#: lib/section.php:89
+msgid "Untitled section"
+msgstr ""
+
+#: lib/section.php:106
+msgid "More..."
+msgstr "Meer..."
+
+#: lib/silenceform.php:67
+msgid "Silence"
+msgstr "Maak stil"
+
+#: lib/silenceform.php:78
+msgid "Silence this user"
+msgstr "Maak die gebruikers stil"
+
+#: lib/subgroupnav.php:83
+#, php-format
+msgid "People %s subscribes to"
+msgstr ""
+
+#: lib/subgroupnav.php:91
+#, php-format
+msgid "People subscribed to %s"
+msgstr ""
+
+#: lib/subgroupnav.php:99
+#, php-format
+msgid "Groups %s is a member of"
+msgstr ""
+
+#: lib/subgroupnav.php:105
+msgid "Invite"
+msgstr "Uitnodig"
+
+#: lib/subgroupnav.php:106
+#, php-format
+msgid "Invite friends and colleagues to join you on %s"
+msgstr ""
+
+#: lib/subscriberspeopleselftagcloudsection.php:48
+#: lib/subscriptionspeopleselftagcloudsection.php:48
+msgid "People Tagcloud as self-tagged"
+msgstr ""
+
+#: lib/subscriberspeopletagcloudsection.php:48
+#: lib/subscriptionspeopletagcloudsection.php:48
+msgid "People Tagcloud as tagged"
+msgstr ""
+
+#: lib/tagcloudsection.php:56
+msgid "None"
+msgstr "Geen"
+
+#: lib/topposterssection.php:74
+msgid "Top posters"
+msgstr "Mees aktiewe gebruikers"
+
+#: lib/unsandboxform.php:69
+msgid "Unsandbox"
+msgstr ""
+
+#: lib/unsandboxform.php:80
+msgid "Unsandbox this user"
+msgstr ""
+
+#: lib/unsilenceform.php:67
+msgid "Unsilence"
+msgstr ""
+
+#: lib/unsilenceform.php:78
+msgid "Unsilence this user"
+msgstr ""
+
+#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
+msgid "Unsubscribe from this user"
+msgstr ""
+
+#: lib/unsubscribeform.php:137
+msgid "Unsubscribe"
+msgstr ""
+
+#: lib/usernoprofileexception.php:58
+#, php-format
+msgid "User %s (%d) has no profile record."
+msgstr ""
+
+#: lib/userprofile.php:117
+msgid "Edit Avatar"
+msgstr "Wysig Avatar"
+
+#: lib/userprofile.php:234 lib/userprofile.php:248
+msgid "User actions"
+msgstr "Gebruikershandelinge"
+
+#: lib/userprofile.php:237
+msgid "User deletion in progress..."
+msgstr ""
+
+#: lib/userprofile.php:263
+msgid "Edit profile settings"
+msgstr "Wysig profiel-instellings"
+
+#: lib/userprofile.php:264
+msgid "Edit"
+msgstr "Wysig"
+
+#: lib/userprofile.php:287
+msgid "Send a direct message to this user"
+msgstr "Stuur 'n direkte boodskap aan hierdie gebruiker"
+
+#: lib/userprofile.php:288
+msgid "Message"
+msgstr "Boodskap"
+
+#: lib/userprofile.php:326
+msgid "Moderate"
+msgstr "Modereer"
+
+#: lib/userprofile.php:364
+msgid "User role"
+msgstr "Gebruikersrol"
+
+#: lib/userprofile.php:366
+msgctxt "role"
+msgid "Administrator"
+msgstr "Administrateur"
+
+#: lib/userprofile.php:367
+msgctxt "role"
+msgid "Moderator"
+msgstr "Moderator"
+
+#: lib/util.php:1046
+msgid "a few seconds ago"
+msgstr "'n paar sekondes gelede"
+
+#: lib/util.php:1048
+msgid "about a minute ago"
+msgstr "ongeveer 'n minuut gelede"
+
+#: lib/util.php:1050
+#, php-format
+msgid "about %d minutes ago"
+msgstr "ongeveer %d minute gelede"
+
+#: lib/util.php:1052
+msgid "about an hour ago"
+msgstr "ongeveer 'n uur gelede"
+
+#: lib/util.php:1054
+#, php-format
+msgid "about %d hours ago"
+msgstr "ongeveer %d uur gelede"
+
+#: lib/util.php:1056
+msgid "about a day ago"
+msgstr "ongeveer een dag gelede"
+
+#: lib/util.php:1058
+#, php-format
+msgid "about %d days ago"
+msgstr "ongeveer %d dae gelede"
+
+#: lib/util.php:1060
+msgid "about a month ago"
+msgstr "ongeveer een maand gelede"
+
+#: lib/util.php:1062
+#, php-format
+msgid "about %d months ago"
+msgstr "ongeveer %d maande gelede"
+
+#: lib/util.php:1064
+msgid "about a year ago"
+msgstr "ongeveer een jaar gelede"
+
+#: lib/webcolor.php:82
+#, php-format
+msgid "%s is not a valid color!"
+msgstr "%s is nie 'n geldige kleur nie!"
+
+#: lib/webcolor.php:123
+#, php-format
+msgid "%s is not a valid color! Use 3 or 6 hex chars."
+msgstr ""
+"%s is nie 'n geldige kleur nie. Gebruik drie of ses heksadesimale karakters."
+
+#: lib/xmppmanager.php:403
+#, php-format
+msgid "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr ""
+"Boodskap is te lank. Die maksimum is %1$d karakters. U het %2$d karakters "
+"gestuur."
diff --git a/locale/ar/LC_MESSAGES/statusnet.po b/locale/ar/LC_MESSAGES/statusnet.po
index 56029bc82..f8dc2b68b 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-03-06 23:49+0000\n"
-"PO-Revision-Date: 2010-03-06 23:49:16+0000\n"
+"POT-Creation-Date: 2010-04-05 18:54+0000\n"
+"PO-Revision-Date: 2010-04-05 18:54:34+0000\n"
"Language-Team: Arabic\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64621); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ar\n"
"X-Message-Group: out-statusnet\n"
@@ -92,9 +92,9 @@ msgstr "لا صفحة كهذه"
#: 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:90
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78
+#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
@@ -103,10 +103,8 @@ msgstr "لا صفحة كهذه"
#: actions/remotesubscribe.php:154 actions/replies.php:73
#: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:163 lib/command.php:302
-#: lib/command.php:355 lib/command.php:401 lib/command.php:462
-#: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82
-#: lib/profileaction.php:77
+#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: lib/mailbox.php:82 lib/profileaction.php:77
msgid "No such user."
msgstr "لا مستخدم كهذا."
@@ -193,18 +191,18 @@ msgstr ""
#: 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:132
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:136
#: actions/apigrouplistall.php:120 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:135
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
-#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184
-#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148
+#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:174
+#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173
+#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
-#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
+#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
msgid "API method not found."
msgstr "لم يتم العثور على وسيلة API."
@@ -217,8 +215,8 @@ msgstr "لم يتم العثور على وسيلة API."
#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65
-#: actions/apistatusesupdate.php:118
+#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
msgid "This method requires a POST."
msgstr "تتطلب هذه الطريقة POST."
@@ -247,7 +245,7 @@ msgid "Could not save profile."
msgstr "لم يمكن حفظ الملف."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:97
+#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
#: actions/designadminpanel.php:122 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
@@ -331,7 +329,7 @@ msgstr ""
msgid "This status is already a favorite."
msgstr "هذه الحالة مفضلة بالفعل."
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
msgid "Could not create favorite."
msgstr "تعذّر إنشاء مفضلة."
@@ -448,7 +446,7 @@ msgstr "لم توجد المجموعة!"
msgid "You are already a member of that group."
msgstr ""
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:221
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
msgid "You have been blocked from that group by the admin."
msgstr ""
@@ -466,11 +464,18 @@ msgstr "لست عضوًا في هذه المجموعة"
msgid "Could not remove user %1$s from group %2$s."
msgstr "لم يمكن إزالة المستخدم %1$s من المجموعة %2$s."
-#: actions/apigrouplist.php:95
+#. TRANS: %s is a user name
+#: actions/apigrouplist.php:97
#, 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
+#, fuzzy, php-format
+msgid "%1$s groups %2$s is a member of."
+msgstr "المجموعات التي %s عضو فيها"
+
#: actions/apigrouplistall.php:90 actions/usergroups.php:62
#, php-format
msgid "%s groups"
@@ -499,7 +504,7 @@ msgstr "حجم غير صالح."
#: 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:337
+#: actions/profilesettings.php:194 actions/recoverpassword.php:350
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
@@ -559,15 +564,15 @@ msgid ""
"give access to your %4$s account to third parties you trust."
msgstr ""
-#: actions/apioauthauthorize.php:310 lib/action.php:438
+#: actions/apioauthauthorize.php:310 lib/action.php:437
msgid "Account"
msgstr "الحساب"
#: actions/apioauthauthorize.php:313 actions/login.php:230
#: actions/profilesettings.php:106 actions/register.php:424
-#: actions/showgroup.php:244 actions/tagother.php:94
+#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
-#: lib/userprofile.php:131
+#: lib/userprofile.php:132
msgid "Nickname"
msgstr "الاسم المستعار"
@@ -636,12 +641,12 @@ msgstr ""
msgid "Unsupported format."
msgstr "نسق غير مدعوم."
-#: actions/apitimelinefavorites.php:108
+#: actions/apitimelinefavorites.php:109
#, php-format
msgid "%1$s / Favorites from %2$s"
msgstr ""
-#: actions/apitimelinefavorites.php:117
+#: actions/apitimelinefavorites.php:118
#, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr ""
@@ -651,7 +656,7 @@ msgstr ""
msgid "%1$s / Updates mentioning %2$s"
msgstr ""
-#: actions/apitimelinementions.php:127
+#: actions/apitimelinementions.php:130
#, php-format
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr ""
@@ -661,7 +666,7 @@ msgstr ""
msgid "%s public timeline"
msgstr "مسار %s الزمني العام"
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr ""
@@ -676,12 +681,12 @@ msgstr "كرر إلى %s"
msgid "Repeats of %s"
msgstr "تكرارات %s"
-#: actions/apitimelinetag.php:102 actions/tag.php:67
+#: actions/apitimelinetag.php:104 actions/tag.php:67
#, php-format
msgid "Notices tagged with %s"
msgstr "الإشعارات الموسومة ب%s"
-#: actions/apitimelinetag.php:104 actions/tagrss.php:65
+#: actions/apitimelinetag.php:106 actions/tagrss.php:65
#, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr ""
@@ -709,7 +714,7 @@ msgstr "لا حجم."
msgid "Invalid size."
msgstr "حجم غير صالح."
-#: actions/avatarsettings.php:67 actions/showgroup.php:229
+#: actions/avatarsettings.php:67 actions/showgroup.php:230
#: lib/accountsettingsaction.php:112
msgid "Avatar"
msgstr "أفتار"
@@ -741,7 +746,7 @@ msgid "Preview"
msgstr "معاينة"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:655
+#: lib/deleteuserform.php:66 lib/noticelist.php:659
msgid "Delete"
msgstr "احذف"
@@ -753,23 +758,27 @@ msgstr "ارفع"
msgid "Crop"
msgstr ""
-#: actions/avatarsettings.php:328
+#: actions/avatarsettings.php:305
+msgid "No file uploaded."
+msgstr "لم يُرفع ملف."
+
+#: actions/avatarsettings.php:332
msgid "Pick a square area of the image to be your avatar"
msgstr ""
-#: actions/avatarsettings.php:343 actions/grouplogo.php:380
+#: actions/avatarsettings.php:347 actions/grouplogo.php:380
msgid "Lost our file data."
msgstr ""
-#: actions/avatarsettings.php:366
+#: actions/avatarsettings.php:370
msgid "Avatar updated."
msgstr "رُفع الأفتار."
-#: actions/avatarsettings.php:369
+#: actions/avatarsettings.php:373
msgid "Failed updating avatar."
msgstr "فشل تحديث الأفتار."
-#: actions/avatarsettings.php:393
+#: actions/avatarsettings.php:397
msgid "Avatar deleted."
msgstr "حُذف الأفتار."
@@ -821,8 +830,8 @@ msgstr "فشل حفظ معلومات المنع."
#: actions/groupunblock.php:86 actions/joingroup.php:82
#: actions/joingroup.php:93 actions/leavegroup.php:82
#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212
-#: lib/command.php:260
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162
+#: lib/command.php:358
msgid "No such group."
msgstr "لا مجموعة كهذه."
@@ -904,7 +913,7 @@ msgid "Conversation"
msgstr "محادثة"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:218 lib/searchgroupnav.php:82
+#: lib/profileaction.php:224 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "الإشعارات"
@@ -923,7 +932,7 @@ msgstr "أنت لست مالك هذا التطبيق."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1217
+#: lib/action.php:1219
msgid "There was a problem with your session token."
msgstr ""
@@ -979,7 +988,7 @@ msgstr "أمتأكد من أنك تريد حذف هذا الإشعار؟"
msgid "Do not delete this notice"
msgstr "لا تحذف هذا الإشعار"
-#: actions/deletenotice.php:146 lib/noticelist.php:655
+#: actions/deletenotice.php:146 lib/noticelist.php:659
msgid "Delete this notice"
msgstr "احذف هذا الإشعار"
@@ -1112,7 +1121,7 @@ msgstr "ارجع إلى المبدئي"
#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:208
+#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
#: actions/tagother.php:154 actions/useradminpanel.php:294
#: lib/applicationeditform.php:333 lib/applicationeditform.php:334
#: lib/designsettings.php:256 lib/groupeditform.php:202
@@ -1228,7 +1237,7 @@ msgstr ""
msgid "Could not update group."
msgstr "تعذر تحديث المجموعة."
-#: actions/editgroup.php:264 classes/User_group.php:493
+#: actions/editgroup.php:264 classes/User_group.php:496
msgid "Could not create aliases."
msgstr "تعذّر إنشاء الكنى."
@@ -1702,7 +1711,7 @@ msgstr "مسار %s الزمني"
msgid "Updates from members of %1$s on %2$s!"
msgstr ""
-#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232
+#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244
#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr "مجموعات"
@@ -1721,6 +1730,10 @@ msgid ""
"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
"%%%%)"
msgstr ""
+"تتيح لك مجموعات %%%%site.name%%%% إيجاد أشخاص ذوي اهتمامات مشتركة والتحدث "
+"معهم. تستطيع إرسال رسائل إلى جميع أعضاء المجموعة الآخرين بعد الانضمام إليها "
+"عبر الصياغة \"!اسم_المجموعة\". ألا ترى مجموعة تعجبك؟ جرّب [البحث عن مجموعة](%%"
+"%%action.groupsearch%%%%) أو [ابدأ مجموعتك!](%%%%action.newgroup%%%%)"
#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
msgid "Create a new group"
@@ -1732,6 +1745,8 @@ msgid ""
"Search for groups on %%site.name%% by their name, location, or description. "
"Separate the terms by spaces; they must be 3 characters or more."
msgstr ""
+"ابحث عن مجموعات على %%site.name%% بدلالة الاسم أو الموقع أو الوصف. افصل "
+"عبارات البحث بمسافات؛ ويجب أن تتكون تلك العبارات من 3 أحرف أو أكثر."
#: actions/groupsearch.php:58
msgid "Group search"
@@ -1892,7 +1907,7 @@ msgstr "دعوة مستخدمين جدد"
msgid "You are already subscribed to these users:"
msgstr ""
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
#, php-format
msgid "%1$s (%2$s)"
msgstr "%1$s (%2$s)"
@@ -1993,7 +2008,7 @@ msgstr "%1$s انضم للمجموعة %2$s"
msgid "You must be logged in to leave a group."
msgstr "يجب أن تلج لتغادر مجموعة."
-#: actions/leavegroup.php:100 lib/command.php:265
+#: actions/leavegroup.php:100 lib/command.php:363
msgid "You are not a member of that group."
msgstr "لست عضوا في تلك المجموعة."
@@ -2103,12 +2118,12 @@ msgstr "استخدم هذا النموذج لإنشاء مجموعة جديدة.
msgid "New message"
msgstr "رسالة جديدة"
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
msgid "You can't send a message to this user."
msgstr "لا يمكنك إرسال رسائل إلى هذا المستخدم."
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342
-#: lib/command.php:475
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
+#: lib/command.php:529
msgid "No content!"
msgstr "لا محتوى!"
@@ -2116,7 +2131,7 @@ msgstr "لا محتوى!"
msgid "No recipient specified."
msgstr "لا مستلم حُدّد."
-#: actions/newmessage.php:164 lib/command.php:361
+#: actions/newmessage.php:164 lib/command.php:462
msgid ""
"Don't send a message to yourself; just say it to yourself quietly instead."
msgstr ""
@@ -2130,7 +2145,7 @@ msgstr "أُرسلت الرسالة"
msgid "Direct message to %s sent."
msgstr "رسالة مباشرة ل%s تم إرسالها."
-#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189
msgid "Ajax Error"
msgstr "خطأ أجاكس"
@@ -2138,7 +2153,7 @@ msgstr "خطأ أجاكس"
msgid "New notice"
msgstr "إشعار جديد"
-#: actions/newnotice.php:211
+#: actions/newnotice.php:217
msgid "Notice posted"
msgstr "أُرسل الإشعار"
@@ -2243,7 +2258,7 @@ msgstr ""
msgid "Notice has no profile"
msgstr ""
-#: actions/oembed.php:86 actions/shownotice.php:180
+#: actions/oembed.php:86 actions/shownotice.php:175
#, php-format
msgid "%1$s's status on %2$s"
msgstr "حالة %1$s في يوم %2$s"
@@ -2256,8 +2271,8 @@ msgstr "نوع المحتوى "
msgid "Only "
msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042
-#: lib/apiaction.php:1070 lib/apiaction.php:1179
+#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1068
+#: lib/apiaction.php:1096 lib/apiaction.php:1212
msgid "Not a supported data format."
msgstr "ليس نسق بيانات مدعوم."
@@ -2388,7 +2403,7 @@ msgstr "كلمة السر القديمة غير صحيحة"
msgid "Error saving user; invalid."
msgstr "خطأ أثناء حفظ المستخدم؛ غير صالح."
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
msgid "Can't save new password."
msgstr "تعذّر حفظ كلمة السر الجديدة."
@@ -2555,6 +2570,8 @@ msgid ""
"Search for people on %%site.name%% by their name, location, or interests. "
"Separate the terms by spaces; they must be 3 characters or more."
msgstr ""
+"ابحث عن أشخاص على %%site.name%% بدلالة الاسم أو الموقع أو الاهتمامات. افصل "
+"عبارات البحث بمسافات؛ ويجب أن تتكون تلك العبارات من 3 أحرف أو أكثر."
#: actions/peoplesearch.php:58
msgid "People search"
@@ -2597,8 +2614,8 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr "1-64 حرفًا إنجليزيًا أو رقمًا بدون نقاط أو مسافات"
#: actions/profilesettings.php:111 actions/register.php:448
-#: actions/showgroup.php:255 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:149
+#: actions/showgroup.php:256 actions/tagother.php:104
+#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "الاسم الكامل"
@@ -2625,9 +2642,9 @@ msgid "Bio"
msgstr "السيرة"
#: actions/profilesettings.php:132 actions/register.php:471
-#: actions/showgroup.php:264 actions/tagother.php:112
+#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
-#: lib/userprofile.php:164
+#: lib/userprofile.php:165
msgid "Location"
msgstr "الموقع"
@@ -2641,7 +2658,7 @@ msgstr "شارك مكاني الحالي عند إرسال إشعارات"
#: actions/profilesettings.php:145 actions/tagother.php:149
#: actions/tagother.php:209 lib/subscriptionlist.php:106
-#: lib/subscriptionlist.php:108 lib/userprofile.php:209
+#: lib/subscriptionlist.php:108 lib/userprofile.php:210
msgid "Tags"
msgstr "الوسوم"
@@ -2872,7 +2889,7 @@ msgstr "أعد ضبط كلمة السر"
msgid "Recover password"
msgstr "استعد كلمة السر"
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
msgid "Password recovery requested"
msgstr "طُلبت استعادة كلمة السر"
@@ -2892,41 +2909,41 @@ msgstr "أعد الضبط"
msgid "Enter a nickname or email address."
msgstr "أدخل اسمًا مستعارًا أو عنوان بريد إلكتروني."
-#: actions/recoverpassword.php:272
+#: actions/recoverpassword.php:282
msgid "No user with that email address or username."
msgstr ""
-#: actions/recoverpassword.php:287
+#: actions/recoverpassword.php:299
msgid "No registered email address for that user."
-msgstr ""
+msgstr "لا يوجد عنوان بريد إلكتروني مُسجّل لهذا المستخدم."
-#: actions/recoverpassword.php:301
+#: actions/recoverpassword.php:313
msgid "Error saving address confirmation."
msgstr "خطأ أثناء حفظ تأكيد العنوان."
-#: actions/recoverpassword.php:325
+#: actions/recoverpassword.php:338
msgid ""
"Instructions for recovering your password have been sent to the email "
"address registered to your account."
msgstr ""
-#: actions/recoverpassword.php:344
+#: actions/recoverpassword.php:357
msgid "Unexpected password reset."
msgstr ""
-#: actions/recoverpassword.php:352
+#: actions/recoverpassword.php:365
msgid "Password must be 6 chars or more."
msgstr "يجب أن تكون كلمة السر 6 محارف أو أكثر."
-#: actions/recoverpassword.php:356
+#: actions/recoverpassword.php:369
msgid "Password and confirmation do not match."
msgstr ""
-#: actions/recoverpassword.php:375 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:248
msgid "Error setting user."
msgstr "خطأ أثناء ضبط المستخدم."
-#: actions/recoverpassword.php:382
+#: actions/recoverpassword.php:395
msgid "New password successfully saved. You are now logged in."
msgstr ""
@@ -3065,7 +3082,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr ""
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:394
+#: lib/userprofile.php:406
msgid "Subscribe"
msgstr "اشترك"
@@ -3101,7 +3118,7 @@ msgstr "لا يمكنك تكرار ملاحظتك الشخصية."
msgid "You already repeated that notice."
msgstr "أنت كررت هذه الملاحظة بالفعل."
-#: actions/repeat.php:114 lib/noticelist.php:674
+#: actions/repeat.php:114 lib/noticelist.php:678
msgid "Repeated"
msgstr "مكرر"
@@ -3241,8 +3258,8 @@ msgstr "المنظمة"
msgid "Description"
msgstr "الوصف"
-#: actions/showapplication.php:192 actions/showgroup.php:438
-#: lib/profileaction.php:176
+#: actions/showapplication.php:192 actions/showgroup.php:439
+#: lib/profileaction.php:182
msgid "Statistics"
msgstr "إحصاءات"
@@ -3353,71 +3370,71 @@ msgid "%s group"
msgstr "مجموعة %s"
#: actions/showgroup.php:84
-#, fuzzy, php-format
+#, php-format
msgid "%1$s group, page %2$d"
-msgstr "%1$s أعضاء المجموعة, الصفحة %2$d"
+msgstr "مجموعة %1$، الصفحة %2$d"
-#: actions/showgroup.php:226
+#: actions/showgroup.php:227
msgid "Group profile"
msgstr "ملف المجموعة الشخصي"
-#: actions/showgroup.php:271 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:177
+#: actions/showgroup.php:272 actions/tagother.php:118
+#: actions/userauthorization.php:175 lib/userprofile.php:178
msgid "URL"
msgstr "مسار"
-#: actions/showgroup.php:282 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:194
+#: actions/showgroup.php:283 actions/tagother.php:128
+#: actions/userauthorization.php:187 lib/userprofile.php:195
msgid "Note"
msgstr "ملاحظة"
-#: actions/showgroup.php:292 lib/groupeditform.php:184
+#: actions/showgroup.php:293 lib/groupeditform.php:184
msgid "Aliases"
msgstr "الكنى"
-#: actions/showgroup.php:301
+#: actions/showgroup.php:302
msgid "Group actions"
msgstr ""
-#: actions/showgroup.php:337
+#: actions/showgroup.php:338
#, php-format
msgid "Notice feed for %s group (RSS 1.0)"
msgstr ""
-#: actions/showgroup.php:343
+#: actions/showgroup.php:344
#, php-format
msgid "Notice feed for %s group (RSS 2.0)"
msgstr ""
-#: actions/showgroup.php:349
+#: actions/showgroup.php:350
#, php-format
msgid "Notice feed for %s group (Atom)"
msgstr ""
-#: actions/showgroup.php:354
+#: actions/showgroup.php:355
#, php-format
msgid "FOAF for %s group"
msgstr ""
-#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91
+#: actions/showgroup.php:391 actions/showgroup.php:448 lib/groupnav.php:91
msgid "Members"
msgstr "الأعضاء"
-#: actions/showgroup.php:395 lib/profileaction.php:117
-#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95
-#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71
+#: actions/showgroup.php:396 lib/profileaction.php:117
+#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95
+#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
msgid "(None)"
msgstr "(لا شيء)"
-#: actions/showgroup.php:401
+#: actions/showgroup.php:402
msgid "All members"
msgstr "جميع الأعضاء"
-#: actions/showgroup.php:441
+#: actions/showgroup.php:442
msgid "Created"
-msgstr "أنشئ"
+msgstr "أنشئت"
-#: actions/showgroup.php:457
+#: actions/showgroup.php:458
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3432,7 +3449,7 @@ msgstr ""
"[انضم الآن](%%%%action.register%%%%) لتصبح عضوًا في هذه المجموعة ومجموعات "
"أخرى عديدة! ([اقرأ المزيد](%%%%doc.help%%%%))"
-#: actions/showgroup.php:463
+#: actions/showgroup.php:464
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3444,7 +3461,7 @@ msgstr ""
"en.wikipedia.org/wiki/Micro-blogging) المبنية على البرنامج الحر [StatusNet]"
"(http://status.net/). يتشارك أعضاؤها رسائل قصيرة عن حياتهم واهتماماتهم. "
-#: actions/showgroup.php:491
+#: actions/showgroup.php:492
msgid "Admins"
msgstr "الإداريون"
@@ -3531,7 +3548,7 @@ msgid ""
"[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to "
"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
-"لدى **%s** حساب على %%site.name%%، خدمة [التدوين المُصغّر](http://en."
+"لدى **%s** حساب على %%%%site.name%%%%، خدمة [التدوين المُصغّر](http://en."
"wikipedia.org/wiki/Micro-blogging) المبنية على البرنامج الحر [StatusNet]"
"(http://status.net/). يتشارك أعضاؤها رسائل قصيرة عن حياتهم واهتماماتهم. "
"[انضم الآن](%%%%action.register%%%%) لتتابع إشعارت **%s** وغيره! ([اقرأ "
@@ -3544,6 +3561,9 @@ msgid ""
"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
"[StatusNet](http://status.net/) tool. "
msgstr ""
+"لدى **%s** حساب على %%%%site.name%%%%، خدمة [التدوين المُصغّر](http://en."
+"wikipedia.org/wiki/Micro-blogging) المبنية على البرنامج الحر [StatusNet]"
+"(http://status.net/). "
#: actions/showstream.php:305
#, php-format
@@ -3576,7 +3596,8 @@ msgid "Unknown language \"%s\"."
msgstr "لغة غير معروفة \"%s\"."
#: actions/siteadminpanel.php:165
-msgid "Minimum text limit is 140 characters."
+#, fuzzy
+msgid "Minimum text limit is 0 (unlimited)."
msgstr "حد النص الأدنى هو 140 حرفًا."
#: actions/siteadminpanel.php:171
@@ -3664,9 +3685,8 @@ msgid "Edit site-wide message"
msgstr "عدّل رسالة الموقع العامة"
#: actions/sitenoticeadminpanel.php:103
-#, fuzzy
msgid "Unable to save site notice."
-msgstr "مشكلة أثناء حفظ الإشعار."
+msgstr "تعذّر حفظ إشعار الموقع."
#: actions/sitenoticeadminpanel.php:113
msgid "Max length for the site-wide notice is 255 chars"
@@ -3840,8 +3860,7 @@ msgstr "اذف إعدادت الموقع"
msgid "You are not subscribed to that profile."
msgstr ""
-#: actions/subedit.php:83 classes/Subscription.php:89
-#: classes/Subscription.php:116
+#: actions/subedit.php:83 classes/Subscription.php:132
msgid "Could not save subscription."
msgstr "تعذّر حفظ الاشتراك."
@@ -3932,18 +3951,18 @@ msgstr ""
msgid "%s is not listening to anyone."
msgstr ""
-#: actions/subscriptions.php:199
+#: actions/subscriptions.php:208
msgid "Jabber"
msgstr "جابر"
-#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:222 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr "رسائل قصيرة"
#: actions/tag.php:69
-#, fuzzy, php-format
+#, php-format
msgid "Notices tagged with %1$s, page %2$d"
-msgstr "الإشعارات الموسومة ب%s"
+msgstr "الإشعارات الموسومة ب%s، الصفحة %2$d"
#: actions/tag.php:87
#, php-format
@@ -3969,12 +3988,12 @@ msgstr "لا مدخل هوية."
msgid "Tag %s"
msgstr ""
-#: actions/tagother.php:77 lib/userprofile.php:75
+#: actions/tagother.php:77 lib/userprofile.php:76
msgid "User profile"
msgstr "ملف المستخدم الشخصي"
#: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:102
+#: lib/userprofile.php:103
msgid "Photo"
msgstr "صورة"
@@ -4027,7 +4046,7 @@ msgstr ""
#: actions/unsubscribe.php:98
msgid "Unsubscribed"
-msgstr ""
+msgstr "غير مشترك"
#: actions/updateprofile.php:64 actions/userauthorization.php:337
#, php-format
@@ -4211,9 +4230,9 @@ msgid "Enjoy your hotdog!"
msgstr "استمتع بالنقانق!"
#: actions/usergroups.php:64
-#, fuzzy, php-format
+#, php-format
msgid "%1$s groups, page %2$d"
-msgstr "%1$s أعضاء المجموعة, الصفحة %2$d"
+msgstr "مجموعات %1$s، الصفحة %2$d"
#: actions/usergroups.php:130
msgid "Search for more groups"
@@ -4227,7 +4246,7 @@ msgstr "%s ليس عضوًا في أي مجموعة."
#: actions/usergroups.php:162
#, php-format
msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
-msgstr ""
+msgstr "جرّب [البحث عن مجموعات](%%action.groupsearch%%) والانضمام إليها."
#: actions/userrss.php:95 lib/atomgroupnoticefeed.php:66
#: lib/atomusernoticefeed.php:72
@@ -4280,7 +4299,7 @@ msgstr ""
msgid "Plugins"
msgstr "الملحقات"
-#: actions/version.php:196 lib/action.php:767
+#: actions/version.php:196 lib/action.php:766
msgid "Version"
msgstr "النسخة"
@@ -4288,19 +4307,19 @@ msgstr "النسخة"
msgid "Author(s)"
msgstr "المؤلف(ون)"
-#: classes/File.php:144
+#: classes/File.php:169
#, 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:154
+#: classes/File.php:179
#, php-format
msgid "A file this large would exceed your user quota of %d bytes."
msgstr ""
-#: classes/File.php:161
+#: classes/File.php:186
#, php-format
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
@@ -4338,96 +4357,96 @@ msgstr "تعذّر إدراج الرسالة."
msgid "Could not update message with new URI."
msgstr ""
-#: classes/Notice.php:172
+#: classes/Notice.php:175
#, php-format
msgid "DB error inserting hashtag: %s"
msgstr ""
-#: classes/Notice.php:241
+#: classes/Notice.php:244
msgid "Problem saving notice. Too long."
msgstr "مشكلة في حفظ الإشعار. طويل جدًا."
-#: classes/Notice.php:245
+#: classes/Notice.php:248
msgid "Problem saving notice. Unknown user."
msgstr "مشكلة في حفظ الإشعار. مستخدم غير معروف."
-#: classes/Notice.php:250
+#: classes/Notice.php:253
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
-#: classes/Notice.php:256
+#: classes/Notice.php:259
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
msgstr ""
-#: classes/Notice.php:262
+#: classes/Notice.php:265
msgid "You are banned from posting notices on this site."
msgstr ""
-#: classes/Notice.php:328 classes/Notice.php:354
+#: classes/Notice.php:331 classes/Notice.php:357
msgid "Problem saving notice."
msgstr "مشكلة أثناء حفظ الإشعار."
-#: classes/Notice.php:927
+#: classes/Notice.php:943
#, fuzzy
msgid "Problem saving group inbox."
msgstr "مشكلة أثناء حفظ الإشعار."
-#: classes/Notice.php:1459
+#: classes/Notice.php:1481
#, php-format
msgid "RT @%1$s %2$s"
msgstr "آر تي @%1$s %2$s"
-#: classes/Subscription.php:66 lib/oauthstore.php:465
+#: classes/Subscription.php:74 lib/oauthstore.php:465
msgid "You have been banned from subscribing."
msgstr ""
-#: classes/Subscription.php:70
+#: classes/Subscription.php:78
msgid "Already subscribed!"
msgstr "مُشترك أصلا!"
-#: classes/Subscription.php:74
+#: classes/Subscription.php:82
msgid "User has blocked you."
msgstr "لقد منعك المستخدم."
-#: classes/Subscription.php:157
+#: classes/Subscription.php:167
msgid "Not subscribed!"
msgstr "غير مشترك!"
-#: classes/Subscription.php:163
+#: classes/Subscription.php:173
msgid "Couldn't delete self-subscription."
msgstr "لم يمكن حذف اشتراك ذاتي."
-#: classes/Subscription.php:190
+#: classes/Subscription.php:200
#, fuzzy
msgid "Couldn't delete subscription OMB token."
msgstr "تعذّر حذف الاشتراك."
-#: classes/Subscription.php:201 lib/subs.php:69
+#: classes/Subscription.php:211
msgid "Couldn't delete subscription."
msgstr "تعذّر حذف الاشتراك."
-#: classes/User.php:373
+#: classes/User.php:363
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "أهلا بكم في %1$s يا @%2$s!"
-#: classes/User_group.php:477
+#: classes/User_group.php:480
msgid "Could not create group."
msgstr "تعذّر إنشاء المجموعة."
-#: classes/User_group.php:486
+#: classes/User_group.php:489
#, fuzzy
msgid "Could not set group URI."
msgstr "تعذّر ضبط عضوية المجموعة."
-#: classes/User_group.php:507
+#: classes/User_group.php:510
msgid "Could not set group membership."
msgstr "تعذّر ضبط عضوية المجموعة."
-#: classes/User_group.php:521
+#: classes/User_group.php:524
#, fuzzy
msgid "Could not save local group info."
msgstr "تعذّر حفظ الاشتراك."
@@ -4469,171 +4488,171 @@ msgstr "%1$s - %2$s"
msgid "Untitled page"
msgstr "صفحة غير مُعنونة"
-#: lib/action.php:424
+#: lib/action.php:423
msgid "Primary site navigation"
msgstr ""
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:430
+#: lib/action.php:429
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr "الملف الشخصي ومسار الأصدقاء الزمني"
-#: lib/action.php:433
+#: lib/action.php:432
msgctxt "MENU"
msgid "Personal"
msgstr "الصفحة الشخصية"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:435
+#: lib/action.php:434
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "غير بريدك الإلكتروني وكلمة سرّك وأفتارك وملفك الشخصي"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:440
+#: lib/action.php:439
#, fuzzy
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "اتصالات"
-#: lib/action.php:443
+#: lib/action.php:442
msgid "Connect"
msgstr "اتصل"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:446
+#: lib/action.php:445
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "غيّر ضبط الموقع"
-#: lib/action.php:449
+#: lib/action.php:448
msgctxt "MENU"
msgid "Admin"
msgstr "إداري"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:453
+#: lib/action.php:452
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "ادعُ أصدقائك وزملائك للانضمام إليك في %s"
-#: lib/action.php:456
+#: lib/action.php:455
msgctxt "MENU"
msgid "Invite"
msgstr "ادعُ"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:462
+#: lib/action.php:461
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "اخرج من الموقع"
-#: lib/action.php:465
+#: lib/action.php:464
msgctxt "MENU"
msgid "Logout"
msgstr "اخرج"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:470
+#: lib/action.php:469
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "أنشئ حسابًا"
-#: lib/action.php:473
+#: lib/action.php:472
msgctxt "MENU"
msgid "Register"
msgstr "سجّل"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:476
+#: lib/action.php:475
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "لُج إلى الموقع"
-#: lib/action.php:479
+#: lib/action.php:478
msgctxt "MENU"
msgid "Login"
msgstr "لُج"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:482
+#: lib/action.php:481
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "ساعدني!"
-#: lib/action.php:485
+#: lib/action.php:484
msgctxt "MENU"
msgid "Help"
msgstr "مساعدة"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:488
+#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "ابحث عن أشخاص أو نصوص"
-#: lib/action.php:491
+#: lib/action.php:490
msgctxt "MENU"
msgid "Search"
msgstr "ابحث"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:513 lib/adminpanelaction.php:398
+#: lib/action.php:512 lib/adminpanelaction.php:398
msgid "Site notice"
msgstr "إشعار الموقع"
-#: lib/action.php:579
+#: lib/action.php:578
msgid "Local views"
msgstr "المشاهدات المحلية"
-#: lib/action.php:645
+#: lib/action.php:644
msgid "Page notice"
msgstr "إشعار الصفحة"
-#: lib/action.php:747
+#: lib/action.php:746
msgid "Secondary site navigation"
msgstr ""
-#: lib/action.php:752
+#: lib/action.php:751
msgid "Help"
msgstr "مساعدة"
-#: lib/action.php:754
+#: lib/action.php:753
msgid "About"
msgstr "عن"
-#: lib/action.php:756
+#: lib/action.php:755
msgid "FAQ"
msgstr "الأسئلة المكررة"
-#: lib/action.php:760
+#: lib/action.php:759
msgid "TOS"
msgstr "الشروط"
-#: lib/action.php:763
+#: lib/action.php:762
msgid "Privacy"
msgstr "خصوصية"
-#: lib/action.php:765
+#: lib/action.php:764
msgid "Source"
msgstr "المصدر"
-#: lib/action.php:769
+#: lib/action.php:768
msgid "Contact"
msgstr "اتصل"
-#: lib/action.php:771
+#: lib/action.php:770
msgid "Badge"
msgstr "الجسر"
-#: lib/action.php:799
+#: lib/action.php:798
msgid "StatusNet software license"
msgstr "رخصة برنامج StatusNet"
-#: lib/action.php:802
+#: lib/action.php:803
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4642,12 +4661,12 @@ msgstr ""
"**%%site.name%%** خدمة تدوين مصغر يقدمها لك [%%site.broughtby%%](%%site."
"broughtbyurl%%). "
-#: lib/action.php:804
+#: lib/action.php:805
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr ""
-#: lib/action.php:806
+#: lib/action.php:808
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4658,53 +4677,57 @@ msgstr ""
"المتوفر تحت [رخصة غنو أفيرو العمومية](http://www.fsf.org/licensing/licenses/"
"agpl-3.0.html)."
-#: lib/action.php:821
+#: lib/action.php:823
msgid "Site content license"
msgstr "رخصة محتوى الموقع"
-#: lib/action.php:826
+#: lib/action.php:828
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
-#: lib/action.php:831
+#: lib/action.php:833
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
-#: lib/action.php:834
+#: lib/action.php:836
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
-#: lib/action.php:847
+#: lib/action.php:849
msgid "All "
msgstr ""
-#: lib/action.php:853
+#: lib/action.php:855
msgid "license."
msgstr "الرخصة."
-#: lib/action.php:1152
+#: lib/action.php:1154
msgid "Pagination"
msgstr ""
-#: lib/action.php:1161
+#: lib/action.php:1163
msgid "After"
msgstr "بعد"
-#: lib/action.php:1169
+#: lib/action.php:1171
msgid "Before"
msgstr "قبل"
-#: lib/activity.php:453
+#: lib/activity.php:120
+msgid "Expecting a root feed element but got a whole XML document."
+msgstr ""
+
+#: lib/activityutils.php:208
msgid "Can't handle remote content yet."
msgstr ""
-#: lib/activity.php:481
+#: lib/activityutils.php:236
msgid "Can't handle embedded XML content yet."
msgstr ""
-#: lib/activity.php:485
+#: lib/activityutils.php:240
msgid "Can't handle embedded Base64 content yet."
msgstr ""
@@ -4795,7 +4818,7 @@ msgstr "ضبط المسارات"
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
-#: lib/apiauth.php:272
+#: lib/apiauth.php:276
#, php-format
msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s"
msgstr ""
@@ -4823,7 +4846,7 @@ msgstr "مسار المصدر"
#: lib/applicationeditform.php:218
msgid "URL of the homepage of this application"
-msgstr ""
+msgstr "مسار صفحة هذا التطبيق"
#: lib/applicationeditform.php:224
msgid "Organization responsible for this application"
@@ -4869,11 +4892,11 @@ msgstr "اسحب"
msgid "Attachments"
msgstr "مرفقات"
-#: lib/attachmentlist.php:265
+#: lib/attachmentlist.php:263
msgid "Author"
msgstr "المؤلف"
-#: lib/attachmentlist.php:278
+#: lib/attachmentlist.php:276
msgid "Provider"
msgstr "المزود"
@@ -4893,37 +4916,50 @@ msgstr "تغيير كلمة السر فشل"
msgid "Password changing is not allowed"
msgstr "تغيير كلمة السر غير مسموح به"
-#: lib/channel.php:138 lib/channel.php:158
+#: lib/channel.php:157 lib/channel.php:177
msgid "Command results"
msgstr "نتائج الأمر"
-#: lib/channel.php:210 lib/mailhandler.php:142
+#: lib/channel.php:229 lib/mailhandler.php:142
msgid "Command complete"
msgstr "اكتمل الأمر"
-#: lib/channel.php:221
+#: lib/channel.php:240
msgid "Command failed"
msgstr "فشل الأمر"
-#: lib/command.php:44
-msgid "Sorry, this command is not yet implemented."
-msgstr ""
+#: lib/command.php:83 lib/command.php:105
+msgid "Notice with that id does not exist"
+msgstr "الملاحظة بهذا الرقم غير موجودة"
+
+#: lib/command.php:99 lib/command.php:570
+msgid "User has no last notice"
+msgstr "ليس للمستخدم إشعار أخير"
-#: lib/command.php:88
+#: lib/command.php:125
#, php-format
msgid "Could not find a user with nickname %s"
msgstr "لم يمكن إيجاد مستخدم بالاسم %s"
-#: lib/command.php:92
+#: lib/command.php:143
+#, fuzzy, php-format
+msgid "Could not find a local user with nickname %s"
+msgstr "لم يمكن إيجاد مستخدم بالاسم %s"
+
+#: lib/command.php:176
+msgid "Sorry, this command is not yet implemented."
+msgstr ""
+
+#: lib/command.php:221
msgid "It does not make a lot of sense to nudge yourself!"
msgstr ""
-#: lib/command.php:99
+#: lib/command.php:228
#, php-format
msgid "Nudge sent to %s"
msgstr "التنبيه تم إرساله إلى %s"
-#: lib/command.php:126
+#: lib/command.php:254
#, php-format
msgid ""
"Subscriptions: %1$s\n"
@@ -4934,169 +4970,167 @@ msgstr ""
"المشتركون: %2$s\n"
"الإشعارات: %3$s"
-#: lib/command.php:152 lib/command.php:390 lib/command.php:451
-msgid "Notice with that id does not exist"
-msgstr "الملاحظة بهذا الرقم غير موجودة"
-
-#: lib/command.php:168 lib/command.php:406 lib/command.php:467
-#: lib/command.php:523
-msgid "User has no last notice"
-msgstr "ليس للمستخدم إشعار أخير"
-
-#: lib/command.php:190
+#: lib/command.php:296
msgid "Notice marked as fave."
msgstr ""
-#: lib/command.php:217
+#: lib/command.php:317
msgid "You are already a member of that group"
msgstr "أنت بالفعل عضو في هذه المجموعة"
-#: lib/command.php:231
+#: lib/command.php:331
#, php-format
msgid "Could not join user %s to group %s"
msgstr "لم يمكن ضم المستخدم %s إلى المجموعة %s"
-#: lib/command.php:236
+#: lib/command.php:336
#, php-format
msgid "%s joined group %s"
msgstr "%s انضم إلى مجموعة %s"
-#: lib/command.php:275
+#: lib/command.php:373
#, php-format
msgid "Could not remove user %s to group %s"
msgstr "لم يمكن إزالة المستخدم %s من المجموعة %s"
-#: lib/command.php:280
+#: lib/command.php:378
#, php-format
msgid "%s left group %s"
msgstr "%s ترك المجموعة %s"
-#: lib/command.php:309
+#: lib/command.php:401
#, php-format
msgid "Fullname: %s"
msgstr "الاسم الكامل: %s"
-#: lib/command.php:312 lib/mail.php:258
+#: lib/command.php:404 lib/mail.php:258
#, php-format
msgid "Location: %s"
msgstr "الموقع: %s"
-#: lib/command.php:315 lib/mail.php:260
+#: lib/command.php:407 lib/mail.php:260
#, php-format
msgid "Homepage: %s"
msgstr "الصفحة الرئيسية: %s"
-#: lib/command.php:318
+#: lib/command.php:410
#, php-format
msgid "About: %s"
msgstr "عن: %s"
-#: lib/command.php:349
+#: lib/command.php:437
+#, php-format
+msgid ""
+"%s is a remote profile; you can only send direct messages to users on the "
+"same server."
+msgstr ""
+
+#: lib/command.php:450
#, php-format
msgid "Message too long - maximum is %d characters, you sent %d"
msgstr ""
-#: lib/command.php:367
+#: lib/command.php:468
#, php-format
msgid "Direct message to %s sent"
msgstr "رسالة مباشرة إلى %s تم إرسالها"
-#: lib/command.php:369
+#: lib/command.php:470
msgid "Error sending direct message."
msgstr ""
-#: lib/command.php:413
+#: lib/command.php:490
msgid "Cannot repeat your own notice"
msgstr "لا يمكنك تكرار ملاحظتك الخاصة"
-#: lib/command.php:418
+#: lib/command.php:495
msgid "Already repeated that notice"
msgstr "كرر بالفعل هذا الإشعار"
-#: lib/command.php:426
+#: lib/command.php:503
#, php-format
msgid "Notice from %s repeated"
msgstr "الإشعار من %s مكرر"
-#: lib/command.php:428
+#: lib/command.php:505
msgid "Error repeating notice."
msgstr "خطأ تكرار الإشعار."
-#: lib/command.php:482
+#: lib/command.php:536
#, php-format
msgid "Notice too long - maximum is %d characters, you sent %d"
msgstr ""
-#: lib/command.php:491
+#: lib/command.php:545
#, php-format
msgid "Reply to %s sent"
msgstr "رُد على رسالة %s"
-#: lib/command.php:493
+#: lib/command.php:547
msgid "Error saving notice."
msgstr "خطأ أثناء حفظ الإشعار."
-#: lib/command.php:547
+#: lib/command.php:594
msgid "Specify the name of the user to subscribe to"
msgstr ""
-#: lib/command.php:554 lib/command.php:589
-msgid "No such user"
-msgstr "لا مستخدم كهذا"
+#: lib/command.php:602
+msgid "Can't subscribe to OMB profiles by command."
+msgstr ""
-#: lib/command.php:561
+#: lib/command.php:608
#, php-format
msgid "Subscribed to %s"
msgstr "مُشترك ب%s"
-#: lib/command.php:582 lib/command.php:685
+#: lib/command.php:629 lib/command.php:728
msgid "Specify the name of the user to unsubscribe from"
msgstr ""
-#: lib/command.php:595
+#: lib/command.php:638
#, php-format
msgid "Unsubscribed from %s"
msgstr ""
-#: lib/command.php:613 lib/command.php:636
+#: lib/command.php:656 lib/command.php:679
msgid "Command not yet implemented."
msgstr "الأمر لم يُجهزّ بعد."
-#: lib/command.php:616
+#: lib/command.php:659
msgid "Notification off."
msgstr "الإشعار مُطفأ."
-#: lib/command.php:618
+#: lib/command.php:661
msgid "Can't turn off notification."
msgstr "تعذّر إطفاء الإشعارات."
-#: lib/command.php:639
+#: lib/command.php:682
msgid "Notification on."
msgstr "الإشعار يعمل."
-#: lib/command.php:641
+#: lib/command.php:684
msgid "Can't turn on notification."
msgstr "تعذّر تشغيل الإشعار."
-#: lib/command.php:654
+#: lib/command.php:697
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:665
+#: lib/command.php:708
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:692
+#: lib/command.php:735
#, fuzzy, php-format
msgid "Unsubscribed %s"
msgstr "ألغِ الاشتراك"
-#: lib/command.php:709
+#: lib/command.php:752
msgid "You are not subscribed to anyone."
msgstr "لست مُشتركًا بأي أحد."
-#: lib/command.php:711
+#: lib/command.php:754
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "لست مشتركًا بأحد."
@@ -5106,11 +5140,11 @@ msgstr[3] "أنت مشترك بهؤلاء الأشخاص:"
msgstr[4] ""
msgstr[5] ""
-#: lib/command.php:731
+#: lib/command.php:774
msgid "No one is subscribed to you."
msgstr "لا أحد مشترك بك."
-#: lib/command.php:733
+#: lib/command.php:776
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "لا أحد مشترك بك."
@@ -5120,11 +5154,11 @@ msgstr[3] "هؤلاء الأشخاص مشتركون بك:"
msgstr[4] ""
msgstr[5] ""
-#: lib/command.php:753
+#: lib/command.php:796
msgid "You are not a member of any groups."
msgstr "لست عضوًا في أي مجموعة."
-#: lib/command.php:755
+#: lib/command.php:798
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "لست عضوًا في أي مجموعة."
@@ -5134,7 +5168,7 @@ msgstr[3] "أنت عضو في هذه المجموعات:"
msgstr[4] ""
msgstr[5] ""
-#: lib/command.php:769
+#: lib/command.php:812
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5175,20 +5209,58 @@ msgid ""
"tracks - not yet implemented.\n"
"tracking - not yet implemented.\n"
msgstr ""
-
-#: lib/common.php:148
+"الأوامر:\n"
+"on - شغّل الإشعار\n"
+"off - أطفئ الإشعار\n"
+"help - أظهر هذه المساعدة\n"
+"follow <nickname> - اشترك بالمستخدم\n"
+"groups - اسرد المجموعات التي أنا عضو فيها\n"
+"subscriptions - اسرد الذين أتابعهم\n"
+"subscribers - اسرد الذين يتابعونني\n"
+"leave <nickname> - ألغِ الاشتراك بمستخدم\n"
+"d <nickname> <text> - وجّه رسالة مباشرة إلى مستخدم\n"
+"get <nickname> - اجلب آخر رسالة من مستخدم\n"
+"whois <nickname> - اجلب معلومات ملف المستخدم\n"
+"lose <nickname> - أجبر المستخدم على عدم تتبعك\n"
+"fav <nickname> - اجعل آخر إشعار من المستخدم مفضلًا\n"
+"fav #<notice_id> - اجعل الإشعار ذا رقم الهوية المعطى مفضلا\n"
+"repeat #<notice_id> - كرّر الإشعار ذا رقم الهوية المعطى\n"
+"repeat <nickname> - كرّر آخر إشعار من المستخدم\n"
+"reply #<notice_id> - رُد على الإشعار ذي رقم الهوية المعطى\n"
+"reply <nickname> - رُد على آخر إشعار من المستخدم\n"
+"join <group> - انضم إلى مجموعة\n"
+"login - اجلب وصلة الولوج إلى واجهة الوب\n"
+"drop <group> - اترك المجموعة\n"
+"stats - اجلب إحصاءاتك\n"
+"stop - مثل 'off'\n"
+"quit - مثل 'off'\n"
+"sub <nickname> - مثل 'follow'\n"
+"unsub <nickname> - مثل 'leave'\n"
+"last <nickname> - مثل 'get'\n"
+"on <nickname> - لم يطبق بعد.\n"
+"off <nickname> - لم يطبق بعد.\n"
+"nudge <nickname> - ذكّر مستخدمًا بإشعار أرسلته.\n"
+"invite <phone number> - لم يطبق بعد.\n"
+"track <word> - لم يطبق بعد.\n"
+"untrack <word> - لم يطبق بعد.\n"
+"track off - لم يطبق بعد.\n"
+"untrack all - لم يطبق بعد.\n"
+"tracks - لم يطبق بعد.\n"
+"tracking - لم يطبق بعد.\n"
+
+#: lib/common.php:135
msgid "No configuration file found. "
msgstr ""
-#: lib/common.php:149
+#: lib/common.php:136
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:151
+#: lib/common.php:138
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:152
+#: lib/common.php:139
msgid "Go to the installer."
msgstr "اذهب إلى المُثبّت."
@@ -5202,7 +5274,7 @@ msgstr ""
#: lib/connectsettingsaction.php:116
msgid "Updates by SMS"
-msgstr ""
+msgstr "تحديثات عبر الرسائل القصيرة"
#: lib/connectsettingsaction.php:120
msgid "Connections"
@@ -5296,7 +5368,7 @@ msgstr ""
#: lib/groupeditform.php:168
msgid "Describe the group or topic"
-msgstr ""
+msgstr "صِف المجموعة أو الموضوع"
#: lib/groupeditform.php:170
#, php-format
@@ -5356,55 +5428,55 @@ msgstr "المجموعات الأكثر مرسلات"
#: lib/grouptagcloudsection.php:56
#, php-format
msgid "Tags in %s group's notices"
-msgstr "وسوم في إشعارات المجموعة %s"
+msgstr "وسوم في إشعارات مجموعة %s"
#: lib/htmloutputter.php:103
msgid "This page is not available in a media type you accept"
msgstr ""
-#: lib/imagefile.php:75
+#: lib/imagefile.php:72
+msgid "Unsupported image file format."
+msgstr ""
+
+#: lib/imagefile.php:88
#, php-format
msgid "That file is too big. The maximum file size is %s."
msgstr "هذا الملف كبير جدًا. إن أقصى حجم للملفات هو %s."
-#: lib/imagefile.php:80
+#: lib/imagefile.php:93
msgid "Partial upload."
msgstr ""
-#: lib/imagefile.php:88 lib/mediafile.php:170
+#: lib/imagefile.php:101 lib/mediafile.php:170
msgid "System error uploading file."
msgstr ""
-#: lib/imagefile.php:96
-msgid "Not an image or corrupt file."
-msgstr ""
-
#: lib/imagefile.php:109
-msgid "Unsupported image file format."
+msgid "Not an image or corrupt file."
msgstr ""
#: lib/imagefile.php:122
msgid "Lost our file."
msgstr ""
-#: lib/imagefile.php:166 lib/imagefile.php:231
+#: lib/imagefile.php:163 lib/imagefile.php:224
msgid "Unknown file type"
msgstr "نوع ملف غير معروف"
-#: lib/imagefile.php:251
+#: lib/imagefile.php:244
msgid "MB"
msgstr "ميجابايت"
-#: lib/imagefile.php:253
+#: lib/imagefile.php:246
msgid "kB"
msgstr "كيلوبايت"
-#: lib/jabber.php:220
+#: lib/jabber.php:387
#, php-format
msgid "[%s]"
msgstr "[%s]"
-#: lib/jabber.php:400
+#: lib/jabber.php:567
#, php-format
msgid "Unknown inbox source %d."
msgstr "مصدر صندوق وارد غير معروف %d."
@@ -5621,7 +5693,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:482
+#: lib/mailbox.php:227 lib/noticelist.php:486
msgid "from"
msgstr "من"
@@ -5746,48 +5818,48 @@ msgid ""
"try again later"
msgstr ""
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr ""
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "N"
msgstr "ش"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "S"
msgstr "ج"
-#: lib/noticelist.php:431
+#: lib/noticelist.php:432
msgid "E"
msgstr "ر"
-#: lib/noticelist.php:431
+#: lib/noticelist.php:432
msgid "W"
msgstr "غ"
-#: lib/noticelist.php:438
+#: lib/noticelist.php:439
msgid "at"
msgstr "في"
-#: lib/noticelist.php:566
+#: lib/noticelist.php:570
msgid "in context"
msgstr "في السياق"
-#: lib/noticelist.php:601
+#: lib/noticelist.php:605
msgid "Repeated by"
msgstr "مكرر بواسطة"
-#: lib/noticelist.php:628
+#: lib/noticelist.php:632
msgid "Reply to this notice"
msgstr "رُد على هذا الإشعار"
-#: lib/noticelist.php:629
+#: lib/noticelist.php:633
msgid "Reply"
msgstr "رُد"
-#: lib/noticelist.php:673
+#: lib/noticelist.php:677
msgid "Notice repeated"
msgstr "الإشعار مكرر"
@@ -5860,7 +5932,7 @@ msgstr "وسوم في إشعارات %s"
msgid "Unknown"
msgstr "غير معروفة"
-#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr "الاشتراكات"
@@ -5868,7 +5940,7 @@ msgstr "الاشتراكات"
msgid "All subscriptions"
msgstr "جميع الاشتراكات"
-#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90
+#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr "المشتركون"
@@ -5876,15 +5948,20 @@ msgstr "المشتركون"
msgid "All subscribers"
msgstr "جميع المشتركين"
-#: lib/profileaction.php:180
+#: lib/profileaction.php:186
msgid "User ID"
msgstr "هوية المستخدم"
-#: lib/profileaction.php:185
+#: lib/profileaction.php:191
msgid "Member since"
msgstr "عضو منذ"
-#: lib/profileaction.php:247
+#. TRANS: Average count of posts made per day since account registration
+#: lib/profileaction.php:230
+msgid "Daily average"
+msgstr "المُعدّل اليومي"
+
+#: lib/profileaction.php:259
msgid "All groups"
msgstr "كل المجموعات"
@@ -5929,7 +6006,7 @@ msgstr "كرّر هذا الإشعار"
msgid "Revoke the \"%s\" role from this user"
msgstr "امنع هذا المستخدم من هذه المجموعة"
-#: lib/router.php:671
+#: lib/router.php:704
msgid "No single user defined for single-user mode."
msgstr ""
@@ -6055,90 +6132,99 @@ msgstr "ألغِ الاشتراك مع هذا المستخدم"
msgid "Unsubscribe"
msgstr "ألغِ الاشتراك"
-#: lib/userprofile.php:116
+#: lib/usernoprofileexception.php:58
+#, fuzzy, php-format
+msgid "User %s (%d) has no profile record."
+msgstr "ليس للمستخدم ملف شخصي."
+
+#: lib/userprofile.php:117
msgid "Edit Avatar"
msgstr "عدّل الأفتار"
-#: lib/userprofile.php:236
+#: lib/userprofile.php:234 lib/userprofile.php:248
msgid "User actions"
msgstr "تصرفات المستخدم"
-#: lib/userprofile.php:251
+#: lib/userprofile.php:237
+msgid "User deletion in progress..."
+msgstr "حذف المستخدم قيد التنفيذ..."
+
+#: lib/userprofile.php:263
msgid "Edit profile settings"
msgstr "عدّل إعدادات الملف الشخصي"
-#: lib/userprofile.php:252
+#: lib/userprofile.php:264
msgid "Edit"
msgstr "عدّل"
-#: lib/userprofile.php:275
+#: lib/userprofile.php:287
msgid "Send a direct message to this user"
msgstr "أرسل رسالة مباشرة إلى هذا المستخدم"
-#: lib/userprofile.php:276
+#: lib/userprofile.php:288
msgid "Message"
msgstr "رسالة"
-#: lib/userprofile.php:314
+#: lib/userprofile.php:326
msgid "Moderate"
-msgstr ""
+msgstr "راقب"
-#: lib/userprofile.php:352
+#: lib/userprofile.php:364
#, fuzzy
msgid "User role"
msgstr "ملف المستخدم الشخصي"
-#: lib/userprofile.php:354
+#: lib/userprofile.php:366
msgctxt "role"
msgid "Administrator"
msgstr "إداري"
-#: lib/userprofile.php:355
+#: lib/userprofile.php:367
msgctxt "role"
msgid "Moderator"
msgstr "مراقب"
-#: lib/util.php:1015
+#: lib/util.php:1046
msgid "a few seconds ago"
msgstr "قبل لحظات قليلة"
-#: lib/util.php:1017
+#: lib/util.php:1048
msgid "about a minute ago"
msgstr "قبل دقيقة تقريبًا"
-#: lib/util.php:1019
+#: lib/util.php:1050
#, php-format
msgid "about %d minutes ago"
msgstr ""
-#: lib/util.php:1021
+#: lib/util.php:1052
msgid "about an hour ago"
msgstr "قبل ساعة تقريبًا"
-#: lib/util.php:1023
+#: lib/util.php:1054
#, php-format
msgid "about %d hours ago"
msgstr ""
-#: lib/util.php:1025
+#: lib/util.php:1056
msgid "about a day ago"
msgstr "قبل يوم تقريبا"
-#: lib/util.php:1027
+#: lib/util.php:1058
#, php-format
msgid "about %d days ago"
msgstr ""
-#: lib/util.php:1029
+#: lib/util.php:1060
msgid "about a month ago"
msgstr "قبل شهر تقريبًا"
-#: lib/util.php:1031
+#: lib/util.php:1062
#, php-format
msgid "about %d months ago"
msgstr ""
-#: lib/util.php:1033
+#: lib/util.php:1064
msgid "about a year ago"
msgstr "قبل سنة تقريبًا"
@@ -6152,7 +6238,7 @@ msgstr "%s ليس لونًا صحيحًا!"
msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr ""
-#: lib/xmppmanager.php:402
+#: lib/xmppmanager.php:403
#, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d."
msgstr ""
diff --git a/locale/arz/LC_MESSAGES/statusnet.po b/locale/arz/LC_MESSAGES/statusnet.po
index aaf1d89bd..d8b12e2d5 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-03-06 23:49+0000\n"
-"PO-Revision-Date: 2010-03-06 23:49:19+0000\n"
+"POT-Creation-Date: 2010-04-05 18:54+0000\n"
+"PO-Revision-Date: 2010-04-05 18:54:37+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 (r63350); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64621); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: arz\n"
"X-Message-Group: out-statusnet\n"
@@ -98,9 +98,9 @@ msgstr "لا صفحه كهذه"
#: 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:90
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78
+#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
@@ -109,10 +109,8 @@ msgstr "لا صفحه كهذه"
#: actions/remotesubscribe.php:154 actions/replies.php:73
#: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:163 lib/command.php:302
-#: lib/command.php:355 lib/command.php:401 lib/command.php:462
-#: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82
-#: lib/profileaction.php:77
+#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: lib/mailbox.php:82 lib/profileaction.php:77
msgid "No such user."
msgstr "لا مستخدم كهذا."
@@ -199,18 +197,18 @@ msgstr ""
#: 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:132
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:136
#: actions/apigrouplistall.php:120 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:135
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
-#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184
-#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148
+#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:174
+#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173
+#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
-#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
+#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
msgid "API method not found."
msgstr "الـ API method مش موجوده."
@@ -223,8 +221,8 @@ msgstr "الـ API method مش موجوده."
#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65
-#: actions/apistatusesupdate.php:118
+#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
msgid "This method requires a POST."
msgstr "تتطلب هذه الطريقه POST."
@@ -253,7 +251,7 @@ msgid "Could not save profile."
msgstr "لم يمكن حفظ الملف."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:97
+#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
#: actions/designadminpanel.php:122 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
@@ -337,7 +335,7 @@ msgstr ""
msgid "This status is already a favorite."
msgstr "الحاله دى موجوده فعلا فى التفضيلات."
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
msgid "Could not create favorite."
msgstr "تعذّر إنشاء مفضله."
@@ -454,7 +452,7 @@ msgstr "لم توجد المجموعة!"
msgid "You are already a member of that group."
msgstr ""
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:221
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
msgid "You have been blocked from that group by the admin."
msgstr ""
@@ -472,11 +470,18 @@ msgstr ""
msgid "Could not remove user %1$s from group %2$s."
msgstr "ما نفعش يتشال اليوزر %1$s من الجروپ %2$s."
-#: actions/apigrouplist.php:95
+#. TRANS: %s is a user name
+#: actions/apigrouplist.php:97
#, 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
+#, fuzzy, php-format
+msgid "%1$s groups %2$s is a member of."
+msgstr "المجموعات التى %s عضو فيها"
+
#: actions/apigrouplistall.php:90 actions/usergroups.php:62
#, php-format
msgid "%s groups"
@@ -505,7 +510,7 @@ msgstr "حجم غير صالح."
#: 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:337
+#: actions/profilesettings.php:194 actions/recoverpassword.php:350
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
@@ -565,15 +570,15 @@ msgid ""
"give access to your %4$s account to third parties you trust."
msgstr ""
-#: actions/apioauthauthorize.php:310 lib/action.php:438
+#: actions/apioauthauthorize.php:310 lib/action.php:437
msgid "Account"
msgstr "الحساب"
#: actions/apioauthauthorize.php:313 actions/login.php:230
#: actions/profilesettings.php:106 actions/register.php:424
-#: actions/showgroup.php:244 actions/tagother.php:94
+#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
-#: lib/userprofile.php:131
+#: lib/userprofile.php:132
msgid "Nickname"
msgstr "الاسم المستعار"
@@ -642,12 +647,12 @@ msgstr ""
msgid "Unsupported format."
msgstr "نسق غير مدعوم."
-#: actions/apitimelinefavorites.php:108
+#: actions/apitimelinefavorites.php:109
#, php-format
msgid "%1$s / Favorites from %2$s"
msgstr ""
-#: actions/apitimelinefavorites.php:117
+#: actions/apitimelinefavorites.php:118
#, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr ""
@@ -657,7 +662,7 @@ msgstr ""
msgid "%1$s / Updates mentioning %2$s"
msgstr ""
-#: actions/apitimelinementions.php:127
+#: actions/apitimelinementions.php:130
#, php-format
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr ""
@@ -667,7 +672,7 @@ msgstr ""
msgid "%s public timeline"
msgstr "مسار %s الزمنى العام"
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr ""
@@ -682,12 +687,12 @@ msgstr "كرر إلى %s"
msgid "Repeats of %s"
msgstr "تكرارات %s"
-#: actions/apitimelinetag.php:102 actions/tag.php:67
+#: actions/apitimelinetag.php:104 actions/tag.php:67
#, php-format
msgid "Notices tagged with %s"
msgstr "الإشعارات الموسومه ب%s"
-#: actions/apitimelinetag.php:104 actions/tagrss.php:65
+#: actions/apitimelinetag.php:106 actions/tagrss.php:65
#, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr ""
@@ -715,7 +720,7 @@ msgstr "لا حجم."
msgid "Invalid size."
msgstr "حجم غير صالح."
-#: actions/avatarsettings.php:67 actions/showgroup.php:229
+#: actions/avatarsettings.php:67 actions/showgroup.php:230
#: lib/accountsettingsaction.php:112
msgid "Avatar"
msgstr "أفتار"
@@ -747,7 +752,7 @@ msgid "Preview"
msgstr "عاين"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:655
+#: lib/deleteuserform.php:66 lib/noticelist.php:659
msgid "Delete"
msgstr "احذف"
@@ -759,23 +764,28 @@ msgstr "ارفع"
msgid "Crop"
msgstr ""
-#: actions/avatarsettings.php:328
+#: actions/avatarsettings.php:305
+#, fuzzy
+msgid "No file uploaded."
+msgstr "لا ملف شخصى مُحدّد."
+
+#: actions/avatarsettings.php:332
msgid "Pick a square area of the image to be your avatar"
msgstr ""
-#: actions/avatarsettings.php:343 actions/grouplogo.php:380
+#: actions/avatarsettings.php:347 actions/grouplogo.php:380
msgid "Lost our file data."
msgstr ""
-#: actions/avatarsettings.php:366
+#: actions/avatarsettings.php:370
msgid "Avatar updated."
msgstr "رُفع الأفتار."
-#: actions/avatarsettings.php:369
+#: actions/avatarsettings.php:373
msgid "Failed updating avatar."
msgstr "فشل تحديث الأفتار."
-#: actions/avatarsettings.php:393
+#: actions/avatarsettings.php:397
msgid "Avatar deleted."
msgstr "حُذف الأفتار."
@@ -827,8 +837,8 @@ msgstr "فشل حفظ معلومات المنع."
#: actions/groupunblock.php:86 actions/joingroup.php:82
#: actions/joingroup.php:93 actions/leavegroup.php:82
#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212
-#: lib/command.php:260
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162
+#: lib/command.php:358
msgid "No such group."
msgstr "لا مجموعه كهذه."
@@ -910,7 +920,7 @@ msgid "Conversation"
msgstr "محادثة"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:218 lib/searchgroupnav.php:82
+#: lib/profileaction.php:224 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "الإشعارات"
@@ -931,7 +941,7 @@ msgstr "انت مش بتملك الapplication دى."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1217
+#: lib/action.php:1219
msgid "There was a problem with your session token."
msgstr ""
@@ -990,7 +1000,7 @@ msgstr "أمتأكد من أنك تريد حذف هذا الإشعار؟"
msgid "Do not delete this notice"
msgstr "لا تحذف هذا الإشعار"
-#: actions/deletenotice.php:146 lib/noticelist.php:655
+#: actions/deletenotice.php:146 lib/noticelist.php:659
msgid "Delete this notice"
msgstr "احذف هذا الإشعار"
@@ -1123,7 +1133,7 @@ msgstr "ارجع إلى المبدئي"
#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:208
+#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
#: actions/tagother.php:154 actions/useradminpanel.php:294
#: lib/applicationeditform.php:333 lib/applicationeditform.php:334
#: lib/designsettings.php:256 lib/groupeditform.php:202
@@ -1240,7 +1250,7 @@ msgstr ""
msgid "Could not update group."
msgstr "تعذر تحديث المجموعه."
-#: actions/editgroup.php:264 classes/User_group.php:493
+#: actions/editgroup.php:264 classes/User_group.php:496
msgid "Could not create aliases."
msgstr "تعذّر إنشاء الكنى."
@@ -1714,7 +1724,7 @@ msgstr "مسار %s الزمني"
msgid "Updates from members of %1$s on %2$s!"
msgstr ""
-#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232
+#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244
#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr "مجموعات"
@@ -1904,7 +1914,7 @@ msgstr "دعوه مستخدمين جدد"
msgid "You are already subscribed to these users:"
msgstr ""
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
#, php-format
msgid "%1$s (%2$s)"
msgstr "%1$s (%2$s)"
@@ -2006,7 +2016,7 @@ msgstr "%1$s دخل جروپ %2$s"
msgid "You must be logged in to leave a group."
msgstr ""
-#: actions/leavegroup.php:100 lib/command.php:265
+#: actions/leavegroup.php:100 lib/command.php:363
msgid "You are not a member of that group."
msgstr "لست عضوا فى تلك المجموعه."
@@ -2116,12 +2126,12 @@ msgstr "استخدم هذا النموذج لإنشاء مجموعه جديده.
msgid "New message"
msgstr "رساله جديدة"
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
msgid "You can't send a message to this user."
msgstr ""
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342
-#: lib/command.php:475
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
+#: lib/command.php:529
msgid "No content!"
msgstr "لا محتوى!"
@@ -2129,7 +2139,7 @@ msgstr "لا محتوى!"
msgid "No recipient specified."
msgstr "لا مستلم حُدّد."
-#: actions/newmessage.php:164 lib/command.php:361
+#: actions/newmessage.php:164 lib/command.php:462
msgid ""
"Don't send a message to yourself; just say it to yourself quietly instead."
msgstr ""
@@ -2143,7 +2153,7 @@ msgstr "أُرسلت الرسالة"
msgid "Direct message to %s sent."
msgstr "رساله مباشره اتبعتت لـ%s."
-#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189
msgid "Ajax Error"
msgstr "خطأ أجاكس"
@@ -2151,7 +2161,7 @@ msgstr "خطأ أجاكس"
msgid "New notice"
msgstr "إشعار جديد"
-#: actions/newnotice.php:211
+#: actions/newnotice.php:217
msgid "Notice posted"
msgstr "أُرسل الإشعار"
@@ -2254,7 +2264,7 @@ msgstr ""
msgid "Notice has no profile"
msgstr ""
-#: actions/oembed.php:86 actions/shownotice.php:180
+#: actions/oembed.php:86 actions/shownotice.php:175
#, php-format
msgid "%1$s's status on %2$s"
msgstr ""
@@ -2267,8 +2277,8 @@ msgstr "نوع المحتوى "
msgid "Only "
msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042
-#: lib/apiaction.php:1070 lib/apiaction.php:1179
+#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1068
+#: lib/apiaction.php:1096 lib/apiaction.php:1212
msgid "Not a supported data format."
msgstr " مش نظام بيانات مدعوم."
@@ -2399,7 +2409,7 @@ msgstr "كلمه السر القديمه غير صحيحة"
msgid "Error saving user; invalid."
msgstr "خطأ أثناء حفظ المستخدم؛ غير صالح."
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
msgid "Can't save new password."
msgstr "تعذّر حفظ كلمه السر الجديده."
@@ -2608,8 +2618,8 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr ""
#: actions/profilesettings.php:111 actions/register.php:448
-#: actions/showgroup.php:255 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:149
+#: actions/showgroup.php:256 actions/tagother.php:104
+#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "الاسم الكامل"
@@ -2636,9 +2646,9 @@ msgid "Bio"
msgstr "السيرة"
#: actions/profilesettings.php:132 actions/register.php:471
-#: actions/showgroup.php:264 actions/tagother.php:112
+#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
-#: lib/userprofile.php:164
+#: lib/userprofile.php:165
msgid "Location"
msgstr "الموقع"
@@ -2652,7 +2662,7 @@ msgstr ""
#: actions/profilesettings.php:145 actions/tagother.php:149
#: actions/tagother.php:209 lib/subscriptionlist.php:106
-#: lib/subscriptionlist.php:108 lib/userprofile.php:209
+#: lib/subscriptionlist.php:108 lib/userprofile.php:210
msgid "Tags"
msgstr "الوسوم"
@@ -2882,7 +2892,7 @@ msgstr "أعد ضبط كلمه السر"
msgid "Recover password"
msgstr "استعد كلمه السر"
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
msgid "Password recovery requested"
msgstr "طُلبت استعاده كلمه السر"
@@ -2902,41 +2912,41 @@ msgstr "أعد الضبط"
msgid "Enter a nickname or email address."
msgstr "أدخل اسمًا مستعارًا أو عنوان بريد إلكترونى."
-#: actions/recoverpassword.php:272
+#: actions/recoverpassword.php:282
msgid "No user with that email address or username."
msgstr ""
-#: actions/recoverpassword.php:287
+#: actions/recoverpassword.php:299
msgid "No registered email address for that user."
msgstr ""
-#: actions/recoverpassword.php:301
+#: actions/recoverpassword.php:313
msgid "Error saving address confirmation."
msgstr "خطأ أثناء حفظ تأكيد العنوان."
-#: actions/recoverpassword.php:325
+#: actions/recoverpassword.php:338
msgid ""
"Instructions for recovering your password have been sent to the email "
"address registered to your account."
msgstr ""
-#: actions/recoverpassword.php:344
+#: actions/recoverpassword.php:357
msgid "Unexpected password reset."
msgstr ""
-#: actions/recoverpassword.php:352
+#: actions/recoverpassword.php:365
msgid "Password must be 6 chars or more."
msgstr "يجب أن تكون كلمه السر 6 محارف أو أكثر."
-#: actions/recoverpassword.php:356
+#: actions/recoverpassword.php:369
msgid "Password and confirmation do not match."
msgstr ""
-#: actions/recoverpassword.php:375 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:248
msgid "Error setting user."
msgstr "خطأ أثناء ضبط المستخدم."
-#: actions/recoverpassword.php:382
+#: actions/recoverpassword.php:395
msgid "New password successfully saved. You are now logged in."
msgstr ""
@@ -3075,7 +3085,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr ""
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:394
+#: lib/userprofile.php:406
msgid "Subscribe"
msgstr "اشترك"
@@ -3111,7 +3121,7 @@ msgstr "ما ينفعش تكرر الملاحظه بتاعتك."
msgid "You already repeated that notice."
msgstr "انت عيدت الملاحظه دى فعلا."
-#: actions/repeat.php:114 lib/noticelist.php:674
+#: actions/repeat.php:114 lib/noticelist.php:678
msgid "Repeated"
msgstr "مكرر"
@@ -3251,8 +3261,8 @@ msgstr "المنظمه"
msgid "Description"
msgstr "الوصف"
-#: actions/showapplication.php:192 actions/showgroup.php:438
-#: lib/profileaction.php:176
+#: actions/showapplication.php:192 actions/showgroup.php:439
+#: lib/profileaction.php:182
msgid "Statistics"
msgstr "إحصاءات"
@@ -3367,67 +3377,67 @@ msgstr "مجموعه %s"
msgid "%1$s group, page %2$d"
msgstr "%1$s أعضاء المجموعة, الصفحه %2$d"
-#: actions/showgroup.php:226
+#: actions/showgroup.php:227
msgid "Group profile"
msgstr "ملف المجموعه الشخصي"
-#: actions/showgroup.php:271 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:177
+#: actions/showgroup.php:272 actions/tagother.php:118
+#: actions/userauthorization.php:175 lib/userprofile.php:178
msgid "URL"
msgstr "مسار"
-#: actions/showgroup.php:282 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:194
+#: actions/showgroup.php:283 actions/tagother.php:128
+#: actions/userauthorization.php:187 lib/userprofile.php:195
msgid "Note"
msgstr "ملاحظة"
-#: actions/showgroup.php:292 lib/groupeditform.php:184
+#: actions/showgroup.php:293 lib/groupeditform.php:184
msgid "Aliases"
msgstr "الكنى"
-#: actions/showgroup.php:301
+#: actions/showgroup.php:302
msgid "Group actions"
msgstr ""
-#: actions/showgroup.php:337
+#: actions/showgroup.php:338
#, php-format
msgid "Notice feed for %s group (RSS 1.0)"
msgstr ""
-#: actions/showgroup.php:343
+#: actions/showgroup.php:344
#, php-format
msgid "Notice feed for %s group (RSS 2.0)"
msgstr ""
-#: actions/showgroup.php:349
+#: actions/showgroup.php:350
#, php-format
msgid "Notice feed for %s group (Atom)"
msgstr ""
-#: actions/showgroup.php:354
+#: actions/showgroup.php:355
#, php-format
msgid "FOAF for %s group"
msgstr ""
-#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91
+#: actions/showgroup.php:391 actions/showgroup.php:448 lib/groupnav.php:91
msgid "Members"
msgstr "الأعضاء"
-#: actions/showgroup.php:395 lib/profileaction.php:117
-#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95
-#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71
+#: actions/showgroup.php:396 lib/profileaction.php:117
+#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95
+#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
msgid "(None)"
msgstr "(لا شيء)"
-#: actions/showgroup.php:401
+#: actions/showgroup.php:402
msgid "All members"
msgstr "جميع الأعضاء"
-#: actions/showgroup.php:441
+#: actions/showgroup.php:442
msgid "Created"
msgstr "أنشئ"
-#: actions/showgroup.php:457
+#: actions/showgroup.php:458
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3437,7 +3447,7 @@ msgid ""
"of this group and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
-#: actions/showgroup.php:463
+#: actions/showgroup.php:464
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3446,7 +3456,7 @@ msgid ""
"their life and interests. "
msgstr ""
-#: actions/showgroup.php:491
+#: actions/showgroup.php:492
msgid "Admins"
msgstr "الإداريون"
@@ -3574,7 +3584,8 @@ msgid "Unknown language \"%s\"."
msgstr "لغه مش معروفه \"%s\"."
#: actions/siteadminpanel.php:165
-msgid "Minimum text limit is 140 characters."
+#, fuzzy
+msgid "Minimum text limit is 0 (unlimited)."
msgstr "حد النص الأدنى هو 140 حرفًا."
#: actions/siteadminpanel.php:171
@@ -3843,8 +3854,7 @@ msgstr "اذف إعدادت الموقع"
msgid "You are not subscribed to that profile."
msgstr ""
-#: actions/subedit.php:83 classes/Subscription.php:89
-#: classes/Subscription.php:116
+#: actions/subedit.php:83 classes/Subscription.php:132
msgid "Could not save subscription."
msgstr "تعذّر حفظ الاشتراك."
@@ -3936,11 +3946,11 @@ msgstr ""
msgid "%s is not listening to anyone."
msgstr ""
-#: actions/subscriptions.php:199
+#: actions/subscriptions.php:208
msgid "Jabber"
msgstr "جابر"
-#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:222 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr "رسائل قصيرة"
@@ -3973,12 +3983,12 @@ msgstr "لا مدخل هويه."
msgid "Tag %s"
msgstr ""
-#: actions/tagother.php:77 lib/userprofile.php:75
+#: actions/tagother.php:77 lib/userprofile.php:76
msgid "User profile"
msgstr "ملف المستخدم الشخصي"
#: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:102
+#: lib/userprofile.php:103
msgid "Photo"
msgstr "صورة"
@@ -4283,7 +4293,7 @@ msgstr ""
msgid "Plugins"
msgstr ""
-#: actions/version.php:196 lib/action.php:767
+#: actions/version.php:196 lib/action.php:766
msgid "Version"
msgstr "النسخه"
@@ -4291,19 +4301,19 @@ msgstr "النسخه"
msgid "Author(s)"
msgstr "المؤلف/ين"
-#: classes/File.php:144
+#: classes/File.php:169
#, 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:154
+#: classes/File.php:179
#, php-format
msgid "A file this large would exceed your user quota of %d bytes."
msgstr ""
-#: classes/File.php:161
+#: classes/File.php:186
#, php-format
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
@@ -4342,96 +4352,96 @@ msgstr "تعذّر إدراج الرساله."
msgid "Could not update message with new URI."
msgstr ""
-#: classes/Notice.php:172
+#: classes/Notice.php:175
#, php-format
msgid "DB error inserting hashtag: %s"
msgstr ""
-#: classes/Notice.php:241
+#: classes/Notice.php:244
msgid "Problem saving notice. Too long."
msgstr "مشكله فى حفظ الإشعار. طويل جدًا."
-#: classes/Notice.php:245
+#: classes/Notice.php:248
msgid "Problem saving notice. Unknown user."
msgstr "مشكله فى حفظ الإشعار. مستخدم غير معروف."
-#: classes/Notice.php:250
+#: classes/Notice.php:253
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
-#: classes/Notice.php:256
+#: classes/Notice.php:259
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
msgstr ""
-#: classes/Notice.php:262
+#: classes/Notice.php:265
msgid "You are banned from posting notices on this site."
msgstr ""
-#: classes/Notice.php:328 classes/Notice.php:354
+#: classes/Notice.php:331 classes/Notice.php:357
msgid "Problem saving notice."
msgstr "مشكله أثناء حفظ الإشعار."
-#: classes/Notice.php:927
+#: classes/Notice.php:943
#, fuzzy
msgid "Problem saving group inbox."
msgstr "مشكله أثناء حفظ الإشعار."
-#: classes/Notice.php:1459
+#: classes/Notice.php:1481
#, php-format
msgid "RT @%1$s %2$s"
msgstr "آر تى @%1$s %2$s"
-#: classes/Subscription.php:66 lib/oauthstore.php:465
+#: classes/Subscription.php:74 lib/oauthstore.php:465
msgid "You have been banned from subscribing."
msgstr ""
-#: classes/Subscription.php:70
+#: classes/Subscription.php:78
msgid "Already subscribed!"
msgstr "مُشترك أصلا!"
-#: classes/Subscription.php:74
+#: classes/Subscription.php:82
msgid "User has blocked you."
msgstr "لقد منعك المستخدم."
-#: classes/Subscription.php:157
+#: classes/Subscription.php:167
msgid "Not subscribed!"
msgstr "غير مشترك!"
-#: classes/Subscription.php:163
+#: classes/Subscription.php:173
msgid "Couldn't delete self-subscription."
msgstr "ما نفعش يمسح الاشتراك الشخصى."
-#: classes/Subscription.php:190
+#: classes/Subscription.php:200
#, fuzzy
msgid "Couldn't delete subscription OMB token."
msgstr "تعذّر حذف الاشتراك."
-#: classes/Subscription.php:201 lib/subs.php:69
+#: classes/Subscription.php:211
msgid "Couldn't delete subscription."
msgstr "تعذّر حذف الاشتراك."
-#: classes/User.php:373
+#: classes/User.php:363
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "أهلا بكم فى %1$s يا @%2$s!"
-#: classes/User_group.php:477
+#: classes/User_group.php:480
msgid "Could not create group."
msgstr "تعذّر إنشاء المجموعه."
-#: classes/User_group.php:486
+#: classes/User_group.php:489
#, fuzzy
msgid "Could not set group URI."
msgstr "تعذّر ضبط عضويه المجموعه."
-#: classes/User_group.php:507
+#: classes/User_group.php:510
msgid "Could not set group membership."
msgstr "تعذّر ضبط عضويه المجموعه."
-#: classes/User_group.php:521
+#: classes/User_group.php:524
#, fuzzy
msgid "Could not save local group info."
msgstr "تعذّر حفظ الاشتراك."
@@ -4473,127 +4483,127 @@ msgstr "%1$s - %2$s"
msgid "Untitled page"
msgstr "صفحه غير مُعنونة"
-#: lib/action.php:424
+#: lib/action.php:423
msgid "Primary site navigation"
msgstr ""
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:430
+#: lib/action.php:429
#, fuzzy
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr "الملف الشخصى ومسار الأصدقاء الزمني"
-#: lib/action.php:433
+#: lib/action.php:432
#, fuzzy
msgctxt "MENU"
msgid "Personal"
msgstr "شخصية"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:435
+#: lib/action.php:434
#, fuzzy
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "غير كلمه سرّك"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:440
+#: lib/action.php:439
#, fuzzy
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "كونيكشونات (Connections)"
-#: lib/action.php:443
+#: lib/action.php:442
msgid "Connect"
msgstr "اتصل"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:446
+#: lib/action.php:445
#, fuzzy
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "غيّر ضبط الموقع"
-#: lib/action.php:449
+#: lib/action.php:448
#, fuzzy
msgctxt "MENU"
msgid "Admin"
msgstr "إداري"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:453
+#: lib/action.php:452
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr ""
-#: lib/action.php:456
+#: lib/action.php:455
#, fuzzy
msgctxt "MENU"
msgid "Invite"
msgstr "ادعُ"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:462
+#: lib/action.php:461
#, fuzzy
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "اخرج من الموقع"
-#: lib/action.php:465
+#: lib/action.php:464
#, fuzzy
msgctxt "MENU"
msgid "Logout"
msgstr "اخرج"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:470
+#: lib/action.php:469
#, fuzzy
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "أنشئ حسابًا"
-#: lib/action.php:473
+#: lib/action.php:472
#, fuzzy
msgctxt "MENU"
msgid "Register"
msgstr "سجّل"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:476
+#: lib/action.php:475
#, fuzzy
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "لُج إلى الموقع"
-#: lib/action.php:479
+#: lib/action.php:478
#, fuzzy
msgctxt "MENU"
msgid "Login"
msgstr "لُج"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:482
+#: lib/action.php:481
#, fuzzy
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "ساعدني!"
-#: lib/action.php:485
+#: lib/action.php:484
#, fuzzy
msgctxt "MENU"
msgid "Help"
msgstr "مساعدة"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:488
+#: lib/action.php:487
#, fuzzy
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "ابحث عن أشخاص أو نص"
-#: lib/action.php:491
+#: lib/action.php:490
#, fuzzy
msgctxt "MENU"
msgid "Search"
@@ -4601,59 +4611,59 @@ msgstr "ابحث"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:513 lib/adminpanelaction.php:398
+#: lib/action.php:512 lib/adminpanelaction.php:398
msgid "Site notice"
msgstr "إشعار الموقع"
-#: lib/action.php:579
+#: lib/action.php:578
msgid "Local views"
msgstr "المشاهدات المحلية"
-#: lib/action.php:645
+#: lib/action.php:644
msgid "Page notice"
msgstr "إشعار الصفحة"
-#: lib/action.php:747
+#: lib/action.php:746
msgid "Secondary site navigation"
msgstr ""
-#: lib/action.php:752
+#: lib/action.php:751
msgid "Help"
msgstr "مساعدة"
-#: lib/action.php:754
+#: lib/action.php:753
msgid "About"
msgstr "عن"
-#: lib/action.php:756
+#: lib/action.php:755
msgid "FAQ"
msgstr "الأسئله المكررة"
-#: lib/action.php:760
+#: lib/action.php:759
msgid "TOS"
msgstr "الشروط"
-#: lib/action.php:763
+#: lib/action.php:762
msgid "Privacy"
msgstr "خصوصية"
-#: lib/action.php:765
+#: lib/action.php:764
msgid "Source"
msgstr "المصدر"
-#: lib/action.php:769
+#: lib/action.php:768
msgid "Contact"
msgstr "اتصل"
-#: lib/action.php:771
+#: lib/action.php:770
msgid "Badge"
msgstr ""
-#: lib/action.php:799
+#: lib/action.php:798
msgid "StatusNet software license"
msgstr ""
-#: lib/action.php:802
+#: lib/action.php:803
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4662,12 +4672,12 @@ msgstr ""
"**%%site.name%%** خدمه تدوين مصغر يقدمها لك [%%site.broughtby%%](%%site."
"broughtbyurl%%). "
-#: lib/action.php:804
+#: lib/action.php:805
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr ""
-#: lib/action.php:806
+#: lib/action.php:808
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4678,53 +4688,57 @@ msgstr ""
"المتوفر تحت [رخصه غنو أفيرو العمومية](http://www.fsf.org/licensing/licenses/"
"agpl-3.0.html)."
-#: lib/action.php:821
+#: lib/action.php:823
msgid "Site content license"
msgstr "رخصه محتوى الموقع"
-#: lib/action.php:826
+#: lib/action.php:828
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
-#: lib/action.php:831
+#: lib/action.php:833
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
-#: lib/action.php:834
+#: lib/action.php:836
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
-#: lib/action.php:847
+#: lib/action.php:849
msgid "All "
msgstr ""
-#: lib/action.php:853
+#: lib/action.php:855
msgid "license."
msgstr "الرخصه."
-#: lib/action.php:1152
+#: lib/action.php:1154
msgid "Pagination"
msgstr ""
-#: lib/action.php:1161
+#: lib/action.php:1163
msgid "After"
msgstr "بعد"
-#: lib/action.php:1169
+#: lib/action.php:1171
msgid "Before"
msgstr "قبل"
-#: lib/activity.php:453
+#: lib/activity.php:120
+msgid "Expecting a root feed element but got a whole XML document."
+msgstr ""
+
+#: lib/activityutils.php:208
msgid "Can't handle remote content yet."
msgstr ""
-#: lib/activity.php:481
+#: lib/activityutils.php:236
msgid "Can't handle embedded XML content yet."
msgstr ""
-#: lib/activity.php:485
+#: lib/activityutils.php:240
msgid "Can't handle embedded Base64 content yet."
msgstr ""
@@ -4821,7 +4835,7 @@ msgstr "ضبط المسارات"
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
-#: lib/apiauth.php:272
+#: lib/apiauth.php:276
#, php-format
msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s"
msgstr ""
@@ -4895,11 +4909,11 @@ msgstr "بطّل"
msgid "Attachments"
msgstr "مرفقات"
-#: lib/attachmentlist.php:265
+#: lib/attachmentlist.php:263
msgid "Author"
msgstr "المؤلف"
-#: lib/attachmentlist.php:278
+#: lib/attachmentlist.php:276
msgid "Provider"
msgstr "المزود"
@@ -4919,37 +4933,50 @@ msgstr "تغيير الپاسوورد فشل"
msgid "Password changing is not allowed"
msgstr "تغيير الپاسوورد مش مسموح"
-#: lib/channel.php:138 lib/channel.php:158
+#: lib/channel.php:157 lib/channel.php:177
msgid "Command results"
msgstr "نتائج الأمر"
-#: lib/channel.php:210 lib/mailhandler.php:142
+#: lib/channel.php:229 lib/mailhandler.php:142
msgid "Command complete"
msgstr "اكتمل الأمر"
-#: lib/channel.php:221
+#: lib/channel.php:240
msgid "Command failed"
msgstr "فشل الأمر"
-#: lib/command.php:44
-msgid "Sorry, this command is not yet implemented."
-msgstr ""
+#: lib/command.php:83 lib/command.php:105
+msgid "Notice with that id does not exist"
+msgstr "الملاحظه بالـID ده مالهاش وجود"
+
+#: lib/command.php:99 lib/command.php:570
+msgid "User has no last notice"
+msgstr "ليس للمستخدم إشعار أخير"
-#: lib/command.php:88
+#: lib/command.php:125
#, php-format
msgid "Could not find a user with nickname %s"
msgstr "ما نفعش يلاقى يوزر بإسم %s"
-#: lib/command.php:92
+#: lib/command.php:143
+#, fuzzy, php-format
+msgid "Could not find a local user with nickname %s"
+msgstr "ما نفعش يلاقى يوزر بإسم %s"
+
+#: lib/command.php:176
+msgid "Sorry, this command is not yet implemented."
+msgstr ""
+
+#: lib/command.php:221
msgid "It does not make a lot of sense to nudge yourself!"
msgstr ""
-#: lib/command.php:99
+#: lib/command.php:228
#, php-format
msgid "Nudge sent to %s"
msgstr "Nudge اتبعتت لـ %s"
-#: lib/command.php:126
+#: lib/command.php:254
#, php-format
msgid ""
"Subscriptions: %1$s\n"
@@ -4960,170 +4987,167 @@ msgstr ""
"المشتركون: %2$s\n"
"الإشعارات: %3$s"
-#: lib/command.php:152 lib/command.php:390 lib/command.php:451
-msgid "Notice with that id does not exist"
-msgstr "الملاحظه بالـID ده مالهاش وجود"
-
-#: lib/command.php:168 lib/command.php:406 lib/command.php:467
-#: lib/command.php:523
-msgid "User has no last notice"
-msgstr "ليس للمستخدم إشعار أخير"
-
-#: lib/command.php:190
+#: lib/command.php:296
msgid "Notice marked as fave."
msgstr ""
-#: lib/command.php:217
+#: lib/command.php:317
msgid "You are already a member of that group"
msgstr "انت اصلا عضو فى الجروپ ده"
-#: lib/command.php:231
+#: lib/command.php:331
#, php-format
msgid "Could not join user %s to group %s"
msgstr "ما نفعش يدخل اليوزر %s لجروپ %s"
-#: lib/command.php:236
+#: lib/command.php:336
#, php-format
msgid "%s joined group %s"
msgstr "%s انضم إلى مجموعه %s"
-#: lib/command.php:275
+#: lib/command.php:373
#, php-format
msgid "Could not remove user %s to group %s"
msgstr "ما نفعش يشيل اليوزر %s لجروپ %s"
-#: lib/command.php:280
+#: lib/command.php:378
#, php-format
msgid "%s left group %s"
msgstr "%s ساب الجروپ %s"
-#: lib/command.php:309
+#: lib/command.php:401
#, php-format
msgid "Fullname: %s"
msgstr "الاسم الكامل: %s"
-#: lib/command.php:312 lib/mail.php:258
+#: lib/command.php:404 lib/mail.php:258
#, php-format
msgid "Location: %s"
msgstr "الموقع: %s"
-#: lib/command.php:315 lib/mail.php:260
+#: lib/command.php:407 lib/mail.php:260
#, php-format
msgid "Homepage: %s"
msgstr "الصفحه الرئيسية: %s"
-#: lib/command.php:318
+#: lib/command.php:410
#, php-format
msgid "About: %s"
msgstr "عن: %s"
-#: lib/command.php:349
+#: lib/command.php:437
+#, php-format
+msgid ""
+"%s is a remote profile; you can only send direct messages to users on the "
+"same server."
+msgstr ""
+
+#: lib/command.php:450
#, php-format
msgid "Message too long - maximum is %d characters, you sent %d"
msgstr ""
-#: lib/command.php:367
+#: lib/command.php:468
#, php-format
msgid "Direct message to %s sent"
msgstr "رساله مباشره اتبعتت لـ %s"
-#: lib/command.php:369
+#: lib/command.php:470
msgid "Error sending direct message."
msgstr ""
-#: lib/command.php:413
+#: lib/command.php:490
msgid "Cannot repeat your own notice"
msgstr "الملاحظه بتاعتك مش نافعه تتكرر"
-#: lib/command.php:418
+#: lib/command.php:495
msgid "Already repeated that notice"
msgstr "كرر بالفعل هذا الإشعار"
-#: lib/command.php:426
+#: lib/command.php:503
#, php-format
msgid "Notice from %s repeated"
msgstr "الإشعار من %s مكرر"
-#: lib/command.php:428
+#: lib/command.php:505
msgid "Error repeating notice."
msgstr "خطأ تكرار الإشعار."
-#: lib/command.php:482
+#: lib/command.php:536
#, php-format
msgid "Notice too long - maximum is %d characters, you sent %d"
msgstr ""
-#: lib/command.php:491
+#: lib/command.php:545
#, php-format
msgid "Reply to %s sent"
msgstr "رُد على رساله %s"
-#: lib/command.php:493
+#: lib/command.php:547
msgid "Error saving notice."
msgstr "خطأ أثناء حفظ الإشعار."
-#: lib/command.php:547
+#: lib/command.php:594
msgid "Specify the name of the user to subscribe to"
msgstr ""
-#: lib/command.php:554 lib/command.php:589
-#, fuzzy
-msgid "No such user"
-msgstr "لا مستخدم كهذا."
+#: lib/command.php:602
+msgid "Can't subscribe to OMB profiles by command."
+msgstr ""
-#: lib/command.php:561
+#: lib/command.php:608
#, php-format
msgid "Subscribed to %s"
msgstr "مُشترك ب%s"
-#: lib/command.php:582 lib/command.php:685
+#: lib/command.php:629 lib/command.php:728
msgid "Specify the name of the user to unsubscribe from"
msgstr ""
-#: lib/command.php:595
+#: lib/command.php:638
#, php-format
msgid "Unsubscribed from %s"
msgstr ""
-#: lib/command.php:613 lib/command.php:636
+#: lib/command.php:656 lib/command.php:679
msgid "Command not yet implemented."
msgstr ""
-#: lib/command.php:616
+#: lib/command.php:659
msgid "Notification off."
msgstr ""
-#: lib/command.php:618
+#: lib/command.php:661
msgid "Can't turn off notification."
msgstr ""
-#: lib/command.php:639
+#: lib/command.php:682
msgid "Notification on."
msgstr ""
-#: lib/command.php:641
+#: lib/command.php:684
msgid "Can't turn on notification."
msgstr ""
-#: lib/command.php:654
+#: lib/command.php:697
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:665
+#: lib/command.php:708
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:692
+#: lib/command.php:735
#, fuzzy, php-format
msgid "Unsubscribed %s"
msgstr "ألغِ الاشتراك"
-#: lib/command.php:709
+#: lib/command.php:752
msgid "You are not subscribed to anyone."
msgstr "لست مُشتركًا بأى أحد."
-#: lib/command.php:711
+#: lib/command.php:754
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "لست مشتركًا بأحد."
@@ -5133,11 +5157,11 @@ msgstr[3] "أنت مشترك بهؤلاء الأشخاص:"
msgstr[4] ""
msgstr[5] ""
-#: lib/command.php:731
+#: lib/command.php:774
msgid "No one is subscribed to you."
msgstr "لا أحد مشترك بك."
-#: lib/command.php:733
+#: lib/command.php:776
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "لا أحد مشترك بك."
@@ -5147,11 +5171,11 @@ msgstr[3] "هؤلاء الأشخاص مشتركون بك:"
msgstr[4] ""
msgstr[5] ""
-#: lib/command.php:753
+#: lib/command.php:796
msgid "You are not a member of any groups."
msgstr "لست عضوًا فى أى مجموعه."
-#: lib/command.php:755
+#: lib/command.php:798
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "لست عضوًا فى أى مجموعه."
@@ -5161,7 +5185,7 @@ msgstr[3] "أنت عضو فى هذه المجموعات:"
msgstr[4] ""
msgstr[5] ""
-#: lib/command.php:769
+#: lib/command.php:812
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5203,19 +5227,19 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:148
+#: lib/common.php:135
msgid "No configuration file found. "
msgstr ""
-#: lib/common.php:149
+#: lib/common.php:136
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:151
+#: lib/common.php:138
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:152
+#: lib/common.php:139
msgid "Go to the installer."
msgstr "اذهب إلى المُثبّت."
@@ -5389,49 +5413,49 @@ msgstr ""
msgid "This page is not available in a media type you accept"
msgstr ""
-#: lib/imagefile.php:75
+#: lib/imagefile.php:72
+msgid "Unsupported image file format."
+msgstr ""
+
+#: lib/imagefile.php:88
#, php-format
msgid "That file is too big. The maximum file size is %s."
msgstr "هذا الملف كبير جدًا. إن أقصى حجم للملفات هو %s."
-#: lib/imagefile.php:80
+#: lib/imagefile.php:93
msgid "Partial upload."
msgstr ""
-#: lib/imagefile.php:88 lib/mediafile.php:170
+#: lib/imagefile.php:101 lib/mediafile.php:170
msgid "System error uploading file."
msgstr ""
-#: lib/imagefile.php:96
-msgid "Not an image or corrupt file."
-msgstr ""
-
#: lib/imagefile.php:109
-msgid "Unsupported image file format."
+msgid "Not an image or corrupt file."
msgstr ""
#: lib/imagefile.php:122
msgid "Lost our file."
msgstr ""
-#: lib/imagefile.php:166 lib/imagefile.php:231
+#: lib/imagefile.php:163 lib/imagefile.php:224
msgid "Unknown file type"
msgstr "نوع ملف غير معروف"
-#: lib/imagefile.php:251
+#: lib/imagefile.php:244
msgid "MB"
msgstr "ميجابايت"
-#: lib/imagefile.php:253
+#: lib/imagefile.php:246
msgid "kB"
msgstr "كيلوبايت"
-#: lib/jabber.php:220
+#: lib/jabber.php:387
#, php-format
msgid "[%s]"
msgstr "[%s]"
-#: lib/jabber.php:400
+#: lib/jabber.php:567
#, php-format
msgid "Unknown inbox source %d."
msgstr "مصدر الـinbox مش معروف %d."
@@ -5626,7 +5650,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:482
+#: lib/mailbox.php:227 lib/noticelist.php:486
msgid "from"
msgstr "من"
@@ -5752,48 +5776,48 @@ msgid ""
"try again later"
msgstr ""
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr ""
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "N"
msgstr "ش"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "S"
msgstr "ج"
-#: lib/noticelist.php:431
+#: lib/noticelist.php:432
msgid "E"
msgstr "ر"
-#: lib/noticelist.php:431
+#: lib/noticelist.php:432
msgid "W"
msgstr "غ"
-#: lib/noticelist.php:438
+#: lib/noticelist.php:439
msgid "at"
msgstr "في"
-#: lib/noticelist.php:566
+#: lib/noticelist.php:570
msgid "in context"
msgstr "فى السياق"
-#: lib/noticelist.php:601
+#: lib/noticelist.php:605
msgid "Repeated by"
msgstr "متكرر من"
-#: lib/noticelist.php:628
+#: lib/noticelist.php:632
msgid "Reply to this notice"
msgstr "رُد على هذا الإشعار"
-#: lib/noticelist.php:629
+#: lib/noticelist.php:633
msgid "Reply"
msgstr "رُد"
-#: lib/noticelist.php:673
+#: lib/noticelist.php:677
msgid "Notice repeated"
msgstr "الإشعار مكرر"
@@ -5866,7 +5890,7 @@ msgstr ""
msgid "Unknown"
msgstr "مش معروف"
-#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr "الاشتراكات"
@@ -5874,7 +5898,7 @@ msgstr "الاشتراكات"
msgid "All subscriptions"
msgstr "جميع الاشتراكات"
-#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90
+#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr "المشتركون"
@@ -5882,15 +5906,20 @@ msgstr "المشتركون"
msgid "All subscribers"
msgstr "جميع المشتركين"
-#: lib/profileaction.php:180
+#: lib/profileaction.php:186
msgid "User ID"
msgstr "هويه المستخدم"
-#: lib/profileaction.php:185
+#: lib/profileaction.php:191
msgid "Member since"
msgstr "عضو منذ"
-#: lib/profileaction.php:247
+#. TRANS: Average count of posts made per day since account registration
+#: lib/profileaction.php:230
+msgid "Daily average"
+msgstr ""
+
+#: lib/profileaction.php:259
msgid "All groups"
msgstr "كل المجموعات"
@@ -5935,7 +5964,7 @@ msgstr "كرر هذا الإشعار"
msgid "Revoke the \"%s\" role from this user"
msgstr "امنع هذا المستخدم من هذه المجموعة"
-#: lib/router.php:671
+#: lib/router.php:704
msgid "No single user defined for single-user mode."
msgstr ""
@@ -6061,91 +6090,100 @@ msgstr "ألغِ الاشتراك مع هذا المستخدم"
msgid "Unsubscribe"
msgstr "ألغِ الاشتراك"
-#: lib/userprofile.php:116
+#: lib/usernoprofileexception.php:58
+#, fuzzy, php-format
+msgid "User %s (%d) has no profile record."
+msgstr "ليس للمستخدم ملف شخصى."
+
+#: lib/userprofile.php:117
msgid "Edit Avatar"
msgstr "عدّل الأفتار"
-#: lib/userprofile.php:236
+#: lib/userprofile.php:234 lib/userprofile.php:248
msgid "User actions"
msgstr "تصرفات المستخدم"
-#: lib/userprofile.php:251
+#: lib/userprofile.php:237
+msgid "User deletion in progress..."
+msgstr ""
+
+#: lib/userprofile.php:263
msgid "Edit profile settings"
msgstr "عدّل إعدادات الملف الشخصي"
-#: lib/userprofile.php:252
+#: lib/userprofile.php:264
msgid "Edit"
msgstr "عدّل"
-#: lib/userprofile.php:275
+#: lib/userprofile.php:287
msgid "Send a direct message to this user"
msgstr "أرسل رساله مباشره إلى هذا المستخدم"
-#: lib/userprofile.php:276
+#: lib/userprofile.php:288
msgid "Message"
msgstr "رسالة"
-#: lib/userprofile.php:314
+#: lib/userprofile.php:326
msgid "Moderate"
msgstr ""
-#: lib/userprofile.php:352
+#: lib/userprofile.php:364
#, fuzzy
msgid "User role"
msgstr "ملف المستخدم الشخصي"
-#: lib/userprofile.php:354
+#: lib/userprofile.php:366
#, fuzzy
msgctxt "role"
msgid "Administrator"
msgstr "الإداريون"
-#: lib/userprofile.php:355
+#: lib/userprofile.php:367
msgctxt "role"
msgid "Moderator"
msgstr ""
-#: lib/util.php:1015
+#: lib/util.php:1046
msgid "a few seconds ago"
msgstr "قبل لحظات قليلة"
-#: lib/util.php:1017
+#: lib/util.php:1048
msgid "about a minute ago"
msgstr "قبل دقيقه تقريبًا"
-#: lib/util.php:1019
+#: lib/util.php:1050
#, php-format
msgid "about %d minutes ago"
msgstr ""
-#: lib/util.php:1021
+#: lib/util.php:1052
msgid "about an hour ago"
msgstr "قبل ساعه تقريبًا"
-#: lib/util.php:1023
+#: lib/util.php:1054
#, php-format
msgid "about %d hours ago"
msgstr ""
-#: lib/util.php:1025
+#: lib/util.php:1056
msgid "about a day ago"
msgstr "قبل يوم تقريبا"
-#: lib/util.php:1027
+#: lib/util.php:1058
#, php-format
msgid "about %d days ago"
msgstr ""
-#: lib/util.php:1029
+#: lib/util.php:1060
msgid "about a month ago"
msgstr "قبل شهر تقريبًا"
-#: lib/util.php:1031
+#: lib/util.php:1062
#, php-format
msgid "about %d months ago"
msgstr ""
-#: lib/util.php:1033
+#: lib/util.php:1064
msgid "about a year ago"
msgstr "قبل سنه تقريبًا"
@@ -6159,7 +6197,7 @@ msgstr "%s ليس لونًا صحيحًا!"
msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr ""
-#: lib/xmppmanager.php:402
+#: lib/xmppmanager.php:403
#, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d."
msgstr ""
diff --git a/locale/bg/LC_MESSAGES/statusnet.po b/locale/bg/LC_MESSAGES/statusnet.po
index 3a6b5b047..8b2e14236 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-03-06 23:49+0000\n"
-"PO-Revision-Date: 2010-03-06 23:49:22+0000\n"
+"POT-Creation-Date: 2010-04-05 18:54+0000\n"
+"PO-Revision-Date: 2010-04-05 18:54:40+0000\n"
"Language-Team: Bulgarian\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64621); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: bg\n"
"X-Message-Group: out-statusnet\n"
@@ -74,7 +74,6 @@ msgid "Save access settings"
msgstr "Запазване настройките за достъп"
#: actions/accessadminpanel.php:203
-#, fuzzy
msgctxt "BUTTON"
msgid "Save"
msgstr "Запазване"
@@ -93,9 +92,9 @@ msgstr "Няма такака страница."
#: 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:90
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78
+#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
@@ -104,10 +103,8 @@ msgstr "Няма такака страница."
#: actions/remotesubscribe.php:154 actions/replies.php:73
#: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:163 lib/command.php:302
-#: lib/command.php:355 lib/command.php:401 lib/command.php:462
-#: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82
-#: lib/profileaction.php:77
+#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: lib/mailbox.php:82 lib/profileaction.php:77
msgid "No such user."
msgstr "Няма такъв потребител"
@@ -194,18 +191,18 @@ msgstr "Бележки от %1$s и приятели в %2$s."
#: 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:132
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:136
#: actions/apigrouplistall.php:120 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:135
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
-#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184
-#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148
+#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:174
+#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173
+#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
-#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
+#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
msgid "API method not found."
msgstr "Не е открит методът в API."
@@ -218,8 +215,8 @@ msgstr "Не е открит методът в API."
#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65
-#: actions/apistatusesupdate.php:118
+#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
msgid "This method requires a POST."
msgstr "Този метод изисква заявка POST."
@@ -248,7 +245,7 @@ msgid "Could not save profile."
msgstr "Грешка при запазване на профила."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:97
+#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
#: actions/designadminpanel.php:122 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
@@ -333,18 +330,16 @@ msgid "No status found with that ID."
msgstr "Не е открита бележка с такъв идентификатор."
#: actions/apifavoritecreate.php:119
-#, fuzzy
msgid "This status is already a favorite."
-msgstr "Тази бележка вече е отбелязана като любима!"
+msgstr "Тази бележка вече е отбелязана като любима."
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
msgid "Could not create favorite."
msgstr "Грешка при отбелязване като любима."
#: actions/apifavoritedestroy.php:122
-#, fuzzy
msgid "That status is not a favorite."
-msgstr "Тази бележка не е отбелязана като любима!"
+msgstr "Тази бележка не е отбелязана като любима."
#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
msgid "Could not delete favorite."
@@ -364,9 +359,8 @@ msgid "Could not unfollow user: User not found."
msgstr "Грешка при спиране на проследяването — потребителят не е намерен."
#: actions/apifriendshipsdestroy.php:120
-#, fuzzy
msgid "You cannot unfollow yourself."
-msgstr "Не можете да спрете да следите себе си!"
+msgstr "Не можете да спрете да следите себе си."
#: actions/apifriendshipsexists.php:94
msgid "Two user ids or screen_names must be supplied."
@@ -459,7 +453,7 @@ msgstr "Групата не е открита."
msgid "You are already a member of that group."
msgstr "Вече членувате в тази група."
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:221
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
msgid "You have been blocked from that group by the admin."
msgstr ""
@@ -477,11 +471,18 @@ msgstr "Не членувате в тази група."
msgid "Could not remove user %1$s from group %2$s."
msgstr "Грешка при проследяване — потребителят не е намерен."
-#: actions/apigrouplist.php:95
+#. TRANS: %s is a user name
+#: actions/apigrouplist.php:97
#, 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
+#, fuzzy, php-format
+msgid "%1$s groups %2$s is a member of."
+msgstr "Групи, в които участва %s"
+
#: actions/apigrouplistall.php:90 actions/usergroups.php:62
#, php-format
msgid "%s groups"
@@ -510,7 +511,7 @@ msgstr "Неправилен размер."
#: 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:337
+#: actions/profilesettings.php:194 actions/recoverpassword.php:350
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
@@ -520,9 +521,8 @@ msgid "There was a problem with your session token. Try again, please."
msgstr "Имаше проблем със сесията ви в сайта. Моля, опитайте отново!"
#: actions/apioauthauthorize.php:135
-#, fuzzy
msgid "Invalid nickname / password!"
-msgstr "Неправилно име или парола."
+msgstr "Неправилно име или парола!"
#: actions/apioauthauthorize.php:159
#, fuzzy
@@ -571,15 +571,15 @@ msgid ""
"give access to your %4$s account to third parties you trust."
msgstr ""
-#: actions/apioauthauthorize.php:310 lib/action.php:438
+#: actions/apioauthauthorize.php:310 lib/action.php:437
msgid "Account"
msgstr "Сметка"
#: actions/apioauthauthorize.php:313 actions/login.php:230
#: actions/profilesettings.php:106 actions/register.php:424
-#: actions/showgroup.php:244 actions/tagother.php:94
+#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
-#: lib/userprofile.php:131
+#: lib/userprofile.php:132
msgid "Nickname"
msgstr "Псевдоним"
@@ -649,12 +649,12 @@ msgstr ""
msgid "Unsupported format."
msgstr "Неподдържан формат."
-#: actions/apitimelinefavorites.php:108
+#: actions/apitimelinefavorites.php:109
#, fuzzy, php-format
msgid "%1$s / Favorites from %2$s"
msgstr "%s / Отбелязани като любими от %s"
-#: actions/apitimelinefavorites.php:117
+#: actions/apitimelinefavorites.php:118
#, fuzzy, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "%s бележки отбелязани като любими от %s / %s."
@@ -664,7 +664,7 @@ msgstr "%s бележки отбелязани като любими от %s / %
msgid "%1$s / Updates mentioning %2$s"
msgstr "%1$s / Реплики на %2$s"
-#: actions/apitimelinementions.php:127
+#: actions/apitimelinementions.php:130
#, php-format
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "%1$s реплики на съобщения от %2$s / %3$s."
@@ -674,7 +674,7 @@ msgstr "%1$s реплики на съобщения от %2$s / %3$s."
msgid "%s public timeline"
msgstr "Общ поток на %s"
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr ""
@@ -689,12 +689,12 @@ msgstr "Повторено за %s"
msgid "Repeats of %s"
msgstr "Повторения на %s"
-#: actions/apitimelinetag.php:102 actions/tag.php:67
+#: actions/apitimelinetag.php:104 actions/tag.php:67
#, php-format
msgid "Notices tagged with %s"
msgstr "Бележки с етикет %s"
-#: actions/apitimelinetag.php:104 actions/tagrss.php:65
+#: actions/apitimelinetag.php:106 actions/tagrss.php:65
#, fuzzy, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Бележки от %1$s в %2$s."
@@ -723,7 +723,7 @@ msgstr "Няма размер."
msgid "Invalid size."
msgstr "Неправилен размер."
-#: actions/avatarsettings.php:67 actions/showgroup.php:229
+#: actions/avatarsettings.php:67 actions/showgroup.php:230
#: lib/accountsettingsaction.php:112
msgid "Avatar"
msgstr "Аватар"
@@ -756,7 +756,7 @@ msgid "Preview"
msgstr "Преглед"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:655
+#: lib/deleteuserform.php:66 lib/noticelist.php:659
msgid "Delete"
msgstr "Изтриване"
@@ -768,23 +768,27 @@ msgstr "Качване"
msgid "Crop"
msgstr "Изрязване"
-#: actions/avatarsettings.php:328
+#: actions/avatarsettings.php:305
+msgid "No file uploaded."
+msgstr "Няма качен файл."
+
+#: actions/avatarsettings.php:332
msgid "Pick a square area of the image to be your avatar"
msgstr "Изберете квадратна област от изображението за аватар"
-#: actions/avatarsettings.php:343 actions/grouplogo.php:380
+#: actions/avatarsettings.php:347 actions/grouplogo.php:380
msgid "Lost our file data."
msgstr ""
-#: actions/avatarsettings.php:366
+#: actions/avatarsettings.php:370
msgid "Avatar updated."
msgstr "Аватарът е обновен."
-#: actions/avatarsettings.php:369
+#: actions/avatarsettings.php:373
msgid "Failed updating avatar."
msgstr "Неуспешно обновяване на аватара."
-#: actions/avatarsettings.php:393
+#: actions/avatarsettings.php:397
msgid "Avatar deleted."
msgstr "Аватарът е изтрит."
@@ -836,8 +840,8 @@ msgstr "Грешка при записване данните за блокир
#: actions/groupunblock.php:86 actions/joingroup.php:82
#: actions/joingroup.php:93 actions/leavegroup.php:82
#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212
-#: lib/command.php:260
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162
+#: lib/command.php:358
msgid "No such group."
msgstr "Няма такава група"
@@ -921,7 +925,7 @@ msgid "Conversation"
msgstr "Разговор"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:218 lib/searchgroupnav.php:82
+#: lib/profileaction.php:224 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "Бележки"
@@ -943,7 +947,7 @@ msgstr "Не членувате в тази група."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1217
+#: lib/action.php:1219
msgid "There was a problem with your session token."
msgstr "Имаше проблем със сесията ви в сайта."
@@ -1002,7 +1006,7 @@ msgstr "Наистина ли искате да изтриете тази бел
msgid "Do not delete this notice"
msgstr "Да не се изтрива бележката"
-#: actions/deletenotice.php:146 lib/noticelist.php:655
+#: actions/deletenotice.php:146 lib/noticelist.php:659
msgid "Delete this notice"
msgstr "Изтриване на бележката"
@@ -1140,7 +1144,7 @@ msgstr ""
#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:208
+#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
#: actions/tagother.php:154 actions/useradminpanel.php:294
#: lib/applicationeditform.php:333 lib/applicationeditform.php:334
#: lib/designsettings.php:256 lib/groupeditform.php:202
@@ -1165,20 +1169,17 @@ msgid "No such document \"%s\""
msgstr "Няма такъв документ."
#: actions/editapplication.php:54
-#, fuzzy
msgid "Edit Application"
-msgstr "Други настройки"
+msgstr "Редактиране на приложението"
#: actions/editapplication.php:66
-#, fuzzy
msgid "You must be logged in to edit an application."
-msgstr "За да редактирате група, трябва да сте влезли."
+msgstr "За да редактирате приложение, трябва да сте влезли."
#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:166
#: actions/showapplication.php:87
-#, fuzzy
msgid "No such application."
-msgstr "Няма такава бележка."
+msgstr "Няма такова приложение."
#: actions/editapplication.php:161
#, fuzzy
@@ -1186,9 +1187,8 @@ msgid "Use this form to edit your application."
msgstr "Използвайте тази бланка за създаване на нова група."
#: actions/editapplication.php:177 actions/newapplication.php:159
-#, fuzzy
msgid "Name is required."
-msgstr "Същото като паролата по-горе. Задължително поле."
+msgstr "Името е задължително."
#: actions/editapplication.php:180 actions/newapplication.php:165
#, fuzzy
@@ -1201,9 +1201,8 @@ msgid "Name already in use. Try another one."
msgstr "Опитайте друг псевдоним, този вече е зает."
#: actions/editapplication.php:186 actions/newapplication.php:168
-#, fuzzy
msgid "Description is required."
-msgstr "Описание"
+msgstr "Описанието е задължително."
#: actions/editapplication.php:194
msgid "Source URL is too long."
@@ -1219,9 +1218,8 @@ msgid "Organization is required."
msgstr ""
#: actions/editapplication.php:206 actions/newapplication.php:191
-#, fuzzy
msgid "Organization is too long (max 255 chars)."
-msgstr "Името на местоположението е твърде дълго (макс. 255 знака)."
+msgstr "Името на организацията е твърде дълго (макс. 255 знака)."
#: actions/editapplication.php:209 actions/newapplication.php:194
msgid "Organization homepage is required."
@@ -1268,7 +1266,7 @@ msgstr "Описанието е твърде дълго (до %d символа)
msgid "Could not update group."
msgstr "Грешка при обновяване на групата."
-#: actions/editgroup.php:264 classes/User_group.php:493
+#: actions/editgroup.php:264 classes/User_group.php:496
#, fuzzy
msgid "Could not create aliases."
msgstr "Грешка при отбелязване като любима."
@@ -1764,7 +1762,7 @@ msgstr "Поток на %s"
msgid "Updates from members of %1$s on %2$s!"
msgstr "Бележки от %1$s в %2$s."
-#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232
+#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244
#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr "Групи"
@@ -1969,7 +1967,7 @@ msgstr "Покани за нови потребители"
msgid "You are already subscribed to these users:"
msgstr "Вече сте абонирани за следните потребители:"
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
#, php-format
msgid "%1$s (%2$s)"
msgstr "%1$s (%2$s)"
@@ -2101,7 +2099,7 @@ msgstr "%s се присъедини към групата %s"
msgid "You must be logged in to leave a group."
msgstr "За напуснете група, трябва да сте влезли."
-#: actions/leavegroup.php:100 lib/command.php:265
+#: actions/leavegroup.php:100 lib/command.php:363
msgid "You are not a member of that group."
msgstr "Не членувате в тази група."
@@ -2184,9 +2182,8 @@ msgid "No current status"
msgstr ""
#: actions/newapplication.php:52
-#, fuzzy
msgid "New Application"
-msgstr "Няма такава бележка."
+msgstr "Ново приложение"
#: actions/newapplication.php:64
#, fuzzy
@@ -2219,12 +2216,12 @@ msgstr "Използвайте тази бланка за създаване н
msgid "New message"
msgstr "Ново съобщение"
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
msgid "You can't send a message to this user."
msgstr "Не може да изпращате съобщения до този потребител."
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342
-#: lib/command.php:475
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
+#: lib/command.php:529
msgid "No content!"
msgstr "Няма съдържание!"
@@ -2232,7 +2229,7 @@ msgstr "Няма съдържание!"
msgid "No recipient specified."
msgstr "Не е указан получател."
-#: actions/newmessage.php:164 lib/command.php:361
+#: actions/newmessage.php:164 lib/command.php:462
msgid ""
"Don't send a message to yourself; just say it to yourself quietly instead."
msgstr ""
@@ -2248,7 +2245,7 @@ msgstr "Съобщението е изпратено"
msgid "Direct message to %s sent."
msgstr "Прякото съобщение до %s е изпратено."
-#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189
msgid "Ajax Error"
msgstr "Грешка в Ajax"
@@ -2256,7 +2253,7 @@ msgstr "Грешка в Ajax"
msgid "New notice"
msgstr "Нова бележка"
-#: actions/newnotice.php:211
+#: actions/newnotice.php:217
msgid "Notice posted"
msgstr "Бележката е публикувана"
@@ -2364,7 +2361,7 @@ msgstr ""
msgid "Notice has no profile"
msgstr "Бележката няма профил"
-#: actions/oembed.php:86 actions/shownotice.php:180
+#: actions/oembed.php:86 actions/shownotice.php:175
#, php-format
msgid "%1$s's status on %2$s"
msgstr "Бележка на %1$s от %2$s"
@@ -2377,8 +2374,8 @@ msgstr "вид съдържание "
msgid "Only "
msgstr "Само "
-#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042
-#: lib/apiaction.php:1070 lib/apiaction.php:1179
+#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1068
+#: lib/apiaction.php:1096 lib/apiaction.php:1212
msgid "Not a supported data format."
msgstr "Неподдържан формат на данните"
@@ -2516,7 +2513,7 @@ msgstr "Грешна стара парола"
msgid "Error saving user; invalid."
msgstr "Грешка при запазване на потребител — невалидност."
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
msgid "Can't save new password."
msgstr "Грешка при запазване на новата парола."
@@ -2727,8 +2724,8 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr "От 1 до 64 малки букви или цифри, без пунктоация и интервали"
#: actions/profilesettings.php:111 actions/register.php:448
-#: actions/showgroup.php:255 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:149
+#: actions/showgroup.php:256 actions/tagother.php:104
+#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Пълно име"
@@ -2755,9 +2752,9 @@ msgid "Bio"
msgstr "За мен"
#: actions/profilesettings.php:132 actions/register.php:471
-#: actions/showgroup.php:264 actions/tagother.php:112
+#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
-#: lib/userprofile.php:164
+#: lib/userprofile.php:165
msgid "Location"
msgstr "Местоположение"
@@ -2771,7 +2768,7 @@ msgstr ""
#: actions/profilesettings.php:145 actions/tagother.php:149
#: actions/tagother.php:209 lib/subscriptionlist.php:106
-#: lib/subscriptionlist.php:108 lib/userprofile.php:209
+#: lib/subscriptionlist.php:108 lib/userprofile.php:210
msgid "Tags"
msgstr "Етикети"
@@ -2999,7 +2996,7 @@ msgstr "Нова парола"
msgid "Recover password"
msgstr "Възстановяване на паролата"
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
msgid "Password recovery requested"
msgstr "Поискано е възстановяване на парола"
@@ -3019,19 +3016,19 @@ msgstr "Обновяване"
msgid "Enter a nickname or email address."
msgstr "Въведете псевдоним или е-поща."
-#: actions/recoverpassword.php:272
+#: actions/recoverpassword.php:282
msgid "No user with that email address or username."
msgstr "Няма потребител с такава е-поща или потребителско име."
-#: actions/recoverpassword.php:287
+#: actions/recoverpassword.php:299
msgid "No registered email address for that user."
msgstr "Няма указана е-поща за този потребител."
-#: actions/recoverpassword.php:301
+#: actions/recoverpassword.php:313
msgid "Error saving address confirmation."
msgstr "Грешка при запазване на потвърждение за адрес"
-#: actions/recoverpassword.php:325
+#: actions/recoverpassword.php:338
msgid ""
"Instructions for recovering your password have been sent to the email "
"address registered to your account."
@@ -3039,23 +3036,23 @@ msgstr ""
"На е-пощата, с която сте регистрирани са изпратени инструкции за "
"възстановяване на паролата."
-#: actions/recoverpassword.php:344
+#: actions/recoverpassword.php:357
msgid "Unexpected password reset."
msgstr "Неочаквано подновяване на паролата."
-#: actions/recoverpassword.php:352
+#: actions/recoverpassword.php:365
msgid "Password must be 6 chars or more."
msgstr "Паролата трябва да е от поне 6 знака."
-#: actions/recoverpassword.php:356
+#: actions/recoverpassword.php:369
msgid "Password and confirmation do not match."
msgstr "Паролата и потвърждението й не съвпадат."
-#: actions/recoverpassword.php:375 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:248
msgid "Error setting user."
msgstr "Грешка в настройките на потребителя."
-#: actions/recoverpassword.php:382
+#: actions/recoverpassword.php:395
msgid "New password successfully saved. You are now logged in."
msgstr "Новата парола е запазена. Влязохте успешно."
@@ -3218,7 +3215,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "Адрес на профила ви в друга, съвместима услуга за микроблогване"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:394
+#: lib/userprofile.php:406
msgid "Subscribe"
msgstr "Абониране"
@@ -3256,7 +3253,7 @@ msgstr "Не можете да повтаряте собствена бележ
msgid "You already repeated that notice."
msgstr "Вече сте повторили тази бележка."
-#: actions/repeat.php:114 lib/noticelist.php:674
+#: actions/repeat.php:114 lib/noticelist.php:678
msgid "Repeated"
msgstr "Повторено"
@@ -3400,8 +3397,8 @@ msgstr "Организация"
msgid "Description"
msgstr "Описание"
-#: actions/showapplication.php:192 actions/showgroup.php:438
-#: lib/profileaction.php:176
+#: actions/showapplication.php:192 actions/showgroup.php:439
+#: lib/profileaction.php:182
msgid "Statistics"
msgstr "Статистики"
@@ -3420,7 +3417,7 @@ msgstr ""
#: actions/showapplication.php:261
msgid "Application info"
-msgstr ""
+msgstr "Данни за приложението"
#: actions/showapplication.php:263
msgid "Consumer key"
@@ -3513,67 +3510,67 @@ msgstr "Група %s"
msgid "%1$s group, page %2$d"
msgstr "Членове на групата %s, страница %d"
-#: actions/showgroup.php:226
+#: actions/showgroup.php:227
msgid "Group profile"
msgstr "Профил на групата"
-#: actions/showgroup.php:271 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:177
+#: actions/showgroup.php:272 actions/tagother.php:118
+#: actions/userauthorization.php:175 lib/userprofile.php:178
msgid "URL"
msgstr "URL"
-#: actions/showgroup.php:282 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:194
+#: actions/showgroup.php:283 actions/tagother.php:128
+#: actions/userauthorization.php:187 lib/userprofile.php:195
msgid "Note"
msgstr "Бележка"
-#: actions/showgroup.php:292 lib/groupeditform.php:184
+#: actions/showgroup.php:293 lib/groupeditform.php:184
msgid "Aliases"
msgstr "Псевдоними"
-#: actions/showgroup.php:301
+#: actions/showgroup.php:302
msgid "Group actions"
msgstr ""
-#: actions/showgroup.php:337
+#: actions/showgroup.php:338
#, fuzzy, php-format
msgid "Notice feed for %s group (RSS 1.0)"
msgstr "Емисия с бележки на %s"
-#: actions/showgroup.php:343
+#: actions/showgroup.php:344
#, fuzzy, php-format
msgid "Notice feed for %s group (RSS 2.0)"
msgstr "Емисия с бележки на %s"
-#: actions/showgroup.php:349
+#: actions/showgroup.php:350
#, fuzzy, php-format
msgid "Notice feed for %s group (Atom)"
msgstr "Емисия с бележки на %s"
-#: actions/showgroup.php:354
+#: actions/showgroup.php:355
#, php-format
msgid "FOAF for %s group"
msgstr "Изходяща кутия за %s"
-#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91
+#: actions/showgroup.php:391 actions/showgroup.php:448 lib/groupnav.php:91
msgid "Members"
msgstr "Членове"
-#: actions/showgroup.php:395 lib/profileaction.php:117
-#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95
-#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71
+#: actions/showgroup.php:396 lib/profileaction.php:117
+#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95
+#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
msgid "(None)"
msgstr ""
-#: actions/showgroup.php:401
+#: actions/showgroup.php:402
msgid "All members"
msgstr "Всички членове"
-#: actions/showgroup.php:441
+#: actions/showgroup.php:442
msgid "Created"
msgstr "Създадена на"
-#: actions/showgroup.php:457
+#: actions/showgroup.php:458
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3583,7 +3580,7 @@ msgid ""
"of this group and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
-#: actions/showgroup.php:463
+#: actions/showgroup.php:464
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3592,7 +3589,7 @@ msgid ""
"their life and interests. "
msgstr ""
-#: actions/showgroup.php:491
+#: actions/showgroup.php:492
msgid "Admins"
msgstr "Администратори"
@@ -3721,7 +3718,8 @@ msgid "Unknown language \"%s\"."
msgstr "Непознат език \"%s\"."
#: actions/siteadminpanel.php:165
-msgid "Minimum text limit is 140 characters."
+#, fuzzy
+msgid "Minimum text limit is 0 (unlimited)."
msgstr "Минималното ограничение на текста е 140 знака."
#: actions/siteadminpanel.php:171
@@ -3774,9 +3772,8 @@ msgid "Default timezone for the site; usually UTC."
msgstr "Часови пояс по подразбиране за сайта (обикновено UTC)."
#: actions/siteadminpanel.php:262
-#, fuzzy
msgid "Default language"
-msgstr "Език по подразбиране за сайта"
+msgstr "Език по подразбиране"
#: actions/siteadminpanel.php:263
msgid "Site language when autodetection from browser settings is not available"
@@ -4000,8 +3997,7 @@ msgstr "Запазване настройките на сайта"
msgid "You are not subscribed to that profile."
msgstr "Не сте абонирани за този профил"
-#: actions/subedit.php:83 classes/Subscription.php:89
-#: classes/Subscription.php:116
+#: actions/subedit.php:83 classes/Subscription.php:132
#, fuzzy
msgid "Could not save subscription."
msgstr "Грешка при създаване на нов абонамент."
@@ -4011,9 +4007,8 @@ msgid "This action only accepts POST requests."
msgstr ""
#: actions/subscribe.php:107
-#, fuzzy
msgid "No such profile."
-msgstr "Няма такъв файл."
+msgstr "Няма такъв профил."
#: actions/subscribe.php:117
#, fuzzy
@@ -4096,11 +4091,11 @@ msgstr ""
msgid "%s is not listening to anyone."
msgstr "%s не получава ничии бележки."
-#: actions/subscriptions.php:199
+#: actions/subscriptions.php:208
msgid "Jabber"
msgstr "Jabber"
-#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:222 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr "SMS"
@@ -4134,12 +4129,12 @@ msgstr "Няма такъв документ."
msgid "Tag %s"
msgstr "Етикети"
-#: actions/tagother.php:77 lib/userprofile.php:75
+#: actions/tagother.php:77 lib/userprofile.php:76
msgid "User profile"
msgstr "Потребителски профил"
#: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:102
+#: lib/userprofile.php:103
msgid "Photo"
msgstr "Снимка"
@@ -4206,7 +4201,6 @@ msgstr ""
#. TRANS: User admin panel title
#: actions/useradminpanel.php:59
-#, fuzzy
msgctxt "TITLE"
msgid "User"
msgstr "Потребител"
@@ -4463,7 +4457,7 @@ msgstr ""
msgid "Plugins"
msgstr "Приставки"
-#: actions/version.php:196 lib/action.php:767
+#: actions/version.php:196 lib/action.php:766
msgid "Version"
msgstr "Версия"
@@ -4471,19 +4465,19 @@ msgstr "Версия"
msgid "Author(s)"
msgstr "Автор(и)"
-#: classes/File.php:144
+#: classes/File.php:169
#, 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:154
+#: classes/File.php:179
#, php-format
msgid "A file this large would exceed your user quota of %d bytes."
msgstr ""
-#: classes/File.php:161
+#: classes/File.php:186
#, php-format
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
@@ -4526,28 +4520,28 @@ msgstr "Грешка при вмъкване на съобщението."
msgid "Could not update message with new URI."
msgstr "Грешка при обновяване на бележката с нов URL-адрес."
-#: classes/Notice.php:172
+#: classes/Notice.php:175
#, php-format
msgid "DB error inserting hashtag: %s"
msgstr ""
-#: classes/Notice.php:241
+#: classes/Notice.php:244
#, fuzzy
msgid "Problem saving notice. Too long."
msgstr "Проблем при записване на бележката."
-#: classes/Notice.php:245
+#: classes/Notice.php:248
msgid "Problem saving notice. Unknown user."
msgstr "Грешка при записване на бележката. Непознат потребител."
-#: classes/Notice.php:250
+#: classes/Notice.php:253
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
"Твърде много бележки за кратко време. Спрете, поемете дъх и публикувайте "
"отново след няколко минути."
-#: classes/Notice.php:256
+#: classes/Notice.php:259
#, fuzzy
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
@@ -4556,76 +4550,76 @@ msgstr ""
"Твърде много бележки за кратко време. Спрете, поемете дъх и публикувайте "
"отново след няколко минути."
-#: classes/Notice.php:262
+#: classes/Notice.php:265
msgid "You are banned from posting notices on this site."
msgstr "Забранено ви е да публикувате бележки в този сайт."
-#: classes/Notice.php:328 classes/Notice.php:354
+#: classes/Notice.php:331 classes/Notice.php:357
msgid "Problem saving notice."
msgstr "Проблем при записване на бележката."
-#: classes/Notice.php:927
+#: classes/Notice.php:943
#, fuzzy
msgid "Problem saving group inbox."
msgstr "Проблем при записване на бележката."
-#: classes/Notice.php:1459
+#: classes/Notice.php:1481
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
-#: classes/Subscription.php:66 lib/oauthstore.php:465
+#: classes/Subscription.php:74 lib/oauthstore.php:465
#, fuzzy
msgid "You have been banned from subscribing."
msgstr "Потребителят е забранил да се абонирате за него."
-#: classes/Subscription.php:70
+#: classes/Subscription.php:78
msgid "Already subscribed!"
msgstr ""
-#: classes/Subscription.php:74
+#: classes/Subscription.php:82
msgid "User has blocked you."
msgstr "Потребителят ви е блокирал."
-#: classes/Subscription.php:157
+#: classes/Subscription.php:167
#, fuzzy
msgid "Not subscribed!"
msgstr "Не сте абонирани!"
-#: classes/Subscription.php:163
+#: classes/Subscription.php:173
#, fuzzy
msgid "Couldn't delete self-subscription."
msgstr "Грешка при изтриване на абонамента."
-#: classes/Subscription.php:190
+#: classes/Subscription.php:200
#, fuzzy
msgid "Couldn't delete subscription OMB token."
msgstr "Грешка при изтриване на абонамента."
-#: classes/Subscription.php:201 lib/subs.php:69
+#: classes/Subscription.php:211
msgid "Couldn't delete subscription."
msgstr "Грешка при изтриване на абонамента."
-#: classes/User.php:373
+#: classes/User.php:363
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Добре дошли в %1$s, @%2$s!"
-#: classes/User_group.php:477
+#: classes/User_group.php:480
msgid "Could not create group."
msgstr "Грешка при създаване на групата."
-#: classes/User_group.php:486
+#: classes/User_group.php:489
#, fuzzy
msgid "Could not set group URI."
msgstr "Грешка при създаване на нов абонамент."
-#: classes/User_group.php:507
+#: classes/User_group.php:510
#, fuzzy
msgid "Could not set group membership."
msgstr "Грешка при създаване на нов абонамент."
-#: classes/User_group.php:521
+#: classes/User_group.php:524
#, fuzzy
msgid "Could not save local group info."
msgstr "Грешка при създаване на нов абонамент."
@@ -4668,189 +4662,183 @@ msgstr "%1$s - %2$s"
msgid "Untitled page"
msgstr "Неозаглавена страница"
-#: lib/action.php:424
+#: lib/action.php:423
msgid "Primary site navigation"
msgstr ""
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:430
+#: lib/action.php:429
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr ""
-#: lib/action.php:433
-#, fuzzy
+#: lib/action.php:432
msgctxt "MENU"
msgid "Personal"
msgstr "Лично"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:435
+#: lib/action.php:434
#, fuzzy
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "Промяна на поща, аватар, парола, профил"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:440
+#: lib/action.php:439
#, fuzzy
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "Свързване към услуги"
-#: lib/action.php:443
+#: lib/action.php:442
msgid "Connect"
msgstr "Свързване"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:446
+#: lib/action.php:445
#, fuzzy
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "Промяна настройките на сайта"
-#: lib/action.php:449
+#: lib/action.php:448
#, fuzzy
msgctxt "MENU"
msgid "Admin"
msgstr "Настройки"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:453
+#: lib/action.php:452
#, fuzzy, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "Поканете приятели и колеги да се присъединят към вас в %s"
-#: lib/action.php:456
+#: lib/action.php:455
#, fuzzy
msgctxt "MENU"
msgid "Invite"
msgstr "Покани"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:462
-#, fuzzy
+#: lib/action.php:461
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "Излизане от сайта"
-#: lib/action.php:465
-#, fuzzy
+#: lib/action.php:464
msgctxt "MENU"
msgid "Logout"
msgstr "Изход"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:470
+#: lib/action.php:469
#, fuzzy
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Създаване на нова сметка"
-#: lib/action.php:473
+#: lib/action.php:472
#, fuzzy
msgctxt "MENU"
msgid "Register"
msgstr "Регистриране"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:476
-#, fuzzy
+#: lib/action.php:475
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Влизане в сайта"
-#: lib/action.php:479
-#, fuzzy
+#: lib/action.php:478
msgctxt "MENU"
msgid "Login"
msgstr "Вход"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:482
+#: lib/action.php:481
#, fuzzy
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Помощ"
-#: lib/action.php:485
+#: lib/action.php:484
#, fuzzy
msgctxt "MENU"
msgid "Help"
msgstr "Помощ"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:488
+#: lib/action.php:487
#, fuzzy
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "Търсене за хора или бележки"
-#: lib/action.php:491
-#, fuzzy
+#: lib/action.php:490
msgctxt "MENU"
msgid "Search"
msgstr "Търсене"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:513 lib/adminpanelaction.php:398
+#: lib/action.php:512 lib/adminpanelaction.php:398
#, fuzzy
msgid "Site notice"
msgstr "Нова бележка"
-#: lib/action.php:579
+#: lib/action.php:578
msgid "Local views"
msgstr ""
-#: lib/action.php:645
+#: lib/action.php:644
#, fuzzy
msgid "Page notice"
msgstr "Нова бележка"
-#: lib/action.php:747
+#: lib/action.php:746
#, fuzzy
msgid "Secondary site navigation"
msgstr "Абонаменти"
-#: lib/action.php:752
+#: lib/action.php:751
msgid "Help"
msgstr "Помощ"
-#: lib/action.php:754
+#: lib/action.php:753
msgid "About"
msgstr "Относно"
-#: lib/action.php:756
+#: lib/action.php:755
msgid "FAQ"
msgstr "Въпроси"
-#: lib/action.php:760
+#: lib/action.php:759
msgid "TOS"
msgstr "Условия"
-#: lib/action.php:763
+#: lib/action.php:762
msgid "Privacy"
msgstr "Поверителност"
-#: lib/action.php:765
+#: lib/action.php:764
msgid "Source"
msgstr "Изходен код"
-#: lib/action.php:769
+#: lib/action.php:768
msgid "Contact"
msgstr "Контакт"
-#: lib/action.php:771
+#: lib/action.php:770
msgid "Badge"
msgstr "Табелка"
-#: lib/action.php:799
+#: lib/action.php:798
msgid "StatusNet software license"
msgstr "Лиценз на програмата StatusNet"
-#: lib/action.php:802
+#: lib/action.php:803
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4859,12 +4847,12 @@ msgstr ""
"**%%site.name%%** е услуга за микроблогване, предоставена ви от [%%site."
"broughtby%%](%%site.broughtbyurl%%). "
-#: lib/action.php:804
+#: lib/action.php:805
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** е услуга за микроблогване. "
-#: lib/action.php:806
+#: lib/action.php:808
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4875,53 +4863,57 @@ msgstr ""
"достъпна под [GNU Affero General Public License](http://www.fsf.org/"
"licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:821
+#: lib/action.php:823
msgid "Site content license"
msgstr "Лиценз на съдържанието"
-#: lib/action.php:826
+#: lib/action.php:828
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
-#: lib/action.php:831
+#: lib/action.php:833
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
-#: lib/action.php:834
+#: lib/action.php:836
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
-#: lib/action.php:847
+#: lib/action.php:849
msgid "All "
msgstr "Всички "
-#: lib/action.php:853
+#: lib/action.php:855
msgid "license."
msgstr "лиценз."
-#: lib/action.php:1152
+#: lib/action.php:1154
msgid "Pagination"
msgstr "Страниране"
-#: lib/action.php:1161
+#: lib/action.php:1163
msgid "After"
msgstr "След"
-#: lib/action.php:1169
+#: lib/action.php:1171
msgid "Before"
msgstr "Преди"
-#: lib/activity.php:453
+#: lib/activity.php:120
+msgid "Expecting a root feed element but got a whole XML document."
+msgstr ""
+
+#: lib/activityutils.php:208
msgid "Can't handle remote content yet."
msgstr ""
-#: lib/activity.php:481
+#: lib/activityutils.php:236
msgid "Can't handle embedded XML content yet."
msgstr ""
-#: lib/activity.php:485
+#: lib/activityutils.php:240
msgid "Can't handle embedded Base64 content yet."
msgstr ""
@@ -4961,7 +4953,6 @@ msgstr "Основна настройка на сайта"
#. TRANS: Menu item for site administration
#: lib/adminpanelaction.php:350
-#, fuzzy
msgctxt "MENU"
msgid "Site"
msgstr "Сайт"
@@ -5022,7 +5013,7 @@ msgstr "Настройка на пътищата"
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
-#: lib/apiauth.php:272
+#: lib/apiauth.php:276
#, php-format
msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s"
msgstr ""
@@ -5101,11 +5092,11 @@ msgstr "Премахване"
msgid "Attachments"
msgstr ""
-#: lib/attachmentlist.php:265
+#: lib/attachmentlist.php:263
msgid "Author"
msgstr "Автор"
-#: lib/attachmentlist.php:278
+#: lib/attachmentlist.php:276
msgid "Provider"
msgstr "Доставчик"
@@ -5127,37 +5118,51 @@ msgstr "Паролата е записана."
msgid "Password changing is not allowed"
msgstr "Паролата е записана."
-#: lib/channel.php:138 lib/channel.php:158
+#: lib/channel.php:157 lib/channel.php:177
msgid "Command results"
msgstr "Резултат от командата"
-#: lib/channel.php:210 lib/mailhandler.php:142
+#: lib/channel.php:229 lib/mailhandler.php:142
msgid "Command complete"
msgstr "Командата е изпълнена"
-#: lib/channel.php:221
+#: lib/channel.php:240
msgid "Command failed"
msgstr "Грешка при изпълнение на командата"
-#: lib/command.php:44
-msgid "Sorry, this command is not yet implemented."
-msgstr "За съжаление тази команда все още не се поддържа."
+#: lib/command.php:83 lib/command.php:105
+#, fuzzy
+msgid "Notice with that id does not exist"
+msgstr "Не е открита бележка с такъв идентификатор."
-#: lib/command.php:88
+#: lib/command.php:99 lib/command.php:570
+msgid "User has no last notice"
+msgstr "Потребителят няма последна бележка"
+
+#: lib/command.php:125
#, fuzzy, php-format
msgid "Could not find a user with nickname %s"
msgstr "Грешка при обновяване на потребител с потвърден email адрес."
-#: lib/command.php:92
+#: lib/command.php:143
+#, fuzzy, php-format
+msgid "Could not find a local user with nickname %s"
+msgstr "Грешка при обновяване на потребител с потвърден email адрес."
+
+#: lib/command.php:176
+msgid "Sorry, this command is not yet implemented."
+msgstr "За съжаление тази команда все още не се поддържа."
+
+#: lib/command.php:221
msgid "It does not make a lot of sense to nudge yourself!"
msgstr ""
-#: lib/command.php:99
+#: lib/command.php:228
#, php-format
msgid "Nudge sent to %s"
msgstr "Изпратено е побутване на %s"
-#: lib/command.php:126
+#: lib/command.php:254
#, php-format
msgid ""
"Subscriptions: %1$s\n"
@@ -5168,198 +5173,196 @@ msgstr ""
"Абонати: %2$s\n"
"Бележки: %3$s"
-#: lib/command.php:152 lib/command.php:390 lib/command.php:451
-#, fuzzy
-msgid "Notice with that id does not exist"
-msgstr "Не е открита бележка с такъв идентификатор."
-
-#: lib/command.php:168 lib/command.php:406 lib/command.php:467
-#: lib/command.php:523
-msgid "User has no last notice"
-msgstr "Потребителят няма последна бележка"
-
-#: lib/command.php:190
+#: lib/command.php:296
msgid "Notice marked as fave."
msgstr "Бележката е отбелязана като любима."
-#: lib/command.php:217
+#: lib/command.php:317
msgid "You are already a member of that group"
msgstr "Вече членувате в тази група."
-#: lib/command.php:231
+#: lib/command.php:331
#, fuzzy, php-format
msgid "Could not join user %s to group %s"
msgstr "Грешка при проследяване — потребителят не е намерен."
-#: lib/command.php:236
+#: lib/command.php:336
#, php-format
msgid "%s joined group %s"
msgstr "%s се присъедини към групата %s"
-#: lib/command.php:275
+#: lib/command.php:373
#, fuzzy, php-format
msgid "Could not remove user %s to group %s"
msgstr "Грешка при проследяване — потребителят не е намерен."
-#: lib/command.php:280
+#: lib/command.php:378
#, php-format
msgid "%s left group %s"
msgstr "%s напусна групата %s"
-#: lib/command.php:309
+#: lib/command.php:401
#, php-format
msgid "Fullname: %s"
msgstr "Пълно име: %s"
-#: lib/command.php:312 lib/mail.php:258
+#: lib/command.php:404 lib/mail.php:258
#, php-format
msgid "Location: %s"
msgstr "Местоположение: %s"
-#: lib/command.php:315 lib/mail.php:260
+#: lib/command.php:407 lib/mail.php:260
#, php-format
msgid "Homepage: %s"
msgstr "Домашна страница: %s"
-#: lib/command.php:318
+#: lib/command.php:410
#, php-format
msgid "About: %s"
msgstr "Относно: %s"
-#: lib/command.php:349
+#: lib/command.php:437
+#, php-format
+msgid ""
+"%s is a remote profile; you can only send direct messages to users on the "
+"same server."
+msgstr ""
+
+#: lib/command.php:450
#, fuzzy, php-format
msgid "Message too long - maximum is %d characters, you sent %d"
msgstr ""
"Съобщението е твърде дълго. Най-много може да е 140 знака, а сте въвели %d."
-#: lib/command.php:367
+#: lib/command.php:468
#, php-format
msgid "Direct message to %s sent"
msgstr "Прякото съобщение до %s е изпратено."
-#: lib/command.php:369
+#: lib/command.php:470
msgid "Error sending direct message."
msgstr "Грешка при изпращане на прякото съобщение"
-#: lib/command.php:413
+#: lib/command.php:490
msgid "Cannot repeat your own notice"
msgstr "Не можете да повтаряте собствена бележка"
-#: lib/command.php:418
+#: lib/command.php:495
msgid "Already repeated that notice"
msgstr "Вече сте повторили тази бележка."
-#: lib/command.php:426
+#: lib/command.php:503
#, php-format
msgid "Notice from %s repeated"
msgstr "Бележката от %s е повторена"
-#: lib/command.php:428
+#: lib/command.php:505
msgid "Error repeating notice."
msgstr "Грешка при повтаряне на бележката."
-#: lib/command.php:482
+#: lib/command.php:536
#, fuzzy, php-format
msgid "Notice too long - maximum is %d characters, you sent %d"
msgstr ""
"Съобщението е твърде дълго. Най-много може да е 140 знака, а сте въвели %d."
-#: lib/command.php:491
+#: lib/command.php:545
#, php-format
msgid "Reply to %s sent"
msgstr "Отговорът до %s е изпратен"
-#: lib/command.php:493
+#: lib/command.php:547
msgid "Error saving notice."
msgstr "Грешка при записване на бележката."
-#: lib/command.php:547
+#: lib/command.php:594
msgid "Specify the name of the user to subscribe to"
msgstr "Уточнете името на потребителя, за когото се абонирате."
-#: lib/command.php:554 lib/command.php:589
-msgid "No such user"
-msgstr "Няма такъв потребител"
+#: lib/command.php:602
+#, fuzzy
+msgid "Can't subscribe to OMB profiles by command."
+msgstr "Не сте абонирани за този профил"
-#: lib/command.php:561
+#: lib/command.php:608
#, php-format
msgid "Subscribed to %s"
msgstr "Абонирани сте за %s."
-#: lib/command.php:582 lib/command.php:685
+#: lib/command.php:629 lib/command.php:728
msgid "Specify the name of the user to unsubscribe from"
msgstr "Уточнете името на потребителя, от когото се отписвате."
-#: lib/command.php:595
+#: lib/command.php:638
#, php-format
msgid "Unsubscribed from %s"
msgstr "Отписани сте от %s."
-#: lib/command.php:613 lib/command.php:636
+#: lib/command.php:656 lib/command.php:679
msgid "Command not yet implemented."
msgstr "Командата все още не се поддържа."
-#: lib/command.php:616
+#: lib/command.php:659
msgid "Notification off."
msgstr "Уведомлението е изключено."
-#: lib/command.php:618
+#: lib/command.php:661
msgid "Can't turn off notification."
msgstr "Грешка при изключване на уведомлението."
-#: lib/command.php:639
+#: lib/command.php:682
msgid "Notification on."
msgstr "Уведомлението е включено."
-#: lib/command.php:641
+#: lib/command.php:684
msgid "Can't turn on notification."
msgstr "Грешка при включване на уведомлението."
-#: lib/command.php:654
+#: lib/command.php:697
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:665
+#: lib/command.php:708
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:692
+#: lib/command.php:735
#, fuzzy, php-format
msgid "Unsubscribed %s"
msgstr "Отписани сте от %s."
-#: lib/command.php:709
+#: lib/command.php:752
msgid "You are not subscribed to anyone."
msgstr "Не сте абонирани за никого."
-#: lib/command.php:711
+#: lib/command.php:754
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Вече сте абонирани за следните потребители:"
msgstr[1] "Вече сте абонирани за следните потребители:"
-#: lib/command.php:731
+#: lib/command.php:774
msgid "No one is subscribed to you."
msgstr "Никой не е абониран за вас."
-#: lib/command.php:733
+#: lib/command.php:776
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Грешка при абониране на друг потребител за вас."
msgstr[1] "Грешка при абониране на друг потребител за вас."
-#: lib/command.php:753
+#: lib/command.php:796
msgid "You are not a member of any groups."
msgstr "Не членувате в нито една група."
-#: lib/command.php:755
+#: lib/command.php:798
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Не членувате в тази група."
msgstr[1] "Не членувате в тази група."
-#: lib/command.php:769
+#: lib/command.php:812
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5401,19 +5404,19 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:148
+#: lib/common.php:135
msgid "No configuration file found. "
msgstr "Не е открит файл с настройки. "
-#: lib/common.php:149
+#: lib/common.php:136
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:151
+#: lib/common.php:138
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:152
+#: lib/common.php:139
#, fuzzy
msgid "Go to the installer."
msgstr "Влизане в сайта"
@@ -5593,50 +5596,50 @@ msgstr "Етикети в бележките към групата %s"
msgid "This page is not available in a media type you accept"
msgstr "Страницата не е достъпна във вида медия, който приемате"
-#: lib/imagefile.php:75
+#: lib/imagefile.php:72
+msgid "Unsupported image file format."
+msgstr "Форматът на файла с изображението не се поддържа."
+
+#: lib/imagefile.php:88
#, fuzzy, php-format
msgid "That file is too big. The maximum file size is %s."
msgstr "Може да качите лого за групата ви."
-#: lib/imagefile.php:80
+#: lib/imagefile.php:93
msgid "Partial upload."
msgstr "Частично качване на файла."
-#: lib/imagefile.php:88 lib/mediafile.php:170
+#: lib/imagefile.php:101 lib/mediafile.php:170
msgid "System error uploading file."
msgstr "Системна грешка при качване на файл."
-#: lib/imagefile.php:96
+#: lib/imagefile.php:109
msgid "Not an image or corrupt file."
msgstr "Файлът не е изображение или е повреден."
-#: lib/imagefile.php:109
-msgid "Unsupported image file format."
-msgstr "Форматът на файла с изображението не се поддържа."
-
#: lib/imagefile.php:122
#, fuzzy
msgid "Lost our file."
msgstr "Няма такава бележка."
-#: lib/imagefile.php:166 lib/imagefile.php:231
+#: lib/imagefile.php:163 lib/imagefile.php:224
msgid "Unknown file type"
msgstr "Неподдържан вид файл"
-#: lib/imagefile.php:251
+#: lib/imagefile.php:244
msgid "MB"
msgstr "MB"
-#: lib/imagefile.php:253
+#: lib/imagefile.php:246
msgid "kB"
msgstr "kB"
-#: lib/jabber.php:220
+#: lib/jabber.php:387
#, php-format
msgid "[%s]"
-msgstr ""
+msgstr "[%s]"
-#: lib/jabber.php:400
+#: lib/jabber.php:567
#, fuzzy, php-format
msgid "Unknown inbox source %d."
msgstr "Непознат език \"%s\""
@@ -5841,7 +5844,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:482
+#: lib/mailbox.php:227 lib/noticelist.php:486
msgid "from"
msgstr "от"
@@ -5970,48 +5973,48 @@ msgid ""
"try again later"
msgstr ""
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr ""
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "N"
msgstr "С"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "S"
msgstr "Ю"
-#: lib/noticelist.php:431
+#: lib/noticelist.php:432
msgid "E"
msgstr "И"
-#: lib/noticelist.php:431
+#: lib/noticelist.php:432
msgid "W"
msgstr "З"
-#: lib/noticelist.php:438
+#: lib/noticelist.php:439
msgid "at"
msgstr ""
-#: lib/noticelist.php:566
+#: lib/noticelist.php:570
msgid "in context"
msgstr "в контекст"
-#: lib/noticelist.php:601
+#: lib/noticelist.php:605
msgid "Repeated by"
msgstr "Повторено от"
-#: lib/noticelist.php:628
+#: lib/noticelist.php:632
msgid "Reply to this notice"
msgstr "Отговаряне на тази бележка"
-#: lib/noticelist.php:629
+#: lib/noticelist.php:633
msgid "Reply"
msgstr "Отговор"
-#: lib/noticelist.php:673
+#: lib/noticelist.php:677
msgid "Notice repeated"
msgstr "Бележката е повторена."
@@ -6086,7 +6089,7 @@ msgstr "Етикети в бележките на %s"
msgid "Unknown"
msgstr "Непознато действие"
-#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr "Абонаменти"
@@ -6094,7 +6097,7 @@ msgstr "Абонаменти"
msgid "All subscriptions"
msgstr "Всички абонаменти"
-#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90
+#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr "Абонати"
@@ -6102,16 +6105,21 @@ msgstr "Абонати"
msgid "All subscribers"
msgstr "Всички абонати"
-#: lib/profileaction.php:180
+#: lib/profileaction.php:186
#, fuzzy
msgid "User ID"
msgstr "Потребител"
-#: lib/profileaction.php:185
+#: lib/profileaction.php:191
msgid "Member since"
msgstr "Участник от"
-#: lib/profileaction.php:247
+#. TRANS: Average count of posts made per day since account registration
+#: lib/profileaction.php:230
+msgid "Daily average"
+msgstr ""
+
+#: lib/profileaction.php:259
msgid "All groups"
msgstr "Всички групи"
@@ -6157,7 +6165,7 @@ msgstr "Повтаряне на тази бележка"
msgid "Revoke the \"%s\" role from this user"
msgstr "Списък с потребителите в тази група."
-#: lib/router.php:671
+#: lib/router.php:704
msgid "No single user defined for single-user mode."
msgstr ""
@@ -6211,7 +6219,7 @@ msgstr "Неозаглавен раздел"
#: lib/section.php:106
msgid "More..."
-msgstr ""
+msgstr "Още…"
#: lib/silenceform.php:67
msgid "Silence"
@@ -6289,91 +6297,98 @@ msgstr "Отписване от този потребител"
msgid "Unsubscribe"
msgstr "Отписване"
-#: lib/userprofile.php:116
+#: lib/usernoprofileexception.php:58
+#, fuzzy, php-format
+msgid "User %s (%d) has no profile record."
+msgstr "Потребителят няма профил."
+
+#: lib/userprofile.php:117
msgid "Edit Avatar"
msgstr "Редактиране на аватара"
-#: lib/userprofile.php:236
+#: lib/userprofile.php:234 lib/userprofile.php:248
msgid "User actions"
msgstr "Потребителски действия"
-#: lib/userprofile.php:251
+#: lib/userprofile.php:237
+msgid "User deletion in progress..."
+msgstr ""
+
+#: lib/userprofile.php:263
msgid "Edit profile settings"
msgstr "Редактиране на профила"
-#: lib/userprofile.php:252
+#: lib/userprofile.php:264
msgid "Edit"
msgstr "Редактиране"
-#: lib/userprofile.php:275
+#: lib/userprofile.php:287
msgid "Send a direct message to this user"
msgstr "Изпращате на пряко съобщение до този потребител."
-#: lib/userprofile.php:276
+#: lib/userprofile.php:288
msgid "Message"
msgstr "Съобщение"
-#: lib/userprofile.php:314
+#: lib/userprofile.php:326
msgid "Moderate"
msgstr ""
-#: lib/userprofile.php:352
-#, fuzzy
+#: lib/userprofile.php:364
msgid "User role"
-msgstr "Потребителски профил"
+msgstr "Потребителска роля"
-#: lib/userprofile.php:354
-#, fuzzy
+#: lib/userprofile.php:366
msgctxt "role"
msgid "Administrator"
-msgstr "Администратори"
+msgstr "Администратор"
-#: lib/userprofile.php:355
+#: lib/userprofile.php:367
msgctxt "role"
msgid "Moderator"
-msgstr ""
+msgstr "Модератор"
-#: lib/util.php:1015
+#: lib/util.php:1046
msgid "a few seconds ago"
msgstr "преди няколко секунди"
-#: lib/util.php:1017
+#: lib/util.php:1048
msgid "about a minute ago"
msgstr "преди около минута"
-#: lib/util.php:1019
+#: lib/util.php:1050
#, php-format
msgid "about %d minutes ago"
msgstr "преди около %d минути"
-#: lib/util.php:1021
+#: lib/util.php:1052
msgid "about an hour ago"
msgstr "преди около час"
-#: lib/util.php:1023
+#: lib/util.php:1054
#, php-format
msgid "about %d hours ago"
msgstr "преди около %d часа"
-#: lib/util.php:1025
+#: lib/util.php:1056
msgid "about a day ago"
msgstr "преди около ден"
-#: lib/util.php:1027
+#: lib/util.php:1058
#, php-format
msgid "about %d days ago"
msgstr "преди около %d дни"
-#: lib/util.php:1029
+#: lib/util.php:1060
msgid "about a month ago"
msgstr "преди около месец"
-#: lib/util.php:1031
+#: lib/util.php:1062
#, php-format
msgid "about %d months ago"
msgstr "преди около %d месеца"
-#: lib/util.php:1033
+#: lib/util.php:1064
msgid "about a year ago"
msgstr "преди около година"
@@ -6387,8 +6402,9 @@ msgstr "%s не е допустим цвят!"
msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr "%s не е допустим цвят! Използвайте 3 или 6 шестнадесетични знака."
-#: lib/xmppmanager.php:402
-#, fuzzy, php-format
+#: lib/xmppmanager.php:403
+#, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d."
msgstr ""
-"Съобщението е твърде дълго. Най-много може да е 140 знака, а сте въвели %d."
+"Съобщението е твърде дълго. Най-много може да е %1$d знака, а сте въвели %2"
+"$d."
diff --git a/locale/br/LC_MESSAGES/statusnet.po b/locale/br/LC_MESSAGES/statusnet.po
index 2197b9e74..205167316 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-03-06 23:49+0000\n"
-"PO-Revision-Date: 2010-03-06 23:49:25+0000\n"
+"POT-Creation-Date: 2010-04-05 18:54+0000\n"
+"PO-Revision-Date: 2010-04-05 18:54:43+0000\n"
"Language-Team: Dutch\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64621); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: br\n"
"X-Message-Group: out-statusnet\n"
@@ -29,7 +29,7 @@ msgstr "Moned"
#. TRANS: Page notice
#: actions/accessadminpanel.php:67
msgid "Site access settings"
-msgstr ""
+msgstr "Arventennoù moned d'al lec'hienn"
#. TRANS: Form legend for registration form.
#: actions/accessadminpanel.php:161
@@ -39,7 +39,7 @@ msgstr "Enskrivadur"
#. TRANS: Checkbox instructions for admin setting "Private"
#: actions/accessadminpanel.php:165
msgid "Prohibit anonymous users (not logged in) from viewing site?"
-msgstr ""
+msgstr "Nac'h ouzh an implijerien dizanv (nann-luget) da welet al lec'hienn ?"
#. TRANS: Checkbox label for prohibiting anonymous users from viewing site.
#: actions/accessadminpanel.php:167
@@ -91,9 +91,9 @@ msgstr "N'eus ket eus ar bajenn-se"
#: 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:90
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78
+#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
@@ -102,10 +102,8 @@ msgstr "N'eus ket eus ar bajenn-se"
#: actions/remotesubscribe.php:154 actions/replies.php:73
#: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:163 lib/command.php:302
-#: lib/command.php:355 lib/command.php:401 lib/command.php:462
-#: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82
-#: lib/profileaction.php:77
+#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: lib/mailbox.php:82 lib/profileaction.php:77
msgid "No such user."
msgstr "N'eus ket eus an implijer-se."
@@ -192,18 +190,18 @@ msgstr "Hizivadennoù %1$s ha mignoned e %2$s!"
#: 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:132
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:136
#: actions/apigrouplistall.php:120 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:135
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
-#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184
-#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148
+#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:174
+#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173
+#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
-#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
+#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
msgid "API method not found."
msgstr "N'eo ket bet kavet an hentenn API !"
@@ -216,8 +214,8 @@ msgstr "N'eo ket bet kavet an hentenn API !"
#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65
-#: actions/apistatusesupdate.php:118
+#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
msgid "This method requires a POST."
msgstr "Ezhomm en deus an argerzh-mañ eus ur POST."
@@ -246,7 +244,7 @@ msgid "Could not save profile."
msgstr "Diposubl eo enrollañ ar profil."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:97
+#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
#: actions/designadminpanel.php:122 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
@@ -265,7 +263,7 @@ msgstr ""
#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
msgid "Unable to save your design settings."
-msgstr ""
+msgstr "Dibosupl eo enrollañ an arventennoù empentiñ."
#: actions/apiaccountupdateprofilebackgroundimage.php:187
#: actions/apiaccountupdateprofilecolors.php:142
@@ -274,15 +272,15 @@ msgstr "Diposubl eo hizivat ho design."
#: actions/apiblockcreate.php:105
msgid "You cannot block yourself!"
-msgstr "Ne c'helloc'h ket ho stankañ ho unan !"
+msgstr "N'hallit ket en em stankañ hoc'h-unan !"
#: actions/apiblockcreate.php:126
msgid "Block user failed."
-msgstr "N'eo ket bet stanke an implijer."
+msgstr "N'eus ket bet tu da stankañ an implijer."
#: actions/apiblockdestroy.php:114
msgid "Unblock user failed."
-msgstr "N'eus ket bet tu distankañ an implijer."
+msgstr "N'eus ket bet tu da zistankañ an implijer."
#: actions/apidirectmessage.php:89
#, php-format
@@ -332,7 +330,7 @@ msgstr "N'eo bet kavet statud ebet gant an ID-mañ."
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:176
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
msgid "Could not create favorite."
msgstr "Diposupl eo krouiñ ar pennroll-mañ."
@@ -364,7 +362,7 @@ msgstr "Ne c'hallit ket chom hep ho heuliañ hoc'h-unan."
#: actions/apifriendshipsexists.php:94
msgid "Two user ids or screen_names must be supplied."
-msgstr ""
+msgstr "Rankout a reoc'h reiñ daou id pe lesanv."
#: actions/apifriendshipsshow.php:134
msgid "Could not determine source user."
@@ -444,13 +442,13 @@ msgstr "Ne c'hell ket an alias bezañ ar memes hini eget al lesanv."
#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
msgid "Group not found!"
-msgstr "N'eo ket bet kavet ar strollad"
+msgstr "N'eo ket bet kavet ar strollad !"
#: actions/apigroupjoin.php:110 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:221
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
msgid "You have been blocked from that group by the admin."
msgstr "Stanket oc'h bet eus ar strollad-mañ gant ur merour."
@@ -468,11 +466,18 @@ msgstr "N'oc'h ket ezel eus ar strollad-mañ."
msgid "Could not remove user %1$s from group %2$s."
msgstr "Diposubl eo dilemel an implijer %1$s deus ar strollad %2$s."
-#: actions/apigrouplist.php:95
+#. TRANS: %s is a user name
+#: actions/apigrouplist.php:97
#, php-format
msgid "%s's groups"
msgstr "Strollad %s"
+#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s
+#: actions/apigrouplist.php:107
+#, fuzzy, php-format
+msgid "%1$s groups %2$s is a member of."
+msgstr "Ezel eo %s eus ar strolladoù"
+
#: actions/apigrouplistall.php:90 actions/usergroups.php:62
#, php-format
msgid "%s groups"
@@ -500,14 +505,14 @@ msgstr "Fichenn direizh."
#: 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:337
+#: actions/profilesettings.php:194 actions/recoverpassword.php:350
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
#: lib/designsettings.php:294
msgid "There was a problem with your session token. Try again, please."
-msgstr ""
+msgstr "Ur gudenn 'zo bet gant ho jedaouer dalc'h. Mar plij adklaskit."
#: actions/apioauthauthorize.php:135
msgid "Invalid nickname / password!"
@@ -540,11 +545,11 @@ msgstr ""
#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
#: actions/smssettings.php:248 lib/designsettings.php:304
msgid "Unexpected form submission."
-msgstr ""
+msgstr "Kinnig ar furmskrid dic'hortoz."
#: actions/apioauthauthorize.php:259
msgid "An application would like to connect to your account"
-msgstr ""
+msgstr "C'hoant 'zo gant ur poellad kevreañ gant ho kont"
#: actions/apioauthauthorize.php:276
msgid "Allow or deny access"
@@ -558,15 +563,15 @@ msgid ""
"give access to your %4$s account to third parties you trust."
msgstr ""
-#: actions/apioauthauthorize.php:310 lib/action.php:438
+#: actions/apioauthauthorize.php:310 lib/action.php:437
msgid "Account"
msgstr "Kont"
#: actions/apioauthauthorize.php:313 actions/login.php:230
#: actions/profilesettings.php:106 actions/register.php:424
-#: actions/showgroup.php:244 actions/tagother.php:94
+#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
-#: lib/userprofile.php:131
+#: lib/userprofile.php:132
msgid "Nickname"
msgstr "Lesanv"
@@ -635,12 +640,12 @@ msgstr ""
msgid "Unsupported format."
msgstr "Diembreget eo ar furmad-se."
-#: actions/apitimelinefavorites.php:108
+#: actions/apitimelinefavorites.php:109
#, php-format
msgid "%1$s / Favorites from %2$s"
msgstr "%1$s / Pennroll %2$s"
-#: actions/apitimelinefavorites.php:117
+#: actions/apitimelinefavorites.php:118
#, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "%1$s statud pennroll da %2$s / %2$s."
@@ -650,7 +655,7 @@ msgstr "%1$s statud pennroll da %2$s / %2$s."
msgid "%1$s / Updates mentioning %2$s"
msgstr "%1$s / Hizivadennoù a veneg %2$s"
-#: actions/apitimelinementions.php:127
+#: actions/apitimelinementions.php:130
#, php-format
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr ""
@@ -660,7 +665,7 @@ msgstr ""
msgid "%s public timeline"
msgstr "Oberezhioù publik %s"
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "%s statud an holl !"
@@ -675,15 +680,15 @@ msgstr "Adkemeret evit %s"
msgid "Repeats of %s"
msgstr "Adkemeret eus %s"
-#: actions/apitimelinetag.php:102 actions/tag.php:67
+#: actions/apitimelinetag.php:104 actions/tag.php:67
#, php-format
msgid "Notices tagged with %s"
msgstr "Alioù merket gant %s"
-#: actions/apitimelinetag.php:104 actions/tagrss.php:65
+#: actions/apitimelinetag.php:106 actions/tagrss.php:65
#, php-format
msgid "Updates tagged with %1$s on %2$s!"
-msgstr ""
+msgstr "Hizivadennoù merket gant %1$s e %2$s !"
#: actions/apiusershow.php:96
msgid "Not found."
@@ -708,7 +713,7 @@ msgstr "Ment ebet."
msgid "Invalid size."
msgstr "Ment direizh."
-#: actions/avatarsettings.php:67 actions/showgroup.php:229
+#: actions/avatarsettings.php:67 actions/showgroup.php:230
#: lib/accountsettingsaction.php:112
msgid "Avatar"
msgstr "Avatar"
@@ -740,7 +745,7 @@ msgid "Preview"
msgstr "Rakwelet"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:655
+#: lib/deleteuserform.php:66 lib/noticelist.php:659
msgid "Delete"
msgstr "Diverkañ"
@@ -752,23 +757,27 @@ msgstr "Enporzhiañ"
msgid "Crop"
msgstr "Adframmañ"
-#: actions/avatarsettings.php:328
+#: actions/avatarsettings.php:305
+msgid "No file uploaded."
+msgstr "N'eus bet enporzhiet restr ebet."
+
+#: actions/avatarsettings.php:332
msgid "Pick a square area of the image to be your avatar"
-msgstr ""
+msgstr "Diuzit ur zonenn gant ur stumm karrez evit tremeniñ ho avatar"
-#: actions/avatarsettings.php:343 actions/grouplogo.php:380
+#: actions/avatarsettings.php:347 actions/grouplogo.php:380
msgid "Lost our file data."
msgstr "Kollet eo bet roadennoù."
-#: actions/avatarsettings.php:366
+#: actions/avatarsettings.php:370
msgid "Avatar updated."
msgstr "Hizivaet eo bet an avatar."
-#: actions/avatarsettings.php:369
+#: actions/avatarsettings.php:373
msgid "Failed updating avatar."
msgstr "Ur gudenn 'zo bet e-pad hizivadenn an avatar."
-#: actions/avatarsettings.php:393
+#: actions/avatarsettings.php:397
msgid "Avatar deleted."
msgstr "Dilammet eo bet an Avatar."
@@ -820,8 +829,8 @@ msgstr "Diposubl eo enrollañ an titouroù stankañ."
#: actions/groupunblock.php:86 actions/joingroup.php:82
#: actions/joingroup.php:93 actions/leavegroup.php:82
#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212
-#: lib/command.php:260
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162
+#: lib/command.php:358
msgid "No such group."
msgstr "N'eus ket eus ar strollad-se."
@@ -850,7 +859,7 @@ msgstr "Distankañ"
#: actions/blockedfromgroup.php:320 lib/unblockform.php:80
msgid "Unblock this user"
-msgstr "Distankañ an implijer-se"
+msgstr "Distankañ an implijer-mañ"
#: actions/bookmarklet.php:50
msgid "Post to "
@@ -904,7 +913,7 @@ msgid "Conversation"
msgstr "Kaozeadenn"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:218 lib/searchgroupnav.php:82
+#: lib/profileaction.php:224 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "Ali"
@@ -923,9 +932,9 @@ msgstr "N'oc'h ket perc'henn ar poellad-se."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1217
+#: lib/action.php:1219
msgid "There was a problem with your session token."
-msgstr ""
+msgstr "Ur gudenn 'zo bet gant ho jedaouer dalc'h."
#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
msgid "Delete application"
@@ -979,13 +988,13 @@ msgstr "Ha sur oc'h ho peus c'hoant dilemel an ali-mañ ?"
msgid "Do not delete this notice"
msgstr "Arabat dilemel an ali-mañ"
-#: actions/deletenotice.php:146 lib/noticelist.php:655
+#: actions/deletenotice.php:146 lib/noticelist.php:659
msgid "Delete this notice"
msgstr "Dilemel an ali-mañ"
#: actions/deleteuser.php:67
msgid "You cannot delete users."
-msgstr "Ne c'helloc'h ket diverkañ implijerien"
+msgstr "N'hallit ket diverkañ implijerien."
#: actions/deleteuser.php:74
msgid "You can only delete local users."
@@ -1003,7 +1012,7 @@ msgstr ""
#: actions/deleteuser.php:151 lib/deleteuserform.php:77
msgid "Delete this user"
-msgstr "Diverkañ an implijer-se"
+msgstr "Diverkañ an implijer-mañ"
#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124
#: lib/groupnav.php:119
@@ -1073,7 +1082,7 @@ msgstr "Gweredekaat pe diweredekaat ar skeudenn foñs."
#: actions/designadminpanel.php:479 lib/designsettings.php:161
msgid "Tile background image"
-msgstr ""
+msgstr "Adober gant ar skeudenn drekleur"
#: actions/designadminpanel.php:488 lib/designsettings.php:170
msgid "Change colours"
@@ -1112,7 +1121,7 @@ msgstr "Adlakaat an arventennoù dre ziouer"
#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:208
+#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
#: actions/tagother.php:154 actions/useradminpanel.php:294
#: lib/applicationeditform.php:333 lib/applicationeditform.php:334
#: lib/designsettings.php:256 lib/groupeditform.php:202
@@ -1228,7 +1237,7 @@ msgstr "re hir eo an deskrivadur (%d arouezenn d'ar muiañ)."
msgid "Could not update group."
msgstr "Diposubl eo hizivaat ar strollad."
-#: actions/editgroup.php:264 classes/User_group.php:493
+#: actions/editgroup.php:264 classes/User_group.php:496
msgid "Could not create aliases."
msgstr "Diposubl eo krouiñ an aliasoù."
@@ -1341,7 +1350,7 @@ msgstr "Penndibaboù enrollet"
#: actions/emailsettings.php:320
msgid "No email address."
-msgstr "N'eus chomlec'h postel ebet."
+msgstr "Chomlec'h postel ebet."
#: actions/emailsettings.php:327
msgid "Cannot normalize that email address"
@@ -1396,7 +1405,7 @@ msgstr "Dilamet eo bet ar chomlec'h."
#: actions/emailsettings.php:446 actions/smssettings.php:518
msgid "No incoming email address."
-msgstr ""
+msgstr "Chomlec'h postel ebet o tont."
#: actions/emailsettings.php:456 actions/emailsettings.php:478
#: actions/smssettings.php:528 actions/smssettings.php:552
@@ -1417,7 +1426,7 @@ msgstr "Ouzhpennet eo bet an ali-mañ d'ho pennrolloù dija !"
#: actions/favor.php:92 lib/disfavorform.php:140
msgid "Disfavor favorite"
-msgstr ""
+msgstr "Tennañ ar pennroll"
#: actions/favorited.php:65 lib/popularnoticesection.php:91
#: lib/publicgroupnav.php:93
@@ -1699,7 +1708,7 @@ msgstr "Oberezhioù %s"
msgid "Updates from members of %1$s on %2$s!"
msgstr "Hizivadenn izili %1$s e %2$s !"
-#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232
+#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244
#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr "Strolladoù"
@@ -1881,7 +1890,7 @@ msgstr "Fall eo ar postel : %s"
#: actions/invite.php:110
msgid "Invitation(s) sent"
-msgstr "Kaset eo bet ar bedadenn(où)"
+msgstr "Pedadenn(où) kaset"
#: actions/invite.php:112
msgid "Invite new users"
@@ -1891,7 +1900,7 @@ msgstr "Pediñ implijerien nevez"
msgid "You are already subscribed to these users:"
msgstr "Koumanantet oc'h dija d'an implijerien-mañ :"
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
#, php-format
msgid "%1$s (%2$s)"
msgstr "%1$s (%2$s)"
@@ -1928,7 +1937,7 @@ msgstr "Chomlec'hioù an implijerien da bediñ (unan dre linenn)"
#: actions/invite.php:192
msgid "Personal message"
-msgstr "Kemenadenn bersonel"
+msgstr "Kemennadenn bersonel"
#: actions/invite.php:194
msgid "Optionally add a personal message to the invitation."
@@ -1993,7 +2002,7 @@ msgstr "%1$s a zo bet er strollad %2$s"
msgid "You must be logged in to leave a group."
msgstr "Ret eo deoc'h bezañ kevreet evit kuitaat ur strollad"
-#: actions/leavegroup.php:100 lib/command.php:265
+#: actions/leavegroup.php:100 lib/command.php:363
msgid "You are not a member of that group."
msgstr "N'oc'h ket un ezel eus ar strollad-mañ."
@@ -2110,12 +2119,12 @@ msgstr "Implijit ar furmskrid-mañ a-benn krouiñ ur strollad nevez."
msgid "New message"
msgstr "Kemennadenn nevez"
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
msgid "You can't send a message to this user."
msgstr "Ne c'helloc'h ket kas kemennadennoù d'an implijer-mañ."
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342
-#: lib/command.php:475
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
+#: lib/command.php:529
msgid "No content!"
msgstr "Goullo eo !"
@@ -2123,7 +2132,7 @@ msgstr "Goullo eo !"
msgid "No recipient specified."
msgstr "N'o peus ket lakaet a resever."
-#: actions/newmessage.php:164 lib/command.php:361
+#: actions/newmessage.php:164 lib/command.php:462
msgid ""
"Don't send a message to yourself; just say it to yourself quietly instead."
msgstr ""
@@ -2132,14 +2141,14 @@ msgstr ""
#: actions/newmessage.php:181
msgid "Message sent"
-msgstr "Kaset eo bet ar gemenadenn"
+msgstr "Kemennadenn kaset"
#: actions/newmessage.php:185
#, php-format
msgid "Direct message to %s sent."
msgstr "Kaset eo bet da %s ar gemennadenn war-eeun."
-#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189
msgid "Ajax Error"
msgstr "Fazi Ajax"
@@ -2147,7 +2156,7 @@ msgstr "Fazi Ajax"
msgid "New notice"
msgstr "Ali nevez"
-#: actions/newnotice.php:211
+#: actions/newnotice.php:217
msgid "Notice posted"
msgstr "Ali embannet"
@@ -2160,7 +2169,7 @@ msgstr ""
#: actions/noticesearch.php:78
msgid "Text search"
-msgstr "Klask un destenn"
+msgstr "Klask testennoù"
#: actions/noticesearch.php:91
#, php-format
@@ -2250,7 +2259,7 @@ msgstr ""
msgid "Notice has no profile"
msgstr "N'en deus ket an ali a profil"
-#: actions/oembed.php:86 actions/shownotice.php:180
+#: actions/oembed.php:86 actions/shownotice.php:175
#, php-format
msgid "%1$s's status on %2$s"
msgstr "Statud %1$s war %2$s"
@@ -2263,8 +2272,8 @@ msgstr "seurt an danvez "
msgid "Only "
msgstr "Hepken "
-#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042
-#: lib/apiaction.php:1070 lib/apiaction.php:1179
+#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1068
+#: lib/apiaction.php:1096 lib/apiaction.php:1212
msgid "Not a supported data format."
msgstr ""
@@ -2302,7 +2311,7 @@ msgstr ""
#: actions/othersettings.php:123
msgid "Show or hide profile designs."
-msgstr ""
+msgstr "Diskouez pe kuzhat designoù ar profil."
#: actions/othersettings.php:153
msgid "URL shortening service is too long (max 50 chars)."
@@ -2348,11 +2357,11 @@ msgstr "Cheñch ger-tremen"
#: actions/passwordsettings.php:69
msgid "Change your password."
-msgstr "Kemmañ ho ger tremen."
+msgstr "Cheñch ger-tremen."
#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
msgid "Password change"
-msgstr "Kemmañ ar ger-tremen"
+msgstr "Kemmañ ger-tremen"
#: actions/passwordsettings.php:104
msgid "Old password"
@@ -2389,13 +2398,13 @@ msgstr "Ne glot ket ar gerioù-tremen."
#: actions/passwordsettings.php:165
msgid "Incorrect old password"
-msgstr "ger-termen kozh amreizh"
+msgstr "Ger-termen kozh direizh"
#: actions/passwordsettings.php:181
msgid "Error saving user; invalid."
msgstr "Ur fazi 'zo bet e-pad enolladenn an implijer ; diwiriek."
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
msgid "Can't save new password."
msgstr "Dibosupl eo enrollañ ar ger-tremen nevez."
@@ -2438,7 +2447,7 @@ msgstr ""
#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
msgid "Site"
-msgstr "Lec'hien"
+msgstr "Lec'hienn"
#: actions/pathsadminpanel.php:238
msgid "Server"
@@ -2446,7 +2455,7 @@ msgstr "Servijer"
#: actions/pathsadminpanel.php:238
msgid "Site's server hostname."
-msgstr ""
+msgstr "Anv ostiz servijer al lec'hienn."
#: actions/pathsadminpanel.php:242
msgid "Path"
@@ -2454,7 +2463,7 @@ msgstr "Hent"
#: actions/pathsadminpanel.php:242
msgid "Site path"
-msgstr "Hent al lec'hien"
+msgstr "Hent al lec'hienn"
#: actions/pathsadminpanel.php:246
msgid "Path to locales"
@@ -2498,11 +2507,11 @@ msgstr "Servijer avatar"
#: actions/pathsadminpanel.php:288
msgid "Avatar path"
-msgstr ""
+msgstr "Hent an avataroù"
#: actions/pathsadminpanel.php:292
msgid "Avatar directory"
-msgstr ""
+msgstr "Restroù an avataroù"
#: actions/pathsadminpanel.php:301
msgid "Backgrounds"
@@ -2538,11 +2547,11 @@ msgstr "Atav"
#: actions/pathsadminpanel.php:329
msgid "Use SSL"
-msgstr "Implij SSl"
+msgstr "Implijout SSL"
#: actions/pathsadminpanel.php:330
msgid "When to use SSL"
-msgstr ""
+msgstr "Peur implijout SSL"
#: actions/pathsadminpanel.php:335
msgid "SSL server"
@@ -2575,11 +2584,11 @@ msgstr "N'eo ket reizh ar merk-se : %s"
#: actions/peopletag.php:144
#, php-format
msgid "Users self-tagged with %1$s - page %2$d"
-msgstr ""
+msgstr "Implijerien bet merket drezo o unan gant %1$s - pajenn %2$d"
#: actions/postnotice.php:95
msgid "Invalid notice content"
-msgstr ""
+msgstr "Danvez direizh an ali"
#: actions/postnotice.php:101
#, php-format
@@ -2604,8 +2613,8 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr ""
#: actions/profilesettings.php:111 actions/register.php:448
-#: actions/showgroup.php:255 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:149
+#: actions/showgroup.php:256 actions/tagother.php:104
+#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Anv klok"
@@ -2632,15 +2641,15 @@ msgid "Bio"
msgstr "Buhezskrid"
#: actions/profilesettings.php:132 actions/register.php:471
-#: actions/showgroup.php:264 actions/tagother.php:112
+#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
-#: lib/userprofile.php:164
+#: lib/userprofile.php:165
msgid "Location"
msgstr "Lec'hiadur"
#: actions/profilesettings.php:134 actions/register.php:473
msgid "Where you are, like \"City, State (or Region), Country\""
-msgstr ""
+msgstr "El lec'h m'emaoc'h, da skouer \"Kêr, Stad (pe Rannvro), Bro\""
#: actions/profilesettings.php:138
msgid "Share my current location when posting notices"
@@ -2648,7 +2657,7 @@ msgstr ""
#: actions/profilesettings.php:145 actions/tagother.php:149
#: actions/tagother.php:209 lib/subscriptionlist.php:106
-#: lib/subscriptionlist.php:108 lib/userprofile.php:209
+#: lib/subscriptionlist.php:108 lib/userprofile.php:210
msgid "Tags"
msgstr "Balizennoù"
@@ -2872,7 +2881,7 @@ msgstr "Adderaouekaat ar ger-tremen"
msgid "Recover password"
msgstr "Adtapout ar ger-tremen"
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
msgid "Password recovery requested"
msgstr "Goulennet eo an adtapout gerioù-tremen"
@@ -2892,41 +2901,41 @@ msgstr "Adderaouekaat"
msgid "Enter a nickname or email address."
msgstr "Lakait ul lesanv pe ur chomlec'h postel."
-#: actions/recoverpassword.php:272
+#: actions/recoverpassword.php:282
msgid "No user with that email address or username."
msgstr ""
-#: actions/recoverpassword.php:287
+#: actions/recoverpassword.php:299
msgid "No registered email address for that user."
msgstr ""
-#: actions/recoverpassword.php:301
+#: actions/recoverpassword.php:313
msgid "Error saving address confirmation."
msgstr ""
-#: actions/recoverpassword.php:325
+#: actions/recoverpassword.php:338
msgid ""
"Instructions for recovering your password have been sent to the email "
"address registered to your account."
msgstr ""
-#: actions/recoverpassword.php:344
+#: actions/recoverpassword.php:357
msgid "Unexpected password reset."
msgstr ""
-#: actions/recoverpassword.php:352
+#: actions/recoverpassword.php:365
msgid "Password must be 6 chars or more."
msgstr ""
-#: actions/recoverpassword.php:356
+#: actions/recoverpassword.php:369
msgid "Password and confirmation do not match."
msgstr ""
-#: actions/recoverpassword.php:375 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:248
msgid "Error setting user."
msgstr ""
-#: actions/recoverpassword.php:382
+#: actions/recoverpassword.php:395
msgid "New password successfully saved. You are now logged in."
msgstr ""
@@ -2991,7 +3000,7 @@ msgstr ""
#: actions/register.php:450
msgid "Longer name, preferably your \"real\" name"
-msgstr ""
+msgstr "Anv hiroc'h, ho anv \"gwir\" a zo gwelloc'h"
#: actions/register.php:494
msgid "My text and files are available under "
@@ -2999,7 +3008,7 @@ msgstr ""
#: actions/register.php:496
msgid "Creative Commons Attribution 3.0"
-msgstr ""
+msgstr "Creative Commons Deroadenn 3.0"
#: actions/register.php:497
msgid ""
@@ -3050,22 +3059,22 @@ msgstr ""
#: actions/remotesubscribe.php:129
msgid "User nickname"
-msgstr ""
+msgstr "Lesanv an implijer"
#: actions/remotesubscribe.php:130
msgid "Nickname of the user you want to follow"
-msgstr ""
+msgstr "Lesanv an implijer o peus c'hoant heuliañ"
#: actions/remotesubscribe.php:133
msgid "Profile URL"
-msgstr ""
+msgstr "URL ar profil"
#: actions/remotesubscribe.php:134
msgid "URL of your profile on another compatible microblogging service"
msgstr ""
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:394
+#: lib/userprofile.php:406
msgid "Subscribe"
msgstr "En em enskrivañ"
@@ -3101,7 +3110,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:674
+#: actions/repeat.php:114 lib/noticelist.php:678
msgid "Repeated"
msgstr "Adlavaret"
@@ -3123,17 +3132,17 @@ msgstr "Respontoù da %1$s, pajenn %2$d"
#: actions/replies.php:145
#, php-format
msgid "Replies feed for %s (RSS 1.0)"
-msgstr ""
+msgstr "Gwazh respontoù evit %s (RSS 1.0)"
#: actions/replies.php:152
#, php-format
msgid "Replies feed for %s (RSS 2.0)"
-msgstr ""
+msgstr "Gwazh respontoù evit %s (RSS 2.0)"
#: actions/replies.php:159
#, php-format
msgid "Replies feed for %s (Atom)"
-msgstr ""
+msgstr "Gwazh respontoù evit %s (Atom)"
#: actions/replies.php:199
#, php-format
@@ -3159,7 +3168,7 @@ msgstr ""
#: actions/repliesrss.php:72
#, php-format
msgid "Replies to %1$s on %2$s!"
-msgstr ""
+msgstr "Respontoù da %1$s war %2$s !"
#: actions/revokerole.php:75
#, fuzzy
@@ -3168,7 +3177,7 @@ msgstr "Ne c'helloc'h ket kas kemennadennoù d'an implijer-mañ."
#: actions/revokerole.php:82
msgid "User doesn't have this role."
-msgstr ""
+msgstr "n'en deus ket an implijer-mañ ar rol-se."
#: actions/rsd.php:146 actions/version.php:157
msgid "StatusNet"
@@ -3180,7 +3189,7 @@ msgstr ""
#: actions/sandbox.php:72
msgid "User is already sandboxed."
-msgstr ""
+msgstr "Er poull-traezh emañ dija an implijer."
#. TRANS: Menu item for site administration
#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
@@ -3190,7 +3199,7 @@ msgstr "Dalc'hoù"
#: actions/sessionsadminpanel.php:65
msgid "Session settings for this StatusNet site."
-msgstr ""
+msgstr "Arventennoù evit al lec'hienn StatusNet-mañ."
#: actions/sessionsadminpanel.php:175
msgid "Handle sessions"
@@ -3198,11 +3207,11 @@ msgstr "Merañ an dalc'hoù"
#: actions/sessionsadminpanel.php:177
msgid "Whether to handle sessions ourselves."
-msgstr ""
+msgstr "Ma rankomp merañ an dalc'hoù hon unan."
#: actions/sessionsadminpanel.php:181
msgid "Session debugging"
-msgstr ""
+msgstr "Dizreinadenn an dalc'h"
#: actions/sessionsadminpanel.php:183
msgid "Turn on debugging output for sessions."
@@ -3215,15 +3224,15 @@ msgstr ""
#: actions/showapplication.php:82
msgid "You must be logged in to view an application."
-msgstr ""
+msgstr "Rankout a reoc'h bezañ kevreet evit gwelet ur poellad."
#: actions/showapplication.php:157
msgid "Application profile"
-msgstr ""
+msgstr "Profil ar poellad"
#: actions/showapplication.php:159 lib/applicationeditform.php:180
msgid "Icon"
-msgstr ""
+msgstr "Arlun"
#: actions/showapplication.php:169 actions/version.php:195
#: lib/applicationeditform.php:195
@@ -3232,42 +3241,42 @@ msgstr "Anv"
#: actions/showapplication.php:178 lib/applicationeditform.php:222
msgid "Organization"
-msgstr ""
+msgstr "Aozadur"
#: actions/showapplication.php:187 actions/version.php:198
#: lib/applicationeditform.php:209 lib/groupeditform.php:172
msgid "Description"
-msgstr ""
+msgstr "Deskrivadur"
-#: actions/showapplication.php:192 actions/showgroup.php:438
-#: lib/profileaction.php:176
+#: actions/showapplication.php:192 actions/showgroup.php:439
+#: lib/profileaction.php:182
msgid "Statistics"
msgstr "Stadegoù"
#: actions/showapplication.php:203
#, php-format
msgid "Created by %1$s - %2$s access by default - %3$d users"
-msgstr ""
+msgstr "Krouet gant %1$s - moned %2$s dre ziouer - %3$d implijer"
#: actions/showapplication.php:213
msgid "Application actions"
-msgstr ""
+msgstr "Obererezhioù ar poellad"
#: actions/showapplication.php:236
msgid "Reset key & secret"
-msgstr ""
+msgstr "Adderaouekaat an alc'hwez hag ar sekred"
#: actions/showapplication.php:261
msgid "Application info"
-msgstr ""
+msgstr "Titouroù ar poelad"
#: actions/showapplication.php:263
msgid "Consumer key"
-msgstr ""
+msgstr "Alc'hwez an implijer"
#: actions/showapplication.php:268
msgid "Consumer secret"
-msgstr ""
+msgstr "Sekred an implijer"
#: actions/showapplication.php:273
msgid "Request token URL"
@@ -3279,7 +3288,7 @@ msgstr ""
#: actions/showapplication.php:283
msgid "Authorize URL"
-msgstr ""
+msgstr "aotren an URL"
#: actions/showapplication.php:288
msgid ""
@@ -3294,7 +3303,7 @@ msgstr ""
#: actions/showfavorites.php:79
#, php-format
msgid "%1$s's favorite notices, page %2$d"
-msgstr ""
+msgstr "Alioù karetañ %1$s, pajenn %2$d"
#: actions/showfavorites.php:132
msgid "Could not retrieve favorite notices."
@@ -3313,7 +3322,7 @@ msgstr ""
#: actions/showfavorites.php:185
#, php-format
msgid "Feed for favorites of %s (Atom)"
-msgstr ""
+msgstr "Gwazh evit mignoned %s (Atom)"
#: actions/showfavorites.php:206
msgid ""
@@ -3338,7 +3347,7 @@ msgstr ""
#: actions/showfavorites.php:243
msgid "This is a way to share what you like."
-msgstr ""
+msgstr "Un doare eo evit kevranañ ar pezh a blij deoc'h."
#: actions/showgroup.php:82 lib/groupnav.php:86
#, php-format
@@ -3348,69 +3357,69 @@ msgstr "strollad %s"
#: actions/showgroup.php:84
#, php-format
msgid "%1$s group, page %2$d"
-msgstr ""
+msgstr "Strollad %1$s, pajenn %2$d"
-#: actions/showgroup.php:226
+#: actions/showgroup.php:227
msgid "Group profile"
msgstr "Profil ar strollad"
-#: actions/showgroup.php:271 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:177
+#: actions/showgroup.php:272 actions/tagother.php:118
+#: actions/userauthorization.php:175 lib/userprofile.php:178
msgid "URL"
msgstr "URL"
-#: actions/showgroup.php:282 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:194
+#: actions/showgroup.php:283 actions/tagother.php:128
+#: actions/userauthorization.php:187 lib/userprofile.php:195
msgid "Note"
msgstr "Notenn"
-#: actions/showgroup.php:292 lib/groupeditform.php:184
+#: actions/showgroup.php:293 lib/groupeditform.php:184
msgid "Aliases"
msgstr "Aliasoù"
-#: actions/showgroup.php:301
+#: actions/showgroup.php:302
msgid "Group actions"
-msgstr "Oberoù ar strollad"
+msgstr "Obererezh ar strollad"
-#: actions/showgroup.php:337
+#: actions/showgroup.php:338
#, php-format
msgid "Notice feed for %s group (RSS 1.0)"
msgstr ""
-#: actions/showgroup.php:343
+#: actions/showgroup.php:344
#, php-format
msgid "Notice feed for %s group (RSS 2.0)"
msgstr ""
-#: actions/showgroup.php:349
+#: actions/showgroup.php:350
#, php-format
msgid "Notice feed for %s group (Atom)"
msgstr ""
-#: actions/showgroup.php:354
+#: actions/showgroup.php:355
#, php-format
msgid "FOAF for %s group"
-msgstr ""
+msgstr "Mignon ur mignon evit ar strollad %s"
-#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91
+#: actions/showgroup.php:391 actions/showgroup.php:448 lib/groupnav.php:91
msgid "Members"
msgstr "Izili"
-#: actions/showgroup.php:395 lib/profileaction.php:117
-#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95
-#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71
+#: actions/showgroup.php:396 lib/profileaction.php:117
+#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95
+#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
msgid "(None)"
-msgstr "(hini ebet)"
+msgstr "(Hini ebet)"
-#: actions/showgroup.php:401
+#: actions/showgroup.php:402
msgid "All members"
msgstr "An holl izili"
-#: actions/showgroup.php:441
+#: actions/showgroup.php:442
msgid "Created"
msgstr "Krouet"
-#: actions/showgroup.php:457
+#: actions/showgroup.php:458
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3420,7 +3429,7 @@ msgid ""
"of this group and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
-#: actions/showgroup.php:463
+#: actions/showgroup.php:464
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3429,7 +3438,7 @@ msgid ""
"their life and interests. "
msgstr ""
-#: actions/showgroup.php:491
+#: actions/showgroup.php:492
msgid "Admins"
msgstr "Merourien"
@@ -3440,20 +3449,22 @@ msgstr "N'eus ket eus ar gemennadenn-se."
#: actions/showmessage.php:98
msgid "Only the sender and recipient may read this message."
msgstr ""
+"Ne c'hell bezañ lennet ar gemenadenn-mañ nemet gant ar c'haser hag ar "
+"resever."
#: actions/showmessage.php:108
#, php-format
msgid "Message to %1$s on %2$s"
-msgstr ""
+msgstr "Kemanadenn kaset da %1$s d'an %2$s"
#: actions/showmessage.php:113
#, php-format
msgid "Message from %1$s on %2$s"
-msgstr ""
+msgstr "Kemenadenn resevet eus %1$s d'an %2$s"
#: actions/shownotice.php:90
msgid "Notice deleted."
-msgstr ""
+msgstr "Ali dilammet."
#: actions/showstream.php:73
#, php-format
@@ -3463,7 +3474,7 @@ msgstr " merket %s"
#: actions/showstream.php:79
#, php-format
msgid "%1$s, page %2$d"
-msgstr ""
+msgstr "%1$s, pajenn %2$d"
#: actions/showstream.php:122
#, php-format
@@ -3483,12 +3494,12 @@ msgstr ""
#: actions/showstream.php:143
#, php-format
msgid "Notice feed for %s (Atom)"
-msgstr ""
+msgstr "Gwazh alioù %s (Atom)"
#: actions/showstream.php:148
#, php-format
msgid "FOAF for %s"
-msgstr ""
+msgstr "mignon ur mignon evit %s"
#: actions/showstream.php:200
#, php-format
@@ -3528,7 +3539,7 @@ msgstr ""
#: actions/showstream.php:305
#, php-format
msgid "Repeat of %s"
-msgstr ""
+msgstr "Adkemeret eus %s"
#: actions/silence.php:65 actions/unsilence.php:65
msgid "You cannot silence users on this site."
@@ -3536,16 +3547,15 @@ msgstr ""
#: actions/silence.php:72
msgid "User is already silenced."
-msgstr ""
+msgstr "Lakaet eo bet da mut an implijer-mañ dija."
#: actions/siteadminpanel.php:69
-#, fuzzy
msgid "Basic settings for this StatusNet site"
-msgstr "Arventennoù design evit al lec'hienn StatusNet-mañ."
+msgstr "Arventennoù diazez evit al lec'hienn StatusNet-mañ."
#: actions/siteadminpanel.php:133
msgid "Site name must have non-zero length."
-msgstr ""
+msgstr "Ne c'hell ket bezañ goullo anv al lec'hienn."
#: actions/siteadminpanel.php:141
msgid "You must have a valid contact email address."
@@ -3554,10 +3564,10 @@ msgstr ""
#: actions/siteadminpanel.php:159
#, php-format
msgid "Unknown language \"%s\"."
-msgstr ""
+msgstr "Yezh \"%s\" dizanv."
#: actions/siteadminpanel.php:165
-msgid "Minimum text limit is 140 characters."
+msgid "Minimum text limit is 0 (unlimited)."
msgstr ""
#: actions/siteadminpanel.php:171
@@ -3586,7 +3596,7 @@ msgstr ""
#: actions/siteadminpanel.php:234
msgid "Brought by URL"
-msgstr ""
+msgstr "Degaset dre URL"
#: actions/siteadminpanel.php:235
msgid "URL used for credits link in footer of each page"
@@ -3609,9 +3619,8 @@ msgid "Default timezone for the site; usually UTC."
msgstr ""
#: actions/siteadminpanel.php:262
-#, fuzzy
msgid "Default language"
-msgstr "Yezh d'ober ganti da gentañ"
+msgstr "Yezh dre ziouer"
#: actions/siteadminpanel.php:263
msgid "Site language when autodetection from browser settings is not available"
@@ -3623,24 +3632,23 @@ msgstr "Bevennoù"
#: actions/siteadminpanel.php:274
msgid "Text limit"
-msgstr ""
+msgstr "Bevenn testenn"
#: actions/siteadminpanel.php:274
msgid "Maximum number of characters for notices."
-msgstr ""
+msgstr "Niver brasañ a arouezennoù evit an alioù."
#: actions/siteadminpanel.php:278
msgid "Dupe limit"
-msgstr ""
+msgstr "Bevenn a doublennoù"
#: actions/siteadminpanel.php:278
msgid "How long users must wait (in seconds) to post the same thing again."
msgstr ""
#: actions/sitenoticeadminpanel.php:56
-#, fuzzy
msgid "Site Notice"
-msgstr "Ali"
+msgstr "Ali al lec'hienn"
#: actions/sitenoticeadminpanel.php:67
#, fuzzy
@@ -3648,27 +3656,24 @@ msgid "Edit site-wide message"
msgstr "Kemennadenn nevez"
#: actions/sitenoticeadminpanel.php:103
-#, fuzzy
msgid "Unable to save site notice."
-msgstr "Diposubl eo enrollañ an titouroù stankañ."
+msgstr "Diposubl eo enrollañ ali al lec'hienn."
#: actions/sitenoticeadminpanel.php:113
msgid "Max length for the site-wide notice is 255 chars"
msgstr ""
#: actions/sitenoticeadminpanel.php:176
-#, fuzzy
msgid "Site notice text"
-msgstr "Eilañ an ali"
+msgstr "Testenn ali al lec'hienn"
#: actions/sitenoticeadminpanel.php:178
msgid "Site-wide notice text (255 chars max; HTML okay)"
msgstr ""
#: actions/sitenoticeadminpanel.php:198
-#, fuzzy
msgid "Save site notice"
-msgstr "Dilemel un ali"
+msgstr "Enrollañ ali ul lec'hienn"
#: actions/smssettings.php:58
msgid "SMS settings"
@@ -3723,11 +3728,11 @@ msgstr ""
#: actions/smssettings.php:318
msgid "That is already your phone number."
-msgstr ""
+msgstr "Ho niverenn pellgomz eo dija."
#: actions/smssettings.php:321
msgid "That phone number already belongs to another user."
-msgstr ""
+msgstr "D'un implijer all eo an niverenn-mañ dija."
#: actions/smssettings.php:347
msgid ""
@@ -3737,11 +3742,11 @@ msgstr ""
#: actions/smssettings.php:374
msgid "That is the wrong confirmation number."
-msgstr ""
+msgstr "Direizh eo ar c'hod gwiriekaat-mañ."
#: actions/smssettings.php:405
msgid "That is not your phone number."
-msgstr ""
+msgstr "n'eo ket ho niverenn pellgomz."
#: actions/smssettings.php:465
msgid "Mobile carrier"
@@ -3749,7 +3754,7 @@ msgstr ""
#: actions/smssettings.php:469
msgid "Select a carrier"
-msgstr ""
+msgstr "Dibab un douger"
#: actions/smssettings.php:476
#, php-format
@@ -3766,7 +3771,7 @@ msgstr "N'eo bet lakaet kod ebet"
#: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
#: lib/adminpanelaction.php:406
msgid "Snapshots"
-msgstr ""
+msgstr "Prim"
#: actions/snapshotadminpanel.php:65
msgid "Manage snapshot configuration"
@@ -3825,8 +3830,7 @@ msgstr "Enrollañ an arventennoù moned"
msgid "You are not subscribed to that profile."
msgstr ""
-#: actions/subedit.php:83 classes/Subscription.php:89
-#: classes/Subscription.php:116
+#: actions/subedit.php:83 classes/Subscription.php:132
msgid "Could not save subscription."
msgstr ""
@@ -3836,7 +3840,7 @@ msgstr ""
#: actions/subscribe.php:107
msgid "No such profile."
-msgstr ""
+msgstr "N'eus ket eus ar profil-se."
#: actions/subscribe.php:117
msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
@@ -3844,17 +3848,17 @@ msgstr ""
#: actions/subscribe.php:145
msgid "Subscribed"
-msgstr ""
+msgstr "Koumanantet"
#: actions/subscribers.php:50
#, php-format
msgid "%s subscribers"
-msgstr ""
+msgstr "Koumanantet da %s"
#: actions/subscribers.php:52
#, php-format
msgid "%1$s subscribers, page %2$d"
-msgstr ""
+msgstr "Koumanantet da %1$s, pajenn %2$d"
#: actions/subscribers.php:63
msgid "These are the people who listen to your notices."
@@ -3875,6 +3879,7 @@ msgstr ""
#, php-format
msgid "%s has no subscribers. Want to be the first?"
msgstr ""
+"n'ez eus den ebet koumanantet da %s. Ha c'hoant o peus bezañ an hini gentañ ?"
#: actions/subscribers.php:114
#, php-format
@@ -3900,7 +3905,7 @@ msgstr ""
#: actions/subscriptions.php:69
#, php-format
msgid "These are the people whose notices %s listens to."
-msgstr ""
+msgstr "Heuliet eo alioù an den-mañ gant %s."
#: actions/subscriptions.php:126
#, php-format
@@ -3915,13 +3920,13 @@ msgstr ""
#: actions/subscriptions.php:128 actions/subscriptions.php:132
#, php-format
msgid "%s is not listening to anyone."
-msgstr ""
+msgstr "Ne heuilh %s den ebet."
-#: actions/subscriptions.php:199
+#: actions/subscriptions.php:208
msgid "Jabber"
msgstr "Jabber"
-#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:222 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr "SMS"
@@ -3952,20 +3957,20 @@ msgstr ""
#: actions/tagother.php:65
#, php-format
msgid "Tag %s"
-msgstr ""
+msgstr "Merk %s"
-#: actions/tagother.php:77 lib/userprofile.php:75
+#: actions/tagother.php:77 lib/userprofile.php:76
msgid "User profile"
-msgstr ""
+msgstr "Profil an implijer"
#: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:102
+#: lib/userprofile.php:103
msgid "Photo"
msgstr "Skeudenn"
#: actions/tagother.php:141
msgid "Tag user"
-msgstr ""
+msgstr "Merkañ an implijer"
#: actions/tagother.php:151
msgid ""
@@ -3980,7 +3985,7 @@ msgstr ""
#: actions/tagother.php:200
msgid "Could not save tags."
-msgstr ""
+msgstr "Dibosupl eo enrollañ ar merkoù."
#: actions/tagother.php:236
msgid "Use this form to add tags to your subscribers or subscriptions."
@@ -3996,7 +4001,7 @@ msgstr ""
#: actions/unblock.php:59
msgid "You haven't blocked that user."
-msgstr ""
+msgstr "N'o peus ket stanket an implijer-mañ."
#: actions/unsandbox.php:72
msgid "User is not sandboxed."
@@ -4008,11 +4013,11 @@ msgstr ""
#: actions/unsubscribe.php:77
msgid "No profile id in request."
-msgstr ""
+msgstr "N'eus profil id ebet er reked."
#: actions/unsubscribe.php:98
msgid "Unsubscribed"
-msgstr ""
+msgstr "Digoumanantet"
#: actions/updateprofile.php:64 actions/userauthorization.php:337
#, php-format
@@ -4024,7 +4029,7 @@ msgstr ""
#: actions/useradminpanel.php:59
msgctxt "TITLE"
msgid "User"
-msgstr ""
+msgstr "Implijer"
#: actions/useradminpanel.php:70
msgid "User settings for this StatusNet site."
@@ -4070,7 +4075,7 @@ msgstr ""
#: actions/useradminpanel.php:241
msgid "Default subscription"
-msgstr ""
+msgstr "Koumanantoù dre ziouer"
#: actions/useradminpanel.php:242
msgid "Automatically subscribe new users to this user."
@@ -4082,7 +4087,7 @@ msgstr "Pedadennoù"
#: actions/useradminpanel.php:256
msgid "Invitations enabled"
-msgstr ""
+msgstr "Pedadennoù gweredekaet"
#: actions/useradminpanel.php:258
msgid "Whether to allow users to invite new users."
@@ -4090,7 +4095,7 @@ msgstr ""
#: actions/userauthorization.php:105
msgid "Authorize subscription"
-msgstr ""
+msgstr "Aotreañ ar c'houmanant"
#: actions/userauthorization.php:110
msgid ""
@@ -4110,7 +4115,7 @@ msgstr "Degemer"
#: actions/userauthorization.php:218 lib/subscribeform.php:115
#: lib/subscribeform.php:139
msgid "Subscribe to this user"
-msgstr ""
+msgstr "En em goumanantiñ d'an implijer-mañ"
#: actions/userauthorization.php:219
msgid "Reject"
@@ -4118,15 +4123,15 @@ msgstr "Disteurel"
#: actions/userauthorization.php:220
msgid "Reject this subscription"
-msgstr ""
+msgstr "Nac'hañ ar c'houmanant"
#: actions/userauthorization.php:232
msgid "No authorization request!"
-msgstr ""
+msgstr "Reked aotreañ ebet !"
#: actions/userauthorization.php:254
msgid "Subscription authorized"
-msgstr ""
+msgstr "Koumanant aotreet"
#: actions/userauthorization.php:256
msgid ""
@@ -4137,7 +4142,7 @@ msgstr ""
#: actions/userauthorization.php:266
msgid "Subscription rejected"
-msgstr ""
+msgstr "Koumanant bet nac'het"
#: actions/userauthorization.php:268
msgid ""
@@ -4174,7 +4179,7 @@ msgstr ""
#: actions/userauthorization.php:350
#, php-format
msgid "Can’t read avatar URL ‘%s’."
-msgstr ""
+msgstr "Dibosupl eo lenn URL an avatar \"%s\"."
#: actions/userauthorization.php:355
#, php-format
@@ -4193,12 +4198,12 @@ msgstr ""
#: actions/userdesignsettings.php:282
msgid "Enjoy your hotdog!"
-msgstr ""
+msgstr "Bez plijadur gant da hotdog !"
#: actions/usergroups.php:64
#, php-format
msgid "%1$s groups, page %2$d"
-msgstr ""
+msgstr "Strolladoù %1$s, pajenn %2$d"
#: actions/usergroups.php:130
msgid "Search for more groups"
@@ -4207,7 +4212,7 @@ msgstr "Klask muioc'h a strolladoù"
#: actions/usergroups.php:157
#, php-format
msgid "%s is not a member of any group."
-msgstr ""
+msgstr "N'eo ket ezel %s eus ur strollad."
#: actions/usergroups.php:162
#, php-format
@@ -4263,7 +4268,7 @@ msgstr ""
msgid "Plugins"
msgstr "Pluginoù"
-#: actions/version.php:196 lib/action.php:767
+#: actions/version.php:196 lib/action.php:766
msgid "Version"
msgstr "Stumm"
@@ -4271,19 +4276,19 @@ msgstr "Stumm"
msgid "Author(s)"
msgstr "Aozer(ien)"
-#: classes/File.php:144
+#: classes/File.php:169
#, 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:154
+#: classes/File.php:179
#, php-format
msgid "A file this large would exceed your user quota of %d bytes."
msgstr ""
-#: classes/File.php:161
+#: classes/File.php:186
#, php-format
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
@@ -4319,96 +4324,96 @@ msgstr "Diposubl eo ensoc'hañ ur gemenadenn"
#: classes/Message.php:71
msgid "Could not update message with new URI."
-msgstr ""
+msgstr "Dibosupl eo hizivaat ar gemennadenn gant un URI nevez."
-#: classes/Notice.php:172
+#: classes/Notice.php:175
#, php-format
msgid "DB error inserting hashtag: %s"
msgstr ""
-#: classes/Notice.php:241
+#: classes/Notice.php:244
msgid "Problem saving notice. Too long."
msgstr ""
-#: classes/Notice.php:245
+#: classes/Notice.php:248
msgid "Problem saving notice. Unknown user."
msgstr ""
-#: classes/Notice.php:250
+#: classes/Notice.php:253
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
-#: classes/Notice.php:256
+#: classes/Notice.php:259
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
msgstr ""
-#: classes/Notice.php:262
+#: classes/Notice.php:265
msgid "You are banned from posting notices on this site."
msgstr ""
-#: classes/Notice.php:328 classes/Notice.php:354
+#: classes/Notice.php:331 classes/Notice.php:357
msgid "Problem saving notice."
msgstr ""
-#: classes/Notice.php:927
+#: classes/Notice.php:943
msgid "Problem saving group inbox."
msgstr ""
-#: classes/Notice.php:1459
+#: classes/Notice.php:1481
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
-#: classes/Subscription.php:66 lib/oauthstore.php:465
+#: classes/Subscription.php:74 lib/oauthstore.php:465
msgid "You have been banned from subscribing."
msgstr ""
-#: classes/Subscription.php:70
+#: classes/Subscription.php:78
msgid "Already subscribed!"
-msgstr ""
+msgstr "Koumanantet dija !"
-#: classes/Subscription.php:74
+#: classes/Subscription.php:82
msgid "User has blocked you."
-msgstr ""
+msgstr "An implijer-mañ en deus stanket ac'hanoc'h."
-#: classes/Subscription.php:157
+#: classes/Subscription.php:167
msgid "Not subscribed!"
-msgstr ""
+msgstr "Nann-koumanantet !"
-#: classes/Subscription.php:163
+#: classes/Subscription.php:173
msgid "Couldn't delete self-subscription."
msgstr ""
-#: classes/Subscription.php:190
+#: classes/Subscription.php:200
#, fuzzy
msgid "Couldn't delete subscription OMB token."
msgstr "Diposubl eo dilemel ar postel kadarnadur."
-#: classes/Subscription.php:201 lib/subs.php:69
+#: classes/Subscription.php:211
msgid "Couldn't delete subscription."
msgstr ""
-#: classes/User.php:373
+#: classes/User.php:363
#, php-format
msgid "Welcome to %1$s, @%2$s!"
-msgstr ""
+msgstr "Deuet mat da %1$s, @%2$s !"
-#: classes/User_group.php:477
+#: classes/User_group.php:480
msgid "Could not create group."
-msgstr ""
+msgstr "Dibosupl eo krouiñ ar strollad."
-#: classes/User_group.php:486
+#: classes/User_group.php:489
msgid "Could not set group URI."
msgstr ""
-#: classes/User_group.php:507
+#: classes/User_group.php:510
msgid "Could not set group membership."
msgstr ""
-#: classes/User_group.php:521
+#: classes/User_group.php:524
msgid "Could not save local group info."
msgstr ""
@@ -4418,7 +4423,7 @@ msgstr ""
#: lib/accountsettingsaction.php:112
msgid "Upload an avatar"
-msgstr ""
+msgstr "Enporzhiañ un avatar"
#: lib/accountsettingsaction.php:116
msgid "Change your password"
@@ -4438,7 +4443,7 @@ msgstr "All"
#: lib/accountsettingsaction.php:128
msgid "Other options"
-msgstr ""
+msgstr "Dibarzhioù all"
#: lib/action.php:144
#, php-format
@@ -4447,184 +4452,184 @@ msgstr "%1$s - %2$s"
#: lib/action.php:159
msgid "Untitled page"
-msgstr ""
+msgstr "Pajenn hep anv"
-#: lib/action.php:424
+#: lib/action.php:423
msgid "Primary site navigation"
msgstr ""
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:430
+#: lib/action.php:429
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr ""
-#: lib/action.php:433
+#: lib/action.php:432
msgctxt "MENU"
msgid "Personal"
-msgstr ""
+msgstr "Personel"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:435
+#: lib/action.php:434
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
-msgstr ""
+msgstr "Kemmañ ho chomlec'h postel, hoc'h avatar, ho ger-tremen, ho profil"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:440
+#: lib/action.php:439
msgctxt "TOOLTIP"
msgid "Connect to services"
-msgstr ""
+msgstr "Liammañ d'ar servijoù"
-#: lib/action.php:443
+#: lib/action.php:442
msgid "Connect"
msgstr "Kevreañ"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:446
+#: lib/action.php:445
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr ""
-#: lib/action.php:449
+#: lib/action.php:448
msgctxt "MENU"
msgid "Admin"
-msgstr ""
+msgstr "Merañ"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:453
+#: lib/action.php:452
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr ""
-#: lib/action.php:456
+#: lib/action.php:455
msgctxt "MENU"
msgid "Invite"
-msgstr ""
+msgstr "Pediñ"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:462
+#: lib/action.php:461
msgctxt "TOOLTIP"
msgid "Logout from the site"
-msgstr ""
+msgstr "Digevreañ diouzh al lec'hienn"
-#: lib/action.php:465
+#: lib/action.php:464
msgctxt "MENU"
msgid "Logout"
-msgstr ""
+msgstr "Digevreañ"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:470
+#: lib/action.php:469
msgctxt "TOOLTIP"
msgid "Create an account"
-msgstr ""
+msgstr "Krouiñ ur gont"
-#: lib/action.php:473
+#: lib/action.php:472
msgctxt "MENU"
msgid "Register"
-msgstr ""
+msgstr "En em enskrivañ"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:476
+#: lib/action.php:475
msgctxt "TOOLTIP"
msgid "Login to the site"
-msgstr ""
+msgstr "Kevreañ d'al lec'hienn"
-#: lib/action.php:479
+#: lib/action.php:478
msgctxt "MENU"
msgid "Login"
-msgstr ""
+msgstr "Kevreañ"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:482
+#: lib/action.php:481
msgctxt "TOOLTIP"
msgid "Help me!"
-msgstr ""
+msgstr "Sikour din !"
-#: lib/action.php:485
+#: lib/action.php:484
msgctxt "MENU"
msgid "Help"
-msgstr ""
+msgstr "Skoazell"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:488
+#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Search for people or text"
-msgstr ""
+msgstr "Klask tud pe un tamm testenn"
-#: lib/action.php:491
+#: lib/action.php:490
msgctxt "MENU"
msgid "Search"
-msgstr ""
+msgstr "Klask"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:513 lib/adminpanelaction.php:398
+#: lib/action.php:512 lib/adminpanelaction.php:398
msgid "Site notice"
-msgstr ""
+msgstr "Ali al lec'hienn"
-#: lib/action.php:579
+#: lib/action.php:578
msgid "Local views"
-msgstr ""
+msgstr "Selloù lec'hel"
-#: lib/action.php:645
+#: lib/action.php:644
msgid "Page notice"
-msgstr ""
+msgstr "Ali ar bajenn"
-#: lib/action.php:747
+#: lib/action.php:746
msgid "Secondary site navigation"
msgstr ""
-#: lib/action.php:752
+#: lib/action.php:751
msgid "Help"
msgstr "Skoazell"
-#: lib/action.php:754
+#: lib/action.php:753
msgid "About"
msgstr "Diwar-benn"
-#: lib/action.php:756
+#: lib/action.php:755
msgid "FAQ"
msgstr "FAG"
-#: lib/action.php:760
+#: lib/action.php:759
msgid "TOS"
-msgstr ""
+msgstr "AIH"
-#: lib/action.php:763
+#: lib/action.php:762
msgid "Privacy"
msgstr "Prevezded"
-#: lib/action.php:765
+#: lib/action.php:764
msgid "Source"
msgstr "Mammenn"
-#: lib/action.php:769
+#: lib/action.php:768
msgid "Contact"
msgstr "Darempred"
-#: lib/action.php:771
+#: lib/action.php:770
msgid "Badge"
-msgstr ""
+msgstr "Badj"
-#: lib/action.php:799
+#: lib/action.php:798
msgid "StatusNet software license"
-msgstr ""
+msgstr "Aotre-implijout ar meziant StatusNet"
-#: lib/action.php:802
+#: lib/action.php:803
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
"broughtby%%](%%site.broughtbyurl%%). "
msgstr ""
-#: lib/action.php:804
+#: lib/action.php:805
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr ""
-#: lib/action.php:806
+#: lib/action.php:808
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4632,53 +4637,57 @@ msgid ""
"org/licensing/licenses/agpl-3.0.html)."
msgstr ""
-#: lib/action.php:821
+#: lib/action.php:823
msgid "Site content license"
msgstr ""
-#: lib/action.php:826
+#: lib/action.php:828
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
-#: lib/action.php:831
+#: lib/action.php:833
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
-#: lib/action.php:834
+#: lib/action.php:836
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
-#: lib/action.php:847
+#: lib/action.php:849
msgid "All "
msgstr "Pep tra "
-#: lib/action.php:853
+#: lib/action.php:855
msgid "license."
msgstr "aotre implijout."
-#: lib/action.php:1152
+#: lib/action.php:1154
msgid "Pagination"
msgstr "Pajennadur"
-#: lib/action.php:1161
+#: lib/action.php:1163
msgid "After"
msgstr "War-lerc'h"
-#: lib/action.php:1169
+#: lib/action.php:1171
msgid "Before"
msgstr "Kent"
-#: lib/activity.php:453
+#: lib/activity.php:120
+msgid "Expecting a root feed element but got a whole XML document."
+msgstr ""
+
+#: lib/activityutils.php:208
msgid "Can't handle remote content yet."
msgstr ""
-#: lib/activity.php:481
+#: lib/activityutils.php:236
msgid "Can't handle embedded XML content yet."
msgstr ""
-#: lib/activity.php:485
+#: lib/activityutils.php:240
msgid "Can't handle embedded Base64 content yet."
msgstr ""
@@ -4716,7 +4725,7 @@ msgstr ""
#: lib/adminpanelaction.php:350
msgctxt "MENU"
msgid "Site"
-msgstr ""
+msgstr "Lec'hienn"
#. TRANS: Menu item title/tooltip
#: lib/adminpanelaction.php:356
@@ -4727,7 +4736,7 @@ msgstr ""
#: lib/adminpanelaction.php:358
msgctxt "MENU"
msgid "Design"
-msgstr ""
+msgstr "Design"
#. TRANS: Menu item title/tooltip
#: lib/adminpanelaction.php:364
@@ -4756,9 +4765,8 @@ msgstr ""
#. TRANS: Menu item title/tooltip
#: lib/adminpanelaction.php:396
-#, fuzzy
msgid "Edit site notice"
-msgstr "Eilañ an ali"
+msgstr "Kemmañ ali al lec'hienn"
#. TRANS: Menu item title/tooltip
#: lib/adminpanelaction.php:404
@@ -4769,7 +4777,7 @@ msgstr ""
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
-#: lib/apiauth.php:272
+#: lib/apiauth.php:276
#, php-format
msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s"
msgstr ""
@@ -4817,7 +4825,7 @@ msgstr "Merdeer"
#: lib/applicationeditform.php:274
msgid "Desktop"
-msgstr ""
+msgstr "Burev"
#: lib/applicationeditform.php:275
msgid "Type of application, browser or desktop"
@@ -4825,11 +4833,11 @@ msgstr ""
#: lib/applicationeditform.php:297
msgid "Read-only"
-msgstr ""
+msgstr "Lenn hepken"
#: lib/applicationeditform.php:315
msgid "Read-write"
-msgstr ""
+msgstr "Lenn-skrivañ"
#: lib/applicationeditform.php:316
msgid "Default access for this application: read-only, or read-write"
@@ -4841,13 +4849,13 @@ msgstr ""
#: lib/attachmentlist.php:87
msgid "Attachments"
-msgstr ""
+msgstr "Pezhioù stag"
-#: lib/attachmentlist.php:265
+#: lib/attachmentlist.php:263
msgid "Author"
msgstr "Aozer"
-#: lib/attachmentlist.php:278
+#: lib/attachmentlist.php:276
msgid "Provider"
msgstr "Pourvezer"
@@ -4867,37 +4875,50 @@ msgstr ""
msgid "Password changing is not allowed"
msgstr ""
-#: lib/channel.php:138 lib/channel.php:158
+#: lib/channel.php:157 lib/channel.php:177
msgid "Command results"
msgstr ""
-#: lib/channel.php:210 lib/mailhandler.php:142
+#: lib/channel.php:229 lib/mailhandler.php:142
msgid "Command complete"
msgstr ""
-#: lib/channel.php:221
+#: lib/channel.php:240
msgid "Command failed"
msgstr ""
-#: lib/command.php:44
-msgid "Sorry, this command is not yet implemented."
+#: lib/command.php:83 lib/command.php:105
+msgid "Notice with that id does not exist"
+msgstr ""
+
+#: lib/command.php:99 lib/command.php:570
+msgid "User has no last notice"
msgstr ""
-#: lib/command.php:88
+#: lib/command.php:125
#, php-format
msgid "Could not find a user with nickname %s"
msgstr ""
-#: lib/command.php:92
+#: lib/command.php:143
+#, php-format
+msgid "Could not find a local user with nickname %s"
+msgstr ""
+
+#: lib/command.php:176
+msgid "Sorry, this command is not yet implemented."
+msgstr ""
+
+#: lib/command.php:221
msgid "It does not make a lot of sense to nudge yourself!"
msgstr ""
-#: lib/command.php:99
+#: lib/command.php:228
#, php-format
msgid "Nudge sent to %s"
-msgstr ""
+msgstr "Blinkadenn kaset da %s"
-#: lib/command.php:126
+#: lib/command.php:254
#, php-format
msgid ""
"Subscriptions: %1$s\n"
@@ -4905,198 +4926,196 @@ msgid ""
"Notices: %3$s"
msgstr ""
-#: lib/command.php:152 lib/command.php:390 lib/command.php:451
-msgid "Notice with that id does not exist"
-msgstr ""
-
-#: lib/command.php:168 lib/command.php:406 lib/command.php:467
-#: lib/command.php:523
-msgid "User has no last notice"
-msgstr ""
-
-#: lib/command.php:190
+#: lib/command.php:296
msgid "Notice marked as fave."
msgstr ""
-#: lib/command.php:217
+#: lib/command.php:317
msgid "You are already a member of that group"
msgstr ""
-#: lib/command.php:231
+#: lib/command.php:331
#, php-format
msgid "Could not join user %s to group %s"
-msgstr ""
+msgstr "Dibosupl eo enskrivañ an implijer %s d'ar strollad %s"
-#: lib/command.php:236
+#: lib/command.php:336
#, php-format
msgid "%s joined group %s"
-msgstr "%s zo emezelet er strollad %s"
+msgstr "emezelet eo %s er strollad %s"
-#: lib/command.php:275
+#: lib/command.php:373
#, php-format
msgid "Could not remove user %s to group %s"
msgstr ""
-#: lib/command.php:280
+#: lib/command.php:378
#, php-format
msgid "%s left group %s"
msgstr "%s {{Gender:.|en|he}} deus kuitaet ar strollad %s"
-#: lib/command.php:309
+#: lib/command.php:401
#, php-format
msgid "Fullname: %s"
msgstr "Anv klok : %s"
-#: lib/command.php:312 lib/mail.php:258
+#: lib/command.php:404 lib/mail.php:258
#, php-format
msgid "Location: %s"
-msgstr ""
+msgstr "Lec'hiadur : %s"
-#: lib/command.php:315 lib/mail.php:260
+#: lib/command.php:407 lib/mail.php:260
#, php-format
msgid "Homepage: %s"
-msgstr ""
+msgstr "Lec'hienn Web : %s"
-#: lib/command.php:318
+#: lib/command.php:410
#, php-format
msgid "About: %s"
msgstr "Diwar-benn : %s"
-#: lib/command.php:349
+#: lib/command.php:437
+#, php-format
+msgid ""
+"%s is a remote profile; you can only send direct messages to users on the "
+"same server."
+msgstr ""
+
+#: lib/command.php:450
#, php-format
msgid "Message too long - maximum is %d characters, you sent %d"
msgstr ""
-#: lib/command.php:367
+#: lib/command.php:468
#, php-format
msgid "Direct message to %s sent"
-msgstr ""
+msgstr "Kaset eo bet ar gemennadenn war eeun da %s."
-#: lib/command.php:369
+#: lib/command.php:470
msgid "Error sending direct message."
msgstr ""
-#: lib/command.php:413
+#: lib/command.php:490
msgid "Cannot repeat your own notice"
msgstr ""
-#: lib/command.php:418
+#: lib/command.php:495
msgid "Already repeated that notice"
msgstr ""
-#: lib/command.php:426
+#: lib/command.php:503
#, php-format
msgid "Notice from %s repeated"
msgstr ""
-#: lib/command.php:428
+#: lib/command.php:505
msgid "Error repeating notice."
msgstr ""
-#: lib/command.php:482
+#: lib/command.php:536
#, php-format
msgid "Notice too long - maximum is %d characters, you sent %d"
msgstr ""
-#: lib/command.php:491
+#: lib/command.php:545
#, php-format
msgid "Reply to %s sent"
-msgstr ""
+msgstr "Respont kaset da %s"
-#: lib/command.php:493
+#: lib/command.php:547
msgid "Error saving notice."
msgstr ""
-#: lib/command.php:547
+#: lib/command.php:594
msgid "Specify the name of the user to subscribe to"
msgstr ""
-#: lib/command.php:554 lib/command.php:589
-msgid "No such user"
+#: lib/command.php:602
+msgid "Can't subscribe to OMB profiles by command."
msgstr ""
-#: lib/command.php:561
+#: lib/command.php:608
#, php-format
msgid "Subscribed to %s"
msgstr ""
-#: lib/command.php:582 lib/command.php:685
+#: lib/command.php:629 lib/command.php:728
msgid "Specify the name of the user to unsubscribe from"
msgstr ""
-#: lib/command.php:595
+#: lib/command.php:638
#, php-format
msgid "Unsubscribed from %s"
msgstr ""
-#: lib/command.php:613 lib/command.php:636
+#: lib/command.php:656 lib/command.php:679
msgid "Command not yet implemented."
msgstr ""
-#: lib/command.php:616
+#: lib/command.php:659
msgid "Notification off."
msgstr ""
-#: lib/command.php:618
+#: lib/command.php:661
msgid "Can't turn off notification."
msgstr ""
-#: lib/command.php:639
+#: lib/command.php:682
msgid "Notification on."
msgstr ""
-#: lib/command.php:641
+#: lib/command.php:684
msgid "Can't turn on notification."
msgstr ""
-#: lib/command.php:654
+#: lib/command.php:697
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:665
+#: lib/command.php:708
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:692
+#: lib/command.php:735
#, php-format
msgid "Unsubscribed %s"
-msgstr ""
+msgstr "Digoumanantet eus %s"
-#: lib/command.php:709
+#: lib/command.php:752
msgid "You are not subscribed to anyone."
msgstr ""
-#: lib/command.php:711
+#: lib/command.php:754
#, fuzzy
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "You are subscribed to this person:"
msgstr[1] "You are subscribed to these people:"
-#: lib/command.php:731
+#: lib/command.php:774
msgid "No one is subscribed to you."
msgstr ""
-#: lib/command.php:733
+#: lib/command.php:776
#, fuzzy
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "This person is subscribed to you:"
msgstr[1] "These people are subscribed to you:"
-#: lib/command.php:753
+#: lib/command.php:796
msgid "You are not a member of any groups."
msgstr ""
-#: lib/command.php:755
+#: lib/command.php:798
#, fuzzy
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "You are a member of this group:"
msgstr[1] "You are a member of these groups:"
-#: lib/command.php:769
+#: lib/command.php:812
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5138,21 +5157,21 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:148
+#: lib/common.php:135
msgid "No configuration file found. "
msgstr ""
-#: lib/common.php:149
+#: lib/common.php:136
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:151
+#: lib/common.php:138
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:152
+#: lib/common.php:139
msgid "Go to the installer."
-msgstr ""
+msgstr "Mont d'ar meziant staliañ"
#: lib/connectsettingsaction.php:110
msgid "IM"
@@ -5168,7 +5187,7 @@ msgstr ""
#: lib/connectsettingsaction.php:120
msgid "Connections"
-msgstr ""
+msgstr "Kevreadennoù"
#: lib/connectsettingsaction.php:121
msgid "Authorized connected applications"
@@ -5237,7 +5256,7 @@ msgstr ""
#: lib/galleryaction.php:140
msgid "Tag"
-msgstr "Merk"
+msgstr "Balizenn"
#: lib/galleryaction.php:141
msgid "Choose a tag to narrow list"
@@ -5300,7 +5319,7 @@ msgstr "Logo"
#: lib/groupnav.php:114
#, php-format
msgid "Add or edit %s logo"
-msgstr ""
+msgstr "Ouzhpennañ pe kemmañ logo %s"
#: lib/groupnav.php:120
#, php-format
@@ -5324,49 +5343,49 @@ msgstr ""
msgid "This page is not available in a media type you accept"
msgstr ""
-#: lib/imagefile.php:75
+#: lib/imagefile.php:72
+msgid "Unsupported image file format."
+msgstr ""
+
+#: lib/imagefile.php:88
#, php-format
msgid "That file is too big. The maximum file size is %s."
msgstr ""
-#: lib/imagefile.php:80
+#: lib/imagefile.php:93
msgid "Partial upload."
msgstr ""
-#: lib/imagefile.php:88 lib/mediafile.php:170
+#: lib/imagefile.php:101 lib/mediafile.php:170
msgid "System error uploading file."
msgstr ""
-#: lib/imagefile.php:96
-msgid "Not an image or corrupt file."
-msgstr ""
-
#: lib/imagefile.php:109
-msgid "Unsupported image file format."
+msgid "Not an image or corrupt file."
msgstr ""
#: lib/imagefile.php:122
msgid "Lost our file."
-msgstr ""
+msgstr "Restr bet kollet."
-#: lib/imagefile.php:166 lib/imagefile.php:231
+#: lib/imagefile.php:163 lib/imagefile.php:224
msgid "Unknown file type"
-msgstr ""
+msgstr "Dizanv eo seurt ar restr"
-#: lib/imagefile.php:251
+#: lib/imagefile.php:244
msgid "MB"
msgstr "Mo"
-#: lib/imagefile.php:253
+#: lib/imagefile.php:246
msgid "kB"
msgstr "Ko"
-#: lib/jabber.php:220
+#: lib/jabber.php:387
#, php-format
msgid "[%s]"
msgstr "[%s]"
-#: lib/jabber.php:400
+#: lib/jabber.php:567
#, php-format
msgid "Unknown inbox source %d."
msgstr ""
@@ -5377,7 +5396,7 @@ msgstr "Stagañ"
#: lib/leaveform.php:114
msgid "Leave"
-msgstr "Kuitañ"
+msgstr "Kuitaat"
#: lib/logingroupnav.php:80
msgid "Login with a username and password"
@@ -5385,7 +5404,7 @@ msgstr ""
#: lib/logingroupnav.php:86
msgid "Sign up for a new account"
-msgstr ""
+msgstr "Digeriñ ur gont nevez"
#: lib/mail.php:173
msgid "Email address confirmation"
@@ -5561,7 +5580,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:482
+#: lib/mailbox.php:227 lib/noticelist.php:486
msgid "from"
msgstr "eus"
@@ -5571,7 +5590,7 @@ msgstr ""
#: lib/mailhandler.php:42
msgid "Not a registered user."
-msgstr ""
+msgstr "N'eo ket un implijer enrollet."
#: lib/mailhandler.php:46
msgid "Sorry, that is not your incoming email address."
@@ -5640,7 +5659,7 @@ msgstr ""
#: lib/messageform.php:120
msgid "Send a direct notice"
-msgstr ""
+msgstr "Kas ur gemennadenn war-eeun"
#: lib/messageform.php:146
msgid "To"
@@ -5653,7 +5672,7 @@ msgstr ""
#: lib/messageform.php:178 lib/noticeform.php:236
msgctxt "Send button for sending notice"
msgid "Send"
-msgstr ""
+msgstr "Kas"
#: lib/noticeform.php:160
msgid "Send a notice"
@@ -5674,11 +5693,11 @@ msgstr "Stagañ ur restr"
#: lib/noticeform.php:212
msgid "Share my location"
-msgstr ""
+msgstr "Rannañ va lec'hiadur."
#: lib/noticeform.php:215
msgid "Do not share my location"
-msgstr ""
+msgstr "Chom hep rannañ va lec'hiadur."
#: lib/noticeform.php:216
msgid ""
@@ -5686,50 +5705,50 @@ msgid ""
"try again later"
msgstr ""
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
-msgstr ""
+msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "N"
msgstr "N"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "S"
msgstr "S"
-#: lib/noticelist.php:431
+#: lib/noticelist.php:432
msgid "E"
msgstr "R"
-#: lib/noticelist.php:431
+#: lib/noticelist.php:432
msgid "W"
msgstr "K"
-#: lib/noticelist.php:438
+#: lib/noticelist.php:439
msgid "at"
msgstr "e"
-#: lib/noticelist.php:566
+#: lib/noticelist.php:570
msgid "in context"
-msgstr ""
+msgstr "en amdro"
-#: lib/noticelist.php:601
+#: lib/noticelist.php:605
msgid "Repeated by"
-msgstr ""
+msgstr "Adkemeret gant"
-#: lib/noticelist.php:628
+#: lib/noticelist.php:632
msgid "Reply to this notice"
-msgstr ""
+msgstr "Respont d'an ali-mañ"
-#: lib/noticelist.php:629
+#: lib/noticelist.php:633
msgid "Reply"
msgstr "Respont"
-#: lib/noticelist.php:673
+#: lib/noticelist.php:677
msgid "Notice repeated"
-msgstr ""
+msgstr "Ali adkemeret"
#: lib/nudgeform.php:116
msgid "Nudge this user"
@@ -5800,15 +5819,15 @@ msgstr ""
msgid "Unknown"
msgstr "Dianav"
-#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr "Koumanantoù"
#: lib/profileaction.php:126
msgid "All subscriptions"
-msgstr ""
+msgstr "An holl koumanantoù"
-#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90
+#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr "Ar re koumanantet"
@@ -5816,15 +5835,20 @@ msgstr "Ar re koumanantet"
msgid "All subscribers"
msgstr "An holl re koumanantet"
-#: lib/profileaction.php:180
+#: lib/profileaction.php:186
msgid "User ID"
msgstr "ID an implijer"
-#: lib/profileaction.php:185
+#: lib/profileaction.php:191
msgid "Member since"
msgstr "Ezel abaoe"
-#: lib/profileaction.php:247
+#. TRANS: Average count of posts made per day since account registration
+#: lib/profileaction.php:230
+msgid "Daily average"
+msgstr "Keidenn pemdeziek"
+
+#: lib/profileaction.php:259
msgid "All groups"
msgstr "An holl strolladoù"
@@ -5869,7 +5893,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:671
+#: lib/router.php:704
msgid "No single user defined for single-user mode."
msgstr ""
@@ -5915,7 +5939,7 @@ msgstr "Klask strolladoù el lec'hienn-mañ"
#: lib/section.php:89
msgid "Untitled section"
-msgstr ""
+msgstr "Rann hep titl"
#: lib/section.php:106
msgid "More..."
@@ -5942,7 +5966,7 @@ msgstr ""
#: lib/subgroupnav.php:99
#, php-format
msgid "Groups %s is a member of"
-msgstr ""
+msgstr "Ezel eo %s eus ar strolladoù"
#: lib/subgroupnav.php:105
msgid "Invite"
@@ -5969,7 +5993,7 @@ msgstr "Hini ebet"
#: lib/topposterssection.php:74
msgid "Top posters"
-msgstr ""
+msgstr "An implijerien an efedusañ"
#: lib/unsandboxform.php:69
msgid "Unsandbox"
@@ -5989,112 +6013,119 @@ msgstr ""
#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
msgid "Unsubscribe from this user"
-msgstr ""
+msgstr "En em zigoumanantiñ eus an implijer-mañ"
#: lib/unsubscribeform.php:137
msgid "Unsubscribe"
-msgstr ""
+msgstr "Digoumanantiñ"
+
+#: lib/usernoprofileexception.php:58
+#, fuzzy, php-format
+msgid "User %s (%d) has no profile record."
+msgstr "An implijer-mañ n'eus profil ebet dezhañ."
-#: lib/userprofile.php:116
+#: lib/userprofile.php:117
msgid "Edit Avatar"
msgstr "Kemmañ an Avatar"
-#: lib/userprofile.php:236
+#: lib/userprofile.php:234 lib/userprofile.php:248
msgid "User actions"
msgstr "Obererezh an implijer"
-#: lib/userprofile.php:251
+#: lib/userprofile.php:237
+msgid "User deletion in progress..."
+msgstr "Diverkadenn an implijer o vont war-raok..."
+
+#: lib/userprofile.php:263
msgid "Edit profile settings"
-msgstr ""
+msgstr "Kemmañ arventennoù ar profil"
-#: lib/userprofile.php:252
+#: lib/userprofile.php:264
msgid "Edit"
msgstr "Aozañ"
-#: lib/userprofile.php:275
+#: lib/userprofile.php:287
msgid "Send a direct message to this user"
msgstr "Kas ur gemennadenn war-eeun d'an implijer-mañ"
-#: lib/userprofile.php:276
+#: lib/userprofile.php:288
msgid "Message"
msgstr "Kemennadenn"
-#: lib/userprofile.php:314
+#: lib/userprofile.php:326
msgid "Moderate"
msgstr "Habaskaat"
-#: lib/userprofile.php:352
+#: lib/userprofile.php:364
#, fuzzy
msgid "User role"
msgstr "Strolladoù implijerien"
-#: lib/userprofile.php:354
-#, fuzzy
+#: lib/userprofile.php:366
msgctxt "role"
msgid "Administrator"
-msgstr "Merourien"
+msgstr "Merour"
-#: lib/userprofile.php:355
-#, fuzzy
+#: lib/userprofile.php:367
msgctxt "role"
msgid "Moderator"
-msgstr "Habaskaat"
+msgstr "Habasker"
-#: lib/util.php:1015
+#: lib/util.php:1046
msgid "a few seconds ago"
msgstr "un nebeud eilennoù zo"
-#: lib/util.php:1017
+#: lib/util.php:1048
msgid "about a minute ago"
msgstr "1 vunutenn zo well-wazh"
-#: lib/util.php:1019
+#: lib/util.php:1050
#, php-format
msgid "about %d minutes ago"
msgstr "%d munutenn zo well-wazh"
-#: lib/util.php:1021
+#: lib/util.php:1052
msgid "about an hour ago"
msgstr "1 eurvezh zo well-wazh"
-#: lib/util.php:1023
+#: lib/util.php:1054
#, php-format
msgid "about %d hours ago"
msgstr "%d eurvezh zo well-wazh"
-#: lib/util.php:1025
+#: lib/util.php:1056
msgid "about a day ago"
msgstr "1 devezh zo well-wazh"
-#: lib/util.php:1027
+#: lib/util.php:1058
#, php-format
msgid "about %d days ago"
msgstr "%d devezh zo well-wazh"
-#: lib/util.php:1029
+#: lib/util.php:1060
msgid "about a month ago"
msgstr "miz zo well-wazh"
-#: lib/util.php:1031
+#: lib/util.php:1062
#, php-format
msgid "about %d months ago"
msgstr "%d miz zo well-wazh"
-#: lib/util.php:1033
+#: lib/util.php:1064
msgid "about a year ago"
msgstr "bloaz zo well-wazh"
#: lib/webcolor.php:82
#, php-format
msgid "%s is not a valid color!"
-msgstr ""
+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 ""
-#: lib/xmppmanager.php:402
+#: lib/xmppmanager.php:403
#, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d."
msgstr ""
diff --git a/locale/ca/LC_MESSAGES/statusnet.po b/locale/ca/LC_MESSAGES/statusnet.po
index bd7c5cd5a..e4be063e9 100644
--- a/locale/ca/LC_MESSAGES/statusnet.po
+++ b/locale/ca/LC_MESSAGES/statusnet.po
@@ -10,12 +10,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-06 23:49+0000\n"
-"PO-Revision-Date: 2010-03-06 23:49:29+0000\n"
+"POT-Creation-Date: 2010-04-05 18:54+0000\n"
+"PO-Revision-Date: 2010-04-05 18:54:46+0000\n"
"Language-Team: Catalan\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64621); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ca\n"
"X-Message-Group: out-statusnet\n"
@@ -99,9 +99,9 @@ msgstr "No existeix la pàgina."
#: 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:90
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78
+#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
@@ -110,10 +110,8 @@ msgstr "No existeix la pàgina."
#: actions/remotesubscribe.php:154 actions/replies.php:73
#: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:163 lib/command.php:302
-#: lib/command.php:355 lib/command.php:401 lib/command.php:462
-#: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82
-#: lib/profileaction.php:77
+#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: lib/mailbox.php:82 lib/profileaction.php:77
msgid "No such user."
msgstr "No existeix aquest usuari."
@@ -202,18 +200,18 @@ msgstr "Actualitzacions de %1$s i amics a %2$s!"
#: 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:132
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:136
#: actions/apigrouplistall.php:120 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:135
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
-#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184
-#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148
+#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:174
+#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173
+#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
-#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
+#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
#, fuzzy
msgid "API method not found."
msgstr "No s'ha trobat el mètode API!"
@@ -227,8 +225,8 @@ msgstr "No s'ha trobat el mètode API!"
#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65
-#: actions/apistatusesupdate.php:118
+#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
msgid "This method requires a POST."
msgstr "Aquest mètode requereix POST."
@@ -259,7 +257,7 @@ msgid "Could not save profile."
msgstr "No s'ha pogut guardar el perfil."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:97
+#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
#: actions/designadminpanel.php:122 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
@@ -349,7 +347,7 @@ msgstr "No s'ha trobat cap estatus amb aquesta ID."
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:176
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
msgid "Could not create favorite."
msgstr "No es pot crear favorit."
@@ -473,7 +471,7 @@ msgstr "No s'ha trobat el grup!"
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:221
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
msgid "You have been blocked from that group by the admin."
msgstr "L'administrador us ha blocat del grup."
@@ -491,11 +489,18 @@ msgstr "No sou un membre del grup."
msgid "Could not remove user %1$s from group %2$s."
msgstr "No s'ha pogut suprimir l'usuari %s del grup %s."
-#: actions/apigrouplist.php:95
+#. TRANS: %s is a user name
+#: actions/apigrouplist.php:97
#, 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
+#, fuzzy, php-format
+msgid "%1$s groups %2$s is a member of."
+msgstr "%s grups són membres de"
+
#: actions/apigrouplistall.php:90 actions/usergroups.php:62
#, php-format
msgid "%s groups"
@@ -524,7 +529,7 @@ msgstr "Mida invàlida."
#: 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:337
+#: actions/profilesettings.php:194 actions/recoverpassword.php:350
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
@@ -587,15 +592,15 @@ msgid ""
"give access to your %4$s account to third parties you trust."
msgstr ""
-#: actions/apioauthauthorize.php:310 lib/action.php:438
+#: actions/apioauthauthorize.php:310 lib/action.php:437
msgid "Account"
msgstr "Compte"
#: actions/apioauthauthorize.php:313 actions/login.php:230
#: actions/profilesettings.php:106 actions/register.php:424
-#: actions/showgroup.php:244 actions/tagother.php:94
+#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
-#: lib/userprofile.php:131
+#: lib/userprofile.php:132
msgid "Nickname"
msgstr "Sobrenom"
@@ -668,12 +673,12 @@ msgstr ""
msgid "Unsupported format."
msgstr "El format no està implementat."
-#: actions/apitimelinefavorites.php:108
+#: actions/apitimelinefavorites.php:109
#, fuzzy, php-format
msgid "%1$s / Favorites from %2$s"
msgstr "%s / Preferits de %s"
-#: actions/apitimelinefavorites.php:117
+#: actions/apitimelinefavorites.php:118
#, fuzzy, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "%s actualitzacions favorites per %s / %s."
@@ -683,7 +688,7 @@ msgstr "%s actualitzacions favorites per %s / %s."
msgid "%1$s / Updates mentioning %2$s"
msgstr "%1$s / Notificacions contestant a %2$s"
-#: actions/apitimelinementions.php:127
+#: actions/apitimelinementions.php:130
#, 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."
@@ -693,7 +698,7 @@ msgstr "%1$s notificacions que responen a notificacions de %2$s / %3$s."
msgid "%s public timeline"
msgstr "%s línia temporal pública"
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "%s notificacions de tots!"
@@ -708,12 +713,12 @@ msgstr "Respostes a %s"
msgid "Repeats of %s"
msgstr "Repeticions de %s"
-#: actions/apitimelinetag.php:102 actions/tag.php:67
+#: actions/apitimelinetag.php:104 actions/tag.php:67
#, php-format
msgid "Notices tagged with %s"
msgstr "Aviso etiquetats amb %s"
-#: actions/apitimelinetag.php:104 actions/tagrss.php:65
+#: actions/apitimelinetag.php:106 actions/tagrss.php:65
#, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Actualitzacions etiquetades amb %1$s el %2$s!"
@@ -741,7 +746,7 @@ msgstr "Cap mida."
msgid "Invalid size."
msgstr "Mida invàlida."
-#: actions/avatarsettings.php:67 actions/showgroup.php:229
+#: actions/avatarsettings.php:67 actions/showgroup.php:230
#: lib/accountsettingsaction.php:112
msgid "Avatar"
msgstr "Avatar"
@@ -774,7 +779,7 @@ msgid "Preview"
msgstr "Vista prèvia"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:655
+#: lib/deleteuserform.php:66 lib/noticelist.php:659
msgid "Delete"
msgstr "Suprimeix"
@@ -786,25 +791,30 @@ msgstr "Puja"
msgid "Crop"
msgstr "Retalla"
-#: actions/avatarsettings.php:328
+#: actions/avatarsettings.php:305
+#, fuzzy
+msgid "No file uploaded."
+msgstr "No s'ha especificat perfil."
+
+#: actions/avatarsettings.php:332
msgid "Pick a square area of the image to be your avatar"
msgstr ""
"Selecciona un quadrat de l'àrea de la imatge que vols que sigui el teu "
"avatar."
-#: actions/avatarsettings.php:343 actions/grouplogo.php:380
+#: actions/avatarsettings.php:347 actions/grouplogo.php:380
msgid "Lost our file data."
msgstr "S'ha perdut el nostre fitxer de dades."
-#: actions/avatarsettings.php:366
+#: actions/avatarsettings.php:370
msgid "Avatar updated."
msgstr "Avatar actualitzat."
-#: actions/avatarsettings.php:369
+#: actions/avatarsettings.php:373
msgid "Failed updating avatar."
msgstr "Error en actualitzar avatar."
-#: actions/avatarsettings.php:393
+#: actions/avatarsettings.php:397
msgid "Avatar deleted."
msgstr "S'ha suprimit l'avatar."
@@ -856,8 +866,8 @@ msgstr "Error al guardar la informació del block."
#: actions/groupunblock.php:86 actions/joingroup.php:82
#: actions/joingroup.php:93 actions/leavegroup.php:82
#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212
-#: lib/command.php:260
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162
+#: lib/command.php:358
msgid "No such group."
msgstr "No s'ha trobat el grup."
@@ -941,7 +951,7 @@ msgid "Conversation"
msgstr "Conversa"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:218 lib/searchgroupnav.php:82
+#: lib/profileaction.php:224 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "Avisos"
@@ -963,7 +973,7 @@ msgstr "No sou un membre del grup."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1217
+#: lib/action.php:1219
msgid "There was a problem with your session token."
msgstr "Ha ocorregut algun problema amb la teva sessió."
@@ -1026,7 +1036,7 @@ msgstr "N'estàs segur que vols eliminar aquesta notificació?"
msgid "Do not delete this notice"
msgstr "No es pot esborrar la notificació."
-#: actions/deletenotice.php:146 lib/noticelist.php:655
+#: actions/deletenotice.php:146 lib/noticelist.php:659
msgid "Delete this notice"
msgstr "Eliminar aquesta nota"
@@ -1160,7 +1170,7 @@ msgstr ""
#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:208
+#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
#: actions/tagother.php:154 actions/useradminpanel.php:294
#: lib/applicationeditform.php:333 lib/applicationeditform.php:334
#: lib/designsettings.php:256 lib/groupeditform.php:202
@@ -1288,7 +1298,7 @@ msgstr "la descripció és massa llarga (màx. %d caràcters)."
msgid "Could not update group."
msgstr "No s'ha pogut actualitzar el grup."
-#: actions/editgroup.php:264 classes/User_group.php:493
+#: actions/editgroup.php:264 classes/User_group.php:496
msgid "Could not create aliases."
msgstr "No s'han pogut crear els àlies."
@@ -1783,7 +1793,7 @@ msgstr "%s línia temporal"
msgid "Updates from members of %1$s on %2$s!"
msgstr "Actualitzacions dels membres de %1$s el %2$s!"
-#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232
+#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244
#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr "Grups"
@@ -1991,7 +2001,7 @@ msgstr "Invitar nous usuaris"
msgid "You are already subscribed to these users:"
msgstr "Ja estàs subscrit a aquests usuaris:"
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
#, php-format
msgid "%1$s (%2$s)"
msgstr "%1$s (%2$s)"
@@ -2124,7 +2134,7 @@ msgstr "%1$s s'ha unit al grup %2$s"
msgid "You must be logged in to leave a group."
msgstr "Has d'haver entrat per a poder marxar d'un grup."
-#: actions/leavegroup.php:100 lib/command.php:265
+#: actions/leavegroup.php:100 lib/command.php:363
msgid "You are not a member of that group."
msgstr "No ets membre d'aquest grup."
@@ -2245,12 +2255,12 @@ msgstr "Utilitza aquest formulari per crear un nou grup."
msgid "New message"
msgstr "Nou missatge"
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
msgid "You can't send a message to this user."
msgstr "No podeu enviar un misssatge a aquest usuari."
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342
-#: lib/command.php:475
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
+#: lib/command.php:529
msgid "No content!"
msgstr "Cap contingut!"
@@ -2258,7 +2268,7 @@ msgstr "Cap contingut!"
msgid "No recipient specified."
msgstr "No has especificat el destinatari."
-#: actions/newmessage.php:164 lib/command.php:361
+#: actions/newmessage.php:164 lib/command.php:462
msgid ""
"Don't send a message to yourself; just say it to yourself quietly instead."
msgstr "No t'enviïs missatges a tu mateix, simplement dir-te això."
@@ -2272,7 +2282,7 @@ msgstr "S'ha enviat el missatge"
msgid "Direct message to %s sent."
msgstr "S'ha enviat un missatge directe a %s."
-#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189
msgid "Ajax Error"
msgstr "Ajax Error"
@@ -2280,7 +2290,7 @@ msgstr "Ajax Error"
msgid "New notice"
msgstr "Nou avís"
-#: actions/newnotice.php:211
+#: actions/newnotice.php:217
msgid "Notice posted"
msgstr "Notificació publicada"
@@ -2389,7 +2399,7 @@ msgstr ""
msgid "Notice has no profile"
msgstr "Avís sense perfil"
-#: actions/oembed.php:86 actions/shownotice.php:180
+#: actions/oembed.php:86 actions/shownotice.php:175
#, php-format
msgid "%1$s's status on %2$s"
msgstr "estat de %1$s a %2$s"
@@ -2402,8 +2412,8 @@ msgstr "tipus de contingut "
msgid "Only "
msgstr "Només "
-#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042
-#: lib/apiaction.php:1070 lib/apiaction.php:1179
+#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1068
+#: lib/apiaction.php:1096 lib/apiaction.php:1212
msgid "Not a supported data format."
msgstr "Format de data no suportat."
@@ -2541,7 +2551,7 @@ msgstr "Contrasenya antiga incorrecta"
msgid "Error saving user; invalid."
msgstr "Error en guardar usuari; invàlid."
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
msgid "Can't save new password."
msgstr "No es pot guardar la nova contrasenya."
@@ -2757,8 +2767,8 @@ 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/showgroup.php:255 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:149
+#: actions/showgroup.php:256 actions/tagother.php:104
+#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Nom complet"
@@ -2786,9 +2796,9 @@ msgid "Bio"
msgstr "Biografia"
#: actions/profilesettings.php:132 actions/register.php:471
-#: actions/showgroup.php:264 actions/tagother.php:112
+#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
-#: lib/userprofile.php:164
+#: lib/userprofile.php:165
msgid "Location"
msgstr "Ubicació"
@@ -2802,7 +2812,7 @@ msgstr ""
#: actions/profilesettings.php:145 actions/tagother.php:149
#: actions/tagother.php:209 lib/subscriptionlist.php:106
-#: lib/subscriptionlist.php:108 lib/userprofile.php:209
+#: lib/subscriptionlist.php:108 lib/userprofile.php:210
msgid "Tags"
msgstr "Etiquetes"
@@ -3040,7 +3050,7 @@ msgstr "Restablir contrasenya"
msgid "Recover password"
msgstr "Recuperar contrasenya"
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
msgid "Password recovery requested"
msgstr "Recuperació de contrasenya sol·licitada"
@@ -3060,19 +3070,19 @@ msgstr "Restablir"
msgid "Enter a nickname or email address."
msgstr "Escriu un sobrenom o una adreça de correu electrònic."
-#: actions/recoverpassword.php:272
+#: actions/recoverpassword.php:282
msgid "No user with that email address or username."
msgstr "No hi ha cap usuari amb aquesta direcció o usuari."
-#: actions/recoverpassword.php:287
+#: actions/recoverpassword.php:299
msgid "No registered email address for that user."
msgstr "Cap adreça de correu electrònic registrada per aquest usuari."
-#: actions/recoverpassword.php:301
+#: actions/recoverpassword.php:313
msgid "Error saving address confirmation."
msgstr "Error en guardar confirmació de l'adreça."
-#: actions/recoverpassword.php:325
+#: actions/recoverpassword.php:338
msgid ""
"Instructions for recovering your password have been sent to the email "
"address registered to your account."
@@ -3080,23 +3090,23 @@ msgstr ""
"S'han enviat instruccions per a recuperar la teva contrasenya a l'adreça de "
"correu electrònic registrada."
-#: actions/recoverpassword.php:344
+#: actions/recoverpassword.php:357
msgid "Unexpected password reset."
msgstr "Restabliment de contrasenya inesperat."
-#: actions/recoverpassword.php:352
+#: actions/recoverpassword.php:365
msgid "Password must be 6 chars or more."
msgstr "La contrasenya ha de tenir 6 o més caràcters."
-#: actions/recoverpassword.php:356
+#: actions/recoverpassword.php:369
msgid "Password and confirmation do not match."
msgstr "La contrasenya i la confirmació no coincideixen."
-#: actions/recoverpassword.php:375 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:248
msgid "Error setting user."
msgstr "Error en configurar l'usuari."
-#: actions/recoverpassword.php:382
+#: actions/recoverpassword.php:395
msgid "New password successfully saved. You are now logged in."
msgstr "Nova contrasenya guardada correctament. Has iniciat una sessió."
@@ -3260,7 +3270,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "URL del teu perfil en un altre servei de microblogging compatible"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:394
+#: lib/userprofile.php:406
msgid "Subscribe"
msgstr "Subscriure's"
@@ -3303,7 +3313,7 @@ msgstr "No pots registrar-te si no estàs d'acord amb la llicència."
msgid "You already repeated that notice."
msgstr "Ja heu blocat l'usuari."
-#: actions/repeat.php:114 lib/noticelist.php:674
+#: actions/repeat.php:114 lib/noticelist.php:678
msgid "Repeated"
msgstr "Repetit"
@@ -3451,8 +3461,8 @@ msgstr "Paginació"
msgid "Description"
msgstr "Descripció"
-#: actions/showapplication.php:192 actions/showgroup.php:438
-#: lib/profileaction.php:176
+#: actions/showapplication.php:192 actions/showgroup.php:439
+#: lib/profileaction.php:182
msgid "Statistics"
msgstr "Estadístiques"
@@ -3564,67 +3574,67 @@ msgstr "%s grup"
msgid "%1$s group, page %2$d"
msgstr "%s membre/s en el grup, pàgina %d"
-#: actions/showgroup.php:226
+#: actions/showgroup.php:227
msgid "Group profile"
msgstr "Perfil del grup"
-#: actions/showgroup.php:271 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:177
+#: actions/showgroup.php:272 actions/tagother.php:118
+#: actions/userauthorization.php:175 lib/userprofile.php:178
msgid "URL"
msgstr "URL"
-#: actions/showgroup.php:282 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:194
+#: actions/showgroup.php:283 actions/tagother.php:128
+#: actions/userauthorization.php:187 lib/userprofile.php:195
msgid "Note"
msgstr "Avisos"
-#: actions/showgroup.php:292 lib/groupeditform.php:184
+#: actions/showgroup.php:293 lib/groupeditform.php:184
msgid "Aliases"
msgstr "Àlies"
-#: actions/showgroup.php:301
+#: actions/showgroup.php:302
msgid "Group actions"
msgstr "Accions del grup"
-#: actions/showgroup.php:337
+#: actions/showgroup.php:338
#, fuzzy, php-format
msgid "Notice feed for %s group (RSS 1.0)"
msgstr "Feed d'avisos del grup %s"
-#: actions/showgroup.php:343
+#: actions/showgroup.php:344
#, fuzzy, php-format
msgid "Notice feed for %s group (RSS 2.0)"
msgstr "Feed d'avisos del grup %s"
-#: actions/showgroup.php:349
+#: actions/showgroup.php:350
#, fuzzy, php-format
msgid "Notice feed for %s group (Atom)"
msgstr "Feed d'avisos del grup %s"
-#: actions/showgroup.php:354
+#: actions/showgroup.php:355
#, php-format
msgid "FOAF for %s group"
msgstr "Safata de sortida per %s"
-#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91
+#: actions/showgroup.php:391 actions/showgroup.php:448 lib/groupnav.php:91
msgid "Members"
msgstr "Membres"
-#: actions/showgroup.php:395 lib/profileaction.php:117
-#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95
-#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71
+#: actions/showgroup.php:396 lib/profileaction.php:117
+#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95
+#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
msgid "(None)"
msgstr "(Cap)"
-#: actions/showgroup.php:401
+#: actions/showgroup.php:402
msgid "All members"
msgstr "Tots els membres"
-#: actions/showgroup.php:441
+#: actions/showgroup.php:442
msgid "Created"
msgstr "S'ha creat"
-#: actions/showgroup.php:457
+#: actions/showgroup.php:458
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3634,7 +3644,7 @@ msgid ""
"of this group and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
-#: actions/showgroup.php:463
+#: actions/showgroup.php:464
#, fuzzy, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3645,7 +3655,7 @@ msgstr ""
"**%s** és un grup d'usuaris a %%%%site.name%%%%, un servei de [microblogging]"
"(http://ca.wikipedia.org/wiki/Microblogging)"
-#: actions/showgroup.php:491
+#: actions/showgroup.php:492
msgid "Admins"
msgstr "Administradors"
@@ -3779,7 +3789,7 @@ msgid "Unknown language \"%s\"."
msgstr "Llengua desconeguda «%s»"
#: actions/siteadminpanel.php:165
-msgid "Minimum text limit is 140 characters."
+msgid "Minimum text limit is 0 (unlimited)."
msgstr ""
#: actions/siteadminpanel.php:171
@@ -4061,8 +4071,7 @@ msgstr "Desa els paràmetres del lloc"
msgid "You are not subscribed to that profile."
msgstr "No estàs subscrit a aquest perfil."
-#: actions/subedit.php:83 classes/Subscription.php:89
-#: classes/Subscription.php:116
+#: actions/subedit.php:83 classes/Subscription.php:132
msgid "Could not save subscription."
msgstr "No s'ha pogut guardar la subscripció."
@@ -4159,11 +4168,11 @@ msgstr ""
msgid "%s is not listening to anyone."
msgstr "%s no escolta a ningú."
-#: actions/subscriptions.php:199
+#: actions/subscriptions.php:208
msgid "Jabber"
msgstr "Jabber"
-#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:222 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr "SMS"
@@ -4197,12 +4206,12 @@ msgstr "No argument de la id."
msgid "Tag %s"
msgstr "Etiqueta %s"
-#: actions/tagother.php:77 lib/userprofile.php:75
+#: actions/tagother.php:77 lib/userprofile.php:76
msgid "User profile"
msgstr "Perfil de l'usuari"
#: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:102
+#: lib/userprofile.php:103
msgid "Photo"
msgstr "Foto"
@@ -4527,7 +4536,7 @@ msgstr ""
msgid "Plugins"
msgstr "Connectors"
-#: actions/version.php:196 lib/action.php:767
+#: actions/version.php:196 lib/action.php:766
#, fuzzy
msgid "Version"
msgstr "Sessions"
@@ -4537,19 +4546,19 @@ msgstr "Sessions"
msgid "Author(s)"
msgstr "Autoria"
-#: classes/File.php:144
+#: classes/File.php:169
#, 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:154
+#: classes/File.php:179
#, php-format
msgid "A file this large would exceed your user quota of %d bytes."
msgstr ""
-#: classes/File.php:161
+#: classes/File.php:186
#, php-format
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
@@ -4591,28 +4600,28 @@ msgstr "No s'ha pogut inserir el missatge."
msgid "Could not update message with new URI."
msgstr "No s'ha pogut inserir el missatge amb la nova URI."
-#: classes/Notice.php:172
+#: classes/Notice.php:175
#, php-format
msgid "DB error inserting hashtag: %s"
msgstr "Hashtag de l'error de la base de dades:%s"
-#: classes/Notice.php:241
+#: classes/Notice.php:244
#, fuzzy
msgid "Problem saving notice. Too long."
msgstr "Problema en guardar l'avís."
-#: classes/Notice.php:245
+#: classes/Notice.php:248
msgid "Problem saving notice. Unknown user."
msgstr "Problema al guardar la notificació. Usuari desconegut."
-#: classes/Notice.php:250
+#: classes/Notice.php:253
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."
-#: classes/Notice.php:256
+#: classes/Notice.php:259
#, fuzzy
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
@@ -4621,74 +4630,74 @@ msgstr ""
"Masses notificacions massa ràpid; pren un respir i publica de nou en uns "
"minuts."
-#: classes/Notice.php:262
+#: classes/Notice.php:265
msgid "You are banned from posting notices on this site."
msgstr "Ha estat bandejat de publicar notificacions en aquest lloc."
-#: classes/Notice.php:328 classes/Notice.php:354
+#: classes/Notice.php:331 classes/Notice.php:357
msgid "Problem saving notice."
msgstr "Problema en guardar l'avís."
-#: classes/Notice.php:927
+#: classes/Notice.php:943
#, fuzzy
msgid "Problem saving group inbox."
msgstr "Problema en guardar l'avís."
-#: classes/Notice.php:1459
+#: classes/Notice.php:1481
#, fuzzy, php-format
msgid "RT @%1$s %2$s"
msgstr "%1$s (%2$s)"
-#: classes/Subscription.php:66 lib/oauthstore.php:465
+#: classes/Subscription.php:74 lib/oauthstore.php:465
msgid "You have been banned from subscribing."
msgstr "Se us ha banejat la subscripció."
-#: classes/Subscription.php:70
+#: classes/Subscription.php:78
msgid "Already subscribed!"
msgstr "Ja hi esteu subscrit!"
-#: classes/Subscription.php:74
+#: classes/Subscription.php:82
msgid "User has blocked you."
msgstr "Un usuari t'ha bloquejat."
-#: classes/Subscription.php:157
+#: classes/Subscription.php:167
#, fuzzy
msgid "Not subscribed!"
msgstr "No estàs subscrit!"
-#: classes/Subscription.php:163
+#: classes/Subscription.php:173
#, fuzzy
msgid "Couldn't delete self-subscription."
msgstr "No s'ha pogut eliminar la subscripció."
-#: classes/Subscription.php:190
+#: classes/Subscription.php:200
#, fuzzy
msgid "Couldn't delete subscription OMB token."
msgstr "No s'ha pogut eliminar la subscripció."
-#: classes/Subscription.php:201 lib/subs.php:69
+#: classes/Subscription.php:211
msgid "Couldn't delete subscription."
msgstr "No s'ha pogut eliminar la subscripció."
-#: classes/User.php:373
+#: classes/User.php:363
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Us donem la benvinguda a %1$s, @%2$s!"
-#: classes/User_group.php:477
+#: classes/User_group.php:480
msgid "Could not create group."
msgstr "No s'ha pogut crear el grup."
-#: classes/User_group.php:486
+#: classes/User_group.php:489
#, fuzzy
msgid "Could not set group URI."
msgstr "No s'ha pogut establir la pertinença d'aquest grup."
-#: classes/User_group.php:507
+#: 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:521
+#: classes/User_group.php:524
#, fuzzy
msgid "Could not save local group info."
msgstr "No s'ha pogut guardar la subscripció."
@@ -4731,127 +4740,127 @@ msgstr "%1$s (%2$s)"
msgid "Untitled page"
msgstr "Pàgina sense titol"
-#: lib/action.php:424
+#: lib/action.php:423
msgid "Primary site navigation"
msgstr "Navegació primària del lloc"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:430
+#: lib/action.php:429
#, fuzzy
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr "Perfil personal i línia temporal dels amics"
-#: lib/action.php:433
+#: lib/action.php:432
#, fuzzy
msgctxt "MENU"
msgid "Personal"
msgstr "Personal"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:435
+#: lib/action.php:434
#, fuzzy
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "Canviar correu electrònic, avatar, contrasenya, perfil"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:440
+#: lib/action.php:439
#, fuzzy
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "No s'ha pogut redirigir al servidor: %s"
-#: lib/action.php:443
+#: lib/action.php:442
msgid "Connect"
msgstr "Connexió"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:446
+#: lib/action.php:445
#, fuzzy
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "Canvia la configuració del lloc"
-#: lib/action.php:449
+#: lib/action.php:448
#, fuzzy
msgctxt "MENU"
msgid "Admin"
msgstr "Admin"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:453
+#: lib/action.php:452
#, fuzzy, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "Convidar amics i companys perquè participin a %s"
-#: lib/action.php:456
+#: lib/action.php:455
#, fuzzy
msgctxt "MENU"
msgid "Invite"
msgstr "Convida"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:462
+#: lib/action.php:461
#, fuzzy
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "Finalitza la sessió del lloc"
-#: lib/action.php:465
+#: lib/action.php:464
#, fuzzy
msgctxt "MENU"
msgid "Logout"
msgstr "Finalitza la sessió"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:470
+#: lib/action.php:469
#, fuzzy
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Crea un compte"
-#: lib/action.php:473
+#: lib/action.php:472
#, fuzzy
msgctxt "MENU"
msgid "Register"
msgstr "Registre"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:476
+#: lib/action.php:475
#, fuzzy
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Inicia una sessió al lloc"
-#: lib/action.php:479
+#: lib/action.php:478
#, fuzzy
msgctxt "MENU"
msgid "Login"
msgstr "Inici de sessió"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:482
+#: lib/action.php:481
#, fuzzy
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Ajuda'm"
-#: lib/action.php:485
+#: lib/action.php:484
#, fuzzy
msgctxt "MENU"
msgid "Help"
msgstr "Ajuda"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:488
+#: lib/action.php:487
#, fuzzy
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "Cerca gent o text"
-#: lib/action.php:491
+#: lib/action.php:490
#, fuzzy
msgctxt "MENU"
msgid "Search"
@@ -4859,59 +4868,59 @@ msgstr "Cerca"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:513 lib/adminpanelaction.php:398
+#: lib/action.php:512 lib/adminpanelaction.php:398
msgid "Site notice"
msgstr "Avís del lloc"
-#: lib/action.php:579
+#: lib/action.php:578
msgid "Local views"
msgstr "Vistes locals"
-#: lib/action.php:645
+#: lib/action.php:644
msgid "Page notice"
msgstr "Notificació pàgina"
-#: lib/action.php:747
+#: lib/action.php:746
msgid "Secondary site navigation"
msgstr "Navegació del lloc secundària"
-#: lib/action.php:752
+#: lib/action.php:751
msgid "Help"
msgstr "Ajuda"
-#: lib/action.php:754
+#: lib/action.php:753
msgid "About"
msgstr "Quant a"
-#: lib/action.php:756
+#: lib/action.php:755
msgid "FAQ"
msgstr "Preguntes més freqüents"
-#: lib/action.php:760
+#: lib/action.php:759
msgid "TOS"
msgstr ""
-#: lib/action.php:763
+#: lib/action.php:762
msgid "Privacy"
msgstr "Privadesa"
-#: lib/action.php:765
+#: lib/action.php:764
msgid "Source"
msgstr "Font"
-#: lib/action.php:769
+#: lib/action.php:768
msgid "Contact"
msgstr "Contacte"
-#: lib/action.php:771
+#: lib/action.php:770
msgid "Badge"
msgstr "Insígnia"
-#: lib/action.php:799
+#: lib/action.php:798
msgid "StatusNet software license"
msgstr "Llicència del programari StatusNet"
-#: lib/action.php:802
+#: lib/action.php:803
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4920,12 +4929,12 @@ msgstr ""
"**%%site.name%%** és un servei de microblogging de [%%site.broughtby%%**](%%"
"site.broughtbyurl%%)."
-#: lib/action.php:804
+#: lib/action.php:805
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** és un servei de microblogging."
-#: lib/action.php:806
+#: lib/action.php:808
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4936,53 +4945,57 @@ msgstr ""
"%s, disponible sota la [GNU Affero General Public License](http://www.fsf."
"org/licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:821
+#: lib/action.php:823
msgid "Site content license"
msgstr "Llicència de contingut del lloc"
-#: lib/action.php:826
+#: lib/action.php:828
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
-#: lib/action.php:831
+#: lib/action.php:833
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
-#: lib/action.php:834
+#: lib/action.php:836
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
-#: lib/action.php:847
+#: lib/action.php:849
msgid "All "
msgstr "Tot "
-#: lib/action.php:853
+#: lib/action.php:855
msgid "license."
msgstr "llicència."
-#: lib/action.php:1152
+#: lib/action.php:1154
msgid "Pagination"
msgstr "Paginació"
-#: lib/action.php:1161
+#: lib/action.php:1163
msgid "After"
msgstr "Posteriors"
-#: lib/action.php:1169
+#: lib/action.php:1171
msgid "Before"
msgstr "Anteriors"
-#: lib/activity.php:453
+#: lib/activity.php:120
+msgid "Expecting a root feed element but got a whole XML document."
+msgstr ""
+
+#: lib/activityutils.php:208
msgid "Can't handle remote content yet."
msgstr ""
-#: lib/activity.php:481
+#: lib/activityutils.php:236
msgid "Can't handle embedded XML content yet."
msgstr ""
-#: lib/activity.php:485
+#: lib/activityutils.php:240
msgid "Can't handle embedded Base64 content yet."
msgstr ""
@@ -5083,7 +5096,7 @@ msgstr "Configuració dels camins"
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
-#: lib/apiauth.php:272
+#: lib/apiauth.php:276
#, php-format
msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s"
msgstr ""
@@ -5162,11 +5175,11 @@ msgstr "Suprimeix"
msgid "Attachments"
msgstr "Adjuncions"
-#: lib/attachmentlist.php:265
+#: lib/attachmentlist.php:263
msgid "Author"
msgstr "Autoria"
-#: lib/attachmentlist.php:278
+#: lib/attachmentlist.php:276
msgid "Provider"
msgstr "Proveïdor"
@@ -5187,37 +5200,51 @@ msgstr "El canvi de contrasenya ha fallat"
msgid "Password changing is not allowed"
msgstr "Contrasenya canviada."
-#: lib/channel.php:138 lib/channel.php:158
+#: lib/channel.php:157 lib/channel.php:177
msgid "Command results"
msgstr "Resultats de les comandes"
-#: lib/channel.php:210 lib/mailhandler.php:142
+#: lib/channel.php:229 lib/mailhandler.php:142
msgid "Command complete"
msgstr "Comanda completada"
-#: lib/channel.php:221
+#: lib/channel.php:240
msgid "Command failed"
msgstr "Comanda fallida"
-#: lib/command.php:44
-msgid "Sorry, this command is not yet implemented."
-msgstr "Perdona, aquesta comanda no està implementada."
+#: 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."
+
+#: lib/command.php:99 lib/command.php:570
+msgid "User has no last notice"
+msgstr "L'usuari no té última nota"
-#: lib/command.php:88
+#: lib/command.php:125
#, fuzzy, php-format
msgid "Could not find a user with nickname %s"
msgstr "No es pot actualitzar l'usuari amb el correu electrònic confirmat"
-#: lib/command.php:92
+#: lib/command.php:143
+#, fuzzy, 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"
+
+#: lib/command.php:176
+msgid "Sorry, this command is not yet implemented."
+msgstr "Perdona, aquesta comanda no està implementada."
+
+#: lib/command.php:221
msgid "It does not make a lot of sense to nudge yourself!"
msgstr ""
-#: lib/command.php:99
+#: lib/command.php:228
#, fuzzy, php-format
msgid "Nudge sent to %s"
msgstr "Reclamació enviada"
-#: lib/command.php:126
+#: lib/command.php:254
#, php-format
msgid ""
"Subscriptions: %1$s\n"
@@ -5225,202 +5252,200 @@ msgid ""
"Notices: %3$s"
msgstr ""
-#: lib/command.php:152 lib/command.php:390 lib/command.php:451
-#, fuzzy
-msgid "Notice with that id does not exist"
-msgstr "No hi ha cap perfil amb aquesta id."
-
-#: lib/command.php:168 lib/command.php:406 lib/command.php:467
-#: lib/command.php:523
-msgid "User has no last notice"
-msgstr "L'usuari no té última nota"
-
-#: lib/command.php:190
+#: lib/command.php:296
msgid "Notice marked as fave."
msgstr "Nota marcada com a favorita."
-#: lib/command.php:217
+#: lib/command.php:317
msgid "You are already a member of that group"
msgstr "Ja sou membre del grup."
-#: lib/command.php:231
+#: lib/command.php:331
#, php-format
msgid "Could not join user %s to group %s"
msgstr "No s'ha pogut afegir l'usuari %s al grup %s."
-#: lib/command.php:236
+#: lib/command.php:336
#, php-format
msgid "%s joined group %s"
msgstr "%s s'ha pogut afegir al grup %s"
-#: lib/command.php:275
+#: lib/command.php:373
#, php-format
msgid "Could not remove user %s to group %s"
msgstr "No s'ha pogut eliminar l'usuari %s del grup %s"
-#: lib/command.php:280
+#: lib/command.php:378
#, php-format
msgid "%s left group %s"
msgstr "%s ha abandonat el grup %s"
-#: lib/command.php:309
+#: lib/command.php:401
#, php-format
msgid "Fullname: %s"
msgstr "Nom complet: %s"
-#: lib/command.php:312 lib/mail.php:258
+#: lib/command.php:404 lib/mail.php:258
#, php-format
msgid "Location: %s"
msgstr "Localització: %s"
-#: lib/command.php:315 lib/mail.php:260
+#: lib/command.php:407 lib/mail.php:260
#, php-format
msgid "Homepage: %s"
msgstr "Pàgina web: %s"
-#: lib/command.php:318
+#: lib/command.php:410
#, php-format
msgid "About: %s"
msgstr "Sobre tu: %s"
-#: lib/command.php:349
+#: lib/command.php:437
+#, php-format
+msgid ""
+"%s is a remote profile; you can only send direct messages to users on the "
+"same server."
+msgstr ""
+
+#: lib/command.php:450
#, fuzzy, php-format
msgid "Message too long - maximum is %d characters, you sent %d"
msgstr "Missatge massa llarg - màxim és 140 caràcters, tu has enviat %d"
-#: lib/command.php:367
+#: lib/command.php:468
#, php-format
msgid "Direct message to %s sent"
msgstr "Missatge directe per a %s enviat"
-#: lib/command.php:369
+#: lib/command.php:470
msgid "Error sending direct message."
msgstr "Error al enviar el missatge directe."
-#: lib/command.php:413
+#: lib/command.php:490
#, fuzzy
msgid "Cannot repeat your own notice"
msgstr "No es poden posar en on les notificacions."
-#: lib/command.php:418
+#: lib/command.php:495
#, fuzzy
msgid "Already repeated that notice"
msgstr "Eliminar aquesta nota"
-#: lib/command.php:426
+#: lib/command.php:503
#, fuzzy, php-format
msgid "Notice from %s repeated"
msgstr "Notificació publicada"
-#: lib/command.php:428
+#: lib/command.php:505
#, fuzzy
msgid "Error repeating notice."
msgstr "Problema en guardar l'avís."
-#: lib/command.php:482
+#: lib/command.php:536
#, fuzzy, 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"
-#: lib/command.php:491
+#: lib/command.php:545
#, php-format
msgid "Reply to %s sent"
msgstr "S'ha enviat la resposta a %s"
-#: lib/command.php:493
+#: lib/command.php:547
#, fuzzy
msgid "Error saving notice."
msgstr "Problema en guardar l'avís."
-#: lib/command.php:547
+#: lib/command.php:594
msgid "Specify the name of the user to subscribe to"
msgstr "Especifica el nom de l'usuari a que vols subscriure't"
-#: lib/command.php:554 lib/command.php:589
-msgid "No such user"
-msgstr "No existeix aquest usuari."
+#: lib/command.php:602
+#, fuzzy
+msgid "Can't subscribe to OMB profiles by command."
+msgstr "No estàs subscrit a aquest perfil."
-#: lib/command.php:561
+#: lib/command.php:608
#, php-format
msgid "Subscribed to %s"
msgstr "Subscrit a %s"
-#: lib/command.php:582 lib/command.php:685
+#: lib/command.php:629 lib/command.php:728
msgid "Specify the name of the user to unsubscribe from"
msgstr "Especifica el nom de l'usuari del que vols deixar d'estar subscrit"
-#: lib/command.php:595
+#: lib/command.php:638
#, php-format
msgid "Unsubscribed from %s"
msgstr "Has deixat d'estar subscrit a %s"
-#: lib/command.php:613 lib/command.php:636
+#: lib/command.php:656 lib/command.php:679
msgid "Command not yet implemented."
msgstr "Comanda encara no implementada."
-#: lib/command.php:616
+#: lib/command.php:659
msgid "Notification off."
msgstr "Notificacions off."
-#: lib/command.php:618
+#: lib/command.php:661
msgid "Can't turn off notification."
msgstr "No es poden posar en off les notificacions."
-#: lib/command.php:639
+#: lib/command.php:682
msgid "Notification on."
msgstr "Notificacions on."
-#: lib/command.php:641
+#: lib/command.php:684
msgid "Can't turn on notification."
msgstr "No es poden posar en on les notificacions."
-#: lib/command.php:654
+#: lib/command.php:697
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:665
+#: lib/command.php:708
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:692
+#: lib/command.php:735
#, fuzzy, php-format
msgid "Unsubscribed %s"
msgstr "Has deixat d'estar subscrit a %s"
-#: lib/command.php:709
+#: lib/command.php:752
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "No estàs subscrit a aquest perfil."
-#: lib/command.php:711
+#: lib/command.php:754
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Ja estàs subscrit a aquests usuaris:"
msgstr[1] "Ja estàs subscrit a aquests usuaris:"
-#: lib/command.php:731
+#: lib/command.php:774
#, fuzzy
msgid "No one is subscribed to you."
msgstr "No pots subscriure a un altre a tu mateix."
-#: lib/command.php:733
+#: lib/command.php:776
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "No pots subscriure a un altre a tu mateix."
msgstr[1] "No pots subscriure a un altre a tu mateix."
-#: lib/command.php:753
+#: lib/command.php:796
msgid "You are not a member of any groups."
msgstr "No sou membre de cap grup."
-#: lib/command.php:755
+#: lib/command.php:798
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Sou un membre d'aquest grup:"
msgstr[1] "Sou un membre d'aquests grups:"
-#: lib/command.php:769
+#: lib/command.php:812
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5462,19 +5487,19 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:148
+#: lib/common.php:135
msgid "No configuration file found. "
msgstr "No s'ha trobat cap fitxer de configuració. "
-#: lib/common.php:149
+#: lib/common.php:136
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:151
+#: 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."
-#: lib/common.php:152
+#: lib/common.php:139
msgid "Go to the installer."
msgstr "Vés a l'instal·lador."
@@ -5650,49 +5675,49 @@ msgstr "Etiquetes en les notificacions del grup %s"
msgid "This page is not available in a media type you accept"
msgstr "Aquesta pàgina no està disponible en un tipus de mèdia que acceptis."
-#: lib/imagefile.php:75
+#: lib/imagefile.php:72
+msgid "Unsupported image file format."
+msgstr "Format d'imatge no suportat."
+
+#: lib/imagefile.php:88
#, fuzzy, php-format
msgid "That file is too big. The maximum file size is %s."
msgstr "Pots pujar una imatge de logo per al grup."
-#: lib/imagefile.php:80
+#: lib/imagefile.php:93
msgid "Partial upload."
msgstr "Càrrega parcial."
-#: lib/imagefile.php:88 lib/mediafile.php:170
+#: lib/imagefile.php:101 lib/mediafile.php:170
msgid "System error uploading file."
msgstr "Error del sistema en pujar el fitxer."
-#: lib/imagefile.php:96
+#: lib/imagefile.php:109
msgid "Not an image or corrupt file."
msgstr "No és una imatge o és un fitxer corrupte."
-#: lib/imagefile.php:109
-msgid "Unsupported image file format."
-msgstr "Format d'imatge no suportat."
-
#: lib/imagefile.php:122
msgid "Lost our file."
msgstr "Hem perdut el nostre arxiu."
-#: lib/imagefile.php:166 lib/imagefile.php:231
+#: lib/imagefile.php:163 lib/imagefile.php:224
msgid "Unknown file type"
msgstr "Tipus de fitxer desconegut"
-#: lib/imagefile.php:251
+#: lib/imagefile.php:244
msgid "MB"
msgstr "MB"
-#: lib/imagefile.php:253
+#: lib/imagefile.php:246
msgid "kB"
msgstr "kB"
-#: lib/jabber.php:220
+#: lib/jabber.php:387
#, php-format
msgid "[%s]"
msgstr ""
-#: lib/jabber.php:400
+#: lib/jabber.php:567
#, fuzzy, php-format
msgid "Unknown inbox source %d."
msgstr "Llengua desconeguda «%s»"
@@ -5903,7 +5928,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:482
+#: lib/mailbox.php:227 lib/noticelist.php:486
msgid "from"
msgstr "de"
@@ -6032,49 +6057,49 @@ msgid ""
"try again later"
msgstr ""
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr ""
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
#, fuzzy
msgid "N"
msgstr "No"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "S"
msgstr ""
-#: lib/noticelist.php:431
+#: lib/noticelist.php:432
msgid "E"
msgstr ""
-#: lib/noticelist.php:431
+#: lib/noticelist.php:432
msgid "W"
msgstr ""
-#: lib/noticelist.php:438
+#: lib/noticelist.php:439
msgid "at"
msgstr ""
-#: lib/noticelist.php:566
+#: lib/noticelist.php:570
msgid "in context"
msgstr "en context"
-#: lib/noticelist.php:601
+#: lib/noticelist.php:605
msgid "Repeated by"
msgstr "Repetit per"
-#: lib/noticelist.php:628
+#: lib/noticelist.php:632
msgid "Reply to this notice"
msgstr "respondre a aquesta nota"
-#: lib/noticelist.php:629
+#: lib/noticelist.php:633
msgid "Reply"
msgstr "Respon"
-#: lib/noticelist.php:673
+#: lib/noticelist.php:677
#, fuzzy
msgid "Notice repeated"
msgstr "Notificació publicada"
@@ -6150,7 +6175,7 @@ msgstr "Etiquetes en les notificacions de %s's"
msgid "Unknown"
msgstr "Acció desconeguda"
-#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr "Subscripcions"
@@ -6158,7 +6183,7 @@ msgstr "Subscripcions"
msgid "All subscriptions"
msgstr "Totes les subscripcions"
-#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90
+#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr "Subscriptors"
@@ -6166,15 +6191,20 @@ msgstr "Subscriptors"
msgid "All subscribers"
msgstr "Tots els subscriptors"
-#: lib/profileaction.php:180
+#: lib/profileaction.php:186
msgid "User ID"
msgstr "ID de l'usuari"
-#: lib/profileaction.php:185
+#: lib/profileaction.php:191
msgid "Member since"
msgstr "Membre des de"
-#: lib/profileaction.php:247
+#. TRANS: Average count of posts made per day since account registration
+#: lib/profileaction.php:230
+msgid "Daily average"
+msgstr ""
+
+#: lib/profileaction.php:259
msgid "All groups"
msgstr "Tots els grups"
@@ -6221,7 +6251,7 @@ msgstr "Repeteix l'avís"
msgid "Revoke the \"%s\" role from this user"
msgstr "Bloca l'usuari del grup"
-#: lib/router.php:671
+#: lib/router.php:704
msgid "No single user defined for single-user mode."
msgstr ""
@@ -6350,92 +6380,101 @@ msgstr "Deixar d'estar subscrit des d'aquest usuari"
msgid "Unsubscribe"
msgstr "Cancel·lar subscripció"
-#: lib/userprofile.php:116
+#: lib/usernoprofileexception.php:58
+#, fuzzy, php-format
+msgid "User %s (%d) has no profile record."
+msgstr "L'usuari no té perfil."
+
+#: lib/userprofile.php:117
msgid "Edit Avatar"
msgstr "Edita l'avatar"
-#: lib/userprofile.php:236
+#: lib/userprofile.php:234 lib/userprofile.php:248
msgid "User actions"
msgstr "Accions de l'usuari"
-#: lib/userprofile.php:251
+#: lib/userprofile.php:237
+msgid "User deletion in progress..."
+msgstr ""
+
+#: lib/userprofile.php:263
msgid "Edit profile settings"
msgstr "Edita la configuració del perfil"
-#: lib/userprofile.php:252
+#: lib/userprofile.php:264
msgid "Edit"
msgstr "Edita"
-#: lib/userprofile.php:275
+#: lib/userprofile.php:287
msgid "Send a direct message to this user"
msgstr "Enviar un missatge directe a aquest usuari"
-#: lib/userprofile.php:276
+#: lib/userprofile.php:288
msgid "Message"
msgstr "Missatge"
-#: lib/userprofile.php:314
+#: lib/userprofile.php:326
msgid "Moderate"
msgstr "Modera"
-#: lib/userprofile.php:352
+#: lib/userprofile.php:364
#, fuzzy
msgid "User role"
msgstr "Perfil de l'usuari"
-#: lib/userprofile.php:354
+#: lib/userprofile.php:366
#, fuzzy
msgctxt "role"
msgid "Administrator"
msgstr "Administradors"
-#: lib/userprofile.php:355
+#: lib/userprofile.php:367
#, fuzzy
msgctxt "role"
msgid "Moderator"
msgstr "Modera"
-#: lib/util.php:1015
+#: lib/util.php:1046
msgid "a few seconds ago"
msgstr "fa pocs segons"
-#: lib/util.php:1017
+#: lib/util.php:1048
msgid "about a minute ago"
msgstr "fa un minut"
-#: lib/util.php:1019
+#: lib/util.php:1050
#, php-format
msgid "about %d minutes ago"
msgstr "fa %d minuts"
-#: lib/util.php:1021
+#: lib/util.php:1052
msgid "about an hour ago"
msgstr "fa una hora"
-#: lib/util.php:1023
+#: lib/util.php:1054
#, php-format
msgid "about %d hours ago"
msgstr "fa %d hores"
-#: lib/util.php:1025
+#: lib/util.php:1056
msgid "about a day ago"
msgstr "fa un dia"
-#: lib/util.php:1027
+#: lib/util.php:1058
#, php-format
msgid "about %d days ago"
msgstr "fa %d dies"
-#: lib/util.php:1029
+#: lib/util.php:1060
msgid "about a month ago"
msgstr "fa un mes"
-#: lib/util.php:1031
+#: lib/util.php:1062
#, php-format
msgid "about %d months ago"
msgstr "fa %d mesos"
-#: lib/util.php:1033
+#: lib/util.php:1064
msgid "about a year ago"
msgstr "fa un any"
@@ -6449,7 +6488,7 @@ msgstr "%s no és un color vàlid!"
msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr "%s no és un color vàlid! Feu servir 3 o 6 caràcters hexadecimals."
-#: lib/xmppmanager.php:402
+#: lib/xmppmanager.php:403
#, fuzzy, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d."
msgstr "Missatge massa llarg - màxim és 140 caràcters, tu has enviat %d"
diff --git a/locale/cs/LC_MESSAGES/statusnet.po b/locale/cs/LC_MESSAGES/statusnet.po
index a48ec5885..92184a31d 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-03-06 23:49+0000\n"
-"PO-Revision-Date: 2010-03-06 23:49:32+0000\n"
+"POT-Creation-Date: 2010-04-05 18:54+0000\n"
+"PO-Revision-Date: 2010-04-05 18:54:49+0000\n"
"Language-Team: Czech\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64621); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: cs\n"
"X-Message-Group: out-statusnet\n"
@@ -99,9 +99,9 @@ msgstr "Žádné takové oznámení."
#: 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:90
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78
+#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
@@ -110,10 +110,8 @@ msgstr "Žádné takové oznámení."
#: actions/remotesubscribe.php:154 actions/replies.php:73
#: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:163 lib/command.php:302
-#: lib/command.php:355 lib/command.php:401 lib/command.php:462
-#: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82
-#: lib/profileaction.php:77
+#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: lib/mailbox.php:82 lib/profileaction.php:77
msgid "No such user."
msgstr "Žádný takový uživatel."
@@ -201,18 +199,18 @@ msgstr ""
#: 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:132
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:136
#: actions/apigrouplistall.php:120 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:135
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
-#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184
-#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148
+#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:174
+#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173
+#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
-#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
+#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
#, fuzzy
msgid "API method not found."
msgstr "Potvrzující kód nebyl nalezen"
@@ -226,8 +224,8 @@ msgstr "Potvrzující kód nebyl nalezen"
#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65
-#: actions/apistatusesupdate.php:118
+#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
msgid "This method requires a POST."
msgstr ""
@@ -258,7 +256,7 @@ msgid "Could not save profile."
msgstr "Nelze uložit profil"
#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:97
+#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
#: actions/designadminpanel.php:122 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
@@ -345,7 +343,7 @@ msgstr ""
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:176
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
msgid "Could not create favorite."
msgstr ""
@@ -468,7 +466,7 @@ msgstr "Žádný požadavek nebyl nalezen!"
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:221
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
msgid "You have been blocked from that group by the admin."
msgstr ""
@@ -487,11 +485,18 @@ msgstr "Neodeslal jste nám profil"
msgid "Could not remove user %1$s from group %2$s."
msgstr "Nelze vytvořit OpenID z: %s"
-#: actions/apigrouplist.php:95
+#. TRANS: %s is a user name
+#: actions/apigrouplist.php:97
#, 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
+#, fuzzy, php-format
+msgid "%1$s groups %2$s is a member of."
+msgstr "Neodeslal jste nám profil"
+
#: actions/apigrouplistall.php:90 actions/usergroups.php:62
#, php-format
msgid "%s groups"
@@ -520,7 +525,7 @@ msgstr "Neplatná velikost"
#: 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:337
+#: actions/profilesettings.php:194 actions/recoverpassword.php:350
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
@@ -581,16 +586,16 @@ msgid ""
"give access to your %4$s account to third parties you trust."
msgstr ""
-#: actions/apioauthauthorize.php:310 lib/action.php:438
+#: actions/apioauthauthorize.php:310 lib/action.php:437
#, fuzzy
msgid "Account"
msgstr "O nás"
#: actions/apioauthauthorize.php:313 actions/login.php:230
#: actions/profilesettings.php:106 actions/register.php:424
-#: actions/showgroup.php:244 actions/tagother.php:94
+#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
-#: lib/userprofile.php:131
+#: lib/userprofile.php:132
msgid "Nickname"
msgstr "Přezdívka"
@@ -664,12 +669,12 @@ msgstr ""
msgid "Unsupported format."
msgstr "Nepodporovaný formát obrázku."
-#: actions/apitimelinefavorites.php:108
+#: actions/apitimelinefavorites.php:109
#, fuzzy, php-format
msgid "%1$s / Favorites from %2$s"
msgstr "%1 statusů na %2"
-#: actions/apitimelinefavorites.php:117
+#: actions/apitimelinefavorites.php:118
#, fuzzy, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "Mikroblog od %s"
@@ -679,7 +684,7 @@ msgstr "Mikroblog od %s"
msgid "%1$s / Updates mentioning %2$s"
msgstr "%1 statusů na %2"
-#: actions/apitimelinementions.php:127
+#: actions/apitimelinementions.php:130
#, php-format
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr ""
@@ -689,7 +694,7 @@ msgstr ""
msgid "%s public timeline"
msgstr ""
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr ""
@@ -704,12 +709,12 @@ msgstr "Odpovědi na %s"
msgid "Repeats of %s"
msgstr "Odpovědi na %s"
-#: actions/apitimelinetag.php:102 actions/tag.php:67
+#: actions/apitimelinetag.php:104 actions/tag.php:67
#, php-format
msgid "Notices tagged with %s"
msgstr ""
-#: actions/apitimelinetag.php:104 actions/tagrss.php:65
+#: actions/apitimelinetag.php:106 actions/tagrss.php:65
#, fuzzy, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Mikroblog od %s"
@@ -739,7 +744,7 @@ msgstr "Žádná velikost"
msgid "Invalid size."
msgstr "Neplatná velikost"
-#: actions/avatarsettings.php:67 actions/showgroup.php:229
+#: actions/avatarsettings.php:67 actions/showgroup.php:230
#: lib/accountsettingsaction.php:112
msgid "Avatar"
msgstr "Obrázek"
@@ -772,7 +777,7 @@ msgid "Preview"
msgstr ""
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:655
+#: lib/deleteuserform.php:66 lib/noticelist.php:659
msgid "Delete"
msgstr "Odstranit"
@@ -784,23 +789,28 @@ msgstr "Upload"
msgid "Crop"
msgstr ""
-#: actions/avatarsettings.php:328
+#: actions/avatarsettings.php:305
+#, fuzzy
+msgid "No file uploaded."
+msgstr "Částečné náhrání."
+
+#: actions/avatarsettings.php:332
msgid "Pick a square area of the image to be your avatar"
msgstr ""
-#: actions/avatarsettings.php:343 actions/grouplogo.php:380
+#: actions/avatarsettings.php:347 actions/grouplogo.php:380
msgid "Lost our file data."
msgstr ""
-#: actions/avatarsettings.php:366
+#: actions/avatarsettings.php:370
msgid "Avatar updated."
msgstr "Obrázek nahrán"
-#: actions/avatarsettings.php:369
+#: actions/avatarsettings.php:373
msgid "Failed updating avatar."
msgstr "Nahrávání obrázku selhalo."
-#: actions/avatarsettings.php:393
+#: actions/avatarsettings.php:397
msgid "Avatar deleted."
msgstr "Avatar smazán."
@@ -855,8 +865,8 @@ msgstr ""
#: actions/groupunblock.php:86 actions/joingroup.php:82
#: actions/joingroup.php:93 actions/leavegroup.php:82
#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212
-#: lib/command.php:260
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162
+#: lib/command.php:358
#, fuzzy
msgid "No such group."
msgstr "Žádné takové oznámení."
@@ -943,7 +953,7 @@ msgid "Conversation"
msgstr "Umístění"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:218 lib/searchgroupnav.php:82
+#: lib/profileaction.php:224 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "Sdělení"
@@ -965,7 +975,7 @@ msgstr "Neodeslal jste nám profil"
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1217
+#: lib/action.php:1219
msgid "There was a problem with your session token."
msgstr ""
@@ -1025,7 +1035,7 @@ msgstr ""
msgid "Do not delete this notice"
msgstr "Žádné takové oznámení."
-#: actions/deletenotice.php:146 lib/noticelist.php:655
+#: actions/deletenotice.php:146 lib/noticelist.php:659
msgid "Delete this notice"
msgstr "Odstranit toto oznámení"
@@ -1166,7 +1176,7 @@ msgstr ""
#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:208
+#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
#: actions/tagother.php:154 actions/useradminpanel.php:294
#: lib/applicationeditform.php:333 lib/applicationeditform.php:334
#: lib/designsettings.php:256 lib/groupeditform.php:202
@@ -1291,7 +1301,7 @@ msgstr "Text je příliš dlouhý (maximální délka je 140 zanků)"
msgid "Could not update group."
msgstr "Nelze aktualizovat uživatele"
-#: actions/editgroup.php:264 classes/User_group.php:493
+#: actions/editgroup.php:264 classes/User_group.php:496
#, fuzzy
msgid "Could not create aliases."
msgstr "Nelze uložin informace o obrázku"
@@ -1790,7 +1800,7 @@ msgstr ""
msgid "Updates from members of %1$s on %2$s!"
msgstr "Mikroblog od %s"
-#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232
+#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244
#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr "Skupiny"
@@ -1998,7 +2008,7 @@ msgstr ""
msgid "You are already subscribed to these users:"
msgstr ""
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
#, php-format
msgid "%1$s (%2$s)"
msgstr ""
@@ -2100,7 +2110,7 @@ msgstr ""
msgid "You must be logged in to leave a group."
msgstr ""
-#: actions/leavegroup.php:100 lib/command.php:265
+#: actions/leavegroup.php:100 lib/command.php:363
#, fuzzy
msgid "You are not a member of that group."
msgstr "Neodeslal jste nám profil"
@@ -2216,12 +2226,12 @@ msgstr ""
msgid "New message"
msgstr ""
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
msgid "You can't send a message to this user."
msgstr ""
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342
-#: lib/command.php:475
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
+#: lib/command.php:529
msgid "No content!"
msgstr "Žádný obsah!"
@@ -2229,7 +2239,7 @@ msgstr "Žádný obsah!"
msgid "No recipient specified."
msgstr ""
-#: actions/newmessage.php:164 lib/command.php:361
+#: actions/newmessage.php:164 lib/command.php:462
msgid ""
"Don't send a message to yourself; just say it to yourself quietly instead."
msgstr ""
@@ -2243,7 +2253,7 @@ msgstr ""
msgid "Direct message to %s sent."
msgstr ""
-#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189
msgid "Ajax Error"
msgstr ""
@@ -2251,7 +2261,7 @@ msgstr ""
msgid "New notice"
msgstr "Nové sdělení"
-#: actions/newnotice.php:211
+#: actions/newnotice.php:217
#, fuzzy
msgid "Notice posted"
msgstr "Sdělení"
@@ -2358,7 +2368,7 @@ msgstr ""
msgid "Notice has no profile"
msgstr "Sdělení nemá profil"
-#: actions/oembed.php:86 actions/shownotice.php:180
+#: actions/oembed.php:86 actions/shownotice.php:175
#, php-format
msgid "%1$s's status on %2$s"
msgstr "%1 statusů na %2"
@@ -2372,8 +2382,8 @@ msgstr "Připojit"
msgid "Only "
msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042
-#: lib/apiaction.php:1070 lib/apiaction.php:1179
+#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1068
+#: lib/apiaction.php:1096 lib/apiaction.php:1212
msgid "Not a supported data format."
msgstr ""
@@ -2513,7 +2523,7 @@ msgstr "Neplatné heslo"
msgid "Error saving user; invalid."
msgstr "Chyba při ukládaní uživatele; neplatný"
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
msgid "Can't save new password."
msgstr "Nelze uložit nové heslo"
@@ -2737,8 +2747,8 @@ 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/showgroup.php:255 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:149
+#: actions/showgroup.php:256 actions/tagother.php:104
+#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Celé jméno"
@@ -2765,9 +2775,9 @@ msgid "Bio"
msgstr "O mě"
#: actions/profilesettings.php:132 actions/register.php:471
-#: actions/showgroup.php:264 actions/tagother.php:112
+#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
-#: lib/userprofile.php:164
+#: lib/userprofile.php:165
msgid "Location"
msgstr "Umístění"
@@ -2781,7 +2791,7 @@ msgstr ""
#: actions/profilesettings.php:145 actions/tagother.php:149
#: actions/tagother.php:209 lib/subscriptionlist.php:106
-#: lib/subscriptionlist.php:108 lib/userprofile.php:209
+#: lib/subscriptionlist.php:108 lib/userprofile.php:210
msgid "Tags"
msgstr ""
@@ -3011,7 +3021,7 @@ msgstr "Resetovat heslo"
msgid "Recover password"
msgstr "Obnovit"
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
msgid "Password recovery requested"
msgstr "Žádost o obnovu hesla"
@@ -3031,19 +3041,19 @@ msgstr "Reset"
msgid "Enter a nickname or email address."
msgstr "Zadej přezdívku nebo emailovou adresu"
-#: actions/recoverpassword.php:272
+#: actions/recoverpassword.php:282
msgid "No user with that email address or username."
msgstr ""
-#: actions/recoverpassword.php:287
+#: actions/recoverpassword.php:299
msgid "No registered email address for that user."
msgstr "Žádný registrovaný email pro tohoto uživatele."
-#: actions/recoverpassword.php:301
+#: actions/recoverpassword.php:313
msgid "Error saving address confirmation."
msgstr "Chyba při ukládání potvrzení adresy"
-#: actions/recoverpassword.php:325
+#: actions/recoverpassword.php:338
msgid ""
"Instructions for recovering your password have been sent to the email "
"address registered to your account."
@@ -3051,23 +3061,23 @@ msgstr ""
"Návod jak obnovit heslo byl odeslát na vaší emailovou adresu zaregistrovanou "
"u vašeho účtu."
-#: actions/recoverpassword.php:344
+#: actions/recoverpassword.php:357
msgid "Unexpected password reset."
msgstr "Nečekané resetování hesla."
-#: actions/recoverpassword.php:352
+#: actions/recoverpassword.php:365
msgid "Password must be 6 chars or more."
msgstr "Heslo musí být alespoň 6 znaků dlouhé"
-#: actions/recoverpassword.php:356
+#: actions/recoverpassword.php:369
msgid "Password and confirmation do not match."
msgstr "Heslo a potvrzení nesouhlasí"
-#: actions/recoverpassword.php:375 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:248
msgid "Error setting user."
msgstr "Chyba nastavení uživatele"
-#: actions/recoverpassword.php:382
+#: actions/recoverpassword.php:395
msgid "New password successfully saved. You are now logged in."
msgstr "Nové heslo bylo uloženo. Nyní jste přihlášen."
@@ -3214,7 +3224,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "Adresa profilu na jiných kompatibilních mikroblozích."
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:394
+#: lib/userprofile.php:406
msgid "Subscribe"
msgstr "Odebírat"
@@ -3255,7 +3265,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:674
+#: actions/repeat.php:114 lib/noticelist.php:678
#, fuzzy
msgid "Repeated"
msgstr "Vytvořit"
@@ -3404,8 +3414,8 @@ msgstr "Umístění"
msgid "Description"
msgstr "Odběry"
-#: actions/showapplication.php:192 actions/showgroup.php:438
-#: lib/profileaction.php:176
+#: actions/showapplication.php:192 actions/showgroup.php:439
+#: lib/profileaction.php:182
msgid "Statistics"
msgstr "Statistiky"
@@ -3515,70 +3525,70 @@ msgstr ""
msgid "%1$s group, page %2$d"
msgstr "Všechny odběry"
-#: actions/showgroup.php:226
+#: actions/showgroup.php:227
#, fuzzy
msgid "Group profile"
msgstr "Žádné takové oznámení."
-#: actions/showgroup.php:271 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:177
+#: actions/showgroup.php:272 actions/tagother.php:118
+#: actions/userauthorization.php:175 lib/userprofile.php:178
msgid "URL"
msgstr ""
-#: actions/showgroup.php:282 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:194
+#: actions/showgroup.php:283 actions/tagother.php:128
+#: actions/userauthorization.php:187 lib/userprofile.php:195
msgid "Note"
msgstr "Poznámka"
-#: actions/showgroup.php:292 lib/groupeditform.php:184
+#: actions/showgroup.php:293 lib/groupeditform.php:184
msgid "Aliases"
msgstr ""
-#: actions/showgroup.php:301
+#: actions/showgroup.php:302
msgid "Group actions"
msgstr ""
-#: actions/showgroup.php:337
+#: actions/showgroup.php:338
#, fuzzy, php-format
msgid "Notice feed for %s group (RSS 1.0)"
msgstr "Feed sdělení pro %s"
-#: actions/showgroup.php:343
+#: actions/showgroup.php:344
#, fuzzy, php-format
msgid "Notice feed for %s group (RSS 2.0)"
msgstr "Feed sdělení pro %s"
-#: actions/showgroup.php:349
+#: actions/showgroup.php:350
#, fuzzy, php-format
msgid "Notice feed for %s group (Atom)"
msgstr "Feed sdělení pro %s"
-#: actions/showgroup.php:354
+#: actions/showgroup.php:355
#, fuzzy, php-format
msgid "FOAF for %s group"
msgstr "Feed sdělení pro %s"
-#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91
+#: actions/showgroup.php:391 actions/showgroup.php:448 lib/groupnav.php:91
#, fuzzy
msgid "Members"
msgstr "Členem od"
-#: actions/showgroup.php:395 lib/profileaction.php:117
-#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95
-#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71
+#: actions/showgroup.php:396 lib/profileaction.php:117
+#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95
+#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
msgid "(None)"
msgstr ""
-#: actions/showgroup.php:401
+#: actions/showgroup.php:402
msgid "All members"
msgstr ""
-#: actions/showgroup.php:441
+#: actions/showgroup.php:442
#, fuzzy
msgid "Created"
msgstr "Vytvořit"
-#: actions/showgroup.php:457
+#: actions/showgroup.php:458
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3588,7 +3598,7 @@ msgid ""
"of this group and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
-#: actions/showgroup.php:463
+#: actions/showgroup.php:464
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3597,7 +3607,7 @@ msgid ""
"their life and interests. "
msgstr ""
-#: actions/showgroup.php:491
+#: actions/showgroup.php:492
msgid "Admins"
msgstr ""
@@ -3727,7 +3737,7 @@ msgid "Unknown language \"%s\"."
msgstr ""
#: actions/siteadminpanel.php:165
-msgid "Minimum text limit is 140 characters."
+msgid "Minimum text limit is 0 (unlimited)."
msgstr ""
#: actions/siteadminpanel.php:171
@@ -4002,8 +4012,7 @@ msgstr "Nastavení"
msgid "You are not subscribed to that profile."
msgstr "Neodeslal jste nám profil"
-#: actions/subedit.php:83 classes/Subscription.php:89
-#: classes/Subscription.php:116
+#: actions/subedit.php:83 classes/Subscription.php:132
#, fuzzy
msgid "Could not save subscription."
msgstr "Nelze vytvořit odebírat"
@@ -4098,12 +4107,12 @@ msgstr ""
msgid "%s is not listening to anyone."
msgstr "%1 od teď naslouchá tvým sdělením v %2"
-#: actions/subscriptions.php:199
+#: actions/subscriptions.php:208
#, fuzzy
msgid "Jabber"
msgstr "Žádné Jabber ID."
-#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:222 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr ""
@@ -4137,13 +4146,13 @@ msgstr "Žádný takový dokument."
msgid "Tag %s"
msgstr ""
-#: actions/tagother.php:77 lib/userprofile.php:75
+#: actions/tagother.php:77 lib/userprofile.php:76
#, fuzzy
msgid "User profile"
msgstr "Uživatel nemá profil."
#: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:102
+#: lib/userprofile.php:103
msgid "Photo"
msgstr ""
@@ -4471,7 +4480,7 @@ msgstr ""
msgid "Plugins"
msgstr ""
-#: actions/version.php:196 lib/action.php:767
+#: actions/version.php:196 lib/action.php:766
#, fuzzy
msgid "Version"
msgstr "Osobní"
@@ -4480,19 +4489,19 @@ msgstr "Osobní"
msgid "Author(s)"
msgstr ""
-#: classes/File.php:144
+#: classes/File.php:169
#, 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:154
+#: classes/File.php:179
#, php-format
msgid "A file this large would exceed your user quota of %d bytes."
msgstr ""
-#: classes/File.php:161
+#: classes/File.php:186
#, php-format
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
@@ -4534,103 +4543,103 @@ msgstr ""
msgid "Could not update message with new URI."
msgstr ""
-#: classes/Notice.php:172
+#: classes/Notice.php:175
#, php-format
msgid "DB error inserting hashtag: %s"
msgstr ""
-#: classes/Notice.php:241
+#: classes/Notice.php:244
#, fuzzy
msgid "Problem saving notice. Too long."
msgstr "Problém při ukládání sdělení"
-#: classes/Notice.php:245
+#: classes/Notice.php:248
#, fuzzy
msgid "Problem saving notice. Unknown user."
msgstr "Problém při ukládání sdělení"
-#: classes/Notice.php:250
+#: classes/Notice.php:253
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
-#: classes/Notice.php:256
+#: classes/Notice.php:259
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
msgstr ""
-#: classes/Notice.php:262
+#: classes/Notice.php:265
msgid "You are banned from posting notices on this site."
msgstr ""
-#: classes/Notice.php:328 classes/Notice.php:354
+#: classes/Notice.php:331 classes/Notice.php:357
msgid "Problem saving notice."
msgstr "Problém při ukládání sdělení"
-#: classes/Notice.php:927
+#: classes/Notice.php:943
#, fuzzy
msgid "Problem saving group inbox."
msgstr "Problém při ukládání sdělení"
-#: classes/Notice.php:1459
+#: classes/Notice.php:1481
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
-#: classes/Subscription.php:66 lib/oauthstore.php:465
+#: classes/Subscription.php:74 lib/oauthstore.php:465
msgid "You have been banned from subscribing."
msgstr ""
-#: classes/Subscription.php:70
+#: classes/Subscription.php:78
msgid "Already subscribed!"
msgstr ""
-#: classes/Subscription.php:74
+#: classes/Subscription.php:82
#, fuzzy
msgid "User has blocked you."
msgstr "Uživatel nemá profil."
-#: classes/Subscription.php:157
+#: classes/Subscription.php:167
#, fuzzy
msgid "Not subscribed!"
msgstr "Nepřihlášen!"
-#: classes/Subscription.php:163
+#: classes/Subscription.php:173
#, fuzzy
msgid "Couldn't delete self-subscription."
msgstr "Nelze smazat odebírání"
-#: classes/Subscription.php:190
+#: classes/Subscription.php:200
#, fuzzy
msgid "Couldn't delete subscription OMB token."
msgstr "Nelze smazat odebírání"
-#: classes/Subscription.php:201 lib/subs.php:69
+#: classes/Subscription.php:211
msgid "Couldn't delete subscription."
msgstr "Nelze smazat odebírání"
-#: classes/User.php:373
+#: classes/User.php:363
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr ""
-#: classes/User_group.php:477
+#: classes/User_group.php:480
#, fuzzy
msgid "Could not create group."
msgstr "Nelze uložin informace o obrázku"
-#: classes/User_group.php:486
+#: classes/User_group.php:489
#, fuzzy
msgid "Could not set group URI."
msgstr "Nelze vytvořit odebírat"
-#: classes/User_group.php:507
+#: classes/User_group.php:510
#, fuzzy
msgid "Could not set group membership."
msgstr "Nelze vytvořit odebírat"
-#: classes/User_group.php:521
+#: classes/User_group.php:524
#, fuzzy
msgid "Could not save local group info."
msgstr "Nelze vytvořit odebírat"
@@ -4674,122 +4683,122 @@ msgstr "%1 statusů na %2"
msgid "Untitled page"
msgstr ""
-#: lib/action.php:424
+#: lib/action.php:423
msgid "Primary site navigation"
msgstr ""
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:430
+#: lib/action.php:429
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr ""
-#: lib/action.php:433
+#: lib/action.php:432
#, fuzzy
msgctxt "MENU"
msgid "Personal"
msgstr "Osobní"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:435
+#: lib/action.php:434
#, fuzzy
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "Změnit heslo"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:440
+#: lib/action.php:439
#, fuzzy
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "Nelze přesměrovat na server: %s"
-#: lib/action.php:443
+#: lib/action.php:442
msgid "Connect"
msgstr "Připojit"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:446
+#: lib/action.php:445
#, fuzzy
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "Odběry"
-#: lib/action.php:449
+#: lib/action.php:448
msgctxt "MENU"
msgid "Admin"
msgstr ""
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:453
+#: lib/action.php:452
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr ""
-#: lib/action.php:456
+#: lib/action.php:455
#, fuzzy
msgctxt "MENU"
msgid "Invite"
msgstr "Neplatná velikost"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:462
+#: lib/action.php:461
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr ""
-#: lib/action.php:465
+#: lib/action.php:464
#, fuzzy
msgctxt "MENU"
msgid "Logout"
msgstr "Odhlásit"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:470
+#: lib/action.php:469
#, fuzzy
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Vytvořit nový účet"
-#: lib/action.php:473
+#: lib/action.php:472
#, fuzzy
msgctxt "MENU"
msgid "Register"
msgstr "Registrovat"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:476
+#: lib/action.php:475
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr ""
-#: lib/action.php:479
+#: lib/action.php:478
#, fuzzy
msgctxt "MENU"
msgid "Login"
msgstr "Přihlásit"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:482
+#: lib/action.php:481
#, fuzzy
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Pomoci mi!"
-#: lib/action.php:485
+#: lib/action.php:484
#, fuzzy
msgctxt "MENU"
msgid "Help"
msgstr "Nápověda"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:488
+#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr ""
-#: lib/action.php:491
+#: lib/action.php:490
#, fuzzy
msgctxt "MENU"
msgid "Search"
@@ -4797,62 +4806,62 @@ msgstr "Hledat"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:513 lib/adminpanelaction.php:398
+#: lib/action.php:512 lib/adminpanelaction.php:398
#, fuzzy
msgid "Site notice"
msgstr "Nové sdělení"
-#: lib/action.php:579
+#: lib/action.php:578
msgid "Local views"
msgstr ""
-#: lib/action.php:645
+#: lib/action.php:644
#, fuzzy
msgid "Page notice"
msgstr "Nové sdělení"
-#: lib/action.php:747
+#: lib/action.php:746
#, fuzzy
msgid "Secondary site navigation"
msgstr "Odběry"
-#: lib/action.php:752
+#: lib/action.php:751
msgid "Help"
msgstr "Nápověda"
-#: lib/action.php:754
+#: lib/action.php:753
msgid "About"
msgstr "O nás"
-#: lib/action.php:756
+#: lib/action.php:755
msgid "FAQ"
msgstr "FAQ"
-#: lib/action.php:760
+#: lib/action.php:759
msgid "TOS"
msgstr ""
-#: lib/action.php:763
+#: lib/action.php:762
msgid "Privacy"
msgstr "Soukromí"
-#: lib/action.php:765
+#: lib/action.php:764
msgid "Source"
msgstr "Zdroj"
-#: lib/action.php:769
+#: lib/action.php:768
msgid "Contact"
msgstr "Kontakt"
-#: lib/action.php:771
+#: lib/action.php:770
msgid "Badge"
msgstr ""
-#: lib/action.php:799
+#: lib/action.php:798
msgid "StatusNet software license"
msgstr ""
-#: lib/action.php:802
+#: lib/action.php:803
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4861,12 +4870,12 @@ msgstr ""
"**%%site.name%%** je služba microblogů, kterou pro vás poskytuje [%%site."
"broughtby%%](%%site.broughtbyurl%%). "
-#: lib/action.php:804
+#: lib/action.php:805
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** je služba mikroblogů."
-#: lib/action.php:806
+#: lib/action.php:808
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4877,56 +4886,60 @@ msgstr ""
"dostupná pod [GNU Affero General Public License](http://www.fsf.org/"
"licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:821
+#: lib/action.php:823
#, fuzzy
msgid "Site content license"
msgstr "Nové sdělení"
-#: lib/action.php:826
+#: lib/action.php:828
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
-#: lib/action.php:831
+#: lib/action.php:833
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
-#: lib/action.php:834
+#: lib/action.php:836
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
-#: lib/action.php:847
+#: lib/action.php:849
msgid "All "
msgstr ""
-#: lib/action.php:853
+#: lib/action.php:855
msgid "license."
msgstr ""
-#: lib/action.php:1152
+#: lib/action.php:1154
msgid "Pagination"
msgstr ""
-#: lib/action.php:1161
+#: lib/action.php:1163
#, fuzzy
msgid "After"
msgstr "« Novější"
-#: lib/action.php:1169
+#: lib/action.php:1171
#, fuzzy
msgid "Before"
msgstr "Starší »"
-#: lib/activity.php:453
+#: lib/activity.php:120
+msgid "Expecting a root feed element but got a whole XML document."
+msgstr ""
+
+#: lib/activityutils.php:208
msgid "Can't handle remote content yet."
msgstr ""
-#: lib/activity.php:481
+#: lib/activityutils.php:236
msgid "Can't handle embedded XML content yet."
msgstr ""
-#: lib/activity.php:485
+#: lib/activityutils.php:240
msgid "Can't handle embedded Base64 content yet."
msgstr ""
@@ -5026,7 +5039,7 @@ msgstr "Potvrzení emailové adresy"
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
-#: lib/apiauth.php:272
+#: lib/apiauth.php:276
#, php-format
msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s"
msgstr ""
@@ -5105,11 +5118,11 @@ msgstr "Odstranit"
msgid "Attachments"
msgstr ""
-#: lib/attachmentlist.php:265
+#: lib/attachmentlist.php:263
msgid "Author"
msgstr ""
-#: lib/attachmentlist.php:278
+#: lib/attachmentlist.php:276
msgid "Provider"
msgstr "Poskytovatel"
@@ -5131,37 +5144,52 @@ msgstr "Heslo uloženo"
msgid "Password changing is not allowed"
msgstr "Heslo uloženo"
-#: lib/channel.php:138 lib/channel.php:158
+#: lib/channel.php:157 lib/channel.php:177
msgid "Command results"
msgstr ""
-#: lib/channel.php:210 lib/mailhandler.php:142
+#: lib/channel.php:229 lib/mailhandler.php:142
msgid "Command complete"
msgstr ""
-#: lib/channel.php:221
+#: lib/channel.php:240
msgid "Command failed"
msgstr ""
-#: lib/command.php:44
-msgid "Sorry, this command is not yet implemented."
-msgstr ""
+#: lib/command.php:83 lib/command.php:105
+#, fuzzy
+msgid "Notice with that id does not exist"
+msgstr "Vzdálený profil s nesouhlasícím profilem"
-#: lib/command.php:88
+#: lib/command.php:99 lib/command.php:570
+#, fuzzy
+msgid "User has no last notice"
+msgstr "Uživatel nemá profil."
+
+#: lib/command.php:125
#, php-format
msgid "Could not find a user with nickname %s"
msgstr "Nelze aktualizovat uživatele"
-#: lib/command.php:92
+#: lib/command.php:143
+#, fuzzy, php-format
+msgid "Could not find a local user with nickname %s"
+msgstr "Nelze aktualizovat uživatele"
+
+#: lib/command.php:176
+msgid "Sorry, this command is not yet implemented."
+msgstr ""
+
+#: lib/command.php:221
msgid "It does not make a lot of sense to nudge yourself!"
msgstr ""
-#: lib/command.php:99
+#: lib/command.php:228
#, fuzzy, php-format
msgid "Nudge sent to %s"
msgstr "Odpovědi na %s"
-#: lib/command.php:126
+#: lib/command.php:254
#, php-format
msgid ""
"Subscriptions: %1$s\n"
@@ -5169,209 +5197,205 @@ msgid ""
"Notices: %3$s"
msgstr ""
-#: lib/command.php:152 lib/command.php:390 lib/command.php:451
-#, fuzzy
-msgid "Notice with that id does not exist"
-msgstr "Vzdálený profil s nesouhlasícím profilem"
-
-#: lib/command.php:168 lib/command.php:406 lib/command.php:467
-#: lib/command.php:523
-#, fuzzy
-msgid "User has no last notice"
-msgstr "Uživatel nemá profil."
-
-#: lib/command.php:190
+#: lib/command.php:296
msgid "Notice marked as fave."
msgstr ""
-#: lib/command.php:217
+#: lib/command.php:317
#, fuzzy
msgid "You are already a member of that group"
msgstr "Již jste přihlášen"
-#: lib/command.php:231
+#: lib/command.php:331
#, fuzzy, php-format
msgid "Could not join user %s to group %s"
msgstr "Nelze přesměrovat na server: %s"
-#: lib/command.php:236
+#: lib/command.php:336
#, fuzzy, php-format
msgid "%s joined group %s"
msgstr "%1 statusů na %2"
-#: lib/command.php:275
+#: lib/command.php:373
#, fuzzy, php-format
msgid "Could not remove user %s to group %s"
msgstr "Nelze vytvořit OpenID z: %s"
-#: lib/command.php:280
+#: lib/command.php:378
#, fuzzy, php-format
msgid "%s left group %s"
msgstr "%1 statusů na %2"
-#: lib/command.php:309
+#: lib/command.php:401
#, fuzzy, php-format
msgid "Fullname: %s"
msgstr "Celé jméno"
-#: lib/command.php:312 lib/mail.php:258
+#: lib/command.php:404 lib/mail.php:258
#, php-format
msgid "Location: %s"
msgstr ""
-#: lib/command.php:315 lib/mail.php:260
+#: lib/command.php:407 lib/mail.php:260
#, php-format
msgid "Homepage: %s"
msgstr ""
-#: lib/command.php:318
+#: lib/command.php:410
#, php-format
msgid "About: %s"
msgstr ""
-#: lib/command.php:349
+#: lib/command.php:437
+#, php-format
+msgid ""
+"%s is a remote profile; you can only send direct messages to users on the "
+"same server."
+msgstr ""
+
+#: lib/command.php:450
#, php-format
msgid "Message too long - maximum is %d characters, you sent %d"
msgstr ""
-#: lib/command.php:367
+#: lib/command.php:468
#, php-format
msgid "Direct message to %s sent"
msgstr ""
-#: lib/command.php:369
+#: lib/command.php:470
msgid "Error sending direct message."
msgstr ""
-#: lib/command.php:413
+#: lib/command.php:490
#, fuzzy
msgid "Cannot repeat your own notice"
msgstr "Nemůžete se registrovat, pokud nesouhlasíte s licencí."
-#: lib/command.php:418
+#: lib/command.php:495
#, fuzzy
msgid "Already repeated that notice"
msgstr "Odstranit toto oznámení"
-#: lib/command.php:426
+#: lib/command.php:503
#, fuzzy, php-format
msgid "Notice from %s repeated"
msgstr "Sdělení"
-#: lib/command.php:428
+#: lib/command.php:505
#, fuzzy
msgid "Error repeating notice."
msgstr "Problém při ukládání sdělení"
-#: lib/command.php:482
+#: lib/command.php:536
#, php-format
msgid "Notice too long - maximum is %d characters, you sent %d"
msgstr ""
-#: lib/command.php:491
+#: lib/command.php:545
#, fuzzy, php-format
msgid "Reply to %s sent"
msgstr "Odpovědi na %s"
-#: lib/command.php:493
+#: lib/command.php:547
#, fuzzy
msgid "Error saving notice."
msgstr "Problém při ukládání sdělení"
-#: lib/command.php:547
+#: lib/command.php:594
msgid "Specify the name of the user to subscribe to"
msgstr ""
-#: lib/command.php:554 lib/command.php:589
+#: lib/command.php:602
#, fuzzy
-msgid "No such user"
-msgstr "Žádný takový uživatel."
+msgid "Can't subscribe to OMB profiles by command."
+msgstr "Neodeslal jste nám profil"
-#: lib/command.php:561
+#: lib/command.php:608
#, php-format
msgid "Subscribed to %s"
msgstr ""
-#: lib/command.php:582 lib/command.php:685
+#: lib/command.php:629 lib/command.php:728
msgid "Specify the name of the user to unsubscribe from"
msgstr ""
-#: lib/command.php:595
+#: lib/command.php:638
#, php-format
msgid "Unsubscribed from %s"
msgstr ""
-#: lib/command.php:613 lib/command.php:636
+#: lib/command.php:656 lib/command.php:679
msgid "Command not yet implemented."
msgstr ""
-#: lib/command.php:616
+#: lib/command.php:659
msgid "Notification off."
msgstr ""
-#: lib/command.php:618
+#: lib/command.php:661
msgid "Can't turn off notification."
msgstr ""
-#: lib/command.php:639
+#: lib/command.php:682
msgid "Notification on."
msgstr ""
-#: lib/command.php:641
+#: lib/command.php:684
msgid "Can't turn on notification."
msgstr ""
-#: lib/command.php:654
+#: lib/command.php:697
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:665
+#: lib/command.php:708
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:692
+#: lib/command.php:735
#, fuzzy, php-format
msgid "Unsubscribed %s"
msgstr "Odhlásit"
-#: lib/command.php:709
+#: lib/command.php:752
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "Neodeslal jste nám profil"
-#: lib/command.php:711
+#: lib/command.php:754
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Neodeslal jste nám profil"
msgstr[1] "Neodeslal jste nám profil"
msgstr[2] ""
-#: lib/command.php:731
+#: lib/command.php:774
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Vzdálený odběr"
-#: lib/command.php:733
+#: lib/command.php:776
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Vzdálený odběr"
msgstr[1] "Vzdálený odběr"
msgstr[2] ""
-#: lib/command.php:753
+#: lib/command.php:796
#, fuzzy
msgid "You are not a member of any groups."
msgstr "Neodeslal jste nám profil"
-#: lib/command.php:755
+#: lib/command.php:798
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Neodeslal jste nám profil"
msgstr[1] "Neodeslal jste nám profil"
msgstr[2] ""
-#: lib/command.php:769
+#: lib/command.php:812
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5413,20 +5437,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:148
+#: lib/common.php:135
#, fuzzy
msgid "No configuration file found. "
msgstr "Žádný potvrzující kód."
-#: lib/common.php:149
+#: lib/common.php:136
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:151
+#: lib/common.php:138
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:152
+#: lib/common.php:139
msgid "Go to the installer."
msgstr ""
@@ -5608,50 +5632,50 @@ msgstr ""
msgid "This page is not available in a media type you accept"
msgstr "Tato stránka není k dispozici v typu média která přijímáte."
-#: lib/imagefile.php:75
+#: lib/imagefile.php:72
+msgid "Unsupported image file format."
+msgstr "Nepodporovaný formát obrázku."
+
+#: lib/imagefile.php:88
#, fuzzy, php-format
msgid "That file is too big. The maximum file size is %s."
msgstr "Je to příliš dlouhé. Maximální sdělení délka je 140 znaků"
-#: lib/imagefile.php:80
+#: lib/imagefile.php:93
msgid "Partial upload."
msgstr "Částečné náhrání."
-#: lib/imagefile.php:88 lib/mediafile.php:170
+#: lib/imagefile.php:101 lib/mediafile.php:170
msgid "System error uploading file."
msgstr "Chyba systému při nahrávání souboru"
-#: lib/imagefile.php:96
+#: lib/imagefile.php:109
msgid "Not an image or corrupt file."
msgstr "Není obrázkem, nebo jde o poškozený soubor."
-#: lib/imagefile.php:109
-msgid "Unsupported image file format."
-msgstr "Nepodporovaný formát obrázku."
-
#: lib/imagefile.php:122
#, fuzzy
msgid "Lost our file."
msgstr "Žádné takové oznámení."
-#: lib/imagefile.php:166 lib/imagefile.php:231
+#: lib/imagefile.php:163 lib/imagefile.php:224
msgid "Unknown file type"
msgstr ""
-#: lib/imagefile.php:251
+#: lib/imagefile.php:244
msgid "MB"
msgstr ""
-#: lib/imagefile.php:253
+#: lib/imagefile.php:246
msgid "kB"
msgstr ""
-#: lib/jabber.php:220
+#: lib/jabber.php:387
#, php-format
msgid "[%s]"
msgstr ""
-#: lib/jabber.php:400
+#: lib/jabber.php:567
#, php-format
msgid "Unknown inbox source %d."
msgstr ""
@@ -5855,7 +5879,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:482
+#: lib/mailbox.php:227 lib/noticelist.php:486
#, fuzzy
msgid "from"
msgstr " od "
@@ -5987,51 +6011,51 @@ msgid ""
"try again later"
msgstr ""
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr ""
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "N"
msgstr ""
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "S"
msgstr ""
-#: lib/noticelist.php:431
+#: lib/noticelist.php:432
msgid "E"
msgstr ""
-#: lib/noticelist.php:431
+#: lib/noticelist.php:432
msgid "W"
msgstr ""
-#: lib/noticelist.php:438
+#: lib/noticelist.php:439
msgid "at"
msgstr ""
-#: lib/noticelist.php:566
+#: lib/noticelist.php:570
#, fuzzy
msgid "in context"
msgstr "Žádný obsah!"
-#: lib/noticelist.php:601
+#: lib/noticelist.php:605
#, fuzzy
msgid "Repeated by"
msgstr "Vytvořit"
-#: lib/noticelist.php:628
+#: lib/noticelist.php:632
msgid "Reply to this notice"
msgstr ""
-#: lib/noticelist.php:629
+#: lib/noticelist.php:633
#, fuzzy
msgid "Reply"
msgstr "odpověď"
-#: lib/noticelist.php:673
+#: lib/noticelist.php:677
#, fuzzy
msgid "Notice repeated"
msgstr "Sdělení"
@@ -6106,7 +6130,7 @@ msgstr ""
msgid "Unknown"
msgstr ""
-#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr "Odběry"
@@ -6114,7 +6138,7 @@ msgstr "Odběry"
msgid "All subscriptions"
msgstr "Všechny odběry"
-#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90
+#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr "Odběratelé"
@@ -6122,15 +6146,20 @@ msgstr "Odběratelé"
msgid "All subscribers"
msgstr "Všichni odběratelé"
-#: lib/profileaction.php:180
+#: lib/profileaction.php:186
msgid "User ID"
msgstr ""
-#: lib/profileaction.php:185
+#: lib/profileaction.php:191
msgid "Member since"
msgstr "Členem od"
-#: lib/profileaction.php:247
+#. TRANS: Average count of posts made per day since account registration
+#: lib/profileaction.php:230
+msgid "Daily average"
+msgstr ""
+
+#: lib/profileaction.php:259
msgid "All groups"
msgstr ""
@@ -6179,7 +6208,7 @@ msgstr "Odstranit toto oznámení"
msgid "Revoke the \"%s\" role from this user"
msgstr "Žádný takový uživatel."
-#: lib/router.php:671
+#: lib/router.php:704
msgid "No single user defined for single-user mode."
msgstr ""
@@ -6312,91 +6341,100 @@ msgstr ""
msgid "Unsubscribe"
msgstr "Odhlásit"
-#: lib/userprofile.php:116
+#: lib/usernoprofileexception.php:58
+#, fuzzy, php-format
+msgid "User %s (%d) has no profile record."
+msgstr "Uživatel nemá profil."
+
+#: lib/userprofile.php:117
msgid "Edit Avatar"
msgstr "Upravit avatar"
-#: lib/userprofile.php:236
+#: lib/userprofile.php:234 lib/userprofile.php:248
msgid "User actions"
msgstr "Akce uživatele"
-#: lib/userprofile.php:251
+#: lib/userprofile.php:237
+msgid "User deletion in progress..."
+msgstr ""
+
+#: lib/userprofile.php:263
#, fuzzy
msgid "Edit profile settings"
msgstr "Nastavené Profilu"
-#: lib/userprofile.php:252
+#: lib/userprofile.php:264
msgid "Edit"
msgstr ""
-#: lib/userprofile.php:275
+#: lib/userprofile.php:287
msgid "Send a direct message to this user"
msgstr ""
-#: lib/userprofile.php:276
+#: lib/userprofile.php:288
msgid "Message"
msgstr "Zpráva"
-#: lib/userprofile.php:314
+#: lib/userprofile.php:326
msgid "Moderate"
msgstr ""
-#: lib/userprofile.php:352
+#: lib/userprofile.php:364
#, fuzzy
msgid "User role"
msgstr "Uživatel nemá profil."
-#: lib/userprofile.php:354
+#: lib/userprofile.php:366
msgctxt "role"
msgid "Administrator"
msgstr ""
-#: lib/userprofile.php:355
+#: lib/userprofile.php:367
msgctxt "role"
msgid "Moderator"
msgstr ""
-#: lib/util.php:1015
+#: lib/util.php:1046
msgid "a few seconds ago"
msgstr "před pár sekundami"
-#: lib/util.php:1017
+#: lib/util.php:1048
msgid "about a minute ago"
msgstr "asi před minutou"
-#: lib/util.php:1019
+#: lib/util.php:1050
#, php-format
msgid "about %d minutes ago"
msgstr "asi před %d minutami"
-#: lib/util.php:1021
+#: lib/util.php:1052
msgid "about an hour ago"
msgstr "asi před hodinou"
-#: lib/util.php:1023
+#: lib/util.php:1054
#, php-format
msgid "about %d hours ago"
msgstr "asi před %d hodinami"
-#: lib/util.php:1025
+#: lib/util.php:1056
msgid "about a day ago"
msgstr "asi přede dnem"
-#: lib/util.php:1027
+#: lib/util.php:1058
#, php-format
msgid "about %d days ago"
msgstr "před %d dny"
-#: lib/util.php:1029
+#: lib/util.php:1060
msgid "about a month ago"
msgstr "asi před měsícem"
-#: lib/util.php:1031
+#: lib/util.php:1062
#, php-format
msgid "about %d months ago"
msgstr "asi před %d mesíci"
-#: lib/util.php:1033
+#: lib/util.php:1064
msgid "about a year ago"
msgstr "asi před rokem"
@@ -6410,7 +6448,7 @@ msgstr "Stránka není platnou URL."
msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr ""
-#: lib/xmppmanager.php:402
+#: lib/xmppmanager.php:403
#, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d."
msgstr ""
diff --git a/locale/de/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po
index 4bad95b9e..1940a22b1 100644
--- a/locale/de/LC_MESSAGES/statusnet.po
+++ b/locale/de/LC_MESSAGES/statusnet.po
@@ -15,12 +15,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-06 23:49+0000\n"
-"PO-Revision-Date: 2010-03-08 21:10:39+0000\n"
+"POT-Creation-Date: 2010-04-05 18:54+0000\n"
+"PO-Revision-Date: 2010-04-05 18:54:52+0000\n"
"Language-Team: German\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r63415); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64621); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: de\n"
"X-Message-Group: out-statusnet\n"
@@ -98,9 +98,9 @@ msgstr "Seite nicht vorhanden"
#: 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:90
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78
+#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
@@ -109,10 +109,8 @@ msgstr "Seite nicht vorhanden"
#: actions/remotesubscribe.php:154 actions/replies.php:73
#: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:163 lib/command.php:302
-#: lib/command.php:355 lib/command.php:401 lib/command.php:462
-#: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82
-#: lib/profileaction.php:77
+#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: lib/mailbox.php:82 lib/profileaction.php:77
msgid "No such user."
msgstr "Unbekannter Benutzer."
@@ -209,18 +207,18 @@ msgstr "Aktualisierungen von %1$s und Freunden auf %2$s!"
#: 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:132
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:136
#: actions/apigrouplistall.php:120 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:135
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
-#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184
-#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148
+#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:174
+#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173
+#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
-#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
+#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
msgid "API method not found."
msgstr "API-Methode nicht gefunden."
@@ -233,8 +231,8 @@ msgstr "API-Methode nicht gefunden."
#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65
-#: actions/apistatusesupdate.php:118
+#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
msgid "This method requires a POST."
msgstr "Diese Methode benötigt ein POST."
@@ -263,7 +261,7 @@ msgid "Could not save profile."
msgstr "Konnte Profil nicht speichern."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:97
+#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
#: actions/designadminpanel.php:122 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
@@ -352,7 +350,7 @@ msgstr "Keine Nachricht mit dieser ID gefunden."
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:176
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
msgid "Could not create favorite."
msgstr "Konnte keinen Favoriten erstellen."
@@ -472,7 +470,7 @@ msgstr "Gruppe nicht gefunden!"
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:221
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
msgid "You have been blocked from that group by the admin."
msgstr "Der Admin dieser Gruppe hat dich gesperrt."
@@ -490,11 +488,18 @@ msgstr "Du bist kein Mitglied dieser Gruppe."
msgid "Could not remove user %1$s from group %2$s."
msgstr "Konnte Benutzer %1$s nicht aus der Gruppe %2$s entfernen."
-#: actions/apigrouplist.php:95
+#. TRANS: %s is a user name
+#: actions/apigrouplist.php:97
#, php-format
msgid "%s's groups"
msgstr "%s’s Gruppen"
+#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s
+#: actions/apigrouplist.php:107
+#, fuzzy, php-format
+msgid "%1$s groups %2$s is a member of."
+msgstr "Gruppen in denen %s Mitglied ist"
+
#: actions/apigrouplistall.php:90 actions/usergroups.php:62
#, php-format
msgid "%s groups"
@@ -510,9 +515,8 @@ msgid "No oauth_token parameter provided."
msgstr "Kein oauth_token Parameter angegeben."
#: actions/apioauthauthorize.php:106
-#, fuzzy
msgid "Invalid token."
-msgstr "Ungültige Größe."
+msgstr "Ungültiges Token."
#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
#: actions/deletenotice.php:157 actions/disfavor.php:74
@@ -523,7 +527,7 @@ msgstr "Ungültige Größe."
#: 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:337
+#: actions/profilesettings.php:194 actions/recoverpassword.php:350
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
@@ -537,9 +541,8 @@ msgid "Invalid nickname / password!"
msgstr "Benutzername oder Passwort falsch."
#: actions/apioauthauthorize.php:159
-#, fuzzy
msgid "Database error deleting OAuth application user."
-msgstr "Fehler bei den Nutzereinstellungen."
+msgstr "Datenbank Fehler beim Löschen des OAuth Anwendungs Nutzers."
#: actions/apioauthauthorize.php:185
msgid "Database error inserting OAuth application user."
@@ -583,16 +586,19 @@ 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 ""
+"Das Programm <strong>%1$s</strong> von <strong>%2$s</strong> würde gerne "
+"<strong>%3$s</strong> bei deinem %4$s Zugang. Du solltest nur "
+"vertrauenswürdigen Quellen Erlaubnis zu deinem %4$s Zugang geben."
-#: actions/apioauthauthorize.php:310 lib/action.php:438
+#: actions/apioauthauthorize.php:310 lib/action.php:437
msgid "Account"
-msgstr "Konto"
+msgstr "Profil"
#: actions/apioauthauthorize.php:313 actions/login.php:230
#: actions/profilesettings.php:106 actions/register.php:424
-#: actions/showgroup.php:244 actions/tagother.php:94
+#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
-#: lib/userprofile.php:131
+#: lib/userprofile.php:132
msgid "Nickname"
msgstr "Nutzername"
@@ -664,12 +670,12 @@ msgstr ""
msgid "Unsupported format."
msgstr "Bildformat wird nicht unterstützt."
-#: actions/apitimelinefavorites.php:108
+#: actions/apitimelinefavorites.php:109
#, php-format
msgid "%1$s / Favorites from %2$s"
msgstr "%1$s / Favoriten von %2$s"
-#: actions/apitimelinefavorites.php:117
+#: actions/apitimelinefavorites.php:118
#, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "%1$s Aktualisierung in den Favoriten von %2$s / %2$s."
@@ -679,7 +685,7 @@ msgstr "%1$s Aktualisierung in den Favoriten von %2$s / %2$s."
msgid "%1$s / Updates mentioning %2$s"
msgstr "%1$s / Aktualisierungen erwähnen %2$s"
-#: actions/apitimelinementions.php:127
+#: actions/apitimelinementions.php:130
#, 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."
@@ -689,7 +695,7 @@ msgstr "Nachrichten von %1$, die auf Nachrichten von %2$ / %3$ antworten."
msgid "%s public timeline"
msgstr "%s öffentliche Zeitleiste"
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "%s Nachrichten von allen!"
@@ -704,12 +710,12 @@ msgstr "Antworten an %s"
msgid "Repeats of %s"
msgstr "Antworten von %s"
-#: actions/apitimelinetag.php:102 actions/tag.php:67
+#: actions/apitimelinetag.php:104 actions/tag.php:67
#, php-format
msgid "Notices tagged with %s"
msgstr "Nachrichten, die mit %s getagt sind"
-#: actions/apitimelinetag.php:104 actions/tagrss.php:65
+#: actions/apitimelinetag.php:106 actions/tagrss.php:65
#, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Aktualisierungen mit %1$s getagt auf %2$s!"
@@ -737,7 +743,7 @@ msgstr "Keine Größe."
msgid "Invalid size."
msgstr "Ungültige Größe."
-#: actions/avatarsettings.php:67 actions/showgroup.php:229
+#: actions/avatarsettings.php:67 actions/showgroup.php:230
#: lib/accountsettingsaction.php:112
msgid "Avatar"
msgstr "Avatar"
@@ -770,7 +776,7 @@ msgid "Preview"
msgstr "Vorschau"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:655
+#: lib/deleteuserform.php:66 lib/noticelist.php:659
msgid "Delete"
msgstr "Löschen"
@@ -782,24 +788,28 @@ msgstr "Hochladen"
msgid "Crop"
msgstr "Zuschneiden"
-#: actions/avatarsettings.php:328
+#: actions/avatarsettings.php:305
+msgid "No file uploaded."
+msgstr "Keine Datei hoch geladen."
+
+#: actions/avatarsettings.php:332
msgid "Pick a square area of the image to be your avatar"
msgstr ""
"Wähle eine quadratische Fläche aus dem Bild, um dein Avatar zu speichern"
-#: actions/avatarsettings.php:343 actions/grouplogo.php:380
+#: actions/avatarsettings.php:347 actions/grouplogo.php:380
msgid "Lost our file data."
msgstr "Daten verloren."
-#: actions/avatarsettings.php:366
+#: actions/avatarsettings.php:370
msgid "Avatar updated."
msgstr "Avatar aktualisiert."
-#: actions/avatarsettings.php:369
+#: actions/avatarsettings.php:373
msgid "Failed updating avatar."
msgstr "Aktualisierung des Avatars fehlgeschlagen."
-#: actions/avatarsettings.php:393
+#: actions/avatarsettings.php:397
msgid "Avatar deleted."
msgstr "Avatar gelöscht."
@@ -854,8 +864,8 @@ msgstr "Konnte Blockierungsdaten nicht speichern."
#: actions/groupunblock.php:86 actions/joingroup.php:82
#: actions/joingroup.php:93 actions/leavegroup.php:82
#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212
-#: lib/command.php:260
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162
+#: lib/command.php:358
msgid "No such group."
msgstr "Keine derartige Gruppe."
@@ -937,7 +947,7 @@ msgid "Conversation"
msgstr "Unterhaltung"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:218 lib/searchgroupnav.php:82
+#: lib/profileaction.php:224 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "Nachrichten"
@@ -956,7 +966,7 @@ msgstr "Du bist Besitzer dieses Programms"
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1217
+#: lib/action.php:1219
msgid "There was a problem with your session token."
msgstr "Es gab ein Problem mit deinem Sessiontoken."
@@ -1016,7 +1026,7 @@ msgstr "Bist du sicher, dass du diese Nachricht löschen möchtest?"
msgid "Do not delete this notice"
msgstr "Diese Nachricht nicht löschen"
-#: actions/deletenotice.php:146 lib/noticelist.php:655
+#: actions/deletenotice.php:146 lib/noticelist.php:659
msgid "Delete this notice"
msgstr "Nachricht löschen"
@@ -1153,7 +1163,7 @@ msgstr "Standard wiederherstellen"
#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:208
+#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
#: actions/tagother.php:154 actions/useradminpanel.php:294
#: lib/applicationeditform.php:333 lib/applicationeditform.php:334
#: lib/designsettings.php:256 lib/groupeditform.php:202
@@ -1270,7 +1280,7 @@ msgstr "Die Beschreibung ist zu lang (max. %d Zeichen)."
msgid "Could not update group."
msgstr "Konnte Gruppe nicht aktualisieren."
-#: actions/editgroup.php:264 classes/User_group.php:493
+#: actions/editgroup.php:264 classes/User_group.php:496
msgid "Could not create aliases."
msgstr "Konnte keinen Favoriten erstellen."
@@ -1598,9 +1608,8 @@ msgid "This role is reserved and cannot be set."
msgstr "Diese Aufgabe ist reserviert und kann nicht gesetzt werden"
#: actions/grantrole.php:75
-#, fuzzy
msgid "You cannot grant user roles on this site."
-msgstr "Du kannst diesem Benutzer keine Nachricht schicken."
+msgstr "Auf dieser Seite können keine Benutzerrollen gewährt werden."
#: actions/grantrole.php:82
msgid "User already has this role."
@@ -1765,7 +1774,7 @@ msgstr "%s Zeitleiste"
msgid "Updates from members of %1$s on %2$s!"
msgstr "Aktualisierungen von %1$s auf %2$s!"
-#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232
+#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244
#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr "Gruppen"
@@ -1981,7 +1990,7 @@ msgstr "Lade neue Leute ein"
msgid "You are already subscribed to these users:"
msgstr "Du hast diese Benutzer bereits abonniert:"
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
#, php-format
msgid "%1$s (%2$s)"
msgstr "%1$s (%2$s)"
@@ -2115,7 +2124,7 @@ msgstr "%1$s ist der Gruppe %2$s beigetreten"
msgid "You must be logged in to leave a group."
msgstr "Du musst angemeldet sein, um aus einer Gruppe auszutreten."
-#: actions/leavegroup.php:100 lib/command.php:265
+#: actions/leavegroup.php:100 lib/command.php:363
msgid "You are not a member of that group."
msgstr "Du bist kein Mitglied dieser Gruppe."
@@ -2184,9 +2193,9 @@ msgid "%1$s is already an admin for group \"%2$s\"."
msgstr "%1$s ist bereits Administrator der Gruppe \"%2$s\"."
#: actions/makeadmin.php:133
-#, fuzzy, php-format
+#, php-format
msgid "Can't get membership record for %1$s in group %2$s."
-msgstr "Konnte Benutzer %s aus der Gruppe %s nicht entfernen"
+msgstr "Konnte keinen Mitgliedseintrag für %1$s aus Gruppe %2$s empfangen."
#: actions/makeadmin.php:146
#, php-format
@@ -2229,12 +2238,12 @@ msgstr "Benutzer dieses Formular, um eine neue Gruppe zu erstellen."
msgid "New message"
msgstr "Neue Nachricht"
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
msgid "You can't send a message to this user."
msgstr "Du kannst diesem Benutzer keine Nachricht schicken."
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342
-#: lib/command.php:475
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
+#: lib/command.php:529
msgid "No content!"
msgstr "Kein Inhalt!"
@@ -2242,7 +2251,7 @@ msgstr "Kein Inhalt!"
msgid "No recipient specified."
msgstr "Kein Empfänger angegeben."
-#: actions/newmessage.php:164 lib/command.php:361
+#: actions/newmessage.php:164 lib/command.php:462
msgid ""
"Don't send a message to yourself; just say it to yourself quietly instead."
msgstr ""
@@ -2257,7 +2266,7 @@ msgstr "Nachricht gesendet"
msgid "Direct message to %s sent."
msgstr "Direkte Nachricht an %s abgeschickt"
-#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189
msgid "Ajax Error"
msgstr "Ajax-Fehler"
@@ -2265,7 +2274,7 @@ msgstr "Ajax-Fehler"
msgid "New notice"
msgstr "Neue Nachricht"
-#: actions/newnotice.php:211
+#: actions/newnotice.php:217
msgid "Notice posted"
msgstr "Nachricht hinzugefügt"
@@ -2382,7 +2391,7 @@ msgstr ""
msgid "Notice has no profile"
msgstr "Nachricht hat kein Profil"
-#: actions/oembed.php:86 actions/shownotice.php:180
+#: actions/oembed.php:86 actions/shownotice.php:175
#, php-format
msgid "%1$s's status on %2$s"
msgstr "%1$s Status auf %2$s"
@@ -2395,8 +2404,8 @@ msgstr "Content-Typ "
msgid "Only "
msgstr "Nur "
-#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042
-#: lib/apiaction.php:1070 lib/apiaction.php:1179
+#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1068
+#: lib/apiaction.php:1096 lib/apiaction.php:1212
msgid "Not a supported data format."
msgstr "Kein unterstütztes Datenformat."
@@ -2449,14 +2458,12 @@ msgid "No login token specified."
msgstr "Kein Zugangstoken angegeben."
#: actions/otp.php:90
-#, fuzzy
msgid "No login token requested."
-msgstr "Keine Profil-ID in der Anfrage."
+msgstr "Kein Login-Token angefordert."
#: actions/otp.php:95
-#, fuzzy
msgid "Invalid login token specified."
-msgstr "Token ungültig oder abgelaufen."
+msgstr "Login-Token ungültig oder abgelaufen."
#: actions/otp.php:104
msgid "Login token expired."
@@ -2530,7 +2537,7 @@ msgstr "Altes Passwort falsch"
msgid "Error saving user; invalid."
msgstr "Fehler beim Speichern des Nutzers, ungültig."
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
msgid "Can't save new password."
msgstr "Konnte neues Passwort nicht speichern"
@@ -2746,8 +2753,8 @@ 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/showgroup.php:255 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:149
+#: actions/showgroup.php:256 actions/tagother.php:104
+#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Vollständiger Name"
@@ -2775,9 +2782,9 @@ msgid "Bio"
msgstr "Biografie"
#: actions/profilesettings.php:132 actions/register.php:471
-#: actions/showgroup.php:264 actions/tagother.php:112
+#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
-#: lib/userprofile.php:164
+#: lib/userprofile.php:165
msgid "Location"
msgstr "Aufenthaltsort"
@@ -2791,7 +2798,7 @@ msgstr "Teile meine aktuelle Position wenn ich Nachrichten sende"
#: actions/profilesettings.php:145 actions/tagother.php:149
#: actions/tagother.php:209 lib/subscriptionlist.php:106
-#: lib/subscriptionlist.php:108 lib/userprofile.php:209
+#: lib/subscriptionlist.php:108 lib/userprofile.php:210
msgid "Tags"
msgstr "Stichwörter"
@@ -3037,7 +3044,7 @@ msgstr "Passwort zurücksetzen"
msgid "Recover password"
msgstr "Stelle Passwort wieder her"
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
msgid "Password recovery requested"
msgstr "Wiederherstellung des Passworts angefordert"
@@ -3057,19 +3064,19 @@ msgstr "Zurücksetzen"
msgid "Enter a nickname or email address."
msgstr "Gib einen Spitznamen oder eine E-Mail-Adresse ein."
-#: actions/recoverpassword.php:272
+#: actions/recoverpassword.php:282
msgid "No user with that email address or username."
msgstr "Kein Benutzer mit dieser E-Mail-Adresse oder mit diesem Nutzernamen."
-#: actions/recoverpassword.php:287
+#: actions/recoverpassword.php:299
msgid "No registered email address for that user."
msgstr "Der Nutzer hat keine registrierte E-Mail-Adresse."
-#: actions/recoverpassword.php:301
+#: actions/recoverpassword.php:313
msgid "Error saving address confirmation."
msgstr "Fehler beim Speichern der Adressbestätigung."
-#: actions/recoverpassword.php:325
+#: actions/recoverpassword.php:338
msgid ""
"Instructions for recovering your password have been sent to the email "
"address registered to your account."
@@ -3077,23 +3084,23 @@ msgstr ""
"Anweisungen für die Wiederherstellung deines Passworts wurden an deine "
"hinterlegte E-Mail-Adresse geschickt."
-#: actions/recoverpassword.php:344
+#: actions/recoverpassword.php:357
msgid "Unexpected password reset."
msgstr "Unerwarteter Passwortreset."
-#: actions/recoverpassword.php:352
+#: actions/recoverpassword.php:365
msgid "Password must be 6 chars or more."
msgstr "Passwort muss mehr als 6 Zeichen enthalten"
-#: actions/recoverpassword.php:356
+#: actions/recoverpassword.php:369
msgid "Password and confirmation do not match."
msgstr "Passwort und seine Bestätigung stimmen nicht überein."
-#: actions/recoverpassword.php:375 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:248
msgid "Error setting user."
msgstr "Fehler bei den Nutzereinstellungen."
-#: actions/recoverpassword.php:382
+#: actions/recoverpassword.php:395
msgid "New password successfully saved. You are now logged in."
msgstr "Neues Passwort erfolgreich gespeichert. Du bist jetzt angemeldet."
@@ -3261,7 +3268,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "Profil-URL bei einem anderen kompatiblen Microbloggingdienst"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:394
+#: lib/userprofile.php:406
msgid "Subscribe"
msgstr "Abonnieren"
@@ -3298,7 +3305,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:674
+#: actions/repeat.php:114 lib/noticelist.php:678
msgid "Repeated"
msgstr "Wiederholt"
@@ -3347,6 +3354,8 @@ msgid ""
"You can engage other users in a conversation, subscribe to more people or "
"[join groups](%%action.groups%%)."
msgstr ""
+"Du kannst andere Nutzer ansprechen, mehr Leuten folgen oder [Gruppen "
+"beitreten](%%action.groups%%)."
#: actions/replies.php:206
#, php-format
@@ -3376,9 +3385,8 @@ msgid "StatusNet"
msgstr "StatusNet"
#: actions/sandbox.php:65 actions/unsandbox.php:65
-#, fuzzy
msgid "You cannot sandbox users on this site."
-msgstr "Du kannst diesem Benutzer keine Nachricht schicken."
+msgstr "Du kannst Benutzer auf dieser Seite nicht auf den Spielplaz schicken."
#: actions/sandbox.php:72
msgid "User is already sandboxed."
@@ -3420,9 +3428,8 @@ msgid "You must be logged in to view an application."
msgstr "Du musst angemeldet sein, um aus dieses Programm zu betrachten."
#: actions/showapplication.php:157
-#, fuzzy
msgid "Application profile"
-msgstr "Nachricht hat kein Profil"
+msgstr "Anwendungsprofil"
#: actions/showapplication.php:159 lib/applicationeditform.php:180
msgid "Icon"
@@ -3442,8 +3449,8 @@ msgstr "Organisation"
msgid "Description"
msgstr "Beschreibung"
-#: actions/showapplication.php:192 actions/showgroup.php:438
-#: lib/profileaction.php:176
+#: actions/showapplication.php:192 actions/showgroup.php:439
+#: lib/profileaction.php:182
msgid "Statistics"
msgstr "Statistiken"
@@ -3525,6 +3532,9 @@ msgid ""
"You haven't chosen any favorite notices yet. Click the fave button on "
"notices you like to bookmark them for later or shed a spotlight on them."
msgstr ""
+"Du hast noch keine Lieblingsnachrichten gewählt. Klicke den Favorisieren-"
+"Button bei einer Nachricht, die dir gefällt um die Aufmerksamkeit auf sie zu "
+"richten und sie in deine Lesezeichen aufzunehmen."
#: actions/showfavorites.php:208
#, php-format
@@ -3540,6 +3550,9 @@ msgid ""
"account](%%%%action.register%%%%) and then post something interesting they "
"would add to their favorites :)"
msgstr ""
+"%s hat noch keine Nachrichten zu seinen Favoriten hinzugefügt. Warum meldest "
+"du dich nicht an ( [anmelden](%%%%action.register%%%%) ) und schreibst "
+"etwas, was %s hinzufügen kann!"
#: actions/showfavorites.php:243
msgid "This is a way to share what you like."
@@ -3555,67 +3568,67 @@ msgstr "%s Gruppe"
msgid "%1$s group, page %2$d"
msgstr "%1$s Gruppe, Seite %d"
-#: actions/showgroup.php:226
+#: actions/showgroup.php:227
msgid "Group profile"
msgstr "Gruppenprofil"
-#: actions/showgroup.php:271 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:177
+#: actions/showgroup.php:272 actions/tagother.php:118
+#: actions/userauthorization.php:175 lib/userprofile.php:178
msgid "URL"
msgstr "URL"
-#: actions/showgroup.php:282 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:194
+#: actions/showgroup.php:283 actions/tagother.php:128
+#: actions/userauthorization.php:187 lib/userprofile.php:195
msgid "Note"
msgstr "Nachricht"
-#: actions/showgroup.php:292 lib/groupeditform.php:184
+#: actions/showgroup.php:293 lib/groupeditform.php:184
msgid "Aliases"
msgstr "Pseudonyme"
-#: actions/showgroup.php:301
+#: actions/showgroup.php:302
msgid "Group actions"
msgstr "Gruppenaktionen"
-#: actions/showgroup.php:337
+#: actions/showgroup.php:338
#, php-format
msgid "Notice feed for %s group (RSS 1.0)"
msgstr "Nachrichtenfeed der Gruppe %s (RSS 1.0)"
-#: actions/showgroup.php:343
+#: actions/showgroup.php:344
#, php-format
msgid "Notice feed for %s group (RSS 2.0)"
msgstr "Nachrichtenfeed der Gruppe %s (RSS 2.0)"
-#: actions/showgroup.php:349
+#: actions/showgroup.php:350
#, php-format
msgid "Notice feed for %s group (Atom)"
msgstr "Nachrichtenfeed der Gruppe %s (Atom)"
-#: actions/showgroup.php:354
+#: actions/showgroup.php:355
#, php-format
msgid "FOAF for %s group"
msgstr "Postausgang von %s"
-#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91
+#: actions/showgroup.php:391 actions/showgroup.php:448 lib/groupnav.php:91
msgid "Members"
msgstr "Mitglieder"
-#: actions/showgroup.php:395 lib/profileaction.php:117
-#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95
-#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71
+#: actions/showgroup.php:396 lib/profileaction.php:117
+#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95
+#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
msgid "(None)"
msgstr "(Kein)"
-#: actions/showgroup.php:401
+#: actions/showgroup.php:402
msgid "All members"
msgstr "Alle Mitglieder"
-#: actions/showgroup.php:441
+#: actions/showgroup.php:442
msgid "Created"
msgstr "Erstellt"
-#: actions/showgroup.php:457
+#: actions/showgroup.php:458
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3624,8 +3637,13 @@ msgid ""
"their life and interests. [Join now](%%%%action.register%%%%) to become part "
"of this group and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
+"**%s** ist eine Gruppe auf %%%%site.name%%%%, einem [micro-blogging](http://"
+"en.wikipedia.org/wiki/Micro-blogging) Dienst auf Basis der freien Software "
+"[StatusNet](http://status.net/). [Werde Mitglied](%%%%action.register%%%%) "
+"und werde Teil der Gruppe und vielen anderen! ([Mehr Informationen](%%%%doc."
+"help%%%%))"
-#: actions/showgroup.php:463
+#: actions/showgroup.php:464
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3638,7 +3656,7 @@ msgstr ""
"Freien Software [StatusNet](http://status.net/). Seine Mitglieder erstellen "
"kurze Nachrichten über Ihr Leben und Interessen. "
-#: actions/showgroup.php:491
+#: actions/showgroup.php:492
msgid "Admins"
msgstr "Administratoren"
@@ -3731,6 +3749,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** ist Mitglied bei %%%%site.name%%%%, einem [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) Dienst auf Basis der freien Software "
+"[StatusNet](http://status.net/). [Werde Mitglied](%%%%action.register%%%%) "
+"um **%s**'s und vielen anderen zu folgen! ([Mehr Informationen](%%%%doc.help%"
+"%%%))"
#: actions/showstream.php:248
#, php-format
@@ -3774,8 +3797,8 @@ msgid "Unknown language \"%s\"."
msgstr "Unbekannte Sprache „%s“"
#: actions/siteadminpanel.php:165
-msgid "Minimum text limit is 140 characters."
-msgstr "Minimale Textlänge ist 140 Zeichen."
+msgid "Minimum text limit is 0 (unlimited)."
+msgstr "Minimale Textlänge ist 0 Zeichen (unbegrenzt)"
#: actions/siteadminpanel.php:171
msgid "Dupe limit must 1 or more seconds."
@@ -3816,9 +3839,8 @@ msgid "Contact email address for your site"
msgstr "Kontakt-E-Mail-Adresse für Deine Site."
#: actions/siteadminpanel.php:245
-#, fuzzy
msgid "Local"
-msgstr "Lokale Ansichten"
+msgstr "Lokal"
#: actions/siteadminpanel.php:256
msgid "Default timezone"
@@ -3835,6 +3857,8 @@ msgstr "Bevorzugte Sprache"
#: actions/siteadminpanel.php:263
msgid "Site language when autodetection from browser settings is not available"
msgstr ""
+"Sprache der Seite für den Fall, dass die automatische Erkennung anhand der "
+"Browser-Einstellungen nicht verfügbar ist."
#: actions/siteadminpanel.php:271
msgid "Limits"
@@ -3990,12 +4014,11 @@ msgstr "Kein Code eingegeben"
#: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
#: lib/adminpanelaction.php:406
msgid "Snapshots"
-msgstr ""
+msgstr "Snapshots"
#: actions/snapshotadminpanel.php:65
-#, fuzzy
msgid "Manage snapshot configuration"
-msgstr "Hauptnavigation"
+msgstr "Verwalten Snapshot-Konfiguration"
#: actions/snapshotadminpanel.php:127
msgid "Invalid snapshot run value."
@@ -4042,16 +4065,14 @@ msgid "Snapshots will be sent to this URL"
msgstr ""
#: actions/snapshotadminpanel.php:248
-#, fuzzy
msgid "Save snapshot settings"
-msgstr "Site-Einstellungen speichern"
+msgstr "Snapshot-Einstellungen speichern"
#: actions/subedit.php:70
msgid "You are not subscribed to that profile."
msgstr "Du hast dieses Profil nicht abonniert."
-#: actions/subedit.php:83 classes/Subscription.php:89
-#: classes/Subscription.php:116
+#: actions/subedit.php:83 classes/Subscription.php:132
msgid "Could not save subscription."
msgstr "Konnte Abonnement nicht erstellen."
@@ -4140,17 +4161,22 @@ msgid ""
"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
"automatically subscribe to people you already follow there."
msgstr ""
+"Du hast momentan noch niemanden abonniert. Benutze die [Personensuche](%%"
+"action.peoplesearch%%) um nach Freunden zu suchen oder besuche die [Beliebte "
+"Benutzer](%%action.featured%%) Seite. Wenn du ein [Twitter Benutzer](%%"
+"action.twittersettings%%) bist kannst du auch automatisch deine Twitter "
+"Freunde abonnieren."
#: actions/subscriptions.php:128 actions/subscriptions.php:132
#, php-format
msgid "%s is not listening to anyone."
msgstr "%s hat niemanden abonniert."
-#: actions/subscriptions.php:199
+#: actions/subscriptions.php:208
msgid "Jabber"
msgstr "Jabber"
-#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:222 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr "SMS"
@@ -4183,12 +4209,12 @@ msgstr "Kein ID Argument."
msgid "Tag %s"
msgstr "Tag %s"
-#: actions/tagother.php:77 lib/userprofile.php:75
+#: actions/tagother.php:77 lib/userprofile.php:76
msgid "User profile"
msgstr "Benutzerprofil"
#: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:102
+#: lib/userprofile.php:103
msgid "Photo"
msgstr "Foto"
@@ -4415,7 +4441,7 @@ msgstr "Profiladresse '%s' ist für einen lokalen Benutzer."
#: actions/userauthorization.php:345
#, php-format
msgid "Avatar URL ‘%s’ is not valid."
-msgstr ""
+msgstr "Avatar Adresse '%s' ist nicht gültig."
#: actions/userauthorization.php:350
#, php-format
@@ -4506,6 +4532,10 @@ msgid ""
"FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License "
"for more details. "
msgstr ""
+"Dieses Programm wird in der Hoffnung vertrieben, dass es nützlich sein wird, "
+"aber OHNE IRGENDEINE GARANTIE, sogar ohne die implizite Garantie der "
+"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
#, php-format
@@ -4520,7 +4550,7 @@ msgstr ""
msgid "Plugins"
msgstr "Erweiterungen"
-#: actions/version.php:196 lib/action.php:767
+#: actions/version.php:196 lib/action.php:766
msgid "Version"
msgstr "Version"
@@ -4528,7 +4558,7 @@ msgstr "Version"
msgid "Author(s)"
msgstr "Autor(en)"
-#: classes/File.php:144
+#: classes/File.php:169
#, php-format
msgid ""
"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
@@ -4537,12 +4567,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:154
+#: classes/File.php:179
#, 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:161
+#: classes/File.php:186
#, php-format
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
@@ -4566,9 +4596,9 @@ msgid "Could not update local group."
msgstr "Konnte Gruppe nicht aktualisieren."
#: classes/Login_token.php:76
-#, fuzzy, php-format
+#, php-format
msgid "Could not create login token for %s"
-msgstr "Konnte keinen Favoriten erstellen."
+msgstr "Konnte keinen Login-Token für %s erstellen"
#: classes/Message.php:45
msgid "You are banned from sending direct messages."
@@ -4582,27 +4612,27 @@ msgstr "Konnte Nachricht nicht einfügen."
msgid "Could not update message with new URI."
msgstr "Konnte Nachricht nicht mit neuer URI versehen."
-#: classes/Notice.php:172
+#: classes/Notice.php:175
#, php-format
msgid "DB error inserting hashtag: %s"
msgstr "Datenbankfehler beim Einfügen des Hashtags: %s"
-#: classes/Notice.php:241
+#: classes/Notice.php:244
msgid "Problem saving notice. Too long."
msgstr "Problem bei Speichern der Nachricht. Sie ist zu lang."
-#: classes/Notice.php:245
+#: classes/Notice.php:248
msgid "Problem saving notice. Unknown user."
msgstr "Problem bei Speichern der Nachricht. Unbekannter Benutzer."
-#: classes/Notice.php:250
+#: classes/Notice.php:253
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:256
+#: classes/Notice.php:259
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
@@ -4610,75 +4640,73 @@ msgstr ""
"Zu schnell zu viele Nachrichten; atme kurz durch und schicke sie erneut in "
"ein paar Minuten ab."
-#: classes/Notice.php:262
+#: classes/Notice.php:265
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:328 classes/Notice.php:354
+#: classes/Notice.php:331 classes/Notice.php:357
msgid "Problem saving notice."
msgstr "Problem bei Speichern der Nachricht."
-#: classes/Notice.php:927
+#: classes/Notice.php:943
msgid "Problem saving group inbox."
msgstr "Problem bei Speichern der Nachricht."
-#: classes/Notice.php:1459
+#: classes/Notice.php:1481
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
-#: classes/Subscription.php:66 lib/oauthstore.php:465
+#: classes/Subscription.php:74 lib/oauthstore.php:465
msgid "You have been banned from subscribing."
msgstr "Dieser Benutzer erlaubt dir nicht ihn zu abonnieren."
-#: classes/Subscription.php:70
+#: classes/Subscription.php:78
msgid "Already subscribed!"
msgstr "Bereits abonniert!"
-#: classes/Subscription.php:74
+#: classes/Subscription.php:82
msgid "User has blocked you."
msgstr "Dieser Benutzer hat dich blockiert."
-#: classes/Subscription.php:157
+#: classes/Subscription.php:167
#, fuzzy
msgid "Not subscribed!"
msgstr "Nicht abonniert!"
-#: classes/Subscription.php:163
+#: classes/Subscription.php:173
msgid "Couldn't delete self-subscription."
msgstr "Konnte Abonnement nicht löschen."
-#: classes/Subscription.php:190
+#: classes/Subscription.php:200
msgid "Couldn't delete subscription OMB token."
msgstr "Konnte OMB-Abonnement nicht löschen."
-#: classes/Subscription.php:201 lib/subs.php:69
+#: classes/Subscription.php:211
msgid "Couldn't delete subscription."
msgstr "Konnte Abonnement nicht löschen."
-#: classes/User.php:373
+#: classes/User.php:363
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Herzlich willkommen bei %1$s, @%2$s!"
-#: classes/User_group.php:477
+#: classes/User_group.php:480
msgid "Could not create group."
msgstr "Konnte Gruppe nicht erstellen."
-#: classes/User_group.php:486
-#, fuzzy
+#: classes/User_group.php:489
msgid "Could not set group URI."
-msgstr "Konnte Gruppenmitgliedschaft nicht setzen."
+msgstr "Konnte die Gruppen URI nicht setzen."
-#: classes/User_group.php:507
+#: classes/User_group.php:510
msgid "Could not set group membership."
msgstr "Konnte Gruppenmitgliedschaft nicht setzen."
-#: classes/User_group.php:521
-#, fuzzy
+#: classes/User_group.php:524
msgid "Could not save local group info."
-msgstr "Konnte Abonnement nicht erstellen."
+msgstr "Konnte die lokale Gruppen Information nicht speichern."
#: lib/accountsettingsaction.php:108
msgid "Change your profile settings"
@@ -4717,170 +4745,170 @@ msgstr "%1$s - %2$s"
msgid "Untitled page"
msgstr "Seite ohne Titel"
-#: lib/action.php:424
+#: lib/action.php:423
msgid "Primary site navigation"
msgstr "Hauptnavigation"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:430
+#: lib/action.php:429
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr "Persönliches Profil und Freundes-Zeitleiste"
-#: lib/action.php:433
+#: lib/action.php:432
msgctxt "MENU"
msgid "Personal"
msgstr "Eigene"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:435
+#: lib/action.php:434
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "Ändere deine E-Mail, Avatar, Passwort und Profil"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:440
+#: lib/action.php:439
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "Zum Dienst verbinden"
-#: lib/action.php:443
+#: lib/action.php:442
msgid "Connect"
msgstr "Verbinden"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:446
+#: lib/action.php:445
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "Seiteneinstellung ändern"
-#: lib/action.php:449
+#: lib/action.php:448
msgctxt "MENU"
msgid "Admin"
msgstr "Administrator"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:453
+#: lib/action.php:452
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "Lade Freunde und Kollegen ein dir auf %s zu folgen"
-#: lib/action.php:456
+#: lib/action.php:455
msgctxt "MENU"
msgid "Invite"
msgstr "Einladen"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:462
+#: lib/action.php:461
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "Von der Seite abmelden"
-#: lib/action.php:465
+#: lib/action.php:464
msgctxt "MENU"
msgid "Logout"
msgstr "Abmelden"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:470
+#: lib/action.php:469
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Neues Konto erstellen"
-#: lib/action.php:473
+#: lib/action.php:472
msgctxt "MENU"
msgid "Register"
msgstr "Registrieren"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:476
+#: lib/action.php:475
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Auf der Seite anmelden"
-#: lib/action.php:479
+#: lib/action.php:478
msgctxt "MENU"
msgid "Login"
msgstr "Anmelden"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:482
+#: lib/action.php:481
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Hilf mir!"
-#: lib/action.php:485
+#: lib/action.php:484
msgctxt "MENU"
msgid "Help"
msgstr "Hilfe"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:488
+#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "Suche nach Leuten oder Text"
-#: lib/action.php:491
+#: lib/action.php:490
msgctxt "MENU"
msgid "Search"
msgstr "Suchen"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:513 lib/adminpanelaction.php:398
+#: lib/action.php:512 lib/adminpanelaction.php:398
msgid "Site notice"
msgstr "Seitennachricht"
-#: lib/action.php:579
+#: lib/action.php:578
msgid "Local views"
msgstr "Lokale Ansichten"
-#: lib/action.php:645
+#: lib/action.php:644
msgid "Page notice"
msgstr "Neue Nachricht"
-#: lib/action.php:747
+#: lib/action.php:746
msgid "Secondary site navigation"
msgstr "Unternavigation"
-#: lib/action.php:752
+#: lib/action.php:751
msgid "Help"
msgstr "Hilfe"
-#: lib/action.php:754
+#: lib/action.php:753
msgid "About"
msgstr "Über"
-#: lib/action.php:756
+#: lib/action.php:755
msgid "FAQ"
msgstr "FAQ"
-#: lib/action.php:760
+#: lib/action.php:759
msgid "TOS"
msgstr "AGB"
-#: lib/action.php:763
+#: lib/action.php:762
msgid "Privacy"
msgstr "Privatsphäre"
-#: lib/action.php:765
+#: lib/action.php:764
msgid "Source"
msgstr "Quellcode"
-#: lib/action.php:769
+#: lib/action.php:768
msgid "Contact"
msgstr "Kontakt"
-#: lib/action.php:771
+#: lib/action.php:770
msgid "Badge"
msgstr "Plakette"
-#: lib/action.php:799
+#: lib/action.php:798
msgid "StatusNet software license"
msgstr "StatusNet-Software-Lizenz"
-#: lib/action.php:802
+#: lib/action.php:803
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4889,12 +4917,12 @@ msgstr ""
"**%%site.name%%** ist ein Microbloggingdienst von [%%site.broughtby%%](%%"
"site.broughtbyurl%%)."
-#: lib/action.php:804
+#: lib/action.php:805
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** ist ein Microbloggingdienst."
-#: lib/action.php:806
+#: lib/action.php:808
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4905,57 +4933,63 @@ msgstr ""
"(Version %s) betrieben, die unter der [GNU Affero General Public License]"
"(http://www.fsf.org/licensing/licenses/agpl-3.0.html) erhältlich ist."
-#: lib/action.php:821
+#: lib/action.php:823
msgid "Site content license"
msgstr "StatusNet-Software-Lizenz"
-#: lib/action.php:826
+#: lib/action.php:828
#, php-format
msgid "Content and data of %1$s are private and confidential."
-msgstr ""
+msgstr "Inhalte und Daten von %1$s sind privat und vertraulich."
-#: lib/action.php:831
+#: lib/action.php:833
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
"Inhalt und Daten urheberrechtlich geschützt durch %1$s. Alle Rechte "
"vorbehalten."
-#: lib/action.php:834
+#: lib/action.php:836
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
+"Urheberrecht von Inhalt und Daten liegt bei den Beteiligten. Alle Rechte "
+"vorbehalten."
-#: lib/action.php:847
+#: lib/action.php:849
msgid "All "
msgstr "Alle "
-#: lib/action.php:853
+#: lib/action.php:855
msgid "license."
msgstr "Lizenz."
-#: lib/action.php:1152
+#: lib/action.php:1154
msgid "Pagination"
msgstr "Seitenerstellung"
-#: lib/action.php:1161
+#: lib/action.php:1163
msgid "After"
msgstr "Später"
-#: lib/action.php:1169
+#: lib/action.php:1171
msgid "Before"
msgstr "Vorher"
-#: lib/activity.php:453
-msgid "Can't handle remote content yet."
+#: lib/activity.php:120
+msgid "Expecting a root feed element but got a whole XML document."
msgstr ""
-#: lib/activity.php:481
+#: lib/activityutils.php:208
+msgid "Can't handle remote content yet."
+msgstr "Fremdinhalt kann noch nicht eingebunden werden."
+
+#: lib/activityutils.php:236
msgid "Can't handle embedded XML content yet."
msgstr "Kann eingebundenen XML Inhalt nicht verarbeiten."
-#: lib/activity.php:485
+#: lib/activityutils.php:240
msgid "Can't handle embedded Base64 content yet."
-msgstr ""
+msgstr "Eingebundener Base64 Inhalt kann noch nicht verarbeitet werden."
#. TRANS: Client error message
#: lib/adminpanelaction.php:98
@@ -5036,15 +5070,14 @@ msgstr "Seitennachricht bearbeiten"
#. TRANS: Menu item title/tooltip
#: lib/adminpanelaction.php:404
-#, fuzzy
msgid "Snapshots configuration"
-msgstr "SMS-Konfiguration"
+msgstr "Snapshot Konfiguration"
#: lib/apiauth.php:94
msgid "API resource requires read-write access, but you only have read access."
-msgstr ""
+msgstr "API-Ressource erfordert lesen/schreib Zugriff; du hast nur Leserechte."
-#: lib/apiauth.php:272
+#: lib/apiauth.php:276
#, php-format
msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s"
msgstr ""
@@ -5076,7 +5109,7 @@ msgstr "Adresse der Homepage dieses Programms"
#: lib/applicationeditform.php:224
msgid "Organization responsible for this application"
-msgstr ""
+msgstr "Für diese Anwendung verantwortliche Organisation"
#: lib/applicationeditform.php:230
msgid "URL for the homepage of the organization"
@@ -5084,7 +5117,7 @@ msgstr "Homepage der Gruppe oder des Themas"
#: lib/applicationeditform.php:236
msgid "URL to redirect to after authentication"
-msgstr ""
+msgstr "aufzurufende Adresse nach der Authentifizierung"
#: lib/applicationeditform.php:258
msgid "Browser"
@@ -5120,11 +5153,11 @@ msgstr "Entfernen"
msgid "Attachments"
msgstr "Anhänge"
-#: lib/attachmentlist.php:265
+#: lib/attachmentlist.php:263
msgid "Author"
msgstr "Autor"
-#: lib/attachmentlist.php:278
+#: lib/attachmentlist.php:276
msgid "Provider"
msgstr "Anbieter"
@@ -5144,37 +5177,50 @@ msgstr "Passwort konnte nicht geändert werden"
msgid "Password changing is not allowed"
msgstr "Passwort kann nicht geändert werden"
-#: lib/channel.php:138 lib/channel.php:158
+#: lib/channel.php:157 lib/channel.php:177
msgid "Command results"
msgstr "Befehl-Ergebnisse"
-#: lib/channel.php:210 lib/mailhandler.php:142
+#: lib/channel.php:229 lib/mailhandler.php:142
msgid "Command complete"
msgstr "Befehl ausgeführt"
-#: lib/channel.php:221
+#: lib/channel.php:240
msgid "Command failed"
msgstr "Befehl fehlgeschlagen"
-#: lib/command.php:44
-msgid "Sorry, this command is not yet implemented."
-msgstr "Leider ist dieser Befehl noch nicht implementiert."
+#: lib/command.php:83 lib/command.php:105
+msgid "Notice with that id does not exist"
+msgstr "Nachricht mit dieser ID existiert nicht"
-#: lib/command.php:88
+#: lib/command.php:99 lib/command.php:570
+msgid "User has no last notice"
+msgstr "Benutzer hat keine letzte Nachricht"
+
+#: lib/command.php:125
#, php-format
msgid "Could not find a user with nickname %s"
msgstr "Die bestätigte E-Mail-Adresse konnte nicht gespeichert werden."
-#: lib/command.php:92
+#: lib/command.php:143
+#, php-format
+msgid "Could not find a local user with nickname %s"
+msgstr "Konnte keinen lokalen Nutzer mit dem Nick %s finden"
+
+#: lib/command.php:176
+msgid "Sorry, this command is not yet implemented."
+msgstr "Leider ist dieser Befehl noch nicht implementiert."
+
+#: lib/command.php:221
msgid "It does not make a lot of sense to nudge yourself!"
msgstr "Es macht keinen Sinn dich selbst anzustupsen!"
-#: lib/command.php:99
+#: lib/command.php:228
#, php-format
msgid "Nudge sent to %s"
msgstr "Stups an %s geschickt"
-#: lib/command.php:126
+#: lib/command.php:254
#, php-format
msgid ""
"Subscriptions: %1$s\n"
@@ -5185,195 +5231,195 @@ msgstr ""
"Abonnenten: %2$s\n"
"Mitteilungen: %3$s"
-#: lib/command.php:152 lib/command.php:390 lib/command.php:451
-msgid "Notice with that id does not exist"
-msgstr "Nachricht mit dieser ID existiert nicht"
-
-#: lib/command.php:168 lib/command.php:406 lib/command.php:467
-#: lib/command.php:523
-msgid "User has no last notice"
-msgstr "Benutzer hat keine letzte Nachricht"
-
-#: lib/command.php:190
+#: lib/command.php:296
msgid "Notice marked as fave."
msgstr "Nachricht als Favorit markiert."
-#: lib/command.php:217
+#: lib/command.php:317
msgid "You are already a member of that group"
msgstr "Du bist bereits Mitglied dieser Gruppe"
-#: lib/command.php:231
+#: lib/command.php:331
#, php-format
msgid "Could not join user %s to group %s"
msgstr "Konnte Benutzer %s nicht der Gruppe %s hinzufügen"
-#: lib/command.php:236
+#: lib/command.php:336
#, php-format
msgid "%s joined group %s"
msgstr "%s ist der Gruppe %s beigetreten"
-#: lib/command.php:275
+#: lib/command.php:373
#, php-format
msgid "Could not remove user %s to group %s"
msgstr "Konnte Benutzer %s aus der Gruppe %s nicht entfernen"
-#: lib/command.php:280
+#: lib/command.php:378
#, php-format
msgid "%s left group %s"
msgstr "%s hat die Gruppe %s verlassen"
-#: lib/command.php:309
+#: lib/command.php:401
#, php-format
msgid "Fullname: %s"
msgstr "Vollständiger Name: %s"
-#: lib/command.php:312 lib/mail.php:258
+#: lib/command.php:404 lib/mail.php:258
#, php-format
msgid "Location: %s"
msgstr "Standort: %s"
-#: lib/command.php:315 lib/mail.php:260
+#: lib/command.php:407 lib/mail.php:260
#, php-format
msgid "Homepage: %s"
msgstr "Homepage: %s"
-#: lib/command.php:318
+#: lib/command.php:410
#, php-format
msgid "About: %s"
msgstr "Über: %s"
-#: lib/command.php:349
+#: lib/command.php:437
+#, php-format
+msgid ""
+"%s is a remote profile; you can only send direct messages to users on the "
+"same server."
+msgstr ""
+"%s ist ein entferntes Profil; man kann direkte Nachrichten nur an Nutzer auf "
+"dem selben Server senden."
+
+#: lib/command.php:450
#, php-format
msgid "Message too long - maximum is %d characters, you sent %d"
msgstr "Nachricht zu lang - maximal %d Zeichen erlaubt, du hast %d gesendet"
-#: lib/command.php:367
+#: lib/command.php:468
#, php-format
msgid "Direct message to %s sent"
msgstr "Direkte Nachricht an %s abgeschickt"
-#: lib/command.php:369
+#: lib/command.php:470
msgid "Error sending direct message."
msgstr "Fehler beim Senden der Nachricht"
-#: lib/command.php:413
+#: lib/command.php:490
msgid "Cannot repeat your own notice"
msgstr "Du kannst deine eigenen Nachrichten nicht wiederholen."
-#: lib/command.php:418
+#: lib/command.php:495
msgid "Already repeated that notice"
msgstr "Nachricht bereits wiederholt"
-#: lib/command.php:426
+#: lib/command.php:503
#, php-format
msgid "Notice from %s repeated"
msgstr "Nachricht von %s wiederholt"
-#: lib/command.php:428
+#: lib/command.php:505
msgid "Error repeating notice."
msgstr "Fehler beim Wiederholen der Nachricht"
-#: lib/command.php:482
+#: lib/command.php:536
#, php-format
msgid "Notice too long - maximum is %d characters, you sent %d"
msgstr "Nachricht zu lange - maximal %d Zeichen erlaubt, du hast %d gesendet"
-#: lib/command.php:491
+#: lib/command.php:545
#, php-format
msgid "Reply to %s sent"
msgstr "Antwort an %s gesendet"
-#: lib/command.php:493
+#: lib/command.php:547
msgid "Error saving notice."
msgstr "Problem beim Speichern der Nachricht."
-#: lib/command.php:547
+#: lib/command.php:594
msgid "Specify the name of the user to subscribe to"
msgstr "Gib den Namen des Benutzers an, den du abonnieren möchtest"
-#: lib/command.php:554 lib/command.php:589
-msgid "No such user"
-msgstr "Unbekannter Benutzer."
+#: lib/command.php:602
+msgid "Can't subscribe to OMB profiles by command."
+msgstr "OMB Profile können nicht mit einem Kommando abonniert werden."
-#: lib/command.php:561
+#: lib/command.php:608
#, php-format
msgid "Subscribed to %s"
msgstr "%s abonniert"
-#: lib/command.php:582 lib/command.php:685
+#: lib/command.php:629 lib/command.php:728
msgid "Specify the name of the user to unsubscribe from"
msgstr "Gib den Namen des Benutzers ein, den du nicht mehr abonnieren möchtest"
-#: lib/command.php:595
+#: lib/command.php:638
#, php-format
msgid "Unsubscribed from %s"
msgstr "%s nicht mehr abonniert"
-#: lib/command.php:613 lib/command.php:636
+#: lib/command.php:656 lib/command.php:679
msgid "Command not yet implemented."
msgstr "Befehl noch nicht implementiert."
-#: lib/command.php:616
+#: lib/command.php:659
msgid "Notification off."
msgstr "Benachrichtigung deaktiviert."
-#: lib/command.php:618
+#: lib/command.php:661
msgid "Can't turn off notification."
msgstr "Konnte Benachrichtigung nicht deaktivieren."
-#: lib/command.php:639
+#: lib/command.php:682
msgid "Notification on."
msgstr "Benachrichtigung aktiviert."
-#: lib/command.php:641
+#: lib/command.php:684
msgid "Can't turn on notification."
msgstr "Konnte Benachrichtigung nicht aktivieren."
-#: lib/command.php:654
+#: lib/command.php:697
msgid "Login command is disabled"
msgstr "Anmeldung ist abgeschaltet"
-#: lib/command.php:665
+#: lib/command.php:708
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr "Der Link ist nur einmal benutzbar und für eine Dauer von 2 Minuten: %s"
-#: lib/command.php:692
+#: lib/command.php:735
#, php-format
msgid "Unsubscribed %s"
msgstr "%s nicht mehr abonniert"
-#: lib/command.php:709
+#: lib/command.php:752
msgid "You are not subscribed to anyone."
msgstr "Du hast niemanden abonniert."
-#: lib/command.php:711
+#: lib/command.php:754
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Du hast diese Benutzer bereits abonniert:"
msgstr[1] "Du hast diese Benutzer bereits abonniert:"
-#: lib/command.php:731
+#: lib/command.php:774
msgid "No one is subscribed to you."
msgstr "Niemand hat Dich abonniert."
-#: lib/command.php:733
+#: lib/command.php:776
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Die Gegenseite konnte Dich nicht abonnieren."
msgstr[1] "Die Gegenseite konnte Dich nicht abonnieren."
-#: lib/command.php:753
+#: lib/command.php:796
msgid "You are not a member of any groups."
msgstr "Du bist in keiner Gruppe Mitglied."
-#: lib/command.php:755
+#: lib/command.php:798
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Du bist Mitglied dieser Gruppe:"
msgstr[1] "Du bist Mitglied dieser Gruppen:"
-#: lib/command.php:769
+#: lib/command.php:812
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5414,20 +5460,58 @@ msgid ""
"tracks - not yet implemented.\n"
"tracking - not yet implemented.\n"
msgstr ""
+"Befehle:\n"
+"on - Benachrichtigung einschalten\n"
+"off - Benachrichtigung ausschalten\n"
+"help - diese Hilfe anzeigen\n"
+"follow <nickname> - einem Nutzer folgen\n"
+"groups - Gruppen auflisten in denen du Mitglied bist\n"
+"subscriptions - Leute auflisten denen du folgst\n"
+"subscribers - Leute auflisten die dir folgen\n"
+"leave <nickname> - einem Nutzer nicht mehr folgen\n"
+"d <nickname> <text> - Direkte Nachricht an einen Nutzer schicken\n"
+"get <nickname> - letzte Nachricht eines Nutzers abrufen\n"
+"whois <nickname> - Profil eines Nutzers abrufen\n"
+"lose <nickname> - Nutzer zwingen dir nicht mehr zu folgen\n"
+"fav <nickname> - letzte Nachricht eines Nutzers als Favorit markieren\n"
+"fav #<notice_id> - Nachricht mit bestimmter ID als Favorit markieren\n"
+"repeat #<notice_id> - Nachricht mit bestimmter ID wiederholen\n"
+"repeat <nickname> - letzte Nachricht eines Nutzers wiederholen\n"
+"reply #<notice_id> - Nachricht mit bestimmter ID beantworten\n"
+"reply <nickname> - letzte Nachricht eines Nutzers beantworten\n"
+"join <group> - Gruppe beitreten\n"
+"login - Link zum Anmelden auf der Webseite anfordern\n"
+"drop <group> - Gruppe verlassen\n"
+"stats - deine Statistik abrufen\n"
+"stop - Äquivalent zu 'off'\n"
+"quit - Äquivalent zu '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:148
+#: lib/common.php:135
msgid "No configuration file found. "
msgstr "Keine Konfigurationsdatei gefunden."
-#: lib/common.php:149
+#: lib/common.php:136
msgid "I looked for configuration files in the following places: "
msgstr "Ich habe an folgenden Stellen nach Konfigurationsdateien gesucht: "
-#: lib/common.php:151
+#: lib/common.php:138
msgid "You may wish to run the installer to fix this."
msgstr "Bitte die Installation erneut starten um das Problem zu beheben."
-#: lib/common.php:152
+#: lib/common.php:139
msgid "Go to the installer."
msgstr "Zur Installation gehen."
@@ -5554,6 +5638,8 @@ msgstr ""
#, php-format
msgid "Extra nicknames for the group, comma- or space- separated, max %d"
msgstr ""
+"Zusätzliche Spitznamen für die Gruppe, Komma oder Leerzeichen getrennt, max %"
+"d"
#: lib/groupnav.php:85
msgid "Group"
@@ -5604,52 +5690,52 @@ msgstr "Stichworte in den Nachrichten der Gruppe %s"
msgid "This page is not available in a media type you accept"
msgstr "Dies Seite liegt in keinem von dir akzeptierten Mediatype vor."
-#: lib/imagefile.php:75
+#: lib/imagefile.php:72
+msgid "Unsupported image file format."
+msgstr "Bildformat wird nicht unterstützt."
+
+#: lib/imagefile.php:88
#, fuzzy, php-format
msgid "That file is too big. The maximum file size is %s."
msgstr "Du kannst ein Logo für Deine Gruppe hochladen."
-#: lib/imagefile.php:80
+#: lib/imagefile.php:93
msgid "Partial upload."
msgstr "Unvollständiges Hochladen."
-#: lib/imagefile.php:88 lib/mediafile.php:170
+#: lib/imagefile.php:101 lib/mediafile.php:170
msgid "System error uploading file."
msgstr "Systemfehler beim hochladen der Datei."
-#: lib/imagefile.php:96
+#: lib/imagefile.php:109
msgid "Not an image or corrupt file."
msgstr "Kein Bild oder defekte Datei."
-#: lib/imagefile.php:109
-msgid "Unsupported image file format."
-msgstr "Bildformat wird nicht unterstützt."
-
#: lib/imagefile.php:122
msgid "Lost our file."
msgstr "Daten verloren."
-#: lib/imagefile.php:166 lib/imagefile.php:231
+#: lib/imagefile.php:163 lib/imagefile.php:224
msgid "Unknown file type"
msgstr "Unbekannter Dateityp"
-#: lib/imagefile.php:251
+#: lib/imagefile.php:244
msgid "MB"
msgstr "MB"
-#: lib/imagefile.php:253
+#: lib/imagefile.php:246
msgid "kB"
msgstr "kB"
-#: lib/jabber.php:220
+#: lib/jabber.php:387
#, php-format
msgid "[%s]"
msgstr "[%s]"
-#: lib/jabber.php:400
-#, fuzzy, php-format
+#: lib/jabber.php:567
+#, php-format
msgid "Unknown inbox source %d."
-msgstr "Unbekannte Sprache „%s“"
+msgstr "Unbekannte inbox Quelle %d."
#: lib/joinform.php:114
msgid "Join"
@@ -5867,6 +5953,16 @@ msgid ""
"Faithfully yours,\n"
"%6$s\n"
msgstr ""
+"%1$s (@%7$s) hat gerade deine Mitteilung von %2$s als Favorit hinzugefügt.\n"
+"Die Adresse der Nachricht ist:\n"
+"%3$s\n"
+"Der Text der Nachricht ist:\n"
+"%4$s\n"
+"Die Favoritenliste von %1$s ist hier:\n"
+"%5$s\n"
+"\n"
+"Gruß,\n"
+"%6$s\n"
#: lib/mail.php:635
#, php-format
@@ -5888,6 +5984,17 @@ msgid ""
"\t%4$s\n"
"\n"
msgstr ""
+"%1$s (@%9$s) hat dir gerade eine Mitteilung auf %2$s gesendet (eine '@-"
+"Antwort').\n"
+"\n"
+"Die Mitteilung ist:\n"
+"\n"
+"%3$s\n"
+"\n"
+"Sie lautet:\n"
+"\n"
+"%4$s\n"
+"\n"
#: lib/mailbox.php:89
msgid "Only the user can read their own mailboxes."
@@ -5902,7 +6009,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:482
+#: lib/mailbox.php:227 lib/noticelist.php:486
msgid "from"
msgstr "von"
@@ -5972,9 +6079,8 @@ msgid "File could not be moved to destination directory."
msgstr "Datei konnte nicht in das Zielverzeichnis verschoben werden."
#: lib/mediafile.php:201 lib/mediafile.php:237
-#, fuzzy
msgid "Could not determine file's MIME type."
-msgstr "Konnte öffentlichen Stream nicht abrufen."
+msgstr "Konnte den MIME-Typ nicht feststellen."
#: lib/mediafile.php:270
#, php-format
@@ -6036,48 +6142,48 @@ msgstr ""
"Es tut uns Leid, aber die Abfrage deiner GPS Position hat zu lange gedauert. "
"Bitte versuche es später wieder."
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
-msgstr ""
+msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "N"
msgstr "N"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "S"
msgstr "S"
-#: lib/noticelist.php:431
+#: lib/noticelist.php:432
msgid "E"
msgstr "O"
-#: lib/noticelist.php:431
+#: lib/noticelist.php:432
msgid "W"
msgstr "W"
-#: lib/noticelist.php:438
+#: lib/noticelist.php:439
msgid "at"
msgstr "in"
-#: lib/noticelist.php:566
+#: lib/noticelist.php:570
msgid "in context"
msgstr "im Zusammenhang"
-#: lib/noticelist.php:601
+#: lib/noticelist.php:605
msgid "Repeated by"
msgstr "Wiederholt von"
-#: lib/noticelist.php:628
+#: lib/noticelist.php:632
msgid "Reply to this notice"
msgstr "Auf diese Nachricht antworten"
-#: lib/noticelist.php:629
+#: lib/noticelist.php:633
msgid "Reply"
msgstr "Antworten"
-#: lib/noticelist.php:673
+#: lib/noticelist.php:677
msgid "Notice repeated"
msgstr "Nachricht wiederholt"
@@ -6115,7 +6221,7 @@ msgstr "Konnte neues Abonnement nicht eintragen."
#: lib/personalgroupnav.php:99
msgid "Personal"
-msgstr "Eigene"
+msgstr "Meine Zeitleiste"
#: lib/personalgroupnav.php:104
msgid "Replies"
@@ -6150,7 +6256,7 @@ msgstr "Stichworte in %ss Nachrichten"
msgid "Unknown"
msgstr "Unbekannter Befehl"
-#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr "Abonnements"
@@ -6158,7 +6264,7 @@ msgstr "Abonnements"
msgid "All subscriptions"
msgstr "Alle Abonnements"
-#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90
+#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr "Abonnenten"
@@ -6166,15 +6272,20 @@ msgstr "Abonnenten"
msgid "All subscribers"
msgstr "Alle Abonnenten"
-#: lib/profileaction.php:180
+#: lib/profileaction.php:186
msgid "User ID"
msgstr "Nutzer ID"
-#: lib/profileaction.php:185
+#: lib/profileaction.php:191
msgid "Member since"
msgstr "Mitglied seit"
-#: lib/profileaction.php:247
+#. TRANS: Average count of posts made per day since account registration
+#: lib/profileaction.php:230
+msgid "Daily average"
+msgstr "Tagesdurchschnitt"
+
+#: lib/profileaction.php:259
msgid "All groups"
msgstr "Alle Gruppen"
@@ -6189,7 +6300,7 @@ msgstr "Nicht unterstützte Methode."
#: lib/publicgroupnav.php:78
msgid "Public"
-msgstr "Öffentlich"
+msgstr "Zeitleiste"
#: lib/publicgroupnav.php:82
msgid "User groups"
@@ -6220,9 +6331,9 @@ msgstr "Diese Nachricht wiederholen"
msgid "Revoke the \"%s\" role from this user"
msgstr "Widerrufe die \"%s\" Rolle von diesem Benutzer"
-#: lib/router.php:671
+#: lib/router.php:704
msgid "No single user defined for single-user mode."
-msgstr ""
+msgstr "Kein einzelner Nutzer für den Ein-Benutzer-Modus ausgewählt."
#: lib/sandboxform.php:67
msgid "Sandbox"
@@ -6238,7 +6349,7 @@ msgstr "Site durchsuchen"
#: lib/searchaction.php:126
msgid "Keyword(s)"
-msgstr "Stichwort/Stichwörter"
+msgstr "Suchbegriff"
#: lib/searchaction.php:127
msgid "Search"
@@ -6346,89 +6457,98 @@ msgstr "Lösche dein Abonnement von diesem Benutzer"
msgid "Unsubscribe"
msgstr "Abbestellen"
-#: lib/userprofile.php:116
+#: lib/usernoprofileexception.php:58
+#, php-format
+msgid "User %s (%d) has no profile record."
+msgstr "Benutzer %s (%d) hat kein Profil."
+
+#: lib/userprofile.php:117
msgid "Edit Avatar"
msgstr "Avatar bearbeiten"
-#: lib/userprofile.php:236
+#: lib/userprofile.php:234 lib/userprofile.php:248
msgid "User actions"
msgstr "Benutzeraktionen"
-#: lib/userprofile.php:251
+#: lib/userprofile.php:237
+msgid "User deletion in progress..."
+msgstr "Löschung des Nutzers in Arbeit..."
+
+#: lib/userprofile.php:263
msgid "Edit profile settings"
msgstr "Profil Einstellungen ändern"
-#: lib/userprofile.php:252
+#: lib/userprofile.php:264
msgid "Edit"
msgstr "Bearbeiten"
-#: lib/userprofile.php:275
+#: lib/userprofile.php:287
msgid "Send a direct message to this user"
msgstr "Direkte Nachricht an Benutzer verschickt"
-#: lib/userprofile.php:276
+#: lib/userprofile.php:288
msgid "Message"
msgstr "Nachricht"
-#: lib/userprofile.php:314
+#: lib/userprofile.php:326
msgid "Moderate"
msgstr "Moderieren"
-#: lib/userprofile.php:352
+#: lib/userprofile.php:364
msgid "User role"
msgstr "Benutzerrolle"
-#: lib/userprofile.php:354
+#: lib/userprofile.php:366
msgctxt "role"
msgid "Administrator"
msgstr "Administrator"
-#: lib/userprofile.php:355
+#: lib/userprofile.php:367
msgctxt "role"
msgid "Moderator"
msgstr "Moderator"
-#: lib/util.php:1015
+#: lib/util.php:1046
msgid "a few seconds ago"
msgstr "vor wenigen Sekunden"
-#: lib/util.php:1017
+#: lib/util.php:1048
msgid "about a minute ago"
msgstr "vor einer Minute"
-#: lib/util.php:1019
+#: lib/util.php:1050
#, php-format
msgid "about %d minutes ago"
msgstr "vor %d Minuten"
-#: lib/util.php:1021
+#: lib/util.php:1052
msgid "about an hour ago"
msgstr "vor einer Stunde"
-#: lib/util.php:1023
+#: lib/util.php:1054
#, php-format
msgid "about %d hours ago"
msgstr "vor %d Stunden"
-#: lib/util.php:1025
+#: lib/util.php:1056
msgid "about a day ago"
msgstr "vor einem Tag"
-#: lib/util.php:1027
+#: lib/util.php:1058
#, php-format
msgid "about %d days ago"
msgstr "vor %d Tagen"
-#: lib/util.php:1029
+#: lib/util.php:1060
msgid "about a month ago"
msgstr "vor einem Monat"
-#: lib/util.php:1031
+#: lib/util.php:1062
#, php-format
msgid "about %d months ago"
msgstr "vor %d Monaten"
-#: lib/util.php:1033
+#: lib/util.php:1064
msgid "about a year ago"
msgstr "vor einem Jahr"
@@ -6442,7 +6562,7 @@ msgstr "%s ist keine gültige Farbe!"
msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr "%s ist keine gültige Farbe! Verwenden Sie 3 oder 6 Hex-Zeichen."
-#: lib/xmppmanager.php:402
+#: lib/xmppmanager.php:403
#, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d."
msgstr ""
diff --git a/locale/el/LC_MESSAGES/statusnet.po b/locale/el/LC_MESSAGES/statusnet.po
index 0ebe84fe7..77d8d701c 100644
--- a/locale/el/LC_MESSAGES/statusnet.po
+++ b/locale/el/LC_MESSAGES/statusnet.po
@@ -1,6 +1,7 @@
# Translation of StatusNet to Greek
#
# Author@translatewiki.net: Crazymadlover
+# Author@translatewiki.net: Dead3y3
# Author@translatewiki.net: Omnipaedista
# --
# This file is distributed under the same license as the StatusNet package.
@@ -9,12 +10,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-06 23:49+0000\n"
-"PO-Revision-Date: 2010-03-06 23:49:37+0000\n"
+"POT-Creation-Date: 2010-04-05 18:54+0000\n"
+"PO-Revision-Date: 2010-04-05 18:54:55+0000\n"
"Language-Team: Greek\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64621); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: el\n"
"X-Message-Group: out-statusnet\n"
@@ -28,31 +29,30 @@ msgstr "Πρόσβαση"
#. TRANS: Page notice
#: actions/accessadminpanel.php:67
-#, fuzzy
msgid "Site access settings"
-msgstr "Ρυθμίσεις OpenID"
+msgstr "Ρυθμίσεις πρόσβασης ιστοτόπου"
#. TRANS: Form legend for registration form.
#: actions/accessadminpanel.php:161
-#, fuzzy
msgid "Registration"
-msgstr "Περιγραφή"
+msgstr "Εγγραφή"
#. TRANS: Checkbox instructions for admin setting "Private"
#: actions/accessadminpanel.php:165
msgid "Prohibit anonymous users (not logged in) from viewing site?"
msgstr ""
+"Απαγόρευση ανωνύμων χρηστών (μη συνδεδεμένων) από το να βλέπουν τον ιστότοπο;"
#. TRANS: Checkbox label for prohibiting anonymous users from viewing site.
#: actions/accessadminpanel.php:167
msgctxt "LABEL"
msgid "Private"
-msgstr ""
+msgstr "Ιδιωτικό"
#. TRANS: Checkbox instructions for admin setting "Invite only"
#: actions/accessadminpanel.php:174
msgid "Make registration invitation only."
-msgstr ""
+msgstr "Κάντε την εγγραφή να είναι με πρόσκληση μόνο."
#. TRANS: Checkbox label for configuring site as invite only.
#: actions/accessadminpanel.php:176
@@ -62,24 +62,22 @@ msgstr ""
#. TRANS: Checkbox instructions for admin setting "Closed" (no new registrations)
#: actions/accessadminpanel.php:183
msgid "Disable new registrations."
-msgstr ""
+msgstr "Απενεργοποίηση των νέων εγγραφών"
#. TRANS: Checkbox label for disabling new user registrations.
#: actions/accessadminpanel.php:185
msgid "Closed"
-msgstr ""
+msgstr "Κλειστό"
#. TRANS: Title / tooltip for button to save access settings in site admin panel
#: actions/accessadminpanel.php:202
-#, fuzzy
msgid "Save access settings"
-msgstr "Ρυθμίσεις OpenID"
+msgstr "Αποθήκευση ρυθμίσεων πρόσβασης"
#: actions/accessadminpanel.php:203
-#, fuzzy
msgctxt "BUTTON"
msgid "Save"
-msgstr "Αποχώρηση"
+msgstr "Αποθήκευση"
#. TRANS: Server error when page not found (404)
#: actions/all.php:64 actions/public.php:98 actions/replies.php:93
@@ -95,9 +93,9 @@ msgstr "Δεν υπάρχει τέτοια σελίδα"
#: 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:90
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78
+#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
@@ -106,18 +104,16 @@ msgstr "Δεν υπάρχει τέτοια σελίδα"
#: actions/remotesubscribe.php:154 actions/replies.php:73
#: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:163 lib/command.php:302
-#: lib/command.php:355 lib/command.php:401 lib/command.php:462
-#: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82
-#: lib/profileaction.php:77
+#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: lib/mailbox.php:82 lib/profileaction.php:77
msgid "No such user."
msgstr "Κανένας τέτοιος χρήστης."
#. TRANS: Page title. %1$s is user nickname, %2$d is page number
#: actions/all.php:86
-#, fuzzy, php-format
+#, php-format
msgid "%1$s and friends, page %2$d"
-msgstr "%s και οι φίλοι του/της"
+msgstr "%1$s και φίλοι, σελίδα 2%$d"
#. TRANS: Page title. %1$s is user nickname
#. TRANS: H1 text. %1$s is user nickname
@@ -152,6 +148,8 @@ msgstr "Ροή φίλων του/της %s (Atom)"
msgid ""
"This is the timeline for %s and friends but no one has posted anything yet."
msgstr ""
+"Αυτό είναι το χρονοδιάγραμμα για %s και φίλους, αλλά κανείς δεν έχει κάνει "
+"καμία αποστολή ακόμα."
#: actions/all.php:139
#, php-format
@@ -159,6 +157,8 @@ msgid ""
"Try subscribing to more people, [join a group](%%action.groups%%) or post "
"something yourself."
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
@@ -196,18 +196,18 @@ msgstr ""
#: 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:132
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:136
#: actions/apigrouplistall.php:120 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:135
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
-#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184
-#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148
+#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:174
+#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173
+#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
-#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
+#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
#, fuzzy
msgid "API method not found."
msgstr "Η μέθοδος του ΑΡΙ δε βρέθηκε!"
@@ -221,8 +221,8 @@ msgstr "Η μέθοδος του ΑΡΙ δε βρέθηκε!"
#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65
-#: actions/apistatusesupdate.php:118
+#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
msgid "This method requires a POST."
msgstr ""
@@ -253,7 +253,7 @@ msgid "Could not save profile."
msgstr "Απέτυχε η αποθήκευση του προφίλ."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:97
+#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
#: actions/designadminpanel.php:122 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
@@ -338,7 +338,7 @@ msgstr ""
msgid "This status is already a favorite."
msgstr ""
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
msgid "Could not create favorite."
msgstr ""
@@ -460,7 +460,7 @@ msgstr "Η ομάδα δεν βρέθηκε!"
msgid "You are already a member of that group."
msgstr ""
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:221
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
msgid "You have been blocked from that group by the admin."
msgstr ""
@@ -478,11 +478,18 @@ msgstr ""
msgid "Could not remove user %1$s from group %2$s."
msgstr "Αδύνατη η αποθήκευση του προφίλ."
-#: actions/apigrouplist.php:95
+#. TRANS: %s is a user name
+#: actions/apigrouplist.php:97
#, 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
+#, fuzzy, php-format
+msgid "%1$s groups %2$s is a member of."
+msgstr "Δεν είστε μέλος καμίας ομάδας."
+
#: actions/apigrouplistall.php:90 actions/usergroups.php:62
#, php-format
msgid "%s groups"
@@ -511,7 +518,7 @@ msgstr "Μήνυμα"
#: 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:337
+#: actions/profilesettings.php:194 actions/recoverpassword.php:350
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
@@ -571,15 +578,15 @@ msgid ""
"give access to your %4$s account to third parties you trust."
msgstr ""
-#: actions/apioauthauthorize.php:310 lib/action.php:438
+#: actions/apioauthauthorize.php:310 lib/action.php:437
msgid "Account"
msgstr "Λογαριασμός"
#: actions/apioauthauthorize.php:313 actions/login.php:230
#: actions/profilesettings.php:106 actions/register.php:424
-#: actions/showgroup.php:244 actions/tagother.php:94
+#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
-#: lib/userprofile.php:131
+#: lib/userprofile.php:132
msgid "Nickname"
msgstr "Ψευδώνυμο"
@@ -650,12 +657,12 @@ msgstr ""
msgid "Unsupported format."
msgstr ""
-#: actions/apitimelinefavorites.php:108
+#: actions/apitimelinefavorites.php:109
#, php-format
msgid "%1$s / Favorites from %2$s"
msgstr ""
-#: actions/apitimelinefavorites.php:117
+#: actions/apitimelinefavorites.php:118
#, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr ""
@@ -665,7 +672,7 @@ msgstr ""
msgid "%1$s / Updates mentioning %2$s"
msgstr ""
-#: actions/apitimelinementions.php:127
+#: actions/apitimelinementions.php:130
#, php-format
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr ""
@@ -675,7 +682,7 @@ msgstr ""
msgid "%s public timeline"
msgstr ""
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr ""
@@ -690,12 +697,12 @@ msgstr ""
msgid "Repeats of %s"
msgstr ""
-#: actions/apitimelinetag.php:102 actions/tag.php:67
+#: actions/apitimelinetag.php:104 actions/tag.php:67
#, php-format
msgid "Notices tagged with %s"
msgstr ""
-#: actions/apitimelinetag.php:104 actions/tagrss.php:65
+#: actions/apitimelinetag.php:106 actions/tagrss.php:65
#, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr ""
@@ -723,7 +730,7 @@ msgstr ""
msgid "Invalid size."
msgstr ""
-#: actions/avatarsettings.php:67 actions/showgroup.php:229
+#: actions/avatarsettings.php:67 actions/showgroup.php:230
#: lib/accountsettingsaction.php:112
msgid "Avatar"
msgstr ""
@@ -755,7 +762,7 @@ msgid "Preview"
msgstr ""
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:655
+#: lib/deleteuserform.php:66 lib/noticelist.php:659
msgid "Delete"
msgstr "Διαγραφή"
@@ -767,23 +774,27 @@ msgstr ""
msgid "Crop"
msgstr ""
-#: actions/avatarsettings.php:328
+#: actions/avatarsettings.php:305
+msgid "No file uploaded."
+msgstr ""
+
+#: actions/avatarsettings.php:332
msgid "Pick a square area of the image to be your avatar"
msgstr ""
-#: actions/avatarsettings.php:343 actions/grouplogo.php:380
+#: actions/avatarsettings.php:347 actions/grouplogo.php:380
msgid "Lost our file data."
msgstr ""
-#: actions/avatarsettings.php:366
+#: actions/avatarsettings.php:370
msgid "Avatar updated."
msgstr ""
-#: actions/avatarsettings.php:369
+#: actions/avatarsettings.php:373
msgid "Failed updating avatar."
msgstr ""
-#: actions/avatarsettings.php:393
+#: actions/avatarsettings.php:397
#, fuzzy
msgid "Avatar deleted."
msgstr "Ρυθμίσεις OpenID"
@@ -838,8 +849,8 @@ msgstr ""
#: actions/groupunblock.php:86 actions/joingroup.php:82
#: actions/joingroup.php:93 actions/leavegroup.php:82
#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212
-#: lib/command.php:260
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162
+#: lib/command.php:358
#, fuzzy
msgid "No such group."
msgstr "Αδύνατη η αποθήκευση του προφίλ."
@@ -923,7 +934,7 @@ msgid "Conversation"
msgstr "Συζήτηση"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:218 lib/searchgroupnav.php:82
+#: lib/profileaction.php:224 lib/searchgroupnav.php:82
msgid "Notices"
msgstr ""
@@ -945,7 +956,7 @@ msgstr "Ομάδες με τα περισσότερα μέλη"
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1217
+#: lib/action.php:1219
msgid "There was a problem with your session token."
msgstr ""
@@ -1006,7 +1017,7 @@ msgstr "Είσαι σίγουρος ότι θες να διαγράψεις αυ
msgid "Do not delete this notice"
msgstr "Αδυναμία διαγραφής αυτού του μηνύματος."
-#: actions/deletenotice.php:146 lib/noticelist.php:655
+#: actions/deletenotice.php:146 lib/noticelist.php:659
msgid "Delete this notice"
msgstr ""
@@ -1143,7 +1154,7 @@ msgstr ""
#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:208
+#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
#: actions/tagother.php:154 actions/useradminpanel.php:294
#: lib/applicationeditform.php:333 lib/applicationeditform.php:334
#: lib/designsettings.php:256 lib/groupeditform.php:202
@@ -1268,7 +1279,7 @@ msgstr "Το βιογραφικό είναι πολύ μεγάλο (μέγιστ
msgid "Could not update group."
msgstr "Αδύνατη η αποθήκευση του προφίλ."
-#: actions/editgroup.php:264 classes/User_group.php:493
+#: actions/editgroup.php:264 classes/User_group.php:496
#, fuzzy
msgid "Could not create aliases."
msgstr "Αδύνατη η αποθήκευση του προφίλ."
@@ -1759,7 +1770,7 @@ msgstr "χρονοδιάγραμμα του χρήστη %s"
msgid "Updates from members of %1$s on %2$s!"
msgstr ""
-#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232
+#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244
#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr ""
@@ -1958,7 +1969,7 @@ msgstr ""
msgid "You are already subscribed to these users:"
msgstr ""
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
#, php-format
msgid "%1$s (%2$s)"
msgstr ""
@@ -2059,7 +2070,7 @@ msgstr ""
msgid "You must be logged in to leave a group."
msgstr ""
-#: actions/leavegroup.php:100 lib/command.php:265
+#: actions/leavegroup.php:100 lib/command.php:363
msgid "You are not a member of that group."
msgstr ""
@@ -2175,12 +2186,12 @@ msgstr ""
msgid "New message"
msgstr ""
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
msgid "You can't send a message to this user."
msgstr ""
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342
-#: lib/command.php:475
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
+#: lib/command.php:529
msgid "No content!"
msgstr ""
@@ -2188,7 +2199,7 @@ msgstr ""
msgid "No recipient specified."
msgstr ""
-#: actions/newmessage.php:164 lib/command.php:361
+#: actions/newmessage.php:164 lib/command.php:462
msgid ""
"Don't send a message to yourself; just say it to yourself quietly instead."
msgstr ""
@@ -2202,7 +2213,7 @@ msgstr ""
msgid "Direct message to %s sent."
msgstr ""
-#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189
msgid "Ajax Error"
msgstr ""
@@ -2210,7 +2221,7 @@ msgstr ""
msgid "New notice"
msgstr ""
-#: actions/newnotice.php:211
+#: actions/newnotice.php:217
msgid "Notice posted"
msgstr ""
@@ -2314,7 +2325,7 @@ msgstr ""
msgid "Notice has no profile"
msgstr ""
-#: actions/oembed.php:86 actions/shownotice.php:180
+#: actions/oembed.php:86 actions/shownotice.php:175
#, php-format
msgid "%1$s's status on %2$s"
msgstr ""
@@ -2328,8 +2339,8 @@ msgstr "Σύνδεση"
msgid "Only "
msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042
-#: lib/apiaction.php:1070 lib/apiaction.php:1179
+#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1068
+#: lib/apiaction.php:1096 lib/apiaction.php:1212
msgid "Not a supported data format."
msgstr ""
@@ -2467,7 +2478,7 @@ msgstr "Λάθος παλιός κωδικός"
msgid "Error saving user; invalid."
msgstr ""
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
msgid "Can't save new password."
msgstr "Αδύνατη η αποθήκευση του νέου κωδικού"
@@ -2683,8 +2694,8 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr "1-64 μικρά γράμματα ή αριθμοί, χωρίς σημεία στίξης ή κενά"
#: actions/profilesettings.php:111 actions/register.php:448
-#: actions/showgroup.php:255 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:149
+#: actions/showgroup.php:256 actions/tagother.php:104
+#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Ονοματεπώνυμο"
@@ -2712,9 +2723,9 @@ msgid "Bio"
msgstr "Βιογραφικό"
#: actions/profilesettings.php:132 actions/register.php:471
-#: actions/showgroup.php:264 actions/tagother.php:112
+#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
-#: lib/userprofile.php:164
+#: lib/userprofile.php:165
msgid "Location"
msgstr "Τοποθεσία"
@@ -2728,7 +2739,7 @@ msgstr ""
#: actions/profilesettings.php:145 actions/tagother.php:149
#: actions/tagother.php:209 lib/subscriptionlist.php:106
-#: lib/subscriptionlist.php:108 lib/userprofile.php:209
+#: lib/subscriptionlist.php:108 lib/userprofile.php:210
msgid "Tags"
msgstr ""
@@ -2958,7 +2969,7 @@ msgstr ""
msgid "Recover password"
msgstr ""
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
msgid "Password recovery requested"
msgstr ""
@@ -2978,19 +2989,19 @@ msgstr ""
msgid "Enter a nickname or email address."
msgstr "Εισάγετε ψευδώνυμο ή διεύθυνση email."
-#: actions/recoverpassword.php:272
+#: actions/recoverpassword.php:282
msgid "No user with that email address or username."
msgstr ""
-#: actions/recoverpassword.php:287
+#: actions/recoverpassword.php:299
msgid "No registered email address for that user."
msgstr ""
-#: actions/recoverpassword.php:301
+#: actions/recoverpassword.php:313
msgid "Error saving address confirmation."
msgstr ""
-#: actions/recoverpassword.php:325
+#: actions/recoverpassword.php:338
msgid ""
"Instructions for recovering your password have been sent to the email "
"address registered to your account."
@@ -2998,23 +3009,23 @@ msgstr ""
"Οδηγίες για την ανάκτηση του κωδικού σας έχουν σταλεί στην διεύθυνση email "
"που έχετε καταχωρίσει στον λογαριασμό σας."
-#: actions/recoverpassword.php:344
+#: actions/recoverpassword.php:357
msgid "Unexpected password reset."
msgstr ""
-#: actions/recoverpassword.php:352
+#: actions/recoverpassword.php:365
msgid "Password must be 6 chars or more."
msgstr "Ο κωδικός πρέπει να είναι 6 χαρακτήρες ή περισσότεροι."
-#: actions/recoverpassword.php:356
+#: actions/recoverpassword.php:369
msgid "Password and confirmation do not match."
msgstr "Ο κωδικός και η επιβεβαίωση του δεν ταυτίζονται."
-#: actions/recoverpassword.php:375 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:248
msgid "Error setting user."
msgstr ""
-#: actions/recoverpassword.php:382
+#: actions/recoverpassword.php:395
msgid "New password successfully saved. You are now logged in."
msgstr ""
@@ -3174,7 +3185,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr ""
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:394
+#: lib/userprofile.php:406
msgid "Subscribe"
msgstr ""
@@ -3213,7 +3224,7 @@ msgstr ""
msgid "You already repeated that notice."
msgstr "Αδυναμία διαγραφής αυτού του μηνύματος."
-#: actions/repeat.php:114 lib/noticelist.php:674
+#: actions/repeat.php:114 lib/noticelist.php:678
#, fuzzy
msgid "Repeated"
msgstr "Δημιουργία"
@@ -3357,8 +3368,8 @@ msgstr "Προσκλήσεις"
msgid "Description"
msgstr "Περιγραφή"
-#: actions/showapplication.php:192 actions/showgroup.php:438
-#: lib/profileaction.php:176
+#: actions/showapplication.php:192 actions/showgroup.php:439
+#: lib/profileaction.php:182
msgid "Statistics"
msgstr ""
@@ -3469,68 +3480,68 @@ msgstr ""
msgid "%1$s group, page %2$d"
msgstr "Αδύνατη η αποθήκευση των νέων πληροφοριών του προφίλ"
-#: actions/showgroup.php:226
+#: actions/showgroup.php:227
#, fuzzy
msgid "Group profile"
msgstr "Αδύνατη η αποθήκευση του προφίλ."
-#: actions/showgroup.php:271 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:177
+#: actions/showgroup.php:272 actions/tagother.php:118
+#: actions/userauthorization.php:175 lib/userprofile.php:178
msgid "URL"
msgstr ""
-#: actions/showgroup.php:282 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:194
+#: actions/showgroup.php:283 actions/tagother.php:128
+#: actions/userauthorization.php:187 lib/userprofile.php:195
msgid "Note"
msgstr ""
-#: actions/showgroup.php:292 lib/groupeditform.php:184
+#: actions/showgroup.php:293 lib/groupeditform.php:184
msgid "Aliases"
msgstr ""
-#: actions/showgroup.php:301
+#: actions/showgroup.php:302
msgid "Group actions"
msgstr ""
-#: actions/showgroup.php:337
+#: actions/showgroup.php:338
#, php-format
msgid "Notice feed for %s group (RSS 1.0)"
msgstr ""
-#: actions/showgroup.php:343
+#: actions/showgroup.php:344
#, php-format
msgid "Notice feed for %s group (RSS 2.0)"
msgstr ""
-#: actions/showgroup.php:349
+#: actions/showgroup.php:350
#, php-format
msgid "Notice feed for %s group (Atom)"
msgstr ""
-#: actions/showgroup.php:354
+#: actions/showgroup.php:355
#, fuzzy, php-format
msgid "FOAF for %s group"
msgstr "Αδύνατη η αποθήκευση του προφίλ."
-#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91
+#: actions/showgroup.php:391 actions/showgroup.php:448 lib/groupnav.php:91
msgid "Members"
msgstr "Μέλη"
-#: actions/showgroup.php:395 lib/profileaction.php:117
-#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95
-#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71
+#: actions/showgroup.php:396 lib/profileaction.php:117
+#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95
+#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
msgid "(None)"
msgstr ""
-#: actions/showgroup.php:401
+#: actions/showgroup.php:402
msgid "All members"
msgstr ""
-#: actions/showgroup.php:441
+#: actions/showgroup.php:442
msgid "Created"
msgstr "Δημιουργημένος"
-#: actions/showgroup.php:457
+#: actions/showgroup.php:458
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3540,7 +3551,7 @@ msgid ""
"of this group and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
-#: actions/showgroup.php:463
+#: actions/showgroup.php:464
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3549,7 +3560,7 @@ msgid ""
"their life and interests. "
msgstr ""
-#: actions/showgroup.php:491
+#: actions/showgroup.php:492
msgid "Admins"
msgstr "Διαχειριστές"
@@ -3678,7 +3689,7 @@ msgid "Unknown language \"%s\"."
msgstr ""
#: actions/siteadminpanel.php:165
-msgid "Minimum text limit is 140 characters."
+msgid "Minimum text limit is 0 (unlimited)."
msgstr ""
#: actions/siteadminpanel.php:171
@@ -3951,8 +3962,7 @@ msgstr "Ρυθμίσεις OpenID"
msgid "You are not subscribed to that profile."
msgstr ""
-#: actions/subedit.php:83 classes/Subscription.php:89
-#: classes/Subscription.php:116
+#: actions/subedit.php:83 classes/Subscription.php:132
#, fuzzy
msgid "Could not save subscription."
msgstr "Αδύνατη η αποθήκευση των νέων πληροφοριών του προφίλ"
@@ -4045,11 +4055,11 @@ msgstr ""
msgid "%s is not listening to anyone."
msgstr ""
-#: actions/subscriptions.php:199
+#: actions/subscriptions.php:208
msgid "Jabber"
msgstr ""
-#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:222 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr ""
@@ -4082,12 +4092,12 @@ msgstr ""
msgid "Tag %s"
msgstr ""
-#: actions/tagother.php:77 lib/userprofile.php:75
+#: actions/tagother.php:77 lib/userprofile.php:76
msgid "User profile"
msgstr "Προφίλ χρήστη"
#: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:102
+#: lib/userprofile.php:103
msgid "Photo"
msgstr ""
@@ -4398,7 +4408,7 @@ msgstr ""
msgid "Plugins"
msgstr ""
-#: actions/version.php:196 lib/action.php:767
+#: actions/version.php:196 lib/action.php:766
#, fuzzy
msgid "Version"
msgstr "Προσωπικά"
@@ -4407,19 +4417,19 @@ msgstr "Προσωπικά"
msgid "Author(s)"
msgstr ""
-#: classes/File.php:144
+#: classes/File.php:169
#, 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:154
+#: classes/File.php:179
#, php-format
msgid "A file this large would exceed your user quota of %d bytes."
msgstr ""
-#: classes/File.php:161
+#: classes/File.php:186
#, php-format
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
@@ -4461,98 +4471,98 @@ msgstr ""
msgid "Could not update message with new URI."
msgstr ""
-#: classes/Notice.php:172
+#: classes/Notice.php:175
#, php-format
msgid "DB error inserting hashtag: %s"
msgstr "Σφάλμα στη βάση δεδομένων κατά την εισαγωγή hashtag: %s"
-#: classes/Notice.php:241
+#: classes/Notice.php:244
msgid "Problem saving notice. Too long."
msgstr ""
-#: classes/Notice.php:245
+#: classes/Notice.php:248
msgid "Problem saving notice. Unknown user."
msgstr ""
-#: classes/Notice.php:250
+#: classes/Notice.php:253
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
-#: classes/Notice.php:256
+#: classes/Notice.php:259
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
msgstr ""
-#: classes/Notice.php:262
+#: classes/Notice.php:265
msgid "You are banned from posting notices on this site."
msgstr ""
-#: classes/Notice.php:328 classes/Notice.php:354
+#: classes/Notice.php:331 classes/Notice.php:357
msgid "Problem saving notice."
msgstr ""
-#: classes/Notice.php:927
+#: classes/Notice.php:943
msgid "Problem saving group inbox."
msgstr ""
-#: classes/Notice.php:1459
+#: classes/Notice.php:1481
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
-#: classes/Subscription.php:66 lib/oauthstore.php:465
+#: classes/Subscription.php:74 lib/oauthstore.php:465
msgid "You have been banned from subscribing."
msgstr ""
-#: classes/Subscription.php:70
+#: classes/Subscription.php:78
msgid "Already subscribed!"
msgstr ""
-#: classes/Subscription.php:74
+#: classes/Subscription.php:82
msgid "User has blocked you."
msgstr ""
-#: classes/Subscription.php:157
+#: classes/Subscription.php:167
#, fuzzy
msgid "Not subscribed!"
msgstr "Απέτυχε η συνδρομή."
-#: classes/Subscription.php:163
+#: classes/Subscription.php:173
#, fuzzy
msgid "Couldn't delete self-subscription."
msgstr "Απέτυχε η διαγραφή συνδρομής."
-#: classes/Subscription.php:190
+#: classes/Subscription.php:200
#, fuzzy
msgid "Couldn't delete subscription OMB token."
msgstr "Απέτυχε η διαγραφή συνδρομής."
-#: classes/Subscription.php:201 lib/subs.php:69
+#: classes/Subscription.php:211
msgid "Couldn't delete subscription."
msgstr "Απέτυχε η διαγραφή συνδρομής."
-#: classes/User.php:373
+#: classes/User.php:363
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr ""
-#: classes/User_group.php:477
+#: classes/User_group.php:480
msgid "Could not create group."
msgstr "Δεν ήταν δυνατή η δημιουργία ομάδας."
-#: classes/User_group.php:486
+#: classes/User_group.php:489
#, fuzzy
msgid "Could not set group URI."
msgstr "Αδύνατη η αποθήκευση των νέων πληροφοριών του προφίλ"
-#: classes/User_group.php:507
+#: classes/User_group.php:510
#, fuzzy
msgid "Could not set group membership."
msgstr "Αδύνατη η αποθήκευση των νέων πληροφοριών του προφίλ"
-#: classes/User_group.php:521
+#: classes/User_group.php:524
#, fuzzy
msgid "Could not save local group info."
msgstr "Αδύνατη η αποθήκευση των νέων πληροφοριών του προφίλ"
@@ -4594,182 +4604,182 @@ msgstr ""
msgid "Untitled page"
msgstr ""
-#: lib/action.php:424
+#: lib/action.php:423
msgid "Primary site navigation"
msgstr ""
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:430
+#: lib/action.php:429
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr ""
-#: lib/action.php:433
+#: lib/action.php:432
#, fuzzy
msgctxt "MENU"
msgid "Personal"
msgstr "Προσωπικά"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:435
+#: lib/action.php:434
#, fuzzy
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "Αλλάξτε τον κωδικό σας"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:440
+#: lib/action.php:439
#, fuzzy
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "Αδυναμία ανακατεύθηνσης στο διακομιστή: %s"
-#: lib/action.php:443
+#: lib/action.php:442
msgid "Connect"
msgstr "Σύνδεση"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:446
+#: lib/action.php:445
#, fuzzy
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "Επιβεβαίωση διεύθυνσης email"
-#: lib/action.php:449
+#: lib/action.php:448
#, fuzzy
msgctxt "MENU"
msgid "Admin"
msgstr "Διαχειριστής"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:453
+#: lib/action.php:452
#, fuzzy, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "Προσκάλεσε φίλους και συναδέλφους σου να γίνουν μέλη στο %s"
-#: lib/action.php:456
+#: lib/action.php:455
#, fuzzy
msgctxt "MENU"
msgid "Invite"
msgstr "Μήνυμα"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:462
+#: lib/action.php:461
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr ""
-#: lib/action.php:465
+#: lib/action.php:464
#, fuzzy
msgctxt "MENU"
msgid "Logout"
msgstr "Αποσύνδεση"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:470
+#: lib/action.php:469
#, fuzzy
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Δημιουργία ενός λογαριασμού"
-#: lib/action.php:473
+#: lib/action.php:472
#, fuzzy
msgctxt "MENU"
msgid "Register"
msgstr "Περιγραφή"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:476
+#: lib/action.php:475
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr ""
-#: lib/action.php:479
+#: lib/action.php:478
#, fuzzy
msgctxt "MENU"
msgid "Login"
msgstr "Σύνδεση"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:482
+#: lib/action.php:481
#, fuzzy
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Βοηθήστε με!"
-#: lib/action.php:485
+#: lib/action.php:484
#, fuzzy
msgctxt "MENU"
msgid "Help"
msgstr "Βοήθεια"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:488
+#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr ""
-#: lib/action.php:491
+#: lib/action.php:490
msgctxt "MENU"
msgid "Search"
msgstr ""
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:513 lib/adminpanelaction.php:398
+#: lib/action.php:512 lib/adminpanelaction.php:398
msgid "Site notice"
msgstr ""
-#: lib/action.php:579
+#: lib/action.php:578
msgid "Local views"
msgstr ""
-#: lib/action.php:645
+#: lib/action.php:644
msgid "Page notice"
msgstr ""
-#: lib/action.php:747
+#: lib/action.php:746
msgid "Secondary site navigation"
msgstr ""
-#: lib/action.php:752
+#: lib/action.php:751
msgid "Help"
msgstr "Βοήθεια"
-#: lib/action.php:754
+#: lib/action.php:753
msgid "About"
msgstr "Περί"
-#: lib/action.php:756
+#: lib/action.php:755
msgid "FAQ"
msgstr "Συχνές ερωτήσεις"
-#: lib/action.php:760
+#: lib/action.php:759
msgid "TOS"
msgstr ""
-#: lib/action.php:763
+#: lib/action.php:762
msgid "Privacy"
msgstr ""
-#: lib/action.php:765
+#: lib/action.php:764
msgid "Source"
msgstr ""
-#: lib/action.php:769
+#: lib/action.php:768
msgid "Contact"
msgstr "Επικοινωνία"
-#: lib/action.php:771
+#: lib/action.php:770
msgid "Badge"
msgstr ""
-#: lib/action.php:799
+#: lib/action.php:798
msgid "StatusNet software license"
msgstr ""
-#: lib/action.php:802
+#: lib/action.php:803
#, fuzzy, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4778,13 +4788,13 @@ msgstr ""
"To **%%site.name%%** είναι μία υπηρεσία microblogging (μικρο-ιστολογίου) που "
"έφερε κοντά σας το [%%site.broughtby%%](%%site.broughtbyurl%%). "
-#: lib/action.php:804
+#: lib/action.php:805
#, fuzzy, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr ""
"Το **%%site.name%%** είναι μία υπηρεσία microblogging (μικρο-ιστολογίου). "
-#: lib/action.php:806
+#: lib/action.php:808
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4792,53 +4802,57 @@ msgid ""
"org/licensing/licenses/agpl-3.0.html)."
msgstr ""
-#: lib/action.php:821
+#: lib/action.php:823
msgid "Site content license"
msgstr ""
-#: lib/action.php:826
+#: lib/action.php:828
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
-#: lib/action.php:831
+#: lib/action.php:833
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
-#: lib/action.php:834
+#: lib/action.php:836
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
-#: lib/action.php:847
+#: lib/action.php:849
msgid "All "
msgstr ""
-#: lib/action.php:853
+#: lib/action.php:855
msgid "license."
msgstr ""
-#: lib/action.php:1152
+#: lib/action.php:1154
msgid "Pagination"
msgstr ""
-#: lib/action.php:1161
+#: lib/action.php:1163
msgid "After"
msgstr ""
-#: lib/action.php:1169
+#: lib/action.php:1171
msgid "Before"
msgstr ""
-#: lib/activity.php:453
+#: lib/activity.php:120
+msgid "Expecting a root feed element but got a whole XML document."
+msgstr ""
+
+#: lib/activityutils.php:208
msgid "Can't handle remote content yet."
msgstr ""
-#: lib/activity.php:481
+#: lib/activityutils.php:236
msgid "Can't handle embedded XML content yet."
msgstr ""
-#: lib/activity.php:485
+#: lib/activityutils.php:240
msgid "Can't handle embedded Base64 content yet."
msgstr ""
@@ -4937,7 +4951,7 @@ msgstr "Επιβεβαίωση διεύθυνσης email"
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
-#: lib/apiauth.php:272
+#: lib/apiauth.php:276
#, php-format
msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s"
msgstr ""
@@ -5012,11 +5026,11 @@ msgstr ""
msgid "Attachments"
msgstr ""
-#: lib/attachmentlist.php:265
+#: lib/attachmentlist.php:263
msgid "Author"
msgstr ""
-#: lib/attachmentlist.php:278
+#: lib/attachmentlist.php:276
msgid "Provider"
msgstr ""
@@ -5038,37 +5052,50 @@ msgstr "Ο κωδικός αποθηκεύτηκε."
msgid "Password changing is not allowed"
msgstr "Ο κωδικός αποθηκεύτηκε."
-#: lib/channel.php:138 lib/channel.php:158
+#: lib/channel.php:157 lib/channel.php:177
msgid "Command results"
msgstr ""
-#: lib/channel.php:210 lib/mailhandler.php:142
+#: lib/channel.php:229 lib/mailhandler.php:142
msgid "Command complete"
msgstr ""
-#: lib/channel.php:221
+#: lib/channel.php:240
msgid "Command failed"
msgstr ""
-#: lib/command.php:44
-msgid "Sorry, this command is not yet implemented."
+#: lib/command.php:83 lib/command.php:105
+msgid "Notice with that id does not exist"
+msgstr ""
+
+#: lib/command.php:99 lib/command.php:570
+msgid "User has no last notice"
msgstr ""
-#: lib/command.php:88
+#: lib/command.php:125
#, fuzzy, php-format
msgid "Could not find a user with nickname %s"
msgstr "Απέτυχε η ενημέρωση χρήστη μέσω επιβεβαιωμένης email διεύθυνσης."
-#: lib/command.php:92
+#: lib/command.php:143
+#, fuzzy, php-format
+msgid "Could not find a local user with nickname %s"
+msgstr "Απέτυχε η ενημέρωση χρήστη μέσω επιβεβαιωμένης email διεύθυνσης."
+
+#: lib/command.php:176
+msgid "Sorry, this command is not yet implemented."
+msgstr ""
+
+#: lib/command.php:221
msgid "It does not make a lot of sense to nudge yourself!"
msgstr ""
-#: lib/command.php:99
+#: lib/command.php:228
#, php-format
msgid "Nudge sent to %s"
msgstr ""
-#: lib/command.php:126
+#: lib/command.php:254
#, php-format
msgid ""
"Subscriptions: %1$s\n"
@@ -5076,201 +5103,198 @@ msgid ""
"Notices: %3$s"
msgstr ""
-#: lib/command.php:152 lib/command.php:390 lib/command.php:451
-msgid "Notice with that id does not exist"
-msgstr ""
-
-#: lib/command.php:168 lib/command.php:406 lib/command.php:467
-#: lib/command.php:523
-msgid "User has no last notice"
-msgstr ""
-
-#: lib/command.php:190
+#: lib/command.php:296
msgid "Notice marked as fave."
msgstr ""
-#: lib/command.php:217
+#: lib/command.php:317
#, fuzzy
msgid "You are already a member of that group"
msgstr "Ομάδες με τα περισσότερα μέλη"
-#: lib/command.php:231
+#: lib/command.php:331
#, fuzzy, php-format
msgid "Could not join user %s to group %s"
msgstr "Αδύνατη η αποθήκευση των νέων πληροφοριών του προφίλ"
-#: lib/command.php:236
+#: lib/command.php:336
#, fuzzy, php-format
msgid "%s joined group %s"
msgstr "ομάδες των χρηστών %s"
-#: lib/command.php:275
+#: lib/command.php:373
#, fuzzy, php-format
msgid "Could not remove user %s to group %s"
msgstr "Αδύνατη η αποθήκευση του προφίλ."
-#: lib/command.php:280
+#: lib/command.php:378
#, fuzzy, php-format
msgid "%s left group %s"
msgstr "ομάδες των χρηστών %s"
-#: lib/command.php:309
+#: lib/command.php:401
#, fuzzy, php-format
msgid "Fullname: %s"
msgstr "Ονοματεπώνυμο"
-#: lib/command.php:312 lib/mail.php:258
+#: lib/command.php:404 lib/mail.php:258
#, php-format
msgid "Location: %s"
msgstr ""
-#: lib/command.php:315 lib/mail.php:260
+#: lib/command.php:407 lib/mail.php:260
#, php-format
msgid "Homepage: %s"
msgstr ""
-#: lib/command.php:318
+#: lib/command.php:410
#, php-format
msgid "About: %s"
msgstr ""
-#: lib/command.php:349
+#: lib/command.php:437
+#, php-format
+msgid ""
+"%s is a remote profile; you can only send direct messages to users on the "
+"same server."
+msgstr ""
+
+#: lib/command.php:450
#, php-format
msgid "Message too long - maximum is %d characters, you sent %d"
msgstr ""
-#: lib/command.php:367
+#: lib/command.php:468
#, php-format
msgid "Direct message to %s sent"
msgstr ""
-#: lib/command.php:369
+#: lib/command.php:470
msgid "Error sending direct message."
msgstr ""
-#: lib/command.php:413
+#: lib/command.php:490
#, fuzzy
msgid "Cannot repeat your own notice"
msgstr "Αδυναμία διαγραφής αυτού του μηνύματος."
-#: lib/command.php:418
+#: lib/command.php:495
#, fuzzy
msgid "Already repeated that notice"
msgstr "Αδυναμία διαγραφής αυτού του μηνύματος."
-#: lib/command.php:426
+#: lib/command.php:503
#, fuzzy, php-format
msgid "Notice from %s repeated"
msgstr "Ρυθμίσεις OpenID"
-#: lib/command.php:428
+#: lib/command.php:505
msgid "Error repeating notice."
msgstr ""
-#: lib/command.php:482
+#: lib/command.php:536
#, php-format
msgid "Notice too long - maximum is %d characters, you sent %d"
msgstr ""
-#: lib/command.php:491
+#: lib/command.php:545
#, php-format
msgid "Reply to %s sent"
msgstr ""
-#: lib/command.php:493
+#: lib/command.php:547
msgid "Error saving notice."
msgstr ""
-#: lib/command.php:547
+#: lib/command.php:594
msgid "Specify the name of the user to subscribe to"
msgstr ""
-#: lib/command.php:554 lib/command.php:589
-#, fuzzy
-msgid "No such user"
-msgstr "Κανένας τέτοιος χρήστης."
+#: lib/command.php:602
+msgid "Can't subscribe to OMB profiles by command."
+msgstr ""
-#: lib/command.php:561
+#: lib/command.php:608
#, php-format
msgid "Subscribed to %s"
msgstr ""
-#: lib/command.php:582 lib/command.php:685
+#: lib/command.php:629 lib/command.php:728
msgid "Specify the name of the user to unsubscribe from"
msgstr ""
-#: lib/command.php:595
+#: lib/command.php:638
#, php-format
msgid "Unsubscribed from %s"
msgstr ""
-#: lib/command.php:613 lib/command.php:636
+#: lib/command.php:656 lib/command.php:679
msgid "Command not yet implemented."
msgstr ""
-#: lib/command.php:616
+#: lib/command.php:659
msgid "Notification off."
msgstr ""
-#: lib/command.php:618
+#: lib/command.php:661
msgid "Can't turn off notification."
msgstr ""
-#: lib/command.php:639
+#: lib/command.php:682
msgid "Notification on."
msgstr ""
-#: lib/command.php:641
+#: lib/command.php:684
msgid "Can't turn on notification."
msgstr ""
-#: lib/command.php:654
+#: lib/command.php:697
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:665
+#: lib/command.php:708
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:692
+#: lib/command.php:735
#, fuzzy, php-format
msgid "Unsubscribed %s"
msgstr "Απέτυχε η συνδρομή."
-#: lib/command.php:709
+#: lib/command.php:752
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους."
-#: lib/command.php:711
+#: lib/command.php:754
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους."
msgstr[1] "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους."
-#: lib/command.php:731
+#: lib/command.php:774
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους."
-#: lib/command.php:733
+#: lib/command.php:776
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους."
msgstr[1] "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους."
-#: lib/command.php:753
+#: lib/command.php:796
msgid "You are not a member of any groups."
msgstr "Δεν είστε μέλος καμίας ομάδας."
-#: lib/command.php:755
+#: lib/command.php:798
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Ομάδες με τα περισσότερα μέλη"
msgstr[1] "Ομάδες με τα περισσότερα μέλη"
-#: lib/command.php:769
+#: lib/command.php:812
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5312,20 +5336,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:148
+#: lib/common.php:135
#, fuzzy
msgid "No configuration file found. "
msgstr "Ο κωδικός επιβεβαίωσης δεν βρέθηκε."
-#: lib/common.php:149
+#: lib/common.php:136
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:151
+#: lib/common.php:138
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:152
+#: lib/common.php:139
msgid "Go to the installer."
msgstr ""
@@ -5501,25 +5525,25 @@ msgstr ""
msgid "This page is not available in a media type you accept"
msgstr ""
-#: lib/imagefile.php:75
+#: lib/imagefile.php:72
+msgid "Unsupported image file format."
+msgstr ""
+
+#: lib/imagefile.php:88
#, php-format
msgid "That file is too big. The maximum file size is %s."
msgstr ""
-#: lib/imagefile.php:80
+#: lib/imagefile.php:93
msgid "Partial upload."
msgstr ""
-#: lib/imagefile.php:88 lib/mediafile.php:170
+#: lib/imagefile.php:101 lib/mediafile.php:170
msgid "System error uploading file."
msgstr ""
-#: lib/imagefile.php:96
-msgid "Not an image or corrupt file."
-msgstr ""
-
#: lib/imagefile.php:109
-msgid "Unsupported image file format."
+msgid "Not an image or corrupt file."
msgstr ""
#: lib/imagefile.php:122
@@ -5527,24 +5551,24 @@ msgstr ""
msgid "Lost our file."
msgstr "Αδύνατη η αποθήκευση του προφίλ."
-#: lib/imagefile.php:166 lib/imagefile.php:231
+#: lib/imagefile.php:163 lib/imagefile.php:224
msgid "Unknown file type"
msgstr ""
-#: lib/imagefile.php:251
+#: lib/imagefile.php:244
msgid "MB"
msgstr ""
-#: lib/imagefile.php:253
+#: lib/imagefile.php:246
msgid "kB"
msgstr ""
-#: lib/jabber.php:220
+#: lib/jabber.php:387
#, php-format
msgid "[%s]"
msgstr ""
-#: lib/jabber.php:400
+#: lib/jabber.php:567
#, php-format
msgid "Unknown inbox source %d."
msgstr ""
@@ -5741,7 +5765,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:482
+#: lib/mailbox.php:227 lib/noticelist.php:486
msgid "from"
msgstr "από"
@@ -5869,48 +5893,48 @@ msgid ""
"try again later"
msgstr ""
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr ""
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "N"
msgstr ""
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "S"
msgstr ""
-#: lib/noticelist.php:431
+#: lib/noticelist.php:432
msgid "E"
msgstr ""
-#: lib/noticelist.php:431
+#: lib/noticelist.php:432
msgid "W"
msgstr ""
-#: lib/noticelist.php:438
+#: lib/noticelist.php:439
msgid "at"
msgstr ""
-#: lib/noticelist.php:566
+#: lib/noticelist.php:570
msgid "in context"
msgstr ""
-#: lib/noticelist.php:601
+#: lib/noticelist.php:605
msgid "Repeated by"
msgstr "Επαναλαμβάνεται από"
-#: lib/noticelist.php:628
+#: lib/noticelist.php:632
msgid "Reply to this notice"
msgstr ""
-#: lib/noticelist.php:629
+#: lib/noticelist.php:633
msgid "Reply"
msgstr ""
-#: lib/noticelist.php:673
+#: lib/noticelist.php:677
#, fuzzy
msgid "Notice repeated"
msgstr "Ρυθμίσεις OpenID"
@@ -5985,7 +6009,7 @@ msgstr ""
msgid "Unknown"
msgstr ""
-#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr ""
@@ -5993,7 +6017,7 @@ msgstr ""
msgid "All subscriptions"
msgstr "Όλες οι συνδρομές"
-#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90
+#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr ""
@@ -6001,15 +6025,20 @@ msgstr ""
msgid "All subscribers"
msgstr ""
-#: lib/profileaction.php:180
+#: lib/profileaction.php:186
msgid "User ID"
msgstr ""
-#: lib/profileaction.php:185
+#: lib/profileaction.php:191
msgid "Member since"
msgstr "Μέλος από"
-#: lib/profileaction.php:247
+#. TRANS: Average count of posts made per day since account registration
+#: lib/profileaction.php:230
+msgid "Daily average"
+msgstr ""
+
+#: lib/profileaction.php:259
msgid "All groups"
msgstr ""
@@ -6056,7 +6085,7 @@ msgstr "Αδυναμία διαγραφής αυτού του μηνύματος
msgid "Revoke the \"%s\" role from this user"
msgstr ""
-#: lib/router.php:671
+#: lib/router.php:704
msgid "No single user defined for single-user mode."
msgstr ""
@@ -6186,91 +6215,100 @@ msgstr ""
msgid "Unsubscribe"
msgstr ""
-#: lib/userprofile.php:116
+#: lib/usernoprofileexception.php:58
+#, php-format
+msgid "User %s (%d) has no profile record."
+msgstr ""
+
+#: lib/userprofile.php:117
msgid "Edit Avatar"
msgstr ""
-#: lib/userprofile.php:236
+#: lib/userprofile.php:234 lib/userprofile.php:248
msgid "User actions"
msgstr ""
-#: lib/userprofile.php:251
+#: lib/userprofile.php:237
+msgid "User deletion in progress..."
+msgstr ""
+
+#: lib/userprofile.php:263
msgid "Edit profile settings"
msgstr "Επεξεργασία ρυθμίσεων προφίλ"
-#: lib/userprofile.php:252
+#: lib/userprofile.php:264
msgid "Edit"
msgstr "Επεξεργασία"
-#: lib/userprofile.php:275
+#: lib/userprofile.php:287
msgid "Send a direct message to this user"
msgstr ""
-#: lib/userprofile.php:276
+#: lib/userprofile.php:288
msgid "Message"
msgstr "Μήνυμα"
-#: lib/userprofile.php:314
+#: lib/userprofile.php:326
msgid "Moderate"
msgstr ""
-#: lib/userprofile.php:352
+#: lib/userprofile.php:364
#, fuzzy
msgid "User role"
msgstr "Προφίλ χρήστη"
-#: lib/userprofile.php:354
+#: lib/userprofile.php:366
#, fuzzy
msgctxt "role"
msgid "Administrator"
msgstr "Διαχειριστές"
-#: lib/userprofile.php:355
+#: lib/userprofile.php:367
msgctxt "role"
msgid "Moderator"
msgstr ""
-#: lib/util.php:1015
+#: lib/util.php:1046
msgid "a few seconds ago"
msgstr ""
-#: lib/util.php:1017
+#: lib/util.php:1048
msgid "about a minute ago"
msgstr ""
-#: lib/util.php:1019
+#: lib/util.php:1050
#, php-format
msgid "about %d minutes ago"
msgstr ""
-#: lib/util.php:1021
+#: lib/util.php:1052
msgid "about an hour ago"
msgstr ""
-#: lib/util.php:1023
+#: lib/util.php:1054
#, php-format
msgid "about %d hours ago"
msgstr ""
-#: lib/util.php:1025
+#: lib/util.php:1056
msgid "about a day ago"
msgstr ""
-#: lib/util.php:1027
+#: lib/util.php:1058
#, php-format
msgid "about %d days ago"
msgstr ""
-#: lib/util.php:1029
+#: lib/util.php:1060
msgid "about a month ago"
msgstr ""
-#: lib/util.php:1031
+#: lib/util.php:1062
#, php-format
msgid "about %d months ago"
msgstr ""
-#: lib/util.php:1033
+#: lib/util.php:1064
msgid "about a year ago"
msgstr ""
@@ -6284,7 +6322,7 @@ msgstr "Το %s δεν είναι ένα έγκυρο χρώμα!"
msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr ""
-#: lib/xmppmanager.php:402
+#: lib/xmppmanager.php:403
#, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d."
msgstr ""
diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po
index 8d846c4e2..06b928ec2 100644
--- a/locale/en_GB/LC_MESSAGES/statusnet.po
+++ b/locale/en_GB/LC_MESSAGES/statusnet.po
@@ -10,12 +10,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-06 23:49+0000\n"
-"PO-Revision-Date: 2010-03-06 23:49:40+0000\n"
+"POT-Creation-Date: 2010-04-05 18:54+0000\n"
+"PO-Revision-Date: 2010-04-05 18:54:58+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 (r63350); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64621); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: en-gb\n"
"X-Message-Group: out-statusnet\n"
@@ -94,9 +94,9 @@ msgstr "No such page"
#: 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:90
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78
+#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
@@ -105,10 +105,8 @@ msgstr "No such page"
#: actions/remotesubscribe.php:154 actions/replies.php:73
#: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:163 lib/command.php:302
-#: lib/command.php:355 lib/command.php:401 lib/command.php:462
-#: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82
-#: lib/profileaction.php:77
+#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: lib/mailbox.php:82 lib/profileaction.php:77
msgid "No such user."
msgstr "No such user."
@@ -202,18 +200,18 @@ msgstr "Updates from %1$s and friends on %2$s!"
#: 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:132
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:136
#: actions/apigrouplistall.php:120 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:135
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
-#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184
-#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148
+#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:174
+#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173
+#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
-#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
+#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
msgid "API method not found."
msgstr "API method not found."
@@ -226,8 +224,8 @@ msgstr "API method not found."
#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65
-#: actions/apistatusesupdate.php:118
+#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
msgid "This method requires a POST."
msgstr "This method requires a POST."
@@ -260,7 +258,7 @@ msgid "Could not save profile."
msgstr "Couldn't save profile."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:97
+#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
#: actions/designadminpanel.php:122 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
@@ -346,7 +344,7 @@ msgstr "No status found with that ID."
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:176
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
msgid "Could not create favorite."
msgstr "Could not create favourite."
@@ -463,7 +461,7 @@ msgstr "Group not found!"
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:221
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
msgid "You have been blocked from that group by the admin."
msgstr "You have been blocked from that group by the admin."
@@ -481,11 +479,18 @@ msgstr "You are not a member of this group."
msgid "Could not remove user %1$s from group %2$s."
msgstr "Could not remove user %1$s to group %2$s."
-#: actions/apigrouplist.php:95
+#. TRANS: %s is a user name
+#: actions/apigrouplist.php:97
#, php-format
msgid "%s's groups"
msgstr "%s's groups"
+#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s
+#: actions/apigrouplist.php:107
+#, fuzzy, php-format
+msgid "%1$s groups %2$s is a member of."
+msgstr "Groups %s is a member of"
+
#: actions/apigrouplistall.php:90 actions/usergroups.php:62
#, php-format
msgid "%s groups"
@@ -513,7 +518,7 @@ msgstr "Invalid token."
#: 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:337
+#: actions/profilesettings.php:194 actions/recoverpassword.php:350
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
@@ -576,15 +581,15 @@ msgstr ""
"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."
-#: actions/apioauthauthorize.php:310 lib/action.php:438
+#: actions/apioauthauthorize.php:310 lib/action.php:437
msgid "Account"
msgstr "Account"
#: actions/apioauthauthorize.php:313 actions/login.php:230
#: actions/profilesettings.php:106 actions/register.php:424
-#: actions/showgroup.php:244 actions/tagother.php:94
+#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
-#: lib/userprofile.php:131
+#: lib/userprofile.php:132
msgid "Nickname"
msgstr "Nickname"
@@ -653,12 +658,12 @@ msgstr "Max notice size is %d chars, including attachment URL."
msgid "Unsupported format."
msgstr "Unsupported format."
-#: actions/apitimelinefavorites.php:108
+#: actions/apitimelinefavorites.php:109
#, php-format
msgid "%1$s / Favorites from %2$s"
msgstr "%1$s / Favourites from %2$s"
-#: actions/apitimelinefavorites.php:117
+#: actions/apitimelinefavorites.php:118
#, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "%1$s updates favourited by %2$s / %2$s."
@@ -668,7 +673,7 @@ msgstr "%1$s updates favourited by %2$s / %2$s."
msgid "%1$s / Updates mentioning %2$s"
msgstr "%1$s / Updates mentioning %2$s"
-#: actions/apitimelinementions.php:127
+#: actions/apitimelinementions.php:130
#, 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."
@@ -678,7 +683,7 @@ msgstr "%1$s updates that reply to updates from %2$s / %3$s."
msgid "%s public timeline"
msgstr "%s public timeline"
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "%s updates from everyone!"
@@ -693,12 +698,12 @@ msgstr "Repeated to %s"
msgid "Repeats of %s"
msgstr "Repeats of %s"
-#: actions/apitimelinetag.php:102 actions/tag.php:67
+#: actions/apitimelinetag.php:104 actions/tag.php:67
#, php-format
msgid "Notices tagged with %s"
msgstr "Notices tagged with %s"
-#: actions/apitimelinetag.php:104 actions/tagrss.php:65
+#: actions/apitimelinetag.php:106 actions/tagrss.php:65
#, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Updates tagged with %1$s on %2$s!"
@@ -726,7 +731,7 @@ msgstr "No size."
msgid "Invalid size."
msgstr "Invalid size."
-#: actions/avatarsettings.php:67 actions/showgroup.php:229
+#: actions/avatarsettings.php:67 actions/showgroup.php:230
#: lib/accountsettingsaction.php:112
msgid "Avatar"
msgstr "Avatar"
@@ -758,7 +763,7 @@ msgid "Preview"
msgstr "Preview"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:655
+#: lib/deleteuserform.php:66 lib/noticelist.php:659
msgid "Delete"
msgstr "Delete"
@@ -770,23 +775,28 @@ msgstr "Upload"
msgid "Crop"
msgstr "Crop"
-#: actions/avatarsettings.php:328
+#: actions/avatarsettings.php:305
+#, fuzzy
+msgid "No file uploaded."
+msgstr "No profile specified."
+
+#: actions/avatarsettings.php:332
msgid "Pick a square area of the image to be your avatar"
msgstr "Pick a square area of the image to be your avatar"
-#: actions/avatarsettings.php:343 actions/grouplogo.php:380
+#: actions/avatarsettings.php:347 actions/grouplogo.php:380
msgid "Lost our file data."
msgstr "Lost our file data."
-#: actions/avatarsettings.php:366
+#: actions/avatarsettings.php:370
msgid "Avatar updated."
msgstr "Avatar updated."
-#: actions/avatarsettings.php:369
+#: actions/avatarsettings.php:373
msgid "Failed updating avatar."
msgstr "Failed updating avatar."
-#: actions/avatarsettings.php:393
+#: actions/avatarsettings.php:397
msgid "Avatar deleted."
msgstr "Avatar deleted."
@@ -841,8 +851,8 @@ msgstr "Failed to save block information."
#: actions/groupunblock.php:86 actions/joingroup.php:82
#: actions/joingroup.php:93 actions/leavegroup.php:82
#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212
-#: lib/command.php:260
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162
+#: lib/command.php:358
msgid "No such group."
msgstr "No such group."
@@ -924,7 +934,7 @@ msgid "Conversation"
msgstr "Conversation"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:218 lib/searchgroupnav.php:82
+#: lib/profileaction.php:224 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "Notices"
@@ -943,7 +953,7 @@ msgstr "You are not the owner of this application."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1217
+#: lib/action.php:1219
msgid "There was a problem with your session token."
msgstr "There was a problem with your session token."
@@ -1004,7 +1014,7 @@ msgstr "Are you sure you want to delete this notice?"
msgid "Do not delete this notice"
msgstr "Do not delete this notice"
-#: actions/deletenotice.php:146 lib/noticelist.php:655
+#: actions/deletenotice.php:146 lib/noticelist.php:659
msgid "Delete this notice"
msgstr "Delete this notice"
@@ -1141,7 +1151,7 @@ msgstr "Reset back to default"
#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:208
+#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
#: actions/tagother.php:154 actions/useradminpanel.php:294
#: lib/applicationeditform.php:333 lib/applicationeditform.php:334
#: lib/designsettings.php:256 lib/groupeditform.php:202
@@ -1257,7 +1267,7 @@ msgstr "description is too long (max %d chars)."
msgid "Could not update group."
msgstr "Could not update group."
-#: actions/editgroup.php:264 classes/User_group.php:493
+#: actions/editgroup.php:264 classes/User_group.php:496
msgid "Could not create aliases."
msgstr "Could not create aliases"
@@ -1746,7 +1756,7 @@ msgstr "%s timeline"
msgid "Updates from members of %1$s on %2$s!"
msgstr "Updates from members of %1$s on %2$s!"
-#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232
+#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244
#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr "Groups"
@@ -1952,7 +1962,7 @@ msgstr "Invite new users"
msgid "You are already subscribed to these users:"
msgstr "You are already subscribed to these users:"
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
#, php-format
msgid "%1$s (%2$s)"
msgstr "%1$s (%2$s)"
@@ -2083,7 +2093,7 @@ msgstr "%1$s joined group %2$s"
msgid "You must be logged in to leave a group."
msgstr "You must be logged in to leave a group."
-#: actions/leavegroup.php:100 lib/command.php:265
+#: actions/leavegroup.php:100 lib/command.php:363
msgid "You are not a member of that group."
msgstr "You are not a member of that group."
@@ -2196,12 +2206,12 @@ msgstr "Use this form to create a new group."
msgid "New message"
msgstr "New message"
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
msgid "You can't send a message to this user."
msgstr "You can't send a message to this user."
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342
-#: lib/command.php:475
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
+#: lib/command.php:529
msgid "No content!"
msgstr "No content!"
@@ -2209,7 +2219,7 @@ msgstr "No content!"
msgid "No recipient specified."
msgstr "No recipient specified."
-#: actions/newmessage.php:164 lib/command.php:361
+#: actions/newmessage.php:164 lib/command.php:462
msgid ""
"Don't send a message to yourself; just say it to yourself quietly instead."
msgstr ""
@@ -2224,7 +2234,7 @@ msgstr "Message sent"
msgid "Direct message to %s sent."
msgstr "Could not create application."
-#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189
msgid "Ajax Error"
msgstr "Ajax Error"
@@ -2232,7 +2242,7 @@ msgstr "Ajax Error"
msgid "New notice"
msgstr "New notice"
-#: actions/newnotice.php:211
+#: actions/newnotice.php:217
msgid "Notice posted"
msgstr "Notice posted"
@@ -2342,7 +2352,7 @@ msgstr ""
msgid "Notice has no profile"
msgstr "Notice has no profile"
-#: actions/oembed.php:86 actions/shownotice.php:180
+#: actions/oembed.php:86 actions/shownotice.php:175
#, php-format
msgid "%1$s's status on %2$s"
msgstr "%1$s's status on %2$s"
@@ -2355,8 +2365,8 @@ msgstr "content type "
msgid "Only "
msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042
-#: lib/apiaction.php:1070 lib/apiaction.php:1179
+#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1068
+#: lib/apiaction.php:1096 lib/apiaction.php:1212
msgid "Not a supported data format."
msgstr "Not a supported data format."
@@ -2487,7 +2497,7 @@ msgstr "Incorrect old password"
msgid "Error saving user; invalid."
msgstr "Error saving user; invalid."
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
msgid "Can't save new password."
msgstr "Can't save new password."
@@ -2699,8 +2709,8 @@ 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/showgroup.php:255 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:149
+#: actions/showgroup.php:256 actions/tagother.php:104
+#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Full name"
@@ -2727,9 +2737,9 @@ msgid "Bio"
msgstr "Bio"
#: actions/profilesettings.php:132 actions/register.php:471
-#: actions/showgroup.php:264 actions/tagother.php:112
+#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
-#: lib/userprofile.php:164
+#: lib/userprofile.php:165
msgid "Location"
msgstr "Location"
@@ -2743,7 +2753,7 @@ msgstr ""
#: actions/profilesettings.php:145 actions/tagother.php:149
#: actions/tagother.php:209 lib/subscriptionlist.php:106
-#: lib/subscriptionlist.php:108 lib/userprofile.php:209
+#: lib/subscriptionlist.php:108 lib/userprofile.php:210
msgid "Tags"
msgstr "Tags"
@@ -2978,7 +2988,7 @@ msgstr "Reset password"
msgid "Recover password"
msgstr "Recover password"
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
msgid "Password recovery requested"
msgstr "Password recovery requested"
@@ -2998,19 +3008,19 @@ msgstr "Reset"
msgid "Enter a nickname or email address."
msgstr "Enter a nickname or e-mail address."
-#: actions/recoverpassword.php:272
+#: actions/recoverpassword.php:282
msgid "No user with that email address or username."
msgstr "No user with that e-mail address or username."
-#: actions/recoverpassword.php:287
+#: actions/recoverpassword.php:299
msgid "No registered email address for that user."
msgstr "No registered e-mail address for that user."
-#: actions/recoverpassword.php:301
+#: actions/recoverpassword.php:313
msgid "Error saving address confirmation."
msgstr "Error saving address confirmation."
-#: actions/recoverpassword.php:325
+#: actions/recoverpassword.php:338
msgid ""
"Instructions for recovering your password have been sent to the email "
"address registered to your account."
@@ -3018,23 +3028,23 @@ msgstr ""
"Instructions for recovering your password have been sent to the e-mail "
"address registered to your account."
-#: actions/recoverpassword.php:344
+#: actions/recoverpassword.php:357
msgid "Unexpected password reset."
msgstr "Unexpected password reset."
-#: actions/recoverpassword.php:352
+#: actions/recoverpassword.php:365
msgid "Password must be 6 chars or more."
msgstr "Password must be 6 chars or more."
-#: actions/recoverpassword.php:356
+#: actions/recoverpassword.php:369
msgid "Password and confirmation do not match."
msgstr "Password and confirmation do not match."
-#: actions/recoverpassword.php:375 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:248
msgid "Error setting user."
msgstr "Error setting user."
-#: actions/recoverpassword.php:382
+#: actions/recoverpassword.php:395
msgid "New password successfully saved. You are now logged in."
msgstr "New password successfully saved. You are now logged in."
@@ -3194,7 +3204,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "URL of your profile on another compatible microblogging service"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:394
+#: lib/userprofile.php:406
msgid "Subscribe"
msgstr "Subscribe"
@@ -3230,7 +3240,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:674
+#: actions/repeat.php:114 lib/noticelist.php:678
msgid "Repeated"
msgstr "Repeated"
@@ -3373,8 +3383,8 @@ msgstr "Organization"
msgid "Description"
msgstr "Description"
-#: actions/showapplication.php:192 actions/showgroup.php:438
-#: lib/profileaction.php:176
+#: actions/showapplication.php:192 actions/showgroup.php:439
+#: lib/profileaction.php:182
msgid "Statistics"
msgstr "Statistics"
@@ -3491,67 +3501,67 @@ msgstr "%s group"
msgid "%1$s group, page %2$d"
msgstr "%1$s group, page %2$d"
-#: actions/showgroup.php:226
+#: actions/showgroup.php:227
msgid "Group profile"
msgstr "Group profile"
-#: actions/showgroup.php:271 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:177
+#: actions/showgroup.php:272 actions/tagother.php:118
+#: actions/userauthorization.php:175 lib/userprofile.php:178
msgid "URL"
msgstr "URL"
-#: actions/showgroup.php:282 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:194
+#: actions/showgroup.php:283 actions/tagother.php:128
+#: actions/userauthorization.php:187 lib/userprofile.php:195
msgid "Note"
msgstr "Note"
-#: actions/showgroup.php:292 lib/groupeditform.php:184
+#: actions/showgroup.php:293 lib/groupeditform.php:184
msgid "Aliases"
msgstr ""
-#: actions/showgroup.php:301
+#: actions/showgroup.php:302
msgid "Group actions"
msgstr "Group actions"
-#: actions/showgroup.php:337
+#: actions/showgroup.php:338
#, php-format
msgid "Notice feed for %s group (RSS 1.0)"
msgstr "Notice feed for %s group (RSS 1.0)"
-#: actions/showgroup.php:343
+#: actions/showgroup.php:344
#, php-format
msgid "Notice feed for %s group (RSS 2.0)"
msgstr "Notice feed for %s group (RSS 2.0)"
-#: actions/showgroup.php:349
+#: actions/showgroup.php:350
#, php-format
msgid "Notice feed for %s group (Atom)"
msgstr "Notice feed for %s group (Atom)"
-#: actions/showgroup.php:354
+#: actions/showgroup.php:355
#, php-format
msgid "FOAF for %s group"
msgstr "Outbox for %s"
-#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91
+#: actions/showgroup.php:391 actions/showgroup.php:448 lib/groupnav.php:91
msgid "Members"
msgstr "Members"
-#: actions/showgroup.php:395 lib/profileaction.php:117
-#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95
-#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71
+#: actions/showgroup.php:396 lib/profileaction.php:117
+#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95
+#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
msgid "(None)"
msgstr "(None)"
-#: actions/showgroup.php:401
+#: actions/showgroup.php:402
msgid "All members"
msgstr "All members"
-#: actions/showgroup.php:441
+#: actions/showgroup.php:442
msgid "Created"
msgstr "Created"
-#: actions/showgroup.php:457
+#: actions/showgroup.php:458
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3566,7 +3576,7 @@ msgstr ""
"their life and interests. [Join now](%%%%action.register%%%%) to become part "
"of this group and many more! ([Read more](%%%%doc.help%%%%))"
-#: actions/showgroup.php:463
+#: actions/showgroup.php:464
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3579,7 +3589,7 @@ msgstr ""
"[StatusNet](http://status.net/) tool. Its members share short messages about "
"their life and interests. "
-#: actions/showgroup.php:491
+#: actions/showgroup.php:492
msgid "Admins"
msgstr "Admins"
@@ -3712,7 +3722,8 @@ msgid "Unknown language \"%s\"."
msgstr ""
#: actions/siteadminpanel.php:165
-msgid "Minimum text limit is 140 characters."
+#, fuzzy
+msgid "Minimum text limit is 0 (unlimited)."
msgstr "Minimum text limit is 140 characters."
#: actions/siteadminpanel.php:171
@@ -3988,8 +3999,7 @@ msgstr "Save site settings"
msgid "You are not subscribed to that profile."
msgstr "You are not subscribed to that profile."
-#: actions/subedit.php:83 classes/Subscription.php:89
-#: classes/Subscription.php:116
+#: actions/subedit.php:83 classes/Subscription.php:132
msgid "Could not save subscription."
msgstr "Could not save subscription."
@@ -4080,11 +4090,11 @@ msgstr ""
msgid "%s is not listening to anyone."
msgstr "%s is not listening to anyone."
-#: actions/subscriptions.php:199
+#: actions/subscriptions.php:208
msgid "Jabber"
msgstr "Jabber"
-#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:222 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr "SMS"
@@ -4117,12 +4127,12 @@ msgstr "No ID argument."
msgid "Tag %s"
msgstr "Tag %s"
-#: actions/tagother.php:77 lib/userprofile.php:75
+#: actions/tagother.php:77 lib/userprofile.php:76
msgid "User profile"
msgstr "User profile"
#: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:102
+#: lib/userprofile.php:103
msgid "Photo"
msgstr "Photo"
@@ -4452,7 +4462,7 @@ msgstr ""
msgid "Plugins"
msgstr ""
-#: actions/version.php:196 lib/action.php:767
+#: actions/version.php:196 lib/action.php:766
msgid "Version"
msgstr "Version"
@@ -4460,19 +4470,19 @@ msgstr "Version"
msgid "Author(s)"
msgstr ""
-#: classes/File.php:144
+#: classes/File.php:169
#, 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:154
+#: classes/File.php:179
#, php-format
msgid "A file this large would exceed your user quota of %d bytes."
msgstr ""
-#: classes/File.php:161
+#: classes/File.php:186
#, php-format
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
@@ -4510,26 +4520,26 @@ msgstr "Could not insert message."
msgid "Could not update message with new URI."
msgstr "Could not update message with new URI."
-#: classes/Notice.php:172
+#: classes/Notice.php:175
#, php-format
msgid "DB error inserting hashtag: %s"
msgstr "DB error inserting hashtag: %s"
-#: classes/Notice.php:241
+#: classes/Notice.php:244
msgid "Problem saving notice. Too long."
msgstr "Problem saving notice. Too long."
-#: classes/Notice.php:245
+#: classes/Notice.php:248
msgid "Problem saving notice. Unknown user."
msgstr "Problem saving notice. Unknown user."
-#: classes/Notice.php:250
+#: classes/Notice.php:253
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:256
+#: classes/Notice.php:259
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
@@ -4537,71 +4547,71 @@ msgstr ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
-#: classes/Notice.php:262
+#: classes/Notice.php:265
msgid "You are banned from posting notices on this site."
msgstr "You are banned from posting notices on this site."
-#: classes/Notice.php:328 classes/Notice.php:354
+#: classes/Notice.php:331 classes/Notice.php:357
msgid "Problem saving notice."
msgstr "Problem saving notice."
-#: classes/Notice.php:927
+#: classes/Notice.php:943
msgid "Problem saving group inbox."
msgstr "Problem saving group inbox."
-#: classes/Notice.php:1459
+#: classes/Notice.php:1481
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
-#: classes/Subscription.php:66 lib/oauthstore.php:465
+#: classes/Subscription.php:74 lib/oauthstore.php:465
msgid "You have been banned from subscribing."
msgstr "You have been banned from subscribing."
-#: classes/Subscription.php:70
+#: classes/Subscription.php:78
msgid "Already subscribed!"
msgstr ""
-#: classes/Subscription.php:74
+#: classes/Subscription.php:82
msgid "User has blocked you."
msgstr "User has blocked you."
-#: classes/Subscription.php:157
+#: classes/Subscription.php:167
#, fuzzy
msgid "Not subscribed!"
msgstr "Not subscribed!"
-#: classes/Subscription.php:163
+#: classes/Subscription.php:173
msgid "Couldn't delete self-subscription."
msgstr "Couldn't delete self-subscription."
-#: classes/Subscription.php:190
+#: classes/Subscription.php:200
#, fuzzy
msgid "Couldn't delete subscription OMB token."
msgstr "Couldn't delete subscription."
-#: classes/Subscription.php:201 lib/subs.php:69
+#: classes/Subscription.php:211
msgid "Couldn't delete subscription."
msgstr "Couldn't delete subscription."
-#: classes/User.php:373
+#: classes/User.php:363
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Welcome to %1$s, @%2$s!"
-#: classes/User_group.php:477
+#: classes/User_group.php:480
msgid "Could not create group."
msgstr "Could not create group."
-#: classes/User_group.php:486
+#: classes/User_group.php:489
msgid "Could not set group URI."
msgstr "Could not set group URI."
-#: classes/User_group.php:507
+#: classes/User_group.php:510
msgid "Could not set group membership."
msgstr "Could not set group membership."
-#: classes/User_group.php:521
+#: classes/User_group.php:524
msgid "Could not save local group info."
msgstr "Could not save local group info."
@@ -4642,127 +4652,127 @@ msgstr "%1$s - %2$s"
msgid "Untitled page"
msgstr "Untitled page"
-#: lib/action.php:424
+#: lib/action.php:423
msgid "Primary site navigation"
msgstr "Primary site navigation"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:430
+#: lib/action.php:429
#, fuzzy
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr "Personal profile and friends timeline"
-#: lib/action.php:433
+#: lib/action.php:432
#, fuzzy
msgctxt "MENU"
msgid "Personal"
msgstr "Personal"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:435
+#: lib/action.php:434
#, fuzzy
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "Change your e-mail, avatar, password, profile"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:440
+#: lib/action.php:439
#, fuzzy
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "Connect to services"
-#: lib/action.php:443
+#: lib/action.php:442
msgid "Connect"
msgstr "Connect"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:446
+#: lib/action.php:445
#, fuzzy
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "Change site configuration"
-#: lib/action.php:449
+#: lib/action.php:448
#, fuzzy
msgctxt "MENU"
msgid "Admin"
msgstr "Admin"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:453
+#: lib/action.php:452
#, fuzzy, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "Invite friends and colleagues to join you on %s"
-#: lib/action.php:456
+#: lib/action.php:455
#, fuzzy
msgctxt "MENU"
msgid "Invite"
msgstr "Invite"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:462
+#: lib/action.php:461
#, fuzzy
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "Logout from the site"
-#: lib/action.php:465
+#: lib/action.php:464
#, fuzzy
msgctxt "MENU"
msgid "Logout"
msgstr "Logout"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:470
+#: lib/action.php:469
#, fuzzy
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Create an account"
-#: lib/action.php:473
+#: lib/action.php:472
#, fuzzy
msgctxt "MENU"
msgid "Register"
msgstr "Register"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:476
+#: lib/action.php:475
#, fuzzy
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Login to the site"
-#: lib/action.php:479
+#: lib/action.php:478
#, fuzzy
msgctxt "MENU"
msgid "Login"
msgstr "Login"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:482
+#: lib/action.php:481
#, fuzzy
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Help me!"
-#: lib/action.php:485
+#: lib/action.php:484
#, fuzzy
msgctxt "MENU"
msgid "Help"
msgstr "Help"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:488
+#: lib/action.php:487
#, fuzzy
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "Search for people or text"
-#: lib/action.php:491
+#: lib/action.php:490
#, fuzzy
msgctxt "MENU"
msgid "Search"
@@ -4770,59 +4780,59 @@ msgstr "Search"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:513 lib/adminpanelaction.php:398
+#: lib/action.php:512 lib/adminpanelaction.php:398
msgid "Site notice"
msgstr "Site notice"
-#: lib/action.php:579
+#: lib/action.php:578
msgid "Local views"
msgstr "Local views"
-#: lib/action.php:645
+#: lib/action.php:644
msgid "Page notice"
msgstr "Page notice"
-#: lib/action.php:747
+#: lib/action.php:746
msgid "Secondary site navigation"
msgstr "Secondary site navigation"
-#: lib/action.php:752
+#: lib/action.php:751
msgid "Help"
msgstr "Help"
-#: lib/action.php:754
+#: lib/action.php:753
msgid "About"
msgstr "About"
-#: lib/action.php:756
+#: lib/action.php:755
msgid "FAQ"
msgstr "F.A.Q."
-#: lib/action.php:760
+#: lib/action.php:759
msgid "TOS"
msgstr ""
-#: lib/action.php:763
+#: lib/action.php:762
msgid "Privacy"
msgstr "Privacy"
-#: lib/action.php:765
+#: lib/action.php:764
msgid "Source"
msgstr "Source"
-#: lib/action.php:769
+#: lib/action.php:768
msgid "Contact"
msgstr "Contact"
-#: lib/action.php:771
+#: lib/action.php:770
msgid "Badge"
msgstr "Badge"
-#: lib/action.php:799
+#: lib/action.php:798
msgid "StatusNet software license"
msgstr "StatusNet software licence"
-#: lib/action.php:802
+#: lib/action.php:803
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4831,12 +4841,12 @@ msgstr ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
"broughtby%%](%%site.broughtbyurl%%)."
-#: lib/action.php:804
+#: lib/action.php:805
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** is a microblogging service."
-#: lib/action.php:806
+#: lib/action.php:808
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4847,53 +4857,57 @@ msgstr ""
"s, available under the [GNU Affero General Public Licence](http://www.fsf."
"org/licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:821
+#: lib/action.php:823
msgid "Site content license"
msgstr "Site content license"
-#: lib/action.php:826
+#: lib/action.php:828
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
-#: lib/action.php:831
+#: lib/action.php:833
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
-#: lib/action.php:834
+#: lib/action.php:836
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
-#: lib/action.php:847
+#: lib/action.php:849
msgid "All "
msgstr "All "
-#: lib/action.php:853
+#: lib/action.php:855
msgid "license."
msgstr "licence."
-#: lib/action.php:1152
+#: lib/action.php:1154
msgid "Pagination"
msgstr "Pagination"
-#: lib/action.php:1161
+#: lib/action.php:1163
msgid "After"
msgstr "After"
-#: lib/action.php:1169
+#: lib/action.php:1171
msgid "Before"
msgstr "Before"
-#: lib/activity.php:453
+#: lib/activity.php:120
+msgid "Expecting a root feed element but got a whole XML document."
+msgstr ""
+
+#: lib/activityutils.php:208
msgid "Can't handle remote content yet."
msgstr ""
-#: lib/activity.php:481
+#: lib/activityutils.php:236
msgid "Can't handle embedded XML content yet."
msgstr ""
-#: lib/activity.php:485
+#: lib/activityutils.php:240
msgid "Can't handle embedded Base64 content yet."
msgstr ""
@@ -4987,7 +5001,7 @@ msgstr "Paths configuration"
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
-#: lib/apiauth.php:272
+#: lib/apiauth.php:276
#, php-format
msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s"
msgstr ""
@@ -5061,11 +5075,11 @@ msgstr "Revoke"
msgid "Attachments"
msgstr ""
-#: lib/attachmentlist.php:265
+#: lib/attachmentlist.php:263
msgid "Author"
msgstr ""
-#: lib/attachmentlist.php:278
+#: lib/attachmentlist.php:276
msgid "Provider"
msgstr "Provider"
@@ -5085,37 +5099,50 @@ msgstr "Password changing failed"
msgid "Password changing is not allowed"
msgstr "Password changing is not allowed"
-#: lib/channel.php:138 lib/channel.php:158
+#: lib/channel.php:157 lib/channel.php:177
msgid "Command results"
msgstr "Command results"
-#: lib/channel.php:210 lib/mailhandler.php:142
+#: lib/channel.php:229 lib/mailhandler.php:142
msgid "Command complete"
msgstr "Command complete"
-#: lib/channel.php:221
+#: lib/channel.php:240
msgid "Command failed"
msgstr "Command failed"
-#: lib/command.php:44
-msgid "Sorry, this command is not yet implemented."
-msgstr "Sorry, this command is not yet implemented."
+#: lib/command.php:83 lib/command.php:105
+msgid "Notice with that id does not exist"
+msgstr "Notice with that id does not exist"
+
+#: lib/command.php:99 lib/command.php:570
+msgid "User has no last notice"
+msgstr "User has no last notice"
-#: lib/command.php:88
+#: lib/command.php:125
#, php-format
msgid "Could not find a user with nickname %s"
msgstr "Could not find a user with nickname %s"
-#: lib/command.php:92
+#: lib/command.php:143
+#, fuzzy, php-format
+msgid "Could not find a local user with nickname %s"
+msgstr "Could not find a user with nickname %s"
+
+#: lib/command.php:176
+msgid "Sorry, this command is not yet implemented."
+msgstr "Sorry, this command is not yet implemented."
+
+#: lib/command.php:221
msgid "It does not make a lot of sense to nudge yourself!"
msgstr ""
-#: lib/command.php:99
+#: lib/command.php:228
#, php-format
msgid "Nudge sent to %s"
msgstr "Nudge sent to %s"
-#: lib/command.php:126
+#: lib/command.php:254
#, php-format
msgid ""
"Subscriptions: %1$s\n"
@@ -5123,195 +5150,194 @@ msgid ""
"Notices: %3$s"
msgstr ""
-#: lib/command.php:152 lib/command.php:390 lib/command.php:451
-msgid "Notice with that id does not exist"
-msgstr "Notice with that id does not exist"
-
-#: lib/command.php:168 lib/command.php:406 lib/command.php:467
-#: lib/command.php:523
-msgid "User has no last notice"
-msgstr "User has no last notice"
-
-#: lib/command.php:190
+#: lib/command.php:296
msgid "Notice marked as fave."
msgstr "Notice marked as fave."
-#: lib/command.php:217
+#: lib/command.php:317
msgid "You are already a member of that group"
msgstr "You are already a member of that group."
-#: lib/command.php:231
+#: lib/command.php:331
#, php-format
msgid "Could not join user %s to group %s"
msgstr "Could not join user %s to group %s."
-#: lib/command.php:236
+#: lib/command.php:336
#, php-format
msgid "%s joined group %s"
msgstr "%s joined group %s"
-#: lib/command.php:275
+#: lib/command.php:373
#, php-format
msgid "Could not remove user %s to group %s"
msgstr "Could not remove user %s to group %s"
-#: lib/command.php:280
+#: lib/command.php:378
#, php-format
msgid "%s left group %s"
msgstr "%s left group %s"
-#: lib/command.php:309
+#: lib/command.php:401
#, php-format
msgid "Fullname: %s"
msgstr "Fullname: %s"
-#: lib/command.php:312 lib/mail.php:258
+#: lib/command.php:404 lib/mail.php:258
#, php-format
msgid "Location: %s"
msgstr "Location: %s"
-#: lib/command.php:315 lib/mail.php:260
+#: lib/command.php:407 lib/mail.php:260
#, php-format
msgid "Homepage: %s"
msgstr "Homepage: %s"
-#: lib/command.php:318
+#: lib/command.php:410
#, php-format
msgid "About: %s"
msgstr "About: %s"
-#: lib/command.php:349
+#: lib/command.php:437
+#, php-format
+msgid ""
+"%s is a remote profile; you can only send direct messages to users on the "
+"same server."
+msgstr ""
+
+#: lib/command.php:450
#, php-format
msgid "Message too long - maximum is %d characters, you sent %d"
msgstr "Message too long - maximum is %d characters, you sent %d"
-#: lib/command.php:367
+#: lib/command.php:468
#, php-format
msgid "Direct message to %s sent"
msgstr "Direct message to %s sent"
-#: lib/command.php:369
+#: lib/command.php:470
msgid "Error sending direct message."
msgstr "Error sending direct message."
-#: lib/command.php:413
+#: lib/command.php:490
msgid "Cannot repeat your own notice"
msgstr "Cannot repeat your own notice."
-#: lib/command.php:418
+#: lib/command.php:495
msgid "Already repeated that notice"
msgstr "Already repeated that notice."
-#: lib/command.php:426
+#: lib/command.php:503
#, php-format
msgid "Notice from %s repeated"
msgstr "Notice from %s repeated"
-#: lib/command.php:428
+#: lib/command.php:505
msgid "Error repeating notice."
msgstr "Error repeating notice."
-#: lib/command.php:482
+#: lib/command.php:536
#, php-format
msgid "Notice too long - maximum is %d characters, you sent %d"
msgstr "Notice too long - maximum is %d characters, you sent %d"
-#: lib/command.php:491
+#: lib/command.php:545
#, php-format
msgid "Reply to %s sent"
msgstr "Reply to %s sent"
-#: lib/command.php:493
+#: lib/command.php:547
msgid "Error saving notice."
msgstr "Error saving notice."
-#: lib/command.php:547
+#: lib/command.php:594
msgid "Specify the name of the user to subscribe to"
msgstr "Specify the name of the user to subscribe to"
-#: lib/command.php:554 lib/command.php:589
-msgid "No such user"
-msgstr "No such user."
+#: lib/command.php:602
+#, fuzzy
+msgid "Can't subscribe to OMB profiles by command."
+msgstr "You are not subscribed to that profile."
-#: lib/command.php:561
+#: lib/command.php:608
#, php-format
msgid "Subscribed to %s"
msgstr "Subscribed to %s"
-#: lib/command.php:582 lib/command.php:685
+#: lib/command.php:629 lib/command.php:728
msgid "Specify the name of the user to unsubscribe from"
msgstr "Specify the name of the user to unsubscribe from"
-#: lib/command.php:595
+#: lib/command.php:638
#, php-format
msgid "Unsubscribed from %s"
msgstr "Unsubscribed from %s"
-#: lib/command.php:613 lib/command.php:636
+#: lib/command.php:656 lib/command.php:679
msgid "Command not yet implemented."
msgstr "Command not yet implemented."
-#: lib/command.php:616
+#: lib/command.php:659
msgid "Notification off."
msgstr "Notification off."
-#: lib/command.php:618
+#: lib/command.php:661
msgid "Can't turn off notification."
msgstr "Can't turn off notification."
-#: lib/command.php:639
+#: lib/command.php:682
msgid "Notification on."
msgstr "Notification on."
-#: lib/command.php:641
+#: lib/command.php:684
msgid "Can't turn on notification."
msgstr "Can't turn on notification."
-#: lib/command.php:654
+#: lib/command.php:697
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:665
+#: lib/command.php:708
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:692
+#: lib/command.php:735
#, php-format
msgid "Unsubscribed %s"
msgstr "Unsubscribed %s"
-#: lib/command.php:709
+#: lib/command.php:752
msgid "You are not subscribed to anyone."
msgstr "You are not subscribed to anyone."
-#: lib/command.php:711
+#: lib/command.php:754
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "You are already subscribed to these users:"
msgstr[1] "You are already subscribed to these users:"
-#: lib/command.php:731
+#: lib/command.php:774
msgid "No one is subscribed to you."
msgstr "No one is subscribed to you."
-#: lib/command.php:733
+#: lib/command.php:776
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Could not subscribe other to you."
msgstr[1] "Could not subscribe other to you."
-#: lib/command.php:753
+#: lib/command.php:796
msgid "You are not a member of any groups."
msgstr "You are not a member of any groups."
-#: lib/command.php:755
+#: lib/command.php:798
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "You are not a member of that group."
msgstr[1] "You are not a member of that group."
-#: lib/command.php:769
+#: lib/command.php:812
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5353,19 +5379,19 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:148
+#: lib/common.php:135
msgid "No configuration file found. "
msgstr "No configuration file found"
-#: lib/common.php:149
+#: lib/common.php:136
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:151
+#: lib/common.php:138
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:152
+#: lib/common.php:139
msgid "Go to the installer."
msgstr "Go to the installer."
@@ -5541,49 +5567,49 @@ msgstr "Tags in %s group's notices"
msgid "This page is not available in a media type you accept"
msgstr "This page is not available in a media type you accept"
-#: lib/imagefile.php:75
+#: lib/imagefile.php:72
+msgid "Unsupported image file format."
+msgstr "Unsupported image file format."
+
+#: lib/imagefile.php:88
#, php-format
msgid "That file is too big. The maximum file size is %s."
msgstr "That file is too big. The maximum file size is %s."
-#: lib/imagefile.php:80
+#: lib/imagefile.php:93
msgid "Partial upload."
msgstr "Partial upload."
-#: lib/imagefile.php:88 lib/mediafile.php:170
+#: lib/imagefile.php:101 lib/mediafile.php:170
msgid "System error uploading file."
msgstr "System error uploading file."
-#: lib/imagefile.php:96
+#: lib/imagefile.php:109
msgid "Not an image or corrupt file."
msgstr "Not an image or corrupt file."
-#: lib/imagefile.php:109
-msgid "Unsupported image file format."
-msgstr "Unsupported image file format."
-
#: lib/imagefile.php:122
msgid "Lost our file."
msgstr "Lost our file."
-#: lib/imagefile.php:166 lib/imagefile.php:231
+#: lib/imagefile.php:163 lib/imagefile.php:224
msgid "Unknown file type"
msgstr "Unknown file type"
-#: lib/imagefile.php:251
+#: lib/imagefile.php:244
msgid "MB"
msgstr ""
-#: lib/imagefile.php:253
+#: lib/imagefile.php:246
msgid "kB"
msgstr ""
-#: lib/jabber.php:220
+#: lib/jabber.php:387
#, php-format
msgid "[%s]"
msgstr ""
-#: lib/jabber.php:400
+#: lib/jabber.php:567
#, php-format
msgid "Unknown inbox source %d."
msgstr ""
@@ -5796,7 +5822,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:482
+#: lib/mailbox.php:227 lib/noticelist.php:486
msgid "from"
msgstr "from"
@@ -5921,48 +5947,48 @@ msgid ""
"try again later"
msgstr ""
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr ""
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "N"
msgstr "N"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "S"
msgstr ""
-#: lib/noticelist.php:431
+#: lib/noticelist.php:432
msgid "E"
msgstr ""
-#: lib/noticelist.php:431
+#: lib/noticelist.php:432
msgid "W"
msgstr ""
-#: lib/noticelist.php:438
+#: lib/noticelist.php:439
msgid "at"
msgstr ""
-#: lib/noticelist.php:566
+#: lib/noticelist.php:570
msgid "in context"
msgstr "in context"
-#: lib/noticelist.php:601
+#: lib/noticelist.php:605
msgid "Repeated by"
msgstr "Repeated by"
-#: lib/noticelist.php:628
+#: lib/noticelist.php:632
msgid "Reply to this notice"
msgstr "Reply to this notice"
-#: lib/noticelist.php:629
+#: lib/noticelist.php:633
msgid "Reply"
msgstr "Reply"
-#: lib/noticelist.php:673
+#: lib/noticelist.php:677
msgid "Notice repeated"
msgstr "Notice repeated"
@@ -6035,7 +6061,7 @@ msgstr "Tags in %s's notices"
msgid "Unknown"
msgstr "Unknown"
-#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr "Subscriptions"
@@ -6043,7 +6069,7 @@ msgstr "Subscriptions"
msgid "All subscriptions"
msgstr "All subscriptions"
-#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90
+#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr "Subscribers"
@@ -6051,15 +6077,20 @@ msgstr "Subscribers"
msgid "All subscribers"
msgstr "All subscribers"
-#: lib/profileaction.php:180
+#: lib/profileaction.php:186
msgid "User ID"
msgstr "User ID"
-#: lib/profileaction.php:185
+#: lib/profileaction.php:191
msgid "Member since"
msgstr "Member since"
-#: lib/profileaction.php:247
+#. TRANS: Average count of posts made per day since account registration
+#: lib/profileaction.php:230
+msgid "Daily average"
+msgstr ""
+
+#: lib/profileaction.php:259
msgid "All groups"
msgstr "All groups"
@@ -6104,7 +6135,7 @@ msgstr "Repeat this notice"
msgid "Revoke the \"%s\" role from this user"
msgstr "Block this user from this group"
-#: lib/router.php:671
+#: lib/router.php:704
msgid "No single user defined for single-user mode."
msgstr ""
@@ -6230,91 +6261,100 @@ msgstr "Unsubscribe from this user"
msgid "Unsubscribe"
msgstr "Unsubscribe"
-#: lib/userprofile.php:116
+#: lib/usernoprofileexception.php:58
+#, fuzzy, php-format
+msgid "User %s (%d) has no profile record."
+msgstr "User has no profile."
+
+#: lib/userprofile.php:117
msgid "Edit Avatar"
msgstr "Edit Avatar"
-#: lib/userprofile.php:236
+#: lib/userprofile.php:234 lib/userprofile.php:248
msgid "User actions"
msgstr "User actions"
-#: lib/userprofile.php:251
+#: lib/userprofile.php:237
+msgid "User deletion in progress..."
+msgstr ""
+
+#: lib/userprofile.php:263
msgid "Edit profile settings"
msgstr "Edit profile settings"
-#: lib/userprofile.php:252
+#: lib/userprofile.php:264
msgid "Edit"
msgstr ""
-#: lib/userprofile.php:275
+#: lib/userprofile.php:287
msgid "Send a direct message to this user"
msgstr "Send a direct message to this user"
-#: lib/userprofile.php:276
+#: lib/userprofile.php:288
msgid "Message"
msgstr "Message"
-#: lib/userprofile.php:314
+#: lib/userprofile.php:326
msgid "Moderate"
msgstr ""
-#: lib/userprofile.php:352
+#: lib/userprofile.php:364
#, fuzzy
msgid "User role"
msgstr "User profile"
-#: lib/userprofile.php:354
+#: lib/userprofile.php:366
#, fuzzy
msgctxt "role"
msgid "Administrator"
msgstr "Admins"
-#: lib/userprofile.php:355
+#: lib/userprofile.php:367
msgctxt "role"
msgid "Moderator"
msgstr ""
-#: lib/util.php:1015
+#: lib/util.php:1046
msgid "a few seconds ago"
msgstr "a few seconds ago"
-#: lib/util.php:1017
+#: lib/util.php:1048
msgid "about a minute ago"
msgstr "about a minute ago"
-#: lib/util.php:1019
+#: lib/util.php:1050
#, php-format
msgid "about %d minutes ago"
msgstr "about %d minutes ago"
-#: lib/util.php:1021
+#: lib/util.php:1052
msgid "about an hour ago"
msgstr "about an hour ago"
-#: lib/util.php:1023
+#: lib/util.php:1054
#, php-format
msgid "about %d hours ago"
msgstr "about %d hours ago"
-#: lib/util.php:1025
+#: lib/util.php:1056
msgid "about a day ago"
msgstr "about a day ago"
-#: lib/util.php:1027
+#: lib/util.php:1058
#, php-format
msgid "about %d days ago"
msgstr "about %d days ago"
-#: lib/util.php:1029
+#: lib/util.php:1060
msgid "about a month ago"
msgstr "about a month ago"
-#: lib/util.php:1031
+#: lib/util.php:1062
#, php-format
msgid "about %d months ago"
msgstr "about %d months ago"
-#: lib/util.php:1033
+#: lib/util.php:1064
msgid "about a year ago"
msgstr "about a year ago"
@@ -6328,7 +6368,7 @@ msgstr "%s is not a valid colour!"
msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr "%s is not a valid colour! Use 3 or 6 hex chars."
-#: lib/xmppmanager.php:402
+#: lib/xmppmanager.php:403
#, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d."
msgstr "Message too long - maximum is %1$d characters, you sent %2$d."
diff --git a/locale/es/LC_MESSAGES/statusnet.po b/locale/es/LC_MESSAGES/statusnet.po
index cdc0184e4..b72d774c1 100644
--- a/locale/es/LC_MESSAGES/statusnet.po
+++ b/locale/es/LC_MESSAGES/statusnet.po
@@ -1,7 +1,7 @@
# Translation of StatusNet to Spanish
#
-# Author@translatewiki.net: Brion
# Author@translatewiki.net: Crazymadlover
+# Author@translatewiki.net: Locos epraix
# Author@translatewiki.net: McDutchie
# Author@translatewiki.net: PerroVerd
# Author@translatewiki.net: Peter17
@@ -13,12 +13,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-06 23:49+0000\n"
-"PO-Revision-Date: 2010-03-06 23:49:43+0000\n"
+"POT-Creation-Date: 2010-04-06 22:53+0000\n"
+"PO-Revision-Date: 2010-04-06 22:54:17+0000\n"
"Language-Team: Spanish\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64665); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: es\n"
"X-Message-Group: out-statusnet\n"
@@ -47,7 +47,6 @@ msgstr "¿Prohibir a los usuarios anónimos (no conectados) ver el sitio?"
#. TRANS: Checkbox label for prohibiting anonymous users from viewing site.
#: actions/accessadminpanel.php:167
-#, fuzzy
msgctxt "LABEL"
msgid "Private"
msgstr "Privado"
@@ -78,7 +77,6 @@ msgid "Save access settings"
msgstr "Guardar la configuración de acceso"
#: actions/accessadminpanel.php:203
-#, fuzzy
msgctxt "BUTTON"
msgid "Save"
msgstr "Guardar"
@@ -97,9 +95,9 @@ msgstr "No existe tal página"
#: 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:90
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78
+#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
@@ -108,10 +106,8 @@ msgstr "No existe tal página"
#: actions/remotesubscribe.php:154 actions/replies.php:73
#: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:163 lib/command.php:302
-#: lib/command.php:355 lib/command.php:401 lib/command.php:462
-#: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82
-#: lib/profileaction.php:77
+#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: lib/mailbox.php:82 lib/profileaction.php:77
msgid "No such user."
msgstr "No existe ese usuario."
@@ -119,7 +115,7 @@ msgstr "No existe ese usuario."
#: actions/all.php:86
#, php-format
msgid "%1$s and friends, page %2$d"
-msgstr "%1$s y amigos, página %2$d"
+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
@@ -128,7 +124,7 @@ msgstr "%1$s y amigos, página %2$d"
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
-msgstr "%s y amigos"
+msgstr "%s y sus amistades"
#. TRANS: %1$s is user nickname
#: actions/all.php:103
@@ -188,13 +184,13 @@ msgstr ""
#. TRANS: H1 text
#: actions/all.php:178
msgid "You and friends"
-msgstr "Tú y amigos"
+msgstr "Tú y tus amistades"
#: actions/allrss.php:119 actions/apitimelinefriends.php:119
#: actions/apitimelinehome.php:120
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
-msgstr "¡Actualizaciones de %1$s y amigos en %2$s!"
+msgstr "¡Actualizaciones de %1$s y sus amistades en %2$s!"
#: actions/apiaccountratelimitstatus.php:70
#: actions/apiaccountupdatedeliverydevice.php:93
@@ -206,18 +202,18 @@ msgstr "¡Actualizaciones de %1$s y amigos en %2$s!"
#: 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:132
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:136
#: actions/apigrouplistall.php:120 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:135
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
-#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184
-#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148
+#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:174
+#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173
+#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
-#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
+#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
msgid "API method not found."
msgstr "Método de API no encontrado."
@@ -230,8 +226,8 @@ msgstr "Método de API no encontrado."
#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65
-#: actions/apistatusesupdate.php:118
+#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
msgid "This method requires a POST."
msgstr "Este método requiere un POST."
@@ -262,7 +258,7 @@ msgid "Could not save profile."
msgstr "No se pudo guardar el perfil."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:97
+#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
#: actions/designadminpanel.php:122 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
@@ -348,7 +344,7 @@ msgstr "No se encontró estado para ese ID"
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:176
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
msgid "Could not create favorite."
msgstr "No se pudo crear favorito."
@@ -467,7 +463,7 @@ msgstr "¡No se ha encontrado el grupo!"
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:221
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
msgid "You have been blocked from that group by the admin."
msgstr "Has sido bloqueado de ese grupo por el administrador."
@@ -485,11 +481,18 @@ msgstr "No eres miembro de este grupo."
msgid "Could not remove user %1$s from group %2$s."
msgstr "No se pudo eliminar al usuario %1$s del grupo %2$s."
-#: actions/apigrouplist.php:95
+#. TRANS: %s is a user name
+#: actions/apigrouplist.php:97
#, php-format
msgid "%s's groups"
msgstr "Grupos de %s"
+#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s
+#: actions/apigrouplist.php:107
+#, fuzzy, php-format
+msgid "%1$s groups %2$s is a member of."
+msgstr "%s es miembro de los grupos"
+
#: actions/apigrouplistall.php:90 actions/usergroups.php:62
#, php-format
msgid "%s groups"
@@ -517,7 +520,7 @@ msgstr "Token inválido."
#: 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:337
+#: actions/profilesettings.php:194 actions/recoverpassword.php:350
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
@@ -529,7 +532,7 @@ msgstr ""
#: actions/apioauthauthorize.php:135
msgid "Invalid nickname / password!"
-msgstr "¡Apodo o contraseña inválidos!"
+msgstr "¡Usuario o contraseña inválidos!"
#: actions/apioauthauthorize.php:159
msgid "Database error deleting OAuth application user."
@@ -583,17 +586,17 @@ msgstr ""
"permiso para <strong>%3$s</strong> la información de tu cuenta %4$s. Sólo "
"debes dar acceso a tu cuenta %4$s a terceras partes en las que confíes."
-#: actions/apioauthauthorize.php:310 lib/action.php:438
+#: actions/apioauthauthorize.php:310 lib/action.php:437
msgid "Account"
msgstr "Cuenta"
#: actions/apioauthauthorize.php:313 actions/login.php:230
#: actions/profilesettings.php:106 actions/register.php:424
-#: actions/showgroup.php:244 actions/tagother.php:94
+#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
-#: lib/userprofile.php:131
+#: lib/userprofile.php:132
msgid "Nickname"
-msgstr "Apodo"
+msgstr "Usuario"
#: actions/apioauthauthorize.php:316 actions/login.php:233
#: actions/register.php:429 lib/accountsettingsaction.php:116
@@ -662,12 +665,12 @@ msgstr ""
msgid "Unsupported format."
msgstr "Formato no soportado."
-#: actions/apitimelinefavorites.php:108
+#: actions/apitimelinefavorites.php:109
#, php-format
msgid "%1$s / Favorites from %2$s"
msgstr "%1$s / Favoritos de %2$s"
-#: actions/apitimelinefavorites.php:117
+#: actions/apitimelinefavorites.php:118
#, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "%1$s actualizaciones favoritas de %2$s / %2$s."
@@ -677,7 +680,7 @@ msgstr "%1$s actualizaciones favoritas de %2$s / %2$s."
msgid "%1$s / Updates mentioning %2$s"
msgstr "%1$s / Actualizaciones que mencionan %2$s"
-#: actions/apitimelinementions.php:127
+#: actions/apitimelinementions.php:130
#, 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"
@@ -687,7 +690,7 @@ msgstr "actualizaciones de %1$s en respuesta a las de %2$s / %3$s"
msgid "%s public timeline"
msgstr "línea temporal pública de %s"
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "¡Actualizaciones de todos en %s!"
@@ -702,12 +705,12 @@ msgstr "Repetido a %s"
msgid "Repeats of %s"
msgstr "Repeticiones de %s"
-#: actions/apitimelinetag.php:102 actions/tag.php:67
+#: actions/apitimelinetag.php:104 actions/tag.php:67
#, php-format
msgid "Notices tagged with %s"
msgstr "Avisos marcados con %s"
-#: actions/apitimelinetag.php:104 actions/tagrss.php:65
+#: actions/apitimelinetag.php:106 actions/tagrss.php:65
#, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Actualizaciones etiquetadas con %1$s en %2$s!"
@@ -725,7 +728,7 @@ msgstr "No existe tal archivo adjunto."
#: actions/grouplogo.php:86 actions/groupmembers.php:76
#: actions/grouprss.php:91 actions/showgroup.php:121
msgid "No nickname."
-msgstr "Ningún apodo."
+msgstr "Ningún nombre de usuario."
#: actions/avatarbynickname.php:64
msgid "No size."
@@ -735,10 +738,10 @@ msgstr "Ningún tamaño."
msgid "Invalid size."
msgstr "Tamaño inválido."
-#: actions/avatarsettings.php:67 actions/showgroup.php:229
+#: actions/avatarsettings.php:67 actions/showgroup.php:230
#: lib/accountsettingsaction.php:112
msgid "Avatar"
-msgstr "Avatar"
+msgstr "Imagen"
#: actions/avatarsettings.php:78
#, php-format
@@ -754,7 +757,7 @@ msgstr "Usuario sin perfil equivalente"
#: actions/avatarsettings.php:119 actions/avatarsettings.php:197
#: actions/grouplogo.php:254
msgid "Avatar settings"
-msgstr "Configuración de Avatar"
+msgstr "Configuración de imagen"
#: actions/avatarsettings.php:127 actions/avatarsettings.php:205
#: actions/grouplogo.php:202 actions/grouplogo.php:262
@@ -767,37 +770,41 @@ msgid "Preview"
msgstr "Vista previa"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:655
+#: lib/deleteuserform.php:66 lib/noticelist.php:659
msgid "Delete"
msgstr "Borrar"
#: actions/avatarsettings.php:166 actions/grouplogo.php:236
msgid "Upload"
-msgstr "Cargar"
+msgstr "Subir"
#: actions/avatarsettings.php:231 actions/grouplogo.php:289
msgid "Crop"
msgstr "Cortar"
-#: actions/avatarsettings.php:328
+#: actions/avatarsettings.php:305
+msgid "No file uploaded."
+msgstr "Ningún archivo fue subido."
+
+#: actions/avatarsettings.php:332
msgid "Pick a square area of the image to be your avatar"
-msgstr "Elige un área cuadrada de la imagen para que sea tu avatar"
+msgstr "Elige un área cuadrada para que sea tu imagen"
-#: actions/avatarsettings.php:343 actions/grouplogo.php:380
+#: actions/avatarsettings.php:347 actions/grouplogo.php:380
msgid "Lost our file data."
msgstr "Se perdió nuestros datos de archivo."
-#: actions/avatarsettings.php:366
+#: actions/avatarsettings.php:370
msgid "Avatar updated."
-msgstr "Avatar actualizado"
+msgstr "Imagen actualizada"
-#: actions/avatarsettings.php:369
+#: actions/avatarsettings.php:373
msgid "Failed updating avatar."
-msgstr "Error al actualizar avatar."
+msgstr "Error al actualizar la imagen."
-#: actions/avatarsettings.php:393
+#: actions/avatarsettings.php:397
msgid "Avatar deleted."
-msgstr "Avatar borrado."
+msgstr "Imagen borrada."
#: actions/block.php:69
msgid "You already blocked that user."
@@ -833,7 +840,7 @@ msgstr "No bloquear a este usuario"
msgid "Yes"
msgstr "Sí"
-#: actions/block.php:144 actions/groupmembers.php:355 lib/blockform.php:80
+#: actions/block.php:144 actions/groupmembers.php:373 lib/blockform.php:80
msgid "Block this user"
msgstr "Bloquear este usuario."
@@ -850,8 +857,8 @@ msgstr "No se guardó información de bloqueo."
#: actions/groupunblock.php:86 actions/joingroup.php:82
#: actions/joingroup.php:93 actions/leavegroup.php:82
#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212
-#: lib/command.php:260
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162
+#: lib/command.php:358
msgid "No such group."
msgstr "No existe ese grupo."
@@ -934,7 +941,7 @@ msgid "Conversation"
msgstr "Conversación"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:218 lib/searchgroupnav.php:82
+#: lib/profileaction.php:229 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "Avisos"
@@ -953,7 +960,7 @@ msgstr "No eres el propietario de esta aplicación."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1217
+#: lib/action.php:1219
msgid "There was a problem with your session token."
msgstr "Hubo problemas con tu clave de sesión."
@@ -1014,7 +1021,7 @@ msgstr "¿Estás seguro de que quieres eliminar este aviso?"
msgid "Do not delete this notice"
msgstr "No eliminar este mensaje"
-#: actions/deletenotice.php:146 lib/noticelist.php:655
+#: actions/deletenotice.php:146 lib/noticelist.php:659
msgid "Delete this notice"
msgstr "Borrar este aviso"
@@ -1151,7 +1158,7 @@ msgstr "Volver a los valores predeterminados"
#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:208
+#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
#: actions/tagother.php:154 actions/useradminpanel.php:294
#: lib/applicationeditform.php:333 lib/applicationeditform.php:334
#: lib/designsettings.php:256 lib/groupeditform.php:202
@@ -1214,7 +1221,7 @@ msgstr "El URL fuente es muy largo."
#: actions/editapplication.php:200 actions/newapplication.php:185
msgid "Source URL is not valid."
-msgstr "La URL fuente es inválida."
+msgstr "El URL fuente es inválido."
#: actions/editapplication.php:203 actions/newapplication.php:188
msgid "Organization is required."
@@ -1267,7 +1274,7 @@ msgstr "La descripción es muy larga (máx. %d caracteres)."
msgid "Could not update group."
msgstr "No se pudo actualizar el grupo."
-#: actions/editgroup.php:264 classes/User_group.php:493
+#: actions/editgroup.php:264 classes/User_group.php:496
msgid "Could not create aliases."
msgstr "No fue posible crear alias."
@@ -1543,7 +1550,7 @@ msgstr "Sin archivo adjunto"
#: actions/file.php:51
msgid "No uploaded attachments."
-msgstr "No hay archivos adjuntos cargados."
+msgstr "No hay archivos adjuntos subidos."
#: actions/finishremotesubscribe.php:69
msgid "Not expecting this response!"
@@ -1586,23 +1593,20 @@ msgid "Cannot read file."
msgstr "No se puede leer archivo."
#: actions/grantrole.php:62 actions/revokerole.php:62
-#, fuzzy
msgid "Invalid role."
-msgstr "Token inválido."
+msgstr "Función no válida."
#: actions/grantrole.php:66 actions/revokerole.php:66
msgid "This role is reserved and cannot be set."
-msgstr ""
+msgstr "Esta función es reservada y no puede asignarse."
#: actions/grantrole.php:75
-#, fuzzy
msgid "You cannot grant user roles on this site."
-msgstr "No puedes enviar mensaje a este usuario."
+msgstr "No puedes conceder funciones de usuario en este sitio."
#: actions/grantrole.php:82
-#, fuzzy
msgid "User already has this role."
-msgstr "El usuario te ha bloqueado."
+msgstr "El usuario ya tiene esta función."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
@@ -1633,7 +1637,7 @@ msgstr "Usuario ya está bloqueado del grupo."
msgid "User is not a member of group."
msgstr "Usuario no es miembro del grupo"
-#: actions/groupblock.php:136 actions/groupmembers.php:323
+#: actions/groupblock.php:136 actions/groupmembers.php:341
msgid "Block user from group"
msgstr "Bloquear usuario de grupo"
@@ -1737,19 +1741,19 @@ msgstr "Lista de los usuarios en este grupo."
msgid "Admin"
msgstr "Admin"
-#: actions/groupmembers.php:355 lib/blockform.php:69
+#: actions/groupmembers.php:373 lib/blockform.php:69
msgid "Block"
msgstr "Bloquear"
-#: actions/groupmembers.php:450
+#: actions/groupmembers.php:468
msgid "Make user an admin of the group"
msgstr "Convertir al usuario en administrador del grupo"
-#: actions/groupmembers.php:482
+#: actions/groupmembers.php:500
msgid "Make Admin"
msgstr "Convertir en administrador"
-#: actions/groupmembers.php:482
+#: actions/groupmembers.php:500
msgid "Make this user an admin"
msgstr "Convertir a este usuario en administrador"
@@ -1764,7 +1768,7 @@ msgstr "línea temporal de %s"
msgid "Updates from members of %1$s on %2$s!"
msgstr "¡Actualizaciones de miembros de %1$s en %2$s!"
-#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232
+#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249
#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr "Grupos"
@@ -1978,7 +1982,7 @@ msgstr "Invitar nuevos usuarios:"
msgid "You are already subscribed to these users:"
msgstr "Ya estás suscrito a estos usuarios:"
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
#, php-format
msgid "%1$s (%2$s)"
msgstr "%1$s (%2$s)"
@@ -2025,7 +2029,6 @@ msgstr "Opcionalmente añada un mensaje personalizado a su invitación."
#. TRANS: Send button for inviting friends
#: actions/invite.php:198
-#, fuzzy
msgctxt "BUTTON"
msgid "Send"
msgstr "Enviar"
@@ -2097,9 +2100,8 @@ msgid "You must be logged in to join a group."
msgstr "Debes estar conectado para unirte a un grupo."
#: actions/joingroup.php:88 actions/leavegroup.php:88
-#, fuzzy
msgid "No nickname or ID."
-msgstr "Ningún apodo."
+msgstr "Ningún nombre de usuario o ID."
#: actions/joingroup.php:141
#, php-format
@@ -2110,7 +2112,7 @@ msgstr "%1$s se ha unido al grupo %2$"
msgid "You must be logged in to leave a group."
msgstr "Debes estar conectado para dejar un grupo."
-#: actions/leavegroup.php:100 lib/command.php:265
+#: actions/leavegroup.php:100 lib/command.php:363
msgid "You are not a member of that group."
msgstr "No eres miembro de este grupo."
@@ -2208,7 +2210,7 @@ msgstr "Utiliza este formulario para registrar una nueva aplicación."
#: actions/newapplication.php:176
msgid "Source URL is required."
-msgstr "Se requiere la URL fuente."
+msgstr "Se requiere el URL fuente."
#: actions/newapplication.php:258 actions/newapplication.php:267
msgid "Could not create application."
@@ -2226,12 +2228,12 @@ msgstr "Usa este formulario para crear un grupo nuevo."
msgid "New message"
msgstr "Nuevo Mensaje "
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
msgid "You can't send a message to this user."
msgstr "No puedes enviar mensaje a este usuario."
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342
-#: lib/command.php:475
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
+#: lib/command.php:529
msgid "No content!"
msgstr "¡Ningún contenido!"
@@ -2239,7 +2241,7 @@ msgstr "¡Ningún contenido!"
msgid "No recipient specified."
msgstr "No se especificó receptor."
-#: actions/newmessage.php:164 lib/command.php:361
+#: actions/newmessage.php:164 lib/command.php:462
msgid ""
"Don't send a message to yourself; just say it to yourself quietly instead."
msgstr "No te auto envíes un mensaje; dícetelo a ti mismo."
@@ -2253,7 +2255,7 @@ msgstr "Mensaje enviado"
msgid "Direct message to %s sent."
msgstr "Se ha enviado un mensaje directo a %s."
-#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189
msgid "Ajax Error"
msgstr "Error de Ajax"
@@ -2261,7 +2263,7 @@ msgstr "Error de Ajax"
msgid "New notice"
msgstr "Nuevo aviso"
-#: actions/newnotice.php:211
+#: actions/newnotice.php:217
msgid "Notice posted"
msgstr "Mensaje publicado"
@@ -2376,7 +2378,7 @@ msgstr ""
msgid "Notice has no profile"
msgstr "Aviso sin perfil"
-#: actions/oembed.php:86 actions/shownotice.php:180
+#: actions/oembed.php:86 actions/shownotice.php:175
#, php-format
msgid "%1$s's status on %2$s"
msgstr "estado de %1$s en %2$s"
@@ -2389,8 +2391,8 @@ msgstr "tipo de contenido "
msgid "Only "
msgstr "Sólo "
-#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042
-#: lib/apiaction.php:1070 lib/apiaction.php:1179
+#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1068
+#: lib/apiaction.php:1096 lib/apiaction.php:1212
msgid "Not a supported data format."
msgstr "No es un formato de dato soportado"
@@ -2416,7 +2418,7 @@ msgstr "  (servicio gratuito)"
#: actions/othersettings.php:116
msgid "Shorten URLs with"
-msgstr "Acortar las URL con"
+msgstr "Acortar los URL con"
#: actions/othersettings.php:117
msgid "Automatic shortening service to use."
@@ -2522,7 +2524,7 @@ msgstr "Contraseña antigua incorrecta."
msgid "Error saving user; invalid."
msgstr "Error al guardar el usuario; inválido."
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
msgid "Can't save new password."
msgstr "No se puede guardar la nueva contraseña."
@@ -2538,6 +2540,7 @@ msgstr "Rutas"
#: actions/pathsadminpanel.php:70
msgid "Path and server settings for this StatusNet site."
msgstr ""
+"Configuración de la ruta de acceso y del servidor de este sitio StatusNet."
#: actions/pathsadminpanel.php:157
#, php-format
@@ -2547,7 +2550,7 @@ msgstr "Directorio de temas ilegible: %s"
#: actions/pathsadminpanel.php:163
#, php-format
msgid "Avatar directory not writable: %s"
-msgstr ""
+msgstr "Directorio de imágenes no editable: %s"
#: actions/pathsadminpanel.php:169
#, php-format
@@ -2557,7 +2560,7 @@ msgstr "Directorio de fondo ilegible: %s"
#: actions/pathsadminpanel.php:177
#, php-format
msgid "Locales directory not readable: %s"
-msgstr ""
+msgstr "Directorio de configuración regional ilegible: $s"
#: actions/pathsadminpanel.php:183
msgid "Invalid SSL server. The maximum length is 255 characters."
@@ -2573,32 +2576,31 @@ msgstr "Servidor"
#: actions/pathsadminpanel.php:238
msgid "Site's server hostname."
-msgstr ""
+msgstr "Nombre del host del servidor del sitio."
#: actions/pathsadminpanel.php:242
msgid "Path"
msgstr "Ruta"
#: actions/pathsadminpanel.php:242
-#, fuzzy
msgid "Site path"
-msgstr "Aviso de sitio"
+msgstr "Ruta del sitio"
#: actions/pathsadminpanel.php:246
msgid "Path to locales"
-msgstr ""
+msgstr "Ruta de las configuraciones locales"
#: actions/pathsadminpanel.php:246
msgid "Directory path to locales"
-msgstr ""
+msgstr "Ruta del directorio de las configuraciones locales"
#: actions/pathsadminpanel.php:250
msgid "Fancy URLs"
-msgstr ""
+msgstr "URL agradables"
#: actions/pathsadminpanel.php:252
msgid "Use fancy (more readable and memorable) URLs?"
-msgstr ""
+msgstr "¿Usar URL agradables (más legibles y memorizables)?"
#: actions/pathsadminpanel.php:259
msgid "Theme"
@@ -2610,7 +2612,7 @@ msgstr "Servidor de los temas"
#: actions/pathsadminpanel.php:268
msgid "Theme path"
-msgstr ""
+msgstr "Ruta del tema"
#: actions/pathsadminpanel.php:272
msgid "Theme directory"
@@ -2618,20 +2620,19 @@ msgstr "Directorio de temas"
#: actions/pathsadminpanel.php:279
msgid "Avatars"
-msgstr "Avatares"
+msgstr "Imágenes"
#: actions/pathsadminpanel.php:284
msgid "Avatar server"
-msgstr "Servidor del avatar"
+msgstr "Servidor de la imagen"
#: actions/pathsadminpanel.php:288
-#, fuzzy
msgid "Avatar path"
-msgstr "Avatar actualizado"
+msgstr "Ruta de la imagen"
#: actions/pathsadminpanel.php:292
msgid "Avatar directory"
-msgstr "Directorio del avatar"
+msgstr "Directorio de la imagen"
#: actions/pathsadminpanel.php:301
msgid "Backgrounds"
@@ -2643,7 +2644,7 @@ msgstr "Servidor de fondo"
#: actions/pathsadminpanel.php:309
msgid "Background path"
-msgstr ""
+msgstr "Ruta del fondo"
#: actions/pathsadminpanel.php:313
msgid "Background directory"
@@ -2682,9 +2683,8 @@ msgid "Server to direct SSL requests to"
msgstr "Servidor hacia el cual dirigir las solicitudes SSL"
#: actions/pathsadminpanel.php:352
-#, fuzzy
msgid "Save paths"
-msgstr "Aviso de sitio"
+msgstr "Guardar rutas"
#: actions/peoplesearch.php:52
#, php-format
@@ -2699,15 +2699,15 @@ msgstr ""
msgid "People search"
msgstr "Buscador de gente"
-#: actions/peopletag.php:70
+#: actions/peopletag.php:68
#, php-format
msgid "Not a valid people tag: %s"
msgstr "No es una etiqueta válida para personas: %s"
-#: actions/peopletag.php:144
-#, fuzzy, php-format
+#: actions/peopletag.php:142
+#, php-format
msgid "Users self-tagged with %1$s - page %2$d"
-msgstr "Usuarios auto marcados con %s - página %d"
+msgstr "Usuarios auto etiquetados con %1$s - página %2$d"
#: actions/postnotice.php:95
msgid "Invalid notice content"
@@ -2717,6 +2717,7 @@ msgstr "El contenido del aviso es inválido"
#, php-format
msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
msgstr ""
+"La licencia del aviso %1$s’ es incompatible con la licencia del sitio ‘%2$s’."
#: actions/profilesettings.php:60
msgid "Profile settings"
@@ -2739,8 +2740,8 @@ 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/showgroup.php:255 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:149
+#: actions/showgroup.php:256 actions/tagother.php:104
+#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Nombre completo"
@@ -2767,9 +2768,9 @@ msgid "Bio"
msgstr "Biografía"
#: actions/profilesettings.php:132 actions/register.php:471
-#: actions/showgroup.php:264 actions/tagother.php:112
+#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
-#: lib/userprofile.php:164
+#: lib/userprofile.php:165
msgid "Location"
msgstr "Ubicación"
@@ -2783,7 +2784,7 @@ msgstr "Compartir mi ubicación actual al publicar los mensajes"
#: actions/profilesettings.php:145 actions/tagother.php:149
#: actions/tagother.php:209 lib/subscriptionlist.php:106
-#: lib/subscriptionlist.php:108 lib/userprofile.php:209
+#: lib/subscriptionlist.php:108 lib/userprofile.php:210
msgid "Tags"
msgstr "Tags"
@@ -2873,19 +2874,16 @@ msgid "Public timeline"
msgstr "Línea temporal pública"
#: actions/public.php:160
-#, fuzzy
msgid "Public Stream Feed (RSS 1.0)"
-msgstr "Feed del flujo público"
+msgstr "Canal público (RSS 1.0)"
#: actions/public.php:164
-#, fuzzy
msgid "Public Stream Feed (RSS 2.0)"
-msgstr "Feed del flujo público"
+msgstr "Canal público (RSS 2.0)"
#: actions/public.php:168
-#, fuzzy
msgid "Public Stream Feed (Atom)"
-msgstr "Feed del flujo público"
+msgstr "Canal público (Atom)"
#: actions/public.php:188
#, php-format
@@ -2905,6 +2903,8 @@ msgstr "¡Sé la primera persona en publicar algo!"
msgid ""
"Why not [register an account](%%action.register%%) and be the first to post!"
msgstr ""
+"¿Por qué no [registras una cuenta](%%action.register%%) y te conviertes en "
+"la primera persona en publicar?"
#: actions/public.php:242
#, php-format
@@ -2914,16 +2914,22 @@ msgid ""
"tool. [Join now](%%action.register%%) to share notices about yourself with "
"friends, family, and colleagues! ([Read more](%%doc.help%%))"
msgstr ""
+"Este es %%site.name%%, un servicio de [microblogueo](http://es.wikipedia."
+"org/wiki/Microblogging) basada en la herramienta de software libre "
+"[StatusNet](http://status.net/) tool. ¡[Regístrate](%%action.register%%) "
+"para compartir notas acerca de tí con tus amistades, familiares y "
+"compañeros!! ([Más información](%%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 ""
-"Es un %%site.name%%, un servicio [micro-blogging](http://en.wikipedia.org/"
-"wiki/Micro-blogging) "
+"Este es %%site.name%%, un servicio de [microblogueo](http://es.wikipedia."
+"org/wiki/Microblogging) basada en la herramienta de software libre "
+"[StatusNet](http://status.net/) tool."
#: actions/publictagcloud.php:57
msgid "Public tag cloud"
@@ -2937,7 +2943,7 @@ msgstr "Éstos son los tags recientes más populares en %s"
#: actions/publictagcloud.php:69
#, php-format
msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
-msgstr ""
+msgstr "Aún nadie a publicado un aviso con [hashtags] (%%doc.tags%%)"
#: actions/publictagcloud.php:72
msgid "Be the first to post one!"
@@ -2991,6 +2997,8 @@ msgid ""
"If you have forgotten or lost your password, you can get a new one sent to "
"the email address you have stored in your account."
msgstr ""
+"Si has olvidado tu contraseña, podemos enviarte una nueva a la dirección de "
+"correo electrónico que has registrado en tu cuenta."
#: actions/recoverpassword.php:158
msgid "You have been identified. Enter a new password below. "
@@ -3024,7 +3032,7 @@ msgstr "Restablecer contraseña"
msgid "Recover password"
msgstr "Recuperar contraseña"
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
msgid "Password recovery requested"
msgstr "Recuperación de contraseña solicitada"
@@ -3042,21 +3050,21 @@ msgstr "Restablecer"
#: actions/recoverpassword.php:252
msgid "Enter a nickname or email address."
-msgstr "Ingresa un apodo o correo electronico"
+msgstr "Ingresa un nombre de usuario o correo electronico"
-#: actions/recoverpassword.php:272
+#: actions/recoverpassword.php:282
msgid "No user with that email address or username."
msgstr "No hay ningún usuario con esa dirección de correo o nombre de usuario."
-#: actions/recoverpassword.php:287
+#: actions/recoverpassword.php:299
msgid "No registered email address for that user."
msgstr "Ninguna dirección de correo electrónico registrada por este usuario."
-#: actions/recoverpassword.php:301
+#: actions/recoverpassword.php:313
msgid "Error saving address confirmation."
msgstr "Error al guardar confirmación de la dirección."
-#: actions/recoverpassword.php:325
+#: actions/recoverpassword.php:338
msgid ""
"Instructions for recovering your password have been sent to the email "
"address registered to your account."
@@ -3064,23 +3072,23 @@ msgstr ""
"Se enviaron instrucciones para recuperar tu contraseña a la dirección de "
"correo registrada."
-#: actions/recoverpassword.php:344
+#: actions/recoverpassword.php:357
msgid "Unexpected password reset."
msgstr "Restablecimiento de contraseña inesperado."
-#: actions/recoverpassword.php:352
+#: actions/recoverpassword.php:365
msgid "Password must be 6 chars or more."
msgstr "La contraseña debe tener 6 o más caracteres."
-#: actions/recoverpassword.php:356
+#: actions/recoverpassword.php:369
msgid "Password and confirmation do not match."
msgstr "La contraseña y la confirmación no coinciden."
-#: actions/recoverpassword.php:375 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:248
msgid "Error setting user."
msgstr "Error al configurar el usuario."
-#: actions/recoverpassword.php:382
+#: actions/recoverpassword.php:395
msgid "New password successfully saved. You are now logged in."
msgstr "Nueva contraseña guardada correctamente. Has iniciado una sesión."
@@ -3121,6 +3129,8 @@ msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
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 compañeros. "
#: actions/register.php:425
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
@@ -3156,7 +3166,7 @@ msgstr "Mi texto y archivos están disponibles bajo"
#: actions/register.php:496
msgid "Creative Commons Attribution 3.0"
-msgstr ""
+msgstr "Creative Commons Reconocimiento 3.0"
#: actions/register.php:497
msgid ""
@@ -3244,7 +3254,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "El URL de tu perfil en otro servicio de microblogueo compatible"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:394
+#: lib/userprofile.php:406
msgid "Subscribe"
msgstr "Suscribirse"
@@ -3282,7 +3292,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:674
+#: actions/repeat.php:114 lib/noticelist.php:678
msgid "Repeated"
msgstr "Repetido"
@@ -3302,14 +3312,14 @@ msgid "Replies to %1$s, page %2$d"
msgstr "Respuestas a %1$s, página %2$d"
#: actions/replies.php:145
-#, fuzzy, php-format
+#, php-format
msgid "Replies feed for %s (RSS 1.0)"
-msgstr "Feed de avisos de %s"
+msgstr "Canal de respuestas a %s (RSS 1.0)"
#: actions/replies.php:152
-#, fuzzy, php-format
+#, php-format
msgid "Replies feed for %s (RSS 2.0)"
-msgstr "Feed de avisos de %s"
+msgstr "Canal de respuestas a %s (RSS 2.0)"
#: actions/replies.php:159
#, php-format
@@ -3322,6 +3332,8 @@ msgid ""
"This is the timeline showing replies to %1$s but %2$s hasn't received a "
"notice to his attention yet."
msgstr ""
+"Esta es la línea temporal que muestra las respuestas a a %1$s, pero %2$s aún "
+"no ha recibido ningún aviso a su atención."
#: actions/replies.php:204
#, php-format
@@ -3329,6 +3341,8 @@ msgid ""
"You can engage other users in a conversation, subscribe to more people or "
"[join groups](%%action.groups%%)."
msgstr ""
+"Puedes introducir a otros usuarios en conversaciones, suscribir a más gente "
+"o [unirte a grupos](%%action.groups%%)."
#: actions/replies.php:206
#, php-format
@@ -3336,6 +3350,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 ""
+"Puedes intentar [darle un toque a %1$s](../%2$s) o [publicar algo en su "
+"atención](%%%%action.newnotice%%%%?status_textarea=%3$s)."
#: actions/repliesrss.php:72
#, php-format
@@ -3343,28 +3359,24 @@ msgid "Replies to %1$s on %2$s!"
msgstr "Respuestas a %1$s en %2$s!"
#: actions/revokerole.php:75
-#, fuzzy
msgid "You cannot revoke user roles on this site."
-msgstr "No puedes enviar mensaje a este usuario."
+msgstr "No puedes revocar funciones de usuario en este sitio."
#: actions/revokerole.php:82
-#, fuzzy
msgid "User doesn't have this role."
-msgstr "Usuario sin perfil coincidente."
+msgstr "El usuario no tiene esta función."
#: actions/rsd.php:146 actions/version.php:157
msgid "StatusNet"
msgstr "StatusNet"
#: actions/sandbox.php:65 actions/unsandbox.php:65
-#, fuzzy
msgid "You cannot sandbox users on this site."
-msgstr "No puedes enviar mensaje a este usuario."
+msgstr "No puedes enviar usuarios a la zona de pruebas en este sitio."
#: actions/sandbox.php:72
-#, fuzzy
msgid "User is already sandboxed."
-msgstr "El usuario te ha bloqueado."
+msgstr "El usuario ya está en la zona de pruebas."
#. TRANS: Menu item for site administration
#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
@@ -3382,15 +3394,15 @@ msgstr "Gestionar sesiones"
#: actions/sessionsadminpanel.php:177
msgid "Whether to handle sessions ourselves."
-msgstr ""
+msgstr "Si manejamos las sesiones nosotros mismos."
#: actions/sessionsadminpanel.php:181
msgid "Session debugging"
-msgstr ""
+msgstr "Depuración de sesión"
#: actions/sessionsadminpanel.php:183
msgid "Turn on debugging output for sessions."
-msgstr ""
+msgstr "Activar la salida de depuración para sesiones."
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
#: actions/useradminpanel.php:294
@@ -3398,9 +3410,8 @@ msgid "Save site settings"
msgstr "Guardar la configuración del sitio"
#: actions/showapplication.php:82
-#, fuzzy
msgid "You must be logged in to view an application."
-msgstr "Debes estar conectado para dejar un grupo."
+msgstr "Tienes que haber iniciado sesión para poder ver aplicaciones."
#: actions/showapplication.php:157
msgid "Application profile"
@@ -3424,15 +3435,15 @@ msgstr "Organización"
msgid "Description"
msgstr "Descripción"
-#: actions/showapplication.php:192 actions/showgroup.php:438
-#: lib/profileaction.php:176
+#: actions/showapplication.php:192 actions/showgroup.php:444
+#: lib/profileaction.php:187
msgid "Statistics"
msgstr "Estadísticas"
#: actions/showapplication.php:203
#, php-format
msgid "Created by %1$s - %2$s access by default - %3$d users"
-msgstr ""
+msgstr "Creado por %1$s - acceso predeterminado %2$s - %3$d usuarios"
#: actions/showapplication.php:213
msgid "Application actions"
@@ -3440,7 +3451,7 @@ msgstr "Acciones de la aplicación"
#: actions/showapplication.php:236
msgid "Reset key & secret"
-msgstr ""
+msgstr "Reiniciar clave y secreto"
#: actions/showapplication.php:261
msgid "Application info"
@@ -3448,11 +3459,11 @@ msgstr "Información de la aplicación"
#: actions/showapplication.php:263
msgid "Consumer key"
-msgstr ""
+msgstr "Clave del consumidor"
#: actions/showapplication.php:268
msgid "Consumer secret"
-msgstr ""
+msgstr "Secreto del consumidor"
#: actions/showapplication.php:273
msgid "Request token URL"
@@ -3471,16 +3482,17 @@ msgid ""
"Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
"signature method."
msgstr ""
+"Nota: Nuestro sistema sólo es compatible con firmas HMAC-SHA1. No son "
+"compatibles las firmas de texto sin formato."
#: actions/showapplication.php:309
-#, fuzzy
msgid "Are you sure you want to reset your consumer key and secret?"
-msgstr "¿Estás seguro de que quieres eliminar este aviso?"
+msgstr "¿realmente deseas reiniciar tu clave y secreto de consumidor?"
#: actions/showfavorites.php:79
-#, fuzzy, php-format
+#, php-format
msgid "%1$s's favorite notices, page %2$d"
-msgstr "Avisos favoritos de %s"
+msgstr "Avisos favoritos de %1$s, página %2$d"
#: actions/showfavorites.php:132
msgid "Could not retrieve favorite notices."
@@ -3489,23 +3501,25 @@ msgstr "No se pudo recibir avisos favoritos."
#: actions/showfavorites.php:171
#, php-format
msgid "Feed for favorites of %s (RSS 1.0)"
-msgstr "Feed de los amigos de %s"
+msgstr "Canal de las amistades de %s (RSS 1.0)"
#: actions/showfavorites.php:178
#, php-format
msgid "Feed for favorites of %s (RSS 2.0)"
-msgstr "Feed de los amigos de %s"
+msgstr "Canal de las amistades de %s (RSS 2.0)"
#: actions/showfavorites.php:185
#, php-format
msgid "Feed for favorites of %s (Atom)"
-msgstr "Feed de los amigos de %s"
+msgstr "Canal de las amistades de %s (Atom)"
#: actions/showfavorites.php:206
msgid ""
"You haven't chosen any favorite notices yet. Click the fave button on "
"notices you like to bookmark them for later or shed a spotlight on them."
msgstr ""
+"Aún no has elegido ningún aviso. Haz click sobre el botón \"favoritos\" en "
+"los avisos que quieras para ponerles un marcador o resaltarlos."
#: actions/showfavorites.php:208
#, php-format
@@ -3513,6 +3527,8 @@ msgid ""
"%s hasn't added any notices to his favorites yet. Post something interesting "
"they would add to their favorites :)"
msgstr ""
+"%s aún no ha añadido ningún aviso a sus favoritos. ¡Publica algo interesante "
+"que pueda añadir a sus favoritos! :)"
#: actions/showfavorites.php:212
#, php-format
@@ -3521,10 +3537,13 @@ msgid ""
"account](%%%%action.register%%%%) and then post something interesting they "
"would add to their favorites :)"
msgstr ""
+"%s aún no ha añadido ningún aviso a sus favoritos. ¿Por qué no [registras "
+"una cuenta] (%%%%action.register%%%%) y publicas algo interesante que pueda "
+"añadir a sus favoritos? :)"
#: actions/showfavorites.php:243
msgid "This is a way to share what you like."
-msgstr ""
+msgstr "Esta es una manera de compartir lo que te gusta."
#: actions/showgroup.php:82 lib/groupnav.php:86
#, php-format
@@ -3532,72 +3551,71 @@ msgid "%s group"
msgstr "Grupo %s"
#: actions/showgroup.php:84
-#, fuzzy, php-format
+#, php-format
msgid "%1$s group, page %2$d"
-msgstr "Miembros del grupo %s, página %d"
+msgstr "grupo %1$s, página %2$d"
-#: actions/showgroup.php:226
+#: actions/showgroup.php:227
msgid "Group profile"
msgstr "Perfil del grupo"
-#: actions/showgroup.php:271 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:177
+#: actions/showgroup.php:272 actions/tagother.php:118
+#: actions/userauthorization.php:175 lib/userprofile.php:178
msgid "URL"
msgstr "URL"
-#: actions/showgroup.php:282 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:194
+#: actions/showgroup.php:283 actions/tagother.php:128
+#: actions/userauthorization.php:187 lib/userprofile.php:195
msgid "Note"
msgstr "Nota"
-#: actions/showgroup.php:292 lib/groupeditform.php:184
+#: actions/showgroup.php:293 lib/groupeditform.php:184
msgid "Aliases"
msgstr "Alias"
-#: actions/showgroup.php:301
+#: actions/showgroup.php:302
msgid "Group actions"
msgstr "Acciones del grupo"
-#: actions/showgroup.php:337
-#, fuzzy, php-format
+#: actions/showgroup.php:338
+#, php-format
msgid "Notice feed for %s group (RSS 1.0)"
-msgstr "Feed de avisos de grupo %s"
+msgstr "Canal de avisos del grupo %s (RSS 1.0)"
-#: actions/showgroup.php:343
-#, fuzzy, php-format
+#: actions/showgroup.php:344
+#, php-format
msgid "Notice feed for %s group (RSS 2.0)"
-msgstr "Feed de avisos de grupo %s"
+msgstr "Canal de avisos del grupo %s (RSS 2.0)"
-#: actions/showgroup.php:349
-#, fuzzy, php-format
+#: actions/showgroup.php:350
+#, php-format
msgid "Notice feed for %s group (Atom)"
-msgstr "Feed de avisos de grupo %s"
+msgstr "Canal de avisos del grupo %s (Atom)"
-#: actions/showgroup.php:354
+#: actions/showgroup.php:355
#, php-format
msgid "FOAF for %s group"
-msgstr "Bandeja de salida para %s"
+msgstr "Amistades de amistades del grupo %s"
-#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91
-#, fuzzy
+#: actions/showgroup.php:393 actions/showgroup.php:453 lib/groupnav.php:91
msgid "Members"
msgstr "Miembros"
-#: actions/showgroup.php:395 lib/profileaction.php:117
-#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95
-#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71
+#: actions/showgroup.php:398 lib/profileaction.php:117
+#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95
+#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
msgid "(None)"
msgstr "(Ninguno)"
-#: actions/showgroup.php:401
+#: actions/showgroup.php:404
msgid "All members"
msgstr "Todos los miembros"
-#: actions/showgroup.php:441
+#: actions/showgroup.php:447
msgid "Created"
msgstr "Creado"
-#: actions/showgroup.php:457
+#: actions/showgroup.php:463
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3606,19 +3624,27 @@ msgid ""
"their life and interests. [Join now](%%%%action.register%%%%) to become part "
"of this group and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
+"**%s** es un grupo de usuarios en %%%%site.name%%%%, un servicio de "
+"[microblogueo](http://es.wikipedia.org/wiki/Microblogging) basado en la "
+"herramienta de software libre [StatusNet](http://status.net/). Sus miembros "
+"comparten mensajes cortos acerca de sus vida e intereses. ¡[Regístrate](%%%%"
+"action.register%%%%) para formar parte de este y muchos más grupos! ([Más "
+"información](%%%%doc.help%%%%))"
-#: actions/showgroup.php:463
-#, fuzzy, php-format
+#: actions/showgroup.php:469
+#, 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 "
"[StatusNet](http://status.net/) tool. Its members share short messages about "
"their life and interests. "
msgstr ""
-"**%s** es un grupo de usuarios en %%%%site.name%%%%, un servicio [micro-"
-"blogging](http://en.wikipedia.org/wiki/Micro-blogging) "
+"**%s** es un grupo de usuarios en %%%%site.name%%%%, un servicio de "
+"[microblogueo](http://es.wikipedia.org/wiki/Microblogging) basado en la "
+"herramienta de software libre [StatusNet](http://status.net/). Sus miembros "
+"comparten mensajes cortos acerca de su vida e intereses. "
-#: actions/showgroup.php:491
+#: actions/showgroup.php:497
msgid "Admins"
msgstr "Administradores"
@@ -3655,40 +3681,42 @@ 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 de avisos de grupo %s"
+msgstr "Canal de avisos de %1$s etiquetados %2$s (RSS 1.0)"
#: actions/showstream.php:129
-#, fuzzy, php-format
+#, php-format
msgid "Notice feed for %s (RSS 1.0)"
-msgstr "Feed de avisos de %s"
+msgstr "Canal de mensajes para %s (RSS 1.0)"
#: actions/showstream.php:136
-#, fuzzy, php-format
+#, php-format
msgid "Notice feed for %s (RSS 2.0)"
-msgstr "Feed de avisos de %s"
+msgstr "Canal de mensajes para %s (RSS 2.0)"
#: actions/showstream.php:143
-#, fuzzy, php-format
+#, php-format
msgid "Notice feed for %s (Atom)"
-msgstr "Feed de avisos de %s"
+msgstr "Canal de mensajes para %s (Atom)"
#: actions/showstream.php:148
-#, fuzzy, php-format
+#, php-format
msgid "FOAF for %s"
-msgstr "Bandeja de salida para %s"
+msgstr "Amistades de amistades de %s"
#: actions/showstream.php:200
#, php-format
msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
-msgstr ""
+msgstr "Esta es la línea temporal de %1$s, pero %2$s aún no ha publicado nada."
#: actions/showstream.php:205
msgid ""
"Seen anything interesting recently? You haven't posted any notices yet, now "
"would be a good time to start :)"
msgstr ""
+"¿Has visto algo interesante recientemente? Aún no has hecho ninguna "
+"publicación, así que este puede ser un buen momento para empezar :)"
#: actions/showstream.php:207
#, php-format
@@ -3696,6 +3724,8 @@ msgid ""
"You can try to nudge %1$s or [post something to his or her attention](%%%%"
"action.newnotice%%%%?status_textarea=%2$s)."
msgstr ""
+"Puedes intentar darle un toque a %1$s o [publicar algo a su atención](%%%%"
+"action.newnotice%%%%?status_textarea=%2$s)."
#: actions/showstream.php:243
#, php-format
@@ -3705,6 +3735,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** tiene una cuenta en %%%%site.name%%%%, un servicio de [microblogueo]"
+"(http://es.wikipedia.org/wiki/Microblogging) basado en la herramienta de "
+"software libre [StatusNet](http://status.net/). ¡[Regístrate](%%%%action."
+"register%%%%) para seguir los avisos de **%s** y de muchas personas más! "
+"([Más información](%%%%doc.help%%%%))"
#: actions/showstream.php:248
#, php-format
@@ -3723,28 +3758,24 @@ msgid "Repeat of %s"
msgstr "Repetición de %s"
#: actions/silence.php:65 actions/unsilence.php:65
-#, fuzzy
msgid "You cannot silence users on this site."
-msgstr "No puedes enviar mensaje a este usuario."
+msgstr "No puedes silenciar a otros usuarios en este sitio."
#: actions/silence.php:72
-#, fuzzy
msgid "User is already silenced."
-msgstr "El usuario te ha bloqueado."
+msgstr "El usuario ya ha sido silenciado."
#: actions/siteadminpanel.php:69
-#, fuzzy
msgid "Basic settings for this StatusNet site"
msgstr "Configuración básica de este sitio StatusNet."
#: actions/siteadminpanel.php:133
msgid "Site name must have non-zero length."
-msgstr ""
+msgstr "El nombre del sitio debe tener longitud diferente de cero."
#: actions/siteadminpanel.php:141
-#, fuzzy
msgid "You must have a valid contact email address."
-msgstr "No es una dirección de correo electrónico válida"
+msgstr "Debes tener una dirección de correo electrónico válida."
#: actions/siteadminpanel.php:159
#, php-format
@@ -3752,12 +3783,12 @@ msgid "Unknown language \"%s\"."
msgstr "Idioma desconocido \"%s\"."
#: actions/siteadminpanel.php:165
-msgid "Minimum text limit is 140 characters."
-msgstr ""
+msgid "Minimum text limit is 0 (unlimited)."
+msgstr "El límite mínimo de texto es 0 (sin límite)."
#: actions/siteadminpanel.php:171
msgid "Dupe limit must 1 or more seconds."
-msgstr ""
+msgstr "El límite de duplicación debe ser de 1 o más segundos."
#: actions/siteadminpanel.php:221
msgid "General"
@@ -3769,33 +3800,31 @@ msgstr "Nombre del sitio"
#: actions/siteadminpanel.php:225
msgid "The name of your site, like \"Yourcompany Microblog\""
-msgstr ""
+msgstr "El nombre de tu sitio, por ejemplo, \"Microblog tucompañía\""
#: actions/siteadminpanel.php:229
msgid "Brought by"
-msgstr ""
+msgstr "Traído por"
#: actions/siteadminpanel.php:230
msgid "Text used for credits link in footer of each page"
-msgstr ""
+msgstr "Texto utilizado para los vínculos a créditos en el pie de cada página"
#: actions/siteadminpanel.php:234
msgid "Brought by URL"
-msgstr ""
+msgstr "Traído por URL"
#: actions/siteadminpanel.php:235
msgid "URL used for credits link in footer of each page"
-msgstr ""
+msgstr "URL utilizado para el vínculo a los créditos en el pie de cada página"
#: actions/siteadminpanel.php:239
-#, fuzzy
msgid "Contact email address for your site"
-msgstr "Nueva dirección de correo para postear a %s"
+msgstr "Correo electrónico de contacto para tu sitio"
#: actions/siteadminpanel.php:245
-#, fuzzy
msgid "Local"
-msgstr "Vistas locales"
+msgstr "Configuraciones regionales"
#: actions/siteadminpanel.php:256
msgid "Default timezone"
@@ -3806,13 +3835,14 @@ msgid "Default timezone for the site; usually UTC."
msgstr "Zona horaria predeterminada del sitio; generalmente UTC."
#: actions/siteadminpanel.php:262
-#, fuzzy
msgid "Default language"
-msgstr "Idioma predeterminado del sitio"
+msgstr "!Idioma predeterminado"
#: actions/siteadminpanel.php:263
msgid "Site language when autodetection from browser settings is not available"
msgstr ""
+"Idioma del sitio cuando la autodetección de la configuración del navegador "
+"no está disponible"
#: actions/siteadminpanel.php:271
msgid "Limits"
@@ -3828,44 +3858,43 @@ msgstr "Cantidad máxima de caracteres para los mensajes."
#: actions/siteadminpanel.php:278
msgid "Dupe limit"
-msgstr ""
+msgstr "Límite de duplicados"
#: actions/siteadminpanel.php:278
msgid "How long users must wait (in seconds) to post the same thing again."
msgstr "Cuántos segundos es necesario esperar para publicar lo mismo de nuevo."
#: actions/sitenoticeadminpanel.php:56
-#, fuzzy
msgid "Site Notice"
-msgstr "Aviso de sitio"
+msgstr "Aviso del sitio"
#: actions/sitenoticeadminpanel.php:67
-#, fuzzy
msgid "Edit site-wide message"
-msgstr "Nuevo Mensaje "
+msgstr "Editar el mensaje que va a lo ancho del sitio"
#: actions/sitenoticeadminpanel.php:103
-#, fuzzy
msgid "Unable to save site notice."
-msgstr "No se pudo grabar tu configuración de diseño."
+msgstr "No se pudo guarda el aviso del sitio."
#: actions/sitenoticeadminpanel.php:113
msgid "Max length for the site-wide notice is 255 chars"
msgstr ""
+"La longitud máxima para el aviso que va a lo ancho del sitio es de 255 "
+"caracteres"
#: actions/sitenoticeadminpanel.php:176
-#, fuzzy
msgid "Site notice text"
-msgstr "Aviso de sitio"
+msgstr "Texto del aviso del sitio"
#: actions/sitenoticeadminpanel.php:178
msgid "Site-wide notice text (255 chars max; HTML okay)"
msgstr ""
+"Texto del aviso que va a lo ancho del sitio (máximo 255 caracteres; se "
+"acepta HTML)"
#: actions/sitenoticeadminpanel.php:198
-#, fuzzy
msgid "Save site notice"
-msgstr "Aviso de sitio"
+msgstr "Guardar el aviso del sitio"
#: actions/smssettings.php:58
msgid "SMS settings"
@@ -3930,14 +3959,13 @@ msgid "That phone number already belongs to another user."
msgstr "Ese número telefónico ya pertenece a otro usuario"
#: actions/smssettings.php:347
-#, 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 ""
-"Un código de confirmación fue enviado al número de teléfono que agregaste. "
-"Revisa tu bandeja de entrada (¡y la de spam!) para encontrar el código y las "
-"instrucciones sobre cómo usarlo."
+"Se ha enviado un código de confirmación al número de teléfono que agregaste. "
+"Revisa tu teléfono para encontrar el código y las instrucciones acerca de "
+"cómo usarlo."
#: actions/smssettings.php:374
msgid "That is the wrong confirmation number."
@@ -3976,13 +4004,12 @@ msgid "Snapshots"
msgstr "Capturas"
#: actions/snapshotadminpanel.php:65
-#, fuzzy
msgid "Manage snapshot configuration"
-msgstr "Cambiar la configuración del sitio"
+msgstr "Administrar la configuración de instantáneas"
#: actions/snapshotadminpanel.php:127
msgid "Invalid snapshot run value."
-msgstr ""
+msgstr "Valor de ejecución de instantánea inválido"
#: actions/snapshotadminpanel.php:133
msgid "Snapshot frequency must be a number."
@@ -3990,11 +4017,11 @@ msgstr "La frecuencia de captura debe ser un número."
#: actions/snapshotadminpanel.php:144
msgid "Invalid snapshot report URL."
-msgstr ""
+msgstr "URL de instantánea de reporte inválido"
#: actions/snapshotadminpanel.php:200
msgid "Randomly during Web hit"
-msgstr ""
+msgstr "Aleatoriamente durante visita Web"
#: actions/snapshotadminpanel.php:201
msgid "In a scheduled job"
@@ -4006,7 +4033,7 @@ msgstr "Capturas de datos"
#: actions/snapshotadminpanel.php:208
msgid "When to send statistical data to status.net servers"
-msgstr ""
+msgstr "Cuándo enviar datos estadísticos a los servidores status.net"
#: actions/snapshotadminpanel.php:217
msgid "Frequency"
@@ -4014,43 +4041,39 @@ msgstr "Frecuencia"
#: actions/snapshotadminpanel.php:218
msgid "Snapshots will be sent once every N web hits"
-msgstr ""
+msgstr "Las instantáneas se enviarán una vez cada N visitas Web"
#: actions/snapshotadminpanel.php:226
msgid "Report URL"
-msgstr ""
+msgstr "Reportar URL"
#: actions/snapshotadminpanel.php:227
msgid "Snapshots will be sent to this URL"
msgstr "Las capturas se enviarán a este URL"
#: actions/snapshotadminpanel.php:248
-#, fuzzy
msgid "Save snapshot settings"
-msgstr "Guardar la configuración del sitio"
+msgstr "Guardar la configuración de instantáneas"
#: actions/subedit.php:70
msgid "You are not subscribed to that profile."
msgstr "No te has suscrito a ese perfil."
-#: actions/subedit.php:83 classes/Subscription.php:89
-#: classes/Subscription.php:116
+#: actions/subedit.php:83 classes/Subscription.php:132
msgid "Could not save subscription."
msgstr "No se ha podido guardar la suscripción."
#: actions/subscribe.php:77
msgid "This action only accepts POST requests."
-msgstr ""
+msgstr "Esta acción sólo acepta solicitudes POST."
#: actions/subscribe.php:107
-#, fuzzy
msgid "No such profile."
-msgstr "No existe tal archivo."
+msgstr "No existe tal perfil."
#: actions/subscribe.php:117
-#, fuzzy
msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
-msgstr "No te has suscrito a ese perfil."
+msgstr "No puedes suscribirte a un perfil remoto 0.1 de OMB con esta acción."
#: actions/subscribe.php:145
msgid "Subscribed"
@@ -4062,9 +4085,9 @@ msgid "%s subscribers"
msgstr "%s suscriptores"
#: actions/subscribers.php:52
-#, fuzzy, php-format
+#, php-format
msgid "%1$s subscribers, page %2$d"
-msgstr "Suscriptores, página %d"
+msgstr "%1$s suscriptores, página %2$d"
#: actions/subscribers.php:63
msgid "These are the people who listen to your notices."
@@ -4080,11 +4103,14 @@ msgid ""
"You have no subscribers. Try subscribing to people you know and they might "
"return the favor"
msgstr ""
+"No tienes suscriptores. Intenta suscribirte a gente que conozcas y puede que "
+"te devuelvan el favor"
#: actions/subscribers.php:110
#, php-format
msgid "%s has no subscribers. Want to be the first?"
msgstr ""
+"%s no tiene suscriptores. ¿Quieres se la primera persona que se suscriba?"
#: actions/subscribers.php:114
#, php-format
@@ -4092,6 +4118,8 @@ msgid ""
"%s has no subscribers. Why not [register an account](%%%%action.register%%%"
"%) and be the first?"
msgstr ""
+"%s no tiene suscriptores. ¿Por qué no [registrar una cuenta](%%%%action."
+"register%%%%) y ser la primera persona?"
#: actions/subscriptions.php:52
#, php-format
@@ -4099,9 +4127,9 @@ msgid "%s subscriptions"
msgstr "Suscripciones %s"
#: actions/subscriptions.php:54
-#, fuzzy, php-format
+#, php-format
msgid "%1$s subscriptions, page %2$d"
-msgstr "%s suscripciones, página %d"
+msgstr "%1$s suscrippciones, página %2$d"
#: actions/subscriptions.php:65
msgid "These are the people whose notices you listen to."
@@ -4121,42 +4149,46 @@ msgid ""
"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
"automatically subscribe to people you already follow there."
msgstr ""
+"Ahora mismo no estás escuchando los avisos de nadie. Intenta suscribirte a "
+"gente que conozcas. Puedes [buscar gente](%%action.peoplesearch%%); busca "
+"miembros de grupos que te intereses y entre nuestros [usuarios especiales](%%"
+"action.featured%%). Si eres [usuario de Twitter](%%action.twittersettings%"
+"%), puedes suscribirte automáticamente a las personas que ya sigues allí."
#: actions/subscriptions.php:128 actions/subscriptions.php:132
#, php-format
msgid "%s is not listening to anyone."
msgstr "%s no está escuchando a nadie."
-#: actions/subscriptions.php:199
+#: actions/subscriptions.php:208
msgid "Jabber"
msgstr "Jabber"
-#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:222 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr "SMS"
#: actions/tag.php:69
-#, fuzzy, php-format
+#, php-format
msgid "Notices tagged with %1$s, page %2$d"
-msgstr "Usuarios auto marcados con %s - página %d"
+msgstr "Avisos etiquetados con %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 de avisos de %s"
+msgstr "Canal de avisos con 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 de avisos de %s"
+msgstr "Canal de avisos con etiqueta %s (RSS 2.0)"
#: actions/tag.php:99
-#, fuzzy, php-format
+#, php-format
msgid "Notice feed for tag %s (Atom)"
-msgstr "Feed de avisos de %s"
+msgstr "Canal de avisos con etiqueta %s (Atom)"
#: actions/tagother.php:39
-#, fuzzy
msgid "No ID argument."
msgstr "No existe argumento de ID."
@@ -4165,12 +4197,12 @@ msgstr "No existe argumento de ID."
msgid "Tag %s"
msgstr "%s tag"
-#: actions/tagother.php:77 lib/userprofile.php:75
+#: actions/tagother.php:77 lib/userprofile.php:76
msgid "User profile"
msgstr "Perfil de usuario"
#: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:102
+#: lib/userprofile.php:103
msgid "Photo"
msgstr "Foto"
@@ -4214,14 +4246,12 @@ msgid "You haven't blocked that user."
msgstr "No has bloqueado ese usuario."
#: actions/unsandbox.php:72
-#, fuzzy
msgid "User is not sandboxed."
-msgstr "El usuario te ha bloqueado."
+msgstr "El usuario no está en la zona de pruebas."
#: actions/unsilence.php:72
-#, fuzzy
msgid "User is not silenced."
-msgstr "El usuario no tiene un perfil."
+msgstr "El usuario no ha sido silenciado."
#: actions/unsubscribe.php:77
msgid "No profile id in request."
@@ -4236,10 +4266,11 @@ msgstr "Desuscrito"
msgid ""
"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
msgstr ""
+"Licencia de flujo del emisor ‘%1$s’ es incompatible con la licencia del "
+"sitio ‘%2$s’."
#. TRANS: User admin panel title
#: actions/useradminpanel.php:59
-#, fuzzy
msgctxt "TITLE"
msgid "User"
msgstr "Usuario"
@@ -4304,7 +4335,7 @@ msgstr "Invitaciones habilitadas"
#: actions/useradminpanel.php:258
msgid "Whether to allow users to invite new users."
-msgstr ""
+msgstr "Si permitir a los usuarios invitar nuevos usuarios."
#: actions/userauthorization.php:105
msgid "Authorize subscription"
@@ -4350,65 +4381,63 @@ msgid "Subscription authorized"
msgstr "Suscripción autorizada"
#: 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 ""
-"Se ha autorizado la suscripción, pero no se ha enviado un URL de retorno. "
-"Lee de nuevo las instrucciones para saber cómo autorizar la suscripción. Tu "
-"identificador de suscripción es:"
+"La suscripción ha sido autorizada, pero no se ha pasado un URL de retorno. "
+"Consulte con las instrucciones del sitio para obtener detalles acerca de "
+"cómo autorizar la suscripción. Tu token de suscripción es:"
#: actions/userauthorization.php:266
msgid "Subscription rejected"
msgstr "Suscripción rechazada"
#: 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 ""
-"Se ha rechazado la suscripción, pero no se ha enviado un URL de retorno. Lee "
+"!Se ha rechazado la suscripción, pero no se ha pasado un URL de retorno. Lee "
"de nuevo las instrucciones para saber cómo rechazar la suscripción "
"completamente."
#: actions/userauthorization.php:303
#, php-format
msgid "Listener URI ‘%s’ not found here."
-msgstr ""
+msgstr "No se ha encontrado aquí el URI del oyente ‘%s’."
#: actions/userauthorization.php:308
#, php-format
msgid "Listenee URI ‘%s’ is too long."
-msgstr ""
+msgstr "El URI ‘%s’ del receptor es muy largo."
#: actions/userauthorization.php:314
#, php-format
msgid "Listenee URI ‘%s’ is a local user."
-msgstr ""
+msgstr "El URI ‘%s’ del receptor es un usuario local."
#: actions/userauthorization.php:329
#, php-format
msgid "Profile URL ‘%s’ is for a local user."
-msgstr ""
+msgstr "El URL ‘%s’ de perfil es para un usuario local."
#: actions/userauthorization.php:345
#, php-format
msgid "Avatar URL ‘%s’ is not valid."
-msgstr ""
+msgstr "La URL ‘%s’ de la imagen no es válida."
#: actions/userauthorization.php:350
-#, fuzzy, php-format
+#, php-format
msgid "Can’t read avatar URL ‘%s’."
-msgstr "No se puede leer el URL del avatar '%s'"
+msgstr "No se puede leer la URL de la imagen ‘%s’."
#: actions/userauthorization.php:355
-#, fuzzy, php-format
+#, php-format
msgid "Wrong image type for avatar URL ‘%s’."
-msgstr "Tipo de imagen incorrecto para '%s'"
+msgstr "Tipo de imagen incorrecto para la URL de imagen ‘%s’."
#: actions/userdesignsettings.php:76 lib/designsettings.php:65
msgid "Profile design"
@@ -4419,29 +4448,31 @@ msgid ""
"Customize the way your profile looks with a background image and a colour "
"palette of your choice."
msgstr ""
+"Personaliza la vista de tu perfil con una imagen de fondo y la paelta de "
+"colores que quieras."
#: actions/userdesignsettings.php:282
msgid "Enjoy your hotdog!"
-msgstr ""
+msgstr "¡Disfruta de tu perrito caliente!"
#: actions/usergroups.php:64
-#, fuzzy, php-format
+#, php-format
msgid "%1$s groups, page %2$d"
-msgstr "Miembros del grupo %s, página %d"
+msgstr "%1$s grupos, página %2$d"
#: actions/usergroups.php:130
msgid "Search for more groups"
msgstr "Buscar más grupos"
#: actions/usergroups.php:157
-#, fuzzy, php-format
+#, php-format
msgid "%s is not a member of any group."
-msgstr "No eres miembro de ese grupo"
+msgstr "%s no es miembro de ningún grupo."
#: actions/usergroups.php:162
#, php-format
msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
-msgstr ""
+msgstr "Intenta [buscar gupos](%%action.groupsearch%%) y unirte a ellos."
#: actions/userrss.php:95 lib/atomgroupnoticefeed.php:66
#: lib/atomusernoticefeed.php:72
@@ -4450,9 +4481,9 @@ msgid "Updates from %1$s on %2$s!"
msgstr "¡Actualizaciones de %1$s en %2$s!"
#: actions/version.php:73
-#, fuzzy, php-format
+#, php-format
msgid "StatusNet %s"
-msgstr "Estadísticas"
+msgstr "%s StatusNet"
#: actions/version.php:153
#, php-format
@@ -4474,6 +4505,10 @@ msgid ""
"Software Foundation, either version 3 of the License, or (at your option) "
"any later version. "
msgstr ""
+"Freecol es software libre: Puedes redistribuirlo y/o modificarlo bajo los "
+"términos de la Licencia Pública General de Affero AGPL tal y como se ha "
+"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
msgid ""
@@ -4482,6 +4517,10 @@ msgid ""
"FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License "
"for more details. "
msgstr ""
+"Este programa se distribuye con la esperanza de que sea útil, pero SIN "
+"NINGUNA GARANTÍA, incluso sin la garantía implícita de COMERCIALIZACIÓN o "
+"IDONEIDAD PARA UN PROPÓSITO PARTICULAR. Consulte la Licencia Pública General "
+"de Affero AGPL para más detalles. "
#: actions/version.php:180
#, php-format
@@ -4489,60 +4528,61 @@ msgid ""
"You should have received a copy of the GNU Affero General Public License "
"along with this program. If not, see %s."
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
msgid "Plugins"
msgstr "Complementos"
-#: actions/version.php:196 lib/action.php:767
-#, fuzzy
+#: actions/version.php:196 lib/action.php:766
msgid "Version"
-msgstr "Sesiones"
+msgstr "Versión"
#: actions/version.php:197
msgid "Author(s)"
msgstr "Autor(es)"
-#: classes/File.php:144
+#: classes/File.php:169
#, 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 ""
+"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:154
+#: classes/File.php:179
#, 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:161
+#: classes/File.php:186
#, php-format
msgid "A file this large would exceed your monthly quota of %d bytes."
-msgstr ""
+msgstr "Un archivo tan grande podría sobrepasar tu cuota mensual de %d bytes."
#: classes/Group_member.php:41
-#, fuzzy
msgid "Group join failed."
-msgstr "Perfil de grupo"
+msgstr "Ha fallado la acción de unirse el grupo"
#: classes/Group_member.php:53
msgid "Not part of group."
msgstr "No es parte del grupo."
#: classes/Group_member.php:60
-#, fuzzy
msgid "Group leave failed."
-msgstr "Perfil de grupo"
+msgstr "Ha fallado la acción de abandonar el grupo"
#: classes/Local_group.php:41
-#, fuzzy
msgid "Could not update local group."
-msgstr "No se pudo actualizar el grupo."
+msgstr "No se pudo actualizar el grupo local."
#: classes/Login_token.php:76
-#, fuzzy, php-format
+#, php-format
msgid "Could not create login token for %s"
-msgstr "No se pudo crear favorito."
+msgstr "No se pudo crear el token de acceso para %s"
#: classes/Message.php:45
msgid "You are banned from sending direct messages."
@@ -4556,107 +4596,100 @@ msgstr "No se pudo insertar mensaje."
msgid "Could not update message with new URI."
msgstr "No se pudo actualizar mensaje con nuevo URI."
-#: classes/Notice.php:172
+#: classes/Notice.php:175
#, php-format
msgid "DB error inserting hashtag: %s"
msgstr "Error de la BD al insertar la etiqueta clave: %s"
-#: classes/Notice.php:241
+#: classes/Notice.php:244
msgid "Problem saving notice. Too long."
msgstr "Ha habido un problema al guardar el mensaje. Es muy largo."
-#: classes/Notice.php:245
+#: classes/Notice.php:248
msgid "Problem saving notice. Unknown user."
msgstr "Ha habido un problema al guardar el mensaje. Usuario desconocido."
-#: classes/Notice.php:250
+#: classes/Notice.php:253
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:256
-#, fuzzy
+#: classes/Notice.php:259
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
msgstr ""
-"Demasiados avisos demasiado rápido; para y publicar nuevamente en unos "
-"minutos."
+"Muchos mensajes, enviados muy rápido; espera un poco e intenta publicar "
+"pasados unos minutos."
-#: classes/Notice.php:262
+#: classes/Notice.php:265
msgid "You are banned from posting notices on this site."
msgstr "Tienes prohibido publicar avisos en este sitio."
-#: classes/Notice.php:328 classes/Notice.php:354
+#: classes/Notice.php:331 classes/Notice.php:357
msgid "Problem saving notice."
msgstr "Hubo un problema al guardar el aviso."
-#: classes/Notice.php:927
-#, fuzzy
+#: classes/Notice.php:943
msgid "Problem saving group inbox."
-msgstr "Hubo un problema al guardar el aviso."
+msgstr "Hubo un problema al guarda la bandeja de entrada del grupo."
-#: classes/Notice.php:1459
+#: classes/Notice.php:1481
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
-#: classes/Subscription.php:66 lib/oauthstore.php:465
+#: classes/Subscription.php:74 lib/oauthstore.php:465
msgid "You have been banned from subscribing."
msgstr "Se te ha prohibido la suscripción."
-#: classes/Subscription.php:70
+#: classes/Subscription.php:78
msgid "Already subscribed!"
-msgstr ""
+msgstr "¡Ya te has suscrito!"
-#: classes/Subscription.php:74
+#: classes/Subscription.php:82
msgid "User has blocked you."
msgstr "El usuario te ha bloqueado."
-#: classes/Subscription.php:157
+#: classes/Subscription.php:167
#, fuzzy
msgid "Not subscribed!"
msgstr "¡No estás suscrito!"
-#: classes/Subscription.php:163
-#, fuzzy
+#: classes/Subscription.php:173
msgid "Couldn't delete self-subscription."
-msgstr "No se pudo eliminar la suscripción."
+msgstr "No se pudo eliminar la auto-suscripción."
-#: classes/Subscription.php:190
-#, fuzzy
+#: classes/Subscription.php:200
msgid "Couldn't delete subscription OMB token."
-msgstr "No se pudo eliminar la suscripción."
+msgstr "No se pudo eliminar el token OMB de suscripción."
-#: classes/Subscription.php:201 lib/subs.php:69
+#: classes/Subscription.php:211
msgid "Couldn't delete subscription."
msgstr "No se pudo eliminar la suscripción."
-#: classes/User.php:373
+#: classes/User.php:363
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Bienvenido a %1$s, @%2$s!"
-#: classes/User_group.php:477
+#: classes/User_group.php:480
msgid "Could not create group."
msgstr "No se pudo crear grupo."
-#: classes/User_group.php:486
-#, fuzzy
+#: classes/User_group.php:489
msgid "Could not set group URI."
-msgstr "No se pudo configurar miembros de grupo."
+msgstr "No se pudo configurar el URI del grupo."
-#: classes/User_group.php:507
-#, fuzzy
+#: classes/User_group.php:510
msgid "Could not set group membership."
-msgstr "No se pudo configurar miembros de grupo."
+msgstr "No se pudo configurar la membresía del grupo."
-#: classes/User_group.php:521
-#, fuzzy
+#: classes/User_group.php:524
msgid "Could not save local group info."
-msgstr "No se ha podido guardar la suscripción."
+msgstr "No se ha podido guardar la información del grupo local."
#: lib/accountsettingsaction.php:108
msgid "Change your profile settings"
@@ -4664,7 +4697,7 @@ msgstr "Cambia tus opciones de perfil"
#: lib/accountsettingsaction.php:112
msgid "Upload an avatar"
-msgstr "Cargar un avatar."
+msgstr "Subir una imagen."
#: lib/accountsettingsaction.php:116
msgid "Change your password"
@@ -4695,187 +4728,170 @@ msgstr "%1$s - %2$s"
msgid "Untitled page"
msgstr "Página sin título"
-#: lib/action.php:424
+#: lib/action.php:423
msgid "Primary site navigation"
msgstr "Navegación de sitio primario"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:430
-#, fuzzy
+#: lib/action.php:429
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
-msgstr "Perfil personal y línea de tiempo de amigos"
+msgstr "Perfil personal y línea temporal de amistades"
-#: lib/action.php:433
-#, fuzzy
+#: lib/action.php:432
msgctxt "MENU"
msgid "Personal"
msgstr "Personal"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:435
-#, fuzzy
+#: lib/action.php:434
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
-msgstr "Cambia tu correo electrónico, avatar, contraseña, perfil"
+msgstr "Cambia tu correo electrónico, imagen, contraseña, perfil"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:440
-#, fuzzy
+#: lib/action.php:439
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "Conectar a los servicios"
-#: lib/action.php:443
+#: lib/action.php:442
msgid "Connect"
msgstr "Conectarse"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:446
-#, fuzzy
+#: lib/action.php:445
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "Cambiar la configuración del sitio"
-#: lib/action.php:449
-#, fuzzy
+#: lib/action.php:448
msgctxt "MENU"
msgid "Admin"
msgstr "Admin"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:453
-#, fuzzy, php-format
+#: lib/action.php:452
+#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
-msgstr "Invita a amigos y colegas a unirse a %s"
+msgstr "Invita a amistades y compañeros a unirse a tí en %s"
-#: lib/action.php:456
-#, fuzzy
+#: lib/action.php:455
msgctxt "MENU"
msgid "Invite"
msgstr "Invitar"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:462
-#, fuzzy
+#: lib/action.php:461
msgctxt "TOOLTIP"
msgid "Logout from the site"
-msgstr "Salir de sitio"
+msgstr "Cerrar sesión en el sitio"
-#: lib/action.php:465
-#, fuzzy
+#: lib/action.php:464
msgctxt "MENU"
msgid "Logout"
-msgstr "Salir"
+msgstr "Cerrar Sesión"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:470
-#, fuzzy
+#: lib/action.php:469
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Crear una cuenta"
-#: lib/action.php:473
-#, fuzzy
+#: lib/action.php:472
msgctxt "MENU"
msgid "Register"
msgstr "Registrarse"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:476
-#, fuzzy
+#: lib/action.php:475
msgctxt "TOOLTIP"
msgid "Login to the site"
-msgstr "Ingresar a sitio"
+msgstr "Iniciar sesión en el sitio"
-#: lib/action.php:479
-#, fuzzy
+#: lib/action.php:478
msgctxt "MENU"
msgid "Login"
msgstr "Inicio de sesión"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:482
-#, fuzzy
+#: lib/action.php:481
msgctxt "TOOLTIP"
msgid "Help me!"
-msgstr "Ayúdame!"
+msgstr "¡Ayúdame!"
-#: lib/action.php:485
-#, fuzzy
+#: lib/action.php:484
msgctxt "MENU"
msgid "Help"
msgstr "Ayuda"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:488
-#, fuzzy
+#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "Buscar personas o texto"
-#: lib/action.php:491
-#, fuzzy
+#: lib/action.php:490
msgctxt "MENU"
msgid "Search"
msgstr "Buscar"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:513 lib/adminpanelaction.php:398
+#: lib/action.php:512 lib/adminpanelaction.php:398
msgid "Site notice"
msgstr "Aviso de sitio"
-#: lib/action.php:579
+#: lib/action.php:578
msgid "Local views"
msgstr "Vistas locales"
-#: lib/action.php:645
+#: lib/action.php:644
msgid "Page notice"
msgstr "Aviso de página"
-#: lib/action.php:747
+#: lib/action.php:746
msgid "Secondary site navigation"
msgstr "Navegación de sitio secundario"
-#: lib/action.php:752
+#: lib/action.php:751
msgid "Help"
msgstr "Ayuda"
-#: lib/action.php:754
+#: lib/action.php:753
msgid "About"
msgstr "Acerca de"
-#: lib/action.php:756
+#: lib/action.php:755
msgid "FAQ"
msgstr "Preguntas Frecuentes"
-#: lib/action.php:760
+#: lib/action.php:759
msgid "TOS"
-msgstr ""
+msgstr "TOS"
-#: lib/action.php:763
+#: lib/action.php:762
msgid "Privacy"
msgstr "Privacidad"
-#: lib/action.php:765
+#: lib/action.php:764
msgid "Source"
msgstr "Fuente"
-#: lib/action.php:769
+#: lib/action.php:768
msgid "Contact"
msgstr "Ponerse en contacto"
-#: lib/action.php:771
+#: lib/action.php:770
msgid "Badge"
msgstr "Insignia"
-#: lib/action.php:799
+#: lib/action.php:798
msgid "StatusNet software license"
msgstr "Licencia de software de StatusNet"
-#: lib/action.php:802
+#: lib/action.php:803
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4884,12 +4900,12 @@ msgstr ""
"**%%site.name%%** es un servicio de microblogueo de [%%site.broughtby%%**](%%"
"site.broughtbyurl%%)."
-#: lib/action.php:804
+#: lib/action.php:805
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** es un servicio de microblogueo."
-#: lib/action.php:806
+#: lib/action.php:808
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4900,57 +4916,64 @@ msgstr ""
"disponible bajo la [GNU Affero General Public License](http://www.fsf.org/"
"licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:821
+#: lib/action.php:823
msgid "Site content license"
msgstr "Licencia de contenido del sitio"
-#: lib/action.php:826
+#: lib/action.php:828
#, php-format
msgid "Content and data of %1$s are private and confidential."
-msgstr ""
+msgstr "El contenido y datos de %1$s son privados y confidenciales."
-#: lib/action.php:831
+#: lib/action.php:833
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
+"Copyright del contenido y los datos de%1$s. Todos los derechos reservados."
-#: lib/action.php:834
+#: lib/action.php:836
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
"Derechos de autor de contenido y datos por los colaboradores. Todos los "
"derechos reservados."
-#: lib/action.php:847
+#: lib/action.php:849
msgid "All "
msgstr "Todo"
-#: lib/action.php:853
+#: lib/action.php:855
msgid "license."
msgstr "Licencia."
-#: lib/action.php:1152
+#: lib/action.php:1154
msgid "Pagination"
msgstr "Paginación"
-#: lib/action.php:1161
+#: lib/action.php:1163
msgid "After"
msgstr "Después"
-#: lib/action.php:1169
+#: lib/action.php:1171
msgid "Before"
msgstr "Antes"
-#: lib/activity.php:453
-msgid "Can't handle remote content yet."
+#: lib/activity.php:120
+msgid "Expecting a root feed element but got a whole XML document."
msgstr ""
+"A espera de un elemento de alimentación de raíz, pero se obtuvo un documento "
+"XML entero."
-#: lib/activity.php:481
+#: lib/activityutils.php:208
+msgid "Can't handle remote content yet."
+msgstr "Aún no se puede manejar contenido remoto."
+
+#: lib/activityutils.php:236
msgid "Can't handle embedded XML content yet."
-msgstr ""
+msgstr "Aún no se puede manejar contenido XML incrustado."
-#: lib/activity.php:485
+#: lib/activityutils.php:240
msgid "Can't handle embedded Base64 content yet."
-msgstr ""
+msgstr "Aún no se puede manejar contenido incrustado Base64."
#. TRANS: Client error message
#: lib/adminpanelaction.php:98
@@ -4959,27 +4982,23 @@ msgstr "No puedes hacer cambios a este sitio."
#. TRANS: Client error message
#: lib/adminpanelaction.php:110
-#, fuzzy
msgid "Changes to that panel are not allowed."
-msgstr "Registro de usuario no permitido."
+msgstr "No se permite realizar cambios a ese panel."
#. TRANS: Client error message
#: lib/adminpanelaction.php:229
-#, fuzzy
msgid "showForm() not implemented."
-msgstr "Todavía no se implementa comando."
+msgstr "showForm() no implementada."
#. TRANS: Client error message
#: lib/adminpanelaction.php:259
-#, fuzzy
msgid "saveSettings() not implemented."
-msgstr "Todavía no se implementa comando."
+msgstr "saveSettings() no implementada."
#. TRANS: Client error message
#: lib/adminpanelaction.php:283
-#, fuzzy
msgid "Unable to delete design setting."
-msgstr "¡No se pudo guardar tu configuración de Twitter!"
+msgstr "No se puede eliminar la configuración de diseño."
#. TRANS: Menu item title/tooltip
#: lib/adminpanelaction.php:348
@@ -4988,7 +5007,6 @@ msgstr "Configuración básica del sitio"
#. TRANS: Menu item for site administration
#: lib/adminpanelaction.php:350
-#, fuzzy
msgctxt "MENU"
msgid "Site"
msgstr "Sitio"
@@ -5000,7 +5018,6 @@ msgstr "Configuración del diseño"
#. TRANS: Menu item for site administration
#: lib/adminpanelaction.php:358
-#, fuzzy
msgctxt "MENU"
msgid "Design"
msgstr "Diseño"
@@ -5022,9 +5039,8 @@ msgstr "Configuración de acceso"
#. TRANS: Menu item title/tooltip
#: lib/adminpanelaction.php:380
-#, fuzzy
msgid "Paths configuration"
-msgstr "SMS confirmación"
+msgstr "Configuración de rutas"
#. TRANS: Menu item title/tooltip
#: lib/adminpanelaction.php:388
@@ -5033,24 +5049,25 @@ msgstr "Configuración de sesiones"
#. TRANS: Menu item title/tooltip
#: lib/adminpanelaction.php:396
-#, fuzzy
msgid "Edit site notice"
-msgstr "Aviso de sitio"
+msgstr "Editar el aviso del sitio"
#. TRANS: Menu item title/tooltip
#: lib/adminpanelaction.php:404
-#, fuzzy
msgid "Snapshots configuration"
-msgstr "SMS confirmación"
+msgstr "Configuración de instantáneas"
#: lib/apiauth.php:94
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
+"API requiere acceso de lectura y escritura, pero sólo tienes acceso de "
+"lectura."
-#: lib/apiauth.php:272
+#: lib/apiauth.php:276
#, php-format
msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s"
msgstr ""
+"Ha fallado el intento de auth API, usuario = %1$s, proxy = %2$s, ip = %3$s"
#: lib/applicationeditform.php:136
msgid "Edit application"
@@ -5058,39 +5075,36 @@ msgstr "Editar aplicación"
#: lib/applicationeditform.php:184
msgid "Icon for this application"
-msgstr ""
+msgstr "Icono para esta aplicación"
#: lib/applicationeditform.php:204
-#, fuzzy, php-format
+#, php-format
msgid "Describe your application in %d characters"
-msgstr "Describir al grupo o tema en %d caracteres"
+msgstr "Describe tu aplicación en %d caracteres"
#: lib/applicationeditform.php:207
-#, fuzzy
msgid "Describe your application"
-msgstr "Describir al grupo o tema"
+msgstr "Describe tu aplicación"
#: lib/applicationeditform.php:216
msgid "Source URL"
msgstr "La URL de origen"
#: lib/applicationeditform.php:218
-#, fuzzy
msgid "URL of the homepage of this application"
-msgstr "El URL de página de inicio o blog del grupo or tema"
+msgstr "URL de la página principal de esta aplicación"
#: lib/applicationeditform.php:224
msgid "Organization responsible for this application"
msgstr "Organización responsable de esta aplicación"
#: lib/applicationeditform.php:230
-#, fuzzy
msgid "URL for the homepage of the organization"
-msgstr "El URL de página de inicio o blog del grupo or tema"
+msgstr "URL de la página principal de la organización"
#: lib/applicationeditform.php:236
msgid "URL to redirect to after authentication"
-msgstr ""
+msgstr "URL al que se redirigirá después de la autenticación"
#: lib/applicationeditform.php:258
msgid "Browser"
@@ -5106,15 +5120,16 @@ msgstr "Tipo de aplicación, de navegador o de escritorio"
#: lib/applicationeditform.php:297
msgid "Read-only"
-msgstr ""
+msgstr "Solo lectura"
#: lib/applicationeditform.php:315
msgid "Read-write"
-msgstr ""
+msgstr "Solo escritura"
#: lib/applicationeditform.php:316
msgid "Default access for this application: read-only, or read-write"
msgstr ""
+"Acceso predeterminado para esta aplicación: sólo lectura o lectura-escritura"
#: lib/applicationlist.php:154
msgid "Revoke"
@@ -5122,13 +5137,13 @@ msgstr "Revocar"
#: lib/attachmentlist.php:87
msgid "Attachments"
-msgstr ""
+msgstr "Adjuntos"
-#: lib/attachmentlist.php:265
+#: lib/attachmentlist.php:263
msgid "Author"
msgstr "Autor"
-#: lib/attachmentlist.php:278
+#: lib/attachmentlist.php:276
msgid "Provider"
msgstr "Proveedor"
@@ -5145,242 +5160,254 @@ msgid "Password changing failed"
msgstr "El cambio de contraseña ha fallado"
#: lib/authenticationplugin.php:235
-#, fuzzy
msgid "Password changing is not allowed"
-msgstr "Cambio de contraseña "
+msgstr "No está permitido cambiar la contraseña"
-#: lib/channel.php:138 lib/channel.php:158
+#: lib/channel.php:157 lib/channel.php:177
msgid "Command results"
msgstr "Resultados de comando"
-#: lib/channel.php:210 lib/mailhandler.php:142
+#: lib/channel.php:229 lib/mailhandler.php:142
msgid "Command complete"
msgstr "Comando completo"
-#: lib/channel.php:221
+#: lib/channel.php:240
msgid "Command failed"
msgstr "Comando falló"
-#: lib/command.php:44
-msgid "Sorry, this command is not yet implemented."
-msgstr "Disculpa, todavía no se implementa este comando."
+#: lib/command.php:83 lib/command.php:105
+msgid "Notice with that id does not exist"
+msgstr "No existe ningún mensaje con ese id"
+
+#: lib/command.php:99 lib/command.php:570
+msgid "User has no last notice"
+msgstr "Usuario no tiene último aviso"
-#: lib/command.php:88
+#: lib/command.php:125
#, php-format
msgid "Could not find a user with nickname %s"
msgstr "No se pudo encontrar a nadie con el nombre de usuario %s"
-#: lib/command.php:92
-msgid "It does not make a lot of sense to nudge yourself!"
+#: lib/command.php:143
+#, php-format
+msgid "Could not find a local user with nickname %s"
msgstr ""
+"No se pudo encontrar a ningún usuario local con el nombre de usuario %s"
+
+#: lib/command.php:176
+msgid "Sorry, this command is not yet implemented."
+msgstr "Disculpa, todavía no se implementa este comando."
+
+#: lib/command.php:221
+msgid "It does not make a lot of sense to nudge yourself!"
+msgstr "¡No tiene sentido darte un toque a ti mismo!"
-#: lib/command.php:99
+#: lib/command.php:228
#, php-format
msgid "Nudge sent to %s"
msgstr "zumbido enviado a %s"
-#: lib/command.php:126
+#: lib/command.php:254
#, php-format
msgid ""
"Subscriptions: %1$s\n"
"Subscribers: %2$s\n"
"Notices: %3$s"
msgstr ""
+"Suscripciones: %1$s\n"
+"Suscriptores: %2$s\n"
+"Avisos: %3$s"
-#: lib/command.php:152 lib/command.php:390 lib/command.php:451
-msgid "Notice with that id does not exist"
-msgstr "No existe ningún mensaje con ese id"
-
-#: lib/command.php:168 lib/command.php:406 lib/command.php:467
-#: lib/command.php:523
-msgid "User has no last notice"
-msgstr "Usuario no tiene último aviso"
-
-#: lib/command.php:190
+#: lib/command.php:296
msgid "Notice marked as fave."
msgstr "Aviso marcado como favorito."
-#: lib/command.php:217
-#, fuzzy
+#: lib/command.php:317
msgid "You are already a member of that group"
-msgstr "Ya eres miembro de ese grupo"
+msgstr "Ya eres parte de ese grupo"
-#: lib/command.php:231
-#, fuzzy, php-format
+#: lib/command.php:331
+#, php-format
msgid "Could not join user %s to group %s"
-msgstr "No se puede unir usuario %s a grupo %s"
+msgstr "No se pudo unir el usuario %s al grupo %s"
-#: lib/command.php:236
+#: lib/command.php:336
#, php-format
msgid "%s joined group %s"
msgstr "%s se unió a grupo %s"
-#: lib/command.php:275
-#, fuzzy, php-format
+#: lib/command.php:373
+#, php-format
msgid "Could not remove user %s to group %s"
-msgstr "No se pudo eliminar a usuario %s de grupo %s"
+msgstr "No se pudo eliminar al usuario %s del grupo %s"
-#: lib/command.php:280
+#: lib/command.php:378
#, php-format
msgid "%s left group %s"
msgstr "%s dejó grupo %s"
-#: lib/command.php:309
+#: lib/command.php:401
#, php-format
msgid "Fullname: %s"
msgstr "Nombre completo: %s"
-#: lib/command.php:312 lib/mail.php:258
+#: lib/command.php:404 lib/mail.php:258
#, php-format
msgid "Location: %s"
msgstr "Lugar: %s"
-#: lib/command.php:315 lib/mail.php:260
+#: lib/command.php:407 lib/mail.php:260
#, php-format
msgid "Homepage: %s"
msgstr "Página de inicio: %s"
-#: lib/command.php:318
+#: lib/command.php:410
#, php-format
msgid "About: %s"
msgstr "Sobre: %s"
-#: lib/command.php:349
-#, fuzzy, php-format
+#: lib/command.php:437
+#, php-format
+msgid ""
+"%s is a remote profile; you can only send direct messages to users on the "
+"same server."
+msgstr ""
+"%s es un perfil remoto: sólo puedes enviarle mensajes directos a usuarios en "
+"el mismo servidor."
+
+#: lib/command.php:450
+#, php-format
msgid "Message too long - maximum is %d characters, you sent %d"
-msgstr "Mensaje muy largo - máximo 140 caracteres, enviaste %d"
+msgstr "Mensaje muy largo - el máximo es de %d caracteres. Has enviado %d"
-#: lib/command.php:367
+#: lib/command.php:468
#, php-format
msgid "Direct message to %s sent"
msgstr "Se envió mensaje directo a %s"
-#: lib/command.php:369
+#: lib/command.php:470
msgid "Error sending direct message."
msgstr "Error al enviar mensaje directo."
-#: lib/command.php:413
-#, fuzzy
+#: lib/command.php:490
msgid "Cannot repeat your own notice"
-msgstr "No se puede activar notificación."
+msgstr "No puedes repetir tu propio aviso"
-#: lib/command.php:418
-#, fuzzy
+#: lib/command.php:495
msgid "Already repeated that notice"
-msgstr "Borrar este aviso"
+msgstr "Ya has repetido este aviso"
-#: lib/command.php:426
-#, fuzzy, php-format
+#: lib/command.php:503
+#, php-format
msgid "Notice from %s repeated"
-msgstr "Aviso publicado"
+msgstr "Aviso de %s repetido"
-#: lib/command.php:428
-#, fuzzy
+#: lib/command.php:505
msgid "Error repeating notice."
-msgstr "Hubo un problema al guardar el aviso."
+msgstr "Ha habido un error al repetir el aviso."
-#: lib/command.php:482
-#, fuzzy, php-format
+#: lib/command.php:536
+#, php-format
msgid "Notice too long - maximum is %d characters, you sent %d"
-msgstr "Mensaje muy largo - máximo 140 caracteres, enviaste %d"
+msgstr "Mensaje muy largo - el máximo es de %d caracteres. Has enviado %d"
-#: lib/command.php:491
-#, fuzzy, php-format
+#: lib/command.php:545
+#, php-format
msgid "Reply to %s sent"
-msgstr "Responder este aviso."
+msgstr "Responder a %s enviados"
-#: lib/command.php:493
-#, fuzzy
+#: lib/command.php:547
msgid "Error saving notice."
-msgstr "Hubo un problema al guardar el aviso."
+msgstr "Error al guardar el aviso."
-#: lib/command.php:547
+#: lib/command.php:594
msgid "Specify the name of the user to subscribe to"
msgstr "Especificar el nombre del usuario a suscribir"
-#: lib/command.php:554 lib/command.php:589
-msgid "No such user"
-msgstr "No existe ese usuario."
+#: lib/command.php:602
+msgid "Can't subscribe to OMB profiles by command."
+msgstr "No te puedes suscribir a perfiles de OMB por orden."
-#: lib/command.php:561
+#: lib/command.php:608
#, php-format
msgid "Subscribed to %s"
msgstr "Suscrito a %s"
-#: lib/command.php:582 lib/command.php:685
+#: lib/command.php:629 lib/command.php:728
msgid "Specify the name of the user to unsubscribe from"
msgstr "Especificar el nombre del usuario para desuscribirse de"
-#: lib/command.php:595
+#: lib/command.php:638
#, php-format
msgid "Unsubscribed from %s"
msgstr "Desuscrito de %s"
-#: lib/command.php:613 lib/command.php:636
+#: lib/command.php:656 lib/command.php:679
msgid "Command not yet implemented."
msgstr "Todavía no se implementa comando."
-#: lib/command.php:616
+#: lib/command.php:659
msgid "Notification off."
msgstr "Notificación no activa."
-#: lib/command.php:618
+#: lib/command.php:661
msgid "Can't turn off notification."
msgstr "No se puede desactivar notificación."
-#: lib/command.php:639
+#: lib/command.php:682
msgid "Notification on."
msgstr "Notificación activada."
-#: lib/command.php:641
+#: lib/command.php:684
msgid "Can't turn on notification."
msgstr "No se puede activar notificación."
-#: lib/command.php:654
+#: lib/command.php:697
msgid "Login command is disabled"
-msgstr ""
+msgstr "El comando de inicio de sesión está desactivado"
-#: lib/command.php:665
+#: lib/command.php:708
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
+"Este enlace es utilizable solamente una vez y sólo válido por 2 minutos: %s"
-#: lib/command.php:692
-#, fuzzy, php-format
+#: lib/command.php:735
+#, php-format
msgid "Unsubscribed %s"
msgstr "Desuscrito de %s"
-#: lib/command.php:709
+#: lib/command.php:752
msgid "You are not subscribed to anyone."
msgstr "No estás suscrito a nadie."
-#: lib/command.php:711
+#: lib/command.php:754
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Ya estás suscrito a estos usuarios:"
msgstr[1] "Ya estás suscrito a estos usuarios:"
-#: lib/command.php:731
+#: lib/command.php:774
msgid "No one is subscribed to you."
msgstr "Nadie está suscrito a ti."
-#: lib/command.php:733
+#: lib/command.php:776
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "No se pudo suscribir otro a ti."
msgstr[1] "No se pudo suscribir otro a ti."
-#: lib/command.php:753
+#: lib/command.php:796
msgid "You are not a member of any groups."
msgstr "No eres miembro de ningún grupo"
-#: lib/command.php:755
+#: lib/command.php:798
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Eres miembro de este grupo:"
msgstr[1] "Eres miembro de estos grupos:"
-#: lib/command.php:769
+#: lib/command.php:812
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5422,19 +5449,19 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:148
+#: lib/common.php:135
msgid "No configuration file found. "
msgstr "Ningún archivo de configuración encontrado. "
-#: lib/common.php:149
+#: lib/common.php:136
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:151
+#: lib/common.php:138
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:152
+#: lib/common.php:139
msgid "Go to the installer."
msgstr "Ir al instalador."
@@ -5451,27 +5478,27 @@ msgid "Updates by SMS"
msgstr "Actualizaciones por sms"
#: lib/connectsettingsaction.php:120
-#, fuzzy
msgid "Connections"
-msgstr "Conectarse"
+msgstr "Conecciones"
#: lib/connectsettingsaction.php:121
msgid "Authorized connected applications"
-msgstr ""
+msgstr "Aplicaciones conectadas autorizadas"
#: lib/dberroraction.php:60
msgid "Database error"
-msgstr ""
+msgstr "Error de la base de datos"
#: lib/designsettings.php:105
msgid "Upload file"
-msgstr "Cargar archivo"
+msgstr "Subir archivo"
#: lib/designsettings.php:109
-#, fuzzy
msgid ""
"You can upload your personal background image. The maximum file size is 2MB."
-msgstr "Puedes cargar tu avatar personal."
+msgstr ""
+"Puedes subir tu imagen de fondo personal. El tamaño de archivo máximo "
+"permitido es 2 MB."
#: lib/designsettings.php:418
msgid "Design defaults restored."
@@ -5614,49 +5641,49 @@ msgstr "Tags en avisos del grupo %s"
msgid "This page is not available in a media type you accept"
msgstr "Esta página no está disponible en el tipo de medio que aceptas."
-#: lib/imagefile.php:75
-#, fuzzy, php-format
+#: lib/imagefile.php:72
+msgid "Unsupported image file format."
+msgstr "Formato de imagen no soportado."
+
+#: lib/imagefile.php:88
+#, php-format
msgid "That file is too big. The maximum file size is %s."
-msgstr "Puedes cargar una imagen de logo para tu grupo."
+msgstr "El archivo es muy grande. El tamaño máximo permitido es %s."
-#: lib/imagefile.php:80
+#: lib/imagefile.php:93
msgid "Partial upload."
-msgstr "Carga parcial."
+msgstr "Subida parcial"
-#: lib/imagefile.php:88 lib/mediafile.php:170
+#: lib/imagefile.php:101 lib/mediafile.php:170
msgid "System error uploading file."
-msgstr "Error del sistema al cargar el archivo."
+msgstr "Error del sistema subir el archivo"
-#: lib/imagefile.php:96
+#: lib/imagefile.php:109
msgid "Not an image or corrupt file."
msgstr "No es una imagen o es un fichero corrupto."
-#: lib/imagefile.php:109
-msgid "Unsupported image file format."
-msgstr "Formato de imagen no soportado."
-
#: lib/imagefile.php:122
msgid "Lost our file."
msgstr "Se perdió nuestro archivo."
-#: lib/imagefile.php:166 lib/imagefile.php:231
+#: lib/imagefile.php:163 lib/imagefile.php:224
msgid "Unknown file type"
msgstr "Tipo de archivo desconocido"
-#: lib/imagefile.php:251
+#: lib/imagefile.php:244
msgid "MB"
msgstr "MB"
-#: lib/imagefile.php:253
+#: lib/imagefile.php:246
msgid "kB"
msgstr "kB"
-#: lib/jabber.php:220
+#: lib/jabber.php:387
#, php-format
msgid "[%s]"
-msgstr ""
+msgstr "[%s]"
-#: lib/jabber.php:400
+#: lib/jabber.php:567
#, php-format
msgid "Unknown inbox source %d."
msgstr ""
@@ -5725,11 +5752,9 @@ msgstr ""
"%4$s.\n"
#: lib/mail.php:262
-#, fuzzy, php-format
+#, php-format
msgid "Bio: %s"
-msgstr ""
-"Bio: %s\n"
-"\n"
+msgstr "Bio: %s"
#: lib/mail.php:290
#, php-format
@@ -5786,6 +5811,17 @@ msgid ""
"With kind regards,\n"
"%4$s\n"
msgstr ""
+"%1$s (%2$s) se pregunta que será de tí durante estos días y te invita a "
+"publicar algunas noticias.\n"
+"\n"
+"Así que, ¡vamos! queremos escuchar de tí:)\n"
+"\n"
+"%3$s\n"
+"\n"
+"No respondas a este correo electrónico. No llegará a ninguna parte.\n"
+"\n"
+"Un cordial saludo,\n"
+"%4$s\n"
#: lib/mail.php:517
#, php-format
@@ -5867,7 +5903,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:482
+#: lib/mailbox.php:227 lib/noticelist.php:486
msgid "from"
msgstr "desde"
@@ -5888,62 +5924,66 @@ msgid "Sorry, no incoming email allowed."
msgstr "Lo sentimos, pero no se permite correos entrantes"
#: lib/mailhandler.php:228
-#, fuzzy, php-format
+#, php-format
msgid "Unsupported message type: %s"
-msgstr "Formato de imagen no soportado."
+msgstr "Tipo de mensaje no compatible: %s"
#: lib/mediafile.php:98 lib/mediafile.php:123
msgid "There was a database error while saving your file. Please try again."
msgstr ""
+"Hubo un error en la base de datos mientras subías tu archivo. Por favor, "
+"inténtalo de nuevo."
#: lib/mediafile.php:142
msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
msgstr ""
+"El archivo subido sobrepasa la directiva upload_max_filesize en 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 archivo subido sobrepasa la directiva MAX_FILE_SIZE que se especificó en "
+"el formulario HTML."
#: lib/mediafile.php:152
msgid "The uploaded file was only partially uploaded."
-msgstr ""
+msgstr "El archivo subido sólo fue parcialmente subido."
#: lib/mediafile.php:159
msgid "Missing a temporary folder."
-msgstr ""
+msgstr "Falta una carpeta temporal."
#: lib/mediafile.php:162
msgid "Failed to write file to disk."
-msgstr ""
+msgstr "No se pudo escribir el archivo en el disco."
#: lib/mediafile.php:165
msgid "File upload stopped by extension."
-msgstr ""
+msgstr "La subida de archivos se detuvo por extensión."
#: lib/mediafile.php:179 lib/mediafile.php:216
msgid "File exceeds user's quota."
-msgstr ""
+msgstr "Archivo sobrepasa la cuota del usuario."
#: lib/mediafile.php:196 lib/mediafile.php:233
msgid "File could not be moved to destination directory."
msgstr ""
#: lib/mediafile.php:201 lib/mediafile.php:237
-#, fuzzy
msgid "Could not determine file's MIME type."
-msgstr "No se pudo acceder a corriente pública."
+msgstr "No se pudo determinar tipo MIME del archivo"
#: lib/mediafile.php:270
#, php-format
msgid " Try using another %s format."
-msgstr ""
+msgstr "Pruebe a usar otro formato %s."
#: lib/mediafile.php:275
#, php-format
msgid "%s is not a supported file type on this server."
-msgstr ""
+msgstr "%s no es un tipo de archivo soportado en este servidor."
#: lib/messageform.php:120
msgid "Send a direct notice"
@@ -5954,18 +5994,15 @@ msgid "To"
msgstr "Para"
#: lib/messageform.php:159 lib/noticeform.php:185
-#, fuzzy
msgid "Available characters"
msgstr "Caracteres disponibles"
#: lib/messageform.php:178 lib/noticeform.php:236
-#, fuzzy
msgctxt "Send button for sending notice"
msgid "Send"
msgstr "Enviar"
#: lib/noticeform.php:160
-#, fuzzy
msgid "Send a notice"
msgstr "Enviar un aviso"
@@ -5976,74 +6013,72 @@ msgstr "¿Qué tal, %s?"
#: lib/noticeform.php:192
msgid "Attach"
-msgstr ""
+msgstr "Adjuntar"
#: lib/noticeform.php:196
msgid "Attach a file"
-msgstr ""
+msgstr "Adjuntar un archivo"
#: lib/noticeform.php:212
-#, fuzzy
msgid "Share my location"
-msgstr "No se pudo guardar tags."
+msgstr "Compartir mi ubicación"
#: lib/noticeform.php:215
-#, fuzzy
msgid "Do not share my location"
-msgstr "No se pudo guardar tags."
+msgstr "No compartir mi ubicación"
#: lib/noticeform.php:216
msgid ""
"Sorry, retrieving your geo location is taking longer than expected, please "
"try again later"
msgstr ""
+"Lo sentimos, pero geolocalizarte está tardando más de lo esperado. Por "
+"favor, inténtalo más tarde."
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
-msgstr ""
+msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "N"
msgstr "N"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "S"
msgstr "S"
-#: lib/noticelist.php:431
+#: lib/noticelist.php:432
msgid "E"
msgstr "E"
-#: lib/noticelist.php:431
+#: lib/noticelist.php:432
msgid "W"
-msgstr ""
+msgstr "W"
-#: lib/noticelist.php:438
+#: lib/noticelist.php:439
msgid "at"
msgstr "en"
-#: lib/noticelist.php:566
+#: lib/noticelist.php:570
msgid "in context"
msgstr "en contexto"
-#: lib/noticelist.php:601
-#, fuzzy
+#: lib/noticelist.php:605
msgid "Repeated by"
-msgstr "Crear"
+msgstr "Repetido por"
-#: lib/noticelist.php:628
+#: lib/noticelist.php:632
msgid "Reply to this notice"
msgstr "Responder este aviso."
-#: lib/noticelist.php:629
+#: lib/noticelist.php:633
msgid "Reply"
msgstr "Responder"
-#: lib/noticelist.php:673
-#, fuzzy
+#: lib/noticelist.php:677
msgid "Notice repeated"
-msgstr "Aviso borrado"
+msgstr "Aviso repetido"
#: lib/nudgeform.php:116
msgid "Nudge this user"
@@ -6063,7 +6098,7 @@ msgstr "Error al insertar el nuevo perfil"
#: lib/oauthstore.php:291
msgid "Error inserting avatar"
-msgstr "Error al insertar el avatar"
+msgstr "Error al insertar la imagen"
#: lib/oauthstore.php:311
msgid "Error inserting remote profile"
@@ -6111,11 +6146,10 @@ msgid "Tags in %s's notices"
msgstr "Tags en avisos de %s"
#: lib/plugin.php:114
-#, fuzzy
msgid "Unknown"
-msgstr "Acción desconocida"
+msgstr "Desconocido"
-#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr "Suscripciones"
@@ -6123,35 +6157,38 @@ msgstr "Suscripciones"
msgid "All subscriptions"
msgstr "Todas las suscripciones"
-#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90
+#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr "Suscriptores"
-#: lib/profileaction.php:159
-#, fuzzy
+#: lib/profileaction.php:161
msgid "All subscribers"
msgstr "Todos los suscriptores"
-#: lib/profileaction.php:180
+#: lib/profileaction.php:191
msgid "User ID"
msgstr "ID de usuario"
-#: lib/profileaction.php:185
+#: lib/profileaction.php:196
msgid "Member since"
msgstr "Miembro desde"
-#: lib/profileaction.php:247
+#. TRANS: Average count of posts made per day since account registration
+#: lib/profileaction.php:235
+msgid "Daily average"
+msgstr "Promedio diario"
+
+#: lib/profileaction.php:264
msgid "All groups"
msgstr "Todos los grupos"
#: lib/profileformaction.php:123
-#, fuzzy
msgid "No return-to arguments."
-msgstr "No existe argumento de ID."
+msgstr "No hay respuesta a los argumentos."
#: lib/profileformaction.php:137
msgid "Unimplemented method."
-msgstr ""
+msgstr "Método no implementado."
#: lib/publicgroupnav.php:78
msgid "Public"
@@ -6174,28 +6211,25 @@ msgid "Popular"
msgstr "Popular"
#: lib/repeatform.php:107
-#, fuzzy
msgid "Repeat this notice?"
-msgstr "Responder este aviso."
+msgstr "Responder este aviso?"
#: lib/repeatform.php:132
-#, fuzzy
msgid "Repeat this notice"
msgstr "Responder este aviso."
#: lib/revokeroleform.php:91
-#, fuzzy, php-format
+#, php-format
msgid "Revoke the \"%s\" role from this user"
-msgstr "Bloquear este usuario de este grupo"
+msgstr "Revocar el rol \"%s\" de este usuario"
-#: lib/router.php:671
+#: lib/router.php:704
msgid "No single user defined for single-user mode."
-msgstr ""
+msgstr "Ningún usuario sólo definido para modo monousuario."
#: lib/sandboxform.php:67
-#, fuzzy
msgid "Sandbox"
-msgstr "Bandeja de Entrada"
+msgstr "Cajón de sastre"
#: lib/sandboxform.php:78
#, fuzzy
@@ -6203,13 +6237,12 @@ msgid "Sandbox this user"
msgstr "Desbloquear este usuario"
#: lib/searchaction.php:120
-#, fuzzy
msgid "Search site"
-msgstr "Buscar"
+msgstr "Buscar sitio"
#: lib/searchaction.php:126
msgid "Keyword(s)"
-msgstr ""
+msgstr "Palabra(s) clave"
#: lib/searchaction.php:127
msgid "Search"
@@ -6241,17 +6274,15 @@ msgstr "Sección sin título"
#: lib/section.php:106
msgid "More..."
-msgstr ""
+msgstr "Más..."
#: lib/silenceform.php:67
-#, fuzzy
msgid "Silence"
-msgstr "Aviso de sitio"
+msgstr "Silencio"
#: lib/silenceform.php:78
-#, fuzzy
msgid "Silence this user"
-msgstr "Bloquear este usuario."
+msgstr "Silenciar este usuario"
#: lib/subgroupnav.php:83
#, fuzzy, php-format
@@ -6321,106 +6352,112 @@ msgstr "Desuscribirse de este usuario"
msgid "Unsubscribe"
msgstr "Cancelar suscripción"
-#: lib/userprofile.php:116
+#: lib/usernoprofileexception.php:58
+#, fuzzy, php-format
+msgid "User %s (%d) has no profile record."
+msgstr "El usuario no tiene un perfil."
+
+#: lib/userprofile.php:117
msgid "Edit Avatar"
-msgstr "editar avatar"
+msgstr "Editar imagen"
-#: lib/userprofile.php:236
+#: lib/userprofile.php:234 lib/userprofile.php:248
msgid "User actions"
msgstr "Acciones de usuario"
-#: lib/userprofile.php:251
+#: lib/userprofile.php:237
+msgid "User deletion in progress..."
+msgstr ""
+
+#: lib/userprofile.php:263
msgid "Edit profile settings"
msgstr "Editar configuración del perfil"
-#: lib/userprofile.php:252
+#: lib/userprofile.php:264
msgid "Edit"
msgstr "Editar"
-#: lib/userprofile.php:275
+#: lib/userprofile.php:287
msgid "Send a direct message to this user"
msgstr "Enviar un mensaje directo a este usuario"
-#: lib/userprofile.php:276
+#: lib/userprofile.php:288
msgid "Message"
msgstr "Mensaje"
-#: lib/userprofile.php:314
+#: lib/userprofile.php:326
msgid "Moderate"
msgstr "Moderar"
-#: lib/userprofile.php:352
-#, fuzzy
+#: lib/userprofile.php:364
msgid "User role"
-msgstr "Perfil de usuario"
+msgstr "Rol de usuario"
-#: lib/userprofile.php:354
-#, fuzzy
+#: lib/userprofile.php:366
msgctxt "role"
msgid "Administrator"
-msgstr "Administradores"
+msgstr "Administrador"
-#: lib/userprofile.php:355
-#, fuzzy
+#: lib/userprofile.php:367
msgctxt "role"
msgid "Moderator"
-msgstr "Moderar"
+msgstr "Moderador"
-#: lib/util.php:1015
+#: lib/util.php:1046
msgid "a few seconds ago"
msgstr "hace unos segundos"
-#: lib/util.php:1017
+#: lib/util.php:1048
msgid "about a minute ago"
msgstr "hace un minuto"
-#: lib/util.php:1019
+#: lib/util.php:1050
#, php-format
msgid "about %d minutes ago"
msgstr "hace %d minutos"
-#: lib/util.php:1021
+#: lib/util.php:1052
msgid "about an hour ago"
msgstr "hace una hora"
-#: lib/util.php:1023
+#: lib/util.php:1054
#, php-format
msgid "about %d hours ago"
msgstr "hace %d horas"
-#: lib/util.php:1025
+#: lib/util.php:1056
msgid "about a day ago"
msgstr "hace un día"
-#: lib/util.php:1027
+#: lib/util.php:1058
#, php-format
msgid "about %d days ago"
msgstr "hace %d días"
-#: lib/util.php:1029
+#: lib/util.php:1060
msgid "about a month ago"
msgstr "hace un mes"
-#: lib/util.php:1031
+#: lib/util.php:1062
#, php-format
msgid "about %d months ago"
msgstr "hace %d meses"
-#: lib/util.php:1033
+#: lib/util.php:1064
msgid "about a year ago"
msgstr "hace un año"
#: lib/webcolor.php:82
#, php-format
msgid "%s is not a valid color!"
-msgstr ""
+msgstr "¡%s no es un color válido!"
#: lib/webcolor.php:123
#, php-format
msgid "%s is not a valid color! Use 3 or 6 hex chars."
-msgstr ""
+msgstr "%s no es un color válido! Usar 3 o 6 caracteres hexagesimales"
-#: lib/xmppmanager.php:402
-#, fuzzy, php-format
+#: lib/xmppmanager.php:403
+#, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr "Mensaje muy largo - máximo 140 caracteres, enviaste %d"
+msgstr "Mensaje muy largo - máximo %1$d caracteres, enviaste %2$d"
diff --git a/locale/fa/LC_MESSAGES/statusnet.po b/locale/fa/LC_MESSAGES/statusnet.po
index 955efd243..77afb2bd4 100644
--- a/locale/fa/LC_MESSAGES/statusnet.po
+++ b/locale/fa/LC_MESSAGES/statusnet.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-06 23:49+0000\n"
-"PO-Revision-Date: 2010-03-06 23:49:48+0000\n"
+"POT-Creation-Date: 2010-04-05 18:54+0000\n"
+"PO-Revision-Date: 2010-04-05 18:55:15+0000\n"
"Last-Translator: Ahmad Sufi Mahmudi\n"
"Language-Team: Persian\n"
"MIME-Version: 1.0\n"
@@ -20,7 +20,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 (r63350); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64621); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
#. TRANS: Page title
@@ -99,9 +99,9 @@ msgstr "چنین صفحه‌ای وجود ندارد"
#: 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:90
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78
+#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
@@ -110,10 +110,8 @@ msgstr "چنین صفحه‌ای وجود ندارد"
#: actions/remotesubscribe.php:154 actions/replies.php:73
#: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:163 lib/command.php:302
-#: lib/command.php:355 lib/command.php:401 lib/command.php:462
-#: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82
-#: lib/profileaction.php:77
+#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: lib/mailbox.php:82 lib/profileaction.php:77
msgid "No such user."
msgstr "چنین کاربری وجود ندارد."
@@ -206,18 +204,18 @@ msgstr "به روز رسانی از %1$ و دوستان در %2$"
#: 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:132
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:136
#: actions/apigrouplistall.php:120 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:135
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
-#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184
-#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148
+#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:174
+#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173
+#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
-#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
+#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
msgid "API method not found."
msgstr "رابط مورد نظر پیدا نشد."
@@ -230,8 +228,8 @@ msgstr "رابط مورد نظر پیدا نشد."
#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65
-#: actions/apistatusesupdate.php:118
+#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
msgid "This method requires a POST."
msgstr "برای استفاده از این روش باید اطلاعات را به صورت پست بفرستید"
@@ -260,7 +258,7 @@ msgid "Could not save profile."
msgstr "نمی‌توان شناس‌نامه را ذخیره کرد."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:97
+#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
#: actions/designadminpanel.php:122 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
@@ -346,7 +344,7 @@ msgstr "هیچ وضعیتی با آن شناسه پیدا نشد."
msgid "This status is already a favorite."
msgstr "این وضعیت درحال حاضر یک وضعیت مورد علاقه است!"
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
msgid "Could not create favorite."
msgstr "نمی‌توان وضعیت را موردعلاقه کرد."
@@ -465,7 +463,7 @@ msgstr "گروه یافت نشد!"
msgid "You are already a member of that group."
msgstr "شما از پیش یک عضو این گروه هستید."
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:221
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
msgid "You have been blocked from that group by the admin."
msgstr "دسترسی شما به گروه توسط مدیر آن محدود شده است."
@@ -483,11 +481,18 @@ msgstr "شما یک عضو این گروه نیستید."
msgid "Could not remove user %1$s from group %2$s."
msgstr "خارج شدن %s از گروه %s نا موفق بود"
-#: actions/apigrouplist.php:95
+#. TRANS: %s is a user name
+#: actions/apigrouplist.php:97
#, 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
+#, fuzzy, php-format
+msgid "%1$s groups %2$s is a member of."
+msgstr "هست عضو %s گروه"
+
#: actions/apigrouplistall.php:90 actions/usergroups.php:62
#, php-format
msgid "%s groups"
@@ -516,7 +521,7 @@ msgstr "اندازه‌ی نادرست"
#: 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:337
+#: actions/profilesettings.php:194 actions/recoverpassword.php:350
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
@@ -575,15 +580,15 @@ msgid ""
"give access to your %4$s account to third parties you trust."
msgstr ""
-#: actions/apioauthauthorize.php:310 lib/action.php:438
+#: actions/apioauthauthorize.php:310 lib/action.php:437
msgid "Account"
msgstr "حساب کاربری"
#: actions/apioauthauthorize.php:313 actions/login.php:230
#: actions/profilesettings.php:106 actions/register.php:424
-#: actions/showgroup.php:244 actions/tagother.php:94
+#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
-#: lib/userprofile.php:131
+#: lib/userprofile.php:132
msgid "Nickname"
msgstr "نام کاربری"
@@ -654,12 +659,12 @@ msgstr "حداکثر طول پیام %d حرف است که شامل ضمیمه
msgid "Unsupported format."
msgstr "قالب پشتیبانی نشده."
-#: actions/apitimelinefavorites.php:108
+#: actions/apitimelinefavorites.php:109
#, fuzzy, php-format
msgid "%1$s / Favorites from %2$s"
msgstr "%s / دوست داشتنی از %s"
-#: actions/apitimelinefavorites.php:117
+#: actions/apitimelinefavorites.php:118
#, fuzzy, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "%s به روز رسانی های دوست داشتنی %s / %s"
@@ -669,7 +674,7 @@ msgstr "%s به روز رسانی های دوست داشتنی %s / %s"
msgid "%1$s / Updates mentioning %2$s"
msgstr "%$1s / به روز رسانی های شامل %2$s"
-#: actions/apitimelinementions.php:127
+#: actions/apitimelinementions.php:130
#, php-format
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "%1$s به روز رسانی هایی که در پاسخ به $2$s / %3$s"
@@ -679,7 +684,7 @@ msgstr "%1$s به روز رسانی هایی که در پاسخ به $2$s / %3$s
msgid "%s public timeline"
msgstr "%s خط‌زمانی عمومی"
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "%s به روز رسانی های عموم"
@@ -694,12 +699,12 @@ msgstr ""
msgid "Repeats of %s"
msgstr "تکرار %s"
-#: actions/apitimelinetag.php:102 actions/tag.php:67
+#: actions/apitimelinetag.php:104 actions/tag.php:67
#, php-format
msgid "Notices tagged with %s"
msgstr "پیام‌هایی که با %s نشانه گزاری شده اند."
-#: actions/apitimelinetag.php:104 actions/tagrss.php:65
+#: actions/apitimelinetag.php:106 actions/tagrss.php:65
#, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "پیام‌های نشانه گزاری شده با %1$s در %2$s"
@@ -727,7 +732,7 @@ msgstr "بدون اندازه."
msgid "Invalid size."
msgstr "اندازه‌ی نادرست"
-#: actions/avatarsettings.php:67 actions/showgroup.php:229
+#: actions/avatarsettings.php:67 actions/showgroup.php:230
#: lib/accountsettingsaction.php:112
msgid "Avatar"
msgstr "چهره"
@@ -760,7 +765,7 @@ msgid "Preview"
msgstr "پیش‌نمایش"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:655
+#: lib/deleteuserform.php:66 lib/noticelist.php:659
msgid "Delete"
msgstr "حذف"
@@ -772,23 +777,28 @@ msgstr "پایین‌گذاری"
msgid "Crop"
msgstr "برش"
-#: actions/avatarsettings.php:328
+#: actions/avatarsettings.php:305
+#, fuzzy
+msgid "No file uploaded."
+msgstr "کاربری مشخص نشده است."
+
+#: actions/avatarsettings.php:332
msgid "Pick a square area of the image to be your avatar"
msgstr "یک مربع از عکس خود را انتخاب کنید تا چهره‌ی شما باشد."
-#: actions/avatarsettings.php:343 actions/grouplogo.php:380
+#: actions/avatarsettings.php:347 actions/grouplogo.php:380
msgid "Lost our file data."
msgstr "فایل اطلاعات خود را گم کرده ایم."
-#: actions/avatarsettings.php:366
+#: actions/avatarsettings.php:370
msgid "Avatar updated."
msgstr "چهره به روز رسانی شد."
-#: actions/avatarsettings.php:369
+#: actions/avatarsettings.php:373
msgid "Failed updating avatar."
msgstr "به روز رسانی چهره موفقیت آمیر نبود."
-#: actions/avatarsettings.php:393
+#: actions/avatarsettings.php:397
msgid "Avatar deleted."
msgstr "چهره پاک شد."
@@ -844,8 +854,8 @@ msgstr ""
#: actions/groupunblock.php:86 actions/joingroup.php:82
#: actions/joingroup.php:93 actions/leavegroup.php:82
#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212
-#: lib/command.php:260
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162
+#: lib/command.php:358
msgid "No such group."
msgstr "چنین گروهی وجود ندارد."
@@ -928,7 +938,7 @@ msgid "Conversation"
msgstr "مکالمه"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:218 lib/searchgroupnav.php:82
+#: lib/profileaction.php:224 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "پیام‌ها"
@@ -950,7 +960,7 @@ msgstr "شما یک عضو این گروه نیستید."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1217
+#: lib/action.php:1219
msgid "There was a problem with your session token."
msgstr ""
@@ -1014,7 +1024,7 @@ msgstr "آیا اطمینان دارید که می‌خواهید این پیا
msgid "Do not delete this notice"
msgstr "این پیام را پاک نکن"
-#: actions/deletenotice.php:146 lib/noticelist.php:655
+#: actions/deletenotice.php:146 lib/noticelist.php:659
msgid "Delete this notice"
msgstr "این پیام را پاک کن"
@@ -1151,7 +1161,7 @@ msgstr "برگشت به حالت پیش گزیده"
#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:208
+#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
#: actions/tagother.php:154 actions/useradminpanel.php:294
#: lib/applicationeditform.php:333 lib/applicationeditform.php:334
#: lib/designsettings.php:256 lib/groupeditform.php:202
@@ -1277,7 +1287,7 @@ msgstr "توصیف بسیار زیاد است (حداکثر %d حرف)."
msgid "Could not update group."
msgstr "نمی‌توان گروه را به‌هنگام‌سازی کرد."
-#: actions/editgroup.php:264 classes/User_group.php:493
+#: actions/editgroup.php:264 classes/User_group.php:496
msgid "Could not create aliases."
msgstr "نمی‌توان نام‌های مستعار را ساخت."
@@ -1761,7 +1771,7 @@ msgstr "خط زمانی %s"
msgid "Updates from members of %1$s on %2$s!"
msgstr "به روز رسانی کابران %1$s در %2$s"
-#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232
+#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244
#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr "گروه‌ها"
@@ -1971,7 +1981,7 @@ msgstr "دعوت کردن کاربران تازه"
msgid "You are already subscribed to these users:"
msgstr "هم اکنون شما این کاربران را دنبال می‌کنید: "
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
#, php-format
msgid "%1$s (%2$s)"
msgstr ""
@@ -2076,7 +2086,7 @@ msgstr "ملحق شدن به گروه"
msgid "You must be logged in to leave a group."
msgstr "برای ترک یک گروه، شما باید وارد شده باشید."
-#: actions/leavegroup.php:100 lib/command.php:265
+#: actions/leavegroup.php:100 lib/command.php:363
msgid "You are not a member of that group."
msgstr "شما یک کاربر این گروه نیستید."
@@ -2193,12 +2203,12 @@ msgstr "از این فرم برای ساختن یک گروه جدید استفا
msgid "New message"
msgstr "پیام جدید"
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
msgid "You can't send a message to this user."
msgstr "شما نمی توانید به این کاربر پیام بفرستید."
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342
-#: lib/command.php:475
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
+#: lib/command.php:529
msgid "No content!"
msgstr "بدون محتوا!"
@@ -2206,7 +2216,7 @@ msgstr "بدون محتوا!"
msgid "No recipient specified."
msgstr "هیچ گیرنده ای مشخص نشده"
-#: actions/newmessage.php:164 lib/command.php:361
+#: actions/newmessage.php:164 lib/command.php:462
msgid ""
"Don't send a message to yourself; just say it to yourself quietly instead."
msgstr "یک پیام را به خودتان نفرستید؛ در عوض آن را آهسته برای خود بگویید."
@@ -2220,7 +2230,7 @@ msgstr "پیام فرستاده‌شد"
msgid "Direct message to %s sent."
msgstr "پیام مستقیم به %s فرستاده شد."
-#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189
msgid "Ajax Error"
msgstr "اشکال آژاکسی"
@@ -2228,7 +2238,7 @@ msgstr "اشکال آژاکسی"
msgid "New notice"
msgstr "آگهی جدید"
-#: actions/newnotice.php:211
+#: actions/newnotice.php:217
msgid "Notice posted"
msgstr "آگهی فرستاده‌شد."
@@ -2342,7 +2352,7 @@ msgstr ""
msgid "Notice has no profile"
msgstr "ابن خبر ذخیره ای ندارد ."
-#: actions/oembed.php:86 actions/shownotice.php:180
+#: actions/oembed.php:86 actions/shownotice.php:175
#, php-format
msgid "%1$s's status on %2$s"
msgstr "وضعیت %1$s در %2$s"
@@ -2355,8 +2365,8 @@ msgstr "نوع محتوا "
msgid "Only "
msgstr " فقط"
-#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042
-#: lib/apiaction.php:1070 lib/apiaction.php:1179
+#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1068
+#: lib/apiaction.php:1096 lib/apiaction.php:1212
msgid "Not a supported data format."
msgstr "یک قالب دادهٔ پشتیبانی‌شده نیست."
@@ -2494,7 +2504,7 @@ msgstr "گذرواژه قدیمی اشتباه است"
msgid "Error saving user; invalid."
msgstr "خطا هنگام ذخیره ی کاربر؛ نا معتبر."
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
msgid "Can't save new password."
msgstr "نمی‌توان گذرواژه جدید را ذخیره کرد."
@@ -2708,8 +2718,8 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr "۱-۶۴ کاراکتر کوچک یا اعداد، بدون نقطه گذاری یا فاصله"
#: actions/profilesettings.php:111 actions/register.php:448
-#: actions/showgroup.php:255 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:149
+#: actions/showgroup.php:256 actions/tagother.php:104
+#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "نام‌کامل"
@@ -2736,9 +2746,9 @@ msgid "Bio"
msgstr "شرح‌حال"
#: actions/profilesettings.php:132 actions/register.php:471
-#: actions/showgroup.php:264 actions/tagother.php:112
+#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
-#: lib/userprofile.php:164
+#: lib/userprofile.php:165
msgid "Location"
msgstr "موقعیت"
@@ -2752,7 +2762,7 @@ msgstr ""
#: actions/profilesettings.php:145 actions/tagother.php:149
#: actions/tagother.php:209 lib/subscriptionlist.php:106
-#: lib/subscriptionlist.php:108 lib/userprofile.php:209
+#: lib/subscriptionlist.php:108 lib/userprofile.php:210
msgid "Tags"
msgstr "برچسب‌ها"
@@ -2978,7 +2988,7 @@ msgstr "ریست کردن کلمه ی عبور"
msgid "Recover password"
msgstr "بازیابی کلمه ی عبور"
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
msgid "Password recovery requested"
msgstr "بازیابی کلمه ی عبور درخواست شد"
@@ -2998,19 +3008,19 @@ msgstr "ریست( راه انداری مجدد )"
msgid "Enter a nickname or email address."
msgstr "یک نام کاربری یا آدرس ایمیل وارد کنید."
-#: actions/recoverpassword.php:272
+#: actions/recoverpassword.php:282
msgid "No user with that email address or username."
msgstr "هیچ کاربری با آن آدرس ایمیل یا نام کاربری وجود ندارد."
-#: actions/recoverpassword.php:287
+#: actions/recoverpassword.php:299
msgid "No registered email address for that user."
msgstr "برای آن کاربر آدرس ایمیل ثبت شده وجود ندارد."
-#: actions/recoverpassword.php:301
+#: actions/recoverpassword.php:313
msgid "Error saving address confirmation."
msgstr "خطا هنگام ذخیره ی تاییدیه ی آدرس."
-#: actions/recoverpassword.php:325
+#: actions/recoverpassword.php:338
msgid ""
"Instructions for recovering your password have been sent to the email "
"address registered to your account."
@@ -3018,23 +3028,23 @@ msgstr ""
"دستورالعمل چگونگی بازیابی کلمه ی عبور به آدرس ایمیل ثبت شده در حساب شما "
"ارسال شده است."
-#: actions/recoverpassword.php:344
+#: actions/recoverpassword.php:357
msgid "Unexpected password reset."
msgstr "کلمه ی عبور به طور غیر منتظره ریست شد."
-#: actions/recoverpassword.php:352
+#: actions/recoverpassword.php:365
msgid "Password must be 6 chars or more."
msgstr "کلمه ی عبور باید ۶ کاراکتر یا بیشتر باشد."
-#: actions/recoverpassword.php:356
+#: actions/recoverpassword.php:369
msgid "Password and confirmation do not match."
msgstr "کلمه ی عبور و تاییدیه ی آن با هم تطابق ندارند."
-#: actions/recoverpassword.php:375 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:248
msgid "Error setting user."
msgstr ""
-#: actions/recoverpassword.php:382
+#: actions/recoverpassword.php:395
msgid "New password successfully saved. You are now logged in."
msgstr "کلمه ی عبور جدید با موفقیت ذخیره شد. شما الان وارد شده اید."
@@ -3177,7 +3187,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr ""
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:394
+#: lib/userprofile.php:406
msgid "Subscribe"
msgstr ""
@@ -3213,7 +3223,7 @@ msgstr "شما نمی توانید آگهی خودتان را تکرار کنی
msgid "You already repeated that notice."
msgstr "شما قبلا آن آگهی را تکرار کردید."
-#: actions/repeat.php:114 lib/noticelist.php:674
+#: actions/repeat.php:114 lib/noticelist.php:678
msgid "Repeated"
msgstr ""
@@ -3360,8 +3370,8 @@ msgstr "صفحه بندى"
msgid "Description"
msgstr ""
-#: actions/showapplication.php:192 actions/showgroup.php:438
-#: lib/profileaction.php:176
+#: actions/showapplication.php:192 actions/showgroup.php:439
+#: lib/profileaction.php:182
msgid "Statistics"
msgstr "آمار"
@@ -3473,67 +3483,67 @@ msgstr ""
msgid "%1$s group, page %2$d"
msgstr "اعضای گروه %s، صفحهٔ %d"
-#: actions/showgroup.php:226
+#: actions/showgroup.php:227
msgid "Group profile"
msgstr ""
-#: actions/showgroup.php:271 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:177
+#: actions/showgroup.php:272 actions/tagother.php:118
+#: actions/userauthorization.php:175 lib/userprofile.php:178
msgid "URL"
msgstr ""
-#: actions/showgroup.php:282 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:194
+#: actions/showgroup.php:283 actions/tagother.php:128
+#: actions/userauthorization.php:187 lib/userprofile.php:195
msgid "Note"
msgstr ""
-#: actions/showgroup.php:292 lib/groupeditform.php:184
+#: actions/showgroup.php:293 lib/groupeditform.php:184
msgid "Aliases"
msgstr "نام های مستعار"
-#: actions/showgroup.php:301
+#: actions/showgroup.php:302
msgid "Group actions"
msgstr ""
-#: actions/showgroup.php:337
+#: actions/showgroup.php:338
#, php-format
msgid "Notice feed for %s group (RSS 1.0)"
msgstr ""
-#: actions/showgroup.php:343
+#: actions/showgroup.php:344
#, php-format
msgid "Notice feed for %s group (RSS 2.0)"
msgstr ""
-#: actions/showgroup.php:349
+#: actions/showgroup.php:350
#, php-format
msgid "Notice feed for %s group (Atom)"
msgstr ""
-#: actions/showgroup.php:354
+#: actions/showgroup.php:355
#, php-format
msgid "FOAF for %s group"
msgstr ""
-#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91
+#: actions/showgroup.php:391 actions/showgroup.php:448 lib/groupnav.php:91
msgid "Members"
msgstr "اعضا"
-#: actions/showgroup.php:395 lib/profileaction.php:117
-#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95
-#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71
+#: actions/showgroup.php:396 lib/profileaction.php:117
+#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95
+#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
msgid "(None)"
msgstr "هیچ"
-#: actions/showgroup.php:401
+#: actions/showgroup.php:402
msgid "All members"
msgstr "همه ی اعضا"
-#: actions/showgroup.php:441
+#: actions/showgroup.php:442
msgid "Created"
msgstr "ساخته شد"
-#: actions/showgroup.php:457
+#: actions/showgroup.php:458
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3543,7 +3553,7 @@ msgid ""
"of this group and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
-#: actions/showgroup.php:463
+#: actions/showgroup.php:464
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3552,7 +3562,7 @@ msgid ""
"their life and interests. "
msgstr ""
-#: actions/showgroup.php:491
+#: actions/showgroup.php:492
msgid "Admins"
msgstr ""
@@ -3685,7 +3695,7 @@ msgid "Unknown language \"%s\"."
msgstr ""
#: actions/siteadminpanel.php:165
-msgid "Minimum text limit is 140 characters."
+msgid "Minimum text limit is 0 (unlimited)."
msgstr ""
#: actions/siteadminpanel.php:171
@@ -3960,8 +3970,7 @@ msgstr "تنظیمات چهره"
msgid "You are not subscribed to that profile."
msgstr "شما به این پروفيل متعهد نشدید"
-#: actions/subedit.php:83 classes/Subscription.php:89
-#: classes/Subscription.php:116
+#: actions/subedit.php:83 classes/Subscription.php:132
msgid "Could not save subscription."
msgstr ""
@@ -4054,11 +4063,11 @@ msgstr ""
msgid "%s is not listening to anyone."
msgstr ""
-#: actions/subscriptions.php:199
+#: actions/subscriptions.php:208
msgid "Jabber"
msgstr ""
-#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:222 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr ""
@@ -4091,12 +4100,12 @@ msgstr ""
msgid "Tag %s"
msgstr ""
-#: actions/tagother.php:77 lib/userprofile.php:75
+#: actions/tagother.php:77 lib/userprofile.php:76
msgid "User profile"
msgstr "پروفایل کاربر"
#: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:102
+#: lib/userprofile.php:103
msgid "Photo"
msgstr ""
@@ -4401,7 +4410,7 @@ msgstr ""
msgid "Plugins"
msgstr ""
-#: actions/version.php:196 lib/action.php:767
+#: actions/version.php:196 lib/action.php:766
#, fuzzy
msgid "Version"
msgstr "شخصی"
@@ -4411,19 +4420,19 @@ msgstr "شخصی"
msgid "Author(s)"
msgstr "مؤلف"
-#: classes/File.php:144
+#: classes/File.php:169
#, 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:154
+#: classes/File.php:179
#, php-format
msgid "A file this large would exceed your user quota of %d bytes."
msgstr ""
-#: classes/File.php:161
+#: classes/File.php:186
#, php-format
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
@@ -4463,27 +4472,27 @@ msgstr "پیغام نمی تواند درج گردد"
msgid "Could not update message with new URI."
msgstr ""
-#: classes/Notice.php:172
+#: classes/Notice.php:175
#, php-format
msgid "DB error inserting hashtag: %s"
msgstr ""
-#: classes/Notice.php:241
+#: classes/Notice.php:244
msgid "Problem saving notice. Too long."
msgstr "مشکل در ذخیره کردن پیام. بسیار طولانی."
-#: classes/Notice.php:245
+#: classes/Notice.php:248
msgid "Problem saving notice. Unknown user."
msgstr "مشکل در ذخیره کردن پیام. کاربر نا شناخته."
-#: classes/Notice.php:250
+#: classes/Notice.php:253
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
"تعداد خیلی زیاد آگهی و بسیار سریع؛ استراحت کنید و مجددا دقایقی دیگر ارسال "
"کنید."
-#: classes/Notice.php:256
+#: classes/Notice.php:259
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
@@ -4491,72 +4500,72 @@ msgstr ""
"تعداد زیاد پیام های دو نسخه ای و بسرعت؛ استراحت کنید و دقایقی دیگر مجددا "
"ارسال کنید."
-#: classes/Notice.php:262
+#: classes/Notice.php:265
msgid "You are banned from posting notices on this site."
msgstr "شما از فرستادن پست در این سایت مردود شدید ."
-#: classes/Notice.php:328 classes/Notice.php:354
+#: classes/Notice.php:331 classes/Notice.php:357
msgid "Problem saving notice."
msgstr "مشکل در ذخیره کردن آگهی."
-#: classes/Notice.php:927
+#: classes/Notice.php:943
#, fuzzy
msgid "Problem saving group inbox."
msgstr "مشکل در ذخیره کردن آگهی."
-#: classes/Notice.php:1459
+#: classes/Notice.php:1481
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
-#: classes/Subscription.php:66 lib/oauthstore.php:465
+#: classes/Subscription.php:74 lib/oauthstore.php:465
msgid "You have been banned from subscribing."
msgstr ""
-#: classes/Subscription.php:70
+#: classes/Subscription.php:78
msgid "Already subscribed!"
msgstr "قبلا تایید شده !"
-#: classes/Subscription.php:74
+#: classes/Subscription.php:82
msgid "User has blocked you."
msgstr ""
-#: classes/Subscription.php:157
+#: classes/Subscription.php:167
msgid "Not subscribed!"
msgstr "تایید نشده!"
-#: classes/Subscription.php:163
+#: classes/Subscription.php:173
msgid "Couldn't delete self-subscription."
msgstr ""
-#: classes/Subscription.php:190
+#: classes/Subscription.php:200
#, fuzzy
msgid "Couldn't delete subscription OMB token."
msgstr "نمی‌توان تصدیق پست الکترونیک را پاک کرد."
-#: classes/Subscription.php:201 lib/subs.php:69
+#: classes/Subscription.php:211
msgid "Couldn't delete subscription."
msgstr ""
-#: classes/User.php:373
+#: classes/User.php:363
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "خوش امدید به %1$s , @%2$s!"
-#: classes/User_group.php:477
+#: classes/User_group.php:480
msgid "Could not create group."
msgstr "نمیتوان گروه را تشکیل داد"
-#: classes/User_group.php:486
+#: classes/User_group.php:489
#, fuzzy
msgid "Could not set group URI."
msgstr "نمیتوان گروه را تشکیل داد"
-#: classes/User_group.php:507
+#: classes/User_group.php:510
msgid "Could not set group membership."
msgstr ""
-#: classes/User_group.php:521
+#: classes/User_group.php:524
#, fuzzy
msgid "Could not save local group info."
msgstr "نمی‌توان شناس‌نامه را ذخیره کرد."
@@ -4598,126 +4607,126 @@ msgstr "%s گروه %s را ترک کرد."
msgid "Untitled page"
msgstr "صفحه ی بدون عنوان"
-#: lib/action.php:424
+#: lib/action.php:423
msgid "Primary site navigation"
msgstr ""
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:430
+#: lib/action.php:429
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr ""
-#: lib/action.php:433
+#: lib/action.php:432
#, fuzzy
msgctxt "MENU"
msgid "Personal"
msgstr "شخصی"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:435
+#: lib/action.php:434
#, fuzzy
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "آدرس ایمیل، آواتار، کلمه ی عبور، پروفایل خود را تغییر دهید"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:440
+#: lib/action.php:439
#, fuzzy
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "متصل شدن به خدمات"
-#: lib/action.php:443
+#: lib/action.php:442
msgid "Connect"
msgstr "وصل‌شدن"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:446
+#: lib/action.php:445
#, fuzzy
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "تغییر پیکربندی سایت"
-#: lib/action.php:449
+#: lib/action.php:448
#, fuzzy
msgctxt "MENU"
msgid "Admin"
msgstr "مدیر"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:453
+#: lib/action.php:452
#, fuzzy, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr " به شما ملحق شوند %s دوستان و همکاران را دعوت کنید تا در"
-#: lib/action.php:456
+#: lib/action.php:455
#, fuzzy
msgctxt "MENU"
msgid "Invite"
msgstr "دعوت‌کردن"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:462
+#: lib/action.php:461
#, fuzzy
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "خارج شدن از سایت ."
-#: lib/action.php:465
+#: lib/action.php:464
#, fuzzy
msgctxt "MENU"
msgid "Logout"
msgstr "خروج"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:470
+#: lib/action.php:469
#, fuzzy
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "یک حساب کاربری بسازید"
-#: lib/action.php:473
+#: lib/action.php:472
#, fuzzy
msgctxt "MENU"
msgid "Register"
msgstr "ثبت نام"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:476
+#: lib/action.php:475
#, fuzzy
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "ورود به وب‌گاه"
-#: lib/action.php:479
+#: lib/action.php:478
#, fuzzy
msgctxt "MENU"
msgid "Login"
msgstr "ورود"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:482
+#: lib/action.php:481
#, fuzzy
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "به من کمک کنید!"
-#: lib/action.php:485
+#: lib/action.php:484
#, fuzzy
msgctxt "MENU"
msgid "Help"
msgstr "کمک"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:488
+#: lib/action.php:487
#, fuzzy
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "جستجو برای شخص با متن"
-#: lib/action.php:491
+#: lib/action.php:490
#, fuzzy
msgctxt "MENU"
msgid "Search"
@@ -4725,71 +4734,71 @@ msgstr "جست‌وجو"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:513 lib/adminpanelaction.php:398
+#: lib/action.php:512 lib/adminpanelaction.php:398
msgid "Site notice"
msgstr "خبر سایت"
-#: lib/action.php:579
+#: lib/action.php:578
msgid "Local views"
msgstr "دید محلی"
-#: lib/action.php:645
+#: lib/action.php:644
msgid "Page notice"
msgstr "خبر صفحه"
-#: lib/action.php:747
+#: lib/action.php:746
msgid "Secondary site navigation"
msgstr ""
-#: lib/action.php:752
+#: lib/action.php:751
msgid "Help"
msgstr "کمک"
-#: lib/action.php:754
+#: lib/action.php:753
msgid "About"
msgstr "دربارهٔ"
-#: lib/action.php:756
+#: lib/action.php:755
msgid "FAQ"
msgstr "سوال‌های رایج"
-#: lib/action.php:760
+#: lib/action.php:759
msgid "TOS"
msgstr ""
-#: lib/action.php:763
+#: lib/action.php:762
msgid "Privacy"
msgstr "خصوصی"
-#: lib/action.php:765
+#: lib/action.php:764
msgid "Source"
msgstr "منبع"
-#: lib/action.php:769
+#: lib/action.php:768
msgid "Contact"
msgstr "تماس"
-#: lib/action.php:771
+#: lib/action.php:770
msgid "Badge"
msgstr ""
-#: lib/action.php:799
+#: lib/action.php:798
msgid "StatusNet software license"
msgstr "StatusNet مجوز نرم افزار"
-#: lib/action.php:802
+#: lib/action.php:803
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
"broughtby%%](%%site.broughtbyurl%%). "
msgstr ""
-#: lib/action.php:804
+#: lib/action.php:805
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr ""
-#: lib/action.php:806
+#: lib/action.php:808
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4797,53 +4806,57 @@ msgid ""
"org/licensing/licenses/agpl-3.0.html)."
msgstr ""
-#: lib/action.php:821
+#: lib/action.php:823
msgid "Site content license"
msgstr "مجوز محتویات سایت"
-#: lib/action.php:826
+#: lib/action.php:828
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
-#: lib/action.php:831
+#: lib/action.php:833
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
-#: lib/action.php:834
+#: lib/action.php:836
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
-#: lib/action.php:847
+#: lib/action.php:849
msgid "All "
msgstr "همه "
-#: lib/action.php:853
+#: lib/action.php:855
msgid "license."
msgstr "مجوز."
-#: lib/action.php:1152
+#: lib/action.php:1154
msgid "Pagination"
msgstr "صفحه بندى"
-#: lib/action.php:1161
+#: lib/action.php:1163
msgid "After"
msgstr "بعد از"
-#: lib/action.php:1169
+#: lib/action.php:1171
msgid "Before"
msgstr "قبل از"
-#: lib/activity.php:453
+#: lib/activity.php:120
+msgid "Expecting a root feed element but got a whole XML document."
+msgstr ""
+
+#: lib/activityutils.php:208
msgid "Can't handle remote content yet."
msgstr ""
-#: lib/activity.php:481
+#: lib/activityutils.php:236
msgid "Can't handle embedded XML content yet."
msgstr ""
-#: lib/activity.php:485
+#: lib/activityutils.php:240
msgid "Can't handle embedded Base64 content yet."
msgstr ""
@@ -4941,7 +4954,7 @@ msgstr "پیکره بندی اصلی سایت"
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
-#: lib/apiauth.php:272
+#: lib/apiauth.php:276
#, php-format
msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s"
msgstr ""
@@ -5017,11 +5030,11 @@ msgstr "حذف"
msgid "Attachments"
msgstr "ضمائم"
-#: lib/attachmentlist.php:265
+#: lib/attachmentlist.php:263
msgid "Author"
msgstr "مؤلف"
-#: lib/attachmentlist.php:278
+#: lib/attachmentlist.php:276
msgid "Provider"
msgstr "مهیا کننده"
@@ -5043,37 +5056,50 @@ msgstr "تغییر گذرواژه"
msgid "Password changing is not allowed"
msgstr "تغییر گذرواژه"
-#: lib/channel.php:138 lib/channel.php:158
+#: lib/channel.php:157 lib/channel.php:177
msgid "Command results"
msgstr "نتیجه دستور"
-#: lib/channel.php:210 lib/mailhandler.php:142
+#: lib/channel.php:229 lib/mailhandler.php:142
msgid "Command complete"
msgstr "دستور انجام شد"
-#: lib/channel.php:221
+#: lib/channel.php:240
msgid "Command failed"
msgstr "فرمان شکست خورد"
-#: lib/command.php:44
-msgid "Sorry, this command is not yet implemented."
-msgstr "متاسفانه این دستور هنوز اجرا نشده."
+#: lib/command.php:83 lib/command.php:105
+msgid "Notice with that id does not exist"
+msgstr "خبری با این مشخصه ایجاد نشد"
+
+#: lib/command.php:99 lib/command.php:570
+msgid "User has no last notice"
+msgstr "کاربر آگهی آخر ندارد"
-#: lib/command.php:88
+#: lib/command.php:125
#, php-format
msgid "Could not find a user with nickname %s"
msgstr "پیدا نشد %s کاریری یا نام مستعار"
-#: lib/command.php:92
+#: lib/command.php:143
+#, fuzzy, php-format
+msgid "Could not find a local user with nickname %s"
+msgstr "پیدا نشد %s کاریری یا نام مستعار"
+
+#: lib/command.php:176
+msgid "Sorry, this command is not yet implemented."
+msgstr "متاسفانه این دستور هنوز اجرا نشده."
+
+#: lib/command.php:221
msgid "It does not make a lot of sense to nudge yourself!"
msgstr ""
-#: lib/command.php:99
+#: lib/command.php:228
#, fuzzy, php-format
msgid "Nudge sent to %s"
msgstr "فرتادن اژیر"
-#: lib/command.php:126
+#: lib/command.php:254
#, php-format
msgid ""
"Subscriptions: %1$s\n"
@@ -5084,197 +5110,195 @@ msgstr ""
"مشترک : %2$s\n"
"خبر : %3$s"
-#: lib/command.php:152 lib/command.php:390 lib/command.php:451
-msgid "Notice with that id does not exist"
-msgstr "خبری با این مشخصه ایجاد نشد"
-
-#: lib/command.php:168 lib/command.php:406 lib/command.php:467
-#: lib/command.php:523
-msgid "User has no last notice"
-msgstr "کاربر آگهی آخر ندارد"
-
-#: lib/command.php:190
+#: lib/command.php:296
msgid "Notice marked as fave."
msgstr ""
-#: lib/command.php:217
+#: lib/command.php:317
msgid "You are already a member of that group"
msgstr "شما از پیش یک عضو این گروه هستید."
-#: lib/command.php:231
+#: lib/command.php:331
#, php-format
msgid "Could not join user %s to group %s"
msgstr "عضویت %s در گروه %s نا موفق بود."
-#: lib/command.php:236
+#: lib/command.php:336
#, php-format
msgid "%s joined group %s"
msgstr "ملحق شدن به گروه"
-#: lib/command.php:275
+#: lib/command.php:373
#, fuzzy, php-format
msgid "Could not remove user %s to group %s"
msgstr "خارج شدن %s از گروه %s نا موفق بود"
-#: lib/command.php:280
+#: lib/command.php:378
#, php-format
msgid "%s left group %s"
msgstr "%s گروه %s را ترک کرد."
-#: lib/command.php:309
+#: lib/command.php:401
#, php-format
msgid "Fullname: %s"
msgstr "نام کامل : %s"
-#: lib/command.php:312 lib/mail.php:258
+#: lib/command.php:404 lib/mail.php:258
#, php-format
msgid "Location: %s"
msgstr "موقعیت : %s"
-#: lib/command.php:315 lib/mail.php:260
+#: lib/command.php:407 lib/mail.php:260
#, php-format
msgid "Homepage: %s"
msgstr "صفحه خانگی : %s"
-#: lib/command.php:318
+#: lib/command.php:410
#, php-format
msgid "About: %s"
msgstr "درباره ی : %s"
-#: lib/command.php:349
+#: lib/command.php:437
+#, php-format
+msgid ""
+"%s is a remote profile; you can only send direct messages to users on the "
+"same server."
+msgstr ""
+
+#: lib/command.php:450
#, php-format
msgid "Message too long - maximum is %d characters, you sent %d"
msgstr ""
"پیغام بسیار طولانی است - بیشترین اندازه امکان پذیر %d کاراکتر است , شما %d "
"تا فرستادید"
-#: lib/command.php:367
+#: lib/command.php:468
#, php-format
msgid "Direct message to %s sent"
msgstr "پیام مستقیم به %s فرستاده شد."
-#: lib/command.php:369
+#: lib/command.php:470
msgid "Error sending direct message."
msgstr "خطا در فرستادن پیام مستقیم."
-#: lib/command.php:413
+#: lib/command.php:490
msgid "Cannot repeat your own notice"
msgstr "نمی توان آگهی خودتان را تکرار کرد"
-#: lib/command.php:418
+#: lib/command.php:495
msgid "Already repeated that notice"
msgstr "آن آگهی قبلا تکرار شده است."
-#: lib/command.php:426
+#: lib/command.php:503
#, fuzzy, php-format
msgid "Notice from %s repeated"
msgstr "آگهی تکرار شد"
-#: lib/command.php:428
+#: lib/command.php:505
msgid "Error repeating notice."
msgstr "خطا هنگام تکرار آگهی."
-#: lib/command.php:482
+#: lib/command.php:536
#, fuzzy, php-format
msgid "Notice too long - maximum is %d characters, you sent %d"
msgstr ""
"پیغام بسیار طولانی است - بیشترین اندازه امکان پذیر %d کاراکتر است , شما %d "
"تا فرستادید"
-#: lib/command.php:491
+#: lib/command.php:545
#, fuzzy, php-format
msgid "Reply to %s sent"
msgstr "به این آگهی جواب دهید"
-#: lib/command.php:493
+#: lib/command.php:547
msgid "Error saving notice."
msgstr "خطا هنگام ذخیره ی آگهی"
-#: lib/command.php:547
+#: lib/command.php:594
msgid "Specify the name of the user to subscribe to"
msgstr ""
-#: lib/command.php:554 lib/command.php:589
+#: lib/command.php:602
#, fuzzy
-msgid "No such user"
-msgstr "چنین کاربری وجود ندارد."
+msgid "Can't subscribe to OMB profiles by command."
+msgstr "شما به این پروفيل متعهد نشدید"
-#: lib/command.php:561
+#: lib/command.php:608
#, php-format
msgid "Subscribed to %s"
msgstr ""
-#: lib/command.php:582 lib/command.php:685
+#: lib/command.php:629 lib/command.php:728
msgid "Specify the name of the user to unsubscribe from"
msgstr ""
-#: lib/command.php:595
+#: lib/command.php:638
#, php-format
msgid "Unsubscribed from %s"
msgstr ""
-#: lib/command.php:613 lib/command.php:636
+#: lib/command.php:656 lib/command.php:679
msgid "Command not yet implemented."
msgstr "دستور هنوز اجرا نشده"
-#: lib/command.php:616
+#: lib/command.php:659
msgid "Notification off."
msgstr ""
-#: lib/command.php:618
+#: lib/command.php:661
msgid "Can't turn off notification."
msgstr "ناتوان در خاموش کردن آگاه سازی."
-#: lib/command.php:639
+#: lib/command.php:682
msgid "Notification on."
msgstr "آگاه سازی فعال است."
-#: lib/command.php:641
+#: lib/command.php:684
msgid "Can't turn on notification."
msgstr "ناتوان در روشن کردن آگاه سازی."
-#: lib/command.php:654
+#: lib/command.php:697
msgid "Login command is disabled"
msgstr "فرمان ورود از کار افتاده است"
-#: lib/command.php:665
+#: lib/command.php:708
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:692
+#: lib/command.php:735
#, fuzzy, php-format
msgid "Unsubscribed %s"
msgstr "مشترک‌ها"
-#: lib/command.php:709
+#: lib/command.php:752
msgid "You are not subscribed to anyone."
msgstr "شما توسط هیچ کس تصویب نشده اید ."
-#: lib/command.php:711
+#: lib/command.php:754
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "هم اکنون شما این کاربران را دنبال می‌کنید: "
-#: lib/command.php:731
+#: lib/command.php:774
msgid "No one is subscribed to you."
msgstr "هیچکس شما را تایید نکرده ."
-#: lib/command.php:733
+#: lib/command.php:776
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "هیچکس شما را تایید نکرده ."
-#: lib/command.php:753
+#: lib/command.php:796
msgid "You are not a member of any groups."
msgstr "شما در هیچ گروهی عضو نیستید ."
-#: lib/command.php:755
+#: lib/command.php:798
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "شما یک عضو این گروه نیستید."
-#: lib/command.php:769
+#: lib/command.php:812
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5316,19 +5340,19 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:148
+#: lib/common.php:135
msgid "No configuration file found. "
msgstr ""
-#: lib/common.php:149
+#: lib/common.php:136
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:151
+#: lib/common.php:138
msgid "You may wish to run the installer to fix this."
msgstr "شما ممکن است بخواهید نصاب را اجرا کنید تا این را تعمیر کند."
-#: lib/common.php:152
+#: lib/common.php:139
msgid "Go to the installer."
msgstr "برو به نصاب."
@@ -5503,50 +5527,50 @@ msgstr ""
msgid "This page is not available in a media type you accept"
msgstr ""
-#: lib/imagefile.php:75
+#: lib/imagefile.php:72
+msgid "Unsupported image file format."
+msgstr "فرمت(فایل) عکس پشتیبانی نشده."
+
+#: lib/imagefile.php:88
#, php-format
msgid "That file is too big. The maximum file size is %s."
msgstr ""
"است . این فایل بسیار یزرگ است %s بیشترین مقدار قابل قبول برای اندازه ی فایل."
-#: lib/imagefile.php:80
+#: lib/imagefile.php:93
msgid "Partial upload."
msgstr ""
-#: lib/imagefile.php:88 lib/mediafile.php:170
+#: lib/imagefile.php:101 lib/mediafile.php:170
msgid "System error uploading file."
msgstr "خطای سیستم ارسال فایل."
-#: lib/imagefile.php:96
+#: lib/imagefile.php:109
msgid "Not an image or corrupt file."
msgstr "تصویر یا فایل خرابی نیست"
-#: lib/imagefile.php:109
-msgid "Unsupported image file format."
-msgstr "فرمت(فایل) عکس پشتیبانی نشده."
-
#: lib/imagefile.php:122
msgid "Lost our file."
msgstr "فایلمان گم شده"
-#: lib/imagefile.php:166 lib/imagefile.php:231
+#: lib/imagefile.php:163 lib/imagefile.php:224
msgid "Unknown file type"
msgstr "نوع فایل پشتیبانی نشده"
-#: lib/imagefile.php:251
+#: lib/imagefile.php:244
msgid "MB"
msgstr "مگابایت"
-#: lib/imagefile.php:253
+#: lib/imagefile.php:246
msgid "kB"
msgstr "کیلوبایت"
-#: lib/jabber.php:220
+#: lib/jabber.php:387
#, php-format
msgid "[%s]"
msgstr ""
-#: lib/jabber.php:400
+#: lib/jabber.php:567
#, php-format
msgid "Unknown inbox source %d."
msgstr ""
@@ -5747,7 +5771,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:482
+#: lib/mailbox.php:227 lib/noticelist.php:486
msgid "from"
msgstr "از"
@@ -5877,48 +5901,48 @@ msgid ""
"try again later"
msgstr ""
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr ""
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "N"
msgstr ""
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "S"
msgstr ""
-#: lib/noticelist.php:431
+#: lib/noticelist.php:432
msgid "E"
msgstr ""
-#: lib/noticelist.php:431
+#: lib/noticelist.php:432
msgid "W"
msgstr ""
-#: lib/noticelist.php:438
+#: lib/noticelist.php:439
msgid "at"
msgstr "در"
-#: lib/noticelist.php:566
+#: lib/noticelist.php:570
msgid "in context"
msgstr "در زمینه"
-#: lib/noticelist.php:601
+#: lib/noticelist.php:605
msgid "Repeated by"
msgstr "تکرار از"
-#: lib/noticelist.php:628
+#: lib/noticelist.php:632
msgid "Reply to this notice"
msgstr "به این آگهی جواب دهید"
-#: lib/noticelist.php:629
+#: lib/noticelist.php:633
msgid "Reply"
msgstr "جواب دادن"
-#: lib/noticelist.php:673
+#: lib/noticelist.php:677
msgid "Notice repeated"
msgstr "آگهی تکرار شد"
@@ -5991,7 +6015,7 @@ msgstr ""
msgid "Unknown"
msgstr ""
-#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr "اشتراک‌ها"
@@ -5999,7 +6023,7 @@ msgstr "اشتراک‌ها"
msgid "All subscriptions"
msgstr "تمام اشتراک‌ها"
-#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90
+#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr "مشترک‌ها"
@@ -6007,15 +6031,20 @@ msgstr "مشترک‌ها"
msgid "All subscribers"
msgstr "تمام مشترک‌ها"
-#: lib/profileaction.php:180
+#: lib/profileaction.php:186
msgid "User ID"
msgstr "شناسه کاربر"
-#: lib/profileaction.php:185
+#: lib/profileaction.php:191
msgid "Member since"
msgstr "عضو شده از"
-#: lib/profileaction.php:247
+#. TRANS: Average count of posts made per day since account registration
+#: lib/profileaction.php:230
+msgid "Daily average"
+msgstr ""
+
+#: lib/profileaction.php:259
msgid "All groups"
msgstr "تمام گروه‌ها"
@@ -6061,7 +6090,7 @@ msgstr ""
msgid "Revoke the \"%s\" role from this user"
msgstr "دسترسی کاربر را به گروه مسدود کن"
-#: lib/router.php:671
+#: lib/router.php:704
msgid "No single user defined for single-user mode."
msgstr ""
@@ -6187,90 +6216,99 @@ msgstr ""
msgid "Unsubscribe"
msgstr ""
-#: lib/userprofile.php:116
+#: lib/usernoprofileexception.php:58
+#, fuzzy, php-format
+msgid "User %s (%d) has no profile record."
+msgstr "کاربر هیچ شناس‌نامه‌ای ندارد."
+
+#: lib/userprofile.php:117
msgid "Edit Avatar"
msgstr "ویرایش اواتور"
-#: lib/userprofile.php:236
+#: lib/userprofile.php:234 lib/userprofile.php:248
msgid "User actions"
msgstr ""
-#: lib/userprofile.php:251
+#: lib/userprofile.php:237
+msgid "User deletion in progress..."
+msgstr ""
+
+#: lib/userprofile.php:263
msgid "Edit profile settings"
msgstr "ویرایش تنظیمات پروفيل"
-#: lib/userprofile.php:252
+#: lib/userprofile.php:264
msgid "Edit"
msgstr "ویرایش"
-#: lib/userprofile.php:275
+#: lib/userprofile.php:287
msgid "Send a direct message to this user"
msgstr "پیام مستقیم به این کاربر بفرستید"
-#: lib/userprofile.php:276
+#: lib/userprofile.php:288
msgid "Message"
msgstr "پیام"
-#: lib/userprofile.php:314
+#: lib/userprofile.php:326
msgid "Moderate"
msgstr ""
-#: lib/userprofile.php:352
+#: lib/userprofile.php:364
#, fuzzy
msgid "User role"
msgstr "پروفایل کاربر"
-#: lib/userprofile.php:354
+#: lib/userprofile.php:366
msgctxt "role"
msgid "Administrator"
msgstr ""
-#: lib/userprofile.php:355
+#: lib/userprofile.php:367
msgctxt "role"
msgid "Moderator"
msgstr ""
-#: lib/util.php:1015
+#: lib/util.php:1046
msgid "a few seconds ago"
msgstr "چند ثانیه پیش"
-#: lib/util.php:1017
+#: lib/util.php:1048
msgid "about a minute ago"
msgstr "حدود یک دقیقه پیش"
-#: lib/util.php:1019
+#: lib/util.php:1050
#, php-format
msgid "about %d minutes ago"
msgstr "حدود %d دقیقه پیش"
-#: lib/util.php:1021
+#: lib/util.php:1052
msgid "about an hour ago"
msgstr "حدود یک ساعت پیش"
-#: lib/util.php:1023
+#: lib/util.php:1054
#, php-format
msgid "about %d hours ago"
msgstr "حدود %d ساعت پیش"
-#: lib/util.php:1025
+#: lib/util.php:1056
msgid "about a day ago"
msgstr "حدود یک روز پیش"
-#: lib/util.php:1027
+#: lib/util.php:1058
#, php-format
msgid "about %d days ago"
msgstr "حدود %d روز پیش"
-#: lib/util.php:1029
+#: lib/util.php:1060
msgid "about a month ago"
msgstr "حدود یک ماه پیش"
-#: lib/util.php:1031
+#: lib/util.php:1062
#, php-format
msgid "about %d months ago"
msgstr "حدود %d ماه پیش"
-#: lib/util.php:1033
+#: lib/util.php:1064
msgid "about a year ago"
msgstr "حدود یک سال پیش"
@@ -6284,7 +6322,7 @@ msgstr "%s یک رنگ صحیح نیست!"
msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr "%s یک رنگ صحیح نیست! از ۳ یا ۶ حرف مبنای شانزده استفاده کنید"
-#: lib/xmppmanager.php:402
+#: lib/xmppmanager.php:403
#, fuzzy, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d."
msgstr ""
diff --git a/locale/fi/LC_MESSAGES/statusnet.po b/locale/fi/LC_MESSAGES/statusnet.po
index 68a63537b..4be4a250d 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-03-06 23:49+0000\n"
-"PO-Revision-Date: 2010-03-06 23:49:46+0000\n"
+"POT-Creation-Date: 2010-04-05 18:54+0000\n"
+"PO-Revision-Date: 2010-04-05 18:55:08+0000\n"
"Language-Team: Finnish\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64621); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: fi\n"
"X-Message-Group: out-statusnet\n"
@@ -100,9 +100,9 @@ msgstr "Sivua ei ole."
#: 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:90
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78
+#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
@@ -111,10 +111,8 @@ msgstr "Sivua ei ole."
#: actions/remotesubscribe.php:154 actions/replies.php:73
#: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:163 lib/command.php:302
-#: lib/command.php:355 lib/command.php:401 lib/command.php:462
-#: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82
-#: lib/profileaction.php:77
+#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: lib/mailbox.php:82 lib/profileaction.php:77
msgid "No such user."
msgstr "Käyttäjää ei ole."
@@ -207,18 +205,18 @@ msgstr "Käyttäjän %1$s ja kavereiden päivitykset palvelussa %2$s!"
#: 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:132
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:136
#: actions/apigrouplistall.php:120 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:135
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
-#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184
-#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148
+#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:174
+#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173
+#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
-#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
+#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
#, fuzzy
msgid "API method not found."
msgstr "API-metodia ei löytynyt!"
@@ -232,8 +230,8 @@ msgstr "API-metodia ei löytynyt!"
#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65
-#: actions/apistatusesupdate.php:118
+#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
msgid "This method requires a POST."
msgstr "Tämä metodi edellyttää POST sanoman."
@@ -264,7 +262,7 @@ msgid "Could not save profile."
msgstr "Ei voitu tallentaa profiilia."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:97
+#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
#: actions/designadminpanel.php:122 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
@@ -353,7 +351,7 @@ msgstr "Käyttäjätunnukselle ei löytynyt statusviestiä."
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:176
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
msgid "Could not create favorite."
msgstr "Ei voitu lisätä suosikiksi."
@@ -476,7 +474,7 @@ msgstr "Ryhmää ei löytynyt!"
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:221
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
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."
@@ -494,11 +492,18 @@ msgstr "Sinä et kuulu tähän ryhmään."
msgid "Could not remove user %1$s from group %2$s."
msgstr "Ei voitu poistaa käyttäjää %s ryhmästä %s"
-#: actions/apigrouplist.php:95
+#. TRANS: %s is a user name
+#: actions/apigrouplist.php:97
#, 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
+#, fuzzy, php-format
+msgid "%1$s groups %2$s is a member of."
+msgstr "Ryhmät, joiden jäsen %s on"
+
#: actions/apigrouplistall.php:90 actions/usergroups.php:62
#, php-format
msgid "%s groups"
@@ -527,7 +532,7 @@ msgstr "Koko ei kelpaa."
#: 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:337
+#: actions/profilesettings.php:194 actions/recoverpassword.php:350
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
@@ -590,15 +595,15 @@ msgid ""
"give access to your %4$s account to third parties you trust."
msgstr ""
-#: actions/apioauthauthorize.php:310 lib/action.php:438
+#: actions/apioauthauthorize.php:310 lib/action.php:437
msgid "Account"
msgstr "Käyttäjätili"
#: actions/apioauthauthorize.php:313 actions/login.php:230
#: actions/profilesettings.php:106 actions/register.php:424
-#: actions/showgroup.php:244 actions/tagother.php:94
+#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
-#: lib/userprofile.php:131
+#: lib/userprofile.php:132
msgid "Nickname"
msgstr "Tunnus"
@@ -671,12 +676,12 @@ msgstr "Maksimikoko päivitykselle on %d merkkiä, mukaan lukien URL-osoite."
msgid "Unsupported format."
msgstr "Formaattia ei ole tuettu."
-#: actions/apitimelinefavorites.php:108
+#: actions/apitimelinefavorites.php:109
#, fuzzy, php-format
msgid "%1$s / Favorites from %2$s"
msgstr "%s / Käyttäjän %s suosikit"
-#: actions/apitimelinefavorites.php:117
+#: actions/apitimelinefavorites.php:118
#, fuzzy, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr " Palvelun %s päivitykset, jotka %s / %s on merkinnyt suosikikseen."
@@ -686,7 +691,7 @@ msgstr " Palvelun %s päivitykset, jotka %s / %s on merkinnyt suosikikseen."
msgid "%1$s / Updates mentioning %2$s"
msgstr "%1$s / Vastaukset päivitykseen %2$s"
-#: actions/apitimelinementions.php:127
+#: actions/apitimelinementions.php:130
#, php-format
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr ""
@@ -697,7 +702,7 @@ msgstr ""
msgid "%s public timeline"
msgstr "%s julkinen aikajana"
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "%s päivitykset kaikilta!"
@@ -712,12 +717,12 @@ msgstr "Vastaukset käyttäjälle %s"
msgid "Repeats of %s"
msgstr "Vastaukset käyttäjälle %s"
-#: actions/apitimelinetag.php:102 actions/tag.php:67
+#: actions/apitimelinetag.php:104 actions/tag.php:67
#, php-format
msgid "Notices tagged with %s"
msgstr "Päivitykset joilla on tagi %s"
-#: actions/apitimelinetag.php:104 actions/tagrss.php:65
+#: actions/apitimelinetag.php:106 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!"
@@ -745,7 +750,7 @@ msgstr "Kokoa ei ole."
msgid "Invalid size."
msgstr "Koko ei kelpaa."
-#: actions/avatarsettings.php:67 actions/showgroup.php:229
+#: actions/avatarsettings.php:67 actions/showgroup.php:230
#: lib/accountsettingsaction.php:112
msgid "Avatar"
msgstr "Kuva"
@@ -777,7 +782,7 @@ msgid "Preview"
msgstr "Esikatselu"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:655
+#: lib/deleteuserform.php:66 lib/noticelist.php:659
msgid "Delete"
msgstr "Poista"
@@ -789,23 +794,28 @@ msgstr "Lataa"
msgid "Crop"
msgstr "Rajaa"
-#: actions/avatarsettings.php:328
+#: actions/avatarsettings.php:305
+#, fuzzy
+msgid "No file uploaded."
+msgstr "Profiilia ei ole määritelty."
+
+#: actions/avatarsettings.php:332
msgid "Pick a square area of the image to be your avatar"
msgstr "Valitse neliön muotoinen alue kuvasta profiilikuvaksi"
-#: actions/avatarsettings.php:343 actions/grouplogo.php:380
+#: actions/avatarsettings.php:347 actions/grouplogo.php:380
msgid "Lost our file data."
msgstr "Tiedoston data hävisi."
-#: actions/avatarsettings.php:366
+#: actions/avatarsettings.php:370
msgid "Avatar updated."
msgstr "Kuva päivitetty."
-#: actions/avatarsettings.php:369
+#: actions/avatarsettings.php:373
msgid "Failed updating avatar."
msgstr "Profiilikuvan päivittäminen epäonnistui."
-#: actions/avatarsettings.php:393
+#: actions/avatarsettings.php:397
msgid "Avatar deleted."
msgstr "Kuva poistettu."
@@ -858,8 +868,8 @@ msgstr "Käyttäjän estotiedon tallennus epäonnistui."
#: actions/groupunblock.php:86 actions/joingroup.php:82
#: actions/joingroup.php:93 actions/leavegroup.php:82
#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212
-#: lib/command.php:260
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162
+#: lib/command.php:358
msgid "No such group."
msgstr "Tuota ryhmää ei ole."
@@ -943,7 +953,7 @@ msgid "Conversation"
msgstr "Keskustelu"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:218 lib/searchgroupnav.php:82
+#: lib/profileaction.php:224 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "Päivitykset"
@@ -966,7 +976,7 @@ msgstr "Sinä et kuulu tähän ryhmään."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1217
+#: lib/action.php:1219
msgid "There was a problem with your session token."
msgstr "Istuntoavaimesi kanssa oli ongelma."
@@ -1027,7 +1037,7 @@ msgstr "Oletko varma että haluat poistaa tämän päivityksen?"
msgid "Do not delete this notice"
msgstr "Älä poista tätä päivitystä"
-#: actions/deletenotice.php:146 lib/noticelist.php:655
+#: actions/deletenotice.php:146 lib/noticelist.php:659
msgid "Delete this notice"
msgstr "Poista tämä päivitys"
@@ -1169,7 +1179,7 @@ msgstr ""
#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:208
+#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
#: actions/tagother.php:154 actions/useradminpanel.php:294
#: lib/applicationeditform.php:333 lib/applicationeditform.php:334
#: lib/designsettings.php:256 lib/groupeditform.php:202
@@ -1298,7 +1308,7 @@ msgstr "kuvaus on liian pitkä (max %d merkkiä)."
msgid "Could not update group."
msgstr "Ei voitu päivittää ryhmää."
-#: actions/editgroup.php:264 classes/User_group.php:493
+#: actions/editgroup.php:264 classes/User_group.php:496
msgid "Could not create aliases."
msgstr "Ei voitu lisätä aliasta."
@@ -1793,7 +1803,7 @@ msgstr "%s aikajana"
msgid "Updates from members of %1$s on %2$s!"
msgstr "Ryhmän %1$s käyttäjien päivitykset palvelussa %2$s!"
-#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232
+#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244
#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr "Ryhmät"
@@ -2002,7 +2012,7 @@ msgstr "Kutsu uusia käyttäjiä"
msgid "You are already subscribed to these users:"
msgstr "Olet jos tilannut seuraavien käyttäjien päivitykset:"
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
#, php-format
msgid "%1$s (%2$s)"
msgstr "%1$s (%2$s)"
@@ -2135,7 +2145,7 @@ msgstr "%s liittyi ryhmään %s"
msgid "You must be logged in to leave a group."
msgstr "Sinun pitää olla kirjautunut sisään, jotta voit erota ryhmästä."
-#: actions/leavegroup.php:100 lib/command.php:265
+#: actions/leavegroup.php:100 lib/command.php:363
msgid "You are not a member of that group."
msgstr "Sinä et kuulu tähän ryhmään."
@@ -2256,12 +2266,12 @@ msgstr "Käytä tätä lomaketta luodaksesi ryhmän."
msgid "New message"
msgstr "Uusi viesti"
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
msgid "You can't send a message to this user."
msgstr "Et voi lähettää viestiä tälle käyttäjälle."
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342
-#: lib/command.php:475
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
+#: lib/command.php:529
msgid "No content!"
msgstr "Ei sisältöä!"
@@ -2269,7 +2279,7 @@ msgstr "Ei sisältöä!"
msgid "No recipient specified."
msgstr "Vastaanottajaa ei ole määritelty."
-#: actions/newmessage.php:164 lib/command.php:361
+#: actions/newmessage.php:164 lib/command.php:462
msgid ""
"Don't send a message to yourself; just say it to yourself quietly instead."
msgstr "Älä lähetä viestiä itsellesi, vaan kuiskaa se vain hiljaa itsellesi."
@@ -2283,7 +2293,7 @@ msgstr "Viesti lähetetty"
msgid "Direct message to %s sent."
msgstr "Suora viesti käyttäjälle %s lähetetty"
-#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189
msgid "Ajax Error"
msgstr "Ajax-virhe"
@@ -2291,7 +2301,7 @@ msgstr "Ajax-virhe"
msgid "New notice"
msgstr "Uusi päivitys"
-#: actions/newnotice.php:211
+#: actions/newnotice.php:217
msgid "Notice posted"
msgstr "Päivitys lähetetty"
@@ -2404,7 +2414,7 @@ msgstr ""
msgid "Notice has no profile"
msgstr "Päivitykselle ei ole profiilia"
-#: actions/oembed.php:86 actions/shownotice.php:180
+#: actions/oembed.php:86 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"
@@ -2418,8 +2428,8 @@ msgstr "Yhdistä"
msgid "Only "
msgstr "Vain "
-#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042
-#: lib/apiaction.php:1070 lib/apiaction.php:1179
+#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1068
+#: lib/apiaction.php:1096 lib/apiaction.php:1212
msgid "Not a supported data format."
msgstr "Tuo ei ole tuettu tietomuoto."
@@ -2557,7 +2567,7 @@ msgstr "Väärä vanha salasana"
msgid "Error saving user; invalid."
msgstr "Virhe tapahtui käyttäjän tallentamisessa; epäkelpo."
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
msgid "Can't save new password."
msgstr "Uutta salasanaa ei voida tallentaa."
@@ -2786,8 +2796,8 @@ msgstr ""
"välilyöntejä"
#: actions/profilesettings.php:111 actions/register.php:448
-#: actions/showgroup.php:255 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:149
+#: actions/showgroup.php:256 actions/tagother.php:104
+#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Koko nimi"
@@ -2814,9 +2824,9 @@ msgid "Bio"
msgstr "Tietoja"
#: actions/profilesettings.php:132 actions/register.php:471
-#: actions/showgroup.php:264 actions/tagother.php:112
+#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
-#: lib/userprofile.php:164
+#: lib/userprofile.php:165
msgid "Location"
msgstr "Kotipaikka"
@@ -2830,7 +2840,7 @@ msgstr ""
#: actions/profilesettings.php:145 actions/tagother.php:149
#: actions/tagother.php:209 lib/subscriptionlist.php:106
-#: lib/subscriptionlist.php:108 lib/userprofile.php:209
+#: lib/subscriptionlist.php:108 lib/userprofile.php:210
msgid "Tags"
msgstr "Tagit"
@@ -3064,7 +3074,7 @@ msgstr "Vaihda salasana"
msgid "Recover password"
msgstr "Salasanan palautus"
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
msgid "Password recovery requested"
msgstr "Salasanan palautuspyyntö lähetetty."
@@ -3084,19 +3094,19 @@ msgstr "Vaihda"
msgid "Enter a nickname or email address."
msgstr "Syötä käyttäjätunnus tai sähköpostiosoite"
-#: actions/recoverpassword.php:272
+#: actions/recoverpassword.php:282
msgid "No user with that email address or username."
msgstr "Käyttäjää tuolla sähköpostilla tai käyttäjätunnuksella ei ole."
-#: actions/recoverpassword.php:287
+#: actions/recoverpassword.php:299
msgid "No registered email address for that user."
msgstr "Rekisteröityä sähköpostiosoitetta ei ole tälle käyttäjälle."
-#: actions/recoverpassword.php:301
+#: actions/recoverpassword.php:313
msgid "Error saving address confirmation."
msgstr "Virhe tapahtui osoitevahvistuksen tallentamisessa"
-#: actions/recoverpassword.php:325
+#: actions/recoverpassword.php:338
msgid ""
"Instructions for recovering your password have been sent to the email "
"address registered to your account."
@@ -3104,23 +3114,23 @@ msgstr ""
"Ohjeet salasanan palauttamiseksi on lähetetty sähköpostiisiosoitteeseen, "
"joka on rekisteröity käyttäjätunnuksellesi."
-#: actions/recoverpassword.php:344
+#: actions/recoverpassword.php:357
msgid "Unexpected password reset."
msgstr "Odottamaton salasanan uudelleenasetus."
-#: actions/recoverpassword.php:352
+#: actions/recoverpassword.php:365
msgid "Password must be 6 chars or more."
msgstr "Salasanassa pitää olla 6 tai useampia merkkejä."
-#: actions/recoverpassword.php:356
+#: actions/recoverpassword.php:369
msgid "Password and confirmation do not match."
msgstr "Salasana ja salasanan vahvistus eivät täsmää."
-#: actions/recoverpassword.php:375 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:248
msgid "Error setting user."
msgstr "Virhe tapahtui käyttäjän asettamisessa."
-#: actions/recoverpassword.php:382
+#: actions/recoverpassword.php:395
msgid "New password successfully saved. You are now logged in."
msgstr ""
"Uusi salasana tallennettiin onnistuneesti. Olet nyt kirjautunut sisään."
@@ -3288,7 +3298,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "Profiilisi URL-osoite toisessa yhteensopivassa mikroblogauspalvelussa"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:394
+#: lib/userprofile.php:406
msgid "Subscribe"
msgstr "Tilaa"
@@ -3332,7 +3342,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:674
+#: actions/repeat.php:114 lib/noticelist.php:678
#, fuzzy
msgid "Repeated"
msgstr "Luotu"
@@ -3486,8 +3496,8 @@ msgstr "Sivutus"
msgid "Description"
msgstr "Kuvaus"
-#: actions/showapplication.php:192 actions/showgroup.php:438
-#: lib/profileaction.php:176
+#: actions/showapplication.php:192 actions/showgroup.php:439
+#: lib/profileaction.php:182
msgid "Statistics"
msgstr "Tilastot"
@@ -3598,67 +3608,67 @@ msgstr "Ryhmä %s"
msgid "%1$s group, page %2$d"
msgstr "Ryhmän %s jäsenet, sivu %d"
-#: actions/showgroup.php:226
+#: actions/showgroup.php:227
msgid "Group profile"
msgstr "Ryhmän profiili"
-#: actions/showgroup.php:271 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:177
+#: actions/showgroup.php:272 actions/tagother.php:118
+#: actions/userauthorization.php:175 lib/userprofile.php:178
msgid "URL"
msgstr "URL"
-#: actions/showgroup.php:282 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:194
+#: actions/showgroup.php:283 actions/tagother.php:128
+#: actions/userauthorization.php:187 lib/userprofile.php:195
msgid "Note"
msgstr "Huomaa"
-#: actions/showgroup.php:292 lib/groupeditform.php:184
+#: actions/showgroup.php:293 lib/groupeditform.php:184
msgid "Aliases"
msgstr "Aliakset"
-#: actions/showgroup.php:301
+#: actions/showgroup.php:302
msgid "Group actions"
msgstr "Ryhmän toiminnot"
-#: actions/showgroup.php:337
+#: actions/showgroup.php:338
#, php-format
msgid "Notice feed for %s group (RSS 1.0)"
msgstr "Syöte ryhmän %s päivityksille (RSS 1.0)"
-#: actions/showgroup.php:343
+#: actions/showgroup.php:344
#, php-format
msgid "Notice feed for %s group (RSS 2.0)"
msgstr "Syöte ryhmän %s päivityksille (RSS 2.0)"
-#: actions/showgroup.php:349
+#: actions/showgroup.php:350
#, php-format
msgid "Notice feed for %s group (Atom)"
msgstr "Syöte ryhmän %s päivityksille (Atom)"
-#: actions/showgroup.php:354
+#: actions/showgroup.php:355
#, php-format
msgid "FOAF for %s group"
msgstr "Käyttäjän %s lähetetyt viestit"
-#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91
+#: actions/showgroup.php:391 actions/showgroup.php:448 lib/groupnav.php:91
msgid "Members"
msgstr "Jäsenet"
-#: actions/showgroup.php:395 lib/profileaction.php:117
-#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95
-#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71
+#: actions/showgroup.php:396 lib/profileaction.php:117
+#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95
+#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
msgid "(None)"
msgstr "(Tyhjä)"
-#: actions/showgroup.php:401
+#: actions/showgroup.php:402
msgid "All members"
msgstr "Kaikki jäsenet"
-#: actions/showgroup.php:441
+#: actions/showgroup.php:442
msgid "Created"
msgstr "Luotu"
-#: actions/showgroup.php:457
+#: actions/showgroup.php:458
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3668,7 +3678,7 @@ msgid ""
"of this group and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
-#: actions/showgroup.php:463
+#: actions/showgroup.php:464
#, fuzzy, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3679,7 +3689,7 @@ msgstr ""
"**%s** on ryhmä palvelussa %%%%site.name%%%%, joka on [mikroblogauspalvelu]"
"(http://en.wikipedia.org/wiki/Micro-blogging)"
-#: actions/showgroup.php:491
+#: actions/showgroup.php:492
msgid "Admins"
msgstr "Ylläpitäjät"
@@ -3816,7 +3826,7 @@ msgid "Unknown language \"%s\"."
msgstr ""
#: actions/siteadminpanel.php:165
-msgid "Minimum text limit is 140 characters."
+msgid "Minimum text limit is 0 (unlimited)."
msgstr ""
#: actions/siteadminpanel.php:171
@@ -4098,8 +4108,7 @@ msgstr "Profiilikuva-asetukset"
msgid "You are not subscribed to that profile."
msgstr "Et ole tilannut tämän käyttäjän päivityksiä."
-#: actions/subedit.php:83 classes/Subscription.php:89
-#: classes/Subscription.php:116
+#: actions/subedit.php:83 classes/Subscription.php:132
msgid "Could not save subscription."
msgstr "Tilausta ei onnistuttu tallentamaan."
@@ -4192,11 +4201,11 @@ msgstr ""
msgid "%s is not listening to anyone."
msgstr "%s ei seuraa ketään käyttäjää."
-#: actions/subscriptions.php:199
+#: actions/subscriptions.php:208
msgid "Jabber"
msgstr "Jabber"
-#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:222 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr "SMS"
@@ -4230,12 +4239,12 @@ msgstr "Ei id parametria."
msgid "Tag %s"
msgstr "Tagi %s"
-#: actions/tagother.php:77 lib/userprofile.php:75
+#: actions/tagother.php:77 lib/userprofile.php:76
msgid "User profile"
msgstr "Käyttäjän profiili"
#: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:102
+#: lib/userprofile.php:103
msgid "Photo"
msgstr "Kuva"
@@ -4569,7 +4578,7 @@ msgstr ""
msgid "Plugins"
msgstr ""
-#: actions/version.php:196 lib/action.php:767
+#: actions/version.php:196 lib/action.php:766
#, fuzzy
msgid "Version"
msgstr "Omat"
@@ -4578,19 +4587,19 @@ msgstr "Omat"
msgid "Author(s)"
msgstr ""
-#: classes/File.php:144
+#: classes/File.php:169
#, 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:154
+#: classes/File.php:179
#, php-format
msgid "A file this large would exceed your user quota of %d bytes."
msgstr ""
-#: classes/File.php:161
+#: classes/File.php:186
#, php-format
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
@@ -4633,28 +4642,28 @@ msgstr "Viestin tallennus ei onnistunut."
msgid "Could not update message with new URI."
msgstr "Viestin päivittäminen uudella URI-osoitteella ei onnistunut."
-#: classes/Notice.php:172
+#: classes/Notice.php:175
#, php-format
msgid "DB error inserting hashtag: %s"
msgstr "Tietokantavirhe tallennettaessa risutagiä: %s"
-#: classes/Notice.php:241
+#: classes/Notice.php:244
#, fuzzy
msgid "Problem saving notice. Too long."
msgstr "Ongelma päivityksen tallentamisessa."
-#: classes/Notice.php:245
+#: classes/Notice.php:248
msgid "Problem saving notice. Unknown user."
msgstr "Virhe tapahtui päivityksen tallennuksessa. Tuntematon käyttäjä."
-#: classes/Notice.php:250
+#: classes/Notice.php:253
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:256
+#: classes/Notice.php:259
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
@@ -4662,75 +4671,75 @@ 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:262
+#: classes/Notice.php:265
msgid "You are banned from posting notices on this site."
msgstr "Päivityksesi tähän palveluun on estetty."
-#: classes/Notice.php:328 classes/Notice.php:354
+#: classes/Notice.php:331 classes/Notice.php:357
msgid "Problem saving notice."
msgstr "Ongelma päivityksen tallentamisessa."
-#: classes/Notice.php:927
+#: classes/Notice.php:943
#, fuzzy
msgid "Problem saving group inbox."
msgstr "Ongelma päivityksen tallentamisessa."
-#: classes/Notice.php:1459
+#: classes/Notice.php:1481
#, fuzzy, php-format
msgid "RT @%1$s %2$s"
msgstr "%1$s (%2$s)"
-#: classes/Subscription.php:66 lib/oauthstore.php:465
+#: classes/Subscription.php:74 lib/oauthstore.php:465
#, fuzzy
msgid "You have been banned from subscribing."
msgstr "Käyttäjä on estänyt sinua tilaamasta päivityksiä."
-#: classes/Subscription.php:70
+#: classes/Subscription.php:78
msgid "Already subscribed!"
msgstr ""
-#: classes/Subscription.php:74
+#: classes/Subscription.php:82
msgid "User has blocked you."
msgstr "Käyttäjä on asettanut eston sinulle."
-#: classes/Subscription.php:157
+#: classes/Subscription.php:167
#, fuzzy
msgid "Not subscribed!"
msgstr "Ei ole tilattu!."
-#: classes/Subscription.php:163
+#: classes/Subscription.php:173
#, fuzzy
msgid "Couldn't delete self-subscription."
msgstr "Ei voitu poistaa tilausta."
-#: classes/Subscription.php:190
+#: classes/Subscription.php:200
#, fuzzy
msgid "Couldn't delete subscription OMB token."
msgstr "Ei voitu poistaa tilausta."
-#: classes/Subscription.php:201 lib/subs.php:69
+#: classes/Subscription.php:211
msgid "Couldn't delete subscription."
msgstr "Ei voitu poistaa tilausta."
-#: classes/User.php:373
+#: classes/User.php:363
#, fuzzy, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Viesti käyttäjälle %1$s, %2$s"
-#: classes/User_group.php:477
+#: classes/User_group.php:480
msgid "Could not create group."
msgstr "Ryhmän luonti ei onnistunut."
-#: classes/User_group.php:486
+#: classes/User_group.php:489
#, fuzzy
msgid "Could not set group URI."
msgstr "Ryhmän jäsenyystietoja ei voitu asettaa."
-#: classes/User_group.php:507
+#: classes/User_group.php:510
msgid "Could not set group membership."
msgstr "Ryhmän jäsenyystietoja ei voitu asettaa."
-#: classes/User_group.php:521
+#: classes/User_group.php:524
#, fuzzy
msgid "Could not save local group info."
msgstr "Tilausta ei onnistuttu tallentamaan."
@@ -4773,127 +4782,127 @@ msgstr "%1$s (%2$s)"
msgid "Untitled page"
msgstr "Nimetön sivu"
-#: lib/action.php:424
+#: lib/action.php:423
msgid "Primary site navigation"
msgstr "Ensisijainen sivunavigointi"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:430
+#: lib/action.php:429
#, fuzzy
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr "Henkilökohtainen profiili ja kavereiden aikajana"
-#: lib/action.php:433
+#: lib/action.php:432
#, fuzzy
msgctxt "MENU"
msgid "Personal"
msgstr "Omat"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:435
+#: lib/action.php:434
#, fuzzy
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "Muuta sähköpostiosoitettasi, kuvaasi, salasanaasi, profiiliasi"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:440
+#: lib/action.php:439
#, fuzzy
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "Ei voitu uudelleenohjata palvelimelle: %s"
-#: lib/action.php:443
+#: lib/action.php:442
msgid "Connect"
msgstr "Yhdistä"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:446
+#: lib/action.php:445
#, fuzzy
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "Ensisijainen sivunavigointi"
-#: lib/action.php:449
+#: lib/action.php:448
#, fuzzy
msgctxt "MENU"
msgid "Admin"
msgstr "Ylläpito"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:453
+#: lib/action.php:452
#, fuzzy, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "Kutsu kavereita ja työkavereita liittymään palveluun %s"
-#: lib/action.php:456
+#: lib/action.php:455
#, fuzzy
msgctxt "MENU"
msgid "Invite"
msgstr "Kutsu"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:462
+#: lib/action.php:461
#, fuzzy
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "Kirjaudu ulos palvelusta"
-#: lib/action.php:465
+#: lib/action.php:464
#, fuzzy
msgctxt "MENU"
msgid "Logout"
msgstr "Kirjaudu ulos"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:470
+#: lib/action.php:469
#, fuzzy
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Luo uusi käyttäjätili"
-#: lib/action.php:473
+#: lib/action.php:472
#, fuzzy
msgctxt "MENU"
msgid "Register"
msgstr "Rekisteröidy"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:476
+#: lib/action.php:475
#, fuzzy
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Kirjaudu sisään palveluun"
-#: lib/action.php:479
+#: lib/action.php:478
#, fuzzy
msgctxt "MENU"
msgid "Login"
msgstr "Kirjaudu sisään"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:482
+#: lib/action.php:481
#, fuzzy
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Auta minua!"
-#: lib/action.php:485
+#: lib/action.php:484
#, fuzzy
msgctxt "MENU"
msgid "Help"
msgstr "Ohjeet"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:488
+#: lib/action.php:487
#, fuzzy
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "Hae ihmisiä tai tekstiä"
-#: lib/action.php:491
+#: lib/action.php:490
#, fuzzy
msgctxt "MENU"
msgid "Search"
@@ -4901,60 +4910,60 @@ msgstr "Haku"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:513 lib/adminpanelaction.php:398
+#: lib/action.php:512 lib/adminpanelaction.php:398
msgid "Site notice"
msgstr "Palvelun ilmoitus"
-#: lib/action.php:579
+#: lib/action.php:578
msgid "Local views"
msgstr "Paikalliset näkymät"
-#: lib/action.php:645
+#: lib/action.php:644
msgid "Page notice"
msgstr "Sivuilmoitus"
-#: lib/action.php:747
+#: lib/action.php:746
msgid "Secondary site navigation"
msgstr "Toissijainen sivunavigointi"
-#: lib/action.php:752
+#: lib/action.php:751
msgid "Help"
msgstr "Ohjeet"
-#: lib/action.php:754
+#: lib/action.php:753
msgid "About"
msgstr "Tietoa"
-#: lib/action.php:756
+#: lib/action.php:755
msgid "FAQ"
msgstr "UKK"
-#: lib/action.php:760
+#: lib/action.php:759
msgid "TOS"
msgstr ""
-#: lib/action.php:763
+#: lib/action.php:762
msgid "Privacy"
msgstr "Yksityisyys"
-#: lib/action.php:765
+#: lib/action.php:764
msgid "Source"
msgstr "Lähdekoodi"
-#: lib/action.php:769
+#: lib/action.php:768
msgid "Contact"
msgstr "Ota yhteyttä"
-#: lib/action.php:771
+#: lib/action.php:770
#, fuzzy
msgid "Badge"
msgstr "Tönäise"
-#: lib/action.php:799
+#: lib/action.php:798
msgid "StatusNet software license"
msgstr "StatusNet-ohjelmiston lisenssi"
-#: lib/action.php:802
+#: lib/action.php:803
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4963,12 +4972,12 @@ msgstr ""
"**%%site.name%%** on mikroblogipalvelu, jonka tarjoaa [%%site.broughtby%%](%%"
"site.broughtbyurl%%). "
-#: lib/action.php:804
+#: lib/action.php:805
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** on mikroblogipalvelu. "
-#: lib/action.php:806
+#: lib/action.php:808
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4979,54 +4988,58 @@ msgstr ""
"versio %s, saatavilla lisenssillä [GNU Affero General Public License](http://"
"www.fsf.org/licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:821
+#: lib/action.php:823
#, fuzzy
msgid "Site content license"
msgstr "StatusNet-ohjelmiston lisenssi"
-#: lib/action.php:826
+#: lib/action.php:828
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
-#: lib/action.php:831
+#: lib/action.php:833
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
-#: lib/action.php:834
+#: lib/action.php:836
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
-#: lib/action.php:847
+#: lib/action.php:849
msgid "All "
msgstr "Kaikki "
-#: lib/action.php:853
+#: lib/action.php:855
msgid "license."
msgstr "lisenssi."
-#: lib/action.php:1152
+#: lib/action.php:1154
msgid "Pagination"
msgstr "Sivutus"
-#: lib/action.php:1161
+#: lib/action.php:1163
msgid "After"
msgstr "Myöhemmin"
-#: lib/action.php:1169
+#: lib/action.php:1171
msgid "Before"
msgstr "Aiemmin"
-#: lib/activity.php:453
+#: lib/activity.php:120
+msgid "Expecting a root feed element but got a whole XML document."
+msgstr ""
+
+#: lib/activityutils.php:208
msgid "Can't handle remote content yet."
msgstr ""
-#: lib/activity.php:481
+#: lib/activityutils.php:236
msgid "Can't handle embedded XML content yet."
msgstr ""
-#: lib/activity.php:485
+#: lib/activityutils.php:240
msgid "Can't handle embedded Base64 content yet."
msgstr ""
@@ -5131,7 +5144,7 @@ msgstr "SMS vahvistus"
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
-#: lib/apiauth.php:272
+#: lib/apiauth.php:276
#, php-format
msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s"
msgstr ""
@@ -5210,11 +5223,11 @@ msgstr "Poista"
msgid "Attachments"
msgstr ""
-#: lib/attachmentlist.php:265
+#: lib/attachmentlist.php:263
msgid "Author"
msgstr ""
-#: lib/attachmentlist.php:278
+#: lib/attachmentlist.php:276
#, fuzzy
msgid "Provider"
msgstr "Profiili"
@@ -5237,37 +5250,51 @@ msgstr "Salasanan vaihto"
msgid "Password changing is not allowed"
msgstr "Salasanan vaihto"
-#: lib/channel.php:138 lib/channel.php:158
+#: lib/channel.php:157 lib/channel.php:177
msgid "Command results"
msgstr "Komennon tulos"
-#: lib/channel.php:210 lib/mailhandler.php:142
+#: lib/channel.php:229 lib/mailhandler.php:142
msgid "Command complete"
msgstr "Komento suoritettu"
-#: lib/channel.php:221
+#: lib/channel.php:240
msgid "Command failed"
msgstr "Komento epäonnistui"
-#: lib/command.php:44
-msgid "Sorry, this command is not yet implemented."
-msgstr "Valitettavasti tätä komentoa ei ole vielä toteutettu."
+#: lib/command.php:83 lib/command.php:105
+#, fuzzy
+msgid "Notice with that id does not exist"
+msgstr "Ei profiilia tuolla id:llä."
+
+#: lib/command.php:99 lib/command.php:570
+msgid "User has no last notice"
+msgstr "Käyttäjällä ei ole viimeistä päivitystä"
-#: lib/command.php:88
+#: lib/command.php:125
#, fuzzy, php-format
msgid "Could not find a user with nickname %s"
msgstr "Ei voitu päivittää käyttäjälle vahvistettua sähköpostiosoitetta."
-#: lib/command.php:92
+#: lib/command.php:143
+#, fuzzy, php-format
+msgid "Could not find a local user with nickname %s"
+msgstr "Ei voitu päivittää käyttäjälle vahvistettua sähköpostiosoitetta."
+
+#: lib/command.php:176
+msgid "Sorry, this command is not yet implemented."
+msgstr "Valitettavasti tätä komentoa ei ole vielä toteutettu."
+
+#: lib/command.php:221
msgid "It does not make a lot of sense to nudge yourself!"
msgstr ""
-#: lib/command.php:99
+#: lib/command.php:228
#, fuzzy, php-format
msgid "Nudge sent to %s"
msgstr "Tönäisy lähetetty"
-#: lib/command.php:126
+#: lib/command.php:254
#, php-format
msgid ""
"Subscriptions: %1$s\n"
@@ -5275,203 +5302,201 @@ msgid ""
"Notices: %3$s"
msgstr ""
-#: lib/command.php:152 lib/command.php:390 lib/command.php:451
-#, fuzzy
-msgid "Notice with that id does not exist"
-msgstr "Ei profiilia tuolla id:llä."
-
-#: lib/command.php:168 lib/command.php:406 lib/command.php:467
-#: lib/command.php:523
-msgid "User has no last notice"
-msgstr "Käyttäjällä ei ole viimeistä päivitystä"
-
-#: lib/command.php:190
+#: lib/command.php:296
msgid "Notice marked as fave."
msgstr "Päivitys on merkitty suosikiksi."
-#: lib/command.php:217
+#: lib/command.php:317
msgid "You are already a member of that group"
msgstr "Sinä kuulut jo tähän ryhmään."
-#: lib/command.php:231
+#: lib/command.php:331
#, php-format
msgid "Could not join user %s to group %s"
msgstr "Käyttäjä %s ei voinut liittyä ryhmään %s."
-#: lib/command.php:236
+#: lib/command.php:336
#, php-format
msgid "%s joined group %s"
msgstr "%s liittyi ryhmään %s"
-#: lib/command.php:275
+#: lib/command.php:373
#, php-format
msgid "Could not remove user %s to group %s"
msgstr "Ei voitu poistaa käyttäjää %s ryhmästä %s"
-#: lib/command.php:280
+#: lib/command.php:378
#, php-format
msgid "%s left group %s"
msgstr "%s erosi ryhmästä %s"
-#: lib/command.php:309
+#: lib/command.php:401
#, php-format
msgid "Fullname: %s"
msgstr "Koko nimi: %s"
-#: lib/command.php:312 lib/mail.php:258
+#: lib/command.php:404 lib/mail.php:258
#, php-format
msgid "Location: %s"
msgstr "Kotipaikka: %s"
-#: lib/command.php:315 lib/mail.php:260
+#: lib/command.php:407 lib/mail.php:260
#, php-format
msgid "Homepage: %s"
msgstr "Kotisivu: %s"
-#: lib/command.php:318
+#: lib/command.php:410
#, php-format
msgid "About: %s"
msgstr "Tietoa: %s"
-#: lib/command.php:349
+#: lib/command.php:437
+#, php-format
+msgid ""
+"%s is a remote profile; you can only send direct messages to users on the "
+"same server."
+msgstr ""
+
+#: lib/command.php:450
#, fuzzy, php-format
msgid "Message too long - maximum is %d characters, you sent %d"
msgstr "Viesti oli liian pitkä - maksimikoko on 140 merkkiä, lähetit %d"
-#: lib/command.php:367
+#: lib/command.php:468
#, php-format
msgid "Direct message to %s sent"
msgstr "Suora viesti käyttäjälle %s lähetetty"
-#: lib/command.php:369
+#: lib/command.php:470
msgid "Error sending direct message."
msgstr "Tapahtui virhe suoran viestin lähetyksessä."
-#: lib/command.php:413
+#: lib/command.php:490
#, fuzzy
msgid "Cannot repeat your own notice"
msgstr "Ilmoituksia ei voi pistää päälle."
-#: lib/command.php:418
+#: lib/command.php:495
#, fuzzy
msgid "Already repeated that notice"
msgstr "Poista tämä päivitys"
-#: lib/command.php:426
+#: lib/command.php:503
#, fuzzy, php-format
msgid "Notice from %s repeated"
msgstr "Päivitys lähetetty"
-#: lib/command.php:428
+#: lib/command.php:505
#, fuzzy
msgid "Error repeating notice."
msgstr "Ongelma päivityksen tallentamisessa."
-#: lib/command.php:482
+#: lib/command.php:536
#, fuzzy, php-format
msgid "Notice too long - maximum is %d characters, you sent %d"
msgstr "Viesti oli liian pitkä - maksimikoko on 140 merkkiä, lähetit %d"
-#: lib/command.php:491
+#: lib/command.php:545
#, fuzzy, php-format
msgid "Reply to %s sent"
msgstr "Vastaa tähän päivitykseen"
-#: lib/command.php:493
+#: lib/command.php:547
#, fuzzy
msgid "Error saving notice."
msgstr "Ongelma päivityksen tallentamisessa."
-#: lib/command.php:547
+#: lib/command.php:594
msgid "Specify the name of the user to subscribe to"
msgstr "Anna käyttäjätunnus, jonka päivitykset haluat tilata"
-#: lib/command.php:554 lib/command.php:589
-msgid "No such user"
-msgstr "Käyttäjää ei ole."
+#: lib/command.php:602
+#, fuzzy
+msgid "Can't subscribe to OMB profiles by command."
+msgstr "Et ole tilannut tämän käyttäjän päivityksiä."
-#: lib/command.php:561
+#: lib/command.php:608
#, php-format
msgid "Subscribed to %s"
msgstr "Käyttäjän %s päivitykset tilattu"
-#: lib/command.php:582 lib/command.php:685
+#: lib/command.php:629 lib/command.php:728
msgid "Specify the name of the user to unsubscribe from"
msgstr "Anna käyttäjätunnus, jonka päivityksien tilauksen haluat lopettaa"
-#: lib/command.php:595
+#: lib/command.php:638
#, php-format
msgid "Unsubscribed from %s"
msgstr "Käyttäjän %s päivitysten tilaus lopetettu"
-#: lib/command.php:613 lib/command.php:636
+#: lib/command.php:656 lib/command.php:679
msgid "Command not yet implemented."
msgstr "Komentoa ei ole vielä toteutettu."
-#: lib/command.php:616
+#: lib/command.php:659
msgid "Notification off."
msgstr "Ilmoitukset pois päältä."
-#: lib/command.php:618
+#: lib/command.php:661
msgid "Can't turn off notification."
msgstr "Ilmoituksia ei voi pistää pois päältä."
-#: lib/command.php:639
+#: lib/command.php:682
msgid "Notification on."
msgstr "Ilmoitukset päällä."
-#: lib/command.php:641
+#: lib/command.php:684
msgid "Can't turn on notification."
msgstr "Ilmoituksia ei voi pistää päälle."
-#: lib/command.php:654
+#: lib/command.php:697
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:665
+#: lib/command.php:708
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:692
+#: lib/command.php:735
#, fuzzy, php-format
msgid "Unsubscribed %s"
msgstr "Käyttäjän %s päivitysten tilaus lopetettu"
-#: lib/command.php:709
+#: lib/command.php:752
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "Et ole tilannut tämän käyttäjän päivityksiä."
-#: lib/command.php:711
+#: lib/command.php:754
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Olet jos tilannut seuraavien käyttäjien päivitykset:"
msgstr[1] "Olet jos tilannut seuraavien käyttäjien päivitykset:"
-#: lib/command.php:731
+#: lib/command.php:774
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Toista ei voitu asettaa tilaamaan sinua."
-#: lib/command.php:733
+#: lib/command.php:776
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Toista ei voitu asettaa tilaamaan sinua."
msgstr[1] "Toista ei voitu asettaa tilaamaan sinua."
-#: lib/command.php:753
+#: lib/command.php:796
#, fuzzy
msgid "You are not a member of any groups."
msgstr "Sinä et kuulu tähän ryhmään."
-#: lib/command.php:755
+#: lib/command.php:798
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Sinä et kuulu tähän ryhmään."
msgstr[1] "Sinä et kuulu tähän ryhmään."
-#: lib/command.php:769
+#: lib/command.php:812
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5513,20 +5538,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:148
+#: lib/common.php:135
#, fuzzy
msgid "No configuration file found. "
msgstr "Varmistuskoodia ei ole annettu."
-#: lib/common.php:149
+#: lib/common.php:136
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:151
+#: lib/common.php:138
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:152
+#: lib/common.php:139
#, fuzzy
msgid "Go to the installer."
msgstr "Kirjaudu sisään palveluun"
@@ -5709,49 +5734,49 @@ msgstr "Tagit ryhmän %s päivityksissä"
msgid "This page is not available in a media type you accept"
msgstr "Tämä sivu ei ole saatavilla sinulle sopivassa mediatyypissä."
-#: lib/imagefile.php:75
+#: lib/imagefile.php:72
+msgid "Unsupported image file format."
+msgstr "Kuvatiedoston formaattia ei ole tuettu."
+
+#: lib/imagefile.php:88
#, fuzzy, php-format
msgid "That file is too big. The maximum file size is %s."
msgstr "Voit ladata ryhmälle logon."
-#: lib/imagefile.php:80
+#: lib/imagefile.php:93
msgid "Partial upload."
msgstr "Osittain ladattu palvelimelle."
-#: lib/imagefile.php:88 lib/mediafile.php:170
+#: lib/imagefile.php:101 lib/mediafile.php:170
msgid "System error uploading file."
msgstr "Tiedoston lähetyksessä tapahtui järjestelmävirhe."
-#: lib/imagefile.php:96
+#: lib/imagefile.php:109
msgid "Not an image or corrupt file."
msgstr "Tuo ei ole kelvollinen kuva tai tiedosto on rikkoutunut."
-#: lib/imagefile.php:109
-msgid "Unsupported image file format."
-msgstr "Kuvatiedoston formaattia ei ole tuettu."
-
#: lib/imagefile.php:122
msgid "Lost our file."
msgstr "Tiedosto hävisi."
-#: lib/imagefile.php:166 lib/imagefile.php:231
+#: lib/imagefile.php:163 lib/imagefile.php:224
msgid "Unknown file type"
msgstr "Tunnistamaton tiedoston tyyppi"
-#: lib/imagefile.php:251
+#: lib/imagefile.php:244
msgid "MB"
msgstr ""
-#: lib/imagefile.php:253
+#: lib/imagefile.php:246
msgid "kB"
msgstr ""
-#: lib/jabber.php:220
+#: lib/jabber.php:387
#, php-format
msgid "[%s]"
msgstr ""
-#: lib/jabber.php:400
+#: lib/jabber.php:567
#, php-format
msgid "Unknown inbox source %d."
msgstr ""
@@ -5966,7 +5991,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:482
+#: lib/mailbox.php:227 lib/noticelist.php:486
#, fuzzy
msgid "from"
msgstr " lähteestä "
@@ -6096,51 +6121,51 @@ msgid ""
"try again later"
msgstr ""
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr ""
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
#, fuzzy
msgid "N"
msgstr "Ei"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "S"
msgstr ""
-#: lib/noticelist.php:431
+#: lib/noticelist.php:432
msgid "E"
msgstr ""
-#: lib/noticelist.php:431
+#: lib/noticelist.php:432
msgid "W"
msgstr ""
-#: lib/noticelist.php:438
+#: lib/noticelist.php:439
msgid "at"
msgstr ""
-#: lib/noticelist.php:566
+#: lib/noticelist.php:570
#, fuzzy
msgid "in context"
msgstr "Ei sisältöä!"
-#: lib/noticelist.php:601
+#: lib/noticelist.php:605
#, fuzzy
msgid "Repeated by"
msgstr "Luotu"
-#: lib/noticelist.php:628
+#: lib/noticelist.php:632
msgid "Reply to this notice"
msgstr "Vastaa tähän päivitykseen"
-#: lib/noticelist.php:629
+#: lib/noticelist.php:633
msgid "Reply"
msgstr "Vastaus"
-#: lib/noticelist.php:673
+#: lib/noticelist.php:677
#, fuzzy
msgid "Notice repeated"
msgstr "Päivitys on poistettu."
@@ -6216,7 +6241,7 @@ msgstr "Tagit käyttäjän %s päivityksissä"
msgid "Unknown"
msgstr "Tuntematon toiminto"
-#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr "Tilaukset"
@@ -6224,7 +6249,7 @@ msgstr "Tilaukset"
msgid "All subscriptions"
msgstr "Kaikki tilaukset"
-#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90
+#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr "Tilaajat"
@@ -6232,16 +6257,21 @@ msgstr "Tilaajat"
msgid "All subscribers"
msgstr "Kaikki tilaajat"
-#: lib/profileaction.php:180
+#: lib/profileaction.php:186
#, fuzzy
msgid "User ID"
msgstr "Käyttäjä"
-#: lib/profileaction.php:185
+#: lib/profileaction.php:191
msgid "Member since"
msgstr "Käyttäjänä alkaen"
-#: lib/profileaction.php:247
+#. TRANS: Average count of posts made per day since account registration
+#: lib/profileaction.php:230
+msgid "Daily average"
+msgstr ""
+
+#: lib/profileaction.php:259
msgid "All groups"
msgstr "Kaikki ryhmät"
@@ -6289,7 +6319,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:671
+#: lib/router.php:704
msgid "No single user defined for single-user mode."
msgstr ""
@@ -6423,93 +6453,102 @@ msgstr "Peruuta tämän käyttäjän tilaus"
msgid "Unsubscribe"
msgstr "Peruuta tilaus"
-#: lib/userprofile.php:116
+#: lib/usernoprofileexception.php:58
+#, fuzzy, php-format
+msgid "User %s (%d) has no profile record."
+msgstr "Käyttäjällä ei ole profiilia."
+
+#: lib/userprofile.php:117
#, fuzzy
msgid "Edit Avatar"
msgstr "Kuva"
-#: lib/userprofile.php:236
+#: lib/userprofile.php:234 lib/userprofile.php:248
msgid "User actions"
msgstr "Käyttäjän toiminnot"
-#: lib/userprofile.php:251
+#: lib/userprofile.php:237
+msgid "User deletion in progress..."
+msgstr ""
+
+#: lib/userprofile.php:263
#, fuzzy
msgid "Edit profile settings"
msgstr "Profiiliasetukset"
-#: lib/userprofile.php:252
+#: lib/userprofile.php:264
msgid "Edit"
msgstr ""
-#: lib/userprofile.php:275
+#: lib/userprofile.php:287
msgid "Send a direct message to this user"
msgstr "Lähetä suora viesti tälle käyttäjälle"
-#: lib/userprofile.php:276
+#: lib/userprofile.php:288
msgid "Message"
msgstr "Viesti"
-#: lib/userprofile.php:314
+#: lib/userprofile.php:326
msgid "Moderate"
msgstr ""
-#: lib/userprofile.php:352
+#: lib/userprofile.php:364
#, fuzzy
msgid "User role"
msgstr "Käyttäjän profiili"
-#: lib/userprofile.php:354
+#: lib/userprofile.php:366
#, fuzzy
msgctxt "role"
msgid "Administrator"
msgstr "Ylläpitäjät"
-#: lib/userprofile.php:355
+#: lib/userprofile.php:367
msgctxt "role"
msgid "Moderator"
msgstr ""
-#: lib/util.php:1015
+#: lib/util.php:1046
msgid "a few seconds ago"
msgstr "muutama sekunti sitten"
-#: lib/util.php:1017
+#: lib/util.php:1048
msgid "about a minute ago"
msgstr "noin minuutti sitten"
-#: lib/util.php:1019
+#: lib/util.php:1050
#, php-format
msgid "about %d minutes ago"
msgstr "noin %d minuuttia sitten"
-#: lib/util.php:1021
+#: lib/util.php:1052
msgid "about an hour ago"
msgstr "noin tunti sitten"
-#: lib/util.php:1023
+#: lib/util.php:1054
#, php-format
msgid "about %d hours ago"
msgstr "noin %d tuntia sitten"
-#: lib/util.php:1025
+#: lib/util.php:1056
msgid "about a day ago"
msgstr "noin päivä sitten"
-#: lib/util.php:1027
+#: lib/util.php:1058
#, php-format
msgid "about %d days ago"
msgstr "noin %d päivää sitten"
-#: lib/util.php:1029
+#: lib/util.php:1060
msgid "about a month ago"
msgstr "noin kuukausi sitten"
-#: lib/util.php:1031
+#: lib/util.php:1062
#, php-format
msgid "about %d months ago"
msgstr "noin %d kuukautta sitten"
-#: lib/util.php:1033
+#: lib/util.php:1064
msgid "about a year ago"
msgstr "noin vuosi sitten"
@@ -6523,7 +6562,7 @@ msgstr "Kotisivun verkko-osoite ei ole toimiva."
msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr ""
-#: lib/xmppmanager.php:402
+#: lib/xmppmanager.php:403
#, fuzzy, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d."
msgstr "Viesti oli liian pitkä - maksimikoko on 140 merkkiä, lähetit %d"
diff --git a/locale/fr/LC_MESSAGES/statusnet.po b/locale/fr/LC_MESSAGES/statusnet.po
index 4c9429e21..edf0f6707 100644
--- a/locale/fr/LC_MESSAGES/statusnet.po
+++ b/locale/fr/LC_MESSAGES/statusnet.po
@@ -14,12 +14,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-06 23:49+0000\n"
-"PO-Revision-Date: 2010-03-06 23:49:51+0000\n"
+"POT-Creation-Date: 2010-04-06 22:53+0000\n"
+"PO-Revision-Date: 2010-04-06 22:54:27+0000\n"
"Language-Team: French\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64665); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: fr\n"
"X-Message-Group: out-statusnet\n"
@@ -96,9 +96,9 @@ msgstr "Page non trouvée"
#: 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:90
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78
+#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
@@ -107,10 +107,8 @@ msgstr "Page non trouvée"
#: actions/remotesubscribe.php:154 actions/replies.php:73
#: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:163 lib/command.php:302
-#: lib/command.php:355 lib/command.php:401 lib/command.php:462
-#: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82
-#: lib/profileaction.php:77
+#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: lib/mailbox.php:82 lib/profileaction.php:77
msgid "No such user."
msgstr "Utilisateur non trouvé."
@@ -206,18 +204,18 @@ msgstr "Statuts de %1$s et ses amis dans %2$s!"
#: 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:132
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:136
#: actions/apigrouplistall.php:120 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:135
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
-#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184
-#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148
+#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:174
+#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173
+#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
-#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
+#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
msgid "API method not found."
msgstr "Méthode API non trouvée !"
@@ -230,8 +228,8 @@ msgstr "Méthode API non trouvée !"
#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65
-#: actions/apistatusesupdate.php:118
+#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
msgid "This method requires a POST."
msgstr "Ce processus requiert un POST."
@@ -262,7 +260,7 @@ msgid "Could not save profile."
msgstr "Impossible d’enregistrer le profil."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:97
+#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
#: actions/designadminpanel.php:122 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
@@ -350,7 +348,7 @@ msgstr "Aucun statut trouvé avec cet identifiant. "
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:176
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
msgid "Could not create favorite."
msgstr "Impossible de créer le favori."
@@ -469,7 +467,7 @@ msgstr "Groupe non trouvé !"
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:221
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
msgid "You have been blocked from that group by the admin."
msgstr "Vous avez été bloqué de ce groupe par l’administrateur."
@@ -487,11 +485,18 @@ msgstr "Vous n’êtes pas membre de ce groupe."
msgid "Could not remove user %1$s from group %2$s."
msgstr "Impossible de retirer l’utilisateur %1$s du groupe %2$s."
-#: actions/apigrouplist.php:95
+#. TRANS: %s is a user name
+#: actions/apigrouplist.php:97
#, 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
+#, php-format
+msgid "%1$s groups %2$s is a member of."
+msgstr "Groupes de %1$s dont %2$s est membre."
+
#: actions/apigrouplistall.php:90 actions/usergroups.php:62
#, php-format
msgid "%s groups"
@@ -519,7 +524,7 @@ msgstr "Jeton incorrect."
#: 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:337
+#: actions/profilesettings.php:194 actions/recoverpassword.php:350
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
@@ -589,15 +594,15 @@ msgstr ""
"devriez donner l’accès à votre compte %4$s qu’aux tiers à qui vous faites "
"confiance."
-#: actions/apioauthauthorize.php:310 lib/action.php:438
+#: actions/apioauthauthorize.php:310 lib/action.php:437
msgid "Account"
msgstr "Compte"
#: actions/apioauthauthorize.php:313 actions/login.php:230
#: actions/profilesettings.php:106 actions/register.php:424
-#: actions/showgroup.php:244 actions/tagother.php:94
+#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
-#: lib/userprofile.php:131
+#: lib/userprofile.php:132
msgid "Nickname"
msgstr "Pseudo"
@@ -668,12 +673,12 @@ msgstr ""
msgid "Unsupported format."
msgstr "Format non supporté."
-#: actions/apitimelinefavorites.php:108
+#: actions/apitimelinefavorites.php:109
#, php-format
msgid "%1$s / Favorites from %2$s"
msgstr "%1$s / Favoris de %2$s"
-#: actions/apitimelinefavorites.php:117
+#: actions/apitimelinefavorites.php:118
#, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "%1$s statuts favoris de %2$s / %2$s."
@@ -683,7 +688,7 @@ msgstr "%1$s statuts favoris de %2$s / %2$s."
msgid "%1$s / Updates mentioning %2$s"
msgstr "%1$s / Mises à jour mentionnant %2$s"
-#: actions/apitimelinementions.php:127
+#: actions/apitimelinementions.php:130
#, 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."
@@ -693,7 +698,7 @@ msgstr "%1$s statuts en réponses aux statuts de %2$s / %3$s."
msgid "%s public timeline"
msgstr "Activité publique %s"
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "%s statuts de tout le monde !"
@@ -708,12 +713,12 @@ msgstr "Repris pour %s"
msgid "Repeats of %s"
msgstr "Reprises de %s"
-#: actions/apitimelinetag.php:102 actions/tag.php:67
+#: actions/apitimelinetag.php:104 actions/tag.php:67
#, php-format
msgid "Notices tagged with %s"
msgstr "Avis marqués avec %s"
-#: actions/apitimelinetag.php:104 actions/tagrss.php:65
+#: actions/apitimelinetag.php:106 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 !"
@@ -741,7 +746,7 @@ msgstr "Aucune taille"
msgid "Invalid size."
msgstr "Taille incorrecte."
-#: actions/avatarsettings.php:67 actions/showgroup.php:229
+#: actions/avatarsettings.php:67 actions/showgroup.php:230
#: lib/accountsettingsaction.php:112
msgid "Avatar"
msgstr "Avatar"
@@ -775,7 +780,7 @@ msgid "Preview"
msgstr "Aperçu"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:655
+#: lib/deleteuserform.php:66 lib/noticelist.php:659
msgid "Delete"
msgstr "Supprimer"
@@ -787,23 +792,27 @@ msgstr "Transfert"
msgid "Crop"
msgstr "Recadrer"
-#: actions/avatarsettings.php:328
+#: actions/avatarsettings.php:305
+msgid "No file uploaded."
+msgstr "Aucun fichier n’a été téléversé."
+
+#: actions/avatarsettings.php:332
msgid "Pick a square area of the image to be your avatar"
msgstr "Sélectionnez une zone de forme carrée pour définir votre avatar"
-#: actions/avatarsettings.php:343 actions/grouplogo.php:380
+#: actions/avatarsettings.php:347 actions/grouplogo.php:380
msgid "Lost our file data."
msgstr "Données perdues."
-#: actions/avatarsettings.php:366
+#: actions/avatarsettings.php:370
msgid "Avatar updated."
msgstr "Avatar mis à jour."
-#: actions/avatarsettings.php:369
+#: actions/avatarsettings.php:373
msgid "Failed updating avatar."
msgstr "La mise à jour de l’avatar a échoué."
-#: actions/avatarsettings.php:393
+#: actions/avatarsettings.php:397
msgid "Avatar deleted."
msgstr "Avatar supprimé."
@@ -841,7 +850,7 @@ msgstr "Ne pas bloquer cet utilisateur"
msgid "Yes"
msgstr "Oui"
-#: actions/block.php:144 actions/groupmembers.php:355 lib/blockform.php:80
+#: actions/block.php:144 actions/groupmembers.php:373 lib/blockform.php:80
msgid "Block this user"
msgstr "Bloquer cet utilisateur"
@@ -858,8 +867,8 @@ msgstr "Impossible d’enregistrer les informations de blocage."
#: actions/groupunblock.php:86 actions/joingroup.php:82
#: actions/joingroup.php:93 actions/leavegroup.php:82
#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212
-#: lib/command.php:260
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162
+#: lib/command.php:358
msgid "No such group."
msgstr "Aucun groupe trouvé."
@@ -941,7 +950,7 @@ msgid "Conversation"
msgstr "Conversation"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:218 lib/searchgroupnav.php:82
+#: lib/profileaction.php:229 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "Avis"
@@ -960,7 +969,7 @@ msgstr "Vous n’êtes pas le propriétaire de cette application."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1217
+#: lib/action.php:1219
msgid "There was a problem with your session token."
msgstr "Un problème est survenu avec votre jeton de session."
@@ -1021,7 +1030,7 @@ msgstr "Voulez-vous vraiment supprimer cet avis ?"
msgid "Do not delete this notice"
msgstr "Ne pas supprimer cet avis"
-#: actions/deletenotice.php:146 lib/noticelist.php:655
+#: actions/deletenotice.php:146 lib/noticelist.php:659
msgid "Delete this notice"
msgstr "Supprimer cet avis"
@@ -1158,7 +1167,7 @@ msgstr "Revenir aux valeurs par défaut"
#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:208
+#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
#: actions/tagother.php:154 actions/useradminpanel.php:294
#: lib/applicationeditform.php:333 lib/applicationeditform.php:334
#: lib/designsettings.php:256 lib/groupeditform.php:202
@@ -1274,7 +1283,7 @@ msgstr "la description est trop longue (%d caractères maximum)."
msgid "Could not update group."
msgstr "Impossible de mettre à jour le groupe."
-#: actions/editgroup.php:264 classes/User_group.php:493
+#: actions/editgroup.php:264 classes/User_group.php:496
msgid "Could not create aliases."
msgstr "Impossible de créer les alias."
@@ -1604,7 +1613,7 @@ msgstr "Vous ne pouvez pas attribuer des rôles aux utilisateurs sur ce site."
#: actions/grantrole.php:82
msgid "User already has this role."
-msgstr "L'utilisateur a déjà ce rôle."
+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
@@ -1635,7 +1644,7 @@ msgstr "Cet utilisateur est déjà bloqué pour le groupe."
msgid "User is not a member of group."
msgstr "L’utilisateur n’est pas membre du groupe."
-#: actions/groupblock.php:136 actions/groupmembers.php:323
+#: actions/groupblock.php:136 actions/groupmembers.php:341
msgid "Block user from group"
msgstr "Bloquer cet utilisateur du groupe"
@@ -1738,19 +1747,19 @@ msgstr "Liste des utilisateurs inscrits à ce groupe."
msgid "Admin"
msgstr "Administrer"
-#: actions/groupmembers.php:355 lib/blockform.php:69
+#: actions/groupmembers.php:373 lib/blockform.php:69
msgid "Block"
msgstr "Bloquer"
-#: actions/groupmembers.php:450
+#: actions/groupmembers.php:468
msgid "Make user an admin of the group"
msgstr "Faire de cet utilisateur un administrateur du groupe"
-#: actions/groupmembers.php:482
+#: actions/groupmembers.php:500
msgid "Make Admin"
msgstr "Faire un administrateur"
-#: actions/groupmembers.php:482
+#: actions/groupmembers.php:500
msgid "Make this user an admin"
msgstr "Faire de cet utilisateur un administrateur"
@@ -1765,7 +1774,7 @@ msgstr "Activité de %s"
msgid "Updates from members of %1$s on %2$s!"
msgstr "Mises à jour des membres de %1$s dans %2$s !"
-#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232
+#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249
#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr "Groupes"
@@ -1985,7 +1994,7 @@ msgstr "Inviter de nouveaux utilisateurs"
msgid "You are already subscribed to these users:"
msgstr "Vous êtes déjà abonné à ces utilisateurs :"
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
#, php-format
msgid "%1$s (%2$s)"
msgstr "%1$s (%2$s)"
@@ -2118,7 +2127,7 @@ msgstr "%1$s a rejoint le groupe %2$s"
msgid "You must be logged in to leave a group."
msgstr "Vous devez ouvrir une session pour quitter un groupe."
-#: actions/leavegroup.php:100 lib/command.php:265
+#: actions/leavegroup.php:100 lib/command.php:363
msgid "You are not a member of that group."
msgstr "Vous n’êtes pas membre de ce groupe."
@@ -2239,12 +2248,12 @@ msgstr "Remplissez les champs ci-dessous pour créer un nouveau groupe :"
msgid "New message"
msgstr "Nouveau message"
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
msgid "You can't send a message to this user."
msgstr "Vous ne pouvez pas envoyer de messages à cet utilisateur."
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342
-#: lib/command.php:475
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
+#: lib/command.php:529
msgid "No content!"
msgstr "Aucun contenu !"
@@ -2252,7 +2261,7 @@ msgstr "Aucun contenu !"
msgid "No recipient specified."
msgstr "Aucun destinataire n’a été spécifié."
-#: actions/newmessage.php:164 lib/command.php:361
+#: actions/newmessage.php:164 lib/command.php:462
msgid ""
"Don't send a message to yourself; just say it to yourself quietly instead."
msgstr ""
@@ -2267,7 +2276,7 @@ msgstr "Message envoyé"
msgid "Direct message to %s sent."
msgstr "Message direct envoyé à %s."
-#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189
msgid "Ajax Error"
msgstr "Erreur Ajax"
@@ -2275,7 +2284,7 @@ msgstr "Erreur Ajax"
msgid "New notice"
msgstr "Nouvel avis"
-#: actions/newnotice.php:211
+#: actions/newnotice.php:217
msgid "Notice posted"
msgstr "Avis publié"
@@ -2390,7 +2399,7 @@ msgstr ""
msgid "Notice has no profile"
msgstr "L’avis n’a pas de profil"
-#: actions/oembed.php:86 actions/shownotice.php:180
+#: actions/oembed.php:86 actions/shownotice.php:175
#, php-format
msgid "%1$s's status on %2$s"
msgstr "Statut de %1$s sur %2$s"
@@ -2403,8 +2412,8 @@ msgstr "type de contenu "
msgid "Only "
msgstr "Seulement "
-#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042
-#: lib/apiaction.php:1070 lib/apiaction.php:1179
+#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1068
+#: lib/apiaction.php:1096 lib/apiaction.php:1212
msgid "Not a supported data format."
msgstr "Format de données non supporté."
@@ -2536,7 +2545,7 @@ msgstr "Ancien mot de passe incorrect"
msgid "Error saving user; invalid."
msgstr "Erreur lors de l’enregistrement de l’utilisateur ; invalide."
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
msgid "Can't save new password."
msgstr "Impossible de sauvegarder le nouveau mot de passe."
@@ -2711,12 +2720,12 @@ msgstr ""
msgid "People search"
msgstr "Recherche de personnes"
-#: actions/peopletag.php:70
+#: actions/peopletag.php:68
#, php-format
msgid "Not a valid people tag: %s"
msgstr "Cette marque est invalide : %s"
-#: actions/peopletag.php:144
+#: actions/peopletag.php:142
#, php-format
msgid "Users self-tagged with %1$s - page %2$d"
msgstr "Utilisateurs marqués par eux-mêmes avec %1$s - page %2$d"
@@ -2752,8 +2761,8 @@ 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/showgroup.php:255 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:149
+#: actions/showgroup.php:256 actions/tagother.php:104
+#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Nom complet"
@@ -2780,9 +2789,9 @@ msgid "Bio"
msgstr "Bio"
#: actions/profilesettings.php:132 actions/register.php:471
-#: actions/showgroup.php:264 actions/tagother.php:112
+#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
-#: lib/userprofile.php:164
+#: lib/userprofile.php:165
msgid "Location"
msgstr "Emplacement"
@@ -2796,7 +2805,7 @@ msgstr "Partager ma localisation lorsque je poste des avis"
#: actions/profilesettings.php:145 actions/tagother.php:149
#: actions/tagother.php:209 lib/subscriptionlist.php:106
-#: lib/subscriptionlist.php:108 lib/userprofile.php:209
+#: lib/subscriptionlist.php:108 lib/userprofile.php:210
msgid "Tags"
msgstr "Marques"
@@ -3043,7 +3052,7 @@ msgstr "Réinitialiser le mot de passe"
msgid "Recover password"
msgstr "Récupérer le mot de passe"
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
msgid "Password recovery requested"
msgstr "Récupération de mot de passe demandée"
@@ -3063,19 +3072,19 @@ msgstr "Réinitialiser"
msgid "Enter a nickname or email address."
msgstr "Entrez un pseudo ou une adresse courriel."
-#: actions/recoverpassword.php:272
+#: actions/recoverpassword.php:282
msgid "No user with that email address or username."
msgstr "Aucun utilisateur trouvé avec ce courriel ou ce nom."
-#: actions/recoverpassword.php:287
+#: actions/recoverpassword.php:299
msgid "No registered email address for that user."
msgstr "Aucune adresse courriel enregistrée pour cet utilisateur."
-#: actions/recoverpassword.php:301
+#: actions/recoverpassword.php:313
msgid "Error saving address confirmation."
msgstr "Erreur lors de l’enregistrement de la confirmation du courriel."
-#: actions/recoverpassword.php:325
+#: actions/recoverpassword.php:338
msgid ""
"Instructions for recovering your password have been sent to the email "
"address registered to your account."
@@ -3083,23 +3092,23 @@ msgstr ""
"Les instructions pour récupérer votre mot de passe ont été envoyées à "
"l’adresse courriel indiquée dans votre compte."
-#: actions/recoverpassword.php:344
+#: actions/recoverpassword.php:357
msgid "Unexpected password reset."
msgstr "Réinitialisation inattendue du mot de passe."
-#: actions/recoverpassword.php:352
+#: actions/recoverpassword.php:365
msgid "Password must be 6 chars or more."
msgstr "Le mot de passe doit contenir au moins 6 caractères."
-#: actions/recoverpassword.php:356
+#: actions/recoverpassword.php:369
msgid "Password and confirmation do not match."
msgstr "Le mot de passe et sa confirmation ne correspondent pas."
-#: actions/recoverpassword.php:375 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:248
msgid "Error setting user."
msgstr "Erreur lors de la configuration de l’utilisateur."
-#: actions/recoverpassword.php:382
+#: actions/recoverpassword.php:395
msgid "New password successfully saved. You are now logged in."
msgstr ""
"Nouveau mot de passe créé avec succès. Votre session est maintenant ouverte."
@@ -3267,7 +3276,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "URL de votre profil sur un autre service de micro-blogging compatible"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:394
+#: lib/userprofile.php:406
msgid "Subscribe"
msgstr "S’abonner"
@@ -3304,7 +3313,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:674
+#: actions/repeat.php:114 lib/noticelist.php:678
msgid "Repeated"
msgstr "Repris"
@@ -3450,8 +3459,8 @@ msgstr "Organisation"
msgid "Description"
msgstr "Description"
-#: actions/showapplication.php:192 actions/showgroup.php:438
-#: lib/profileaction.php:176
+#: actions/showapplication.php:192 actions/showgroup.php:444
+#: lib/profileaction.php:187
msgid "Statistics"
msgstr "Statistiques"
@@ -3571,67 +3580,67 @@ msgstr "Groupe %s"
msgid "%1$s group, page %2$d"
msgstr "Groupe %1$s, page %2$d"
-#: actions/showgroup.php:226
+#: actions/showgroup.php:227
msgid "Group profile"
msgstr "Profil du groupe"
-#: actions/showgroup.php:271 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:177
+#: actions/showgroup.php:272 actions/tagother.php:118
+#: actions/userauthorization.php:175 lib/userprofile.php:178
msgid "URL"
msgstr "URL"
-#: actions/showgroup.php:282 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:194
+#: actions/showgroup.php:283 actions/tagother.php:128
+#: actions/userauthorization.php:187 lib/userprofile.php:195
msgid "Note"
msgstr "Note"
-#: actions/showgroup.php:292 lib/groupeditform.php:184
+#: actions/showgroup.php:293 lib/groupeditform.php:184
msgid "Aliases"
msgstr "Alias"
-#: actions/showgroup.php:301
+#: actions/showgroup.php:302
msgid "Group actions"
msgstr "Actions du groupe"
-#: actions/showgroup.php:337
+#: actions/showgroup.php:338
#, php-format
msgid "Notice feed for %s group (RSS 1.0)"
msgstr "Fil des avis du groupe %s (RSS 1.0)"
-#: actions/showgroup.php:343
+#: actions/showgroup.php:344
#, php-format
msgid "Notice feed for %s group (RSS 2.0)"
msgstr "Fil des avis du groupe %s (RSS 2.0)"
-#: actions/showgroup.php:349
+#: actions/showgroup.php:350
#, php-format
msgid "Notice feed for %s group (Atom)"
msgstr "Fil des avis du groupe %s (Atom)"
-#: actions/showgroup.php:354
+#: actions/showgroup.php:355
#, php-format
msgid "FOAF for %s group"
msgstr "ami d’un ami pour le groupe %s"
-#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91
+#: actions/showgroup.php:393 actions/showgroup.php:453 lib/groupnav.php:91
msgid "Members"
msgstr "Membres"
-#: actions/showgroup.php:395 lib/profileaction.php:117
-#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95
-#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71
+#: actions/showgroup.php:398 lib/profileaction.php:117
+#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95
+#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
msgid "(None)"
msgstr "(aucun)"
-#: actions/showgroup.php:401
+#: actions/showgroup.php:404
msgid "All members"
msgstr "Tous les membres"
-#: actions/showgroup.php:441
+#: actions/showgroup.php:447
msgid "Created"
msgstr "Créé"
-#: actions/showgroup.php:457
+#: actions/showgroup.php:463
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3647,7 +3656,7 @@ msgstr ""
"action.register%%%%) pour devenir membre de ce groupe et bien plus ! ([En "
"lire plus](%%%%doc.help%%%%))"
-#: actions/showgroup.php:463
+#: actions/showgroup.php:469
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3660,7 +3669,7 @@ msgstr ""
"logiciel libre [StatusNet](http://status.net/). Ses membres partagent des "
"messages courts à propos de leur vie et leurs intérêts. "
-#: actions/showgroup.php:491
+#: actions/showgroup.php:497
msgid "Admins"
msgstr "Administrateurs"
@@ -3802,8 +3811,8 @@ msgid "Unknown language \"%s\"."
msgstr "Langue « %s » inconnue."
#: actions/siteadminpanel.php:165
-msgid "Minimum text limit is 140 characters."
-msgstr "La limite minimale de texte est de 140 caractères."
+msgid "Minimum text limit is 0 (unlimited)."
+msgstr "La limite minimale de texte est de 0 caractères (illimité)."
#: actions/siteadminpanel.php:171
msgid "Dupe limit must 1 or more seconds."
@@ -4079,8 +4088,7 @@ msgstr "Sauvegarder les paramètres des instantanés"
msgid "You are not subscribed to that profile."
msgstr "Vous n’êtes pas abonné(e) à ce profil."
-#: actions/subedit.php:83 classes/Subscription.php:89
-#: classes/Subscription.php:116
+#: actions/subedit.php:83 classes/Subscription.php:132
msgid "Could not save subscription."
msgstr "Impossible d’enregistrer l’abonnement."
@@ -4183,11 +4191,11 @@ msgstr ""
msgid "%s is not listening to anyone."
msgstr "%s ne suit actuellement personne."
-#: actions/subscriptions.php:199
+#: actions/subscriptions.php:208
msgid "Jabber"
msgstr "Jabber"
-#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:222 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr "SMS"
@@ -4220,12 +4228,12 @@ msgstr "Aucun argument d’identifiant."
msgid "Tag %s"
msgstr "Marque %s"
-#: actions/tagother.php:77 lib/userprofile.php:75
+#: actions/tagother.php:77 lib/userprofile.php:76
msgid "User profile"
msgstr "Profil de l’utilisateur"
#: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:102
+#: lib/userprofile.php:103
msgid "Photo"
msgstr "Photo"
@@ -4564,7 +4572,7 @@ msgstr ""
msgid "Plugins"
msgstr "Extensions"
-#: actions/version.php:196 lib/action.php:767
+#: actions/version.php:196 lib/action.php:766
msgid "Version"
msgstr "Version"
@@ -4572,7 +4580,7 @@ msgstr "Version"
msgid "Author(s)"
msgstr "Auteur(s)"
-#: classes/File.php:144
+#: classes/File.php:169
#, php-format
msgid ""
"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
@@ -4581,12 +4589,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:154
+#: classes/File.php:179
#, 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:161
+#: classes/File.php:186
#, 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."
@@ -4624,27 +4632,27 @@ msgstr "Impossible d’insérer le message."
msgid "Could not update message with new URI."
msgstr "Impossible de mettre à jour le message avec un nouvel URI."
-#: classes/Notice.php:172
+#: classes/Notice.php:175
#, php-format
msgid "DB error inserting hashtag: %s"
msgstr "Erreur de base de donnée en insérant la marque (hashtag) : %s"
-#: classes/Notice.php:241
+#: classes/Notice.php:244
msgid "Problem saving notice. Too long."
msgstr "Problème lors de l’enregistrement de l’avis ; trop long."
-#: classes/Notice.php:245
+#: classes/Notice.php:248
msgid "Problem saving notice. Unknown user."
msgstr "Erreur lors de l’enregistrement de l’avis. Utilisateur inconnu."
-#: classes/Notice.php:250
+#: classes/Notice.php:253
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:256
+#: classes/Notice.php:259
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
@@ -4652,69 +4660,69 @@ msgstr ""
"Trop de messages en double trop vite ! Prenez une pause et publiez à nouveau "
"dans quelques minutes."
-#: classes/Notice.php:262
+#: classes/Notice.php:265
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:328 classes/Notice.php:354
+#: classes/Notice.php:331 classes/Notice.php:357
msgid "Problem saving notice."
msgstr "Problème lors de l’enregistrement de l’avis."
-#: classes/Notice.php:927
+#: classes/Notice.php:943
msgid "Problem saving group inbox."
msgstr "Problème lors de l’enregistrement de la boîte de réception du groupe."
-#: classes/Notice.php:1459
+#: classes/Notice.php:1481
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
-#: classes/Subscription.php:66 lib/oauthstore.php:465
+#: classes/Subscription.php:74 lib/oauthstore.php:465
msgid "You have been banned from subscribing."
msgstr "Il vous avez été interdit de vous abonner."
-#: classes/Subscription.php:70
+#: classes/Subscription.php:78
msgid "Already subscribed!"
msgstr "Déjà abonné !"
-#: classes/Subscription.php:74
+#: classes/Subscription.php:82
msgid "User has blocked you."
msgstr "Cet utilisateur vous a bloqué."
-#: classes/Subscription.php:157
+#: classes/Subscription.php:167
msgid "Not subscribed!"
msgstr "Pas abonné !"
-#: classes/Subscription.php:163
+#: classes/Subscription.php:173
msgid "Couldn't delete self-subscription."
msgstr "Impossible de supprimer l’abonnement à soi-même."
-#: classes/Subscription.php:190
+#: classes/Subscription.php:200
msgid "Couldn't delete subscription OMB token."
msgstr "Impossible de supprimer le jeton OMB de l'abonnement ."
-#: classes/Subscription.php:201 lib/subs.php:69
+#: classes/Subscription.php:211
msgid "Couldn't delete subscription."
msgstr "Impossible de cesser l’abonnement"
-#: classes/User.php:373
+#: classes/User.php:363
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Bienvenue à %1$s, @%2$s !"
-#: classes/User_group.php:477
+#: classes/User_group.php:480
msgid "Could not create group."
msgstr "Impossible de créer le groupe."
-#: classes/User_group.php:486
+#: classes/User_group.php:489
msgid "Could not set group URI."
msgstr "Impossible de définir l'URI du groupe."
-#: classes/User_group.php:507
+#: classes/User_group.php:510
msgid "Could not set group membership."
msgstr "Impossible d’établir l’inscription au groupe."
-#: classes/User_group.php:521
+#: classes/User_group.php:524
msgid "Could not save local group info."
msgstr "Impossible d’enregistrer les informations du groupe local."
@@ -4755,170 +4763,170 @@ msgstr "%1$s - %2$s"
msgid "Untitled page"
msgstr "Page sans nom"
-#: lib/action.php:424
+#: lib/action.php:423
msgid "Primary site navigation"
msgstr "Navigation primaire du site"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:430
+#: lib/action.php:429
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr "Profil personnel et flux des amis"
-#: lib/action.php:433
+#: lib/action.php:432
msgctxt "MENU"
msgid "Personal"
msgstr "Personnel"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:435
+#: lib/action.php:434
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "Modifier votre adresse électronique, avatar, mot de passe, profil"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:440
+#: lib/action.php:439
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "Se connecter aux services"
-#: lib/action.php:443
+#: lib/action.php:442
msgid "Connect"
msgstr "Connecter"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:446
+#: lib/action.php:445
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "Modifier la configuration du site"
-#: lib/action.php:449
+#: lib/action.php:448
msgctxt "MENU"
msgid "Admin"
msgstr "Administrer"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:453
+#: lib/action.php:452
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "Inviter des amis et collègues à vous rejoindre sur %s"
-#: lib/action.php:456
+#: lib/action.php:455
msgctxt "MENU"
msgid "Invite"
msgstr "Inviter"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:462
+#: lib/action.php:461
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "Fermer la session"
-#: lib/action.php:465
+#: lib/action.php:464
msgctxt "MENU"
msgid "Logout"
msgstr "Déconnexion"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:470
+#: lib/action.php:469
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Créer un compte"
-#: lib/action.php:473
+#: lib/action.php:472
msgctxt "MENU"
msgid "Register"
msgstr "S'inscrire"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:476
+#: lib/action.php:475
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Ouvrir une session"
-#: lib/action.php:479
+#: lib/action.php:478
msgctxt "MENU"
msgid "Login"
msgstr "Connexion"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:482
+#: lib/action.php:481
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "À l’aide !"
-#: lib/action.php:485
+#: lib/action.php:484
msgctxt "MENU"
msgid "Help"
msgstr "Aide"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:488
+#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "Rechercher des personnes ou du texte"
-#: lib/action.php:491
+#: lib/action.php:490
msgctxt "MENU"
msgid "Search"
msgstr "Rechercher"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:513 lib/adminpanelaction.php:398
+#: lib/action.php:512 lib/adminpanelaction.php:398
msgid "Site notice"
msgstr "Notice du site"
-#: lib/action.php:579
+#: lib/action.php:578
msgid "Local views"
msgstr "Vues locales"
-#: lib/action.php:645
+#: lib/action.php:644
msgid "Page notice"
msgstr "Avis de la page"
-#: lib/action.php:747
+#: lib/action.php:746
msgid "Secondary site navigation"
msgstr "Navigation secondaire du site"
-#: lib/action.php:752
+#: lib/action.php:751
msgid "Help"
msgstr "Aide"
-#: lib/action.php:754
+#: lib/action.php:753
msgid "About"
msgstr "À propos"
-#: lib/action.php:756
+#: lib/action.php:755
msgid "FAQ"
msgstr "FAQ"
-#: lib/action.php:760
+#: lib/action.php:759
msgid "TOS"
msgstr "CGU"
-#: lib/action.php:763
+#: lib/action.php:762
msgid "Privacy"
msgstr "Confidentialité"
-#: lib/action.php:765
+#: lib/action.php:764
msgid "Source"
msgstr "Source"
-#: lib/action.php:769
+#: lib/action.php:768
msgid "Contact"
msgstr "Contact"
-#: lib/action.php:771
+#: lib/action.php:770
msgid "Badge"
msgstr "Insigne"
-#: lib/action.php:799
+#: lib/action.php:798
msgid "StatusNet software license"
msgstr "Licence du logiciel StatusNet"
-#: lib/action.php:802
+#: lib/action.php:803
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4927,12 +4935,12 @@ msgstr ""
"**%%site.name%%** est un service de microblogging qui vous est proposé par "
"[%%site.broughtby%%](%%site.broughtbyurl%%)."
-#: lib/action.php:804
+#: lib/action.php:805
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** est un service de micro-blogging."
-#: lib/action.php:806
+#: lib/action.php:808
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4943,57 +4951,61 @@ msgstr ""
"version %s, disponible sous la licence [GNU Affero General Public License] "
"(http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:821
+#: lib/action.php:823
msgid "Site content license"
msgstr "Licence du contenu du site"
-#: lib/action.php:826
+#: lib/action.php:828
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr "Le contenu et les données de %1$s sont privés et confidentiels."
-#: lib/action.php:831
+#: lib/action.php:833
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
"Le contenu et les données sont sous le droit d’auteur de %1$s. Tous droits "
"réservés."
-#: lib/action.php:834
+#: lib/action.php:836
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
"Le contenu et les données sont sous le droit d’auteur du contributeur. Tous "
"droits réservés."
-#: lib/action.php:847
+#: lib/action.php:849
msgid "All "
msgstr "Tous "
-#: lib/action.php:853
+#: lib/action.php:855
msgid "license."
msgstr "licence."
-#: lib/action.php:1152
+#: lib/action.php:1154
msgid "Pagination"
msgstr "Pagination"
-#: lib/action.php:1161
+#: lib/action.php:1163
msgid "After"
msgstr "Après"
-#: lib/action.php:1169
+#: lib/action.php:1171
msgid "Before"
msgstr "Avant"
-#: lib/activity.php:453
+#: lib/activity.php:120
+msgid "Expecting a root feed element but got a whole XML document."
+msgstr "Attendait un élément racine mais a reçu tout un document XML."
+
+#: lib/activityutils.php:208
msgid "Can't handle remote content yet."
msgstr "Impossible de gérer le contenu distant pour le moment."
-#: lib/activity.php:481
+#: lib/activityutils.php:236
msgid "Can't handle embedded XML content yet."
msgstr "Impossible de gérer le contenu XML embarqué pour le moment."
-#: lib/activity.php:485
+#: lib/activityutils.php:240
msgid "Can't handle embedded Base64 content yet."
msgstr "Impossible de gérer le contenu en Base64 embarqué pour le moment."
@@ -5085,7 +5097,7 @@ msgstr ""
"La ressource de l’API a besoin de l’accès en lecture et en écriture, mais "
"vous n’y avez accès qu’en lecture."
-#: lib/apiauth.php:272
+#: lib/apiauth.php:276
#, php-format
msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s"
msgstr ""
@@ -5163,11 +5175,11 @@ msgstr "Révoquer"
msgid "Attachments"
msgstr "Pièces jointes"
-#: lib/attachmentlist.php:265
+#: lib/attachmentlist.php:263
msgid "Author"
msgstr "Auteur"
-#: lib/attachmentlist.php:278
+#: lib/attachmentlist.php:276
msgid "Provider"
msgstr "Fournisseur"
@@ -5187,37 +5199,50 @@ msgstr "La modification du mot de passe a échoué"
msgid "Password changing is not allowed"
msgstr "La modification du mot de passe n’est pas autorisée"
-#: lib/channel.php:138 lib/channel.php:158
+#: lib/channel.php:157 lib/channel.php:177
msgid "Command results"
msgstr "Résultats de la commande"
-#: lib/channel.php:210 lib/mailhandler.php:142
+#: lib/channel.php:229 lib/mailhandler.php:142
msgid "Command complete"
msgstr "Commande complétée"
-#: lib/channel.php:221
+#: lib/channel.php:240
msgid "Command failed"
msgstr "Échec de la commande"
-#: lib/command.php:44
-msgid "Sorry, this command is not yet implemented."
-msgstr "Désolé, cette commande n’a pas encore été implémentée."
+#: lib/command.php:83 lib/command.php:105
+msgid "Notice with that id does not exist"
+msgstr "Aucun avis avec cet identifiant n’existe"
+
+#: lib/command.php:99 lib/command.php:570
+msgid "User has no last notice"
+msgstr "Aucun avis récent pour cet utilisateur"
-#: lib/command.php:88
+#: lib/command.php:125
#, php-format
msgid "Could not find a user with nickname %s"
msgstr "Impossible de trouver un utilisateur avec le pseudo %s"
-#: lib/command.php:92
+#: lib/command.php:143
+#, php-format
+msgid "Could not find a local user with nickname %s"
+msgstr "Impossible de trouver un utilisateur local portant le pseudo %s"
+
+#: lib/command.php:176
+msgid "Sorry, this command is not yet implemented."
+msgstr "Désolé, cette commande n’a pas encore été implémentée."
+
+#: lib/command.php:221
msgid "It does not make a lot of sense to nudge yourself!"
msgstr "Ça n’a pas de sens de se faire un clin d’œil à soi-même !"
-#: lib/command.php:99
+#: lib/command.php:228
#, php-format
msgid "Nudge sent to %s"
msgstr "Clin d’œil envoyé à %s"
-#: lib/command.php:126
+#: lib/command.php:254
#, php-format
msgid ""
"Subscriptions: %1$s\n"
@@ -5228,201 +5253,201 @@ msgstr ""
"Abonnés : %2$s\n"
"Messages : %3$s"
-#: lib/command.php:152 lib/command.php:390 lib/command.php:451
-msgid "Notice with that id does not exist"
-msgstr "Aucun avis avec cet identifiant n’existe"
-
-#: lib/command.php:168 lib/command.php:406 lib/command.php:467
-#: lib/command.php:523
-msgid "User has no last notice"
-msgstr "Aucun avis récent pour cet utilisateur"
-
-#: lib/command.php:190
+#: lib/command.php:296
msgid "Notice marked as fave."
msgstr "Avis ajouté aux favoris."
-#: lib/command.php:217
+#: lib/command.php:317
msgid "You are already a member of that group"
msgstr "Vous êtes déjà membre de ce groupe"
-#: lib/command.php:231
+#: lib/command.php:331
#, php-format
msgid "Could not join user %s to group %s"
msgstr "Impossible d’inscrire l’utilisateur %s au groupe %s"
-#: lib/command.php:236
+#: lib/command.php:336
#, php-format
msgid "%s joined group %s"
msgstr "%s a rejoint le groupe %s"
-#: lib/command.php:275
+#: lib/command.php:373
#, php-format
msgid "Could not remove user %s to group %s"
msgstr "Impossible de retirer l’utilisateur %s du groupe %s"
-#: lib/command.php:280
+#: lib/command.php:378
#, php-format
msgid "%s left group %s"
msgstr "%s a quitté le groupe %s"
-#: lib/command.php:309
+#: lib/command.php:401
#, php-format
msgid "Fullname: %s"
msgstr "Nom complet : %s"
-#: lib/command.php:312 lib/mail.php:258
+#: lib/command.php:404 lib/mail.php:258
#, php-format
msgid "Location: %s"
msgstr "Emplacement : %s"
-#: lib/command.php:315 lib/mail.php:260
+#: lib/command.php:407 lib/mail.php:260
#, php-format
msgid "Homepage: %s"
msgstr "Site Web : %s"
-#: lib/command.php:318
+#: lib/command.php:410
#, php-format
msgid "About: %s"
msgstr "À propos : %s"
-#: lib/command.php:349
+#: lib/command.php:437
+#, php-format
+msgid ""
+"%s is a remote profile; you can only send direct messages to users on the "
+"same server."
+msgstr ""
+"%s est un profil distant ; vous ne pouvez envoyer de messages directs qu'aux "
+"utilisateurs du même serveur."
+
+#: lib/command.php:450
#, php-format
msgid "Message too long - maximum is %d characters, you sent %d"
msgstr ""
"Message trop long ! La taille maximale est de %d caractères ; vous en avez "
"entré %d."
-#: lib/command.php:367
+#: lib/command.php:468
#, php-format
msgid "Direct message to %s sent"
msgstr "Message direct envoyé à %s."
-#: lib/command.php:369
+#: lib/command.php:470
msgid "Error sending direct message."
msgstr "Une erreur est survenue pendant l’envoi de votre message."
-#: lib/command.php:413
+#: lib/command.php:490
msgid "Cannot repeat your own notice"
msgstr "Impossible de reprendre votre propre avis"
-#: lib/command.php:418
+#: lib/command.php:495
msgid "Already repeated that notice"
msgstr "Avis déjà repris"
-#: lib/command.php:426
+#: lib/command.php:503
#, php-format
msgid "Notice from %s repeated"
msgstr "Avis de %s repris"
-#: lib/command.php:428
+#: lib/command.php:505
msgid "Error repeating notice."
msgstr "Erreur lors de la reprise de l’avis."
-#: lib/command.php:482
+#: lib/command.php:536
#, php-format
msgid "Notice too long - maximum is %d characters, you sent %d"
msgstr ""
"Avis trop long ! La taille maximale est de %d caractères ; vous en avez "
"entré %d."
-#: lib/command.php:491
+#: lib/command.php:545
#, php-format
msgid "Reply to %s sent"
msgstr "Réponse à %s envoyée"
-#: lib/command.php:493
+#: lib/command.php:547
msgid "Error saving notice."
msgstr "Problème lors de l’enregistrement de l’avis."
-#: lib/command.php:547
+#: lib/command.php:594
msgid "Specify the name of the user to subscribe to"
msgstr "Indiquez le nom de l’utilisateur auquel vous souhaitez vous abonner"
-#: lib/command.php:554 lib/command.php:589
-msgid "No such user"
-msgstr "Utilisateur non trouvé."
+#: lib/command.php:602
+msgid "Can't subscribe to OMB profiles by command."
+msgstr "Impossible de s'inscrire aux profils OMB par cette commande."
-#: lib/command.php:561
+#: lib/command.php:608
#, php-format
msgid "Subscribed to %s"
msgstr "Abonné à %s"
-#: lib/command.php:582 lib/command.php:685
+#: lib/command.php:629 lib/command.php:728
msgid "Specify the name of the user to unsubscribe from"
msgstr "Indiquez le nom de l’utilisateur duquel vous souhaitez vous désabonner"
-#: lib/command.php:595
+#: lib/command.php:638
#, php-format
msgid "Unsubscribed from %s"
msgstr "Désabonné de %s"
-#: lib/command.php:613 lib/command.php:636
+#: lib/command.php:656 lib/command.php:679
msgid "Command not yet implemented."
msgstr "Cette commande n’a pas encore été implémentée."
-#: lib/command.php:616
+#: lib/command.php:659
msgid "Notification off."
msgstr "Avertissements désactivés."
-#: lib/command.php:618
+#: lib/command.php:661
msgid "Can't turn off notification."
msgstr "Impossible de désactiver les avertissements."
-#: lib/command.php:639
+#: lib/command.php:682
msgid "Notification on."
msgstr "Avertissements activés."
-#: lib/command.php:641
+#: lib/command.php:684
msgid "Can't turn on notification."
msgstr "Impossible d’activer les avertissements."
-#: lib/command.php:654
+#: lib/command.php:697
msgid "Login command is disabled"
msgstr "La commande d’ouverture de session est désactivée"
-#: lib/command.php:665
+#: lib/command.php:708
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
"Ce lien n’est utilisable qu’une seule fois, et est valable uniquement "
"pendant 2 minutes : %s"
-#: lib/command.php:692
+#: lib/command.php:735
#, php-format
msgid "Unsubscribed %s"
msgstr "Désabonné de %s"
-#: lib/command.php:709
+#: lib/command.php:752
msgid "You are not subscribed to anyone."
msgstr "Vous n’êtes abonné(e) à personne."
-#: lib/command.php:711
+#: lib/command.php:754
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Vous êtes abonné à cette personne :"
msgstr[1] "Vous êtes abonné à ces personnes :"
-#: lib/command.php:731
+#: lib/command.php:774
msgid "No one is subscribed to you."
msgstr "Personne ne s’est abonné à vous."
-#: lib/command.php:733
+#: lib/command.php:776
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Cette personne est abonnée à vous :"
msgstr[1] "Ces personnes sont abonnées à vous :"
-#: lib/command.php:753
+#: lib/command.php:796
msgid "You are not a member of any groups."
msgstr "Vous n’êtes membre d’aucun groupe."
-#: lib/command.php:755
+#: lib/command.php:798
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Vous êtes membre de ce groupe :"
msgstr[1] "Vous êtes membre de ces groupes :"
-#: lib/command.php:769
+#: lib/command.php:812
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5503,20 +5528,20 @@ msgstr ""
"tracks - pas encore implémenté.\n"
"tracking - pas encore implémenté.\n"
-#: lib/common.php:148
+#: lib/common.php:135
msgid "No configuration file found. "
msgstr "Aucun fichier de configuration n’a été trouvé. "
-#: lib/common.php:149
+#: lib/common.php:136
msgid "I looked for configuration files in the following places: "
msgstr ""
"J’ai cherché des fichiers de configuration dans les emplacements suivants : "
-#: lib/common.php:151
+#: lib/common.php:138
msgid "You may wish to run the installer to fix this."
msgstr "Vous pouvez essayer de lancer l’installeur pour régler ce problème."
-#: lib/common.php:152
+#: lib/common.php:139
msgid "Go to the installer."
msgstr "Aller au programme d’installation"
@@ -5697,49 +5722,49 @@ msgid "This page is not available in a media type you accept"
msgstr ""
"Cette page n’est pas disponible dans un des formats que vous avez autorisés."
-#: lib/imagefile.php:75
+#: lib/imagefile.php:72
+msgid "Unsupported image file format."
+msgstr "Format de fichier d’image non supporté."
+
+#: lib/imagefile.php:88
#, php-format
msgid "That file is too big. The maximum file size is %s."
msgstr "Ce fichier est trop grand. La taille maximale est %s."
-#: lib/imagefile.php:80
+#: lib/imagefile.php:93
msgid "Partial upload."
msgstr "Transfert partiel."
-#: lib/imagefile.php:88 lib/mediafile.php:170
+#: lib/imagefile.php:101 lib/mediafile.php:170
msgid "System error uploading file."
msgstr "Erreur système lors du transfert du fichier."
-#: lib/imagefile.php:96
+#: lib/imagefile.php:109
msgid "Not an image or corrupt file."
msgstr "Ceci n’est pas une image, ou c’est un fichier corrompu."
-#: lib/imagefile.php:109
-msgid "Unsupported image file format."
-msgstr "Format de fichier d’image non supporté."
-
#: lib/imagefile.php:122
msgid "Lost our file."
msgstr "Fichier perdu."
-#: lib/imagefile.php:166 lib/imagefile.php:231
+#: lib/imagefile.php:163 lib/imagefile.php:224
msgid "Unknown file type"
msgstr "Type de fichier inconnu"
-#: lib/imagefile.php:251
+#: lib/imagefile.php:244
msgid "MB"
msgstr "Mo"
-#: lib/imagefile.php:253
+#: lib/imagefile.php:246
msgid "kB"
msgstr "Ko"
-#: lib/jabber.php:220
+#: lib/jabber.php:387
#, php-format
msgid "[%s]"
msgstr "[%s]"
-#: lib/jabber.php:400
+#: lib/jabber.php:567
#, php-format
msgid "Unknown inbox source %d."
msgstr "Source %d inconnue pour la boîte de réception."
@@ -6020,7 +6045,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:482
+#: lib/mailbox.php:227 lib/noticelist.php:486
msgid "from"
msgstr "de"
@@ -6151,48 +6176,48 @@ msgstr ""
"Désolé, l’obtention de votre localisation prend plus de temps que prévu. "
"Veuillez réessayer plus tard."
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr "%1$u° %2$u' %3$u\" %4$s %5$u° %6$u' %7$u\" %8$s"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "N"
msgstr "N"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "S"
msgstr "S"
-#: lib/noticelist.php:431
+#: lib/noticelist.php:432
msgid "E"
msgstr "E"
-#: lib/noticelist.php:431
+#: lib/noticelist.php:432
msgid "W"
msgstr "O"
-#: lib/noticelist.php:438
+#: lib/noticelist.php:439
msgid "at"
msgstr "chez"
-#: lib/noticelist.php:566
+#: lib/noticelist.php:570
msgid "in context"
msgstr "dans le contexte"
-#: lib/noticelist.php:601
+#: lib/noticelist.php:605
msgid "Repeated by"
msgstr "Repris par"
-#: lib/noticelist.php:628
+#: lib/noticelist.php:632
msgid "Reply to this notice"
msgstr "Répondre à cet avis"
-#: lib/noticelist.php:629
+#: lib/noticelist.php:633
msgid "Reply"
msgstr "Répondre"
-#: lib/noticelist.php:673
+#: lib/noticelist.php:677
msgid "Notice repeated"
msgstr "Avis repris"
@@ -6265,7 +6290,7 @@ msgstr "Marques dans les avis de %s"
msgid "Unknown"
msgstr "Inconnu"
-#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr "Abonnements"
@@ -6273,23 +6298,28 @@ msgstr "Abonnements"
msgid "All subscriptions"
msgstr "Tous les abonnements"
-#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90
+#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr "Abonnés"
-#: lib/profileaction.php:159
+#: lib/profileaction.php:161
msgid "All subscribers"
msgstr "Tous les abonnés"
-#: lib/profileaction.php:180
+#: lib/profileaction.php:191
msgid "User ID"
msgstr "ID de l’utilisateur"
-#: lib/profileaction.php:185
+#: lib/profileaction.php:196
msgid "Member since"
msgstr "Membre depuis"
-#: lib/profileaction.php:247
+#. TRANS: Average count of posts made per day since account registration
+#: lib/profileaction.php:235
+msgid "Daily average"
+msgstr "Moyenne journalière"
+
+#: lib/profileaction.php:264
msgid "All groups"
msgstr "Tous les groupes"
@@ -6334,7 +6364,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:671
+#: lib/router.php:704
msgid "No single user defined for single-user mode."
msgstr "Aucun utilisateur unique défini pour le mode mono-utilisateur."
@@ -6460,89 +6490,98 @@ msgstr "Ne plus suivre cet utilisateur"
msgid "Unsubscribe"
msgstr "Désabonnement"
-#: lib/userprofile.php:116
+#: lib/usernoprofileexception.php:58
+#, php-format
+msgid "User %s (%d) has no profile record."
+msgstr "L’utilisateur %s (%d) n’a pas de profil."
+
+#: lib/userprofile.php:117
msgid "Edit Avatar"
msgstr "Modifier l’avatar"
-#: lib/userprofile.php:236
+#: lib/userprofile.php:234 lib/userprofile.php:248
msgid "User actions"
msgstr "Actions de l’utilisateur"
-#: lib/userprofile.php:251
+#: lib/userprofile.php:237
+msgid "User deletion in progress..."
+msgstr "Suppression de l'utilisateur en cours..."
+
+#: lib/userprofile.php:263
msgid "Edit profile settings"
msgstr "Modifier les paramètres du profil"
-#: lib/userprofile.php:252
+#: lib/userprofile.php:264
msgid "Edit"
msgstr "Modifier"
-#: lib/userprofile.php:275
+#: lib/userprofile.php:287
msgid "Send a direct message to this user"
msgstr "Envoyer un message à cet utilisateur"
-#: lib/userprofile.php:276
+#: lib/userprofile.php:288
msgid "Message"
msgstr "Message"
-#: lib/userprofile.php:314
+#: lib/userprofile.php:326
msgid "Moderate"
msgstr "Modérer"
-#: lib/userprofile.php:352
+#: lib/userprofile.php:364
msgid "User role"
msgstr "Rôle de l'utilisateur"
-#: lib/userprofile.php:354
+#: lib/userprofile.php:366
msgctxt "role"
msgid "Administrator"
msgstr "Administrateur"
-#: lib/userprofile.php:355
+#: lib/userprofile.php:367
msgctxt "role"
msgid "Moderator"
msgstr "Modérateur"
-#: lib/util.php:1015
+#: lib/util.php:1046
msgid "a few seconds ago"
msgstr "il y a quelques secondes"
-#: lib/util.php:1017
+#: lib/util.php:1048
msgid "about a minute ago"
msgstr "il y a 1 minute"
-#: lib/util.php:1019
+#: lib/util.php:1050
#, php-format
msgid "about %d minutes ago"
msgstr "il y a %d minutes"
-#: lib/util.php:1021
+#: lib/util.php:1052
msgid "about an hour ago"
msgstr "il y a 1 heure"
-#: lib/util.php:1023
+#: lib/util.php:1054
#, php-format
msgid "about %d hours ago"
msgstr "il y a %d heures"
-#: lib/util.php:1025
+#: lib/util.php:1056
msgid "about a day ago"
msgstr "il y a 1 jour"
-#: lib/util.php:1027
+#: lib/util.php:1058
#, php-format
msgid "about %d days ago"
msgstr "il y a %d jours"
-#: lib/util.php:1029
+#: lib/util.php:1060
msgid "about a month ago"
msgstr "il y a 1 mois"
-#: lib/util.php:1031
+#: lib/util.php:1062
#, php-format
msgid "about %d months ago"
msgstr "il y a %d mois"
-#: lib/util.php:1033
+#: lib/util.php:1064
msgid "about a year ago"
msgstr "il y a environ 1 an"
@@ -6557,7 +6596,7 @@ msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr ""
"%s n’est pas une couleur valide ! Utilisez 3 ou 6 caractères hexadécimaux."
-#: lib/xmppmanager.php:402
+#: lib/xmppmanager.php:403
#, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d."
msgstr ""
diff --git a/locale/ga/LC_MESSAGES/statusnet.po b/locale/ga/LC_MESSAGES/statusnet.po
index dea9dd11c..78f3c56d7 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-03-06 23:49+0000\n"
-"PO-Revision-Date: 2010-03-06 23:49:54+0000\n"
+"POT-Creation-Date: 2010-04-05 18:54+0000\n"
+"PO-Revision-Date: 2010-04-05 18:55:21+0000\n"
"Language-Team: Irish\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64621); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ga\n"
"X-Message-Group: out-statusnet\n"
@@ -100,9 +100,9 @@ msgstr "Non existe a etiqueta."
#: 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:90
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78
+#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
@@ -111,10 +111,8 @@ msgstr "Non existe a etiqueta."
#: actions/remotesubscribe.php:154 actions/replies.php:73
#: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:163 lib/command.php:302
-#: lib/command.php:355 lib/command.php:401 lib/command.php:462
-#: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82
-#: lib/profileaction.php:77
+#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: lib/mailbox.php:82 lib/profileaction.php:77
msgid "No such user."
msgstr "Ningún usuario."
@@ -202,18 +200,18 @@ msgstr "Actualizacións dende %1$s e amigos en %2$s!"
#: 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:132
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:136
#: actions/apigrouplistall.php:120 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:135
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
-#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184
-#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148
+#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:174
+#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173
+#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
-#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
+#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
#, fuzzy
msgid "API method not found."
msgstr "Método da API non atopado"
@@ -227,8 +225,8 @@ msgstr "Método da API non atopado"
#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65
-#: actions/apistatusesupdate.php:118
+#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
msgid "This method requires a POST."
msgstr "Este método require un POST."
@@ -259,7 +257,7 @@ msgid "Could not save profile."
msgstr "Non se puido gardar o perfil."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:97
+#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
#: actions/designadminpanel.php:122 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
@@ -349,7 +347,7 @@ msgstr "Non se atopou un estado con ese ID."
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:176
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
msgid "Could not create favorite."
msgstr "Non se puido crear o favorito."
@@ -474,7 +472,7 @@ msgstr "Método da API non atopado"
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:221
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
msgid "You have been blocked from that group by the admin."
msgstr ""
@@ -492,11 +490,18 @@ msgstr "Non estás suscrito a ese perfil"
msgid "Could not remove user %1$s from group %2$s."
msgstr "Non podes seguir a este usuario: o Usuario non se atopa."
-#: actions/apigrouplist.php:95
+#. TRANS: %s is a user name
+#: actions/apigrouplist.php:97
#, 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
+#, fuzzy, php-format
+msgid "%1$s groups %2$s is a member of."
+msgstr "%1s non é unha orixe fiable."
+
#: actions/apigrouplistall.php:90 actions/usergroups.php:62
#, php-format
msgid "%s groups"
@@ -525,7 +530,7 @@ msgstr "Tamaño inválido."
#: 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:337
+#: actions/profilesettings.php:194 actions/recoverpassword.php:350
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
@@ -586,16 +591,16 @@ msgid ""
"give access to your %4$s account to third parties you trust."
msgstr ""
-#: actions/apioauthauthorize.php:310 lib/action.php:438
+#: actions/apioauthauthorize.php:310 lib/action.php:437
#, fuzzy
msgid "Account"
msgstr "Sobre"
#: actions/apioauthauthorize.php:313 actions/login.php:230
#: actions/profilesettings.php:106 actions/register.php:424
-#: actions/showgroup.php:244 actions/tagother.php:94
+#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
-#: lib/userprofile.php:131
+#: lib/userprofile.php:132
msgid "Nickname"
msgstr "Alcume"
@@ -670,12 +675,12 @@ msgstr ""
msgid "Unsupported format."
msgstr "Formato de ficheiro de imaxe non soportado."
-#: actions/apitimelinefavorites.php:108
+#: actions/apitimelinefavorites.php:109
#, fuzzy, php-format
msgid "%1$s / Favorites from %2$s"
msgstr "%s / Favoritos dende %s"
-#: actions/apitimelinefavorites.php:117
+#: actions/apitimelinefavorites.php:118
#, fuzzy, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "%s updates favorited by %s / %s."
@@ -685,7 +690,7 @@ msgstr "%s updates favorited by %s / %s."
msgid "%1$s / Updates mentioning %2$s"
msgstr "%1$s / Chíos que respostan a %2$s"
-#: actions/apitimelinementions.php:127
+#: actions/apitimelinementions.php:130
#, 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."
@@ -695,7 +700,7 @@ msgstr "Hai %1$s chíos en resposta a chíos dende %2$s / %3$s."
msgid "%s public timeline"
msgstr "Liña de tempo pública de %s"
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "%s chíos de calquera!"
@@ -710,12 +715,12 @@ msgstr "Replies to %s"
msgid "Repeats of %s"
msgstr "Replies to %s"
-#: actions/apitimelinetag.php:102 actions/tag.php:67
+#: actions/apitimelinetag.php:104 actions/tag.php:67
#, php-format
msgid "Notices tagged with %s"
msgstr "Chíos tagueados con %s"
-#: actions/apitimelinetag.php:104 actions/tagrss.php:65
+#: actions/apitimelinetag.php:106 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!"
@@ -744,7 +749,7 @@ msgstr "Sen tamaño."
msgid "Invalid size."
msgstr "Tamaño inválido."
-#: actions/avatarsettings.php:67 actions/showgroup.php:229
+#: actions/avatarsettings.php:67 actions/showgroup.php:230
#: lib/accountsettingsaction.php:112
msgid "Avatar"
msgstr "Avatar"
@@ -777,7 +782,7 @@ msgid "Preview"
msgstr ""
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:655
+#: lib/deleteuserform.php:66 lib/noticelist.php:659
#, fuzzy
msgid "Delete"
msgstr "eliminar"
@@ -790,23 +795,28 @@ msgstr "Subir"
msgid "Crop"
msgstr ""
-#: actions/avatarsettings.php:328
+#: actions/avatarsettings.php:305
+#, fuzzy
+msgid "No file uploaded."
+msgstr "Non se especificou ningún perfil."
+
+#: actions/avatarsettings.php:332
msgid "Pick a square area of the image to be your avatar"
msgstr ""
-#: actions/avatarsettings.php:343 actions/grouplogo.php:380
+#: actions/avatarsettings.php:347 actions/grouplogo.php:380
msgid "Lost our file data."
msgstr ""
-#: actions/avatarsettings.php:366
+#: actions/avatarsettings.php:370
msgid "Avatar updated."
msgstr "Avatar actualizado."
-#: actions/avatarsettings.php:369
+#: actions/avatarsettings.php:373
msgid "Failed updating avatar."
msgstr "Acounteceu un fallo ó actualizar o avatar."
-#: actions/avatarsettings.php:393
+#: actions/avatarsettings.php:397
#, fuzzy
msgid "Avatar deleted."
msgstr "Avatar actualizado."
@@ -865,8 +875,8 @@ msgstr "Erro ao gardar información de bloqueo."
#: actions/groupunblock.php:86 actions/joingroup.php:82
#: actions/joingroup.php:93 actions/leavegroup.php:82
#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212
-#: lib/command.php:260
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162
+#: lib/command.php:358
#, fuzzy
msgid "No such group."
msgstr "Non existe a etiqueta."
@@ -954,7 +964,7 @@ msgid "Conversation"
msgstr "Código de confirmación."
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:218 lib/searchgroupnav.php:82
+#: lib/profileaction.php:224 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "Chíos"
@@ -976,7 +986,7 @@ msgstr "Non estás suscrito a ese perfil"
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1217
+#: lib/action.php:1219
#, fuzzy
msgid "There was a problem with your session token."
msgstr "Houbo un problema co teu token de sesión. Tentao de novo, anda..."
@@ -1040,7 +1050,7 @@ msgstr "Estas seguro que queres eliminar este chío?"
msgid "Do not delete this notice"
msgstr "Non se pode eliminar este chíos."
-#: actions/deletenotice.php:146 lib/noticelist.php:655
+#: actions/deletenotice.php:146 lib/noticelist.php:659
#, fuzzy
msgid "Delete this notice"
msgstr "Eliminar chío"
@@ -1187,7 +1197,7 @@ msgstr ""
#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:208
+#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
#: actions/tagother.php:154 actions/useradminpanel.php:294
#: lib/applicationeditform.php:333 lib/applicationeditform.php:334
#: lib/designsettings.php:256 lib/groupeditform.php:202
@@ -1319,7 +1329,7 @@ msgstr "O teu Bio é demasiado longo (max 140 car.)."
msgid "Could not update group."
msgstr "Non se puido actualizar o usuario."
-#: actions/editgroup.php:264 classes/User_group.php:493
+#: actions/editgroup.php:264 classes/User_group.php:496
#, fuzzy
msgid "Could not create aliases."
msgstr "Non se puido crear o favorito."
@@ -1827,7 +1837,7 @@ msgstr "Liña de tempo de %s"
msgid "Updates from members of %1$s on %2$s!"
msgstr "Actualizacións dende %1$s en %2$s!"
-#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232
+#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244
#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr ""
@@ -2036,7 +2046,7 @@ msgstr "Invitar a novos usuarios"
msgid "You are already subscribed to these users:"
msgstr "Xa estas suscrito a estes usuarios:"
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
#, php-format
msgid "%1$s (%2$s)"
msgstr "%1$s (%2$s)"
@@ -2168,7 +2178,7 @@ msgstr "%s / Favoritos dende %s"
msgid "You must be logged in to leave a group."
msgstr "Debes estar logueado para invitar a outros usuarios a empregar %s"
-#: actions/leavegroup.php:100 lib/command.php:265
+#: actions/leavegroup.php:100 lib/command.php:363
#, fuzzy
msgid "You are not a member of that group."
msgstr "Non estás suscrito a ese perfil"
@@ -2287,12 +2297,12 @@ msgstr ""
msgid "New message"
msgstr "Nova mensaxe"
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
msgid "You can't send a message to this user."
msgstr "Non podes enviar mensaxes a este usurio."
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342
-#: lib/command.php:475
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
+#: lib/command.php:529
msgid "No content!"
msgstr "Sen contido!"
@@ -2300,7 +2310,7 @@ msgstr "Sen contido!"
msgid "No recipient specified."
msgstr "Non se especificou ningún destinatario"
-#: actions/newmessage.php:164 lib/command.php:361
+#: actions/newmessage.php:164 lib/command.php:462
msgid ""
"Don't send a message to yourself; just say it to yourself quietly instead."
msgstr ""
@@ -2317,7 +2327,7 @@ msgstr "Non hai mensaxes de texto!"
msgid "Direct message to %s sent."
msgstr "Mensaxe directo a %s enviado"
-#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189
msgid "Ajax Error"
msgstr "Erro de Ajax"
@@ -2325,7 +2335,7 @@ msgstr "Erro de Ajax"
msgid "New notice"
msgstr "Novo chío"
-#: actions/newnotice.php:211
+#: actions/newnotice.php:217
msgid "Notice posted"
msgstr "Chío publicado"
@@ -2435,7 +2445,7 @@ msgstr ""
msgid "Notice has no profile"
msgstr "O chío non ten perfil"
-#: actions/oembed.php:86 actions/shownotice.php:180
+#: actions/oembed.php:86 actions/shownotice.php:175
#, php-format
msgid "%1$s's status on %2$s"
msgstr "Estado de %1$s en %2$s"
@@ -2449,8 +2459,8 @@ msgstr "Conectar"
msgid "Only "
msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042
-#: lib/apiaction.php:1070 lib/apiaction.php:1179
+#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1068
+#: lib/apiaction.php:1096 lib/apiaction.php:1212
msgid "Not a supported data format."
msgstr "Non é un formato de datos soportado."
@@ -2590,7 +2600,7 @@ msgstr "Contrasinal actual incorrecta"
msgid "Error saving user; invalid."
msgstr "Acounteceu un erro gardando o usuario: é inválido."
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
msgid "Can't save new password."
msgstr "Non se pode gardar a contrasinal."
@@ -2817,8 +2827,8 @@ 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/showgroup.php:255 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:149
+#: actions/showgroup.php:256 actions/tagother.php:104
+#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Nome completo"
@@ -2846,9 +2856,9 @@ msgid "Bio"
msgstr "Bio"
#: actions/profilesettings.php:132 actions/register.php:471
-#: actions/showgroup.php:264 actions/tagother.php:112
+#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
-#: lib/userprofile.php:164
+#: lib/userprofile.php:165
msgid "Location"
msgstr "Localización"
@@ -2862,7 +2872,7 @@ msgstr ""
#: actions/profilesettings.php:145 actions/tagother.php:149
#: actions/tagother.php:209 lib/subscriptionlist.php:106
-#: lib/subscriptionlist.php:108 lib/userprofile.php:209
+#: lib/subscriptionlist.php:108 lib/userprofile.php:210
msgid "Tags"
msgstr "Tags"
@@ -3103,7 +3113,7 @@ msgstr "Restaurar contrasinal"
msgid "Recover password"
msgstr "Recuperar contrasinal"
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
msgid "Password recovery requested"
msgstr "Petición de recuperación de contrasinal"
@@ -3123,19 +3133,19 @@ msgstr "Restaurar"
msgid "Enter a nickname or email address."
msgstr "Insire o teu alcume ou enderezo de correo."
-#: actions/recoverpassword.php:272
+#: actions/recoverpassword.php:282
msgid "No user with that email address or username."
msgstr "Non hai ningún usuario con isa dirección de correo ou nome de usuario."
-#: actions/recoverpassword.php:287
+#: actions/recoverpassword.php:299
msgid "No registered email address for that user."
msgstr "Non hai un enderezo de correo rexistrado para ese usuario."
-#: actions/recoverpassword.php:301
+#: actions/recoverpassword.php:313
msgid "Error saving address confirmation."
msgstr "Acounteceu un erro gardando a confirmación de enderezo."
-#: actions/recoverpassword.php:325
+#: actions/recoverpassword.php:338
msgid ""
"Instructions for recovering your password have been sent to the email "
"address registered to your account."
@@ -3143,23 +3153,23 @@ msgstr ""
"As instruccións para recuperar a túa contrasinal foron enviadas ó enderezo "
"de correo da túa conta."
-#: actions/recoverpassword.php:344
+#: actions/recoverpassword.php:357
msgid "Unexpected password reset."
msgstr "Restauración de contrasinal non esperada."
-#: actions/recoverpassword.php:352
+#: actions/recoverpassword.php:365
msgid "Password must be 6 chars or more."
msgstr "A contrasinal debe ter 6 caracteres ou máis."
-#: actions/recoverpassword.php:356
+#: actions/recoverpassword.php:369
msgid "Password and confirmation do not match."
msgstr "A contrasinal e a súa confirmación non coinciden."
-#: actions/recoverpassword.php:375 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:248
msgid "Error setting user."
msgstr "Acounteceu un erro configurando o usuario."
-#: actions/recoverpassword.php:382
+#: actions/recoverpassword.php:395
msgid "New password successfully saved. You are now logged in."
msgstr "A nova contrasinal gardouse correctamente. Xa estas logueado."
@@ -3329,7 +3339,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "Enderezo do teu perfil en outro servizo de microblogaxe compatíbel"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:394
+#: lib/userprofile.php:406
msgid "Subscribe"
msgstr "Subscribir"
@@ -3372,7 +3382,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:674
+#: actions/repeat.php:114 lib/noticelist.php:678
#, fuzzy
msgid "Repeated"
msgstr "Crear"
@@ -3522,8 +3532,8 @@ msgstr "Invitación(s) enviada(s)."
msgid "Description"
msgstr "Subscricións"
-#: actions/showapplication.php:192 actions/showgroup.php:438
-#: lib/profileaction.php:176
+#: actions/showapplication.php:192 actions/showgroup.php:439
+#: lib/profileaction.php:182
msgid "Statistics"
msgstr "Estatísticas"
@@ -3634,73 +3644,73 @@ msgstr ""
msgid "%1$s group, page %2$d"
msgstr "Tódalas subscricións"
-#: actions/showgroup.php:226
+#: actions/showgroup.php:227
#, fuzzy
msgid "Group profile"
msgstr "Non existe o perfil."
-#: actions/showgroup.php:271 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:177
+#: actions/showgroup.php:272 actions/tagother.php:118
+#: actions/userauthorization.php:175 lib/userprofile.php:178
msgid "URL"
msgstr ""
-#: actions/showgroup.php:282 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:194
+#: actions/showgroup.php:283 actions/tagother.php:128
+#: actions/userauthorization.php:187 lib/userprofile.php:195
#, fuzzy
msgid "Note"
msgstr "Chíos"
-#: actions/showgroup.php:292 lib/groupeditform.php:184
+#: actions/showgroup.php:293 lib/groupeditform.php:184
msgid "Aliases"
msgstr ""
-#: actions/showgroup.php:301
+#: actions/showgroup.php:302
#, fuzzy
msgid "Group actions"
msgstr "Outras opcions"
-#: actions/showgroup.php:337
+#: actions/showgroup.php:338
#, fuzzy, php-format
msgid "Notice feed for %s group (RSS 1.0)"
msgstr "Fonte de chíos para %s"
-#: actions/showgroup.php:343
+#: actions/showgroup.php:344
#, fuzzy, php-format
msgid "Notice feed for %s group (RSS 2.0)"
msgstr "Fonte de chíos para %s"
-#: actions/showgroup.php:349
+#: actions/showgroup.php:350
#, fuzzy, php-format
msgid "Notice feed for %s group (Atom)"
msgstr "Fonte de chíos para %s"
-#: actions/showgroup.php:354
+#: actions/showgroup.php:355
#, fuzzy, php-format
msgid "FOAF for %s group"
msgstr "Band. Saída para %s"
-#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91
+#: actions/showgroup.php:391 actions/showgroup.php:448 lib/groupnav.php:91
#, fuzzy
msgid "Members"
msgstr "Membro dende"
-#: actions/showgroup.php:395 lib/profileaction.php:117
-#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95
-#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71
+#: actions/showgroup.php:396 lib/profileaction.php:117
+#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95
+#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
#, fuzzy
msgid "(None)"
msgstr "(nada)"
-#: actions/showgroup.php:401
+#: actions/showgroup.php:402
msgid "All members"
msgstr ""
-#: actions/showgroup.php:441
+#: actions/showgroup.php:442
#, fuzzy
msgid "Created"
msgstr "Crear"
-#: actions/showgroup.php:457
+#: actions/showgroup.php:458
#, fuzzy, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3714,7 +3724,7 @@ msgstr ""
"(http://status.net/). [Únete agora](%%action.register%%) para compartir "
"chíos cos teus amigos, colegas e familia! ([Ler mais](%%doc.help%%))"
-#: actions/showgroup.php:463
+#: actions/showgroup.php:464
#, fuzzy, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3727,7 +3737,7 @@ msgstr ""
"(http://status.net/). [Únete agora](%%action.register%%) para compartir "
"chíos cos teus amigos, colegas e familia! ([Ler mais](%%doc.help%%))"
-#: actions/showgroup.php:491
+#: actions/showgroup.php:492
msgid "Admins"
msgstr ""
@@ -3866,7 +3876,7 @@ msgid "Unknown language \"%s\"."
msgstr ""
#: actions/siteadminpanel.php:165
-msgid "Minimum text limit is 140 characters."
+msgid "Minimum text limit is 0 (unlimited)."
msgstr ""
#: actions/siteadminpanel.php:171
@@ -4149,8 +4159,7 @@ msgstr "Configuracións de Twitter"
msgid "You are not subscribed to that profile."
msgstr "Non estás suscrito a ese perfil"
-#: actions/subedit.php:83 classes/Subscription.php:89
-#: classes/Subscription.php:116
+#: actions/subedit.php:83 classes/Subscription.php:132
msgid "Could not save subscription."
msgstr "Non se pode gardar a subscrición."
@@ -4243,11 +4252,11 @@ msgstr ""
msgid "%s is not listening to anyone."
msgstr "%1$s está a escoitar os teus chíos %2$s."
-#: actions/subscriptions.php:199
+#: actions/subscriptions.php:208
msgid "Jabber"
msgstr "Jabber."
-#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:222 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr "SMS"
@@ -4281,13 +4290,13 @@ msgstr "Non hai argumento id."
msgid "Tag %s"
msgstr "Tags"
-#: actions/tagother.php:77 lib/userprofile.php:75
+#: actions/tagother.php:77 lib/userprofile.php:76
#, fuzzy
msgid "User profile"
msgstr "O usuario non ten perfil."
#: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:102
+#: lib/userprofile.php:103
msgid "Photo"
msgstr ""
@@ -4624,7 +4633,7 @@ msgstr ""
msgid "Plugins"
msgstr ""
-#: actions/version.php:196 lib/action.php:767
+#: actions/version.php:196 lib/action.php:766
#, fuzzy
msgid "Version"
msgstr "Persoal"
@@ -4633,19 +4642,19 @@ msgstr "Persoal"
msgid "Author(s)"
msgstr ""
-#: classes/File.php:144
+#: classes/File.php:169
#, 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:154
+#: classes/File.php:179
#, php-format
msgid "A file this large would exceed your user quota of %d bytes."
msgstr ""
-#: classes/File.php:161
+#: classes/File.php:186
#, php-format
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
@@ -4688,28 +4697,28 @@ msgstr "Non se pode inserir unha mensaxe."
msgid "Could not update message with new URI."
msgstr "Non se puido actualizar a mensaxe coa nova URI."
-#: classes/Notice.php:172
+#: classes/Notice.php:175
#, php-format
msgid "DB error inserting hashtag: %s"
msgstr "Erro ó inserir o hashtag na BD: %s"
-#: classes/Notice.php:241
+#: classes/Notice.php:244
#, fuzzy
msgid "Problem saving notice. Too long."
msgstr "Aconteceu un erro ó gardar o chío."
-#: classes/Notice.php:245
+#: classes/Notice.php:248
msgid "Problem saving notice. Unknown user."
msgstr "Aconteceu un erro ó gardar o chío. Usuario descoñecido."
-#: classes/Notice.php:250
+#: classes/Notice.php:253
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:256
+#: classes/Notice.php:259
#, fuzzy
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
@@ -4718,77 +4727,77 @@ msgstr ""
"Demasiados chíos en pouco tempo; tomate un respiro e envíao de novo dentro "
"duns minutos."
-#: classes/Notice.php:262
+#: classes/Notice.php:265
msgid "You are banned from posting notices on this site."
msgstr "Tes restrinxido o envio de chíos neste sitio."
-#: classes/Notice.php:328 classes/Notice.php:354
+#: classes/Notice.php:331 classes/Notice.php:357
msgid "Problem saving notice."
msgstr "Aconteceu un erro ó gardar o chío."
-#: classes/Notice.php:927
+#: classes/Notice.php:943
#, fuzzy
msgid "Problem saving group inbox."
msgstr "Aconteceu un erro ó gardar o chío."
-#: classes/Notice.php:1459
+#: classes/Notice.php:1481
#, fuzzy, php-format
msgid "RT @%1$s %2$s"
msgstr "%1$s (%2$s)"
-#: classes/Subscription.php:66 lib/oauthstore.php:465
+#: classes/Subscription.php:74 lib/oauthstore.php:465
#, fuzzy
msgid "You have been banned from subscribing."
msgstr "Este usuario non che permite suscribirte a el."
-#: classes/Subscription.php:70
+#: classes/Subscription.php:78
msgid "Already subscribed!"
msgstr ""
-#: classes/Subscription.php:74
+#: classes/Subscription.php:82
msgid "User has blocked you."
msgstr "O usuario bloqueoute."
-#: classes/Subscription.php:157
+#: classes/Subscription.php:167
#, fuzzy
msgid "Not subscribed!"
msgstr "Non está suscrito!"
-#: classes/Subscription.php:163
+#: classes/Subscription.php:173
#, fuzzy
msgid "Couldn't delete self-subscription."
msgstr "Non se pode eliminar a subscrición."
-#: classes/Subscription.php:190
+#: classes/Subscription.php:200
#, fuzzy
msgid "Couldn't delete subscription OMB token."
msgstr "Non se pode eliminar a subscrición."
-#: classes/Subscription.php:201 lib/subs.php:69
+#: classes/Subscription.php:211
msgid "Couldn't delete subscription."
msgstr "Non se pode eliminar a subscrición."
-#: classes/User.php:373
+#: classes/User.php:363
#, fuzzy, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Mensaxe de %1$s en %2$s"
-#: classes/User_group.php:477
+#: classes/User_group.php:480
#, fuzzy
msgid "Could not create group."
msgstr "Non se puido crear o favorito."
-#: classes/User_group.php:486
+#: classes/User_group.php:489
#, fuzzy
msgid "Could not set group URI."
msgstr "Non se pode gardar a subscrición."
-#: classes/User_group.php:507
+#: classes/User_group.php:510
#, fuzzy
msgid "Could not set group membership."
msgstr "Non se pode gardar a subscrición."
-#: classes/User_group.php:521
+#: classes/User_group.php:524
#, fuzzy
msgid "Could not save local group info."
msgstr "Non se pode gardar a subscrición."
@@ -4832,54 +4841,54 @@ msgstr "%1$s (%2$s)"
msgid "Untitled page"
msgstr ""
-#: lib/action.php:424
+#: lib/action.php:423
msgid "Primary site navigation"
msgstr ""
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:430
+#: lib/action.php:429
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr ""
-#: lib/action.php:433
+#: lib/action.php:432
#, fuzzy
msgctxt "MENU"
msgid "Personal"
msgstr "Persoal"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:435
+#: lib/action.php:434
#, fuzzy
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "Cambiar contrasinal"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:440
+#: lib/action.php:439
#, fuzzy
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "Non se pode redireccionar ao servidor: %s"
-#: lib/action.php:443
+#: lib/action.php:442
msgid "Connect"
msgstr "Conectar"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:446
+#: lib/action.php:445
#, fuzzy
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "Navegación de subscricións"
-#: lib/action.php:449
+#: lib/action.php:448
msgctxt "MENU"
msgid "Admin"
msgstr ""
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:453
+#: lib/action.php:452
#, fuzzy, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
@@ -4887,69 +4896,69 @@ msgstr ""
"Emprega este formulario para invitar ós teus amigos e colegas a empregar "
"este servizo."
-#: lib/action.php:456
+#: lib/action.php:455
#, fuzzy
msgctxt "MENU"
msgid "Invite"
msgstr "Invitar"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:462
+#: lib/action.php:461
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr ""
-#: lib/action.php:465
+#: lib/action.php:464
#, fuzzy
msgctxt "MENU"
msgid "Logout"
msgstr "Sair"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:470
+#: lib/action.php:469
#, fuzzy
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Crear nova conta"
-#: lib/action.php:473
+#: lib/action.php:472
#, fuzzy
msgctxt "MENU"
msgid "Register"
msgstr "Rexistrar"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:476
+#: lib/action.php:475
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr ""
-#: lib/action.php:479
+#: lib/action.php:478
#, fuzzy
msgctxt "MENU"
msgid "Login"
msgstr "Inicio de sesión"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:482
+#: lib/action.php:481
#, fuzzy
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Axuda"
-#: lib/action.php:485
+#: lib/action.php:484
#, fuzzy
msgctxt "MENU"
msgid "Help"
msgstr "Axuda"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:488
+#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr ""
-#: lib/action.php:491
+#: lib/action.php:490
#, fuzzy
msgctxt "MENU"
msgid "Search"
@@ -4957,62 +4966,62 @@ msgstr "Buscar"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:513 lib/adminpanelaction.php:398
+#: lib/action.php:512 lib/adminpanelaction.php:398
#, fuzzy
msgid "Site notice"
msgstr "Novo chío"
-#: lib/action.php:579
+#: lib/action.php:578
msgid "Local views"
msgstr ""
-#: lib/action.php:645
+#: lib/action.php:644
#, fuzzy
msgid "Page notice"
msgstr "Novo chío"
-#: lib/action.php:747
+#: lib/action.php:746
#, fuzzy
msgid "Secondary site navigation"
msgstr "Navegación de subscricións"
-#: lib/action.php:752
+#: lib/action.php:751
msgid "Help"
msgstr "Axuda"
-#: lib/action.php:754
+#: lib/action.php:753
msgid "About"
msgstr "Sobre"
-#: lib/action.php:756
+#: lib/action.php:755
msgid "FAQ"
msgstr "Preguntas frecuentes"
-#: lib/action.php:760
+#: lib/action.php:759
msgid "TOS"
msgstr ""
-#: lib/action.php:763
+#: lib/action.php:762
msgid "Privacy"
msgstr "Privacidade"
-#: lib/action.php:765
+#: lib/action.php:764
msgid "Source"
msgstr "Fonte"
-#: lib/action.php:769
+#: lib/action.php:768
msgid "Contact"
msgstr "Contacto"
-#: lib/action.php:771
+#: lib/action.php:770
msgid "Badge"
msgstr ""
-#: lib/action.php:799
+#: lib/action.php:798
msgid "StatusNet software license"
msgstr ""
-#: lib/action.php:802
+#: lib/action.php:803
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5021,12 +5030,12 @@ msgstr ""
"**%%site.name%%** é un servizo de microbloguexo que che proporciona [%%site."
"broughtby%%](%%site.broughtbyurl%%). "
-#: lib/action.php:804
+#: lib/action.php:805
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** é un servizo de microbloguexo."
-#: lib/action.php:806
+#: lib/action.php:808
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5037,57 +5046,61 @@ msgstr ""
"%s, dispoñible baixo licenza [GNU Affero General Public License](http://www."
"fsf.org/licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:821
+#: lib/action.php:823
#, fuzzy
msgid "Site content license"
msgstr "Atopar no contido dos chíos"
-#: lib/action.php:826
+#: lib/action.php:828
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
-#: lib/action.php:831
+#: lib/action.php:833
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
-#: lib/action.php:834
+#: lib/action.php:836
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
-#: lib/action.php:847
+#: lib/action.php:849
#, fuzzy
msgid "All "
msgstr "Todos"
-#: lib/action.php:853
+#: lib/action.php:855
msgid "license."
msgstr ""
-#: lib/action.php:1152
+#: lib/action.php:1154
msgid "Pagination"
msgstr ""
-#: lib/action.php:1161
+#: lib/action.php:1163
#, fuzzy
msgid "After"
msgstr "« Despois"
-#: lib/action.php:1169
+#: lib/action.php:1171
#, fuzzy
msgid "Before"
msgstr "Antes »"
-#: lib/activity.php:453
+#: lib/activity.php:120
+msgid "Expecting a root feed element but got a whole XML document."
+msgstr ""
+
+#: lib/activityutils.php:208
msgid "Can't handle remote content yet."
msgstr ""
-#: lib/activity.php:481
+#: lib/activityutils.php:236
msgid "Can't handle embedded XML content yet."
msgstr ""
-#: lib/activity.php:485
+#: lib/activityutils.php:240
msgid "Can't handle embedded Base64 content yet."
msgstr ""
@@ -5192,7 +5205,7 @@ msgstr "Confirmación de SMS"
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
-#: lib/apiauth.php:272
+#: lib/apiauth.php:276
#, php-format
msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s"
msgstr ""
@@ -5271,11 +5284,11 @@ msgstr "Eliminar"
msgid "Attachments"
msgstr ""
-#: lib/attachmentlist.php:265
+#: lib/attachmentlist.php:263
msgid "Author"
msgstr ""
-#: lib/attachmentlist.php:278
+#: lib/attachmentlist.php:276
#, fuzzy
msgid "Provider"
msgstr "Perfil"
@@ -5298,37 +5311,51 @@ msgstr "Contrasinal gardada."
msgid "Password changing is not allowed"
msgstr "Contrasinal gardada."
-#: lib/channel.php:138 lib/channel.php:158
+#: lib/channel.php:157 lib/channel.php:177
msgid "Command results"
msgstr "Resultados do comando"
-#: lib/channel.php:210 lib/mailhandler.php:142
+#: lib/channel.php:229 lib/mailhandler.php:142
msgid "Command complete"
msgstr "Comando completo"
-#: lib/channel.php:221
+#: lib/channel.php:240
msgid "Command failed"
msgstr "Comando fallido"
-#: lib/command.php:44
-msgid "Sorry, this command is not yet implemented."
-msgstr "Desculpa, este comando todavía non está implementado."
+#: lib/command.php:83 lib/command.php:105
+#, fuzzy
+msgid "Notice with that id does not exist"
+msgstr "Non se atopou un perfil con ese ID."
+
+#: lib/command.php:99 lib/command.php:570
+msgid "User has no last notice"
+msgstr "O usuario non ten último chio."
-#: lib/command.php:88
+#: lib/command.php:125
#, fuzzy, php-format
msgid "Could not find a user with nickname %s"
msgstr "Non se puido actualizar o usuario coa dirección de correo electrónico."
-#: lib/command.php:92
+#: lib/command.php:143
+#, fuzzy, php-format
+msgid "Could not find a local user with nickname %s"
+msgstr "Non se puido actualizar o usuario coa dirección de correo electrónico."
+
+#: lib/command.php:176
+msgid "Sorry, this command is not yet implemented."
+msgstr "Desculpa, este comando todavía non está implementado."
+
+#: lib/command.php:221
msgid "It does not make a lot of sense to nudge yourself!"
msgstr ""
-#: lib/command.php:99
+#: lib/command.php:228
#, fuzzy, php-format
msgid "Nudge sent to %s"
msgstr "Toque enviado"
-#: lib/command.php:126
+#: lib/command.php:254
#, php-format
msgid ""
"Subscriptions: %1$s\n"
@@ -5339,176 +5366,174 @@ msgstr ""
"Suscriptores: %2$s\n"
"Chíos: %3$s"
-#: lib/command.php:152 lib/command.php:390 lib/command.php:451
-#, fuzzy
-msgid "Notice with that id does not exist"
-msgstr "Non se atopou un perfil con ese ID."
-
-#: lib/command.php:168 lib/command.php:406 lib/command.php:467
-#: lib/command.php:523
-msgid "User has no last notice"
-msgstr "O usuario non ten último chio."
-
-#: lib/command.php:190
+#: lib/command.php:296
msgid "Notice marked as fave."
msgstr "Chío marcado coma favorito."
-#: lib/command.php:217
+#: lib/command.php:317
#, fuzzy
msgid "You are already a member of that group"
msgstr "Xa estas suscrito a estes usuarios:"
-#: lib/command.php:231
+#: lib/command.php:331
#, fuzzy, php-format
msgid "Could not join user %s to group %s"
msgstr "Non podes seguir a este usuario: o Usuario non se atopa."
-#: lib/command.php:236
+#: lib/command.php:336
#, fuzzy, php-format
msgid "%s joined group %s"
msgstr "%s / Favoritos dende %s"
-#: lib/command.php:275
+#: lib/command.php:373
#, fuzzy, php-format
msgid "Could not remove user %s to group %s"
msgstr "Non podes seguir a este usuario: o Usuario non se atopa."
-#: lib/command.php:280
+#: lib/command.php:378
#, fuzzy, php-format
msgid "%s left group %s"
msgstr "%s / Favoritos dende %s"
-#: lib/command.php:309
+#: lib/command.php:401
#, php-format
msgid "Fullname: %s"
msgstr "Nome completo: %s"
-#: lib/command.php:312 lib/mail.php:258
+#: lib/command.php:404 lib/mail.php:258
#, php-format
msgid "Location: %s"
msgstr "Ubicación: %s"
-#: lib/command.php:315 lib/mail.php:260
+#: lib/command.php:407 lib/mail.php:260
#, php-format
msgid "Homepage: %s"
msgstr "Páxina persoal: %s"
-#: lib/command.php:318
+#: lib/command.php:410
#, php-format
msgid "About: %s"
msgstr "Sobre: %s"
-#: lib/command.php:349
+#: lib/command.php:437
+#, php-format
+msgid ""
+"%s is a remote profile; you can only send direct messages to users on the "
+"same server."
+msgstr ""
+
+#: lib/command.php:450
#, fuzzy, php-format
msgid "Message too long - maximum is %d characters, you sent %d"
msgstr "Mensaxe demasiado longa - o máximo é 140 caracteres, ti enviaches %d "
-#: lib/command.php:367
+#: lib/command.php:468
#, php-format
msgid "Direct message to %s sent"
msgstr "Mensaxe directo a %s enviado"
-#: lib/command.php:369
+#: lib/command.php:470
msgid "Error sending direct message."
msgstr "Erro ó enviar a mensaxe directa."
-#: lib/command.php:413
+#: lib/command.php:490
#, fuzzy
msgid "Cannot repeat your own notice"
msgstr "Non se pode activar a notificación."
-#: lib/command.php:418
+#: lib/command.php:495
#, fuzzy
msgid "Already repeated that notice"
msgstr "Eliminar chío"
-#: lib/command.php:426
+#: lib/command.php:503
#, fuzzy, php-format
msgid "Notice from %s repeated"
msgstr "Chío publicado"
-#: lib/command.php:428
+#: lib/command.php:505
#, fuzzy
msgid "Error repeating notice."
msgstr "Aconteceu un erro ó gardar o chío."
-#: lib/command.php:482
+#: lib/command.php:536
#, fuzzy, php-format
msgid "Notice too long - maximum is %d characters, you sent %d"
msgstr "Mensaxe demasiado longa - o máximo é 140 caracteres, ti enviaches %d "
-#: lib/command.php:491
+#: lib/command.php:545
#, php-format
msgid "Reply to %s sent"
msgstr "Non se pode eliminar este chíos."
-#: lib/command.php:493
+#: lib/command.php:547
#, fuzzy
msgid "Error saving notice."
msgstr "Aconteceu un erro ó gardar o chío."
-#: lib/command.php:547
+#: lib/command.php:594
msgid "Specify the name of the user to subscribe to"
msgstr "Especifica o nome do usuario ó que queres suscribirte"
-#: lib/command.php:554 lib/command.php:589
-msgid "No such user"
-msgstr "Ningún usuario."
+#: lib/command.php:602
+#, fuzzy
+msgid "Can't subscribe to OMB profiles by command."
+msgstr "Non estás suscrito a ese perfil"
-#: lib/command.php:561
+#: lib/command.php:608
#, php-format
msgid "Subscribed to %s"
msgstr "Suscrito a %s"
-#: lib/command.php:582 lib/command.php:685
+#: lib/command.php:629 lib/command.php:728
msgid "Specify the name of the user to unsubscribe from"
msgstr "Especifica o nome de usuario ó que queres deixar de seguir"
-#: lib/command.php:595
+#: lib/command.php:638
#, php-format
msgid "Unsubscribed from %s"
msgstr "Desuscribir de %s"
-#: lib/command.php:613 lib/command.php:636
+#: lib/command.php:656 lib/command.php:679
msgid "Command not yet implemented."
msgstr "Comando non implementado."
-#: lib/command.php:616
+#: lib/command.php:659
msgid "Notification off."
msgstr "Notificación desactivada."
-#: lib/command.php:618
+#: lib/command.php:661
msgid "Can't turn off notification."
msgstr "No se pode desactivar a notificación."
-#: lib/command.php:639
+#: lib/command.php:682
msgid "Notification on."
msgstr "Notificación habilitada."
-#: lib/command.php:641
+#: lib/command.php:684
msgid "Can't turn on notification."
msgstr "Non se pode activar a notificación."
-#: lib/command.php:654
+#: lib/command.php:697
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:665
+#: lib/command.php:708
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:692
+#: lib/command.php:735
#, fuzzy, php-format
msgid "Unsubscribed %s"
msgstr "Desuscribir de %s"
-#: lib/command.php:709
+#: lib/command.php:752
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "Non estás suscrito a ese perfil"
-#: lib/command.php:711
+#: lib/command.php:754
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Xa estas suscrito a estes usuarios:"
@@ -5517,12 +5542,12 @@ msgstr[2] ""
msgstr[3] ""
msgstr[4] ""
-#: lib/command.php:731
+#: lib/command.php:774
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Outro usuario non se puido suscribir a ti."
-#: lib/command.php:733
+#: lib/command.php:776
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Outro usuario non se puido suscribir a ti."
@@ -5531,12 +5556,12 @@ msgstr[2] ""
msgstr[3] ""
msgstr[4] ""
-#: lib/command.php:753
+#: lib/command.php:796
#, fuzzy
msgid "You are not a member of any groups."
msgstr "Non estás suscrito a ese perfil"
-#: lib/command.php:755
+#: lib/command.php:798
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Non estás suscrito a ese perfil"
@@ -5545,7 +5570,7 @@ msgstr[2] ""
msgstr[3] ""
msgstr[4] ""
-#: lib/command.php:769
+#: lib/command.php:812
#, fuzzy
msgid ""
"Commands:\n"
@@ -5614,20 +5639,20 @@ msgstr ""
"tracks - non implementado por agora.\n"
"tracking - non implementado por agora.\n"
-#: lib/common.php:148
+#: lib/common.php:135
#, fuzzy
msgid "No configuration file found. "
msgstr "Sen código de confirmación."
-#: lib/common.php:149
+#: lib/common.php:136
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:151
+#: lib/common.php:138
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:152
+#: lib/common.php:139
msgid "Go to the installer."
msgstr ""
@@ -5812,51 +5837,51 @@ msgstr ""
msgid "This page is not available in a media type you accept"
msgstr "Esta páxina non está dispoñíbel no tipo de medio que aceptas"
-#: lib/imagefile.php:75
+#: lib/imagefile.php:72
+msgid "Unsupported image file format."
+msgstr "Formato de ficheiro de imaxe non soportado."
+
+#: lib/imagefile.php:88
#, fuzzy, php-format
msgid "That file is too big. The maximum file size is %s."
msgstr "Podes actualizar a túa información do perfil persoal aquí"
-#: lib/imagefile.php:80
+#: lib/imagefile.php:93
msgid "Partial upload."
msgstr "Carga parcial."
-#: lib/imagefile.php:88 lib/mediafile.php:170
+#: lib/imagefile.php:101 lib/mediafile.php:170
msgid "System error uploading file."
msgstr "Aconteceu un erro no sistema namentras se estaba cargando o ficheiro."
-#: lib/imagefile.php:96
+#: lib/imagefile.php:109
msgid "Not an image or corrupt file."
msgstr "Non é unha imaxe ou está corrupta."
-#: lib/imagefile.php:109
-msgid "Unsupported image file format."
-msgstr "Formato de ficheiro de imaxe non soportado."
-
#: lib/imagefile.php:122
#, fuzzy
msgid "Lost our file."
msgstr "Bloqueo de usuario fallido."
-#: lib/imagefile.php:166 lib/imagefile.php:231
+#: lib/imagefile.php:163 lib/imagefile.php:224
#, fuzzy
msgid "Unknown file type"
msgstr "tipo de ficheiro non soportado"
-#: lib/imagefile.php:251
+#: lib/imagefile.php:244
msgid "MB"
msgstr ""
-#: lib/imagefile.php:253
+#: lib/imagefile.php:246
msgid "kB"
msgstr ""
-#: lib/jabber.php:220
+#: lib/jabber.php:387
#, php-format
msgid "[%s]"
msgstr ""
-#: lib/jabber.php:400
+#: lib/jabber.php:567
#, php-format
msgid "Unknown inbox source %d."
msgstr ""
@@ -6117,7 +6142,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:482
+#: lib/mailbox.php:227 lib/noticelist.php:486
#, fuzzy
msgid "from"
msgstr " dende "
@@ -6250,53 +6275,53 @@ msgid ""
"try again later"
msgstr ""
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr ""
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
#, fuzzy
msgid "N"
msgstr "No"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "S"
msgstr ""
-#: lib/noticelist.php:431
+#: lib/noticelist.php:432
msgid "E"
msgstr ""
-#: lib/noticelist.php:431
+#: lib/noticelist.php:432
msgid "W"
msgstr ""
-#: lib/noticelist.php:438
+#: lib/noticelist.php:439
msgid "at"
msgstr ""
-#: lib/noticelist.php:566
+#: lib/noticelist.php:570
#, fuzzy
msgid "in context"
msgstr "Sen contido!"
-#: lib/noticelist.php:601
+#: lib/noticelist.php:605
#, fuzzy
msgid "Repeated by"
msgstr "Crear"
-#: lib/noticelist.php:628
+#: lib/noticelist.php:632
#, fuzzy
msgid "Reply to this notice"
msgstr "Non se pode eliminar este chíos."
-#: lib/noticelist.php:629
+#: lib/noticelist.php:633
#, fuzzy
msgid "Reply"
msgstr "contestar"
-#: lib/noticelist.php:673
+#: lib/noticelist.php:677
#, fuzzy
msgid "Notice repeated"
msgstr "Chío publicado"
@@ -6375,7 +6400,7 @@ msgstr "O usuario non ten último chio."
msgid "Unknown"
msgstr "Acción descoñecida"
-#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr "Subscricións"
@@ -6383,7 +6408,7 @@ msgstr "Subscricións"
msgid "All subscriptions"
msgstr "Tódalas subscricións"
-#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90
+#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr "Subscritores"
@@ -6392,16 +6417,21 @@ msgstr "Subscritores"
msgid "All subscribers"
msgstr "Subscritores"
-#: lib/profileaction.php:180
+#: lib/profileaction.php:186
#, fuzzy
msgid "User ID"
msgstr "Usuario"
-#: lib/profileaction.php:185
+#: lib/profileaction.php:191
msgid "Member since"
msgstr "Membro dende"
-#: lib/profileaction.php:247
+#. TRANS: Average count of posts made per day since account registration
+#: lib/profileaction.php:230
+msgid "Daily average"
+msgstr ""
+
+#: lib/profileaction.php:259
#, fuzzy
msgid "All groups"
msgstr "Tódalas etiquetas"
@@ -6451,7 +6481,7 @@ msgstr "Non se pode eliminar este chíos."
msgid "Revoke the \"%s\" role from this user"
msgstr ""
-#: lib/router.php:671
+#: lib/router.php:704
msgid "No single user defined for single-user mode."
msgstr ""
@@ -6590,95 +6620,104 @@ msgstr "Desuscribir de %s"
msgid "Unsubscribe"
msgstr "Eliminar subscrición"
-#: lib/userprofile.php:116
+#: lib/usernoprofileexception.php:58
+#, fuzzy, php-format
+msgid "User %s (%d) has no profile record."
+msgstr "O usuario non ten perfil."
+
+#: lib/userprofile.php:117
#, fuzzy
msgid "Edit Avatar"
msgstr "Avatar"
-#: lib/userprofile.php:236
+#: lib/userprofile.php:234 lib/userprofile.php:248
#, fuzzy
msgid "User actions"
msgstr "Outras opcions"
-#: lib/userprofile.php:251
+#: lib/userprofile.php:237
+msgid "User deletion in progress..."
+msgstr ""
+
+#: lib/userprofile.php:263
#, fuzzy
msgid "Edit profile settings"
msgstr "Configuración de perfil"
-#: lib/userprofile.php:252
+#: lib/userprofile.php:264
msgid "Edit"
msgstr ""
-#: lib/userprofile.php:275
+#: lib/userprofile.php:287
#, fuzzy
msgid "Send a direct message to this user"
msgstr "Non podes enviar mensaxes a este usurio."
-#: lib/userprofile.php:276
+#: lib/userprofile.php:288
#, fuzzy
msgid "Message"
msgstr "Nova mensaxe"
-#: lib/userprofile.php:314
+#: lib/userprofile.php:326
msgid "Moderate"
msgstr ""
-#: lib/userprofile.php:352
+#: lib/userprofile.php:364
#, fuzzy
msgid "User role"
msgstr "O usuario non ten perfil."
-#: lib/userprofile.php:354
+#: lib/userprofile.php:366
msgctxt "role"
msgid "Administrator"
msgstr ""
-#: lib/userprofile.php:355
+#: lib/userprofile.php:367
msgctxt "role"
msgid "Moderator"
msgstr ""
-#: lib/util.php:1015
+#: lib/util.php:1046
msgid "a few seconds ago"
msgstr "fai uns segundos"
-#: lib/util.php:1017
+#: lib/util.php:1048
msgid "about a minute ago"
msgstr "fai un minuto"
-#: lib/util.php:1019
+#: lib/util.php:1050
#, php-format
msgid "about %d minutes ago"
msgstr "fai %d minutos"
-#: lib/util.php:1021
+#: lib/util.php:1052
msgid "about an hour ago"
msgstr "fai unha hora"
-#: lib/util.php:1023
+#: lib/util.php:1054
#, php-format
msgid "about %d hours ago"
msgstr "fai %d horas"
-#: lib/util.php:1025
+#: lib/util.php:1056
msgid "about a day ago"
msgstr "fai un día"
-#: lib/util.php:1027
+#: lib/util.php:1058
#, php-format
msgid "about %d days ago"
msgstr "fai %d días"
-#: lib/util.php:1029
+#: lib/util.php:1060
msgid "about a month ago"
msgstr "fai un mes"
-#: lib/util.php:1031
+#: lib/util.php:1062
#, php-format
msgid "about %d months ago"
msgstr "fai %d meses"
-#: lib/util.php:1033
+#: lib/util.php:1064
msgid "about a year ago"
msgstr "fai un ano"
@@ -6692,7 +6731,7 @@ msgstr "%1s non é unha orixe fiable."
msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr ""
-#: lib/xmppmanager.php:402
+#: lib/xmppmanager.php:403
#, fuzzy, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d."
msgstr "Mensaxe demasiado longa - o máximo é 140 caracteres, ti enviaches %d "
diff --git a/locale/he/LC_MESSAGES/statusnet.po b/locale/he/LC_MESSAGES/statusnet.po
index 49f229a96..99de51a7f 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-03-06 23:49+0000\n"
-"PO-Revision-Date: 2010-03-06 23:49:57+0000\n"
+"POT-Creation-Date: 2010-04-05 18:54+0000\n"
+"PO-Revision-Date: 2010-04-05 18:55:24+0000\n"
"Language-Team: Hebrew\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64621); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: he\n"
"X-Message-Group: out-statusnet\n"
@@ -97,9 +97,9 @@ msgstr "אין הודעה כזו."
#: 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:90
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78
+#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
@@ -108,10 +108,8 @@ msgstr "אין הודעה כזו."
#: actions/remotesubscribe.php:154 actions/replies.php:73
#: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:163 lib/command.php:302
-#: lib/command.php:355 lib/command.php:401 lib/command.php:462
-#: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82
-#: lib/profileaction.php:77
+#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: lib/mailbox.php:82 lib/profileaction.php:77
msgid "No such user."
msgstr "אין משתמש כזה."
@@ -199,18 +197,18 @@ msgstr ""
#: 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:132
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:136
#: actions/apigrouplistall.php:120 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:135
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
-#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184
-#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148
+#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:174
+#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173
+#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
-#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
+#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
#, fuzzy
msgid "API method not found."
msgstr "קוד האישור לא נמצא."
@@ -224,8 +222,8 @@ msgstr "קוד האישור לא נמצא."
#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65
-#: actions/apistatusesupdate.php:118
+#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
msgid "This method requires a POST."
msgstr ""
@@ -256,7 +254,7 @@ msgid "Could not save profile."
msgstr "שמירת הפרופיל נכשלה."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:97
+#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
#: actions/designadminpanel.php:122 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
@@ -343,7 +341,7 @@ msgstr ""
msgid "This status is already a favorite."
msgstr "זהו כבר זיהוי ה-Jabber שלך."
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
msgid "Could not create favorite."
msgstr ""
@@ -466,7 +464,7 @@ msgstr "לא נמצא"
msgid "You are already a member of that group."
msgstr "כבר נכנסת למערכת!"
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:221
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
msgid "You have been blocked from that group by the admin."
msgstr ""
@@ -485,11 +483,18 @@ msgstr "לא שלחנו אלינו את הפרופיל הזה"
msgid "Could not remove user %1$s from group %2$s."
msgstr "נכשלה יצירת OpenID מתוך: %s"
-#: actions/apigrouplist.php:95
+#. TRANS: %s is a user name
+#: actions/apigrouplist.php:97
#, 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
+#, fuzzy, php-format
+msgid "%1$s groups %2$s is a member of."
+msgstr "לא שלחנו אלינו את הפרופיל הזה"
+
#: actions/apigrouplistall.php:90 actions/usergroups.php:62
#, php-format
msgid "%s groups"
@@ -518,7 +523,7 @@ msgstr "גודל לא חוקי."
#: 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:337
+#: actions/profilesettings.php:194 actions/recoverpassword.php:350
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
@@ -579,16 +584,16 @@ msgid ""
"give access to your %4$s account to third parties you trust."
msgstr ""
-#: actions/apioauthauthorize.php:310 lib/action.php:438
+#: actions/apioauthauthorize.php:310 lib/action.php:437
#, fuzzy
msgid "Account"
msgstr "אודות"
#: actions/apioauthauthorize.php:313 actions/login.php:230
#: actions/profilesettings.php:106 actions/register.php:424
-#: actions/showgroup.php:244 actions/tagother.php:94
+#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
-#: lib/userprofile.php:131
+#: lib/userprofile.php:132
msgid "Nickname"
msgstr "כינוי"
@@ -661,12 +666,12 @@ msgstr ""
msgid "Unsupported format."
msgstr "פורמט התמונה אינו נתמך."
-#: actions/apitimelinefavorites.php:108
+#: actions/apitimelinefavorites.php:109
#, fuzzy, php-format
msgid "%1$s / Favorites from %2$s"
msgstr "הסטטוס של %1$s ב-%2$s "
-#: actions/apitimelinefavorites.php:117
+#: actions/apitimelinefavorites.php:118
#, fuzzy, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "מיקרובלוג מאת %s"
@@ -676,7 +681,7 @@ msgstr "מיקרובלוג מאת %s"
msgid "%1$s / Updates mentioning %2$s"
msgstr "הסטטוס של %1$s ב-%2$s "
-#: actions/apitimelinementions.php:127
+#: actions/apitimelinementions.php:130
#, php-format
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr ""
@@ -686,7 +691,7 @@ msgstr ""
msgid "%s public timeline"
msgstr ""
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr ""
@@ -701,12 +706,12 @@ msgstr "תגובת עבור %s"
msgid "Repeats of %s"
msgstr "תגובת עבור %s"
-#: actions/apitimelinetag.php:102 actions/tag.php:67
+#: actions/apitimelinetag.php:104 actions/tag.php:67
#, php-format
msgid "Notices tagged with %s"
msgstr ""
-#: actions/apitimelinetag.php:104 actions/tagrss.php:65
+#: actions/apitimelinetag.php:106 actions/tagrss.php:65
#, fuzzy, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "מיקרובלוג מאת %s"
@@ -736,7 +741,7 @@ msgstr "אין גודל."
msgid "Invalid size."
msgstr "גודל לא חוקי."
-#: actions/avatarsettings.php:67 actions/showgroup.php:229
+#: actions/avatarsettings.php:67 actions/showgroup.php:230
#: lib/accountsettingsaction.php:112
msgid "Avatar"
msgstr "תמונה"
@@ -769,7 +774,7 @@ msgid "Preview"
msgstr ""
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:655
+#: lib/deleteuserform.php:66 lib/noticelist.php:659
#, fuzzy
msgid "Delete"
msgstr "מחק"
@@ -782,23 +787,28 @@ msgstr "ההעלה"
msgid "Crop"
msgstr ""
-#: actions/avatarsettings.php:328
+#: actions/avatarsettings.php:305
+#, fuzzy
+msgid "No file uploaded."
+msgstr "העלאה חלקית."
+
+#: actions/avatarsettings.php:332
msgid "Pick a square area of the image to be your avatar"
msgstr ""
-#: actions/avatarsettings.php:343 actions/grouplogo.php:380
+#: actions/avatarsettings.php:347 actions/grouplogo.php:380
msgid "Lost our file data."
msgstr ""
-#: actions/avatarsettings.php:366
+#: actions/avatarsettings.php:370
msgid "Avatar updated."
msgstr "התמונה עודכנה."
-#: actions/avatarsettings.php:369
+#: actions/avatarsettings.php:373
msgid "Failed updating avatar."
msgstr "עדכון התמונה נכשל."
-#: actions/avatarsettings.php:393
+#: actions/avatarsettings.php:397
#, fuzzy
msgid "Avatar deleted."
msgstr "התמונה עודכנה."
@@ -855,8 +865,8 @@ msgstr ""
#: actions/groupunblock.php:86 actions/joingroup.php:82
#: actions/joingroup.php:93 actions/leavegroup.php:82
#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212
-#: lib/command.php:260
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162
+#: lib/command.php:358
#, fuzzy
msgid "No such group."
msgstr "אין הודעה כזו."
@@ -943,7 +953,7 @@ msgid "Conversation"
msgstr "מיקום"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:218 lib/searchgroupnav.php:82
+#: lib/profileaction.php:224 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "הודעות"
@@ -965,7 +975,7 @@ msgstr "לא שלחנו אלינו את הפרופיל הזה"
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1217
+#: lib/action.php:1219
msgid "There was a problem with your session token."
msgstr ""
@@ -1025,7 +1035,7 @@ msgstr ""
msgid "Do not delete this notice"
msgstr "אין הודעה כזו."
-#: actions/deletenotice.php:146 lib/noticelist.php:655
+#: actions/deletenotice.php:146 lib/noticelist.php:659
msgid "Delete this notice"
msgstr ""
@@ -1171,7 +1181,7 @@ msgstr ""
#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:208
+#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
#: actions/tagother.php:154 actions/useradminpanel.php:294
#: lib/applicationeditform.php:333 lib/applicationeditform.php:334
#: lib/designsettings.php:256 lib/groupeditform.php:202
@@ -1297,7 +1307,7 @@ msgstr "הביוגרפיה ארוכה מידי (לכל היותר 140 אותיו
msgid "Could not update group."
msgstr "עידכון המשתמש נכשל."
-#: actions/editgroup.php:264 classes/User_group.php:493
+#: actions/editgroup.php:264 classes/User_group.php:496
#, fuzzy
msgid "Could not create aliases."
msgstr "שמירת מידע התמונה נכשל"
@@ -1798,7 +1808,7 @@ msgstr ""
msgid "Updates from members of %1$s on %2$s!"
msgstr "מיקרובלוג מאת %s"
-#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232
+#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244
#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr "קבוצות"
@@ -2006,7 +2016,7 @@ msgstr ""
msgid "You are already subscribed to these users:"
msgstr ""
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
#, php-format
msgid "%1$s (%2$s)"
msgstr ""
@@ -2108,7 +2118,7 @@ msgstr ""
msgid "You must be logged in to leave a group."
msgstr ""
-#: actions/leavegroup.php:100 lib/command.php:265
+#: actions/leavegroup.php:100 lib/command.php:363
#, fuzzy
msgid "You are not a member of that group."
msgstr "לא שלחנו אלינו את הפרופיל הזה"
@@ -2223,12 +2233,12 @@ msgstr ""
msgid "New message"
msgstr "הודעה חדשה"
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
msgid "You can't send a message to this user."
msgstr ""
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342
-#: lib/command.php:475
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
+#: lib/command.php:529
msgid "No content!"
msgstr "אין תוכן!"
@@ -2236,7 +2246,7 @@ msgstr "אין תוכן!"
msgid "No recipient specified."
msgstr ""
-#: actions/newmessage.php:164 lib/command.php:361
+#: actions/newmessage.php:164 lib/command.php:462
msgid ""
"Don't send a message to yourself; just say it to yourself quietly instead."
msgstr ""
@@ -2251,7 +2261,7 @@ msgstr "הודעה חדשה"
msgid "Direct message to %s sent."
msgstr ""
-#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189
msgid "Ajax Error"
msgstr ""
@@ -2259,7 +2269,7 @@ msgstr ""
msgid "New notice"
msgstr "הודעה חדשה"
-#: actions/newnotice.php:211
+#: actions/newnotice.php:217
#, fuzzy
msgid "Notice posted"
msgstr "הודעות"
@@ -2366,7 +2376,7 @@ msgstr ""
msgid "Notice has no profile"
msgstr "להודעה אין פרופיל"
-#: actions/oembed.php:86 actions/shownotice.php:180
+#: actions/oembed.php:86 actions/shownotice.php:175
#, php-format
msgid "%1$s's status on %2$s"
msgstr "הסטטוס של %1$s ב-%2$s "
@@ -2380,8 +2390,8 @@ msgstr "התחבר"
msgid "Only "
msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042
-#: lib/apiaction.php:1070 lib/apiaction.php:1179
+#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1068
+#: lib/apiaction.php:1096 lib/apiaction.php:1212
msgid "Not a supported data format."
msgstr ""
@@ -2521,7 +2531,7 @@ msgstr "הסיסמה הישנה לא נכונה"
msgid "Error saving user; invalid."
msgstr "שגיאה בשמירת שם המשתמש, לא עומד בכללים."
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
msgid "Can't save new password."
msgstr "לא ניתן לשמור את הסיסמה"
@@ -2744,8 +2754,8 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr "1 עד 64 אותיות אנגליות קטנות או מספרים, ללא סימני פיסוק או רווחים."
#: actions/profilesettings.php:111 actions/register.php:448
-#: actions/showgroup.php:255 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:149
+#: actions/showgroup.php:256 actions/tagother.php:104
+#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "שם מלא"
@@ -2773,9 +2783,9 @@ msgid "Bio"
msgstr "ביוגרפיה"
#: actions/profilesettings.php:132 actions/register.php:471
-#: actions/showgroup.php:264 actions/tagother.php:112
+#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
-#: lib/userprofile.php:164
+#: lib/userprofile.php:165
msgid "Location"
msgstr "מיקום"
@@ -2789,7 +2799,7 @@ msgstr ""
#: actions/profilesettings.php:145 actions/tagother.php:149
#: actions/tagother.php:209 lib/subscriptionlist.php:106
-#: lib/subscriptionlist.php:108 lib/userprofile.php:209
+#: lib/subscriptionlist.php:108 lib/userprofile.php:210
msgid "Tags"
msgstr ""
@@ -3019,7 +3029,7 @@ msgstr "איפוס סיסמה"
msgid "Recover password"
msgstr "סיסמת שיחזור"
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
msgid "Password recovery requested"
msgstr "התבקש שיחזור סיסמה"
@@ -3039,41 +3049,41 @@ msgstr "איפוס"
msgid "Enter a nickname or email address."
msgstr ""
-#: actions/recoverpassword.php:272
+#: actions/recoverpassword.php:282
msgid "No user with that email address or username."
msgstr ""
-#: actions/recoverpassword.php:287
+#: actions/recoverpassword.php:299
msgid "No registered email address for that user."
msgstr ""
-#: actions/recoverpassword.php:301
+#: actions/recoverpassword.php:313
msgid "Error saving address confirmation."
msgstr "שגיאה בשמירת אישור הכתובת."
-#: actions/recoverpassword.php:325
+#: actions/recoverpassword.php:338
msgid ""
"Instructions for recovering your password have been sent to the email "
"address registered to your account."
msgstr ""
-#: actions/recoverpassword.php:344
+#: actions/recoverpassword.php:357
msgid "Unexpected password reset."
msgstr "איפוס סיסמה לא צפוי."
-#: actions/recoverpassword.php:352
+#: actions/recoverpassword.php:365
msgid "Password must be 6 chars or more."
msgstr "הסיסמה חייבת להיות בת לפחות 6 אותיות."
-#: actions/recoverpassword.php:356
+#: actions/recoverpassword.php:369
msgid "Password and confirmation do not match."
msgstr "הסיסמה ואישורה אינן תואמות."
-#: actions/recoverpassword.php:375 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:248
msgid "Error setting user."
msgstr "שגיאה ביצירת שם המשתמש."
-#: actions/recoverpassword.php:382
+#: actions/recoverpassword.php:395
msgid "New password successfully saved. You are now logged in."
msgstr "הסיסמה החדשה נשמרה בהצלחה. אתה מחובר למערכת."
@@ -3217,7 +3227,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "כתובת הפרופיל שלך בשרות ביקרובלוג תואם אחר"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:394
+#: lib/userprofile.php:406
msgid "Subscribe"
msgstr "הירשם כמנוי"
@@ -3258,7 +3268,7 @@ msgstr "לא ניתן להירשם ללא הסכמה לרשיון"
msgid "You already repeated that notice."
msgstr "כבר נכנסת למערכת!"
-#: actions/repeat.php:114 lib/noticelist.php:674
+#: actions/repeat.php:114 lib/noticelist.php:678
#, fuzzy
msgid "Repeated"
msgstr "צור"
@@ -3407,8 +3417,8 @@ msgstr "מיקום"
msgid "Description"
msgstr "הרשמות"
-#: actions/showapplication.php:192 actions/showgroup.php:438
-#: lib/profileaction.php:176
+#: actions/showapplication.php:192 actions/showgroup.php:439
+#: lib/profileaction.php:182
msgid "Statistics"
msgstr "סטטיסטיקה"
@@ -3518,71 +3528,71 @@ msgstr ""
msgid "%1$s group, page %2$d"
msgstr "כל המנויים"
-#: actions/showgroup.php:226
+#: actions/showgroup.php:227
#, fuzzy
msgid "Group profile"
msgstr "אין הודעה כזו."
-#: actions/showgroup.php:271 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:177
+#: actions/showgroup.php:272 actions/tagother.php:118
+#: actions/userauthorization.php:175 lib/userprofile.php:178
msgid "URL"
msgstr ""
-#: actions/showgroup.php:282 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:194
+#: actions/showgroup.php:283 actions/tagother.php:128
+#: actions/userauthorization.php:187 lib/userprofile.php:195
#, fuzzy
msgid "Note"
msgstr "הודעות"
-#: actions/showgroup.php:292 lib/groupeditform.php:184
+#: actions/showgroup.php:293 lib/groupeditform.php:184
msgid "Aliases"
msgstr ""
-#: actions/showgroup.php:301
+#: actions/showgroup.php:302
msgid "Group actions"
msgstr ""
-#: actions/showgroup.php:337
+#: actions/showgroup.php:338
#, fuzzy, php-format
msgid "Notice feed for %s group (RSS 1.0)"
msgstr "הזנת הודעות של %s"
-#: actions/showgroup.php:343
+#: actions/showgroup.php:344
#, fuzzy, php-format
msgid "Notice feed for %s group (RSS 2.0)"
msgstr "הזנת הודעות של %s"
-#: actions/showgroup.php:349
+#: actions/showgroup.php:350
#, fuzzy, php-format
msgid "Notice feed for %s group (Atom)"
msgstr "הזנת הודעות של %s"
-#: actions/showgroup.php:354
+#: actions/showgroup.php:355
#, fuzzy, php-format
msgid "FOAF for %s group"
msgstr "הזנת הודעות של %s"
-#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91
+#: actions/showgroup.php:391 actions/showgroup.php:448 lib/groupnav.php:91
#, fuzzy
msgid "Members"
msgstr "חבר מאז"
-#: actions/showgroup.php:395 lib/profileaction.php:117
-#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95
-#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71
+#: actions/showgroup.php:396 lib/profileaction.php:117
+#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95
+#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
msgid "(None)"
msgstr ""
-#: actions/showgroup.php:401
+#: actions/showgroup.php:402
msgid "All members"
msgstr ""
-#: actions/showgroup.php:441
+#: actions/showgroup.php:442
#, fuzzy
msgid "Created"
msgstr "צור"
-#: actions/showgroup.php:457
+#: actions/showgroup.php:458
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3592,7 +3602,7 @@ msgid ""
"of this group and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
-#: actions/showgroup.php:463
+#: actions/showgroup.php:464
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3601,7 +3611,7 @@ msgid ""
"their life and interests. "
msgstr ""
-#: actions/showgroup.php:491
+#: actions/showgroup.php:492
msgid "Admins"
msgstr ""
@@ -3730,7 +3740,7 @@ msgid "Unknown language \"%s\"."
msgstr ""
#: actions/siteadminpanel.php:165
-msgid "Minimum text limit is 140 characters."
+msgid "Minimum text limit is 0 (unlimited)."
msgstr ""
#: actions/siteadminpanel.php:171
@@ -4004,8 +4014,7 @@ msgstr "הגדרות"
msgid "You are not subscribed to that profile."
msgstr "לא שלחנו אלינו את הפרופיל הזה"
-#: actions/subedit.php:83 classes/Subscription.php:89
-#: classes/Subscription.php:116
+#: actions/subedit.php:83 classes/Subscription.php:132
#, fuzzy
msgid "Could not save subscription."
msgstr "יצירת המנוי נכשלה."
@@ -4100,12 +4109,12 @@ msgstr ""
msgid "%s is not listening to anyone."
msgstr "%1$s כעת מאזין להודעות שלך ב-%2$s"
-#: actions/subscriptions.php:199
+#: actions/subscriptions.php:208
#, fuzzy
msgid "Jabber"
msgstr "אין זיהוי Jabber כזה."
-#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:222 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr "סמס"
@@ -4139,13 +4148,13 @@ msgstr "אין מסמך כזה."
msgid "Tag %s"
msgstr ""
-#: actions/tagother.php:77 lib/userprofile.php:75
+#: actions/tagother.php:77 lib/userprofile.php:76
#, fuzzy
msgid "User profile"
msgstr "למשתמש אין פרופיל."
#: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:102
+#: lib/userprofile.php:103
msgid "Photo"
msgstr ""
@@ -4473,7 +4482,7 @@ msgstr ""
msgid "Plugins"
msgstr ""
-#: actions/version.php:196 lib/action.php:767
+#: actions/version.php:196 lib/action.php:766
#, fuzzy
msgid "Version"
msgstr "אישי"
@@ -4482,19 +4491,19 @@ msgstr "אישי"
msgid "Author(s)"
msgstr ""
-#: classes/File.php:144
+#: classes/File.php:169
#, 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:154
+#: classes/File.php:179
#, php-format
msgid "A file this large would exceed your user quota of %d bytes."
msgstr ""
-#: classes/File.php:161
+#: classes/File.php:186
#, php-format
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
@@ -4536,103 +4545,103 @@ msgstr ""
msgid "Could not update message with new URI."
msgstr ""
-#: classes/Notice.php:172
+#: classes/Notice.php:175
#, php-format
msgid "DB error inserting hashtag: %s"
msgstr ""
-#: classes/Notice.php:241
+#: classes/Notice.php:244
#, fuzzy
msgid "Problem saving notice. Too long."
msgstr "בעיה בשמירת ההודעה."
-#: classes/Notice.php:245
+#: classes/Notice.php:248
#, fuzzy
msgid "Problem saving notice. Unknown user."
msgstr "בעיה בשמירת ההודעה."
-#: classes/Notice.php:250
+#: classes/Notice.php:253
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
-#: classes/Notice.php:256
+#: classes/Notice.php:259
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
msgstr ""
-#: classes/Notice.php:262
+#: classes/Notice.php:265
msgid "You are banned from posting notices on this site."
msgstr ""
-#: classes/Notice.php:328 classes/Notice.php:354
+#: classes/Notice.php:331 classes/Notice.php:357
msgid "Problem saving notice."
msgstr "בעיה בשמירת ההודעה."
-#: classes/Notice.php:927
+#: classes/Notice.php:943
#, fuzzy
msgid "Problem saving group inbox."
msgstr "בעיה בשמירת ההודעה."
-#: classes/Notice.php:1459
+#: classes/Notice.php:1481
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
-#: classes/Subscription.php:66 lib/oauthstore.php:465
+#: classes/Subscription.php:74 lib/oauthstore.php:465
msgid "You have been banned from subscribing."
msgstr ""
-#: classes/Subscription.php:70
+#: classes/Subscription.php:78
msgid "Already subscribed!"
msgstr ""
-#: classes/Subscription.php:74
+#: classes/Subscription.php:82
#, fuzzy
msgid "User has blocked you."
msgstr "למשתמש אין פרופיל."
-#: classes/Subscription.php:157
+#: classes/Subscription.php:167
#, fuzzy
msgid "Not subscribed!"
msgstr "לא מנוי!"
-#: classes/Subscription.php:163
+#: classes/Subscription.php:173
#, fuzzy
msgid "Couldn't delete self-subscription."
msgstr "מחיקת המנוי לא הצליחה."
-#: classes/Subscription.php:190
+#: classes/Subscription.php:200
#, fuzzy
msgid "Couldn't delete subscription OMB token."
msgstr "מחיקת המנוי לא הצליחה."
-#: classes/Subscription.php:201 lib/subs.php:69
+#: classes/Subscription.php:211
msgid "Couldn't delete subscription."
msgstr "מחיקת המנוי לא הצליחה."
-#: classes/User.php:373
+#: classes/User.php:363
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr ""
-#: classes/User_group.php:477
+#: classes/User_group.php:480
#, fuzzy
msgid "Could not create group."
msgstr "שמירת מידע התמונה נכשל"
-#: classes/User_group.php:486
+#: classes/User_group.php:489
#, fuzzy
msgid "Could not set group URI."
msgstr "יצירת המנוי נכשלה."
-#: classes/User_group.php:507
+#: classes/User_group.php:510
#, fuzzy
msgid "Could not set group membership."
msgstr "יצירת המנוי נכשלה."
-#: classes/User_group.php:521
+#: classes/User_group.php:524
#, fuzzy
msgid "Could not save local group info."
msgstr "יצירת המנוי נכשלה."
@@ -4676,122 +4685,122 @@ msgstr "הסטטוס של %1$s ב-%2$s "
msgid "Untitled page"
msgstr ""
-#: lib/action.php:424
+#: lib/action.php:423
msgid "Primary site navigation"
msgstr ""
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:430
+#: lib/action.php:429
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr ""
-#: lib/action.php:433
+#: lib/action.php:432
#, fuzzy
msgctxt "MENU"
msgid "Personal"
msgstr "אישי"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:435
+#: lib/action.php:434
#, fuzzy
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "שנה סיסמה"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:440
+#: lib/action.php:439
#, fuzzy
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "נכשלה ההפניה לשרת: %s"
-#: lib/action.php:443
+#: lib/action.php:442
msgid "Connect"
msgstr "התחבר"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:446
+#: lib/action.php:445
#, fuzzy
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "הרשמות"
-#: lib/action.php:449
+#: lib/action.php:448
msgctxt "MENU"
msgid "Admin"
msgstr ""
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:453
+#: lib/action.php:452
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr ""
-#: lib/action.php:456
+#: lib/action.php:455
#, fuzzy
msgctxt "MENU"
msgid "Invite"
msgstr "גודל לא חוקי."
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:462
+#: lib/action.php:461
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr ""
-#: lib/action.php:465
+#: lib/action.php:464
#, fuzzy
msgctxt "MENU"
msgid "Logout"
msgstr "צא"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:470
+#: lib/action.php:469
#, fuzzy
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "צור חשבון חדש"
-#: lib/action.php:473
+#: lib/action.php:472
#, fuzzy
msgctxt "MENU"
msgid "Register"
msgstr "הירשם"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:476
+#: lib/action.php:475
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr ""
-#: lib/action.php:479
+#: lib/action.php:478
#, fuzzy
msgctxt "MENU"
msgid "Login"
msgstr "היכנס"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:482
+#: lib/action.php:481
#, fuzzy
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "עזרה"
-#: lib/action.php:485
+#: lib/action.php:484
#, fuzzy
msgctxt "MENU"
msgid "Help"
msgstr "עזרה"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:488
+#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr ""
-#: lib/action.php:491
+#: lib/action.php:490
#, fuzzy
msgctxt "MENU"
msgid "Search"
@@ -4799,62 +4808,62 @@ msgstr "חיפוש"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:513 lib/adminpanelaction.php:398
+#: lib/action.php:512 lib/adminpanelaction.php:398
#, fuzzy
msgid "Site notice"
msgstr "הודעה חדשה"
-#: lib/action.php:579
+#: lib/action.php:578
msgid "Local views"
msgstr ""
-#: lib/action.php:645
+#: lib/action.php:644
#, fuzzy
msgid "Page notice"
msgstr "הודעה חדשה"
-#: lib/action.php:747
+#: lib/action.php:746
#, fuzzy
msgid "Secondary site navigation"
msgstr "הרשמות"
-#: lib/action.php:752
+#: lib/action.php:751
msgid "Help"
msgstr "עזרה"
-#: lib/action.php:754
+#: lib/action.php:753
msgid "About"
msgstr "אודות"
-#: lib/action.php:756
+#: lib/action.php:755
msgid "FAQ"
msgstr "רשימת שאלות נפוצות"
-#: lib/action.php:760
+#: lib/action.php:759
msgid "TOS"
msgstr ""
-#: lib/action.php:763
+#: lib/action.php:762
msgid "Privacy"
msgstr "פרטיות"
-#: lib/action.php:765
+#: lib/action.php:764
msgid "Source"
msgstr "מקור"
-#: lib/action.php:769
+#: lib/action.php:768
msgid "Contact"
msgstr "צור קשר"
-#: lib/action.php:771
+#: lib/action.php:770
msgid "Badge"
msgstr ""
-#: lib/action.php:799
+#: lib/action.php:798
msgid "StatusNet software license"
msgstr ""
-#: lib/action.php:802
+#: lib/action.php:803
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4863,12 +4872,12 @@ msgstr ""
"**%%site.name%%** הוא שרות ביקרובלוג הניתן על ידי [%%site.broughtby%%](%%"
"site.broughtbyurl%%)."
-#: lib/action.php:804
+#: lib/action.php:805
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** הוא שרות ביקרובלוג."
-#: lib/action.php:806
+#: lib/action.php:808
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4879,56 +4888,60 @@ msgstr ""
"s, המופצת תחת רשיון [GNU Affero General Public License](http://www.fsf.org/"
"licensing/licenses/agpl-3.0.html)"
-#: lib/action.php:821
+#: lib/action.php:823
#, fuzzy
msgid "Site content license"
msgstr "הודעה חדשה"
-#: lib/action.php:826
+#: lib/action.php:828
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
-#: lib/action.php:831
+#: lib/action.php:833
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
-#: lib/action.php:834
+#: lib/action.php:836
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
-#: lib/action.php:847
+#: lib/action.php:849
msgid "All "
msgstr ""
-#: lib/action.php:853
+#: lib/action.php:855
msgid "license."
msgstr ""
-#: lib/action.php:1152
+#: lib/action.php:1154
msgid "Pagination"
msgstr ""
-#: lib/action.php:1161
+#: lib/action.php:1163
#, fuzzy
msgid "After"
msgstr "<< אחרי"
-#: lib/action.php:1169
+#: lib/action.php:1171
#, fuzzy
msgid "Before"
msgstr "לפני >>"
-#: lib/activity.php:453
+#: lib/activity.php:120
+msgid "Expecting a root feed element but got a whole XML document."
+msgstr ""
+
+#: lib/activityutils.php:208
msgid "Can't handle remote content yet."
msgstr ""
-#: lib/activity.php:481
+#: lib/activityutils.php:236
msgid "Can't handle embedded XML content yet."
msgstr ""
-#: lib/activity.php:485
+#: lib/activityutils.php:240
msgid "Can't handle embedded Base64 content yet."
msgstr ""
@@ -5027,7 +5040,7 @@ msgstr "הרשמות"
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
-#: lib/apiauth.php:272
+#: lib/apiauth.php:276
#, php-format
msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s"
msgstr ""
@@ -5106,11 +5119,11 @@ msgstr "הסר"
msgid "Attachments"
msgstr ""
-#: lib/attachmentlist.php:265
+#: lib/attachmentlist.php:263
msgid "Author"
msgstr ""
-#: lib/attachmentlist.php:278
+#: lib/attachmentlist.php:276
#, fuzzy
msgid "Provider"
msgstr "פרופיל"
@@ -5133,37 +5146,52 @@ msgstr "הסיסמה נשמרה."
msgid "Password changing is not allowed"
msgstr "הסיסמה נשמרה."
-#: lib/channel.php:138 lib/channel.php:158
+#: lib/channel.php:157 lib/channel.php:177
msgid "Command results"
msgstr ""
-#: lib/channel.php:210 lib/mailhandler.php:142
+#: lib/channel.php:229 lib/mailhandler.php:142
msgid "Command complete"
msgstr ""
-#: lib/channel.php:221
+#: lib/channel.php:240
msgid "Command failed"
msgstr ""
-#: lib/command.php:44
-msgid "Sorry, this command is not yet implemented."
-msgstr ""
+#: lib/command.php:83 lib/command.php:105
+#, fuzzy
+msgid "Notice with that id does not exist"
+msgstr "אין פרופיל תואם לפרופיל המרוחק "
-#: lib/command.php:88
+#: lib/command.php:99 lib/command.php:570
+#, fuzzy
+msgid "User has no last notice"
+msgstr "למשתמש אין פרופיל."
+
+#: lib/command.php:125
#, php-format
msgid "Could not find a user with nickname %s"
msgstr "עידכון המשתמש נכשל."
-#: lib/command.php:92
+#: lib/command.php:143
+#, fuzzy, php-format
+msgid "Could not find a local user with nickname %s"
+msgstr "עידכון המשתמש נכשל."
+
+#: lib/command.php:176
+msgid "Sorry, this command is not yet implemented."
+msgstr ""
+
+#: lib/command.php:221
msgid "It does not make a lot of sense to nudge yourself!"
msgstr ""
-#: lib/command.php:99
+#: lib/command.php:228
#, fuzzy, php-format
msgid "Nudge sent to %s"
msgstr "תגובת עבור %s"
-#: lib/command.php:126
+#: lib/command.php:254
#, php-format
msgid ""
"Subscriptions: %1$s\n"
@@ -5171,206 +5199,202 @@ msgid ""
"Notices: %3$s"
msgstr ""
-#: lib/command.php:152 lib/command.php:390 lib/command.php:451
-#, fuzzy
-msgid "Notice with that id does not exist"
-msgstr "אין פרופיל תואם לפרופיל המרוחק "
-
-#: lib/command.php:168 lib/command.php:406 lib/command.php:467
-#: lib/command.php:523
-#, fuzzy
-msgid "User has no last notice"
-msgstr "למשתמש אין פרופיל."
-
-#: lib/command.php:190
+#: lib/command.php:296
msgid "Notice marked as fave."
msgstr ""
-#: lib/command.php:217
+#: lib/command.php:317
#, fuzzy
msgid "You are already a member of that group"
msgstr "כבר נכנסת למערכת!"
-#: lib/command.php:231
+#: lib/command.php:331
#, fuzzy, php-format
msgid "Could not join user %s to group %s"
msgstr "נכשלה ההפניה לשרת: %s"
-#: lib/command.php:236
+#: lib/command.php:336
#, fuzzy, php-format
msgid "%s joined group %s"
msgstr "הסטטוס של %1$s ב-%2$s "
-#: lib/command.php:275
+#: lib/command.php:373
#, fuzzy, php-format
msgid "Could not remove user %s to group %s"
msgstr "נכשלה יצירת OpenID מתוך: %s"
-#: lib/command.php:280
+#: lib/command.php:378
#, fuzzy, php-format
msgid "%s left group %s"
msgstr "הסטטוס של %1$s ב-%2$s "
-#: lib/command.php:309
+#: lib/command.php:401
#, fuzzy, php-format
msgid "Fullname: %s"
msgstr "שם מלא"
-#: lib/command.php:312 lib/mail.php:258
+#: lib/command.php:404 lib/mail.php:258
#, php-format
msgid "Location: %s"
msgstr ""
-#: lib/command.php:315 lib/mail.php:260
+#: lib/command.php:407 lib/mail.php:260
#, php-format
msgid "Homepage: %s"
msgstr ""
-#: lib/command.php:318
+#: lib/command.php:410
#, php-format
msgid "About: %s"
msgstr "אודות: %s"
-#: lib/command.php:349
+#: lib/command.php:437
+#, php-format
+msgid ""
+"%s is a remote profile; you can only send direct messages to users on the "
+"same server."
+msgstr ""
+
+#: lib/command.php:450
#, php-format
msgid "Message too long - maximum is %d characters, you sent %d"
msgstr ""
-#: lib/command.php:367
+#: lib/command.php:468
#, php-format
msgid "Direct message to %s sent"
msgstr ""
-#: lib/command.php:369
+#: lib/command.php:470
msgid "Error sending direct message."
msgstr ""
-#: lib/command.php:413
+#: lib/command.php:490
#, fuzzy
msgid "Cannot repeat your own notice"
msgstr "לא ניתן להירשם ללא הסכמה לרשיון"
-#: lib/command.php:418
+#: lib/command.php:495
#, fuzzy
msgid "Already repeated that notice"
msgstr "כבר נכנסת למערכת!"
-#: lib/command.php:426
+#: lib/command.php:503
#, fuzzy, php-format
msgid "Notice from %s repeated"
msgstr "הודעות"
-#: lib/command.php:428
+#: lib/command.php:505
#, fuzzy
msgid "Error repeating notice."
msgstr "בעיה בשמירת ההודעה."
-#: lib/command.php:482
+#: lib/command.php:536
#, php-format
msgid "Notice too long - maximum is %d characters, you sent %d"
msgstr ""
-#: lib/command.php:491
+#: lib/command.php:545
#, fuzzy, php-format
msgid "Reply to %s sent"
msgstr "תגובת עבור %s"
-#: lib/command.php:493
+#: lib/command.php:547
#, fuzzy
msgid "Error saving notice."
msgstr "בעיה בשמירת ההודעה."
-#: lib/command.php:547
+#: lib/command.php:594
msgid "Specify the name of the user to subscribe to"
msgstr ""
-#: lib/command.php:554 lib/command.php:589
+#: lib/command.php:602
#, fuzzy
-msgid "No such user"
-msgstr "אין משתמש כזה."
+msgid "Can't subscribe to OMB profiles by command."
+msgstr "לא שלחנו אלינו את הפרופיל הזה"
-#: lib/command.php:561
+#: lib/command.php:608
#, php-format
msgid "Subscribed to %s"
msgstr ""
-#: lib/command.php:582 lib/command.php:685
+#: lib/command.php:629 lib/command.php:728
msgid "Specify the name of the user to unsubscribe from"
msgstr ""
-#: lib/command.php:595
+#: lib/command.php:638
#, php-format
msgid "Unsubscribed from %s"
msgstr ""
-#: lib/command.php:613 lib/command.php:636
+#: lib/command.php:656 lib/command.php:679
msgid "Command not yet implemented."
msgstr ""
-#: lib/command.php:616
+#: lib/command.php:659
msgid "Notification off."
msgstr ""
-#: lib/command.php:618
+#: lib/command.php:661
msgid "Can't turn off notification."
msgstr ""
-#: lib/command.php:639
+#: lib/command.php:682
msgid "Notification on."
msgstr ""
-#: lib/command.php:641
+#: lib/command.php:684
msgid "Can't turn on notification."
msgstr ""
-#: lib/command.php:654
+#: lib/command.php:697
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:665
+#: lib/command.php:708
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:692
+#: lib/command.php:735
#, fuzzy, php-format
msgid "Unsubscribed %s"
msgstr "בטל מנוי"
-#: lib/command.php:709
+#: lib/command.php:752
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "לא שלחנו אלינו את הפרופיל הזה"
-#: lib/command.php:711
+#: lib/command.php:754
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "לא שלחנו אלינו את הפרופיל הזה"
msgstr[1] "לא שלחנו אלינו את הפרופיל הזה"
-#: lib/command.php:731
+#: lib/command.php:774
#, fuzzy
msgid "No one is subscribed to you."
msgstr "הרשמה מרוחקת"
-#: lib/command.php:733
+#: lib/command.php:776
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "הרשמה מרוחקת"
msgstr[1] "הרשמה מרוחקת"
-#: lib/command.php:753
+#: lib/command.php:796
#, fuzzy
msgid "You are not a member of any groups."
msgstr "לא שלחנו אלינו את הפרופיל הזה"
-#: lib/command.php:755
+#: lib/command.php:798
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "לא שלחנו אלינו את הפרופיל הזה"
msgstr[1] "לא שלחנו אלינו את הפרופיל הזה"
-#: lib/command.php:769
+#: lib/command.php:812
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5412,20 +5436,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:148
+#: lib/common.php:135
#, fuzzy
msgid "No configuration file found. "
msgstr "אין קוד אישור."
-#: lib/common.php:149
+#: lib/common.php:136
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:151
+#: lib/common.php:138
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:152
+#: lib/common.php:139
msgid "Go to the installer."
msgstr ""
@@ -5608,50 +5632,50 @@ msgstr ""
msgid "This page is not available in a media type you accept"
msgstr "עמוד זה אינו זמין בסוג מדיה שאתה יכול לקבל"
-#: lib/imagefile.php:75
+#: lib/imagefile.php:72
+msgid "Unsupported image file format."
+msgstr "פורמט התמונה אינו נתמך."
+
+#: lib/imagefile.php:88
#, fuzzy, php-format
msgid "That file is too big. The maximum file size is %s."
msgstr "זה ארוך מידי. אורך מירבי להודעה הוא 140 אותיות."
-#: lib/imagefile.php:80
+#: lib/imagefile.php:93
msgid "Partial upload."
msgstr "העלאה חלקית."
-#: lib/imagefile.php:88 lib/mediafile.php:170
+#: lib/imagefile.php:101 lib/mediafile.php:170
msgid "System error uploading file."
msgstr "שגיאת מערכת בהעלאת הקובץ."
-#: lib/imagefile.php:96
+#: lib/imagefile.php:109
msgid "Not an image or corrupt file."
msgstr "זהו לא קובץ תמונה, או שחל בו שיבוש."
-#: lib/imagefile.php:109
-msgid "Unsupported image file format."
-msgstr "פורמט התמונה אינו נתמך."
-
#: lib/imagefile.php:122
#, fuzzy
msgid "Lost our file."
msgstr "אין הודעה כזו."
-#: lib/imagefile.php:166 lib/imagefile.php:231
+#: lib/imagefile.php:163 lib/imagefile.php:224
msgid "Unknown file type"
msgstr ""
-#: lib/imagefile.php:251
+#: lib/imagefile.php:244
msgid "MB"
msgstr ""
-#: lib/imagefile.php:253
+#: lib/imagefile.php:246
msgid "kB"
msgstr ""
-#: lib/jabber.php:220
+#: lib/jabber.php:387
#, php-format
msgid "[%s]"
msgstr ""
-#: lib/jabber.php:400
+#: lib/jabber.php:567
#, php-format
msgid "Unknown inbox source %d."
msgstr ""
@@ -5855,7 +5879,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:482
+#: lib/mailbox.php:227 lib/noticelist.php:486
msgid "from"
msgstr ""
@@ -5986,52 +6010,52 @@ msgid ""
"try again later"
msgstr ""
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr ""
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
#, fuzzy
msgid "N"
msgstr "לא"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "S"
msgstr ""
-#: lib/noticelist.php:431
+#: lib/noticelist.php:432
msgid "E"
msgstr ""
-#: lib/noticelist.php:431
+#: lib/noticelist.php:432
msgid "W"
msgstr ""
-#: lib/noticelist.php:438
+#: lib/noticelist.php:439
msgid "at"
msgstr ""
-#: lib/noticelist.php:566
+#: lib/noticelist.php:570
#, fuzzy
msgid "in context"
msgstr "אין תוכן!"
-#: lib/noticelist.php:601
+#: lib/noticelist.php:605
#, fuzzy
msgid "Repeated by"
msgstr "צור"
-#: lib/noticelist.php:628
+#: lib/noticelist.php:632
msgid "Reply to this notice"
msgstr ""
-#: lib/noticelist.php:629
+#: lib/noticelist.php:633
#, fuzzy
msgid "Reply"
msgstr "הגב"
-#: lib/noticelist.php:673
+#: lib/noticelist.php:677
#, fuzzy
msgid "Notice repeated"
msgstr "הודעות"
@@ -6106,7 +6130,7 @@ msgstr ""
msgid "Unknown"
msgstr ""
-#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr "הרשמות"
@@ -6114,7 +6138,7 @@ msgstr "הרשמות"
msgid "All subscriptions"
msgstr "כל המנויים"
-#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90
+#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr "מנויים"
@@ -6123,16 +6147,21 @@ msgstr "מנויים"
msgid "All subscribers"
msgstr "מנויים"
-#: lib/profileaction.php:180
+#: lib/profileaction.php:186
#, fuzzy
msgid "User ID"
msgstr "מתשמש"
-#: lib/profileaction.php:185
+#: lib/profileaction.php:191
msgid "Member since"
msgstr "חבר מאז"
-#: lib/profileaction.php:247
+#. TRANS: Average count of posts made per day since account registration
+#: lib/profileaction.php:230
+msgid "Daily average"
+msgstr ""
+
+#: lib/profileaction.php:259
msgid "All groups"
msgstr ""
@@ -6181,7 +6210,7 @@ msgstr "אין הודעה כזו."
msgid "Revoke the \"%s\" role from this user"
msgstr "אין משתמש כזה."
-#: lib/router.php:671
+#: lib/router.php:704
msgid "No single user defined for single-user mode."
msgstr ""
@@ -6315,93 +6344,102 @@ msgstr ""
msgid "Unsubscribe"
msgstr "בטל מנוי"
-#: lib/userprofile.php:116
+#: lib/usernoprofileexception.php:58
+#, fuzzy, php-format
+msgid "User %s (%d) has no profile record."
+msgstr "למשתמש אין פרופיל."
+
+#: lib/userprofile.php:117
#, fuzzy
msgid "Edit Avatar"
msgstr "תמונה"
-#: lib/userprofile.php:236
+#: lib/userprofile.php:234 lib/userprofile.php:248
msgid "User actions"
msgstr ""
-#: lib/userprofile.php:251
+#: lib/userprofile.php:237
+msgid "User deletion in progress..."
+msgstr ""
+
+#: lib/userprofile.php:263
#, fuzzy
msgid "Edit profile settings"
msgstr "הגדרות הפרופיל"
-#: lib/userprofile.php:252
+#: lib/userprofile.php:264
msgid "Edit"
msgstr ""
-#: lib/userprofile.php:275
+#: lib/userprofile.php:287
msgid "Send a direct message to this user"
msgstr ""
-#: lib/userprofile.php:276
+#: lib/userprofile.php:288
#, fuzzy
msgid "Message"
msgstr "הודעה חדשה"
-#: lib/userprofile.php:314
+#: lib/userprofile.php:326
msgid "Moderate"
msgstr ""
-#: lib/userprofile.php:352
+#: lib/userprofile.php:364
#, fuzzy
msgid "User role"
msgstr "למשתמש אין פרופיל."
-#: lib/userprofile.php:354
+#: lib/userprofile.php:366
msgctxt "role"
msgid "Administrator"
msgstr ""
-#: lib/userprofile.php:355
+#: lib/userprofile.php:367
msgctxt "role"
msgid "Moderator"
msgstr ""
-#: lib/util.php:1015
+#: lib/util.php:1046
msgid "a few seconds ago"
msgstr "לפני מספר שניות"
-#: lib/util.php:1017
+#: lib/util.php:1048
msgid "about a minute ago"
msgstr "לפני כדקה"
-#: lib/util.php:1019
+#: lib/util.php:1050
#, php-format
msgid "about %d minutes ago"
msgstr "לפני כ-%d דקות"
-#: lib/util.php:1021
+#: lib/util.php:1052
msgid "about an hour ago"
msgstr "לפני כשעה"
-#: lib/util.php:1023
+#: lib/util.php:1054
#, php-format
msgid "about %d hours ago"
msgstr "לפני כ-%d שעות"
-#: lib/util.php:1025
+#: lib/util.php:1056
msgid "about a day ago"
msgstr "לפני כיום"
-#: lib/util.php:1027
+#: lib/util.php:1058
#, php-format
msgid "about %d days ago"
msgstr "לפני כ-%d ימים"
-#: lib/util.php:1029
+#: lib/util.php:1060
msgid "about a month ago"
msgstr "לפני כחודש"
-#: lib/util.php:1031
+#: lib/util.php:1062
#, php-format
msgid "about %d months ago"
msgstr "לפני כ-%d חודשים"
-#: lib/util.php:1033
+#: lib/util.php:1064
msgid "about a year ago"
msgstr "לפני כשנה"
@@ -6415,7 +6453,7 @@ msgstr "לאתר הבית יש כתובת לא חוקית."
msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr ""
-#: lib/xmppmanager.php:402
+#: lib/xmppmanager.php:403
#, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d."
msgstr ""
diff --git a/locale/hsb/LC_MESSAGES/statusnet.po b/locale/hsb/LC_MESSAGES/statusnet.po
index 91d9c9c73..05ca7fa3c 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-03-06 23:49+0000\n"
-"PO-Revision-Date: 2010-03-06 23:50:00+0000\n"
+"POT-Creation-Date: 2010-04-05 18:54+0000\n"
+"PO-Revision-Date: 2010-04-05 18:55: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 (r63350); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64621); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: hsb\n"
"X-Message-Group: out-statusnet\n"
@@ -29,15 +29,13 @@ msgstr "Přistup"
#. TRANS: Page notice
#: actions/accessadminpanel.php:67
-#, fuzzy
msgid "Site access settings"
-msgstr "Sydłowe nastajenja składować"
+msgstr "Nastajenja za sydłowy přistup"
#. TRANS: Form legend for registration form.
#: actions/accessadminpanel.php:161
-#, fuzzy
msgid "Registration"
-msgstr "Registrować"
+msgstr "Registrowanje"
#. TRANS: Checkbox instructions for admin setting "Private"
#: actions/accessadminpanel.php:165
@@ -46,7 +44,6 @@ msgstr ""
#. TRANS: Checkbox label for prohibiting anonymous users from viewing site.
#: actions/accessadminpanel.php:167
-#, fuzzy
msgctxt "LABEL"
msgid "Private"
msgstr "Priwatny"
@@ -73,12 +70,10 @@ msgstr "Začinjeny"
#. TRANS: Title / tooltip for button to save access settings in site admin panel
#: actions/accessadminpanel.php:202
-#, fuzzy
msgid "Save access settings"
-msgstr "Sydłowe nastajenja składować"
+msgstr "Přistupne nastajenja składować"
#: actions/accessadminpanel.php:203
-#, fuzzy
msgctxt "BUTTON"
msgid "Save"
msgstr "Składować"
@@ -97,9 +92,9 @@ msgstr "Strona njeeksistuje"
#: 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:90
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78
+#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
@@ -108,10 +103,8 @@ msgstr "Strona njeeksistuje"
#: actions/remotesubscribe.php:154 actions/replies.php:73
#: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:163 lib/command.php:302
-#: lib/command.php:355 lib/command.php:401 lib/command.php:462
-#: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82
-#: lib/profileaction.php:77
+#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: lib/mailbox.php:82 lib/profileaction.php:77
msgid "No such user."
msgstr "Wužiwar njeeksistuje"
@@ -198,18 +191,18 @@ msgstr ""
#: 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:132
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:136
#: actions/apigrouplistall.php:120 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:135
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
-#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184
-#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148
+#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:174
+#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173
+#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
-#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
+#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
msgid "API method not found."
msgstr "API-metoda njenamakana."
@@ -222,8 +215,8 @@ msgstr "API-metoda njenamakana."
#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65
-#: actions/apistatusesupdate.php:118
+#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
msgid "This method requires a POST."
msgstr "Tuta metoda wužaduje sej POST."
@@ -252,7 +245,7 @@ msgid "Could not save profile."
msgstr "Profil njeje so składować dał."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:97
+#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
#: actions/designadminpanel.php:122 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
@@ -336,7 +329,7 @@ msgstr "Status z tym ID njenamakany."
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:176
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
msgid "Could not create favorite."
msgstr ""
@@ -453,7 +446,7 @@ msgstr "Skupina njenamakana!"
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:221
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
msgid "You have been blocked from that group by the admin."
msgstr ""
@@ -471,15 +464,22 @@ msgstr "Njejsy čłon tuteje skupiny."
msgid "Could not remove user %1$s from group %2$s."
msgstr "Njebě móžno wužiwarja %1$s ze skupiny %2$s wotstronić."
-#: actions/apigrouplist.php:95
+#. TRANS: %s is a user name
+#: actions/apigrouplist.php:97
#, 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
+#, php-format
+msgid "%1$s groups %2$s is a member of."
+msgstr ""
+
#: actions/apigrouplistall.php:90 actions/usergroups.php:62
#, php-format
msgid "%s groups"
-msgstr ""
+msgstr "%s skupinow"
#: actions/apigrouplistall.php:94
#, php-format
@@ -491,9 +491,8 @@ msgid "No oauth_token parameter provided."
msgstr ""
#: actions/apioauthauthorize.php:106
-#, fuzzy
msgid "Invalid token."
-msgstr "Njepłaćiwa wulkosć."
+msgstr "Njepłaćiwy token."
#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
#: actions/deletenotice.php:157 actions/disfavor.php:74
@@ -504,7 +503,7 @@ msgstr "Njepłaćiwa wulkosć."
#: 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:337
+#: actions/profilesettings.php:194 actions/recoverpassword.php:350
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
@@ -518,12 +517,10 @@ msgid "Invalid nickname / password!"
msgstr "Njepłaćiwe přimjeno abo hesło!"
#: actions/apioauthauthorize.php:159
-#, fuzzy
msgid "Database error deleting OAuth application user."
-msgstr "Zmylk datoweje banki při zasunjenju wužiwarja OAuth-aplikacije."
+msgstr "Zmylk datoweje banki při zhašenju wužiwarja OAuth-aplikacije."
#: actions/apioauthauthorize.php:185
-#, fuzzy
msgid "Database error inserting OAuth application user."
msgstr "Zmylk datoweje banki při zasunjenju wužiwarja OAuth-aplikacije."
@@ -564,15 +561,15 @@ msgid ""
"give access to your %4$s account to third parties you trust."
msgstr ""
-#: actions/apioauthauthorize.php:310 lib/action.php:438
+#: actions/apioauthauthorize.php:310 lib/action.php:437
msgid "Account"
msgstr "Konto"
#: actions/apioauthauthorize.php:313 actions/login.php:230
#: actions/profilesettings.php:106 actions/register.php:424
-#: actions/showgroup.php:244 actions/tagother.php:94
+#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
-#: lib/userprofile.php:131
+#: lib/userprofile.php:132
msgid "Nickname"
msgstr "Přimjeno"
@@ -641,12 +638,12 @@ msgstr ""
msgid "Unsupported format."
msgstr "Njepodpěrany format."
-#: actions/apitimelinefavorites.php:108
+#: actions/apitimelinefavorites.php:109
#, php-format
msgid "%1$s / Favorites from %2$s"
msgstr ""
-#: actions/apitimelinefavorites.php:117
+#: actions/apitimelinefavorites.php:118
#, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr ""
@@ -656,7 +653,7 @@ msgstr ""
msgid "%1$s / Updates mentioning %2$s"
msgstr ""
-#: actions/apitimelinementions.php:127
+#: actions/apitimelinementions.php:130
#, php-format
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr ""
@@ -666,7 +663,7 @@ msgstr ""
msgid "%s public timeline"
msgstr ""
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr ""
@@ -681,12 +678,12 @@ msgstr ""
msgid "Repeats of %s"
msgstr ""
-#: actions/apitimelinetag.php:102 actions/tag.php:67
+#: actions/apitimelinetag.php:104 actions/tag.php:67
#, php-format
msgid "Notices tagged with %s"
msgstr ""
-#: actions/apitimelinetag.php:104 actions/tagrss.php:65
+#: actions/apitimelinetag.php:106 actions/tagrss.php:65
#, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr ""
@@ -714,7 +711,7 @@ msgstr "Žana wulkosć."
msgid "Invalid size."
msgstr "Njepłaćiwa wulkosć."
-#: actions/avatarsettings.php:67 actions/showgroup.php:229
+#: actions/avatarsettings.php:67 actions/showgroup.php:230
#: lib/accountsettingsaction.php:112
msgid "Avatar"
msgstr "Awatar"
@@ -747,7 +744,7 @@ msgid "Preview"
msgstr "Přehlad"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:655
+#: lib/deleteuserform.php:66 lib/noticelist.php:659
msgid "Delete"
msgstr "Zničić"
@@ -759,23 +756,27 @@ msgstr "Nahrać"
msgid "Crop"
msgstr ""
-#: actions/avatarsettings.php:328
+#: actions/avatarsettings.php:305
+msgid "No file uploaded."
+msgstr "Žana dataja nahrata."
+
+#: actions/avatarsettings.php:332
msgid "Pick a square area of the image to be your avatar"
msgstr ""
-#: actions/avatarsettings.php:343 actions/grouplogo.php:380
+#: actions/avatarsettings.php:347 actions/grouplogo.php:380
msgid "Lost our file data."
msgstr ""
-#: actions/avatarsettings.php:366
+#: actions/avatarsettings.php:370
msgid "Avatar updated."
msgstr "Awatar zaktualizowany."
-#: actions/avatarsettings.php:369
+#: actions/avatarsettings.php:373
msgid "Failed updating avatar."
msgstr ""
-#: actions/avatarsettings.php:393
+#: actions/avatarsettings.php:397
msgid "Avatar deleted."
msgstr "Awatar zničeny."
@@ -827,8 +828,8 @@ msgstr ""
#: actions/groupunblock.php:86 actions/joingroup.php:82
#: actions/joingroup.php:93 actions/leavegroup.php:82
#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212
-#: lib/command.php:260
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162
+#: lib/command.php:358
msgid "No such group."
msgstr "Skupina njeeksistuje."
@@ -910,19 +911,17 @@ msgid "Conversation"
msgstr "Konwersacija"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:218 lib/searchgroupnav.php:82
+#: lib/profileaction.php:224 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "Zdźělenki"
#: actions/deleteapplication.php:63
-#, fuzzy
msgid "You must be logged in to delete an application."
-msgstr "Dyrbiš přizjewjeny być, zo by skupinu wobdźěłał."
+msgstr "Dyrbiš přizjewjeny być, zo by aplikaciju zničił."
#: actions/deleteapplication.php:71
-#, fuzzy
msgid "Application not found."
-msgstr "Aplikaciski profil"
+msgstr "Aplikaciska njenamakana."
#: actions/deleteapplication.php:78 actions/editapplication.php:77
#: actions/showapplication.php:94
@@ -931,14 +930,13 @@ msgstr "Njejsy wobsedźer tuteje aplikacije."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1217
+#: lib/action.php:1219
msgid "There was a problem with your session token."
msgstr ""
#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
-#, fuzzy
msgid "Delete application"
-msgstr "Aplikacija njeeksistuje."
+msgstr "Aplikaciju zničić"
#: actions/deleteapplication.php:149
msgid ""
@@ -948,14 +946,12 @@ msgid ""
msgstr ""
#: actions/deleteapplication.php:156
-#, fuzzy
msgid "Do not delete this application"
-msgstr "Tutu zdźělenku njewušmórnyć"
+msgstr "Tutu aplikaciju njezničić"
#: actions/deleteapplication.php:160
-#, fuzzy
msgid "Delete this application"
-msgstr "Tutu zdźělenku wušmórnyć"
+msgstr "Tutu aplikaciju zničić"
#. TRANS: Client error message
#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
@@ -990,7 +986,7 @@ msgstr "Chceš woprawdźe tutu zdźělenku wušmórnyć?"
msgid "Do not delete this notice"
msgstr "Tutu zdźělenku njewušmórnyć"
-#: actions/deletenotice.php:146 lib/noticelist.php:655
+#: actions/deletenotice.php:146 lib/noticelist.php:659
msgid "Delete this notice"
msgstr "Tutu zdźělenku wušmórnyć"
@@ -1124,7 +1120,7 @@ msgstr "Na standard wróćo stajić"
#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:208
+#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
#: actions/tagother.php:154 actions/useradminpanel.php:294
#: lib/applicationeditform.php:333 lib/applicationeditform.php:334
#: lib/designsettings.php:256 lib/groupeditform.php:202
@@ -1144,14 +1140,13 @@ msgid "Add to favorites"
msgstr "K faworitam přidać"
#: actions/doc.php:158
-#, fuzzy, php-format
+#, php-format
msgid "No such document \"%s\""
-msgstr "Dokument njeeksistuje."
+msgstr "Dokument \"%s\" njeeksistuje"
#: actions/editapplication.php:54
-#, fuzzy
msgid "Edit Application"
-msgstr "Aplikacije OAuth"
+msgstr "Aplikaciju wobdźěłać"
#: actions/editapplication.php:66
msgid "You must be logged in to edit an application."
@@ -1175,9 +1170,8 @@ msgid "Name is too long (max 255 chars)."
msgstr "Mjeno je předołho (maks. 255 znamješkow)."
#: actions/editapplication.php:183 actions/newapplication.php:162
-#, fuzzy
msgid "Name already in use. Try another one."
-msgstr "Přimjeno so hižo wužiwa. Spytaj druhe."
+msgstr "Mjeno so hižo wužiwa. Spytaj druhe."
#: actions/editapplication.php:186 actions/newapplication.php:168
msgid "Description is required."
@@ -1242,7 +1236,7 @@ msgstr "wopisanje je předołho (maks. %d znamješkow)."
msgid "Could not update group."
msgstr "Skupina njeje so dała aktualizować."
-#: actions/editgroup.php:264 classes/User_group.php:493
+#: actions/editgroup.php:264 classes/User_group.php:496
msgid "Could not create aliases."
msgstr "Aliasy njejsu so dali wutworić."
@@ -1547,23 +1541,20 @@ msgid "Cannot read file."
msgstr "Dataja njeda so čitać."
#: actions/grantrole.php:62 actions/revokerole.php:62
-#, fuzzy
msgid "Invalid role."
-msgstr "Njepłaćiwa wulkosć."
+msgstr "Njepłaćiwa róla."
#: actions/grantrole.php:66 actions/revokerole.php:66
msgid "This role is reserved and cannot be set."
msgstr ""
#: actions/grantrole.php:75
-#, fuzzy
msgid "You cannot grant user roles on this site."
-msgstr "Njemóžeš tutomu wužiwarju powěsć pósłać."
+msgstr "Njemóžeš wužiwarske róle na tutym sydle garantować."
#: actions/grantrole.php:82
-#, fuzzy
msgid "User already has this role."
-msgstr "Wužiwar nima profil."
+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
@@ -1718,7 +1709,7 @@ msgstr ""
msgid "Updates from members of %1$s on %2$s!"
msgstr ""
-#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232
+#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244
#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr "Skupiny"
@@ -1908,7 +1899,7 @@ msgstr "Nowych wužiwarjow přeprosyć"
msgid "You are already subscribed to these users:"
msgstr "Sy tutych wužiwarjow hižo abonował:"
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
#, php-format
msgid "%1$s (%2$s)"
msgstr "%1$s (%2$s)"
@@ -1953,7 +1944,6 @@ msgstr "Wosobinsku powěsć po dobrozdaću přeprošenju přidać."
#. TRANS: Send button for inviting friends
#: actions/invite.php:198
-#, fuzzy
msgctxt "BUTTON"
msgid "Send"
msgstr "Pósłać"
@@ -1999,9 +1989,8 @@ msgid "You must be logged in to join a group."
msgstr ""
#: actions/joingroup.php:88 actions/leavegroup.php:88
-#, fuzzy
msgid "No nickname or ID."
-msgstr "Žane přimjeno."
+msgstr "Žane přimjeno abo žadyn ID."
#: actions/joingroup.php:141
#, php-format
@@ -2012,7 +2001,7 @@ msgstr ""
msgid "You must be logged in to leave a group."
msgstr "Dyrbiš přizjewjeny być, zo by skupinu wopušćił."
-#: actions/leavegroup.php:100 lib/command.php:265
+#: actions/leavegroup.php:100 lib/command.php:363
msgid "You are not a member of that group."
msgstr "Njejsy čłon teje skupiny."
@@ -2090,9 +2079,8 @@ msgid "No current status"
msgstr "Žadyn aktualny status"
#: actions/newapplication.php:52
-#, fuzzy
msgid "New Application"
-msgstr "Aplikacija njeeksistuje."
+msgstr "Nowa aplikacija"
#: actions/newapplication.php:64
msgid "You must be logged in to register an application."
@@ -2122,12 +2110,12 @@ msgstr "Wužij tutón formular, zo by nowu skupinu wutworił."
msgid "New message"
msgstr "Nowa powěsć"
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
msgid "You can't send a message to this user."
msgstr "Njemóžeš tutomu wužiwarju powěsć pósłać."
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342
-#: lib/command.php:475
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
+#: lib/command.php:529
msgid "No content!"
msgstr "Žadyn wobsah!"
@@ -2135,7 +2123,7 @@ msgstr "Žadyn wobsah!"
msgid "No recipient specified."
msgstr "Žadyn přijimowar podaty."
-#: actions/newmessage.php:164 lib/command.php:361
+#: actions/newmessage.php:164 lib/command.php:462
msgid ""
"Don't send a message to yourself; just say it to yourself quietly instead."
msgstr ""
@@ -2149,7 +2137,7 @@ msgstr "Powěsć pósłana"
msgid "Direct message to %s sent."
msgstr "Direktna powěsć do %s pósłana."
-#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189
msgid "Ajax Error"
msgstr "Zmylk Ajax"
@@ -2157,7 +2145,7 @@ msgstr "Zmylk Ajax"
msgid "New notice"
msgstr "Nowa zdźělenka"
-#: actions/newnotice.php:211
+#: actions/newnotice.php:217
msgid "Notice posted"
msgstr "Zdźělenka wotpósłana"
@@ -2260,7 +2248,7 @@ msgstr ""
msgid "Notice has no profile"
msgstr "Zdźělenka nima profil"
-#: actions/oembed.php:86 actions/shownotice.php:180
+#: actions/oembed.php:86 actions/shownotice.php:175
#, php-format
msgid "%1$s's status on %2$s"
msgstr ""
@@ -2273,8 +2261,8 @@ msgstr ""
msgid "Only "
msgstr "Jenož "
-#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042
-#: lib/apiaction.php:1070 lib/apiaction.php:1179
+#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1068
+#: lib/apiaction.php:1096 lib/apiaction.php:1212
msgid "Not a supported data format."
msgstr "Njeje podpěrany datowy format."
@@ -2405,7 +2393,7 @@ msgstr "Wopačne stare hesło"
msgid "Error saving user; invalid."
msgstr ""
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
msgid "Can't save new password."
msgstr ""
@@ -2614,8 +2602,8 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr ""
#: actions/profilesettings.php:111 actions/register.php:448
-#: actions/showgroup.php:255 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:149
+#: actions/showgroup.php:256 actions/tagother.php:104
+#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Dospołne mjeno"
@@ -2642,9 +2630,9 @@ msgid "Bio"
msgstr "Biografija"
#: actions/profilesettings.php:132 actions/register.php:471
-#: actions/showgroup.php:264 actions/tagother.php:112
+#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
-#: lib/userprofile.php:164
+#: lib/userprofile.php:165
msgid "Location"
msgstr "Městno"
@@ -2658,7 +2646,7 @@ msgstr ""
#: actions/profilesettings.php:145 actions/tagother.php:149
#: actions/tagother.php:209 lib/subscriptionlist.php:106
-#: lib/subscriptionlist.php:108 lib/userprofile.php:209
+#: lib/subscriptionlist.php:108 lib/userprofile.php:210
msgid "Tags"
msgstr ""
@@ -2882,7 +2870,7 @@ msgstr "Hesło wróćo stajić"
msgid "Recover password"
msgstr ""
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
msgid "Password recovery requested"
msgstr ""
@@ -2902,42 +2890,42 @@ msgstr "Wróćo stajić"
msgid "Enter a nickname or email address."
msgstr "Zapodaj přimjeno abo e-mejlowu adresu."
-#: actions/recoverpassword.php:272
+#: actions/recoverpassword.php:282
msgid "No user with that email address or username."
msgstr ""
"Wužiwar z tej e-mejlowej adresu abo tym wužiwarskim mjenom njeeksistuje."
-#: actions/recoverpassword.php:287
+#: actions/recoverpassword.php:299
msgid "No registered email address for that user."
msgstr "Wužiwar nima žanu zregistrowanu e-mejlowu adresu."
-#: actions/recoverpassword.php:301
+#: actions/recoverpassword.php:313
msgid "Error saving address confirmation."
msgstr ""
-#: actions/recoverpassword.php:325
+#: actions/recoverpassword.php:338
msgid ""
"Instructions for recovering your password have been sent to the email "
"address registered to your account."
msgstr ""
-#: actions/recoverpassword.php:344
+#: actions/recoverpassword.php:357
msgid "Unexpected password reset."
msgstr ""
-#: actions/recoverpassword.php:352
+#: actions/recoverpassword.php:365
msgid "Password must be 6 chars or more."
msgstr "Hesło dyrbi 6 znamješkow abo wjace měć."
-#: actions/recoverpassword.php:356
+#: actions/recoverpassword.php:369
msgid "Password and confirmation do not match."
msgstr ""
-#: actions/recoverpassword.php:375 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:248
msgid "Error setting user."
msgstr ""
-#: actions/recoverpassword.php:382
+#: actions/recoverpassword.php:395
msgid "New password successfully saved. You are now logged in."
msgstr ""
@@ -3076,7 +3064,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr ""
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:394
+#: lib/userprofile.php:406
msgid "Subscribe"
msgstr "Abonować"
@@ -3112,7 +3100,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:674
+#: actions/repeat.php:114 lib/noticelist.php:678
msgid "Repeated"
msgstr "Wospjetowany"
@@ -3173,14 +3161,12 @@ msgid "Replies to %1$s on %2$s!"
msgstr ""
#: actions/revokerole.php:75
-#, fuzzy
msgid "You cannot revoke user roles on this site."
-msgstr "Njemóžeš tutomu wužiwarju powěsć pósłać."
+msgstr "Njemóžeš wužiwarske róle na tutym sydle wotwołać."
#: actions/revokerole.php:82
-#, fuzzy
msgid "User doesn't have this role."
-msgstr "Wužiwar bjez hodźaceho so profila."
+msgstr "Wužiwar nima tutu rólu."
#: actions/rsd.php:146 actions/version.php:157
msgid "StatusNet"
@@ -3201,9 +3187,8 @@ msgid "Sessions"
msgstr "Posedźenja"
#: actions/sessionsadminpanel.php:65
-#, fuzzy
msgid "Session settings for this StatusNet site."
-msgstr "Designowe nastajenja za tute sydło StatusNet."
+msgstr "Nastajenja posedźenja za tute sydło StatusNet."
#: actions/sessionsadminpanel.php:175
msgid "Handle sessions"
@@ -3252,8 +3237,8 @@ msgstr "Organizacija"
msgid "Description"
msgstr "Wopisanje"
-#: actions/showapplication.php:192 actions/showgroup.php:438
-#: lib/profileaction.php:176
+#: actions/showapplication.php:192 actions/showgroup.php:439
+#: lib/profileaction.php:182
msgid "Statistics"
msgstr "Statistika"
@@ -3301,14 +3286,13 @@ msgid ""
msgstr ""
#: actions/showapplication.php:309
-#, fuzzy
msgid "Are you sure you want to reset your consumer key and secret?"
-msgstr "Chceš woprawdźe tutu zdźělenku wušmórnyć?"
+msgstr "Chceš woprawdźe swój přetrjebowarski kluč a potajny kod wróćo stajić?"
#: actions/showfavorites.php:79
-#, fuzzy, php-format
+#, php-format
msgid "%1$s's favorite notices, page %2$d"
-msgstr "%1$s a přećeljo, strona %2$d"
+msgstr "Preferowane zdźělenki wot %1$s, strona %2$d"
#: actions/showfavorites.php:132
msgid "Could not retrieve favorite notices."
@@ -3360,71 +3344,71 @@ msgid "%s group"
msgstr ""
#: actions/showgroup.php:84
-#, fuzzy, php-format
+#, php-format
msgid "%1$s group, page %2$d"
-msgstr "%1$s skupinskich čłonow, strona %2$d"
+msgstr "%1$s skupina, strona %2$d"
-#: actions/showgroup.php:226
+#: actions/showgroup.php:227
msgid "Group profile"
msgstr "Skupinski profil"
-#: actions/showgroup.php:271 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:177
+#: actions/showgroup.php:272 actions/tagother.php:118
+#: actions/userauthorization.php:175 lib/userprofile.php:178
msgid "URL"
msgstr "URL"
-#: actions/showgroup.php:282 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:194
+#: actions/showgroup.php:283 actions/tagother.php:128
+#: actions/userauthorization.php:187 lib/userprofile.php:195
msgid "Note"
msgstr ""
-#: actions/showgroup.php:292 lib/groupeditform.php:184
+#: actions/showgroup.php:293 lib/groupeditform.php:184
msgid "Aliases"
msgstr "Aliasy"
-#: actions/showgroup.php:301
+#: actions/showgroup.php:302
msgid "Group actions"
msgstr "Skupinske akcije"
-#: actions/showgroup.php:337
+#: actions/showgroup.php:338
#, php-format
msgid "Notice feed for %s group (RSS 1.0)"
msgstr ""
-#: actions/showgroup.php:343
+#: actions/showgroup.php:344
#, php-format
msgid "Notice feed for %s group (RSS 2.0)"
msgstr ""
-#: actions/showgroup.php:349
+#: actions/showgroup.php:350
#, php-format
msgid "Notice feed for %s group (Atom)"
msgstr ""
-#: actions/showgroup.php:354
+#: actions/showgroup.php:355
#, php-format
msgid "FOAF for %s group"
msgstr ""
-#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91
+#: actions/showgroup.php:391 actions/showgroup.php:448 lib/groupnav.php:91
msgid "Members"
msgstr "Čłonojo"
-#: actions/showgroup.php:395 lib/profileaction.php:117
-#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95
-#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71
+#: actions/showgroup.php:396 lib/profileaction.php:117
+#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95
+#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
msgid "(None)"
msgstr "(Žadyn)"
-#: actions/showgroup.php:401
+#: actions/showgroup.php:402
msgid "All members"
msgstr "Wšitcy čłonojo"
-#: actions/showgroup.php:441
+#: actions/showgroup.php:442
msgid "Created"
msgstr "Wutworjeny"
-#: actions/showgroup.php:457
+#: actions/showgroup.php:458
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3434,7 +3418,7 @@ msgid ""
"of this group and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
-#: actions/showgroup.php:463
+#: actions/showgroup.php:464
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3443,7 +3427,7 @@ msgid ""
"their life and interests. "
msgstr ""
-#: actions/showgroup.php:491
+#: actions/showgroup.php:492
msgid "Admins"
msgstr "Administratorojo"
@@ -3475,9 +3459,9 @@ msgid " tagged %s"
msgstr ""
#: actions/showstream.php:79
-#, fuzzy, php-format
+#, php-format
msgid "%1$s, page %2$d"
-msgstr "%1$s a přećeljo, strona %2$d"
+msgstr "%1$s, strona %2$d"
#: actions/showstream.php:122
#, php-format
@@ -3553,9 +3537,8 @@ msgid "User is already silenced."
msgstr ""
#: actions/siteadminpanel.php:69
-#, fuzzy
msgid "Basic settings for this StatusNet site"
-msgstr "Designowe nastajenja za tute sydło StatusNet."
+msgstr "Zakładne nastajenja za tute sydło StatusNet."
#: actions/siteadminpanel.php:133
msgid "Site name must have non-zero length."
@@ -3571,7 +3554,7 @@ msgid "Unknown language \"%s\"."
msgstr "Njeznata rěč \"%s\"."
#: actions/siteadminpanel.php:165
-msgid "Minimum text limit is 140 characters."
+msgid "Minimum text limit is 0 (unlimited)."
msgstr ""
#: actions/siteadminpanel.php:171
@@ -3623,9 +3606,8 @@ msgid "Default timezone for the site; usually UTC."
msgstr ""
#: actions/siteadminpanel.php:262
-#, fuzzy
msgid "Default language"
-msgstr "Standardna sydłowa rěč"
+msgstr "Standardna rěč"
#: actions/siteadminpanel.php:263
msgid "Site language when autodetection from browser settings is not available"
@@ -3652,37 +3634,32 @@ msgid "How long users must wait (in seconds) to post the same thing again."
msgstr ""
#: actions/sitenoticeadminpanel.php:56
-#, fuzzy
msgid "Site Notice"
-msgstr "Zdźělenki"
+msgstr "Sydłowa zdźělenka"
#: actions/sitenoticeadminpanel.php:67
-#, fuzzy
msgid "Edit site-wide message"
-msgstr "Nowa powěsć"
+msgstr "Sydłodaloku powěsć wobdźěłać"
#: actions/sitenoticeadminpanel.php:103
-#, fuzzy
msgid "Unable to save site notice."
-msgstr "Wužiwar nima poslednju powěsć"
+msgstr "Njeje móžno, sydłowu zdźělenku składować."
#: actions/sitenoticeadminpanel.php:113
msgid "Max length for the site-wide notice is 255 chars"
msgstr ""
#: actions/sitenoticeadminpanel.php:176
-#, fuzzy
msgid "Site notice text"
-msgstr "Njepłaćiwy wobsah zdźělenki"
+msgstr "Tekst sydłoweje zdźělenki"
#: actions/sitenoticeadminpanel.php:178
msgid "Site-wide notice text (255 chars max; HTML okay)"
msgstr ""
#: actions/sitenoticeadminpanel.php:198
-#, fuzzy
msgid "Save site notice"
-msgstr "Sydłowe nastajenja składować"
+msgstr "Sydłowu zdźělenku składować"
#: actions/smssettings.php:58
msgid "SMS settings"
@@ -3783,9 +3760,8 @@ msgid "Snapshots"
msgstr ""
#: actions/snapshotadminpanel.php:65
-#, fuzzy
msgid "Manage snapshot configuration"
-msgstr "SMS-wobkrućenje"
+msgstr "Konfiguraciju wobrazowkoweho fota zrjadować"
#: actions/snapshotadminpanel.php:127
msgid "Invalid snapshot run value."
@@ -3832,16 +3808,14 @@ msgid "Snapshots will be sent to this URL"
msgstr ""
#: actions/snapshotadminpanel.php:248
-#, fuzzy
msgid "Save snapshot settings"
-msgstr "Sydłowe nastajenja składować"
+msgstr "Nastajenja wobrazowkoweho fota składować"
#: actions/subedit.php:70
msgid "You are not subscribed to that profile."
msgstr "Njejsy tón profil abonował."
-#: actions/subedit.php:83 classes/Subscription.php:89
-#: classes/Subscription.php:116
+#: actions/subedit.php:83 classes/Subscription.php:132
msgid "Could not save subscription."
msgstr ""
@@ -3850,14 +3824,12 @@ msgid "This action only accepts POST requests."
msgstr ""
#: actions/subscribe.php:107
-#, fuzzy
msgid "No such profile."
-msgstr "Dataja njeeksistuje."
+msgstr "Profil njeeksistuje."
#: actions/subscribe.php:117
-#, fuzzy
msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
-msgstr "Njejsy tón profil abonował."
+msgstr "Njemóžeš zdaleny profil OMB 0.1 z tutej akciju abonować."
#: actions/subscribe.php:145
msgid "Subscribed"
@@ -3934,11 +3906,11 @@ msgstr ""
msgid "%s is not listening to anyone."
msgstr ""
-#: actions/subscriptions.php:199
+#: actions/subscriptions.php:208
msgid "Jabber"
msgstr "Jabber"
-#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:222 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr "SMS"
@@ -3971,12 +3943,12 @@ msgstr "Žadyn argument ID."
msgid "Tag %s"
msgstr ""
-#: actions/tagother.php:77 lib/userprofile.php:75
+#: actions/tagother.php:77 lib/userprofile.php:76
msgid "User profile"
msgstr "Wužiwarski profil"
#: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:102
+#: lib/userprofile.php:103
msgid "Photo"
msgstr "Foto"
@@ -4039,7 +4011,6 @@ msgstr ""
#. TRANS: User admin panel title
#: actions/useradminpanel.php:59
-#, fuzzy
msgctxt "TITLE"
msgid "User"
msgstr "Wužiwar"
@@ -4214,9 +4185,9 @@ msgid "Enjoy your hotdog!"
msgstr ""
#: actions/usergroups.php:64
-#, fuzzy, php-format
+#, php-format
msgid "%1$s groups, page %2$d"
-msgstr "%1$s skupinskich čłonow, strona %2$d"
+msgstr "%1$s skupinow, strona %2$d"
#: actions/usergroups.php:130
msgid "Search for more groups"
@@ -4281,7 +4252,7 @@ msgstr ""
msgid "Plugins"
msgstr ""
-#: actions/version.php:196 lib/action.php:767
+#: actions/version.php:196 lib/action.php:766
msgid "Version"
msgstr "Wersija"
@@ -4289,19 +4260,19 @@ msgstr "Wersija"
msgid "Author(s)"
msgstr "Awtorojo"
-#: classes/File.php:144
+#: classes/File.php:169
#, 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:154
+#: classes/File.php:179
#, php-format
msgid "A file this large would exceed your user quota of %d bytes."
msgstr ""
-#: classes/File.php:161
+#: classes/File.php:186
#, php-format
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
@@ -4319,9 +4290,8 @@ msgid "Group leave failed."
msgstr "Wopušćenje skupiny je so njeporadźiło."
#: classes/Local_group.php:41
-#, fuzzy
msgid "Could not update local group."
-msgstr "Skupina njeje so dała aktualizować."
+msgstr "Lokalna skupina njeda so aktualizować."
#: classes/Login_token.php:76
#, php-format
@@ -4340,98 +4310,95 @@ msgstr ""
msgid "Could not update message with new URI."
msgstr ""
-#: classes/Notice.php:172
+#: classes/Notice.php:175
#, php-format
msgid "DB error inserting hashtag: %s"
msgstr ""
-#: classes/Notice.php:241
+#: classes/Notice.php:244
msgid "Problem saving notice. Too long."
msgstr ""
-#: classes/Notice.php:245
+#: classes/Notice.php:248
msgid "Problem saving notice. Unknown user."
msgstr ""
-#: classes/Notice.php:250
+#: classes/Notice.php:253
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
-#: classes/Notice.php:256
+#: classes/Notice.php:259
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
msgstr ""
-#: classes/Notice.php:262
+#: classes/Notice.php:265
msgid "You are banned from posting notices on this site."
msgstr ""
-#: classes/Notice.php:328 classes/Notice.php:354
+#: classes/Notice.php:331 classes/Notice.php:357
msgid "Problem saving notice."
msgstr ""
-#: classes/Notice.php:927
+#: classes/Notice.php:943
msgid "Problem saving group inbox."
msgstr ""
-#: classes/Notice.php:1459
+#: classes/Notice.php:1481
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
-#: classes/Subscription.php:66 lib/oauthstore.php:465
+#: classes/Subscription.php:74 lib/oauthstore.php:465
msgid "You have been banned from subscribing."
msgstr ""
-#: classes/Subscription.php:70
+#: classes/Subscription.php:78
msgid "Already subscribed!"
msgstr "Hižo abonowany!"
-#: classes/Subscription.php:74
+#: classes/Subscription.php:82
msgid "User has blocked you."
msgstr "Wužiwar je će zablokował."
-#: classes/Subscription.php:157
+#: classes/Subscription.php:167
msgid "Not subscribed!"
msgstr "Njeje abonowany!"
-#: classes/Subscription.php:163
+#: classes/Subscription.php:173
msgid "Couldn't delete self-subscription."
msgstr "Sebjeabonement njeje so dał zničić."
-#: classes/Subscription.php:190
-#, fuzzy
+#: classes/Subscription.php:200
msgid "Couldn't delete subscription OMB token."
-msgstr "Abonoment njeje so dał zničić."
+msgstr "Znamjo OMB-abonementa njeda so zhašeć."
-#: classes/Subscription.php:201 lib/subs.php:69
+#: classes/Subscription.php:211
msgid "Couldn't delete subscription."
msgstr "Abonoment njeje so dał zničić."
-#: classes/User.php:373
+#: classes/User.php:363
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr ""
-#: classes/User_group.php:477
+#: classes/User_group.php:480
msgid "Could not create group."
msgstr ""
-#: classes/User_group.php:486
-#, fuzzy
+#: classes/User_group.php:489
msgid "Could not set group URI."
-msgstr "Skupina njeje so dała aktualizować."
+msgstr "URI skupiny njeda so nastajić."
-#: classes/User_group.php:507
+#: classes/User_group.php:510
msgid "Could not set group membership."
msgstr ""
-#: classes/User_group.php:521
-#, fuzzy
+#: classes/User_group.php:524
msgid "Could not save local group info."
-msgstr "Profil njeje so składować dał."
+msgstr "Informacije wo lokalnej skupinje njedachu so składować."
#: lib/accountsettingsaction.php:108
msgid "Change your profile settings"
@@ -4470,200 +4437,182 @@ msgstr "%1$s - %2$s"
msgid "Untitled page"
msgstr "Strona bjez titula"
-#: lib/action.php:424
+#: lib/action.php:423
msgid "Primary site navigation"
msgstr ""
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:430
+#: lib/action.php:429
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr ""
-#: lib/action.php:433
-#, fuzzy
+#: lib/action.php:432
msgctxt "MENU"
msgid "Personal"
msgstr "Wosobinski"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:435
-#, fuzzy
+#: lib/action.php:434
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
-msgstr "Změń swoje hesło."
+msgstr "Wašu e-mejl, waš awatar, waše hesło, waš profil změnić"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:440
-#, fuzzy
+#: lib/action.php:439
msgctxt "TOOLTIP"
msgid "Connect to services"
-msgstr "Zwiski"
+msgstr "Ze słužbami zwjazać"
-#: lib/action.php:443
+#: lib/action.php:442
msgid "Connect"
msgstr "Zwjazać"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:446
-#, fuzzy
+#: lib/action.php:445
msgctxt "TOOLTIP"
msgid "Change site configuration"
-msgstr "SMS-wobkrućenje"
+msgstr "Sydłowu konfiguraciju změnić"
-#: lib/action.php:449
-#, fuzzy
+#: lib/action.php:448
msgctxt "MENU"
msgid "Admin"
msgstr "Administrator"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:453
-#, fuzzy, php-format
+#: lib/action.php:452
+#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
-msgstr ""
-"Wužij tutón formular, zo by swojich přećelow a kolegow přeprosył, zo bychu "
-"tutu słužbu wužiwali."
+msgstr "Přećelow a kolegow přeprosyć, so tebi na %s přidružić"
-#: lib/action.php:456
-#, fuzzy
+#: lib/action.php:455
msgctxt "MENU"
msgid "Invite"
msgstr "Přeprosyć"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:462
-#, fuzzy
+#: lib/action.php:461
msgctxt "TOOLTIP"
msgid "Logout from the site"
-msgstr "Šat za sydło."
+msgstr "Ze sydła wotzjewić"
-#: lib/action.php:465
-#, fuzzy
+#: lib/action.php:464
msgctxt "MENU"
msgid "Logout"
-msgstr "Logo"
+msgstr "Wotzjewić"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:470
-#, fuzzy
+#: lib/action.php:469
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Konto załožić"
-#: lib/action.php:473
-#, fuzzy
+#: lib/action.php:472
msgctxt "MENU"
msgid "Register"
msgstr "Registrować"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:476
-#, fuzzy
+#: lib/action.php:475
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Při sydle přizjewić"
-#: lib/action.php:479
-#, fuzzy
+#: lib/action.php:478
msgctxt "MENU"
msgid "Login"
-msgstr "Přizjewić"
+msgstr "Přizjewjenje"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:482
-#, fuzzy
+#: lib/action.php:481
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Pomhaj!"
-#: lib/action.php:485
-#, fuzzy
+#: lib/action.php:484
msgctxt "MENU"
msgid "Help"
msgstr "Pomoc"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:488
-#, fuzzy
+#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "Za ludźimi abo tekstom pytać"
-#: lib/action.php:491
-#, fuzzy
+#: lib/action.php:490
msgctxt "MENU"
msgid "Search"
msgstr "Pytać"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:513 lib/adminpanelaction.php:398
+#: lib/action.php:512 lib/adminpanelaction.php:398
msgid "Site notice"
msgstr ""
-#: lib/action.php:579
+#: lib/action.php:578
msgid "Local views"
msgstr ""
-#: lib/action.php:645
+#: lib/action.php:644
msgid "Page notice"
msgstr ""
-#: lib/action.php:747
+#: lib/action.php:746
msgid "Secondary site navigation"
msgstr ""
-#: lib/action.php:752
+#: lib/action.php:751
msgid "Help"
msgstr "Pomoc"
-#: lib/action.php:754
+#: lib/action.php:753
msgid "About"
msgstr "Wo"
-#: lib/action.php:756
+#: lib/action.php:755
msgid "FAQ"
msgstr "Huste prašenja"
-#: lib/action.php:760
+#: lib/action.php:759
msgid "TOS"
msgstr ""
-#: lib/action.php:763
+#: lib/action.php:762
msgid "Privacy"
msgstr "Priwatnosć"
-#: lib/action.php:765
+#: lib/action.php:764
msgid "Source"
msgstr "Žórło"
-#: lib/action.php:769
+#: lib/action.php:768
msgid "Contact"
msgstr "Kontakt"
-#: lib/action.php:771
+#: lib/action.php:770
msgid "Badge"
msgstr ""
-#: lib/action.php:799
+#: lib/action.php:798
msgid "StatusNet software license"
msgstr ""
-#: lib/action.php:802
+#: lib/action.php:803
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
"broughtby%%](%%site.broughtbyurl%%). "
msgstr ""
-#: lib/action.php:804
+#: lib/action.php:805
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr ""
-#: lib/action.php:806
+#: lib/action.php:808
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4671,53 +4620,57 @@ msgid ""
"org/licensing/licenses/agpl-3.0.html)."
msgstr ""
-#: lib/action.php:821
+#: lib/action.php:823
msgid "Site content license"
msgstr ""
-#: lib/action.php:826
+#: lib/action.php:828
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
-#: lib/action.php:831
+#: lib/action.php:833
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
-#: lib/action.php:834
+#: lib/action.php:836
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
-#: lib/action.php:847
+#: lib/action.php:849
msgid "All "
msgstr ""
-#: lib/action.php:853
+#: lib/action.php:855
msgid "license."
msgstr ""
-#: lib/action.php:1152
+#: lib/action.php:1154
msgid "Pagination"
msgstr ""
-#: lib/action.php:1161
+#: lib/action.php:1163
msgid "After"
msgstr ""
-#: lib/action.php:1169
+#: lib/action.php:1171
msgid "Before"
msgstr ""
-#: lib/activity.php:453
+#: lib/activity.php:120
+msgid "Expecting a root feed element but got a whole XML document."
+msgstr ""
+
+#: lib/activityutils.php:208
msgid "Can't handle remote content yet."
msgstr ""
-#: lib/activity.php:481
+#: lib/activityutils.php:236
msgid "Can't handle embedded XML content yet."
msgstr ""
-#: lib/activity.php:485
+#: lib/activityutils.php:240
msgid "Can't handle embedded Base64 content yet."
msgstr ""
@@ -4753,7 +4706,6 @@ msgstr ""
#. TRANS: Menu item for site administration
#: lib/adminpanelaction.php:350
-#, fuzzy
msgctxt "MENU"
msgid "Site"
msgstr "Sydło"
@@ -4765,16 +4717,14 @@ msgstr ""
#. TRANS: Menu item for site administration
#: lib/adminpanelaction.php:358
-#, fuzzy
msgctxt "MENU"
msgid "Design"
msgstr "Design"
#. TRANS: Menu item title/tooltip
#: lib/adminpanelaction.php:364
-#, fuzzy
msgid "User configuration"
-msgstr "SMS-wobkrućenje"
+msgstr "Wužiwarska konfiguracija"
#. TRANS: Menu item for site administration
#: lib/adminpanelaction.php:366 lib/personalgroupnav.php:115
@@ -4783,9 +4733,8 @@ msgstr "Wužiwar"
#. TRANS: Menu item title/tooltip
#: lib/adminpanelaction.php:372
-#, fuzzy
msgid "Access configuration"
-msgstr "SMS-wobkrućenje"
+msgstr "Přistupna konfiguracija"
#. TRANS: Menu item title/tooltip
#: lib/adminpanelaction.php:380
@@ -4794,27 +4743,24 @@ msgstr ""
#. TRANS: Menu item title/tooltip
#: lib/adminpanelaction.php:388
-#, fuzzy
msgid "Sessions configuration"
-msgstr "SMS-wobkrućenje"
+msgstr "Konfiguracija posedźenjow"
#. TRANS: Menu item title/tooltip
#: lib/adminpanelaction.php:396
-#, fuzzy
msgid "Edit site notice"
-msgstr "Dwójna zdźělenka"
+msgstr "Sydłowu zdźělenku wobdźěłać"
#. TRANS: Menu item title/tooltip
#: lib/adminpanelaction.php:404
-#, fuzzy
msgid "Snapshots configuration"
-msgstr "SMS-wobkrućenje"
+msgstr "Konfiguracija wobrazowkowych fotow"
#: lib/apiauth.php:94
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
-#: lib/apiauth.php:272
+#: lib/apiauth.php:276
#, php-format
msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s"
msgstr ""
@@ -4888,11 +4834,11 @@ msgstr "Wotwołać"
msgid "Attachments"
msgstr ""
-#: lib/attachmentlist.php:265
+#: lib/attachmentlist.php:263
msgid "Author"
msgstr "Awtor"
-#: lib/attachmentlist.php:278
+#: lib/attachmentlist.php:276
msgid "Provider"
msgstr ""
@@ -4912,37 +4858,50 @@ msgstr "Změnjenje hesła je so njeporadźiło"
msgid "Password changing is not allowed"
msgstr "Změnjenje hesła njeje dowolene"
-#: lib/channel.php:138 lib/channel.php:158
+#: lib/channel.php:157 lib/channel.php:177
msgid "Command results"
msgstr ""
-#: lib/channel.php:210 lib/mailhandler.php:142
+#: lib/channel.php:229 lib/mailhandler.php:142
msgid "Command complete"
msgstr ""
-#: lib/channel.php:221
+#: lib/channel.php:240
msgid "Command failed"
msgstr ""
-#: lib/command.php:44
-msgid "Sorry, this command is not yet implemented."
-msgstr ""
+#: lib/command.php:83 lib/command.php:105
+msgid "Notice with that id does not exist"
+msgstr "Zdźělenka z tym ID njeeksistuje"
-#: lib/command.php:88
+#: lib/command.php:99 lib/command.php:570
+msgid "User has no last notice"
+msgstr "Wužiwar nima poslednju powěsć"
+
+#: lib/command.php:125
#, php-format
msgid "Could not find a user with nickname %s"
msgstr ""
-#: lib/command.php:92
+#: lib/command.php:143
+#, php-format
+msgid "Could not find a local user with nickname %s"
+msgstr ""
+
+#: lib/command.php:176
+msgid "Sorry, this command is not yet implemented."
+msgstr ""
+
+#: lib/command.php:221
msgid "It does not make a lot of sense to nudge yourself!"
msgstr ""
-#: lib/command.php:99
+#: lib/command.php:228
#, php-format
msgid "Nudge sent to %s"
msgstr ""
-#: lib/command.php:126
+#: lib/command.php:254
#, php-format
msgid ""
"Subscriptions: %1$s\n"
@@ -4950,170 +4909,167 @@ msgid ""
"Notices: %3$s"
msgstr ""
-#: lib/command.php:152 lib/command.php:390 lib/command.php:451
-msgid "Notice with that id does not exist"
-msgstr "Zdźělenka z tym ID njeeksistuje"
-
-#: lib/command.php:168 lib/command.php:406 lib/command.php:467
-#: lib/command.php:523
-msgid "User has no last notice"
-msgstr "Wužiwar nima poslednju powěsć"
-
-#: lib/command.php:190
+#: lib/command.php:296
msgid "Notice marked as fave."
msgstr ""
-#: lib/command.php:217
+#: lib/command.php:317
msgid "You are already a member of that group"
msgstr "Sy hižo čłon teje skupiny"
-#: lib/command.php:231
+#: lib/command.php:331
#, php-format
msgid "Could not join user %s to group %s"
msgstr "Njebě móžno wužiwarja %s skupinje %s přidać"
-#: lib/command.php:236
+#: lib/command.php:336
#, php-format
msgid "%s joined group %s"
msgstr "%s je so k skupinje %s přizamknył"
-#: lib/command.php:275
+#: lib/command.php:373
#, php-format
msgid "Could not remove user %s to group %s"
msgstr "Njebě móžno wužiwarja %s do skupiny %s přesunyć"
-#: lib/command.php:280
+#: lib/command.php:378
#, php-format
msgid "%s left group %s"
msgstr "%s je skupinu %s wopušćił"
-#: lib/command.php:309
+#: lib/command.php:401
#, php-format
msgid "Fullname: %s"
msgstr "Dospołne mjeno: %s"
-#: lib/command.php:312 lib/mail.php:258
+#: lib/command.php:404 lib/mail.php:258
#, php-format
msgid "Location: %s"
msgstr "Městno: %s"
-#: lib/command.php:315 lib/mail.php:260
+#: lib/command.php:407 lib/mail.php:260
#, php-format
msgid "Homepage: %s"
msgstr ""
-#: lib/command.php:318
+#: lib/command.php:410
#, php-format
msgid "About: %s"
msgstr "Wo: %s"
-#: lib/command.php:349
+#: lib/command.php:437
+#, php-format
+msgid ""
+"%s is a remote profile; you can only send direct messages to users on the "
+"same server."
+msgstr ""
+
+#: lib/command.php:450
#, php-format
msgid "Message too long - maximum is %d characters, you sent %d"
msgstr ""
-#: lib/command.php:367
+#: lib/command.php:468
#, php-format
msgid "Direct message to %s sent"
msgstr "Direktna powěsć do %s pósłana"
-#: lib/command.php:369
+#: lib/command.php:470
msgid "Error sending direct message."
msgstr ""
-#: lib/command.php:413
+#: lib/command.php:490
msgid "Cannot repeat your own notice"
msgstr "Njemóžeš swójsku powěsć wospjetować"
-#: lib/command.php:418
+#: lib/command.php:495
msgid "Already repeated that notice"
msgstr "Tuta zdźělenka bu hižo wospjetowana"
-#: lib/command.php:426
+#: lib/command.php:503
#, php-format
msgid "Notice from %s repeated"
msgstr "Zdźělenka wot %s wospjetowana"
-#: lib/command.php:428
+#: lib/command.php:505
msgid "Error repeating notice."
msgstr "Zmylk při wospjetowanju zdźělenki"
-#: lib/command.php:482
+#: lib/command.php:536
#, php-format
msgid "Notice too long - maximum is %d characters, you sent %d"
msgstr ""
-#: lib/command.php:491
+#: lib/command.php:545
#, php-format
msgid "Reply to %s sent"
msgstr "Wotmołwa na %s pósłana"
-#: lib/command.php:493
+#: lib/command.php:547
msgid "Error saving notice."
msgstr ""
-#: lib/command.php:547
+#: lib/command.php:594
msgid "Specify the name of the user to subscribe to"
msgstr ""
-#: lib/command.php:554 lib/command.php:589
-#, fuzzy
-msgid "No such user"
-msgstr "Wužiwar njeeksistuje"
+#: lib/command.php:602
+msgid "Can't subscribe to OMB profiles by command."
+msgstr "OMB-profile njedadźa so přez přikaz abonować."
-#: lib/command.php:561
+#: lib/command.php:608
#, php-format
msgid "Subscribed to %s"
msgstr ""
-#: lib/command.php:582 lib/command.php:685
+#: lib/command.php:629 lib/command.php:728
msgid "Specify the name of the user to unsubscribe from"
msgstr ""
-#: lib/command.php:595
+#: lib/command.php:638
#, php-format
msgid "Unsubscribed from %s"
msgstr ""
-#: lib/command.php:613 lib/command.php:636
+#: lib/command.php:656 lib/command.php:679
msgid "Command not yet implemented."
msgstr ""
-#: lib/command.php:616
+#: lib/command.php:659
msgid "Notification off."
msgstr ""
-#: lib/command.php:618
+#: lib/command.php:661
msgid "Can't turn off notification."
msgstr ""
-#: lib/command.php:639
+#: lib/command.php:682
msgid "Notification on."
msgstr ""
-#: lib/command.php:641
+#: lib/command.php:684
msgid "Can't turn on notification."
msgstr ""
-#: lib/command.php:654
+#: lib/command.php:697
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:665
+#: lib/command.php:708
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:692
-#, fuzzy, php-format
+#: lib/command.php:735
+#, php-format
msgid "Unsubscribed %s"
-msgstr "Wotskazany"
+msgstr "%s wotskazany"
-#: lib/command.php:709
+#: lib/command.php:752
msgid "You are not subscribed to anyone."
msgstr ""
-#: lib/command.php:711
+#: lib/command.php:754
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Sy tutu wosobu abonował:"
@@ -5121,11 +5077,11 @@ msgstr[1] "Sy tutej wosobje abonował:"
msgstr[2] "Sy tute wosoby abonował:"
msgstr[3] "Sy tute wosoby abonował:"
-#: lib/command.php:731
+#: lib/command.php:774
msgid "No one is subscribed to you."
msgstr ""
-#: lib/command.php:733
+#: lib/command.php:776
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Tuta wosoba je će abonowała:"
@@ -5133,11 +5089,11 @@ msgstr[1] "Tutej wosobje stej će abonowałoj:"
msgstr[2] "Tute wosoby su će abonowali:"
msgstr[3] "Tute wosoby su će abonowali:"
-#: lib/command.php:753
+#: lib/command.php:796
msgid "You are not a member of any groups."
msgstr ""
-#: lib/command.php:755
+#: lib/command.php:798
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Sy čłon tuteje skupiny:"
@@ -5145,7 +5101,7 @@ msgstr[1] "Sy čłon tuteju skupinow:"
msgstr[2] "Sy čłon tutych skupinow:"
msgstr[3] "Sy čłon tutych skupinow:"
-#: lib/command.php:769
+#: lib/command.php:812
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5187,19 +5143,19 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:148
+#: lib/common.php:135
msgid "No configuration file found. "
msgstr "Žana konfiguraciska dataja namakana. "
-#: lib/common.php:149
+#: lib/common.php:136
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:151
+#: lib/common.php:138
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:152
+#: lib/common.php:139
msgid "Go to the installer."
msgstr ""
@@ -5373,49 +5329,49 @@ msgstr ""
msgid "This page is not available in a media type you accept"
msgstr ""
-#: lib/imagefile.php:75
+#: lib/imagefile.php:72
+msgid "Unsupported image file format."
+msgstr ""
+
+#: lib/imagefile.php:88
#, php-format
msgid "That file is too big. The maximum file size is %s."
msgstr ""
-#: lib/imagefile.php:80
+#: lib/imagefile.php:93
msgid "Partial upload."
msgstr "Dźělne nahraće."
-#: lib/imagefile.php:88 lib/mediafile.php:170
+#: lib/imagefile.php:101 lib/mediafile.php:170
msgid "System error uploading file."
msgstr ""
-#: lib/imagefile.php:96
-msgid "Not an image or corrupt file."
-msgstr ""
-
#: lib/imagefile.php:109
-msgid "Unsupported image file format."
+msgid "Not an image or corrupt file."
msgstr ""
#: lib/imagefile.php:122
msgid "Lost our file."
msgstr "Naša dataja je so zhubiła."
-#: lib/imagefile.php:166 lib/imagefile.php:231
+#: lib/imagefile.php:163 lib/imagefile.php:224
msgid "Unknown file type"
msgstr "Njeznaty datajowy typ"
-#: lib/imagefile.php:251
+#: lib/imagefile.php:244
msgid "MB"
msgstr "MB"
-#: lib/imagefile.php:253
+#: lib/imagefile.php:246
msgid "kB"
msgstr "KB"
-#: lib/jabber.php:220
+#: lib/jabber.php:387
#, php-format
msgid "[%s]"
msgstr "[%s]"
-#: lib/jabber.php:400
+#: lib/jabber.php:567
#, php-format
msgid "Unknown inbox source %d."
msgstr "Njeznate žórło postoweho kašćika %d."
@@ -5610,7 +5566,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:482
+#: lib/mailbox.php:227 lib/noticelist.php:486
msgid "from"
msgstr "wot"
@@ -5700,7 +5656,6 @@ msgid "Available characters"
msgstr "K dispoziciji stejace znamješka"
#: lib/messageform.php:178 lib/noticeform.php:236
-#, fuzzy
msgctxt "Send button for sending notice"
msgid "Send"
msgstr "Pósłać"
@@ -5736,48 +5691,48 @@ msgid ""
"try again later"
msgstr ""
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "N"
msgstr "S"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "S"
msgstr "J"
-#: lib/noticelist.php:431
+#: lib/noticelist.php:432
msgid "E"
msgstr "W"
-#: lib/noticelist.php:431
+#: lib/noticelist.php:432
msgid "W"
msgstr "Z"
-#: lib/noticelist.php:438
+#: lib/noticelist.php:439
msgid "at"
msgstr ""
-#: lib/noticelist.php:566
+#: lib/noticelist.php:570
msgid "in context"
msgstr ""
-#: lib/noticelist.php:601
+#: lib/noticelist.php:605
msgid "Repeated by"
msgstr "Wospjetowany wot"
-#: lib/noticelist.php:628
+#: lib/noticelist.php:632
msgid "Reply to this notice"
msgstr "Na tutu zdźělenku wotmołwić"
-#: lib/noticelist.php:629
+#: lib/noticelist.php:633
msgid "Reply"
msgstr "Wotmołwić"
-#: lib/noticelist.php:673
+#: lib/noticelist.php:677
msgid "Notice repeated"
msgstr "Zdźělenka wospjetowana"
@@ -5850,7 +5805,7 @@ msgstr ""
msgid "Unknown"
msgstr "Njeznaty"
-#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr "Abonementy"
@@ -5858,7 +5813,7 @@ msgstr "Abonementy"
msgid "All subscriptions"
msgstr "Wšě abonementy"
-#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90
+#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr "Abonenća"
@@ -5866,15 +5821,20 @@ msgstr "Abonenća"
msgid "All subscribers"
msgstr "Wšitcy abonenća"
-#: lib/profileaction.php:180
+#: lib/profileaction.php:186
msgid "User ID"
msgstr "Wužiwarski ID"
-#: lib/profileaction.php:185
+#: lib/profileaction.php:191
msgid "Member since"
msgstr "Čłon wot"
-#: lib/profileaction.php:247
+#. TRANS: Average count of posts made per day since account registration
+#: lib/profileaction.php:230
+msgid "Daily average"
+msgstr ""
+
+#: lib/profileaction.php:259
msgid "All groups"
msgstr "Wšě skupiny"
@@ -5915,11 +5875,11 @@ msgid "Repeat this notice"
msgstr "Tutu zdźělenku wospjetować"
#: lib/revokeroleform.php:91
-#, fuzzy, php-format
+#, php-format
msgid "Revoke the \"%s\" role from this user"
-msgstr "Tutoho wužiwarja za tutu skupinu blokować"
+msgstr "Rólu \"%s\" tutoho wužiwarja wotwołać"
-#: lib/router.php:671
+#: lib/router.php:704
msgid "No single user defined for single-user mode."
msgstr ""
@@ -6045,91 +6005,98 @@ msgstr "Tutoho wužiwarja wotskazać"
msgid "Unsubscribe"
msgstr "Wotskazać"
-#: lib/userprofile.php:116
+#: lib/usernoprofileexception.php:58
+#, php-format
+msgid "User %s (%d) has no profile record."
+msgstr "Wužiwar %s (%d) nima profil."
+
+#: lib/userprofile.php:117
msgid "Edit Avatar"
msgstr "Awatar wobdźěłać"
-#: lib/userprofile.php:236
+#: lib/userprofile.php:234 lib/userprofile.php:248
msgid "User actions"
msgstr "Wužiwarske akcije"
-#: lib/userprofile.php:251
+#: lib/userprofile.php:237
+msgid "User deletion in progress..."
+msgstr ""
+
+#: lib/userprofile.php:263
msgid "Edit profile settings"
msgstr "Profilowe nastajenja wobdźěłać"
-#: lib/userprofile.php:252
+#: lib/userprofile.php:264
msgid "Edit"
msgstr "Wobdźěłać"
-#: lib/userprofile.php:275
+#: lib/userprofile.php:287
msgid "Send a direct message to this user"
msgstr "Tutomu wužiwarja direktnu powěsć pósłać"
-#: lib/userprofile.php:276
+#: lib/userprofile.php:288
msgid "Message"
msgstr "Powěsć"
-#: lib/userprofile.php:314
+#: lib/userprofile.php:326
msgid "Moderate"
msgstr ""
-#: lib/userprofile.php:352
-#, fuzzy
+#: lib/userprofile.php:364
msgid "User role"
-msgstr "Wužiwarski profil"
+msgstr "Wužiwarska róla"
-#: lib/userprofile.php:354
-#, fuzzy
+#: lib/userprofile.php:366
msgctxt "role"
msgid "Administrator"
-msgstr "Administratorojo"
+msgstr "Administrator"
-#: lib/userprofile.php:355
+#: lib/userprofile.php:367
msgctxt "role"
msgid "Moderator"
msgstr ""
-#: lib/util.php:1015
+#: lib/util.php:1046
msgid "a few seconds ago"
msgstr "před něšto sekundami"
-#: lib/util.php:1017
+#: lib/util.php:1048
msgid "about a minute ago"
msgstr "před něhdźe jednej mjeńšinu"
-#: lib/util.php:1019
+#: lib/util.php:1050
#, php-format
msgid "about %d minutes ago"
msgstr "před %d mjeńšinami"
-#: lib/util.php:1021
+#: lib/util.php:1052
msgid "about an hour ago"
msgstr "před něhdźe jednej hodźinu"
-#: lib/util.php:1023
+#: lib/util.php:1054
#, php-format
msgid "about %d hours ago"
msgstr "před něhdźe %d hodźinami"
-#: lib/util.php:1025
+#: lib/util.php:1056
msgid "about a day ago"
msgstr "před něhdźe jednym dnjom"
-#: lib/util.php:1027
+#: lib/util.php:1058
#, php-format
msgid "about %d days ago"
msgstr "před něhdźe %d dnjemi"
-#: lib/util.php:1029
+#: lib/util.php:1060
msgid "about a month ago"
msgstr "před něhdźe jednym měsacom"
-#: lib/util.php:1031
+#: lib/util.php:1062
#, php-format
msgid "about %d months ago"
msgstr "před něhdźe %d měsacami"
-#: lib/util.php:1033
+#: lib/util.php:1064
msgid "about a year ago"
msgstr "před něhdźe jednym lětom"
@@ -6145,7 +6112,7 @@ msgstr ""
"%s płaćiwa barba njeje! Wužij 3 heksadecimalne znamješka abo 6 "
"heksadecimalnych znamješkow."
-#: lib/xmppmanager.php:402
+#: lib/xmppmanager.php:403
#, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d."
msgstr ""
diff --git a/locale/ia/LC_MESSAGES/statusnet.po b/locale/ia/LC_MESSAGES/statusnet.po
index 7a96686ed..c21a0db8c 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-03-06 23:49+0000\n"
-"PO-Revision-Date: 2010-03-06 23:50:08+0000\n"
+"POT-Creation-Date: 2010-04-05 18:54+0000\n"
+"PO-Revision-Date: 2010-04-05 18:55:30+0000\n"
"Language-Team: Interlingua\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64621); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ia\n"
"X-Message-Group: out-statusnet\n"
@@ -42,7 +42,6 @@ msgstr "Prohibir al usatores anonyme (sin session aperte) de vider le sito?"
#. TRANS: Checkbox label for prohibiting anonymous users from viewing site.
#: actions/accessadminpanel.php:167
-#, fuzzy
msgctxt "LABEL"
msgid "Private"
msgstr "Private"
@@ -73,7 +72,6 @@ msgid "Save access settings"
msgstr "Salveguardar configurationes de accesso"
#: actions/accessadminpanel.php:203
-#, fuzzy
msgctxt "BUTTON"
msgid "Save"
msgstr "Salveguardar"
@@ -92,9 +90,9 @@ msgstr "Pagina non existe"
#: 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:90
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78
+#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
@@ -103,10 +101,8 @@ msgstr "Pagina non existe"
#: actions/remotesubscribe.php:154 actions/replies.php:73
#: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:163 lib/command.php:302
-#: lib/command.php:355 lib/command.php:401 lib/command.php:462
-#: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82
-#: lib/profileaction.php:77
+#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: lib/mailbox.php:82 lib/profileaction.php:77
msgid "No such user."
msgstr "Usator non existe."
@@ -201,18 +197,18 @@ msgstr "Actualisationes de %1$s e su amicos in %2$s!"
#: 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:132
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:136
#: actions/apigrouplistall.php:120 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:135
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
-#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184
-#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148
+#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:174
+#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173
+#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
-#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
+#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
msgid "API method not found."
msgstr "Methodo API non trovate."
@@ -225,8 +221,8 @@ msgstr "Methodo API non trovate."
#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65
-#: actions/apistatusesupdate.php:118
+#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
msgid "This method requires a POST."
msgstr "Iste methodo require un POST."
@@ -257,7 +253,7 @@ msgid "Could not save profile."
msgstr "Non poteva salveguardar le profilo."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:97
+#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
#: actions/designadminpanel.php:122 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
@@ -343,7 +339,7 @@ msgstr "Nulle stato trovate con iste ID."
msgid "This status is already a favorite."
msgstr "Iste stato es ja favorite."
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
msgid "Could not create favorite."
msgstr "Non poteva crear le favorite."
@@ -460,7 +456,7 @@ msgstr "Gruppo non trovate!"
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:221
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
msgid "You have been blocked from that group by the admin."
msgstr "Le administrator te ha blocate de iste gruppo."
@@ -478,11 +474,18 @@ msgstr "Tu non es membro de iste gruppo."
msgid "Could not remove user %1$s from group %2$s."
msgstr "Non poteva remover le usator %1$s del gruppo %2$s."
-#: actions/apigrouplist.php:95
+#. TRANS: %s is a user name
+#: actions/apigrouplist.php:97
#, php-format
msgid "%s's groups"
msgstr "Gruppos de %s"
+#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s
+#: actions/apigrouplist.php:107
+#, fuzzy, php-format
+msgid "%1$s groups %2$s is a member of."
+msgstr "Gruppos del quales %s es membro"
+
#: actions/apigrouplistall.php:90 actions/usergroups.php:62
#, php-format
msgid "%s groups"
@@ -510,7 +513,7 @@ msgstr "Indicio invalide."
#: 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:337
+#: actions/profilesettings.php:194 actions/recoverpassword.php:350
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
@@ -576,15 +579,15 @@ msgstr ""
"<strong>%3$s</strong> le datos de tu conto de %4$s. Tu debe solmente dar "
"accesso a tu conto de %4$s a tertie personas in le quales tu ha confidentia."
-#: actions/apioauthauthorize.php:310 lib/action.php:438
+#: actions/apioauthauthorize.php:310 lib/action.php:437
msgid "Account"
msgstr "Conto"
#: actions/apioauthauthorize.php:313 actions/login.php:230
#: actions/profilesettings.php:106 actions/register.php:424
-#: actions/showgroup.php:244 actions/tagother.php:94
+#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
-#: lib/userprofile.php:131
+#: lib/userprofile.php:132
msgid "Nickname"
msgstr "Pseudonymo"
@@ -656,12 +659,12 @@ msgstr ""
msgid "Unsupported format."
msgstr "Formato non supportate."
-#: actions/apitimelinefavorites.php:108
+#: actions/apitimelinefavorites.php:109
#, php-format
msgid "%1$s / Favorites from %2$s"
msgstr "%1$s / Favorites de %2$s"
-#: actions/apitimelinefavorites.php:117
+#: actions/apitimelinefavorites.php:118
#, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "%1$s actualisationes favoritisate per %2$s / %2$s."
@@ -671,7 +674,7 @@ msgstr "%1$s actualisationes favoritisate per %2$s / %2$s."
msgid "%1$s / Updates mentioning %2$s"
msgstr "%1$s / Actualisationes que mentiona %2$s"
-#: actions/apitimelinementions.php:127
+#: actions/apitimelinementions.php:130
#, php-format
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr ""
@@ -682,7 +685,7 @@ msgstr ""
msgid "%s public timeline"
msgstr "Chronologia public de %s"
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "Actualisationes de totes in %s!"
@@ -697,12 +700,12 @@ msgstr "Repetite a %s"
msgid "Repeats of %s"
msgstr "Repetitiones de %s"
-#: actions/apitimelinetag.php:102 actions/tag.php:67
+#: actions/apitimelinetag.php:104 actions/tag.php:67
#, php-format
msgid "Notices tagged with %s"
msgstr "Notas con etiquetta %s"
-#: actions/apitimelinetag.php:104 actions/tagrss.php:65
+#: actions/apitimelinetag.php:106 actions/tagrss.php:65
#, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Actualisationes con etiquetta %1$s in %2$s!"
@@ -730,7 +733,7 @@ msgstr "Nulle dimension."
msgid "Invalid size."
msgstr "Dimension invalide."
-#: actions/avatarsettings.php:67 actions/showgroup.php:229
+#: actions/avatarsettings.php:67 actions/showgroup.php:230
#: lib/accountsettingsaction.php:112
msgid "Avatar"
msgstr "Avatar"
@@ -763,7 +766,7 @@ msgid "Preview"
msgstr "Previsualisation"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:655
+#: lib/deleteuserform.php:66 lib/noticelist.php:659
msgid "Delete"
msgstr "Deler"
@@ -775,23 +778,27 @@ msgstr "Incargar"
msgid "Crop"
msgstr "Taliar"
-#: actions/avatarsettings.php:328
+#: actions/avatarsettings.php:305
+msgid "No file uploaded."
+msgstr "Nulle file incargate."
+
+#: actions/avatarsettings.php:332
msgid "Pick a square area of the image to be your avatar"
msgstr "Selige un area quadrate del imagine pro facer lo tu avatar"
-#: actions/avatarsettings.php:343 actions/grouplogo.php:380
+#: actions/avatarsettings.php:347 actions/grouplogo.php:380
msgid "Lost our file data."
msgstr "Datos del file perdite."
-#: actions/avatarsettings.php:366
+#: actions/avatarsettings.php:370
msgid "Avatar updated."
msgstr "Avatar actualisate."
-#: actions/avatarsettings.php:369
+#: actions/avatarsettings.php:373
msgid "Failed updating avatar."
msgstr "Actualisation del avatar fallite."
-#: actions/avatarsettings.php:393
+#: actions/avatarsettings.php:397
msgid "Avatar deleted."
msgstr "Avatar delite."
@@ -846,8 +853,8 @@ msgstr "Falleva de salveguardar le information del blocada."
#: actions/groupunblock.php:86 actions/joingroup.php:82
#: actions/joingroup.php:93 actions/leavegroup.php:82
#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212
-#: lib/command.php:260
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162
+#: lib/command.php:358
msgid "No such group."
msgstr "Gruppo non existe."
@@ -929,7 +936,7 @@ msgid "Conversation"
msgstr "Conversation"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:218 lib/searchgroupnav.php:82
+#: lib/profileaction.php:224 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "Notas"
@@ -948,7 +955,7 @@ msgstr "Tu non es le proprietario de iste application."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1217
+#: lib/action.php:1219
msgid "There was a problem with your session token."
msgstr "Il habeva un problema con tu indicio de session."
@@ -1009,7 +1016,7 @@ msgstr "Es tu secur de voler deler iste nota?"
msgid "Do not delete this notice"
msgstr "Non deler iste nota"
-#: actions/deletenotice.php:146 lib/noticelist.php:655
+#: actions/deletenotice.php:146 lib/noticelist.php:659
msgid "Delete this notice"
msgstr "Deler iste nota"
@@ -1146,7 +1153,7 @@ msgstr "Revenir al predefinitiones"
#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:208
+#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
#: actions/tagother.php:154 actions/useradminpanel.php:294
#: lib/applicationeditform.php:333 lib/applicationeditform.php:334
#: lib/designsettings.php:256 lib/groupeditform.php:202
@@ -1262,7 +1269,7 @@ msgstr "description es troppo longe (max %d chars)."
msgid "Could not update group."
msgstr "Non poteva actualisar gruppo."
-#: actions/editgroup.php:264 classes/User_group.php:493
+#: actions/editgroup.php:264 classes/User_group.php:496
msgid "Could not create aliases."
msgstr "Non poteva crear aliases."
@@ -1578,23 +1585,20 @@ msgid "Cannot read file."
msgstr "Non pote leger file."
#: actions/grantrole.php:62 actions/revokerole.php:62
-#, fuzzy
msgid "Invalid role."
-msgstr "Indicio invalide."
+msgstr "Rolo invalide."
#: actions/grantrole.php:66 actions/revokerole.php:66
msgid "This role is reserved and cannot be set."
-msgstr ""
+msgstr "Iste rolo es reservate e non pote esser apponite."
#: actions/grantrole.php:75
-#, fuzzy
msgid "You cannot grant user roles on this site."
-msgstr "Tu non pote mitter usatores in le cassa de sablo in iste sito."
+msgstr "Tu non pote conceder rolos a usatores in iste sito."
#: actions/grantrole.php:82
-#, fuzzy
msgid "User already has this role."
-msgstr "Usator es ja silentiate."
+msgstr "Le usator ha ja iste rolo."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
@@ -1754,7 +1758,7 @@ msgstr "Chronologia de %s"
msgid "Updates from members of %1$s on %2$s!"
msgstr "Actualisationes de membros de %1$s in %2$s!"
-#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232
+#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244
#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr "Gruppos"
@@ -1968,7 +1972,7 @@ msgstr "Invitar nove usatores"
msgid "You are already subscribed to these users:"
msgstr "Tu es a subscribite a iste usatores:"
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
#, php-format
msgid "%1$s (%2$s)"
msgstr "%1$s (%2$s)"
@@ -2016,7 +2020,6 @@ msgstr "Si tu vole, adde un message personal al invitation."
#. TRANS: Send button for inviting friends
#: actions/invite.php:198
-#, fuzzy
msgctxt "BUTTON"
msgid "Send"
msgstr "Inviar"
@@ -2088,9 +2091,8 @@ msgid "You must be logged in to join a group."
msgstr "Tu debe aperir un session pro facer te membro de un gruppo."
#: actions/joingroup.php:88 actions/leavegroup.php:88
-#, fuzzy
msgid "No nickname or ID."
-msgstr "Nulle pseudonymo."
+msgstr "Nulle pseudonymo o ID."
#: actions/joingroup.php:141
#, php-format
@@ -2101,7 +2103,7 @@ msgstr "%1$s es ora membro del gruppo %2$s"
msgid "You must be logged in to leave a group."
msgstr "Tu debe aperir un session pro quitar un gruppo."
-#: actions/leavegroup.php:100 lib/command.php:265
+#: actions/leavegroup.php:100 lib/command.php:363
msgid "You are not a member of that group."
msgstr "Tu non es membro de iste gruppo."
@@ -2217,12 +2219,12 @@ msgstr "Usa iste formulario pro crear un nove gruppo."
msgid "New message"
msgstr "Nove message"
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
msgid "You can't send a message to this user."
msgstr "Tu non pote inviar un message a iste usator."
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342
-#: lib/command.php:475
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
+#: lib/command.php:529
msgid "No content!"
msgstr "Nulle contento!"
@@ -2230,7 +2232,7 @@ msgstr "Nulle contento!"
msgid "No recipient specified."
msgstr "Nulle destinatario specificate."
-#: actions/newmessage.php:164 lib/command.php:361
+#: actions/newmessage.php:164 lib/command.php:462
msgid ""
"Don't send a message to yourself; just say it to yourself quietly instead."
msgstr ""
@@ -2246,7 +2248,7 @@ msgstr "Message inviate"
msgid "Direct message to %s sent."
msgstr "Message directe a %s inviate."
-#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189
msgid "Ajax Error"
msgstr "Error de Ajax"
@@ -2254,7 +2256,7 @@ msgstr "Error de Ajax"
msgid "New notice"
msgstr "Nove nota"
-#: actions/newnotice.php:211
+#: actions/newnotice.php:217
msgid "Notice posted"
msgstr "Nota publicate"
@@ -2368,7 +2370,7 @@ msgstr ""
msgid "Notice has no profile"
msgstr "Le nota ha nulle profilo"
-#: actions/oembed.php:86 actions/shownotice.php:180
+#: actions/oembed.php:86 actions/shownotice.php:175
#, php-format
msgid "%1$s's status on %2$s"
msgstr "Le stato de %1$s in %2$s"
@@ -2381,8 +2383,8 @@ msgstr "typo de contento "
msgid "Only "
msgstr "Solmente "
-#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042
-#: lib/apiaction.php:1070 lib/apiaction.php:1179
+#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1068
+#: lib/apiaction.php:1096 lib/apiaction.php:1212
msgid "Not a supported data format."
msgstr "Formato de datos non supportate."
@@ -2514,7 +2516,7 @@ msgstr "Ancian contrasigno incorrecte"
msgid "Error saving user; invalid."
msgstr "Error de salveguardar le usator; invalide."
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
msgid "Can't save new password."
msgstr "Non pote salveguardar le nove contrasigno."
@@ -2729,8 +2731,8 @@ 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/showgroup.php:255 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:149
+#: actions/showgroup.php:256 actions/tagother.php:104
+#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Nomine complete"
@@ -2757,9 +2759,9 @@ msgid "Bio"
msgstr "Bio"
#: actions/profilesettings.php:132 actions/register.php:471
-#: actions/showgroup.php:264 actions/tagother.php:112
+#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
-#: lib/userprofile.php:164
+#: lib/userprofile.php:165
msgid "Location"
msgstr "Loco"
@@ -2773,7 +2775,7 @@ msgstr "Divulgar mi loco actual quando io publica notas"
#: actions/profilesettings.php:145 actions/tagother.php:149
#: actions/tagother.php:209 lib/subscriptionlist.php:106
-#: lib/subscriptionlist.php:108 lib/userprofile.php:209
+#: lib/subscriptionlist.php:108 lib/userprofile.php:210
msgid "Tags"
msgstr "Etiquettas"
@@ -3015,7 +3017,7 @@ msgstr "Reinitialisar contrasigno"
msgid "Recover password"
msgstr "Recuperar contrasigno"
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
msgid "Password recovery requested"
msgstr "Recuperation de contrasigno requestate"
@@ -3035,19 +3037,19 @@ msgstr "Reinitialisar"
msgid "Enter a nickname or email address."
msgstr "Entra un pseudonymo o adresse de e-mail."
-#: actions/recoverpassword.php:272
+#: actions/recoverpassword.php:282
msgid "No user with that email address or username."
msgstr "Nulle usator existe con iste adresse de e-mail o nomine de usator."
-#: actions/recoverpassword.php:287
+#: actions/recoverpassword.php:299
msgid "No registered email address for that user."
msgstr "Nulle adresse de e-mail registrate pro iste usator."
-#: actions/recoverpassword.php:301
+#: actions/recoverpassword.php:313
msgid "Error saving address confirmation."
msgstr "Error al salveguardar le confirmation del adresse."
-#: actions/recoverpassword.php:325
+#: actions/recoverpassword.php:338
msgid ""
"Instructions for recovering your password have been sent to the email "
"address registered to your account."
@@ -3055,23 +3057,23 @@ msgstr ""
"Instructiones pro recuperar tu contrasigno ha essite inviate al adresse de e-"
"mail registrate in tu conto."
-#: actions/recoverpassword.php:344
+#: actions/recoverpassword.php:357
msgid "Unexpected password reset."
msgstr "Reinitialisation inexpectate del contrasigno."
-#: actions/recoverpassword.php:352
+#: actions/recoverpassword.php:365
msgid "Password must be 6 chars or more."
msgstr "Le contrasigno debe haber 6 characteres o plus."
-#: actions/recoverpassword.php:356
+#: actions/recoverpassword.php:369
msgid "Password and confirmation do not match."
msgstr "Contrasigno e confirmation non corresponde."
-#: actions/recoverpassword.php:375 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:248
msgid "Error setting user."
msgstr "Error durante le configuration del usator."
-#: actions/recoverpassword.php:382
+#: actions/recoverpassword.php:395
msgid "New password successfully saved. You are now logged in."
msgstr "Nove contrasigno salveguardate con successo. Tu session es ora aperte."
@@ -3235,7 +3237,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "URL de tu profilo in un altere servicio de microblogging compatibile"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:394
+#: lib/userprofile.php:406
msgid "Subscribe"
msgstr "Subscriber"
@@ -3273,7 +3275,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:674
+#: actions/repeat.php:114 lib/noticelist.php:678
msgid "Repeated"
msgstr "Repetite"
@@ -3340,14 +3342,12 @@ msgid "Replies to %1$s on %2$s!"
msgstr "Responsas a %1$s in %2$s!"
#: actions/revokerole.php:75
-#, fuzzy
msgid "You cannot revoke user roles on this site."
-msgstr "Tu non pote silentiar usatores in iste sito."
+msgstr "Tu non pote revocar rolos de usatores in iste sito."
#: actions/revokerole.php:82
-#, fuzzy
msgid "User doesn't have this role."
-msgstr "Usator sin profilo correspondente"
+msgstr "Le usator non ha iste rolo."
#: actions/rsd.php:146 actions/version.php:157
msgid "StatusNet"
@@ -3418,8 +3418,8 @@ msgstr "Organisation"
msgid "Description"
msgstr "Description"
-#: actions/showapplication.php:192 actions/showgroup.php:438
-#: lib/profileaction.php:176
+#: actions/showapplication.php:192 actions/showgroup.php:439
+#: lib/profileaction.php:182
msgid "Statistics"
msgstr "Statisticas"
@@ -3539,67 +3539,67 @@ msgstr "Gruppo %s"
msgid "%1$s group, page %2$d"
msgstr "Gruppo %1$s, pagina %2$d"
-#: actions/showgroup.php:226
+#: actions/showgroup.php:227
msgid "Group profile"
msgstr "Profilo del gruppo"
-#: actions/showgroup.php:271 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:177
+#: actions/showgroup.php:272 actions/tagother.php:118
+#: actions/userauthorization.php:175 lib/userprofile.php:178
msgid "URL"
msgstr "URL"
-#: actions/showgroup.php:282 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:194
+#: actions/showgroup.php:283 actions/tagother.php:128
+#: actions/userauthorization.php:187 lib/userprofile.php:195
msgid "Note"
msgstr "Nota"
-#: actions/showgroup.php:292 lib/groupeditform.php:184
+#: actions/showgroup.php:293 lib/groupeditform.php:184
msgid "Aliases"
msgstr "Aliases"
-#: actions/showgroup.php:301
+#: actions/showgroup.php:302
msgid "Group actions"
msgstr "Actiones del gruppo"
-#: actions/showgroup.php:337
+#: actions/showgroup.php:338
#, php-format
msgid "Notice feed for %s group (RSS 1.0)"
msgstr "Syndication de notas pro le gruppo %s (RSS 1.0)"
-#: actions/showgroup.php:343
+#: actions/showgroup.php:344
#, php-format
msgid "Notice feed for %s group (RSS 2.0)"
msgstr "Syndication de notas pro le gruppo %s (RSS 2.0)"
-#: actions/showgroup.php:349
+#: actions/showgroup.php:350
#, php-format
msgid "Notice feed for %s group (Atom)"
msgstr "Syndication de notas pro le gruppo %s (Atom)"
-#: actions/showgroup.php:354
+#: actions/showgroup.php:355
#, php-format
msgid "FOAF for %s group"
msgstr "Amico de un amico pro le gruppo %s"
-#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91
+#: actions/showgroup.php:391 actions/showgroup.php:448 lib/groupnav.php:91
msgid "Members"
msgstr "Membros"
-#: actions/showgroup.php:395 lib/profileaction.php:117
-#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95
-#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71
+#: actions/showgroup.php:396 lib/profileaction.php:117
+#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95
+#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
msgid "(None)"
msgstr "(Nulle)"
-#: actions/showgroup.php:401
+#: actions/showgroup.php:402
msgid "All members"
msgstr "Tote le membros"
-#: actions/showgroup.php:441
+#: actions/showgroup.php:442
msgid "Created"
msgstr "Create"
-#: actions/showgroup.php:457
+#: actions/showgroup.php:458
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3614,7 +3614,7 @@ msgstr ""
"lor vita e interesses. [Crea un conto](%%%%action.register%%%%) pro devenir "
"parte de iste gruppo e multe alteres! ([Lege plus](%%%%doc.help%%%%))"
-#: actions/showgroup.php:463
+#: actions/showgroup.php:464
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3627,7 +3627,7 @@ msgstr ""
"[StatusNet](http://status.net/). Su membros condivide breve messages super "
"lor vita e interesses. "
-#: actions/showgroup.php:491
+#: actions/showgroup.php:492
msgid "Admins"
msgstr "Administratores"
@@ -3750,9 +3750,8 @@ msgid "User is already silenced."
msgstr "Usator es ja silentiate."
#: actions/siteadminpanel.php:69
-#, fuzzy
msgid "Basic settings for this StatusNet site"
-msgstr "Configurationes de base pro iste sito de StatusNet."
+msgstr "Configurationes de base pro iste sito de StatusNet"
#: actions/siteadminpanel.php:133
msgid "Site name must have non-zero length."
@@ -3768,8 +3767,8 @@ msgid "Unknown language \"%s\"."
msgstr "Lingua \"%s\" incognite."
#: actions/siteadminpanel.php:165
-msgid "Minimum text limit is 140 characters."
-msgstr "Le limite minimal del texto es 140 characteres."
+msgid "Minimum text limit is 0 (unlimited)."
+msgstr "Le limite minimal del texto es 0 (illimitate)."
#: actions/siteadminpanel.php:171
msgid "Dupe limit must 1 or more seconds."
@@ -3820,13 +3819,14 @@ msgid "Default timezone for the site; usually UTC."
msgstr "Fuso horari predefinite pro le sito; normalmente UTC."
#: actions/siteadminpanel.php:262
-#, fuzzy
msgid "Default language"
-msgstr "Lingua predefinite del sito"
+msgstr "Lingua predefinite"
#: actions/siteadminpanel.php:263
msgid "Site language when autodetection from browser settings is not available"
msgstr ""
+"Le lingua del sito quando le detection automatic ex le configuration del "
+"navigator non es disponibile"
#: actions/siteadminpanel.php:271
msgid "Limits"
@@ -3851,37 +3851,33 @@ msgstr ""
"publicar le mesme cosa de novo."
#: actions/sitenoticeadminpanel.php:56
-#, fuzzy
msgid "Site Notice"
msgstr "Aviso del sito"
#: actions/sitenoticeadminpanel.php:67
-#, fuzzy
msgid "Edit site-wide message"
-msgstr "Nove message"
+msgstr "Modificar message a tote le sito"
#: actions/sitenoticeadminpanel.php:103
-#, fuzzy
msgid "Unable to save site notice."
-msgstr "Impossibile salveguardar le configurationes del apparentia."
+msgstr "Impossibile salveguardar le aviso del sito."
#: actions/sitenoticeadminpanel.php:113
msgid "Max length for the site-wide notice is 255 chars"
-msgstr ""
+msgstr "Le longitude maxime del aviso a tote le sito es 255 characteres"
#: actions/sitenoticeadminpanel.php:176
-#, fuzzy
msgid "Site notice text"
-msgstr "Aviso del sito"
+msgstr "Texto del aviso del sito"
#: actions/sitenoticeadminpanel.php:178
msgid "Site-wide notice text (255 chars max; HTML okay)"
msgstr ""
+"Le texto del aviso a tote le sito (max. 255 characteres; HTML permittite)"
#: actions/sitenoticeadminpanel.php:198
-#, fuzzy
msgid "Save site notice"
-msgstr "Aviso del sito"
+msgstr "Salveguardar aviso del sito"
#: actions/smssettings.php:58
msgid "SMS settings"
@@ -3989,9 +3985,8 @@ msgid "Snapshots"
msgstr "Instantaneos"
#: actions/snapshotadminpanel.php:65
-#, fuzzy
msgid "Manage snapshot configuration"
-msgstr "Modificar le configuration del sito"
+msgstr "Gerer configuration de instantaneos"
#: actions/snapshotadminpanel.php:127
msgid "Invalid snapshot run value."
@@ -4038,32 +4033,28 @@ msgid "Snapshots will be sent to this URL"
msgstr "Le instantaneos essera inviate a iste URL"
#: actions/snapshotadminpanel.php:248
-#, fuzzy
msgid "Save snapshot settings"
-msgstr "Salveguardar configurationes del sito"
+msgstr "Salveguardar configuration de instantaneos"
#: actions/subedit.php:70
msgid "You are not subscribed to that profile."
msgstr "Tu non es subscribite a iste profilo."
-#: actions/subedit.php:83 classes/Subscription.php:89
-#: classes/Subscription.php:116
+#: actions/subedit.php:83 classes/Subscription.php:132
msgid "Could not save subscription."
msgstr "Non poteva salveguardar le subscription."
#: actions/subscribe.php:77
msgid "This action only accepts POST requests."
-msgstr ""
+msgstr "Iste action accepta solmente le requestas de typo POST."
#: actions/subscribe.php:107
-#, fuzzy
msgid "No such profile."
-msgstr "File non existe."
+msgstr "Profilo non existe."
#: actions/subscribe.php:117
-#, fuzzy
msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
-msgstr "Tu non es subscribite a iste profilo."
+msgstr "Tu non pote subscriber te a un profilo remote OMB 0.1 con iste action."
#: actions/subscribe.php:145
msgid "Subscribed"
@@ -4150,11 +4141,11 @@ msgstr ""
msgid "%s is not listening to anyone."
msgstr "%s non seque alcuno."
-#: actions/subscriptions.php:199
+#: actions/subscriptions.php:208
msgid "Jabber"
msgstr "Jabber"
-#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:222 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr "SMS"
@@ -4187,12 +4178,12 @@ msgstr "Nulle parametro de ID."
msgid "Tag %s"
msgstr "Etiquetta %s"
-#: actions/tagother.php:77 lib/userprofile.php:75
+#: actions/tagother.php:77 lib/userprofile.php:76
msgid "User profile"
msgstr "Profilo del usator"
#: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:102
+#: lib/userprofile.php:103
msgid "Photo"
msgstr "Photo"
@@ -4262,7 +4253,6 @@ msgstr ""
#. TRANS: User admin panel title
#: actions/useradminpanel.php:59
-#, fuzzy
msgctxt "TITLE"
msgid "User"
msgstr "Usator"
@@ -4527,7 +4517,7 @@ msgstr ""
msgid "Plugins"
msgstr "Plug-ins"
-#: actions/version.php:196 lib/action.php:767
+#: actions/version.php:196 lib/action.php:766
msgid "Version"
msgstr "Version"
@@ -4535,7 +4525,7 @@ msgstr "Version"
msgid "Author(s)"
msgstr "Autor(es)"
-#: classes/File.php:144
+#: classes/File.php:169
#, php-format
msgid ""
"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
@@ -4544,12 +4534,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:154
+#: classes/File.php:179
#, 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:161
+#: classes/File.php:186
#, 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."
@@ -4567,9 +4557,8 @@ msgid "Group leave failed."
msgstr "Le cancellation del membrato del gruppo ha fallite."
#: classes/Local_group.php:41
-#, fuzzy
msgid "Could not update local group."
-msgstr "Non poteva actualisar gruppo."
+msgstr "Non poteva actualisar gruppo local."
#: classes/Login_token.php:76
#, php-format
@@ -4588,27 +4577,27 @@ msgstr "Non poteva inserer message."
msgid "Could not update message with new URI."
msgstr "Non poteva actualisar message con nove URI."
-#: classes/Notice.php:172
+#: classes/Notice.php:175
#, php-format
msgid "DB error inserting hashtag: %s"
msgstr "Error in base de datos durante insertion del marca (hashtag): %s"
-#: classes/Notice.php:241
+#: classes/Notice.php:244
msgid "Problem saving notice. Too long."
msgstr "Problema salveguardar nota. Troppo longe."
-#: classes/Notice.php:245
+#: classes/Notice.php:248
msgid "Problem saving notice. Unknown user."
msgstr "Problema salveguardar nota. Usator incognite."
-#: classes/Notice.php:250
+#: classes/Notice.php:253
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:256
+#: classes/Notice.php:259
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
@@ -4616,74 +4605,71 @@ msgstr ""
"Troppo de messages duplicate troppo rapidemente; face un pausa e publica de "
"novo post alcun minutas."
-#: classes/Notice.php:262
+#: classes/Notice.php:265
msgid "You are banned from posting notices on this site."
msgstr "Il te es prohibite publicar notas in iste sito."
-#: classes/Notice.php:328 classes/Notice.php:354
+#: classes/Notice.php:331 classes/Notice.php:357
msgid "Problem saving notice."
msgstr "Problema salveguardar nota."
-#: classes/Notice.php:927
+#: classes/Notice.php:943
msgid "Problem saving group inbox."
msgstr "Problema salveguardar le cassa de entrata del gruppo."
-#: classes/Notice.php:1459
+#: classes/Notice.php:1481
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
-#: classes/Subscription.php:66 lib/oauthstore.php:465
+#: classes/Subscription.php:74 lib/oauthstore.php:465
msgid "You have been banned from subscribing."
msgstr "Tu ha essite blocate del subscription."
-#: classes/Subscription.php:70
+#: classes/Subscription.php:78
msgid "Already subscribed!"
msgstr "Ja subscribite!"
-#: classes/Subscription.php:74
+#: classes/Subscription.php:82
msgid "User has blocked you."
msgstr "Le usator te ha blocate."
-#: classes/Subscription.php:157
+#: classes/Subscription.php:167
msgid "Not subscribed!"
msgstr "Non subscribite!"
-#: classes/Subscription.php:163
+#: classes/Subscription.php:173
msgid "Couldn't delete self-subscription."
msgstr "Non poteva deler auto-subscription."
-#: classes/Subscription.php:190
-#, fuzzy
+#: classes/Subscription.php:200
msgid "Couldn't delete subscription OMB token."
-msgstr "Non poteva deler subscription."
+msgstr "Non poteva deler le indicio OMB del subscription."
-#: classes/Subscription.php:201 lib/subs.php:69
+#: classes/Subscription.php:211
msgid "Couldn't delete subscription."
msgstr "Non poteva deler subscription."
-#: classes/User.php:373
+#: classes/User.php:363
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Benvenite a %1$s, @%2$s!"
-#: classes/User_group.php:477
+#: classes/User_group.php:480
msgid "Could not create group."
msgstr "Non poteva crear gruppo."
-#: classes/User_group.php:486
-#, fuzzy
+#: classes/User_group.php:489
msgid "Could not set group URI."
-msgstr "Non poteva configurar le membrato del gruppo."
+msgstr "Non poteva definir le URL del gruppo."
-#: classes/User_group.php:507
+#: classes/User_group.php:510
msgid "Could not set group membership."
msgstr "Non poteva configurar le membrato del gruppo."
-#: classes/User_group.php:521
-#, fuzzy
+#: classes/User_group.php:524
msgid "Could not save local group info."
-msgstr "Non poteva salveguardar le subscription."
+msgstr "Non poteva salveguardar le informationes del gruppo local."
#: lib/accountsettingsaction.php:108
msgid "Change your profile settings"
@@ -4722,187 +4708,170 @@ msgstr "%1$s - %2$s"
msgid "Untitled page"
msgstr "Pagina sin titulo"
-#: lib/action.php:424
+#: lib/action.php:423
msgid "Primary site navigation"
msgstr "Navigation primari del sito"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:430
-#, fuzzy
+#: lib/action.php:429
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr "Profilo personal e chronologia de amicos"
-#: lib/action.php:433
-#, fuzzy
+#: lib/action.php:432
msgctxt "MENU"
msgid "Personal"
msgstr "Personal"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:435
-#, fuzzy
+#: lib/action.php:434
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "Cambiar tu e-mail, avatar, contrasigno, profilo"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:440
-#, fuzzy
+#: lib/action.php:439
msgctxt "TOOLTIP"
msgid "Connect to services"
-msgstr "Connecter con servicios"
+msgstr "Connecter a servicios"
-#: lib/action.php:443
+#: lib/action.php:442
msgid "Connect"
msgstr "Connecter"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:446
-#, fuzzy
+#: lib/action.php:445
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "Modificar le configuration del sito"
-#: lib/action.php:449
-#, fuzzy
+#: lib/action.php:448
msgctxt "MENU"
msgid "Admin"
-msgstr "Administrator"
+msgstr "Admin"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:453
-#, fuzzy, php-format
+#: lib/action.php:452
+#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "Invitar amicos e collegas a accompaniar te in %s"
-#: lib/action.php:456
-#, fuzzy
+#: lib/action.php:455
msgctxt "MENU"
msgid "Invite"
msgstr "Invitar"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:462
-#, fuzzy
+#: lib/action.php:461
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "Terminar le session del sito"
-#: lib/action.php:465
-#, fuzzy
+#: lib/action.php:464
msgctxt "MENU"
msgid "Logout"
msgstr "Clauder session"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:470
-#, fuzzy
+#: lib/action.php:469
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Crear un conto"
-#: lib/action.php:473
-#, fuzzy
+#: lib/action.php:472
msgctxt "MENU"
msgid "Register"
msgstr "Crear conto"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:476
-#, fuzzy
+#: lib/action.php:475
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Identificar te a iste sito"
-#: lib/action.php:479
-#, fuzzy
+#: lib/action.php:478
msgctxt "MENU"
msgid "Login"
msgstr "Aperir session"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:482
-#, fuzzy
+#: lib/action.php:481
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Adjuta me!"
-#: lib/action.php:485
-#, fuzzy
+#: lib/action.php:484
msgctxt "MENU"
msgid "Help"
msgstr "Adjuta"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:488
-#, fuzzy
+#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "Cercar personas o texto"
-#: lib/action.php:491
-#, fuzzy
+#: lib/action.php:490
msgctxt "MENU"
msgid "Search"
msgstr "Cercar"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:513 lib/adminpanelaction.php:398
+#: lib/action.php:512 lib/adminpanelaction.php:398
msgid "Site notice"
msgstr "Aviso del sito"
-#: lib/action.php:579
+#: lib/action.php:578
msgid "Local views"
msgstr "Vistas local"
-#: lib/action.php:645
+#: lib/action.php:644
msgid "Page notice"
msgstr "Aviso de pagina"
-#: lib/action.php:747
+#: lib/action.php:746
msgid "Secondary site navigation"
msgstr "Navigation secundari del sito"
-#: lib/action.php:752
+#: lib/action.php:751
msgid "Help"
msgstr "Adjuta"
-#: lib/action.php:754
+#: lib/action.php:753
msgid "About"
msgstr "A proposito"
-#: lib/action.php:756
+#: lib/action.php:755
msgid "FAQ"
msgstr "FAQ"
-#: lib/action.php:760
+#: lib/action.php:759
msgid "TOS"
msgstr "CdS"
-#: lib/action.php:763
+#: lib/action.php:762
msgid "Privacy"
msgstr "Confidentialitate"
-#: lib/action.php:765
+#: lib/action.php:764
msgid "Source"
msgstr "Fonte"
-#: lib/action.php:769
+#: lib/action.php:768
msgid "Contact"
msgstr "Contacto"
-#: lib/action.php:771
+#: lib/action.php:770
msgid "Badge"
msgstr "Insignia"
-#: lib/action.php:799
+#: lib/action.php:798
msgid "StatusNet software license"
msgstr "Licentia del software StatusNet"
-#: lib/action.php:802
+#: lib/action.php:803
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4911,12 +4880,12 @@ msgstr ""
"**%%site.name%%** es un servicio de microblog offerite per [%%site.broughtby%"
"%](%%site.broughtbyurl%%). "
-#: lib/action.php:804
+#: lib/action.php:805
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** es un servicio de microblog. "
-#: lib/action.php:806
+#: lib/action.php:808
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4927,56 +4896,62 @@ msgstr ""
"net/), version %s, disponibile sub le [GNU Affero General Public License]"
"(http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:821
+#: lib/action.php:823
msgid "Site content license"
msgstr "Licentia del contento del sito"
-#: lib/action.php:826
+#: lib/action.php:828
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr "Le contento e datos de %1$s es private e confidential."
-#: lib/action.php:831
+#: lib/action.php:833
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr "Contento e datos sub copyright de %1$s. Tote le derectos reservate."
-#: lib/action.php:834
+#: lib/action.php:836
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
"Contento e datos sub copyright del contributores. Tote le derectos reservate."
-#: lib/action.php:847
+#: lib/action.php:849
msgid "All "
msgstr "Totes "
-#: lib/action.php:853
+#: lib/action.php:855
msgid "license."
msgstr "licentia."
-#: lib/action.php:1152
+#: lib/action.php:1154
msgid "Pagination"
msgstr "Pagination"
-#: lib/action.php:1161
+#: lib/action.php:1163
msgid "After"
msgstr "Post"
-#: lib/action.php:1169
+#: lib/action.php:1171
msgid "Before"
msgstr "Ante"
-#: lib/activity.php:453
-msgid "Can't handle remote content yet."
+#: lib/activity.php:120
+msgid "Expecting a root feed element but got a whole XML document."
msgstr ""
+"Expectava le elemento-radice de un syndication, ma recipeva un documento XML "
+"integre."
-#: lib/activity.php:481
+#: lib/activityutils.php:208
+msgid "Can't handle remote content yet."
+msgstr "Non pote ancora tractar contento remote."
+
+#: lib/activityutils.php:236
msgid "Can't handle embedded XML content yet."
-msgstr ""
+msgstr "Non pote ancora tractar contento XML incastrate."
-#: lib/activity.php:485
+#: lib/activityutils.php:240
msgid "Can't handle embedded Base64 content yet."
-msgstr ""
+msgstr "Non pote ancora tractar contento Base64 incastrate."
#. TRANS: Client error message
#: lib/adminpanelaction.php:98
@@ -5010,7 +4985,6 @@ msgstr "Configuration basic del sito"
#. TRANS: Menu item for site administration
#: lib/adminpanelaction.php:350
-#, fuzzy
msgctxt "MENU"
msgid "Site"
msgstr "Sito"
@@ -5022,7 +4996,6 @@ msgstr "Configuration del apparentia"
#. TRANS: Menu item for site administration
#: lib/adminpanelaction.php:358
-#, fuzzy
msgctxt "MENU"
msgid "Design"
msgstr "Apparentia"
@@ -5054,15 +5027,13 @@ msgstr "Configuration del sessiones"
#. TRANS: Menu item title/tooltip
#: lib/adminpanelaction.php:396
-#, fuzzy
msgid "Edit site notice"
-msgstr "Aviso del sito"
+msgstr "Modificar aviso del sito"
#. TRANS: Menu item title/tooltip
#: lib/adminpanelaction.php:404
-#, fuzzy
msgid "Snapshots configuration"
-msgstr "Configuration del camminos"
+msgstr "Configuration del instantaneos"
#: lib/apiauth.php:94
msgid "API resource requires read-write access, but you only have read access."
@@ -5070,7 +5041,7 @@ msgstr ""
"Le ressource de API require accesso pro lectura e scriptura, ma tu ha "
"solmente accesso pro lectura."
-#: lib/apiauth.php:272
+#: lib/apiauth.php:276
#, php-format
msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s"
msgstr ""
@@ -5148,11 +5119,11 @@ msgstr "Revocar"
msgid "Attachments"
msgstr "Annexos"
-#: lib/attachmentlist.php:265
+#: lib/attachmentlist.php:263
msgid "Author"
msgstr "Autor"
-#: lib/attachmentlist.php:278
+#: lib/attachmentlist.php:276
msgid "Provider"
msgstr "Providitor"
@@ -5172,37 +5143,50 @@ msgstr "Cambio del contrasigno fallite"
msgid "Password changing is not allowed"
msgstr "Cambio del contrasigno non permittite"
-#: lib/channel.php:138 lib/channel.php:158
+#: lib/channel.php:157 lib/channel.php:177
msgid "Command results"
msgstr "Resultatos del commando"
-#: lib/channel.php:210 lib/mailhandler.php:142
+#: lib/channel.php:229 lib/mailhandler.php:142
msgid "Command complete"
msgstr "Commando complete"
-#: lib/channel.php:221
+#: lib/channel.php:240
msgid "Command failed"
msgstr "Commando fallite"
-#: lib/command.php:44
-msgid "Sorry, this command is not yet implemented."
-msgstr "Pardono, iste commando non es ancora implementate."
+#: lib/command.php:83 lib/command.php:105
+msgid "Notice with that id does not exist"
+msgstr "Non existe un nota con iste ID"
-#: lib/command.php:88
+#: lib/command.php:99 lib/command.php:570
+msgid "User has no last notice"
+msgstr "Usator non ha ultime nota"
+
+#: lib/command.php:125
#, php-format
msgid "Could not find a user with nickname %s"
msgstr "Non poteva trovar un usator con pseudonymo %s"
-#: lib/command.php:92
+#: lib/command.php:143
+#, php-format
+msgid "Could not find a local user with nickname %s"
+msgstr "Non poteva trovar un usator local con pseudonymo %s"
+
+#: lib/command.php:176
+msgid "Sorry, this command is not yet implemented."
+msgstr "Pardono, iste commando non es ancora implementate."
+
+#: lib/command.php:221
msgid "It does not make a lot of sense to nudge yourself!"
msgstr "Non ha multe senso pulsar te mesme!"
-#: lib/command.php:99
+#: lib/command.php:228
#, php-format
msgid "Nudge sent to %s"
msgstr "Pulsata inviate a %s"
-#: lib/command.php:126
+#: lib/command.php:254
#, php-format
msgid ""
"Subscriptions: %1$s\n"
@@ -5213,198 +5197,197 @@ msgstr ""
"Subscriptores: %2$s\n"
"Notas: %3$s"
-#: lib/command.php:152 lib/command.php:390 lib/command.php:451
-msgid "Notice with that id does not exist"
-msgstr "Non existe un nota con iste ID"
-
-#: lib/command.php:168 lib/command.php:406 lib/command.php:467
-#: lib/command.php:523
-msgid "User has no last notice"
-msgstr "Usator non ha ultime nota"
-
-#: lib/command.php:190
+#: lib/command.php:296
msgid "Notice marked as fave."
msgstr "Nota marcate como favorite."
-#: lib/command.php:217
+#: lib/command.php:317
msgid "You are already a member of that group"
msgstr "Tu es ja membro de iste gruppo"
-#: lib/command.php:231
+#: lib/command.php:331
#, php-format
msgid "Could not join user %s to group %s"
msgstr "Non poteva facer le usator %s membro del gruppo %s"
-#: lib/command.php:236
+#: lib/command.php:336
#, php-format
msgid "%s joined group %s"
msgstr "%s se faceva membro del gruppo %s"
-#: lib/command.php:275
+#: lib/command.php:373
#, php-format
msgid "Could not remove user %s to group %s"
msgstr "Non poteva remover le usator %s del gruppo %s"
-#: lib/command.php:280
+#: lib/command.php:378
#, php-format
msgid "%s left group %s"
msgstr "%s quitava le gruppo %s"
-#: lib/command.php:309
+#: lib/command.php:401
#, php-format
msgid "Fullname: %s"
msgstr "Nomine complete: %s"
-#: lib/command.php:312 lib/mail.php:258
+#: lib/command.php:404 lib/mail.php:258
#, php-format
msgid "Location: %s"
msgstr "Loco: %s"
-#: lib/command.php:315 lib/mail.php:260
+#: lib/command.php:407 lib/mail.php:260
#, php-format
msgid "Homepage: %s"
msgstr "Pagina personal: %s"
-#: lib/command.php:318
+#: lib/command.php:410
#, php-format
msgid "About: %s"
msgstr "A proposito: %s"
-#: lib/command.php:349
+#: lib/command.php:437
+#, php-format
+msgid ""
+"%s is a remote profile; you can only send direct messages to users on the "
+"same server."
+msgstr ""
+"%s es un profilo remote; tu pote solmente inviar messages directe a usatores "
+"super le mesme servitor."
+
+#: lib/command.php:450
#, php-format
msgid "Message too long - maximum is %d characters, you sent %d"
msgstr "Message troppo longe - maximo es %d characteres, tu inviava %d"
-#: lib/command.php:367
+#: lib/command.php:468
#, php-format
msgid "Direct message to %s sent"
msgstr "Message directe a %s inviate"
-#: lib/command.php:369
+#: lib/command.php:470
msgid "Error sending direct message."
msgstr "Error durante le invio del message directe."
-#: lib/command.php:413
+#: lib/command.php:490
msgid "Cannot repeat your own notice"
msgstr "Non pote repeter tu proprie nota"
-#: lib/command.php:418
+#: lib/command.php:495
msgid "Already repeated that notice"
msgstr "Iste nota ha ja essite repetite"
-#: lib/command.php:426
+#: lib/command.php:503
#, php-format
msgid "Notice from %s repeated"
msgstr "Nota de %s repetite"
-#: lib/command.php:428
+#: lib/command.php:505
msgid "Error repeating notice."
msgstr "Error durante le repetition del nota."
-#: lib/command.php:482
+#: lib/command.php:536
#, php-format
msgid "Notice too long - maximum is %d characters, you sent %d"
msgstr "Nota troppo longe - maximo es %d characteres, tu inviava %d"
-#: lib/command.php:491
+#: lib/command.php:545
#, php-format
msgid "Reply to %s sent"
msgstr "Responsa a %s inviate"
-#: lib/command.php:493
+#: lib/command.php:547
msgid "Error saving notice."
msgstr "Errur durante le salveguarda del nota."
-#: lib/command.php:547
+#: lib/command.php:594
msgid "Specify the name of the user to subscribe to"
msgstr "Specifica le nomine del usator al qual subscriber te"
-#: lib/command.php:554 lib/command.php:589
-msgid "No such user"
-msgstr "Usator non existe"
+#: lib/command.php:602
+msgid "Can't subscribe to OMB profiles by command."
+msgstr "Impossibile subscriber se a profilos OMB per medio de un commando."
-#: lib/command.php:561
+#: lib/command.php:608
#, php-format
msgid "Subscribed to %s"
msgstr "Subscribite a %s"
-#: lib/command.php:582 lib/command.php:685
+#: lib/command.php:629 lib/command.php:728
msgid "Specify the name of the user to unsubscribe from"
msgstr "Specifica le nomine del usator al qual cancellar le subscription"
-#: lib/command.php:595
+#: lib/command.php:638
#, php-format
msgid "Unsubscribed from %s"
msgstr "Subscription a %s cancellate"
-#: lib/command.php:613 lib/command.php:636
+#: lib/command.php:656 lib/command.php:679
msgid "Command not yet implemented."
msgstr "Commando non ancora implementate."
-#: lib/command.php:616
+#: lib/command.php:659
msgid "Notification off."
msgstr "Notification disactivate."
-#: lib/command.php:618
+#: lib/command.php:661
msgid "Can't turn off notification."
msgstr "Non pote disactivar notification."
-#: lib/command.php:639
+#: lib/command.php:682
msgid "Notification on."
msgstr "Notification activate."
-#: lib/command.php:641
+#: lib/command.php:684
msgid "Can't turn on notification."
msgstr "Non pote activar notification."
-#: lib/command.php:654
+#: lib/command.php:697
msgid "Login command is disabled"
msgstr "Le commando de apertura de session es disactivate"
-#: lib/command.php:665
+#: lib/command.php:708
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
"Iste ligamine pote esser usate solmente un vice, e es valide durante "
"solmente 2 minutas: %s"
-#: lib/command.php:692
-#, fuzzy, php-format
+#: lib/command.php:735
+#, php-format
msgid "Unsubscribed %s"
-msgstr "Subscription a %s cancellate"
+msgstr "Subscription de %s cancellate"
-#: lib/command.php:709
+#: lib/command.php:752
msgid "You are not subscribed to anyone."
msgstr "Tu non es subscribite a alcuno."
-#: lib/command.php:711
+#: lib/command.php:754
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Tu es subscribite a iste persona:"
msgstr[1] "Tu es subscribite a iste personas:"
-#: lib/command.php:731
+#: lib/command.php:774
msgid "No one is subscribed to you."
msgstr "Necuno es subscribite a te."
-#: lib/command.php:733
+#: lib/command.php:776
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Iste persona es subscribite a te:"
msgstr[1] "Iste personas es subscribite a te:"
-#: lib/command.php:753
+#: lib/command.php:796
msgid "You are not a member of any groups."
msgstr "Tu non es membro de alcun gruppo."
-#: lib/command.php:755
+#: lib/command.php:798
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Tu es membro de iste gruppo:"
msgstr[1] "Tu es membro de iste gruppos:"
-#: lib/command.php:769
-#, fuzzy
+#: lib/command.php:812
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5454,9 +5437,10 @@ msgstr ""
"subscriptions - listar le personas que tu seque\n"
"subscribers - listar le personas qui te seque\n"
"leave <pseudonymo> - cancellar subscription al usator\n"
-"d <pseudonymo> <texto> - diriger message al usator\n"
-"get <pseudonymo> - obtener ultime nota del usator\n"
+"d <pseudonymo> <texto> - diriger un message al usator\n"
+"get <pseudonymo> - obtener le ultime nota del usator\n"
"whois <pseudonymo> - obtener info de profilo del usator\n"
+"lose <pseudonymo> - fortiar le usator de cessar de sequer te\n"
"fav <pseudonymo> - adder ultime nota del usator como favorite\n"
"fav #<id_de_nota> - adder nota con le ID date como favorite\n"
"repeat #<id_de_nota> - repeter le nota con le ID date\n"
@@ -5483,19 +5467,19 @@ msgstr ""
"tracks - non ancora implementate.\n"
"tracking - non ancora implementate.\n"
-#: lib/common.php:148
+#: lib/common.php:135
msgid "No configuration file found. "
msgstr "Nulle file de configuration trovate. "
-#: lib/common.php:149
+#: lib/common.php:136
msgid "I looked for configuration files in the following places: "
msgstr "Io cercava files de configuration in le sequente locos: "
-#: lib/common.php:151
+#: lib/common.php:138
msgid "You may wish to run the installer to fix this."
msgstr "Considera executar le installator pro reparar isto."
-#: lib/common.php:152
+#: lib/common.php:139
msgid "Go to the installer."
msgstr "Ir al installator."
@@ -5597,7 +5581,7 @@ msgstr "Ir"
#: lib/grantroleform.php:91
#, php-format
msgid "Grant this user the \"%s\" role"
-msgstr ""
+msgstr "Conceder le rolo \"%s\" a iste usator"
#: lib/groupeditform.php:163
msgid "URL of the homepage or blog of the group or topic"
@@ -5673,49 +5657,49 @@ msgstr "Etiquettas in le notas del gruppo %s"
msgid "This page is not available in a media type you accept"
msgstr "Iste pagina non es disponibile in un formato que tu accepta"
-#: lib/imagefile.php:75
+#: lib/imagefile.php:72
+msgid "Unsupported image file format."
+msgstr "Formato de file de imagine non supportate."
+
+#: lib/imagefile.php:88
#, php-format
msgid "That file is too big. The maximum file size is %s."
msgstr "Iste file es troppo grande. Le dimension maximal es %s."
-#: lib/imagefile.php:80
+#: lib/imagefile.php:93
msgid "Partial upload."
msgstr "Incargamento partial."
-#: lib/imagefile.php:88 lib/mediafile.php:170
+#: lib/imagefile.php:101 lib/mediafile.php:170
msgid "System error uploading file."
msgstr "Error de systema durante le incargamento del file."
-#: lib/imagefile.php:96
+#: lib/imagefile.php:109
msgid "Not an image or corrupt file."
msgstr "Le file non es un imagine o es defectuose."
-#: lib/imagefile.php:109
-msgid "Unsupported image file format."
-msgstr "Formato de file de imagine non supportate."
-
#: lib/imagefile.php:122
msgid "Lost our file."
msgstr "File perdite."
-#: lib/imagefile.php:166 lib/imagefile.php:231
+#: lib/imagefile.php:163 lib/imagefile.php:224
msgid "Unknown file type"
msgstr "Typo de file incognite"
-#: lib/imagefile.php:251
+#: lib/imagefile.php:244
msgid "MB"
msgstr "MB"
-#: lib/imagefile.php:253
+#: lib/imagefile.php:246
msgid "kB"
msgstr "KB"
-#: lib/jabber.php:220
+#: lib/jabber.php:387
#, php-format
msgid "[%s]"
msgstr "[%s]"
-#: lib/jabber.php:400
+#: lib/jabber.php:567
#, php-format
msgid "Unknown inbox source %d."
msgstr "Fonte de cassa de entrata \"%s\" incognite"
@@ -5996,7 +5980,7 @@ msgstr ""
"altere usatores in conversation. Altere personas pote inviar te messages que "
"solmente tu pote leger."
-#: lib/mailbox.php:227 lib/noticelist.php:482
+#: lib/mailbox.php:227 lib/noticelist.php:486
msgid "from"
msgstr "de"
@@ -6090,7 +6074,6 @@ msgid "Available characters"
msgstr "Characteres disponibile"
#: lib/messageform.php:178 lib/noticeform.php:236
-#, fuzzy
msgctxt "Send button for sending notice"
msgid "Send"
msgstr "Inviar"
@@ -6128,48 +6111,48 @@ msgstr ""
"Pardono, le obtention de tu geolocalisation prende plus tempore que "
"previste. Per favor reproba plus tarde."
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "N"
msgstr "N"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "S"
msgstr "S"
-#: lib/noticelist.php:431
+#: lib/noticelist.php:432
msgid "E"
msgstr "E"
-#: lib/noticelist.php:431
+#: lib/noticelist.php:432
msgid "W"
msgstr "W"
-#: lib/noticelist.php:438
+#: lib/noticelist.php:439
msgid "at"
msgstr "a"
-#: lib/noticelist.php:566
+#: lib/noticelist.php:570
msgid "in context"
msgstr "in contexto"
-#: lib/noticelist.php:601
+#: lib/noticelist.php:605
msgid "Repeated by"
msgstr "Repetite per"
-#: lib/noticelist.php:628
+#: lib/noticelist.php:632
msgid "Reply to this notice"
msgstr "Responder a iste nota"
-#: lib/noticelist.php:629
+#: lib/noticelist.php:633
msgid "Reply"
msgstr "Responder"
-#: lib/noticelist.php:673
+#: lib/noticelist.php:677
msgid "Notice repeated"
msgstr "Nota repetite"
@@ -6242,7 +6225,7 @@ msgstr "Etiquettas in le notas de %s"
msgid "Unknown"
msgstr "Incognite"
-#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr "Subscriptiones"
@@ -6250,7 +6233,7 @@ msgstr "Subscriptiones"
msgid "All subscriptions"
msgstr "Tote le subscriptiones"
-#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90
+#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr "Subscriptores"
@@ -6258,15 +6241,20 @@ msgstr "Subscriptores"
msgid "All subscribers"
msgstr "Tote le subscriptores"
-#: lib/profileaction.php:180
+#: lib/profileaction.php:186
msgid "User ID"
msgstr "ID del usator"
-#: lib/profileaction.php:185
+#: lib/profileaction.php:191
msgid "Member since"
msgstr "Membro depost"
-#: lib/profileaction.php:247
+#. TRANS: Average count of posts made per day since account registration
+#: lib/profileaction.php:230
+msgid "Daily average"
+msgstr "Media de cata die"
+
+#: lib/profileaction.php:259
msgid "All groups"
msgstr "Tote le gruppos"
@@ -6307,11 +6295,11 @@ msgid "Repeat this notice"
msgstr "Repeter iste nota"
#: lib/revokeroleform.php:91
-#, fuzzy, php-format
+#, php-format
msgid "Revoke the \"%s\" role from this user"
-msgstr "Blocar iste usator de iste gruppo"
+msgstr "Revocar le rolo \"%s\" de iste usator"
-#: lib/router.php:671
+#: lib/router.php:704
msgid "No single user defined for single-user mode."
msgstr "Nulle signule usator definite pro le modo de singule usator."
@@ -6437,92 +6425,98 @@ msgstr "Cancellar subscription a iste usator"
msgid "Unsubscribe"
msgstr "Cancellar subscription"
-#: lib/userprofile.php:116
+#: lib/usernoprofileexception.php:58
+#, php-format
+msgid "User %s (%d) has no profile record."
+msgstr "Le usator %s (%d) non ha un profilo."
+
+#: lib/userprofile.php:117
msgid "Edit Avatar"
msgstr "Modificar avatar"
-#: lib/userprofile.php:236
+#: lib/userprofile.php:234 lib/userprofile.php:248
msgid "User actions"
msgstr "Actiones de usator"
-#: lib/userprofile.php:251
+#: lib/userprofile.php:237
+msgid "User deletion in progress..."
+msgstr "Deletion del usator in curso…"
+
+#: lib/userprofile.php:263
msgid "Edit profile settings"
msgstr "Modificar configuration de profilo"
-#: lib/userprofile.php:252
+#: lib/userprofile.php:264
msgid "Edit"
msgstr "Modificar"
-#: lib/userprofile.php:275
+#: lib/userprofile.php:287
msgid "Send a direct message to this user"
msgstr "Inviar un message directe a iste usator"
-#: lib/userprofile.php:276
+#: lib/userprofile.php:288
msgid "Message"
msgstr "Message"
-#: lib/userprofile.php:314
+#: lib/userprofile.php:326
msgid "Moderate"
msgstr "Moderar"
-#: lib/userprofile.php:352
-#, fuzzy
+#: lib/userprofile.php:364
msgid "User role"
-msgstr "Profilo del usator"
+msgstr "Rolo de usator"
-#: lib/userprofile.php:354
-#, fuzzy
+#: lib/userprofile.php:366
msgctxt "role"
msgid "Administrator"
-msgstr "Administratores"
+msgstr "Administrator"
-#: lib/userprofile.php:355
-#, fuzzy
+#: lib/userprofile.php:367
msgctxt "role"
msgid "Moderator"
-msgstr "Moderar"
+msgstr "Moderator"
-#: lib/util.php:1015
+#: lib/util.php:1046
msgid "a few seconds ago"
msgstr "alcun secundas retro"
-#: lib/util.php:1017
+#: lib/util.php:1048
msgid "about a minute ago"
msgstr "circa un minuta retro"
-#: lib/util.php:1019
+#: lib/util.php:1050
#, php-format
msgid "about %d minutes ago"
msgstr "circa %d minutas retro"
-#: lib/util.php:1021
+#: lib/util.php:1052
msgid "about an hour ago"
msgstr "circa un hora retro"
-#: lib/util.php:1023
+#: lib/util.php:1054
#, php-format
msgid "about %d hours ago"
msgstr "circa %d horas retro"
-#: lib/util.php:1025
+#: lib/util.php:1056
msgid "about a day ago"
msgstr "circa un die retro"
-#: lib/util.php:1027
+#: lib/util.php:1058
#, php-format
msgid "about %d days ago"
msgstr "circa %d dies retro"
-#: lib/util.php:1029
+#: lib/util.php:1060
msgid "about a month ago"
msgstr "circa un mense retro"
-#: lib/util.php:1031
+#: lib/util.php:1062
#, php-format
msgid "about %d months ago"
msgstr "circa %d menses retro"
-#: lib/util.php:1033
+#: lib/util.php:1064
msgid "about a year ago"
msgstr "circa un anno retro"
@@ -6536,7 +6530,7 @@ msgstr "%s non es un color valide!"
msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr "%s non es un color valide! Usa 3 o 6 characteres hexadecimal."
-#: lib/xmppmanager.php:402
+#: lib/xmppmanager.php:403
#, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d."
msgstr "Message troppo longe - maximo es %1$d characteres, tu inviava %2$d."
diff --git a/locale/is/LC_MESSAGES/statusnet.po b/locale/is/LC_MESSAGES/statusnet.po
index 3c8f33565..e4500fd08 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-03-06 23:49+0000\n"
-"PO-Revision-Date: 2010-03-06 23:50:12+0000\n"
+"POT-Creation-Date: 2010-04-05 18:54+0000\n"
+"PO-Revision-Date: 2010-04-05 18:55:33+0000\n"
"Language-Team: Icelandic\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64621); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: is\n"
"X-Message-Group: out-statusnet\n"
@@ -100,9 +100,9 @@ msgstr "Ekkert þannig merki."
#: 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:90
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78
+#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
@@ -111,10 +111,8 @@ msgstr "Ekkert þannig merki."
#: actions/remotesubscribe.php:154 actions/replies.php:73
#: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:163 lib/command.php:302
-#: lib/command.php:355 lib/command.php:401 lib/command.php:462
-#: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82
-#: lib/profileaction.php:77
+#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: lib/mailbox.php:82 lib/profileaction.php:77
msgid "No such user."
msgstr "Enginn svoleiðis notandi."
@@ -201,18 +199,18 @@ msgstr "Færslur frá %1$s og vinum á %2$s!"
#: 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:132
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:136
#: actions/apigrouplistall.php:120 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:135
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
-#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184
-#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148
+#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:174
+#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173
+#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
-#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
+#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
#, fuzzy
msgid "API method not found."
msgstr "Aðferð í forritsskilum fannst ekki!"
@@ -226,8 +224,8 @@ msgstr "Aðferð í forritsskilum fannst ekki!"
#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65
-#: actions/apistatusesupdate.php:118
+#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
msgid "This method requires a POST."
msgstr "Þessi aðferð krefst POST."
@@ -258,7 +256,7 @@ msgid "Could not save profile."
msgstr "Gat ekki vistað persónulega síðu."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:97
+#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
#: actions/designadminpanel.php:122 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
@@ -345,7 +343,7 @@ msgstr "Engin staða fundin með þessu kenni."
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:176
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
msgid "Could not create favorite."
msgstr "Gat ekki búið til uppáhald."
@@ -468,7 +466,7 @@ msgstr "Aðferð í forritsskilum fannst ekki!"
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:221
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
msgid "You have been blocked from that group by the admin."
msgstr ""
@@ -487,11 +485,18 @@ msgstr "Þú ert ekki meðlimur í þessum hópi."
msgid "Could not remove user %1$s from group %2$s."
msgstr "Gat ekki fjarlægt notandann %s úr hópnum %s"
-#: actions/apigrouplist.php:95
+#. TRANS: %s is a user name
+#: actions/apigrouplist.php:97
#, 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
+#, fuzzy, php-format
+msgid "%1$s groups %2$s is a member of."
+msgstr "Hópar sem %s er meðlimur í"
+
#: actions/apigrouplistall.php:90 actions/usergroups.php:62
#, php-format
msgid "%s groups"
@@ -520,7 +525,7 @@ msgstr "Ótæk stærð."
#: 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:337
+#: actions/profilesettings.php:194 actions/recoverpassword.php:350
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
@@ -581,15 +586,15 @@ msgid ""
"give access to your %4$s account to third parties you trust."
msgstr ""
-#: actions/apioauthauthorize.php:310 lib/action.php:438
+#: actions/apioauthauthorize.php:310 lib/action.php:437
msgid "Account"
msgstr "Aðgangur"
#: actions/apioauthauthorize.php:313 actions/login.php:230
#: actions/profilesettings.php:106 actions/register.php:424
-#: actions/showgroup.php:244 actions/tagother.php:94
+#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
-#: lib/userprofile.php:131
+#: lib/userprofile.php:132
msgid "Nickname"
msgstr "Stuttnefni"
@@ -662,12 +667,12 @@ msgstr ""
msgid "Unsupported format."
msgstr "Skráarsnið myndar ekki stutt."
-#: actions/apitimelinefavorites.php:108
+#: actions/apitimelinefavorites.php:109
#, fuzzy, php-format
msgid "%1$s / Favorites from %2$s"
msgstr "%s / Uppáhaldsbabl frá %s"
-#: actions/apitimelinefavorites.php:117
+#: actions/apitimelinefavorites.php:118
#, 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."
@@ -677,7 +682,7 @@ msgstr "%s færslur gerðar að uppáhaldsbabli af %s / %s."
msgid "%1$s / Updates mentioning %2$s"
msgstr ""
-#: actions/apitimelinementions.php:127
+#: actions/apitimelinementions.php:130
#, 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."
@@ -687,7 +692,7 @@ msgstr "%1$s færslur sem svara færslum frá %2$s / %3$s."
msgid "%s public timeline"
msgstr "Almenningsrás %s"
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "%s færslur frá öllum!"
@@ -702,12 +707,12 @@ msgstr "Svör við %s"
msgid "Repeats of %s"
msgstr "Svör við %s"
-#: actions/apitimelinetag.php:102 actions/tag.php:67
+#: actions/apitimelinetag.php:104 actions/tag.php:67
#, php-format
msgid "Notices tagged with %s"
msgstr "Babl merkt með %s"
-#: actions/apitimelinetag.php:104 actions/tagrss.php:65
+#: actions/apitimelinetag.php:106 actions/tagrss.php:65
#, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr ""
@@ -735,7 +740,7 @@ msgstr "Engin stærð."
msgid "Invalid size."
msgstr "Ótæk stærð."
-#: actions/avatarsettings.php:67 actions/showgroup.php:229
+#: actions/avatarsettings.php:67 actions/showgroup.php:230
#: lib/accountsettingsaction.php:112
msgid "Avatar"
msgstr "Mynd"
@@ -767,7 +772,7 @@ msgid "Preview"
msgstr "Forsýn"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:655
+#: lib/deleteuserform.php:66 lib/noticelist.php:659
msgid "Delete"
msgstr "Eyða"
@@ -779,24 +784,29 @@ msgstr "Hlaða upp"
msgid "Crop"
msgstr "Skera af"
-#: actions/avatarsettings.php:328
+#: actions/avatarsettings.php:305
+#, fuzzy
+msgid "No file uploaded."
+msgstr "Engin persónuleg síða tilgreind"
+
+#: actions/avatarsettings.php:332
msgid "Pick a square area of the image to be your avatar"
msgstr ""
"Veldu ferningslaga svæði á upphaflegu myndinni sem einkennismyndina þína"
-#: actions/avatarsettings.php:343 actions/grouplogo.php:380
+#: actions/avatarsettings.php:347 actions/grouplogo.php:380
msgid "Lost our file data."
msgstr "Týndum skráargögnunum okkar"
-#: actions/avatarsettings.php:366
+#: actions/avatarsettings.php:370
msgid "Avatar updated."
msgstr "Mynd hefur verið uppfærð."
-#: actions/avatarsettings.php:369
+#: actions/avatarsettings.php:373
msgid "Failed updating avatar."
msgstr "Mistókst að uppfæra mynd"
-#: actions/avatarsettings.php:393
+#: actions/avatarsettings.php:397
msgid "Avatar deleted."
msgstr ""
@@ -850,8 +860,8 @@ msgstr "Mistókst að vista upplýsingar um notendalokun"
#: actions/groupunblock.php:86 actions/joingroup.php:82
#: actions/joingroup.php:93 actions/leavegroup.php:82
#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212
-#: lib/command.php:260
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162
+#: lib/command.php:358
msgid "No such group."
msgstr "Enginn þannig hópur."
@@ -936,7 +946,7 @@ msgid "Conversation"
msgstr ""
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:218 lib/searchgroupnav.php:82
+#: lib/profileaction.php:224 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "Babl"
@@ -958,7 +968,7 @@ msgstr "Þú ert ekki meðlimur í þessum hópi."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1217
+#: lib/action.php:1219
msgid "There was a problem with your session token."
msgstr "Það komu upp vandamál varðandi setutókann þinn."
@@ -1017,7 +1027,7 @@ msgstr "Ertu viss um að þú viljir eyða þessu babli?"
msgid "Do not delete this notice"
msgstr ""
-#: actions/deletenotice.php:146 lib/noticelist.php:655
+#: actions/deletenotice.php:146 lib/noticelist.php:659
msgid "Delete this notice"
msgstr "Eyða þessu babli"
@@ -1160,7 +1170,7 @@ msgstr ""
#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:208
+#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
#: actions/tagother.php:154 actions/useradminpanel.php:294
#: lib/applicationeditform.php:333 lib/applicationeditform.php:334
#: lib/designsettings.php:256 lib/groupeditform.php:202
@@ -1288,7 +1298,7 @@ msgstr "Lýsing er of löng (í mesta lagi 140 tákn)."
msgid "Could not update group."
msgstr "Gat ekki uppfært hóp."
-#: actions/editgroup.php:264 classes/User_group.php:493
+#: actions/editgroup.php:264 classes/User_group.php:496
msgid "Could not create aliases."
msgstr ""
@@ -1780,7 +1790,7 @@ msgstr "Rás %s"
msgid "Updates from members of %1$s on %2$s!"
msgstr "Færslur frá %1$s á %2$s!"
-#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232
+#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244
#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr "Hópar"
@@ -1986,7 +1996,7 @@ msgstr "Bjóða nýjum notendum að vera með"
msgid "You are already subscribed to these users:"
msgstr "Þú ert nú þegar í áskrift að þessum notendum:"
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
#, php-format
msgid "%1$s (%2$s)"
msgstr "%1$s (%2$s)"
@@ -2119,7 +2129,7 @@ msgstr "%s bætti sér í hópinn %s"
msgid "You must be logged in to leave a group."
msgstr "Þú verður aða hafa skráð þig inn til að ganga úr hóp."
-#: actions/leavegroup.php:100 lib/command.php:265
+#: actions/leavegroup.php:100 lib/command.php:363
msgid "You are not a member of that group."
msgstr "Þú ert ekki meðlimur í þessum hópi."
@@ -2240,12 +2250,12 @@ msgstr "Notaðu þetta eyðublað til að búa til nýjan hóp."
msgid "New message"
msgstr "Ný skilaboð"
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
msgid "You can't send a message to this user."
msgstr "Þú getur ekki sent þessum notanda skilaboð."
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342
-#: lib/command.php:475
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
+#: lib/command.php:529
msgid "No content!"
msgstr "Ekkert innihald!"
@@ -2253,7 +2263,7 @@ msgstr "Ekkert innihald!"
msgid "No recipient specified."
msgstr "Enginn móttökuaðili tilgreindur."
-#: actions/newmessage.php:164 lib/command.php:361
+#: actions/newmessage.php:164 lib/command.php:462
msgid ""
"Don't send a message to yourself; just say it to yourself quietly instead."
msgstr ""
@@ -2269,7 +2279,7 @@ msgstr ""
msgid "Direct message to %s sent."
msgstr "Bein skilaboð send til %s"
-#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189
msgid "Ajax Error"
msgstr "Ajax villa"
@@ -2277,7 +2287,7 @@ msgstr "Ajax villa"
msgid "New notice"
msgstr "Nýtt babl"
-#: actions/newnotice.php:211
+#: actions/newnotice.php:217
msgid "Notice posted"
msgstr "Babl sent inn"
@@ -2387,7 +2397,7 @@ msgstr ""
msgid "Notice has no profile"
msgstr "Babl hefur enga persónulega síðu"
-#: actions/oembed.php:86 actions/shownotice.php:180
+#: actions/oembed.php:86 actions/shownotice.php:175
#, php-format
msgid "%1$s's status on %2$s"
msgstr "Staða %1$s á %2$s"
@@ -2400,8 +2410,8 @@ msgstr ""
msgid "Only "
msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042
-#: lib/apiaction.php:1070 lib/apiaction.php:1179
+#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1068
+#: lib/apiaction.php:1096 lib/apiaction.php:1212
msgid "Not a supported data format."
msgstr "Enginn stuðningur við gagnasnið."
@@ -2540,7 +2550,7 @@ msgstr "Rangt eldra lykilorð"
msgid "Error saving user; invalid."
msgstr "Villa kom upp í vistun notanda: ótækt."
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
msgid "Can't save new password."
msgstr "Get ekki vistað nýja lykilorðið."
@@ -2764,8 +2774,8 @@ 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/showgroup.php:255 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:149
+#: actions/showgroup.php:256 actions/tagother.php:104
+#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Fullt nafn"
@@ -2795,9 +2805,9 @@ msgid "Bio"
msgstr "Lýsing"
#: actions/profilesettings.php:132 actions/register.php:471
-#: actions/showgroup.php:264 actions/tagother.php:112
+#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
-#: lib/userprofile.php:164
+#: lib/userprofile.php:165
msgid "Location"
msgstr "Staðsetning"
@@ -2811,7 +2821,7 @@ msgstr ""
#: actions/profilesettings.php:145 actions/tagother.php:149
#: actions/tagother.php:209 lib/subscriptionlist.php:106
-#: lib/subscriptionlist.php:108 lib/userprofile.php:209
+#: lib/subscriptionlist.php:108 lib/userprofile.php:210
msgid "Tags"
msgstr "Merki"
@@ -3042,7 +3052,7 @@ msgstr "Endurstilla lykilorð"
msgid "Recover password"
msgstr "Endurheimta lykilorð"
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
msgid "Password recovery requested"
msgstr "Beiðni um að endurheimta lykilorð hefur verið send inn"
@@ -3062,19 +3072,19 @@ msgstr "Endurstilla"
msgid "Enter a nickname or email address."
msgstr "Sláðu inn stuttnefni eða tölvupóstfang."
-#: actions/recoverpassword.php:272
+#: actions/recoverpassword.php:282
msgid "No user with that email address or username."
msgstr "Enginn notandi með þetta tölvupóstfang eða notendanafn"
-#: actions/recoverpassword.php:287
+#: actions/recoverpassword.php:299
msgid "No registered email address for that user."
msgstr "Ekkert tölvupóstfang á skrá fyrir þennan notanda."
-#: actions/recoverpassword.php:301
+#: actions/recoverpassword.php:313
msgid "Error saving address confirmation."
msgstr "Villa kom upp í vistun netfangsstaðfestingar."
-#: actions/recoverpassword.php:325
+#: actions/recoverpassword.php:338
msgid ""
"Instructions for recovering your password have been sent to the email "
"address registered to your account."
@@ -3082,23 +3092,23 @@ msgstr ""
"Leiðbeiningar um það hvernig þú getur endurheimt lykilorðið þitt hafa verið "
"sendar á tölvupóstfangið sem er tengt notendaaðganginum þínum."
-#: actions/recoverpassword.php:344
+#: actions/recoverpassword.php:357
msgid "Unexpected password reset."
msgstr "Bjóst ekki við endurstillingu lykilorðs."
-#: actions/recoverpassword.php:352
+#: actions/recoverpassword.php:365
msgid "Password must be 6 chars or more."
msgstr "Lykilorð verður að vera 6 tákn eða fleiri."
-#: actions/recoverpassword.php:356
+#: actions/recoverpassword.php:369
msgid "Password and confirmation do not match."
msgstr "Lykilorð og staðfesting passa ekki saman."
-#: actions/recoverpassword.php:375 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:248
msgid "Error setting user."
msgstr "Villa kom upp í stillingu notanda."
-#: actions/recoverpassword.php:382
+#: actions/recoverpassword.php:395
msgid "New password successfully saved. You are now logged in."
msgstr "Tókst að vista nýtt lykilorð. Þú ert núna innskráð(ur)"
@@ -3259,7 +3269,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "Veffang persónulegrar síðu á samvirkandi örbloggsþjónustu"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:394
+#: lib/userprofile.php:406
msgid "Subscribe"
msgstr "Gerast áskrifandi"
@@ -3304,7 +3314,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:674
+#: actions/repeat.php:114 lib/noticelist.php:678
#, fuzzy
msgid "Repeated"
msgstr "Í sviðsljósinu"
@@ -3451,8 +3461,8 @@ msgstr "Uppröðun"
msgid "Description"
msgstr "Lýsing"
-#: actions/showapplication.php:192 actions/showgroup.php:438
-#: lib/profileaction.php:176
+#: actions/showapplication.php:192 actions/showgroup.php:439
+#: lib/profileaction.php:182
msgid "Statistics"
msgstr "Tölfræði"
@@ -3563,67 +3573,67 @@ msgstr "%s hópurinn"
msgid "%1$s group, page %2$d"
msgstr "Hópmeðlimir %s, síða %d"
-#: actions/showgroup.php:226
+#: actions/showgroup.php:227
msgid "Group profile"
msgstr "Hópssíðan"
-#: actions/showgroup.php:271 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:177
+#: actions/showgroup.php:272 actions/tagother.php:118
+#: actions/userauthorization.php:175 lib/userprofile.php:178
msgid "URL"
msgstr "Vefslóð"
-#: actions/showgroup.php:282 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:194
+#: actions/showgroup.php:283 actions/tagother.php:128
+#: actions/userauthorization.php:187 lib/userprofile.php:195
msgid "Note"
msgstr "Athugasemd"
-#: actions/showgroup.php:292 lib/groupeditform.php:184
+#: actions/showgroup.php:293 lib/groupeditform.php:184
msgid "Aliases"
msgstr ""
-#: actions/showgroup.php:301
+#: actions/showgroup.php:302
msgid "Group actions"
msgstr "Hópsaðgerðir"
-#: actions/showgroup.php:337
+#: actions/showgroup.php:338
#, php-format
msgid "Notice feed for %s group (RSS 1.0)"
msgstr ""
-#: actions/showgroup.php:343
+#: actions/showgroup.php:344
#, php-format
msgid "Notice feed for %s group (RSS 2.0)"
msgstr ""
-#: actions/showgroup.php:349
+#: actions/showgroup.php:350
#, php-format
msgid "Notice feed for %s group (Atom)"
msgstr ""
-#: actions/showgroup.php:354
+#: actions/showgroup.php:355
#, fuzzy, php-format
msgid "FOAF for %s group"
msgstr "%s hópurinn"
-#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91
+#: actions/showgroup.php:391 actions/showgroup.php:448 lib/groupnav.php:91
msgid "Members"
msgstr "Meðlimir"
-#: actions/showgroup.php:395 lib/profileaction.php:117
-#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95
-#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71
+#: actions/showgroup.php:396 lib/profileaction.php:117
+#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95
+#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
msgid "(None)"
msgstr "(Ekkert)"
-#: actions/showgroup.php:401
+#: actions/showgroup.php:402
msgid "All members"
msgstr "Allir meðlimir"
-#: actions/showgroup.php:441
+#: actions/showgroup.php:442
msgid "Created"
msgstr ""
-#: actions/showgroup.php:457
+#: actions/showgroup.php:458
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3633,7 +3643,7 @@ msgid ""
"of this group and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
-#: actions/showgroup.php:463
+#: actions/showgroup.php:464
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3642,7 +3652,7 @@ msgid ""
"their life and interests. "
msgstr ""
-#: actions/showgroup.php:491
+#: actions/showgroup.php:492
msgid "Admins"
msgstr ""
@@ -3772,7 +3782,7 @@ msgid "Unknown language \"%s\"."
msgstr ""
#: actions/siteadminpanel.php:165
-msgid "Minimum text limit is 140 characters."
+msgid "Minimum text limit is 0 (unlimited)."
msgstr ""
#: actions/siteadminpanel.php:171
@@ -4052,8 +4062,7 @@ msgstr "Stillingar fyrir mynd"
msgid "You are not subscribed to that profile."
msgstr "Þú ert ekki áskrifandi."
-#: actions/subedit.php:83 classes/Subscription.php:89
-#: classes/Subscription.php:116
+#: actions/subedit.php:83 classes/Subscription.php:132
msgid "Could not save subscription."
msgstr "Gat ekki vistað áskrift."
@@ -4146,11 +4155,11 @@ msgstr ""
msgid "%s is not listening to anyone."
msgstr ""
-#: actions/subscriptions.php:199
+#: actions/subscriptions.php:208
msgid "Jabber"
msgstr "Jabber snarskilaboðaþjónusta"
-#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:222 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr "SMS"
@@ -4184,12 +4193,12 @@ msgstr "Ekkert einkenni gefið upp."
msgid "Tag %s"
msgstr "Merki %s"
-#: actions/tagother.php:77 lib/userprofile.php:75
+#: actions/tagother.php:77 lib/userprofile.php:76
msgid "User profile"
msgstr "Persónuleg síða notanda"
#: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:102
+#: lib/userprofile.php:103
msgid "Photo"
msgstr "Ljósmynd"
@@ -4521,7 +4530,7 @@ msgstr ""
msgid "Plugins"
msgstr ""
-#: actions/version.php:196 lib/action.php:767
+#: actions/version.php:196 lib/action.php:766
#, fuzzy
msgid "Version"
msgstr "Persónulegt"
@@ -4530,19 +4539,19 @@ msgstr "Persónulegt"
msgid "Author(s)"
msgstr ""
-#: classes/File.php:144
+#: classes/File.php:169
#, 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:154
+#: classes/File.php:179
#, php-format
msgid "A file this large would exceed your user quota of %d bytes."
msgstr ""
-#: classes/File.php:161
+#: classes/File.php:186
#, php-format
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
@@ -4585,101 +4594,101 @@ msgstr "Gat ekki skeytt skilaboðum inn í."
msgid "Could not update message with new URI."
msgstr "Gat ekki uppfært skilaboð með nýju veffangi."
-#: classes/Notice.php:172
+#: classes/Notice.php:175
#, php-format
msgid "DB error inserting hashtag: %s"
msgstr "Gagnagrunnsvilla við innsetningu myllumerkis: %s"
-#: classes/Notice.php:241
+#: classes/Notice.php:244
msgid "Problem saving notice. Too long."
msgstr ""
-#: classes/Notice.php:245
+#: classes/Notice.php:248
msgid "Problem saving notice. Unknown user."
msgstr "Gat ekki vistað babl. Óþekktur notandi."
-#: classes/Notice.php:250
+#: classes/Notice.php:253
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:256
+#: classes/Notice.php:259
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
msgstr ""
-#: classes/Notice.php:262
+#: classes/Notice.php:265
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:328 classes/Notice.php:354
+#: classes/Notice.php:331 classes/Notice.php:357
msgid "Problem saving notice."
msgstr "Vandamál komu upp við að vista babl."
-#: classes/Notice.php:927
+#: classes/Notice.php:943
#, fuzzy
msgid "Problem saving group inbox."
msgstr "Vandamál komu upp við að vista babl."
-#: classes/Notice.php:1459
+#: classes/Notice.php:1481
#, fuzzy, php-format
msgid "RT @%1$s %2$s"
msgstr "%1$s (%2$s)"
-#: classes/Subscription.php:66 lib/oauthstore.php:465
+#: classes/Subscription.php:74 lib/oauthstore.php:465
#, fuzzy
msgid "You have been banned from subscribing."
msgstr "Þessi notandi hefur bannað þér að gerast áskrifandi"
-#: classes/Subscription.php:70
+#: classes/Subscription.php:78
msgid "Already subscribed!"
msgstr ""
-#: classes/Subscription.php:74
+#: classes/Subscription.php:82
msgid "User has blocked you."
msgstr "Notandinn hefur lokað á þig."
-#: classes/Subscription.php:157
+#: classes/Subscription.php:167
#, fuzzy
msgid "Not subscribed!"
msgstr "Ekki í áskrift!"
-#: classes/Subscription.php:163
+#: classes/Subscription.php:173
#, fuzzy
msgid "Couldn't delete self-subscription."
msgstr "Gat ekki eytt áskrift."
-#: classes/Subscription.php:190
+#: classes/Subscription.php:200
#, fuzzy
msgid "Couldn't delete subscription OMB token."
msgstr "Gat ekki eytt áskrift."
-#: classes/Subscription.php:201 lib/subs.php:69
+#: classes/Subscription.php:211
msgid "Couldn't delete subscription."
msgstr "Gat ekki eytt áskrift."
-#: classes/User.php:373
+#: classes/User.php:363
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr ""
-#: classes/User_group.php:477
+#: classes/User_group.php:480
msgid "Could not create group."
msgstr "Gat ekki búið til hóp."
-#: classes/User_group.php:486
+#: classes/User_group.php:489
#, fuzzy
msgid "Could not set group URI."
msgstr "Gat ekki skráð hópmeðlimi."
-#: classes/User_group.php:507
+#: classes/User_group.php:510
msgid "Could not set group membership."
msgstr "Gat ekki skráð hópmeðlimi."
-#: classes/User_group.php:521
+#: classes/User_group.php:524
#, fuzzy
msgid "Could not save local group info."
msgstr "Gat ekki vistað áskrift."
@@ -4721,25 +4730,25 @@ msgstr "%1$s (%2$s)"
msgid "Untitled page"
msgstr "Ónafngreind síða"
-#: lib/action.php:424
+#: lib/action.php:423
msgid "Primary site navigation"
msgstr "Stikl aðalsíðu"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:430
+#: lib/action.php:429
#, fuzzy
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr "Persónuleg síða og vinarás"
-#: lib/action.php:433
+#: lib/action.php:432
#, fuzzy
msgctxt "MENU"
msgid "Personal"
msgstr "Persónulegt"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:435
+#: lib/action.php:434
#, fuzzy
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
@@ -4748,102 +4757,102 @@ msgstr ""
"persónulegu síðunni þinni"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:440
+#: lib/action.php:439
#, fuzzy
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "Gat ekki framsent til vefþjóns: %s"
-#: lib/action.php:443
+#: lib/action.php:442
msgid "Connect"
msgstr "Tengjast"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:446
+#: lib/action.php:445
#, fuzzy
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "Stikl aðalsíðu"
-#: lib/action.php:449
+#: lib/action.php:448
#, fuzzy
msgctxt "MENU"
msgid "Admin"
msgstr "Stjórnandi"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:453
+#: lib/action.php:452
#, fuzzy, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "Bjóða vinum og vandamönnum að slást í hópinn á %s"
-#: lib/action.php:456
+#: lib/action.php:455
#, fuzzy
msgctxt "MENU"
msgid "Invite"
msgstr "Bjóða"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:462
+#: lib/action.php:461
#, fuzzy
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "Skrá þig út af síðunni"
-#: lib/action.php:465
+#: lib/action.php:464
#, fuzzy
msgctxt "MENU"
msgid "Logout"
msgstr "Útskráning"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:470
+#: lib/action.php:469
#, fuzzy
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Búa til aðgang"
-#: lib/action.php:473
+#: lib/action.php:472
#, fuzzy
msgctxt "MENU"
msgid "Register"
msgstr "Nýskrá"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:476
+#: lib/action.php:475
#, fuzzy
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Skrá þig inn á síðuna"
-#: lib/action.php:479
+#: lib/action.php:478
#, fuzzy
msgctxt "MENU"
msgid "Login"
msgstr "Innskráning"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:482
+#: lib/action.php:481
#, fuzzy
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Hjálp!"
-#: lib/action.php:485
+#: lib/action.php:484
#, fuzzy
msgctxt "MENU"
msgid "Help"
msgstr "Hjálp"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:488
+#: lib/action.php:487
#, fuzzy
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "Leita að fólki eða texta"
-#: lib/action.php:491
+#: lib/action.php:490
#, fuzzy
msgctxt "MENU"
msgid "Search"
@@ -4851,59 +4860,59 @@ msgstr "Leita"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:513 lib/adminpanelaction.php:398
+#: lib/action.php:512 lib/adminpanelaction.php:398
msgid "Site notice"
msgstr "Babl vefsíðunnar"
-#: lib/action.php:579
+#: lib/action.php:578
msgid "Local views"
msgstr "Staðbundin sýn"
-#: lib/action.php:645
+#: lib/action.php:644
msgid "Page notice"
msgstr "Babl síðunnar"
-#: lib/action.php:747
+#: lib/action.php:746
msgid "Secondary site navigation"
msgstr "Stikl undirsíðu"
-#: lib/action.php:752
+#: lib/action.php:751
msgid "Help"
msgstr "Hjálp"
-#: lib/action.php:754
+#: lib/action.php:753
msgid "About"
msgstr "Um"
-#: lib/action.php:756
+#: lib/action.php:755
msgid "FAQ"
msgstr "Spurt og svarað"
-#: lib/action.php:760
+#: lib/action.php:759
msgid "TOS"
msgstr ""
-#: lib/action.php:763
+#: lib/action.php:762
msgid "Privacy"
msgstr "Friðhelgi"
-#: lib/action.php:765
+#: lib/action.php:764
msgid "Source"
msgstr "Frumþula"
-#: lib/action.php:769
+#: lib/action.php:768
msgid "Contact"
msgstr "Tengiliður"
-#: lib/action.php:771
+#: lib/action.php:770
msgid "Badge"
msgstr ""
-#: lib/action.php:799
+#: lib/action.php:798
msgid "StatusNet software license"
msgstr "Hugbúnaðarleyfi StatusNet"
-#: lib/action.php:802
+#: lib/action.php:803
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4912,12 +4921,12 @@ msgstr ""
"**%%site.name%%** er örbloggsþjónusta í boði [%%site.broughtby%%](%%site."
"broughtbyurl%%). "
-#: lib/action.php:804
+#: lib/action.php:805
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** er örbloggsþjónusta."
-#: lib/action.php:806
+#: lib/action.php:808
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4928,54 +4937,58 @@ msgstr ""
"sem er gefinn út undir [GNU Affero almenningsleyfinu](http://www.fsf.org/"
"licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:821
+#: lib/action.php:823
#, fuzzy
msgid "Site content license"
msgstr "Hugbúnaðarleyfi StatusNet"
-#: lib/action.php:826
+#: lib/action.php:828
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
-#: lib/action.php:831
+#: lib/action.php:833
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
-#: lib/action.php:834
+#: lib/action.php:836
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
-#: lib/action.php:847
+#: lib/action.php:849
msgid "All "
msgstr "Allt "
-#: lib/action.php:853
+#: lib/action.php:855
msgid "license."
msgstr "leyfi."
-#: lib/action.php:1152
+#: lib/action.php:1154
msgid "Pagination"
msgstr "Uppröðun"
-#: lib/action.php:1161
+#: lib/action.php:1163
msgid "After"
msgstr "Eftir"
-#: lib/action.php:1169
+#: lib/action.php:1171
msgid "Before"
msgstr "Áður"
-#: lib/activity.php:453
+#: lib/activity.php:120
+msgid "Expecting a root feed element but got a whole XML document."
+msgstr ""
+
+#: lib/activityutils.php:208
msgid "Can't handle remote content yet."
msgstr ""
-#: lib/activity.php:481
+#: lib/activityutils.php:236
msgid "Can't handle embedded XML content yet."
msgstr ""
-#: lib/activity.php:485
+#: lib/activityutils.php:240
msgid "Can't handle embedded Base64 content yet."
msgstr ""
@@ -5079,7 +5092,7 @@ msgstr "SMS staðfesting"
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
-#: lib/apiauth.php:272
+#: lib/apiauth.php:276
#, php-format
msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s"
msgstr ""
@@ -5158,11 +5171,11 @@ msgstr "Fjarlægja"
msgid "Attachments"
msgstr ""
-#: lib/attachmentlist.php:265
+#: lib/attachmentlist.php:263
msgid "Author"
msgstr ""
-#: lib/attachmentlist.php:278
+#: lib/attachmentlist.php:276
msgid "Provider"
msgstr ""
@@ -5184,37 +5197,51 @@ msgstr "Lykilorðabreyting"
msgid "Password changing is not allowed"
msgstr "Lykilorðabreyting"
-#: lib/channel.php:138 lib/channel.php:158
+#: lib/channel.php:157 lib/channel.php:177
msgid "Command results"
msgstr "Niðurstöður skipunar"
-#: lib/channel.php:210 lib/mailhandler.php:142
+#: lib/channel.php:229 lib/mailhandler.php:142
msgid "Command complete"
msgstr "Fullkláruð skipun"
-#: lib/channel.php:221
+#: lib/channel.php:240
msgid "Command failed"
msgstr "Misheppnuð skipun"
-#: lib/command.php:44
-msgid "Sorry, this command is not yet implemented."
-msgstr "Fyrirgefðu en þessi skipun hefur ekki enn verið útbúin."
+#: lib/command.php:83 lib/command.php:105
+#, fuzzy
+msgid "Notice with that id does not exist"
+msgstr "Enginn persónuleg síða með þessu einkenni."
+
+#: lib/command.php:99 lib/command.php:570
+msgid "User has no last notice"
+msgstr "Notandi hefur ekkert nýtt babl"
-#: lib/command.php:88
+#: lib/command.php:125
#, fuzzy, php-format
msgid "Could not find a user with nickname %s"
msgstr "Gat ekki uppfært notanda með staðfestu tölvupóstfangi."
-#: lib/command.php:92
+#: lib/command.php:143
+#, fuzzy, php-format
+msgid "Could not find a local user with nickname %s"
+msgstr "Gat ekki uppfært notanda með staðfestu tölvupóstfangi."
+
+#: lib/command.php:176
+msgid "Sorry, this command is not yet implemented."
+msgstr "Fyrirgefðu en þessi skipun hefur ekki enn verið útbúin."
+
+#: lib/command.php:221
msgid "It does not make a lot of sense to nudge yourself!"
msgstr ""
-#: lib/command.php:99
+#: lib/command.php:228
#, fuzzy, php-format
msgid "Nudge sent to %s"
msgstr "Ýtt við notanda"
-#: lib/command.php:126
+#: lib/command.php:254
#, php-format
msgid ""
"Subscriptions: %1$s\n"
@@ -5222,203 +5249,201 @@ msgid ""
"Notices: %3$s"
msgstr ""
-#: lib/command.php:152 lib/command.php:390 lib/command.php:451
-#, fuzzy
-msgid "Notice with that id does not exist"
-msgstr "Enginn persónuleg síða með þessu einkenni."
-
-#: lib/command.php:168 lib/command.php:406 lib/command.php:467
-#: lib/command.php:523
-msgid "User has no last notice"
-msgstr "Notandi hefur ekkert nýtt babl"
-
-#: lib/command.php:190
+#: lib/command.php:296
msgid "Notice marked as fave."
msgstr "Babl gert að uppáhaldi."
-#: lib/command.php:217
+#: lib/command.php:317
msgid "You are already a member of that group"
msgstr "Þú ert nú þegar meðlimur í þessum hópi"
-#: lib/command.php:231
+#: lib/command.php:331
#, php-format
msgid "Could not join user %s to group %s"
msgstr "Gat ekki bætt notandanum %s í hópinn %s"
-#: lib/command.php:236
+#: lib/command.php:336
#, php-format
msgid "%s joined group %s"
msgstr "%s bætti sér í hópinn %s"
-#: lib/command.php:275
+#: lib/command.php:373
#, php-format
msgid "Could not remove user %s to group %s"
msgstr "Gat ekki fjarlægt notandann %s úr hópnum %s"
-#: lib/command.php:280
+#: lib/command.php:378
#, php-format
msgid "%s left group %s"
msgstr "%s gekk úr hópnum %s"
-#: lib/command.php:309
+#: lib/command.php:401
#, php-format
msgid "Fullname: %s"
msgstr "Fullt nafn: %s"
-#: lib/command.php:312 lib/mail.php:258
+#: lib/command.php:404 lib/mail.php:258
#, php-format
msgid "Location: %s"
msgstr "Staðsetning: %s"
-#: lib/command.php:315 lib/mail.php:260
+#: lib/command.php:407 lib/mail.php:260
#, php-format
msgid "Homepage: %s"
msgstr "Heimasíða: %s"
-#: lib/command.php:318
+#: lib/command.php:410
#, php-format
msgid "About: %s"
msgstr "Um: %s"
-#: lib/command.php:349
+#: lib/command.php:437
+#, php-format
+msgid ""
+"%s is a remote profile; you can only send direct messages to users on the "
+"same server."
+msgstr ""
+
+#: lib/command.php:450
#, fuzzy, php-format
msgid "Message too long - maximum is %d characters, you sent %d"
msgstr "Skilaboð eru of löng - 140 tákn eru í mesta lagi leyfð en þú sendir %d"
-#: lib/command.php:367
+#: lib/command.php:468
#, php-format
msgid "Direct message to %s sent"
msgstr "Bein skilaboð send til %s"
-#: lib/command.php:369
+#: lib/command.php:470
msgid "Error sending direct message."
msgstr "Villa kom upp við að senda bein skilaboð"
-#: lib/command.php:413
+#: lib/command.php:490
#, fuzzy
msgid "Cannot repeat your own notice"
msgstr "Get ekki kveikt á tilkynningum."
-#: lib/command.php:418
+#: lib/command.php:495
#, fuzzy
msgid "Already repeated that notice"
msgstr "Eyða þessu babli"
-#: lib/command.php:426
+#: lib/command.php:503
#, fuzzy, php-format
msgid "Notice from %s repeated"
msgstr "Babl sent inn"
-#: lib/command.php:428
+#: lib/command.php:505
#, fuzzy
msgid "Error repeating notice."
msgstr "Vandamál komu upp við að vista babl."
-#: lib/command.php:482
+#: lib/command.php:536
#, fuzzy, php-format
msgid "Notice too long - maximum is %d characters, you sent %d"
msgstr "Skilaboð eru of löng - 140 tákn eru í mesta lagi leyfð en þú sendir %d"
-#: lib/command.php:491
+#: lib/command.php:545
#, fuzzy, php-format
msgid "Reply to %s sent"
msgstr "Svara þessu babli"
-#: lib/command.php:493
+#: lib/command.php:547
#, fuzzy
msgid "Error saving notice."
msgstr "Vandamál komu upp við að vista babl."
-#: lib/command.php:547
+#: lib/command.php:594
msgid "Specify the name of the user to subscribe to"
msgstr "Tilgreindu nafn notandans sem þú vilt gerast áskrifandi að"
-#: lib/command.php:554 lib/command.php:589
-msgid "No such user"
-msgstr "Enginn svoleiðis notandi."
+#: lib/command.php:602
+#, fuzzy
+msgid "Can't subscribe to OMB profiles by command."
+msgstr "Þú ert ekki áskrifandi."
-#: lib/command.php:561
+#: lib/command.php:608
#, php-format
msgid "Subscribed to %s"
msgstr "Nú ert þú áskrifandi að %s"
-#: lib/command.php:582 lib/command.php:685
+#: lib/command.php:629 lib/command.php:728
msgid "Specify the name of the user to unsubscribe from"
msgstr "Tilgreindu nafn notandans sem þú vilt hætta sem áskrifandi að"
-#: lib/command.php:595
+#: lib/command.php:638
#, php-format
msgid "Unsubscribed from %s"
msgstr "Nú ert þú ekki lengur áskrifandi að %s"
-#: lib/command.php:613 lib/command.php:636
+#: lib/command.php:656 lib/command.php:679
msgid "Command not yet implemented."
msgstr "Skipun hefur ekki verið fullbúin"
-#: lib/command.php:616
+#: lib/command.php:659
msgid "Notification off."
msgstr "Tilkynningar af."
-#: lib/command.php:618
+#: lib/command.php:661
msgid "Can't turn off notification."
msgstr "Get ekki slökkt á tilkynningum."
-#: lib/command.php:639
+#: lib/command.php:682
msgid "Notification on."
msgstr "Tilkynningar á."
-#: lib/command.php:641
+#: lib/command.php:684
msgid "Can't turn on notification."
msgstr "Get ekki kveikt á tilkynningum."
-#: lib/command.php:654
+#: lib/command.php:697
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:665
+#: lib/command.php:708
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:692
+#: lib/command.php:735
#, fuzzy, php-format
msgid "Unsubscribed %s"
msgstr "Nú ert þú ekki lengur áskrifandi að %s"
-#: lib/command.php:709
+#: lib/command.php:752
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "Þú ert ekki áskrifandi."
-#: lib/command.php:711
+#: lib/command.php:754
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Þú ert nú þegar í áskrift að þessum notendum:"
msgstr[1] "Þú ert nú þegar í áskrift að þessum notendum:"
-#: lib/command.php:731
+#: lib/command.php:774
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Gat ekki leyft öðrum að gerast áskrifandi að þér."
-#: lib/command.php:733
+#: lib/command.php:776
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Gat ekki leyft öðrum að gerast áskrifandi að þér."
msgstr[1] "Gat ekki leyft öðrum að gerast áskrifandi að þér."
-#: lib/command.php:753
+#: lib/command.php:796
#, fuzzy
msgid "You are not a member of any groups."
msgstr "Þú ert ekki meðlimur í þessum hópi."
-#: lib/command.php:755
+#: lib/command.php:798
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Þú ert ekki meðlimur í þessum hópi."
msgstr[1] "Þú ert ekki meðlimur í þessum hópi."
-#: lib/command.php:769
+#: lib/command.php:812
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5460,20 +5485,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:148
+#: lib/common.php:135
#, fuzzy
msgid "No configuration file found. "
msgstr "Enginn staðfestingarlykill."
-#: lib/common.php:149
+#: lib/common.php:136
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:151
+#: lib/common.php:138
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:152
+#: lib/common.php:139
#, fuzzy
msgid "Go to the installer."
msgstr "Skrá þig inn á síðuna"
@@ -5653,49 +5678,49 @@ msgid "This page is not available in a media type you accept"
msgstr ""
"Þessi síða er ekki aðgengileg í margmiðlunargerðinni sem þú tekur á móti"
-#: lib/imagefile.php:75
+#: lib/imagefile.php:72
+msgid "Unsupported image file format."
+msgstr "Skráarsnið myndar ekki stutt."
+
+#: lib/imagefile.php:88
#, fuzzy, php-format
msgid "That file is too big. The maximum file size is %s."
msgstr "Þetta er of langt. Hámarkslengd babls er 140 tákn."
-#: lib/imagefile.php:80
+#: lib/imagefile.php:93
msgid "Partial upload."
msgstr "Upphal að hluta til."
-#: lib/imagefile.php:88 lib/mediafile.php:170
+#: lib/imagefile.php:101 lib/mediafile.php:170
msgid "System error uploading file."
msgstr "Kerfisvilla kom upp við upphal skráar."
-#: lib/imagefile.php:96
+#: lib/imagefile.php:109
msgid "Not an image or corrupt file."
msgstr "Annaðhvort ekki mynd eða þá að skráin er gölluð."
-#: lib/imagefile.php:109
-msgid "Unsupported image file format."
-msgstr "Skráarsnið myndar ekki stutt."
-
#: lib/imagefile.php:122
msgid "Lost our file."
msgstr "Týndum skránni okkar"
-#: lib/imagefile.php:166 lib/imagefile.php:231
+#: lib/imagefile.php:163 lib/imagefile.php:224
msgid "Unknown file type"
msgstr "Óþekkt skráargerð"
-#: lib/imagefile.php:251
+#: lib/imagefile.php:244
msgid "MB"
msgstr ""
-#: lib/imagefile.php:253
+#: lib/imagefile.php:246
msgid "kB"
msgstr ""
-#: lib/jabber.php:220
+#: lib/jabber.php:387
#, php-format
msgid "[%s]"
msgstr ""
-#: lib/jabber.php:400
+#: lib/jabber.php:567
#, php-format
msgid "Unknown inbox source %d."
msgstr ""
@@ -5900,7 +5925,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:482
+#: lib/mailbox.php:227 lib/noticelist.php:486
#, fuzzy
msgid "from"
msgstr "frá"
@@ -6030,50 +6055,50 @@ msgid ""
"try again later"
msgstr ""
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr ""
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
#, fuzzy
msgid "N"
msgstr "Nei"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "S"
msgstr ""
-#: lib/noticelist.php:431
+#: lib/noticelist.php:432
msgid "E"
msgstr ""
-#: lib/noticelist.php:431
+#: lib/noticelist.php:432
msgid "W"
msgstr ""
-#: lib/noticelist.php:438
+#: lib/noticelist.php:439
msgid "at"
msgstr ""
-#: lib/noticelist.php:566
+#: lib/noticelist.php:570
msgid "in context"
msgstr ""
-#: lib/noticelist.php:601
+#: lib/noticelist.php:605
#, fuzzy
msgid "Repeated by"
msgstr "Í sviðsljósinu"
-#: lib/noticelist.php:628
+#: lib/noticelist.php:632
msgid "Reply to this notice"
msgstr "Svara þessu babli"
-#: lib/noticelist.php:629
+#: lib/noticelist.php:633
msgid "Reply"
msgstr "Svara"
-#: lib/noticelist.php:673
+#: lib/noticelist.php:677
#, fuzzy
msgid "Notice repeated"
msgstr "Babl sent inn"
@@ -6149,7 +6174,7 @@ msgstr "Merki í babli %s"
msgid "Unknown"
msgstr "Óþekkt aðgerð"
-#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr "Áskriftir"
@@ -6157,7 +6182,7 @@ msgstr "Áskriftir"
msgid "All subscriptions"
msgstr "Allar áskriftir"
-#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90
+#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr "Áskrifendur"
@@ -6165,15 +6190,20 @@ msgstr "Áskrifendur"
msgid "All subscribers"
msgstr "Allir áskrifendur"
-#: lib/profileaction.php:180
+#: lib/profileaction.php:186
msgid "User ID"
msgstr ""
-#: lib/profileaction.php:185
+#: lib/profileaction.php:191
msgid "Member since"
msgstr "Meðlimur síðan"
-#: lib/profileaction.php:247
+#. TRANS: Average count of posts made per day since account registration
+#: lib/profileaction.php:230
+msgid "Daily average"
+msgstr ""
+
+#: lib/profileaction.php:259
msgid "All groups"
msgstr "Allir hópar"
@@ -6221,7 +6251,7 @@ msgstr "Svara þessu babli"
msgid "Revoke the \"%s\" role from this user"
msgstr ""
-#: lib/router.php:671
+#: lib/router.php:704
msgid "No single user defined for single-user mode."
msgstr ""
@@ -6353,90 +6383,99 @@ msgstr "Hætta sem áskrifandi að þessum notanda"
msgid "Unsubscribe"
msgstr "Fara úr áskrift"
-#: lib/userprofile.php:116
+#: lib/usernoprofileexception.php:58
+#, fuzzy, php-format
+msgid "User %s (%d) has no profile record."
+msgstr "Notandi hefur enga persónulega síðu."
+
+#: lib/userprofile.php:117
msgid "Edit Avatar"
msgstr ""
-#: lib/userprofile.php:236
+#: lib/userprofile.php:234 lib/userprofile.php:248
msgid "User actions"
msgstr "Notandaaðgerðir"
-#: lib/userprofile.php:251
+#: lib/userprofile.php:237
+msgid "User deletion in progress..."
+msgstr ""
+
+#: lib/userprofile.php:263
msgid "Edit profile settings"
msgstr ""
-#: lib/userprofile.php:252
+#: lib/userprofile.php:264
msgid "Edit"
msgstr ""
-#: lib/userprofile.php:275
+#: lib/userprofile.php:287
msgid "Send a direct message to this user"
msgstr "Senda bein skilaboð til þessa notanda"
-#: lib/userprofile.php:276
+#: lib/userprofile.php:288
msgid "Message"
msgstr "Skilaboð"
-#: lib/userprofile.php:314
+#: lib/userprofile.php:326
msgid "Moderate"
msgstr ""
-#: lib/userprofile.php:352
+#: lib/userprofile.php:364
#, fuzzy
msgid "User role"
msgstr "Persónuleg síða notanda"
-#: lib/userprofile.php:354
+#: lib/userprofile.php:366
msgctxt "role"
msgid "Administrator"
msgstr ""
-#: lib/userprofile.php:355
+#: lib/userprofile.php:367
msgctxt "role"
msgid "Moderator"
msgstr ""
-#: lib/util.php:1015
+#: lib/util.php:1046
msgid "a few seconds ago"
msgstr "fyrir nokkrum sekúndum"
-#: lib/util.php:1017
+#: lib/util.php:1048
msgid "about a minute ago"
msgstr "fyrir um einni mínútu síðan"
-#: lib/util.php:1019
+#: lib/util.php:1050
#, php-format
msgid "about %d minutes ago"
msgstr "fyrir um %d mínútum síðan"
-#: lib/util.php:1021
+#: lib/util.php:1052
msgid "about an hour ago"
msgstr "fyrir um einum klukkutíma síðan"
-#: lib/util.php:1023
+#: lib/util.php:1054
#, php-format
msgid "about %d hours ago"
msgstr "fyrir um %d klukkutímum síðan"
-#: lib/util.php:1025
+#: lib/util.php:1056
msgid "about a day ago"
msgstr "fyrir um einum degi síðan"
-#: lib/util.php:1027
+#: lib/util.php:1058
#, php-format
msgid "about %d days ago"
msgstr "fyrir um %d dögum síðan"
-#: lib/util.php:1029
+#: lib/util.php:1060
msgid "about a month ago"
msgstr "fyrir um einum mánuði síðan"
-#: lib/util.php:1031
+#: lib/util.php:1062
#, php-format
msgid "about %d months ago"
msgstr "fyrir um %d mánuðum síðan"
-#: lib/util.php:1033
+#: lib/util.php:1064
msgid "about a year ago"
msgstr "fyrir um einu ári síðan"
@@ -6450,7 +6489,7 @@ msgstr ""
msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr ""
-#: lib/xmppmanager.php:402
+#: lib/xmppmanager.php:403
#, fuzzy, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d."
msgstr "Skilaboð eru of löng - 140 tákn eru í mesta lagi leyfð en þú sendir %d"
diff --git a/locale/it/LC_MESSAGES/statusnet.po b/locale/it/LC_MESSAGES/statusnet.po
index 1bd3f26ad..b2a3ff28a 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-03-06 23:49+0000\n"
-"PO-Revision-Date: 2010-03-06 23:50:15+0000\n"
+"POT-Creation-Date: 2010-04-05 18:54+0000\n"
+"PO-Revision-Date: 2010-04-05 18:55:36+0000\n"
"Language-Team: Italian\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64621); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: it\n"
"X-Message-Group: out-statusnet\n"
@@ -93,9 +93,9 @@ msgstr "Pagina inesistente."
#: 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:90
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78
+#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
@@ -104,10 +104,8 @@ msgstr "Pagina inesistente."
#: actions/remotesubscribe.php:154 actions/replies.php:73
#: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:163 lib/command.php:302
-#: lib/command.php:355 lib/command.php:401 lib/command.php:462
-#: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82
-#: lib/profileaction.php:77
+#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: lib/mailbox.php:82 lib/profileaction.php:77
msgid "No such user."
msgstr "Utente inesistente."
@@ -203,18 +201,18 @@ msgstr "Messaggi da %1$s e amici su %2$s!"
#: 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:132
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:136
#: actions/apigrouplistall.php:120 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:135
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
-#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184
-#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148
+#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:174
+#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173
+#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
-#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
+#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
msgid "API method not found."
msgstr "Metodo delle API non trovato."
@@ -227,8 +225,8 @@ msgstr "Metodo delle API non trovato."
#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65
-#: actions/apistatusesupdate.php:118
+#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
msgid "This method requires a POST."
msgstr "Questo metodo richiede POST."
@@ -259,7 +257,7 @@ msgid "Could not save profile."
msgstr "Impossibile salvare il profilo."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:97
+#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
#: actions/designadminpanel.php:122 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
@@ -345,7 +343,7 @@ msgstr "Nessuno messaggio trovato con quel ID."
msgid "This status is already a favorite."
msgstr "Questo messaggio è già un preferito."
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
msgid "Could not create favorite."
msgstr "Impossibile creare un preferito."
@@ -464,7 +462,7 @@ msgstr "Gruppo non trovato!"
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:221
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
msgid "You have been blocked from that group by the admin."
msgstr "L'amministratore ti ha bloccato l'accesso a quel gruppo."
@@ -482,11 +480,18 @@ msgstr "Non fai parte di questo gruppo."
msgid "Could not remove user %1$s from group %2$s."
msgstr "Impossibile rimuovere l'utente %1$s dal gruppo %2$s."
-#: actions/apigrouplist.php:95
+#. TRANS: %s is a user name
+#: actions/apigrouplist.php:97
#, 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
+#, fuzzy, php-format
+msgid "%1$s groups %2$s is a member of."
+msgstr "Gruppi di cui %s fa parte"
+
#: actions/apigrouplistall.php:90 actions/usergroups.php:62
#, php-format
msgid "%s groups"
@@ -514,7 +519,7 @@ msgstr "Token non valido."
#: 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:337
+#: actions/profilesettings.php:194 actions/recoverpassword.php:350
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
@@ -578,15 +583,15 @@ msgstr ""
"<strong>%3$s</strong> ai dati del tuo account %4$s. È consigliato fornire "
"accesso al proprio account %4$s solo ad applicazioni di cui ci si può fidare."
-#: actions/apioauthauthorize.php:310 lib/action.php:438
+#: actions/apioauthauthorize.php:310 lib/action.php:437
msgid "Account"
msgstr "Account"
#: actions/apioauthauthorize.php:313 actions/login.php:230
#: actions/profilesettings.php:106 actions/register.php:424
-#: actions/showgroup.php:244 actions/tagother.php:94
+#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
-#: lib/userprofile.php:131
+#: lib/userprofile.php:132
msgid "Nickname"
msgstr "Soprannome"
@@ -656,12 +661,12 @@ msgstr ""
msgid "Unsupported format."
msgstr "Formato non supportato."
-#: actions/apitimelinefavorites.php:108
+#: actions/apitimelinefavorites.php:109
#, php-format
msgid "%1$s / Favorites from %2$s"
msgstr "%1$s / Preferiti da %2$s"
-#: actions/apitimelinefavorites.php:117
+#: actions/apitimelinefavorites.php:118
#, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "%1$s aggiornamenti preferiti da %2$s / %3$s"
@@ -671,7 +676,7 @@ msgstr "%1$s aggiornamenti preferiti da %2$s / %3$s"
msgid "%1$s / Updates mentioning %2$s"
msgstr "%1$s / Messaggi che citano %2$s"
-#: actions/apitimelinementions.php:127
+#: actions/apitimelinementions.php:130
#, 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"
@@ -681,7 +686,7 @@ msgstr "%1$s messaggi in risposta a quelli da %2$s / %3$s"
msgid "%s public timeline"
msgstr "Attività pubblica di %s"
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "Aggiornamenti di %s da tutti!"
@@ -696,12 +701,12 @@ msgstr "Ripetuto a %s"
msgid "Repeats of %s"
msgstr "Ripetizioni di %s"
-#: actions/apitimelinetag.php:102 actions/tag.php:67
+#: actions/apitimelinetag.php:104 actions/tag.php:67
#, php-format
msgid "Notices tagged with %s"
msgstr "Messaggi etichettati con %s"
-#: actions/apitimelinetag.php:104 actions/tagrss.php:65
+#: actions/apitimelinetag.php:106 actions/tagrss.php:65
#, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Messaggi etichettati con %1$s su %2$s!"
@@ -729,7 +734,7 @@ msgstr "Nessuna dimensione."
msgid "Invalid size."
msgstr "Dimensione non valida."
-#: actions/avatarsettings.php:67 actions/showgroup.php:229
+#: actions/avatarsettings.php:67 actions/showgroup.php:230
#: lib/accountsettingsaction.php:112
msgid "Avatar"
msgstr "Immagine"
@@ -762,7 +767,7 @@ msgid "Preview"
msgstr "Anteprima"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:655
+#: lib/deleteuserform.php:66 lib/noticelist.php:659
msgid "Delete"
msgstr "Elimina"
@@ -774,23 +779,27 @@ msgstr "Carica"
msgid "Crop"
msgstr "Ritaglia"
-#: actions/avatarsettings.php:328
+#: actions/avatarsettings.php:305
+msgid "No file uploaded."
+msgstr "Nessun file caricato."
+
+#: actions/avatarsettings.php:332
msgid "Pick a square area of the image to be your avatar"
msgstr "Scegli un'area quadrata per la tua immagine personale"
-#: actions/avatarsettings.php:343 actions/grouplogo.php:380
+#: actions/avatarsettings.php:347 actions/grouplogo.php:380
msgid "Lost our file data."
msgstr "Perso il nostro file di dati."
-#: actions/avatarsettings.php:366
+#: actions/avatarsettings.php:370
msgid "Avatar updated."
msgstr "Immagine aggiornata."
-#: actions/avatarsettings.php:369
+#: actions/avatarsettings.php:373
msgid "Failed updating avatar."
msgstr "Aggiornamento dell'immagine non riuscito."
-#: actions/avatarsettings.php:393
+#: actions/avatarsettings.php:397
msgid "Avatar deleted."
msgstr "Immagine eliminata."
@@ -845,8 +854,8 @@ msgstr "Salvataggio delle informazioni per il blocco non riuscito."
#: actions/groupunblock.php:86 actions/joingroup.php:82
#: actions/joingroup.php:93 actions/leavegroup.php:82
#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212
-#: lib/command.php:260
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162
+#: lib/command.php:358
msgid "No such group."
msgstr "Nessuna gruppo."
@@ -928,7 +937,7 @@ msgid "Conversation"
msgstr "Conversazione"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:218 lib/searchgroupnav.php:82
+#: lib/profileaction.php:224 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "Messaggi"
@@ -947,7 +956,7 @@ msgstr "Questa applicazione non è di tua proprietà."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1217
+#: lib/action.php:1219
msgid "There was a problem with your session token."
msgstr "Si è verificato un problema con il tuo token di sessione."
@@ -1007,7 +1016,7 @@ msgstr "Vuoi eliminare questo messaggio?"
msgid "Do not delete this notice"
msgstr "Non eliminare il messaggio"
-#: actions/deletenotice.php:146 lib/noticelist.php:655
+#: actions/deletenotice.php:146 lib/noticelist.php:659
msgid "Delete this notice"
msgstr "Elimina questo messaggio"
@@ -1144,7 +1153,7 @@ msgstr "Reimposta i valori predefiniti"
#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:208
+#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
#: actions/tagother.php:154 actions/useradminpanel.php:294
#: lib/applicationeditform.php:333 lib/applicationeditform.php:334
#: lib/designsettings.php:256 lib/groupeditform.php:202
@@ -1260,7 +1269,7 @@ msgstr "La descrizione è troppo lunga (max %d caratteri)."
msgid "Could not update group."
msgstr "Impossibile aggiornare il gruppo."
-#: actions/editgroup.php:264 classes/User_group.php:493
+#: actions/editgroup.php:264 classes/User_group.php:496
msgid "Could not create aliases."
msgstr "Impossibile creare gli alias."
@@ -1753,7 +1762,7 @@ msgstr "Attività di %s"
msgid "Updates from members of %1$s on %2$s!"
msgstr "Messaggi dai membri di %1$s su %2$s!"
-#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232
+#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244
#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr "Gruppi"
@@ -1967,7 +1976,7 @@ msgstr "Invita nuovi utenti"
msgid "You are already subscribed to these users:"
msgstr "Hai già un abbonamento a questi utenti:"
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
#, php-format
msgid "%1$s (%2$s)"
msgstr "%1$s (%2$s)"
@@ -2097,7 +2106,7 @@ msgstr "%1$s fa ora parte del gruppo %2$s"
msgid "You must be logged in to leave a group."
msgstr "Devi eseguire l'accesso per lasciare un gruppo."
-#: actions/leavegroup.php:100 lib/command.php:265
+#: actions/leavegroup.php:100 lib/command.php:363
msgid "You are not a member of that group."
msgstr "Non fai parte di quel gruppo."
@@ -2211,12 +2220,12 @@ msgstr "Usa questo modulo per creare un nuovo gruppo."
msgid "New message"
msgstr "Nuovo messaggio"
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
msgid "You can't send a message to this user."
msgstr "Non puoi inviare un messaggio a questo utente."
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342
-#: lib/command.php:475
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
+#: lib/command.php:529
msgid "No content!"
msgstr "Nessun contenuto!"
@@ -2224,7 +2233,7 @@ msgstr "Nessun contenuto!"
msgid "No recipient specified."
msgstr "Nessun destinatario specificato."
-#: actions/newmessage.php:164 lib/command.php:361
+#: actions/newmessage.php:164 lib/command.php:462
msgid ""
"Don't send a message to yourself; just say it to yourself quietly instead."
msgstr "Non inviarti un messaggio, piuttosto ripetilo a voce dolcemente."
@@ -2238,7 +2247,7 @@ msgstr "Messaggio inviato"
msgid "Direct message to %s sent."
msgstr "Messaggio diretto a %s inviato."
-#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189
msgid "Ajax Error"
msgstr "Errore di Ajax"
@@ -2246,7 +2255,7 @@ msgstr "Errore di Ajax"
msgid "New notice"
msgstr "Nuovo messaggio"
-#: actions/newnotice.php:211
+#: actions/newnotice.php:217
msgid "Notice posted"
msgstr "Messaggio inviato"
@@ -2359,7 +2368,7 @@ msgstr ""
msgid "Notice has no profile"
msgstr "Il messaggio non ha un profilo"
-#: actions/oembed.php:86 actions/shownotice.php:180
+#: actions/oembed.php:86 actions/shownotice.php:175
#, php-format
msgid "%1$s's status on %2$s"
msgstr "Stato di %1$s su %2$s"
@@ -2372,8 +2381,8 @@ msgstr "tipo di contenuto "
msgid "Only "
msgstr "Solo "
-#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042
-#: lib/apiaction.php:1070 lib/apiaction.php:1179
+#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1068
+#: lib/apiaction.php:1096 lib/apiaction.php:1212
msgid "Not a supported data format."
msgstr "Non è un formato di dati supportato."
@@ -2506,7 +2515,7 @@ msgstr "Vecchia password non corretta"
msgid "Error saving user; invalid."
msgstr "Errore nel salvare l'utente; non valido."
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
msgid "Can't save new password."
msgstr "Impossibile salvare la nuova password."
@@ -2722,8 +2731,8 @@ msgstr ""
"1-64 lettere minuscole o numeri, senza spazi o simboli di punteggiatura"
#: actions/profilesettings.php:111 actions/register.php:448
-#: actions/showgroup.php:255 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:149
+#: actions/showgroup.php:256 actions/tagother.php:104
+#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Nome"
@@ -2750,9 +2759,9 @@ msgid "Bio"
msgstr "Biografia"
#: actions/profilesettings.php:132 actions/register.php:471
-#: actions/showgroup.php:264 actions/tagother.php:112
+#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
-#: lib/userprofile.php:164
+#: lib/userprofile.php:165
msgid "Location"
msgstr "Ubicazione"
@@ -2766,7 +2775,7 @@ msgstr "Condividi la mia posizione attuale quando invio messaggi"
#: actions/profilesettings.php:145 actions/tagother.php:149
#: actions/tagother.php:209 lib/subscriptionlist.php:106
-#: lib/subscriptionlist.php:108 lib/userprofile.php:209
+#: lib/subscriptionlist.php:108 lib/userprofile.php:210
msgid "Tags"
msgstr "Etichette"
@@ -3006,7 +3015,7 @@ msgstr "Reimposta la password"
msgid "Recover password"
msgstr "Recupera la password"
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
msgid "Password recovery requested"
msgstr "Richiesta password di ripristino"
@@ -3026,19 +3035,19 @@ msgstr "Reimposta"
msgid "Enter a nickname or email address."
msgstr "Inserisci un soprannome o un indirizzo email."
-#: actions/recoverpassword.php:272
+#: actions/recoverpassword.php:282
msgid "No user with that email address or username."
msgstr "Nessun utente con quell'email o nome utente."
-#: actions/recoverpassword.php:287
+#: actions/recoverpassword.php:299
msgid "No registered email address for that user."
msgstr "Nessun indirizzo email registrato per quell'utente."
-#: actions/recoverpassword.php:301
+#: actions/recoverpassword.php:313
msgid "Error saving address confirmation."
msgstr "Errore nel salvare la conferma dell'indirizzo."
-#: actions/recoverpassword.php:325
+#: actions/recoverpassword.php:338
msgid ""
"Instructions for recovering your password have been sent to the email "
"address registered to your account."
@@ -3046,23 +3055,23 @@ msgstr ""
"Le istruzioni per recuperare la tua password sono state inviate "
"all'indirizzo email registrato nel tuo account."
-#: actions/recoverpassword.php:344
+#: actions/recoverpassword.php:357
msgid "Unexpected password reset."
msgstr "Ripristino della password inaspettato."
-#: actions/recoverpassword.php:352
+#: actions/recoverpassword.php:365
msgid "Password must be 6 chars or more."
msgstr "La password deve essere lunga almeno 6 caratteri."
-#: actions/recoverpassword.php:356
+#: actions/recoverpassword.php:369
msgid "Password and confirmation do not match."
msgstr "La password e la conferma non corrispondono."
-#: actions/recoverpassword.php:375 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:248
msgid "Error setting user."
msgstr "Errore nell'impostare l'utente."
-#: actions/recoverpassword.php:382
+#: actions/recoverpassword.php:395
msgid "New password successfully saved. You are now logged in."
msgstr "Nuova password salvata con successo. Hai effettuato l'accesso."
@@ -3228,7 +3237,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "URL del tuo profilo su un altro servizio di microblog compatibile"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:394
+#: lib/userprofile.php:406
msgid "Subscribe"
msgstr "Abbonati"
@@ -3266,7 +3275,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:674
+#: actions/repeat.php:114 lib/noticelist.php:678
msgid "Repeated"
msgstr "Ripetuti"
@@ -3409,8 +3418,8 @@ msgstr "Organizzazione"
msgid "Description"
msgstr "Descrizione"
-#: actions/showapplication.php:192 actions/showgroup.php:438
-#: lib/profileaction.php:176
+#: actions/showapplication.php:192 actions/showgroup.php:439
+#: lib/profileaction.php:182
msgid "Statistics"
msgstr "Statistiche"
@@ -3529,67 +3538,67 @@ msgstr "Gruppo %s"
msgid "%1$s group, page %2$d"
msgstr "Gruppi di %1$s, pagina %2$d"
-#: actions/showgroup.php:226
+#: actions/showgroup.php:227
msgid "Group profile"
msgstr "Profilo del gruppo"
-#: actions/showgroup.php:271 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:177
+#: actions/showgroup.php:272 actions/tagother.php:118
+#: actions/userauthorization.php:175 lib/userprofile.php:178
msgid "URL"
msgstr "URL"
-#: actions/showgroup.php:282 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:194
+#: actions/showgroup.php:283 actions/tagother.php:128
+#: actions/userauthorization.php:187 lib/userprofile.php:195
msgid "Note"
msgstr "Nota"
-#: actions/showgroup.php:292 lib/groupeditform.php:184
+#: actions/showgroup.php:293 lib/groupeditform.php:184
msgid "Aliases"
msgstr "Alias"
-#: actions/showgroup.php:301
+#: actions/showgroup.php:302
msgid "Group actions"
msgstr "Azioni dei gruppi"
-#: actions/showgroup.php:337
+#: actions/showgroup.php:338
#, php-format
msgid "Notice feed for %s group (RSS 1.0)"
msgstr "Feed dei messaggi per il gruppo %s (RSS 1.0)"
-#: actions/showgroup.php:343
+#: actions/showgroup.php:344
#, php-format
msgid "Notice feed for %s group (RSS 2.0)"
msgstr "Feed dei messaggi per il gruppo %s (RSS 2.0)"
-#: actions/showgroup.php:349
+#: actions/showgroup.php:350
#, php-format
msgid "Notice feed for %s group (Atom)"
msgstr "Feed dei messaggi per il gruppo %s (Atom)"
-#: actions/showgroup.php:354
+#: actions/showgroup.php:355
#, php-format
msgid "FOAF for %s group"
msgstr "FOAF per il gruppo %s"
-#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91
+#: actions/showgroup.php:391 actions/showgroup.php:448 lib/groupnav.php:91
msgid "Members"
msgstr "Membri"
-#: actions/showgroup.php:395 lib/profileaction.php:117
-#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95
-#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71
+#: actions/showgroup.php:396 lib/profileaction.php:117
+#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95
+#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
msgid "(None)"
msgstr "(nessuno)"
-#: actions/showgroup.php:401
+#: actions/showgroup.php:402
msgid "All members"
msgstr "Tutti i membri"
-#: actions/showgroup.php:441
+#: actions/showgroup.php:442
msgid "Created"
msgstr "Creato"
-#: actions/showgroup.php:457
+#: actions/showgroup.php:458
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3605,7 +3614,7 @@ msgstr ""
"stesso](%%%%action.register%%%%) per far parte di questo gruppo e di molti "
"altri! ([Maggiori informazioni](%%%%doc.help%%%%))"
-#: actions/showgroup.php:463
+#: actions/showgroup.php:464
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3617,7 +3626,7 @@ msgstr ""
"(http://it.wikipedia.org/wiki/Microblogging) basato sul software libero "
"[StatusNet](http://status.net/)."
-#: actions/showgroup.php:491
+#: actions/showgroup.php:492
msgid "Admins"
msgstr "Amministratori"
@@ -3756,8 +3765,8 @@ msgid "Unknown language \"%s\"."
msgstr "Lingua \"%s\" sconosciuta."
#: actions/siteadminpanel.php:165
-msgid "Minimum text limit is 140 characters."
-msgstr "Il limite minimo del testo è di 140 caratteri."
+msgid "Minimum text limit is 0 (unlimited)."
+msgstr "Il limite minimo del testo è di 0 caratteri (illimitato)."
#: actions/siteadminpanel.php:171
msgid "Dupe limit must 1 or more seconds."
@@ -4028,8 +4037,7 @@ msgstr "Salva impostazioni snapshot"
msgid "You are not subscribed to that profile."
msgstr "Non hai una abbonamento a quel profilo."
-#: actions/subedit.php:83 classes/Subscription.php:89
-#: classes/Subscription.php:116
+#: actions/subedit.php:83 classes/Subscription.php:132
msgid "Could not save subscription."
msgstr "Impossibile salvare l'abbonamento."
@@ -4130,11 +4138,11 @@ msgstr ""
msgid "%s is not listening to anyone."
msgstr "%s non sta seguendo nessuno."
-#: actions/subscriptions.php:199
+#: actions/subscriptions.php:208
msgid "Jabber"
msgstr "Jabber"
-#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:222 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr "SMS"
@@ -4167,12 +4175,12 @@ msgstr "Nessun argomento ID."
msgid "Tag %s"
msgstr "Etichetta %s"
-#: actions/tagother.php:77 lib/userprofile.php:75
+#: actions/tagother.php:77 lib/userprofile.php:76
msgid "User profile"
msgstr "Profilo utente"
#: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:102
+#: lib/userprofile.php:103
msgid "Photo"
msgstr "Fotografia"
@@ -4507,7 +4515,7 @@ msgstr ""
msgid "Plugins"
msgstr "Plugin"
-#: actions/version.php:196 lib/action.php:767
+#: actions/version.php:196 lib/action.php:766
msgid "Version"
msgstr "Versione"
@@ -4515,7 +4523,7 @@ msgstr "Versione"
msgid "Author(s)"
msgstr "Autori"
-#: classes/File.php:144
+#: classes/File.php:169
#, php-format
msgid ""
"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
@@ -4524,13 +4532,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:154
+#: classes/File.php:179
#, 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:161
+#: classes/File.php:186
#, php-format
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
@@ -4569,27 +4577,27 @@ msgstr "Impossibile inserire il messaggio."
msgid "Could not update message with new URI."
msgstr "Impossibile aggiornare il messaggio con il nuovo URI."
-#: classes/Notice.php:172
+#: classes/Notice.php:175
#, php-format
msgid "DB error inserting hashtag: %s"
msgstr "Errore del DB nell'inserire un hashtag: %s"
-#: classes/Notice.php:241
+#: classes/Notice.php:244
msgid "Problem saving notice. Too long."
msgstr "Problema nel salvare il messaggio. Troppo lungo."
-#: classes/Notice.php:245
+#: classes/Notice.php:248
msgid "Problem saving notice. Unknown user."
msgstr "Problema nel salvare il messaggio. Utente sconosciuto."
-#: classes/Notice.php:250
+#: classes/Notice.php:253
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:256
+#: classes/Notice.php:259
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
@@ -4597,69 +4605,69 @@ msgstr ""
"Troppi messaggi duplicati troppo velocemente; fai una pausa e scrivi di "
"nuovo tra qualche minuto."
-#: classes/Notice.php:262
+#: classes/Notice.php:265
msgid "You are banned from posting notices on this site."
msgstr "Ti è proibito inviare messaggi su questo sito."
-#: classes/Notice.php:328 classes/Notice.php:354
+#: classes/Notice.php:331 classes/Notice.php:357
msgid "Problem saving notice."
msgstr "Problema nel salvare il messaggio."
-#: classes/Notice.php:927
+#: classes/Notice.php:943
msgid "Problem saving group inbox."
msgstr "Problema nel salvare la casella della posta del gruppo."
-#: classes/Notice.php:1459
+#: classes/Notice.php:1481
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
-#: classes/Subscription.php:66 lib/oauthstore.php:465
+#: classes/Subscription.php:74 lib/oauthstore.php:465
msgid "You have been banned from subscribing."
msgstr "Non ti è possibile abbonarti."
-#: classes/Subscription.php:70
+#: classes/Subscription.php:78
msgid "Already subscribed!"
msgstr "Hai già l'abbonamento!"
-#: classes/Subscription.php:74
+#: classes/Subscription.php:82
msgid "User has blocked you."
msgstr "L'utente non ti consente di seguirlo."
-#: classes/Subscription.php:157
+#: classes/Subscription.php:167
msgid "Not subscribed!"
msgstr "Non hai l'abbonamento!"
-#: classes/Subscription.php:163
+#: classes/Subscription.php:173
msgid "Couldn't delete self-subscription."
msgstr "Impossibile eliminare l'auto-abbonamento."
-#: classes/Subscription.php:190
+#: classes/Subscription.php:200
msgid "Couldn't delete subscription OMB token."
msgstr "Impossibile eliminare il token di abbonamento OMB."
-#: classes/Subscription.php:201 lib/subs.php:69
+#: classes/Subscription.php:211
msgid "Couldn't delete subscription."
msgstr "Impossibile eliminare l'abbonamento."
-#: classes/User.php:373
+#: classes/User.php:363
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Benvenuti su %1$s, @%2$s!"
-#: classes/User_group.php:477
+#: classes/User_group.php:480
msgid "Could not create group."
msgstr "Impossibile creare il gruppo."
-#: classes/User_group.php:486
+#: classes/User_group.php:489
msgid "Could not set group URI."
msgstr "Impossibile impostare l'URI del gruppo."
-#: classes/User_group.php:507
+#: classes/User_group.php:510
msgid "Could not set group membership."
msgstr "Impossibile impostare la membership al gruppo."
-#: classes/User_group.php:521
+#: classes/User_group.php:524
msgid "Could not save local group info."
msgstr "Impossibile salvare le informazioni del gruppo locale."
@@ -4700,170 +4708,170 @@ msgstr "%1$s - %2$s"
msgid "Untitled page"
msgstr "Pagina senza nome"
-#: lib/action.php:424
+#: lib/action.php:423
msgid "Primary site navigation"
msgstr "Esplorazione sito primaria"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:430
+#: lib/action.php:429
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr "Profilo personale e attività degli amici"
-#: lib/action.php:433
+#: lib/action.php:432
msgctxt "MENU"
msgid "Personal"
msgstr "Personale"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:435
+#: lib/action.php:434
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "Modifica la tua email, immagine, password o il tuo profilo"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:440
+#: lib/action.php:439
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "Connettiti con altri servizi"
-#: lib/action.php:443
+#: lib/action.php:442
msgid "Connect"
msgstr "Connetti"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:446
+#: lib/action.php:445
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "Modifica la configurazione del sito"
-#: lib/action.php:449
+#: lib/action.php:448
msgctxt "MENU"
msgid "Admin"
msgstr "Amministra"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:453
+#: lib/action.php:452
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "Invita amici e colleghi a seguirti su %s"
-#: lib/action.php:456
+#: lib/action.php:455
msgctxt "MENU"
msgid "Invite"
msgstr "Invita"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:462
+#: lib/action.php:461
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "Termina la tua sessione sul sito"
-#: lib/action.php:465
+#: lib/action.php:464
msgctxt "MENU"
msgid "Logout"
msgstr "Esci"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:470
+#: lib/action.php:469
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Crea un account"
-#: lib/action.php:473
+#: lib/action.php:472
msgctxt "MENU"
msgid "Register"
msgstr "Registrati"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:476
+#: lib/action.php:475
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Accedi al sito"
-#: lib/action.php:479
+#: lib/action.php:478
msgctxt "MENU"
msgid "Login"
msgstr "Accedi"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:482
+#: lib/action.php:481
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Aiutami!"
-#: lib/action.php:485
+#: lib/action.php:484
msgctxt "MENU"
msgid "Help"
msgstr "Aiuto"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:488
+#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "Cerca persone o del testo"
-#: lib/action.php:491
+#: lib/action.php:490
msgctxt "MENU"
msgid "Search"
msgstr "Cerca"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:513 lib/adminpanelaction.php:398
+#: lib/action.php:512 lib/adminpanelaction.php:398
msgid "Site notice"
msgstr "Messaggio del sito"
-#: lib/action.php:579
+#: lib/action.php:578
msgid "Local views"
msgstr "Viste locali"
-#: lib/action.php:645
+#: lib/action.php:644
msgid "Page notice"
msgstr "Pagina messaggio"
-#: lib/action.php:747
+#: lib/action.php:746
msgid "Secondary site navigation"
msgstr "Esplorazione secondaria del sito"
-#: lib/action.php:752
+#: lib/action.php:751
msgid "Help"
msgstr "Aiuto"
-#: lib/action.php:754
+#: lib/action.php:753
msgid "About"
msgstr "Informazioni"
-#: lib/action.php:756
+#: lib/action.php:755
msgid "FAQ"
msgstr "FAQ"
-#: lib/action.php:760
+#: lib/action.php:759
msgid "TOS"
msgstr "TOS"
-#: lib/action.php:763
+#: lib/action.php:762
msgid "Privacy"
msgstr "Privacy"
-#: lib/action.php:765
+#: lib/action.php:764
msgid "Source"
msgstr "Sorgenti"
-#: lib/action.php:769
+#: lib/action.php:768
msgid "Contact"
msgstr "Contatti"
-#: lib/action.php:771
+#: lib/action.php:770
msgid "Badge"
msgstr "Badge"
-#: lib/action.php:799
+#: lib/action.php:798
msgid "StatusNet software license"
msgstr "Licenza del software StatusNet"
-#: lib/action.php:802
+#: lib/action.php:803
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4872,12 +4880,12 @@ msgstr ""
"**%%site.name%%** è un servizio di microblog offerto da [%%site.broughtby%%]"
"(%%site.broughtbyurl%%). "
-#: lib/action.php:804
+#: lib/action.php:805
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** è un servizio di microblog. "
-#: lib/action.php:806
+#: lib/action.php:808
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4888,56 +4896,60 @@ msgstr ""
"s, disponibile nei termini della licenza [GNU Affero General Public License]"
"(http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:821
+#: lib/action.php:823
msgid "Site content license"
msgstr "Licenza del contenuto del sito"
-#: lib/action.php:826
+#: lib/action.php:828
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr "I contenuti e i dati di %1$s sono privati e confidenziali."
-#: lib/action.php:831
+#: lib/action.php:833
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
"I contenuti e i dati sono copyright di %1$s. Tutti i diritti riservati."
-#: lib/action.php:834
+#: lib/action.php:836
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
"I contenuti e i dati sono forniti dai collaboratori. Tutti i diritti "
"riservati."
-#: lib/action.php:847
+#: lib/action.php:849
msgid "All "
msgstr "Tutti "
-#: lib/action.php:853
+#: lib/action.php:855
msgid "license."
msgstr "licenza."
-#: lib/action.php:1152
+#: lib/action.php:1154
msgid "Pagination"
msgstr "Paginazione"
-#: lib/action.php:1161
+#: lib/action.php:1163
msgid "After"
msgstr "Successivi"
-#: lib/action.php:1169
+#: lib/action.php:1171
msgid "Before"
msgstr "Precedenti"
-#: lib/activity.php:453
+#: lib/activity.php:120
+msgid "Expecting a root feed element but got a whole XML document."
+msgstr "Atteso un elemento root del feed, ma ricevuto un documento XML intero."
+
+#: lib/activityutils.php:208
msgid "Can't handle remote content yet."
msgstr "Impossibile gestire contenuti remoti."
-#: lib/activity.php:481
+#: lib/activityutils.php:236
msgid "Can't handle embedded XML content yet."
msgstr "Impossibile gestire contenuti XML incorporati."
-#: lib/activity.php:485
+#: lib/activityutils.php:240
msgid "Can't handle embedded Base64 content yet."
msgstr "Impossibile gestire contenuti Base64."
@@ -5029,7 +5041,7 @@ msgstr ""
"Le risorse API richiedono accesso lettura-scrittura, ma si dispone del solo "
"accesso in lettura."
-#: lib/apiauth.php:272
+#: lib/apiauth.php:276
#, php-format
msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s"
msgstr ""
@@ -5106,11 +5118,11 @@ msgstr "Revoca"
msgid "Attachments"
msgstr "Allegati"
-#: lib/attachmentlist.php:265
+#: lib/attachmentlist.php:263
msgid "Author"
msgstr "Autore"
-#: lib/attachmentlist.php:278
+#: lib/attachmentlist.php:276
msgid "Provider"
msgstr "Provider"
@@ -5130,37 +5142,50 @@ msgstr "Modifica della password non riuscita"
msgid "Password changing is not allowed"
msgstr "La modifica della password non è permessa"
-#: lib/channel.php:138 lib/channel.php:158
+#: lib/channel.php:157 lib/channel.php:177
msgid "Command results"
msgstr "Risultati comando"
-#: lib/channel.php:210 lib/mailhandler.php:142
+#: lib/channel.php:229 lib/mailhandler.php:142
msgid "Command complete"
msgstr "Comando completato"
-#: lib/channel.php:221
+#: lib/channel.php:240
msgid "Command failed"
msgstr "Comando non riuscito"
-#: lib/command.php:44
-msgid "Sorry, this command is not yet implemented."
-msgstr "Questo comando non è ancora implementato."
+#: lib/command.php:83 lib/command.php:105
+msgid "Notice with that id does not exist"
+msgstr "Un messaggio con quel ID non esiste"
+
+#: lib/command.php:99 lib/command.php:570
+msgid "User has no last notice"
+msgstr "L'utente non ha un ultimo messaggio."
-#: lib/command.php:88
+#: lib/command.php:125
#, php-format
msgid "Could not find a user with nickname %s"
msgstr "Impossibile trovare un utente col soprannome %s"
-#: lib/command.php:92
+#: lib/command.php:143
+#, php-format
+msgid "Could not find a local user with nickname %s"
+msgstr "Impossibile trovare un utente locale col soprannome %s"
+
+#: lib/command.php:176
+msgid "Sorry, this command is not yet implemented."
+msgstr "Questo comando non è ancora implementato."
+
+#: lib/command.php:221
msgid "It does not make a lot of sense to nudge yourself!"
msgstr "Non ha molto senso se cerchi di richiamarti!"
-#: lib/command.php:99
+#: lib/command.php:228
#, php-format
msgid "Nudge sent to %s"
msgstr "Richiamo inviato a %s"
-#: lib/command.php:126
+#: lib/command.php:254
#, php-format
msgid ""
"Subscriptions: %1$s\n"
@@ -5171,197 +5196,197 @@ msgstr ""
"Abbonati: %2$s\n"
"Messaggi: %3$s"
-#: lib/command.php:152 lib/command.php:390 lib/command.php:451
-msgid "Notice with that id does not exist"
-msgstr "Un messaggio con quel ID non esiste"
-
-#: lib/command.php:168 lib/command.php:406 lib/command.php:467
-#: lib/command.php:523
-msgid "User has no last notice"
-msgstr "L'utente non ha un ultimo messaggio."
-
-#: lib/command.php:190
+#: lib/command.php:296
msgid "Notice marked as fave."
msgstr "Messaggio indicato come preferito."
-#: lib/command.php:217
+#: lib/command.php:317
msgid "You are already a member of that group"
msgstr "Fai già parte di quel gruppo"
-#: lib/command.php:231
+#: lib/command.php:331
#, php-format
msgid "Could not join user %s to group %s"
msgstr "Impossibile iscrivere l'utente %1$s al gruppo %2$s."
-#: lib/command.php:236
+#: lib/command.php:336
#, php-format
msgid "%s joined group %s"
msgstr "%s fa ora parte del gruppo %s"
-#: lib/command.php:275
+#: lib/command.php:373
#, php-format
msgid "Could not remove user %s to group %s"
msgstr "Impossibile rimuovere l'utente %1$s dal gruppo %2$s"
-#: lib/command.php:280
+#: lib/command.php:378
#, php-format
msgid "%s left group %s"
msgstr "%1$s ha lasciato il gruppo %2$s"
-#: lib/command.php:309
+#: lib/command.php:401
#, php-format
msgid "Fullname: %s"
msgstr "Nome completo: %s"
-#: lib/command.php:312 lib/mail.php:258
+#: lib/command.php:404 lib/mail.php:258
#, php-format
msgid "Location: %s"
msgstr "Posizione: %s"
-#: lib/command.php:315 lib/mail.php:260
+#: lib/command.php:407 lib/mail.php:260
#, php-format
msgid "Homepage: %s"
msgstr "Pagina web: %s"
-#: lib/command.php:318
+#: lib/command.php:410
#, php-format
msgid "About: %s"
msgstr "Informazioni: %s"
-#: lib/command.php:349
+#: lib/command.php:437
+#, php-format
+msgid ""
+"%s is a remote profile; you can only send direct messages to users on the "
+"same server."
+msgstr ""
+"%s è un profilo remoto. È possibile inviare messaggi privati solo agli "
+"utenti sullo stesso server."
+
+#: lib/command.php:450
#, php-format
msgid "Message too long - maximum is %d characters, you sent %d"
msgstr "Messaggio troppo lungo: massimo %d caratteri, inviati %d"
-#: lib/command.php:367
+#: lib/command.php:468
#, php-format
msgid "Direct message to %s sent"
msgstr "Messaggio diretto a %s inviato."
-#: lib/command.php:369
+#: lib/command.php:470
msgid "Error sending direct message."
msgstr "Errore nell'inviare il messaggio diretto."
-#: lib/command.php:413
+#: lib/command.php:490
msgid "Cannot repeat your own notice"
msgstr "Impossibile ripetere un proprio messaggio"
-#: lib/command.php:418
+#: lib/command.php:495
msgid "Already repeated that notice"
msgstr "Hai già ripetuto quel messaggio"
-#: lib/command.php:426
+#: lib/command.php:503
#, php-format
msgid "Notice from %s repeated"
msgstr "Messaggio da %s ripetuto"
-#: lib/command.php:428
+#: lib/command.php:505
msgid "Error repeating notice."
msgstr "Errore nel ripetere il messaggio."
-#: lib/command.php:482
+#: lib/command.php:536
#, php-format
msgid "Notice too long - maximum is %d characters, you sent %d"
msgstr "Messaggio troppo lungo: massimo %d caratteri, inviati %d"
-#: lib/command.php:491
+#: lib/command.php:545
#, php-format
msgid "Reply to %s sent"
msgstr "Risposta a %s inviata"
-#: lib/command.php:493
+#: lib/command.php:547
msgid "Error saving notice."
msgstr "Errore nel salvare il messaggio."
-#: lib/command.php:547
+#: lib/command.php:594
msgid "Specify the name of the user to subscribe to"
msgstr "Specifica il nome dell'utente a cui abbonarti."
-#: lib/command.php:554 lib/command.php:589
-msgid "No such user"
-msgstr "Utente inesistente."
+#: lib/command.php:602
+msgid "Can't subscribe to OMB profiles by command."
+msgstr "Impossibile abbonarsi ai profili OMB attraverso un comando."
-#: lib/command.php:561
+#: lib/command.php:608
#, php-format
msgid "Subscribed to %s"
msgstr "Abbonati a %s"
-#: lib/command.php:582 lib/command.php:685
+#: lib/command.php:629 lib/command.php:728
msgid "Specify the name of the user to unsubscribe from"
msgstr "Specifica il nome dell'utente da cui annullare l'abbonamento."
-#: lib/command.php:595
+#: lib/command.php:638
#, php-format
msgid "Unsubscribed from %s"
msgstr "Abbonamento a %s annullato"
-#: lib/command.php:613 lib/command.php:636
+#: lib/command.php:656 lib/command.php:679
msgid "Command not yet implemented."
msgstr "Comando non ancora implementato."
-#: lib/command.php:616
+#: lib/command.php:659
msgid "Notification off."
msgstr "Notifiche disattivate."
-#: lib/command.php:618
+#: lib/command.php:661
msgid "Can't turn off notification."
msgstr "Impossibile disattivare le notifiche."
-#: lib/command.php:639
+#: lib/command.php:682
msgid "Notification on."
msgstr "Notifiche attivate."
-#: lib/command.php:641
+#: lib/command.php:684
msgid "Can't turn on notification."
msgstr "Impossibile attivare le notifiche."
-#: lib/command.php:654
+#: lib/command.php:697
msgid "Login command is disabled"
msgstr "Il comando di accesso è disabilitato"
-#: lib/command.php:665
+#: lib/command.php:708
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
"Questo collegamento è utilizzabile una sola volta ed è valido solo per 2 "
"minuti: %s"
-#: lib/command.php:692
+#: lib/command.php:735
#, php-format
msgid "Unsubscribed %s"
msgstr "%s ha annullato l'abbonamento"
-#: lib/command.php:709
+#: lib/command.php:752
msgid "You are not subscribed to anyone."
msgstr "Il tuo abbonamento è stato annullato."
-#: lib/command.php:711
+#: lib/command.php:754
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Persona di cui hai già un abbonamento:"
msgstr[1] "Persone di cui hai già un abbonamento:"
-#: lib/command.php:731
+#: lib/command.php:774
msgid "No one is subscribed to you."
msgstr "Nessuno è abbonato ai tuoi messaggi."
-#: lib/command.php:733
+#: lib/command.php:776
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Questa persona è abbonata ai tuoi messaggi:"
msgstr[1] "Queste persone sono abbonate ai tuoi messaggi:"
-#: lib/command.php:753
+#: lib/command.php:796
msgid "You are not a member of any groups."
msgstr "Non fai parte di alcun gruppo."
-#: lib/command.php:755
+#: lib/command.php:798
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Non fai parte di questo gruppo:"
msgstr[1] "Non fai parte di questi gruppi:"
-#: lib/command.php:769
+#: lib/command.php:812
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5443,21 +5468,21 @@ msgstr ""
"tracks - non ancora implementato\n"
"tracking - non ancora implementato\n"
-#: lib/common.php:148
+#: lib/common.php:135
msgid "No configuration file found. "
msgstr "Non è stato trovato alcun file di configurazione. "
-#: lib/common.php:149
+#: lib/common.php:136
msgid "I looked for configuration files in the following places: "
msgstr "I file di configurazione sono stati cercati in questi posti: "
-#: lib/common.php:151
+#: lib/common.php:138
msgid "You may wish to run the installer to fix this."
msgstr ""
"Potrebbe essere necessario lanciare il programma d'installazione per "
"correggere il problema."
-#: lib/common.php:152
+#: lib/common.php:139
msgid "Go to the installer."
msgstr "Vai al programma d'installazione."
@@ -5634,49 +5659,49 @@ msgstr "Etichette nei messaggi del gruppo %s"
msgid "This page is not available in a media type you accept"
msgstr "Questa pagina non è disponibile in un tipo di supporto che tu accetti"
-#: lib/imagefile.php:75
+#: lib/imagefile.php:72
+msgid "Unsupported image file format."
+msgstr "Formato file immagine non supportato."
+
+#: lib/imagefile.php:88
#, php-format
msgid "That file is too big. The maximum file size is %s."
msgstr "Quel file è troppo grande. La dimensione massima è %s."
-#: lib/imagefile.php:80
+#: lib/imagefile.php:93
msgid "Partial upload."
msgstr "Caricamento parziale."
-#: lib/imagefile.php:88 lib/mediafile.php:170
+#: lib/imagefile.php:101 lib/mediafile.php:170
msgid "System error uploading file."
msgstr "Errore di sistema nel caricare il file."
-#: lib/imagefile.php:96
+#: lib/imagefile.php:109
msgid "Not an image or corrupt file."
msgstr "Non è un'immagine o il file è danneggiato."
-#: lib/imagefile.php:109
-msgid "Unsupported image file format."
-msgstr "Formato file immagine non supportato."
-
#: lib/imagefile.php:122
msgid "Lost our file."
msgstr "Perso il nostro file."
-#: lib/imagefile.php:166 lib/imagefile.php:231
+#: lib/imagefile.php:163 lib/imagefile.php:224
msgid "Unknown file type"
msgstr "Tipo di file sconosciuto"
-#: lib/imagefile.php:251
+#: lib/imagefile.php:244
msgid "MB"
msgstr "MB"
-#: lib/imagefile.php:253
+#: lib/imagefile.php:246
msgid "kB"
msgstr "kB"
-#: lib/jabber.php:220
+#: lib/jabber.php:387
#, php-format
msgid "[%s]"
msgstr "[%s]"
-#: lib/jabber.php:400
+#: lib/jabber.php:567
#, php-format
msgid "Unknown inbox source %d."
msgstr "Sorgente casella in arrivo %d sconosciuta."
@@ -5957,7 +5982,7 @@ msgstr ""
"iniziare una conversazione con altri utenti. Altre persone possono mandare "
"messaggi riservati solamente a te."
-#: lib/mailbox.php:227 lib/noticelist.php:482
+#: lib/mailbox.php:227 lib/noticelist.php:486
msgid "from"
msgstr "via"
@@ -6087,48 +6112,48 @@ msgstr ""
"Il recupero della tua posizione geografica sta impiegando più tempo del "
"previsto. Riprova più tardi."
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "N"
msgstr "N"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "S"
msgstr "S"
-#: lib/noticelist.php:431
+#: lib/noticelist.php:432
msgid "E"
msgstr "E"
-#: lib/noticelist.php:431
+#: lib/noticelist.php:432
msgid "W"
msgstr "O"
-#: lib/noticelist.php:438
+#: lib/noticelist.php:439
msgid "at"
msgstr "presso"
-#: lib/noticelist.php:566
+#: lib/noticelist.php:570
msgid "in context"
msgstr "in una discussione"
-#: lib/noticelist.php:601
+#: lib/noticelist.php:605
msgid "Repeated by"
msgstr "Ripetuto da"
-#: lib/noticelist.php:628
+#: lib/noticelist.php:632
msgid "Reply to this notice"
msgstr "Rispondi a questo messaggio"
-#: lib/noticelist.php:629
+#: lib/noticelist.php:633
msgid "Reply"
msgstr "Rispondi"
-#: lib/noticelist.php:673
+#: lib/noticelist.php:677
msgid "Notice repeated"
msgstr "Messaggio ripetuto"
@@ -6201,7 +6226,7 @@ msgstr "Etichette nei messaggi di %s"
msgid "Unknown"
msgstr "Sconosciuto"
-#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr "Abbonamenti"
@@ -6209,7 +6234,7 @@ msgstr "Abbonamenti"
msgid "All subscriptions"
msgstr "Tutti gli abbonamenti"
-#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90
+#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr "Abbonati"
@@ -6217,15 +6242,20 @@ msgstr "Abbonati"
msgid "All subscribers"
msgstr "Tutti gli abbonati"
-#: lib/profileaction.php:180
+#: lib/profileaction.php:186
msgid "User ID"
msgstr "ID utente"
-#: lib/profileaction.php:185
+#: lib/profileaction.php:191
msgid "Member since"
msgstr "Membro dal"
-#: lib/profileaction.php:247
+#. TRANS: Average count of posts made per day since account registration
+#: lib/profileaction.php:230
+msgid "Daily average"
+msgstr "Media giornaliera"
+
+#: lib/profileaction.php:259
msgid "All groups"
msgstr "Tutti i gruppi"
@@ -6270,7 +6300,7 @@ msgstr "Ripeti questo messaggio"
msgid "Revoke the \"%s\" role from this user"
msgstr "Revoca il ruolo \"%s\" a questo utente"
-#: lib/router.php:671
+#: lib/router.php:704
msgid "No single user defined for single-user mode."
msgstr "Nessun utente singolo definito per la modalità single-user."
@@ -6396,89 +6426,98 @@ msgstr "Annulla l'abbonamento da questo utente"
msgid "Unsubscribe"
msgstr "Disabbonati"
-#: lib/userprofile.php:116
+#: lib/usernoprofileexception.php:58
+#, php-format
+msgid "User %s (%d) has no profile record."
+msgstr "L'utente %s (%d) non ha un profilo."
+
+#: lib/userprofile.php:117
msgid "Edit Avatar"
msgstr "Modifica immagine"
-#: lib/userprofile.php:236
+#: lib/userprofile.php:234 lib/userprofile.php:248
msgid "User actions"
msgstr "Azioni utente"
-#: lib/userprofile.php:251
+#: lib/userprofile.php:237
+msgid "User deletion in progress..."
+msgstr "Eliminazione utente..."
+
+#: lib/userprofile.php:263
msgid "Edit profile settings"
msgstr "Modifica impostazioni del profilo"
-#: lib/userprofile.php:252
+#: lib/userprofile.php:264
msgid "Edit"
msgstr "Modifica"
-#: lib/userprofile.php:275
+#: lib/userprofile.php:287
msgid "Send a direct message to this user"
msgstr "Invia un messaggio diretto a questo utente"
-#: lib/userprofile.php:276
+#: lib/userprofile.php:288
msgid "Message"
msgstr "Messaggio"
-#: lib/userprofile.php:314
+#: lib/userprofile.php:326
msgid "Moderate"
msgstr "Modera"
-#: lib/userprofile.php:352
+#: lib/userprofile.php:364
msgid "User role"
msgstr "Ruolo dell'utente"
-#: lib/userprofile.php:354
+#: lib/userprofile.php:366
msgctxt "role"
msgid "Administrator"
msgstr "Amministratore"
-#: lib/userprofile.php:355
+#: lib/userprofile.php:367
msgctxt "role"
msgid "Moderator"
msgstr "Moderatore"
-#: lib/util.php:1015
+#: lib/util.php:1046
msgid "a few seconds ago"
msgstr "pochi secondi fa"
-#: lib/util.php:1017
+#: lib/util.php:1048
msgid "about a minute ago"
msgstr "circa un minuto fa"
-#: lib/util.php:1019
+#: lib/util.php:1050
#, php-format
msgid "about %d minutes ago"
msgstr "circa %d minuti fa"
-#: lib/util.php:1021
+#: lib/util.php:1052
msgid "about an hour ago"
msgstr "circa un'ora fa"
-#: lib/util.php:1023
+#: lib/util.php:1054
#, php-format
msgid "about %d hours ago"
msgstr "circa %d ore fa"
-#: lib/util.php:1025
+#: lib/util.php:1056
msgid "about a day ago"
msgstr "circa un giorno fa"
-#: lib/util.php:1027
+#: lib/util.php:1058
#, php-format
msgid "about %d days ago"
msgstr "circa %d giorni fa"
-#: lib/util.php:1029
+#: lib/util.php:1060
msgid "about a month ago"
msgstr "circa un mese fa"
-#: lib/util.php:1031
+#: lib/util.php:1062
#, php-format
msgid "about %d months ago"
msgstr "circa %d mesi fa"
-#: lib/util.php:1033
+#: lib/util.php:1064
msgid "about a year ago"
msgstr "circa un anno fa"
@@ -6492,7 +6531,7 @@ msgstr "%s non è un colore valido."
msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr "%s non è un colore valido. Usa 3 o 6 caratteri esadecimali."
-#: lib/xmppmanager.php:402
+#: lib/xmppmanager.php:403
#, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d."
msgstr "Messaggio troppo lungo: massimo %1$d caratteri, inviati %2$d."
diff --git a/locale/ja/LC_MESSAGES/statusnet.po b/locale/ja/LC_MESSAGES/statusnet.po
index 847f24c59..f358370ba 100644
--- a/locale/ja/LC_MESSAGES/statusnet.po
+++ b/locale/ja/LC_MESSAGES/statusnet.po
@@ -11,12 +11,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-06 23:49+0000\n"
-"PO-Revision-Date: 2010-03-06 23:50:18+0000\n"
+"POT-Creation-Date: 2010-04-05 18:54+0000\n"
+"PO-Revision-Date: 2010-04-05 18:55:39+0000\n"
"Language-Team: Japanese\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64621); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ja\n"
"X-Message-Group: out-statusnet\n"
@@ -95,9 +95,9 @@ msgstr "そのようなページはありません。"
#: 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:90
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78
+#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
@@ -106,10 +106,8 @@ msgstr "そのようなページはありません。"
#: actions/remotesubscribe.php:154 actions/replies.php:73
#: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:163 lib/command.php:302
-#: lib/command.php:355 lib/command.php:401 lib/command.php:462
-#: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82
-#: lib/profileaction.php:77
+#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: lib/mailbox.php:82 lib/profileaction.php:77
msgid "No such user."
msgstr "そのようなユーザはいません。"
@@ -202,18 +200,18 @@ msgstr "%2$s に %1$s と友人からの更新があります!"
#: 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:132
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:136
#: actions/apigrouplistall.php:120 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:135
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
-#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184
-#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148
+#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:174
+#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173
+#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
-#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
+#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
msgid "API method not found."
msgstr "API メソッドが見つかりません。"
@@ -226,8 +224,8 @@ msgstr "API メソッドが見つかりません。"
#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65
-#: actions/apistatusesupdate.php:118
+#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
msgid "This method requires a POST."
msgstr "このメソッドには POST が必要です。"
@@ -258,7 +256,7 @@ msgid "Could not save profile."
msgstr "プロフィールを保存できませんでした。"
#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:97
+#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
#: actions/designadminpanel.php:122 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
@@ -344,7 +342,7 @@ msgstr "そのIDのステータスが見つかりません。"
msgid "This status is already a favorite."
msgstr "このステータスはすでにお気に入りです。"
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
msgid "Could not create favorite."
msgstr "お気に入りを作成できません。"
@@ -464,7 +462,7 @@ msgstr "グループが見つかりません!"
msgid "You are already a member of that group."
msgstr "すでにこのグループのメンバーです。"
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:221
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
msgid "You have been blocked from that group by the admin."
msgstr "管理者によってこのグループからブロックされています。"
@@ -482,11 +480,18 @@ msgstr "このグループのメンバーではありません。"
msgid "Could not remove user %1$s from group %2$s."
msgstr "ユーザ %1$s をグループ %2$s から削除できません。"
-#: actions/apigrouplist.php:95
+#. TRANS: %s is a user name
+#: actions/apigrouplist.php:97
#, 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
+#, fuzzy, php-format
+msgid "%1$s groups %2$s is a member of."
+msgstr "グループ %s はメンバー"
+
#: actions/apigrouplistall.php:90 actions/usergroups.php:62
#, php-format
msgid "%s groups"
@@ -514,7 +519,7 @@ msgstr "不正なトークン。"
#: 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:337
+#: actions/profilesettings.php:194 actions/recoverpassword.php:350
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
@@ -574,15 +579,15 @@ msgid ""
"give access to your %4$s account to third parties you trust."
msgstr ""
-#: actions/apioauthauthorize.php:310 lib/action.php:438
+#: actions/apioauthauthorize.php:310 lib/action.php:437
msgid "Account"
msgstr "アカウント"
#: actions/apioauthauthorize.php:313 actions/login.php:230
#: actions/profilesettings.php:106 actions/register.php:424
-#: actions/showgroup.php:244 actions/tagother.php:94
+#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
-#: lib/userprofile.php:131
+#: lib/userprofile.php:132
msgid "Nickname"
msgstr "ニックネーム"
@@ -651,12 +656,12 @@ msgstr "つぶやきは URL を含めて最大 %d 字までです。"
msgid "Unsupported format."
msgstr "サポート外の形式です。"
-#: actions/apitimelinefavorites.php:108
+#: actions/apitimelinefavorites.php:109
#, php-format
msgid "%1$s / Favorites from %2$s"
msgstr "%1$s / %2$s からのお気に入り"
-#: actions/apitimelinefavorites.php:117
+#: actions/apitimelinefavorites.php:118
#, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "%1$s は %2$s でお気に入りを更新しました / %2$s。"
@@ -666,7 +671,7 @@ msgstr "%1$s は %2$s でお気に入りを更新しました / %2$s。"
msgid "%1$s / Updates mentioning %2$s"
msgstr "%1$s / %2$s について更新"
-#: actions/apitimelinementions.php:127
+#: actions/apitimelinementions.php:130
#, php-format
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "%2$s からアップデートに答える %1$s アップデート"
@@ -676,7 +681,7 @@ msgstr "%2$s からアップデートに答える %1$s アップデート"
msgid "%s public timeline"
msgstr "%s のパブリックタイムライン"
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "皆からの %s アップデート!"
@@ -691,12 +696,12 @@ msgstr "%s への返信"
msgid "Repeats of %s"
msgstr "%s の返信"
-#: actions/apitimelinetag.php:102 actions/tag.php:67
+#: actions/apitimelinetag.php:104 actions/tag.php:67
#, php-format
msgid "Notices tagged with %s"
msgstr "%s とタグ付けされたつぶやき"
-#: actions/apitimelinetag.php:104 actions/tagrss.php:65
+#: actions/apitimelinetag.php:106 actions/tagrss.php:65
#, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "%2$s に %1$s による更新があります!"
@@ -724,7 +729,7 @@ msgstr "サイズがありません。"
msgid "Invalid size."
msgstr "不正なサイズ。"
-#: actions/avatarsettings.php:67 actions/showgroup.php:229
+#: actions/avatarsettings.php:67 actions/showgroup.php:230
#: lib/accountsettingsaction.php:112
msgid "Avatar"
msgstr "アバター"
@@ -756,7 +761,7 @@ msgid "Preview"
msgstr "プレビュー"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:655
+#: lib/deleteuserform.php:66 lib/noticelist.php:659
msgid "Delete"
msgstr "削除"
@@ -768,23 +773,28 @@ msgstr "アップロード"
msgid "Crop"
msgstr "切り取り"
-#: actions/avatarsettings.php:328
+#: actions/avatarsettings.php:305
+#, fuzzy
+msgid "No file uploaded."
+msgstr "プロファイル記述がありません。"
+
+#: actions/avatarsettings.php:332
msgid "Pick a square area of the image to be your avatar"
msgstr "あなたのアバターとなるイメージを正方形で指定"
-#: actions/avatarsettings.php:343 actions/grouplogo.php:380
+#: actions/avatarsettings.php:347 actions/grouplogo.php:380
msgid "Lost our file data."
msgstr "ファイルデータを紛失しました。"
-#: actions/avatarsettings.php:366
+#: actions/avatarsettings.php:370
msgid "Avatar updated."
msgstr "アバターが更新されました。"
-#: actions/avatarsettings.php:369
+#: actions/avatarsettings.php:373
msgid "Failed updating avatar."
msgstr "アバターの更新に失敗しました。"
-#: actions/avatarsettings.php:393
+#: actions/avatarsettings.php:397
msgid "Avatar deleted."
msgstr "アバターが削除されました。"
@@ -840,8 +850,8 @@ msgstr "ブロック情報の保存に失敗しました。"
#: actions/groupunblock.php:86 actions/joingroup.php:82
#: actions/joingroup.php:93 actions/leavegroup.php:82
#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212
-#: lib/command.php:260
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162
+#: lib/command.php:358
msgid "No such group."
msgstr "そのようなグループはありません。"
@@ -923,7 +933,7 @@ msgid "Conversation"
msgstr "会話"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:218 lib/searchgroupnav.php:82
+#: lib/profileaction.php:224 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "つぶやき"
@@ -942,7 +952,7 @@ msgstr "このアプリケーションのオーナーではありません。"
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1217
+#: lib/action.php:1219
msgid "There was a problem with your session token."
msgstr "あなたのセッショントークンに関する問題がありました。"
@@ -1003,7 +1013,7 @@ msgstr "本当にこのつぶやきを削除しますか?"
msgid "Do not delete this notice"
msgstr "このつぶやきを削除できません。"
-#: actions/deletenotice.php:146 lib/noticelist.php:655
+#: actions/deletenotice.php:146 lib/noticelist.php:659
msgid "Delete this notice"
msgstr "このつぶやきを削除"
@@ -1140,7 +1150,7 @@ msgstr "デフォルトへリセットする"
#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:208
+#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
#: actions/tagother.php:154 actions/useradminpanel.php:294
#: lib/applicationeditform.php:333 lib/applicationeditform.php:334
#: lib/designsettings.php:256 lib/groupeditform.php:202
@@ -1256,7 +1266,7 @@ msgstr "記述が長すぎます。(最長 %d 字)"
msgid "Could not update group."
msgstr "グループを更新できません。"
-#: actions/editgroup.php:264 classes/User_group.php:493
+#: actions/editgroup.php:264 classes/User_group.php:496
msgid "Could not create aliases."
msgstr "別名を作成できません。"
@@ -1751,7 +1761,7 @@ msgstr "%s のタイムライン"
msgid "Updates from members of %1$s on %2$s!"
msgstr "%2$s 上の %1$s のメンバーから更新する"
-#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232
+#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244
#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr "グループ"
@@ -1963,7 +1973,7 @@ msgstr "新しいユーザを招待"
msgid "You are already subscribed to these users:"
msgstr "すでにこれらのユーザをフォローしています:"
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
#, php-format
msgid "%1$s (%2$s)"
msgstr ""
@@ -2096,7 +2106,7 @@ msgstr "%1$s はグループ %2$s に参加しました"
msgid "You must be logged in to leave a group."
msgstr "グループから離れるにはログインしていなければなりません。"
-#: actions/leavegroup.php:100 lib/command.php:265
+#: actions/leavegroup.php:100 lib/command.php:363
msgid "You are not a member of that group."
msgstr "あなたはそのグループのメンバーではありません。"
@@ -2209,12 +2219,12 @@ msgstr "このフォームを使って新しいグループを作成します。
msgid "New message"
msgstr "新しいメッセージ"
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
msgid "You can't send a message to this user."
msgstr "このユーザにメッセージを送ることはできません。"
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342
-#: lib/command.php:475
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
+#: lib/command.php:529
msgid "No content!"
msgstr "コンテンツがありません!"
@@ -2222,7 +2232,7 @@ msgstr "コンテンツがありません!"
msgid "No recipient specified."
msgstr "受取人が書かれていません。"
-#: actions/newmessage.php:164 lib/command.php:361
+#: actions/newmessage.php:164 lib/command.php:462
msgid ""
"Don't send a message to yourself; just say it to yourself quietly instead."
msgstr ""
@@ -2237,7 +2247,7 @@ msgstr "メッセージを送りました"
msgid "Direct message to %s sent."
msgstr "ダイレクトメッセージを %s に送りました"
-#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189
msgid "Ajax Error"
msgstr "Ajax エラー"
@@ -2245,7 +2255,7 @@ msgstr "Ajax エラー"
msgid "New notice"
msgstr "新しいつぶやき"
-#: actions/newnotice.php:211
+#: actions/newnotice.php:217
msgid "Notice posted"
msgstr "つぶやきを投稿しました"
@@ -2357,7 +2367,7 @@ msgstr "開発者は彼らのアプリケーションのために登録設定を
msgid "Notice has no profile"
msgstr "つぶやきにはプロファイルはありません。"
-#: actions/oembed.php:86 actions/shownotice.php:180
+#: actions/oembed.php:86 actions/shownotice.php:175
#, php-format
msgid "%1$s's status on %2$s"
msgstr "%2$s における %1$ のステータス"
@@ -2370,8 +2380,8 @@ msgstr "内容種別 "
msgid "Only "
msgstr "だけ "
-#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042
-#: lib/apiaction.php:1070 lib/apiaction.php:1179
+#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1068
+#: lib/apiaction.php:1096 lib/apiaction.php:1212
msgid "Not a supported data format."
msgstr "サポートされていないデータ形式。"
@@ -2504,7 +2514,7 @@ msgstr "古いパスワードが間違っています。"
msgid "Error saving user; invalid."
msgstr "ユーザ保存エラー; 不正なユーザ"
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
msgid "Can't save new password."
msgstr "新しいパスワードを保存できません。"
@@ -2718,8 +2728,8 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr "1-64文字の、小文字アルファベットか数字で、スペースや句読点は除く"
#: actions/profilesettings.php:111 actions/register.php:448
-#: actions/showgroup.php:255 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:149
+#: actions/showgroup.php:256 actions/tagother.php:104
+#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "フルネーム"
@@ -2746,9 +2756,9 @@ msgid "Bio"
msgstr "自己紹介"
#: actions/profilesettings.php:132 actions/register.php:471
-#: actions/showgroup.php:264 actions/tagother.php:112
+#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
-#: lib/userprofile.php:164
+#: lib/userprofile.php:165
msgid "Location"
msgstr "場所"
@@ -2762,7 +2772,7 @@ msgstr "つぶやきを投稿するときには私の現在の場所を共有し
#: actions/profilesettings.php:145 actions/tagother.php:149
#: actions/tagother.php:209 lib/subscriptionlist.php:106
-#: lib/subscriptionlist.php:108 lib/userprofile.php:209
+#: lib/subscriptionlist.php:108 lib/userprofile.php:210
msgid "Tags"
msgstr "タグ"
@@ -3005,7 +3015,7 @@ msgstr "パスワードをリセット"
msgid "Recover password"
msgstr "パスワードを回復"
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
msgid "Password recovery requested"
msgstr "パスワード回復がリクエストされました"
@@ -3025,41 +3035,41 @@ msgstr "リセット"
msgid "Enter a nickname or email address."
msgstr "ニックネームかメールアドレスを入力してください。"
-#: actions/recoverpassword.php:272
+#: actions/recoverpassword.php:282
msgid "No user with that email address or username."
msgstr "そのメールアドレスかユーザ名をもっているユーザがありません。"
-#: actions/recoverpassword.php:287
+#: actions/recoverpassword.php:299
msgid "No registered email address for that user."
msgstr "そのユーザにはメールアドレスの登録がありません。"
-#: actions/recoverpassword.php:301
+#: actions/recoverpassword.php:313
msgid "Error saving address confirmation."
msgstr "アドレス確認保存エラー"
-#: actions/recoverpassword.php:325
+#: actions/recoverpassword.php:338
msgid ""
"Instructions for recovering your password have been sent to the email "
"address registered to your account."
msgstr "登録されたメールアドレスにパスワードの回復方法をお送りしました。"
-#: actions/recoverpassword.php:344
+#: actions/recoverpassword.php:357
msgid "Unexpected password reset."
msgstr "予期せぬパスワードのリセットです。"
-#: actions/recoverpassword.php:352
+#: actions/recoverpassword.php:365
msgid "Password must be 6 chars or more."
msgstr "パスワードは6字以上でなければいけません。"
-#: actions/recoverpassword.php:356
+#: actions/recoverpassword.php:369
msgid "Password and confirmation do not match."
msgstr "パスワードと確認が一致しません。"
-#: actions/recoverpassword.php:375 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:248
msgid "Error setting user."
msgstr "ユーザ設定エラー"
-#: actions/recoverpassword.php:382
+#: actions/recoverpassword.php:395
msgid "New password successfully saved. You are now logged in."
msgstr "新しいパスワードの保存に成功しました。ログインしています。"
@@ -3221,7 +3231,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "プロファイルサービスまたはマイクロブロギングサービスのURL"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:394
+#: lib/userprofile.php:406
msgid "Subscribe"
msgstr "フォロー"
@@ -3260,7 +3270,7 @@ msgstr "自分のつぶやきは繰り返せません。"
msgid "You already repeated that notice."
msgstr "すでにそのつぶやきを繰り返しています。"
-#: actions/repeat.php:114 lib/noticelist.php:674
+#: actions/repeat.php:114 lib/noticelist.php:678
msgid "Repeated"
msgstr "繰り返された"
@@ -3405,8 +3415,8 @@ msgstr "組織"
msgid "Description"
msgstr "概要"
-#: actions/showapplication.php:192 actions/showgroup.php:438
-#: lib/profileaction.php:176
+#: actions/showapplication.php:192 actions/showgroup.php:439
+#: lib/profileaction.php:182
msgid "Statistics"
msgstr "統計データ"
@@ -3527,67 +3537,67 @@ msgstr "%s グループ"
msgid "%1$s group, page %2$d"
msgstr "%1$s グループ、ページ %2$d"
-#: actions/showgroup.php:226
+#: actions/showgroup.php:227
msgid "Group profile"
msgstr "グループプロファイル"
-#: actions/showgroup.php:271 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:177
+#: actions/showgroup.php:272 actions/tagother.php:118
+#: actions/userauthorization.php:175 lib/userprofile.php:178
msgid "URL"
msgstr "URL"
-#: actions/showgroup.php:282 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:194
+#: actions/showgroup.php:283 actions/tagother.php:128
+#: actions/userauthorization.php:187 lib/userprofile.php:195
msgid "Note"
msgstr "ノート"
-#: actions/showgroup.php:292 lib/groupeditform.php:184
+#: actions/showgroup.php:293 lib/groupeditform.php:184
msgid "Aliases"
msgstr "別名"
-#: actions/showgroup.php:301
+#: actions/showgroup.php:302
msgid "Group actions"
msgstr "グループアクション"
-#: actions/showgroup.php:337
+#: actions/showgroup.php:338
#, php-format
msgid "Notice feed for %s group (RSS 1.0)"
msgstr "%s グループのつぶやきフィード (RSS 1.0)"
-#: actions/showgroup.php:343
+#: actions/showgroup.php:344
#, php-format
msgid "Notice feed for %s group (RSS 2.0)"
msgstr "%s グループのつぶやきフィード (RSS 2.0)"
-#: actions/showgroup.php:349
+#: actions/showgroup.php:350
#, php-format
msgid "Notice feed for %s group (Atom)"
msgstr "%s グループのつぶやきフィード (Atom)"
-#: actions/showgroup.php:354
+#: actions/showgroup.php:355
#, php-format
msgid "FOAF for %s group"
msgstr "%s グループの FOAF"
-#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91
+#: actions/showgroup.php:391 actions/showgroup.php:448 lib/groupnav.php:91
msgid "Members"
msgstr "メンバー"
-#: actions/showgroup.php:395 lib/profileaction.php:117
-#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95
-#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71
+#: actions/showgroup.php:396 lib/profileaction.php:117
+#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95
+#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
msgid "(None)"
msgstr "(なし)"
-#: actions/showgroup.php:401
+#: actions/showgroup.php:402
msgid "All members"
msgstr "全てのメンバー"
-#: actions/showgroup.php:441
+#: actions/showgroup.php:442
msgid "Created"
msgstr "作成日"
-#: actions/showgroup.php:457
+#: actions/showgroup.php:458
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3602,7 +3612,7 @@ msgstr ""
"する短いメッセージを共有します。[今すぐ参加](%%%%action.register%%%%) してこ"
"のグループの一員になりましょう! ([もっと読む](%%%%doc.help%%%%))"
-#: actions/showgroup.php:463
+#: actions/showgroup.php:464
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3615,7 +3625,7 @@ msgstr ""
"wikipedia.org/wiki/Micro-blogging) サービス。メンバーは彼らの暮らしと興味に関"
"する短いメッセージを共有します。"
-#: actions/showgroup.php:491
+#: actions/showgroup.php:492
msgid "Admins"
msgstr "管理者"
@@ -3755,7 +3765,8 @@ msgid "Unknown language \"%s\"."
msgstr "不明な言語 \"%s\""
#: actions/siteadminpanel.php:165
-msgid "Minimum text limit is 140 characters."
+#, fuzzy
+msgid "Minimum text limit is 0 (unlimited)."
msgstr "最小のテキスト制限は140字です。"
#: actions/siteadminpanel.php:171
@@ -4037,8 +4048,7 @@ msgstr "サイト設定の保存"
msgid "You are not subscribed to that profile."
msgstr "あなたはそのプロファイルにフォローされていません。"
-#: actions/subedit.php:83 classes/Subscription.php:89
-#: classes/Subscription.php:116
+#: actions/subedit.php:83 classes/Subscription.php:132
msgid "Could not save subscription."
msgstr "フォローを保存できません。"
@@ -4141,11 +4151,11 @@ msgstr ""
msgid "%s is not listening to anyone."
msgstr "%s はだれも言うことを聞いていません。"
-#: actions/subscriptions.php:199
+#: actions/subscriptions.php:208
msgid "Jabber"
msgstr "Jabber"
-#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:222 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr "SMS"
@@ -4178,12 +4188,12 @@ msgstr "ID引数がありません。"
msgid "Tag %s"
msgstr "タグ %s"
-#: actions/tagother.php:77 lib/userprofile.php:75
+#: actions/tagother.php:77 lib/userprofile.php:76
msgid "User profile"
msgstr "ユーザプロファイル"
#: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:102
+#: lib/userprofile.php:103
msgid "Photo"
msgstr "写真"
@@ -4506,7 +4516,7 @@ msgstr ""
msgid "Plugins"
msgstr "プラグイン"
-#: actions/version.php:196 lib/action.php:767
+#: actions/version.php:196 lib/action.php:766
msgid "Version"
msgstr "バージョン"
@@ -4514,7 +4524,7 @@ msgstr "バージョン"
msgid "Author(s)"
msgstr "作者"
-#: classes/File.php:144
+#: classes/File.php:169
#, php-format
msgid ""
"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
@@ -4524,13 +4534,13 @@ msgstr ""
"ファイルは %d バイトでした。より小さいバージョンをアップロードするようにして"
"ください。"
-#: classes/File.php:154
+#: classes/File.php:179
#, php-format
msgid "A file this large would exceed your user quota of %d bytes."
msgstr ""
"これほど大きいファイルはあなたの%dバイトのユーザ割当てを超えているでしょう。"
-#: classes/File.php:161
+#: classes/File.php:186
#, php-format
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
@@ -4570,26 +4580,26 @@ msgstr "メッセージを追加できません。"
msgid "Could not update message with new URI."
msgstr "新しいURIでメッセージをアップデートできませんでした。"
-#: classes/Notice.php:172
+#: classes/Notice.php:175
#, php-format
msgid "DB error inserting hashtag: %s"
msgstr "ハッシュタグ追加 DB エラー: %s"
-#: classes/Notice.php:241
+#: classes/Notice.php:244
msgid "Problem saving notice. Too long."
msgstr "つぶやきを保存する際に問題が発生しました。長すぎです。"
-#: classes/Notice.php:245
+#: classes/Notice.php:248
msgid "Problem saving notice. Unknown user."
msgstr "つぶやきを保存する際に問題が発生しました。不明なユーザです。"
-#: classes/Notice.php:250
+#: classes/Notice.php:253
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
"多すぎるつぶやきが速すぎます; 数分間の休みを取ってから再投稿してください。"
-#: classes/Notice.php:256
+#: classes/Notice.php:259
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
@@ -4597,71 +4607,71 @@ msgstr ""
"多すぎる重複メッセージが速すぎます; 数分間休みを取ってから再度投稿してくださ"
"い。"
-#: classes/Notice.php:262
+#: classes/Notice.php:265
msgid "You are banned from posting notices on this site."
msgstr "あなたはこのサイトでつぶやきを投稿するのが禁止されています。"
-#: classes/Notice.php:328 classes/Notice.php:354
+#: classes/Notice.php:331 classes/Notice.php:357
msgid "Problem saving notice."
msgstr "つぶやきを保存する際に問題が発生しました。"
-#: classes/Notice.php:927
+#: classes/Notice.php:943
msgid "Problem saving group inbox."
msgstr "グループ受信箱を保存する際に問題が発生しました。"
-#: classes/Notice.php:1459
+#: classes/Notice.php:1481
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
-#: classes/Subscription.php:66 lib/oauthstore.php:465
+#: classes/Subscription.php:74 lib/oauthstore.php:465
msgid "You have been banned from subscribing."
msgstr "あなたはフォローが禁止されました。"
-#: classes/Subscription.php:70
+#: classes/Subscription.php:78
msgid "Already subscribed!"
msgstr "すでにフォローしています!"
-#: classes/Subscription.php:74
+#: classes/Subscription.php:82
msgid "User has blocked you."
msgstr "ユーザはあなたをブロックしました。"
-#: classes/Subscription.php:157
+#: classes/Subscription.php:167
msgid "Not subscribed!"
msgstr "フォローしていません!"
-#: classes/Subscription.php:163
+#: classes/Subscription.php:173
msgid "Couldn't delete self-subscription."
msgstr "自己フォローを削除できません。"
-#: classes/Subscription.php:190
+#: classes/Subscription.php:200
#, fuzzy
msgid "Couldn't delete subscription OMB token."
msgstr "フォローを削除できません"
-#: classes/Subscription.php:201 lib/subs.php:69
+#: classes/Subscription.php:211
msgid "Couldn't delete subscription."
msgstr "フォローを削除できません"
-#: classes/User.php:373
+#: classes/User.php:363
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "ようこそ %1$s、@%2$s!"
-#: classes/User_group.php:477
+#: classes/User_group.php:480
msgid "Could not create group."
msgstr "グループを作成できません。"
-#: classes/User_group.php:486
+#: classes/User_group.php:489
#, fuzzy
msgid "Could not set group URI."
msgstr "グループメンバーシップをセットできません。"
-#: classes/User_group.php:507
+#: classes/User_group.php:510
msgid "Could not set group membership."
msgstr "グループメンバーシップをセットできません。"
-#: classes/User_group.php:521
+#: classes/User_group.php:524
#, fuzzy
msgid "Could not save local group info."
msgstr "フォローを保存できません。"
@@ -4703,127 +4713,127 @@ msgstr ""
msgid "Untitled page"
msgstr "名称未設定ページ"
-#: lib/action.php:424
+#: lib/action.php:423
msgid "Primary site navigation"
msgstr "プライマリサイトナビゲーション"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:430
+#: lib/action.php:429
#, fuzzy
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr "パーソナルプロファイルと友人のタイムライン"
-#: lib/action.php:433
+#: lib/action.php:432
#, fuzzy
msgctxt "MENU"
msgid "Personal"
msgstr "パーソナル"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:435
+#: lib/action.php:434
#, fuzzy
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "メールアドレス、アバター、パスワード、プロパティの変更"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:440
+#: lib/action.php:439
#, fuzzy
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "サービスへ接続"
-#: lib/action.php:443
+#: lib/action.php:442
msgid "Connect"
msgstr "接続"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:446
+#: lib/action.php:445
#, fuzzy
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "サイト設定の変更"
-#: lib/action.php:449
+#: lib/action.php:448
#, fuzzy
msgctxt "MENU"
msgid "Admin"
msgstr "管理者"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:453
+#: lib/action.php:452
#, fuzzy, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "友人や同僚が %s で加わるよう誘ってください。"
-#: lib/action.php:456
+#: lib/action.php:455
#, fuzzy
msgctxt "MENU"
msgid "Invite"
msgstr "招待"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:462
+#: lib/action.php:461
#, fuzzy
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "サイトからログアウト"
-#: lib/action.php:465
+#: lib/action.php:464
#, fuzzy
msgctxt "MENU"
msgid "Logout"
msgstr "ログアウト"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:470
+#: lib/action.php:469
#, fuzzy
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "アカウントを作成"
-#: lib/action.php:473
+#: lib/action.php:472
#, fuzzy
msgctxt "MENU"
msgid "Register"
msgstr "登録"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:476
+#: lib/action.php:475
#, fuzzy
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "サイトへログイン"
-#: lib/action.php:479
+#: lib/action.php:478
#, fuzzy
msgctxt "MENU"
msgid "Login"
msgstr "ログイン"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:482
+#: lib/action.php:481
#, fuzzy
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "助けて!"
-#: lib/action.php:485
+#: lib/action.php:484
#, fuzzy
msgctxt "MENU"
msgid "Help"
msgstr "ヘルプ"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:488
+#: lib/action.php:487
#, fuzzy
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "人々かテキストを検索"
-#: lib/action.php:491
+#: lib/action.php:490
#, fuzzy
msgctxt "MENU"
msgid "Search"
@@ -4831,59 +4841,59 @@ msgstr "検索"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:513 lib/adminpanelaction.php:398
+#: lib/action.php:512 lib/adminpanelaction.php:398
msgid "Site notice"
msgstr "サイトつぶやき"
-#: lib/action.php:579
+#: lib/action.php:578
msgid "Local views"
msgstr "ローカルビュー"
-#: lib/action.php:645
+#: lib/action.php:644
msgid "Page notice"
msgstr "ページつぶやき"
-#: lib/action.php:747
+#: lib/action.php:746
msgid "Secondary site navigation"
msgstr "セカンダリサイトナビゲーション"
-#: lib/action.php:752
+#: lib/action.php:751
msgid "Help"
msgstr "ヘルプ"
-#: lib/action.php:754
+#: lib/action.php:753
msgid "About"
msgstr "About"
-#: lib/action.php:756
+#: lib/action.php:755
msgid "FAQ"
msgstr "よくある質問"
-#: lib/action.php:760
+#: lib/action.php:759
msgid "TOS"
msgstr ""
-#: lib/action.php:763
+#: lib/action.php:762
msgid "Privacy"
msgstr "プライバシー"
-#: lib/action.php:765
+#: lib/action.php:764
msgid "Source"
msgstr "ソース"
-#: lib/action.php:769
+#: lib/action.php:768
msgid "Contact"
msgstr "連絡先"
-#: lib/action.php:771
+#: lib/action.php:770
msgid "Badge"
msgstr "バッジ"
-#: lib/action.php:799
+#: lib/action.php:798
msgid "StatusNet software license"
msgstr "StatusNet ソフトウェアライセンス"
-#: lib/action.php:802
+#: lib/action.php:803
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4892,12 +4902,12 @@ msgstr ""
"**%%site.name%%** は [%%site.broughtby%%](%%site.broughtbyurl%%) が提供するマ"
"イクロブログサービスです。 "
-#: lib/action.php:804
+#: lib/action.php:805
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** はマイクロブログサービスです。 "
-#: lib/action.php:806
+#: lib/action.php:808
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4908,53 +4918,57 @@ msgstr ""
"いています。 ライセンス [GNU Affero General Public License](http://www.fsf."
"org/licensing/licenses/agpl-3.0.html)。"
-#: lib/action.php:821
+#: lib/action.php:823
msgid "Site content license"
msgstr "サイト内容ライセンス"
-#: lib/action.php:826
+#: lib/action.php:828
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
-#: lib/action.php:831
+#: lib/action.php:833
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
-#: lib/action.php:834
+#: lib/action.php:836
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
-#: lib/action.php:847
+#: lib/action.php:849
msgid "All "
msgstr "全て "
-#: lib/action.php:853
+#: lib/action.php:855
msgid "license."
msgstr "ライセンス。"
-#: lib/action.php:1152
+#: lib/action.php:1154
msgid "Pagination"
msgstr "ページ化"
-#: lib/action.php:1161
+#: lib/action.php:1163
msgid "After"
msgstr "<<後"
-#: lib/action.php:1169
+#: lib/action.php:1171
msgid "Before"
msgstr "前>>"
-#: lib/activity.php:453
+#: lib/activity.php:120
+msgid "Expecting a root feed element but got a whole XML document."
+msgstr ""
+
+#: lib/activityutils.php:208
msgid "Can't handle remote content yet."
msgstr ""
-#: lib/activity.php:481
+#: lib/activityutils.php:236
msgid "Can't handle embedded XML content yet."
msgstr ""
-#: lib/activity.php:485
+#: lib/activityutils.php:240
msgid "Can't handle embedded Base64 content yet."
msgstr ""
@@ -5050,7 +5064,7 @@ msgstr ""
"APIリソースは読み書きアクセスが必要です、しかしあなたは読みアクセスしか持って"
"いません。"
-#: lib/apiauth.php:272
+#: lib/apiauth.php:276
#, php-format
msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s"
msgstr ""
@@ -5126,11 +5140,11 @@ msgstr "取消し"
msgid "Attachments"
msgstr "添付"
-#: lib/attachmentlist.php:265
+#: lib/attachmentlist.php:263
msgid "Author"
msgstr "作者"
-#: lib/attachmentlist.php:278
+#: lib/attachmentlist.php:276
msgid "Provider"
msgstr "プロバイダ"
@@ -5150,37 +5164,50 @@ msgstr "パスワード変更に失敗しました"
msgid "Password changing is not allowed"
msgstr "パスワード変更は許可されていません"
-#: lib/channel.php:138 lib/channel.php:158
+#: lib/channel.php:157 lib/channel.php:177
msgid "Command results"
msgstr "コマンド結果"
-#: lib/channel.php:210 lib/mailhandler.php:142
+#: lib/channel.php:229 lib/mailhandler.php:142
msgid "Command complete"
msgstr "コマンド完了"
-#: lib/channel.php:221
+#: lib/channel.php:240
msgid "Command failed"
msgstr "コマンド失敗"
-#: lib/command.php:44
-msgid "Sorry, this command is not yet implemented."
-msgstr "すみません、このコマンドはまだ実装されていません。"
+#: lib/command.php:83 lib/command.php:105
+msgid "Notice with that id does not exist"
+msgstr "その ID によるつぶやきは存在していません"
-#: lib/command.php:88
+#: lib/command.php:99 lib/command.php:570
+msgid "User has no last notice"
+msgstr "ユーザはまだつぶやいていません"
+
+#: lib/command.php:125
#, php-format
msgid "Could not find a user with nickname %s"
msgstr "ユーザを更新できません"
-#: lib/command.php:92
+#: lib/command.php:143
+#, fuzzy, php-format
+msgid "Could not find a local user with nickname %s"
+msgstr "ユーザを更新できません"
+
+#: lib/command.php:176
+msgid "Sorry, this command is not yet implemented."
+msgstr "すみません、このコマンドはまだ実装されていません。"
+
+#: lib/command.php:221
msgid "It does not make a lot of sense to nudge yourself!"
msgstr "それは自分自身への合図で多くは意味がありません!"
-#: lib/command.php:99
+#: lib/command.php:228
#, php-format
msgid "Nudge sent to %s"
msgstr "%s へ合図を送りました"
-#: lib/command.php:126
+#: lib/command.php:254
#, php-format
msgid ""
"Subscriptions: %1$s\n"
@@ -5191,193 +5218,191 @@ msgstr ""
"フォローされている: %2$s\n"
"つぶやき: %3$s"
-#: lib/command.php:152 lib/command.php:390 lib/command.php:451
-msgid "Notice with that id does not exist"
-msgstr "その ID によるつぶやきは存在していません"
-
-#: lib/command.php:168 lib/command.php:406 lib/command.php:467
-#: lib/command.php:523
-msgid "User has no last notice"
-msgstr "ユーザはまだつぶやいていません"
-
-#: lib/command.php:190
+#: lib/command.php:296
msgid "Notice marked as fave."
msgstr "お気に入りにされているつぶやき。"
-#: lib/command.php:217
+#: lib/command.php:317
msgid "You are already a member of that group"
msgstr "あなたは既にそのグループに参加しています。"
-#: lib/command.php:231
+#: lib/command.php:331
#, php-format
msgid "Could not join user %s to group %s"
msgstr "ユーザ %s はグループ %s に参加できません"
-#: lib/command.php:236
+#: lib/command.php:336
#, php-format
msgid "%s joined group %s"
msgstr "%s はグループ %s に参加しました"
-#: lib/command.php:275
+#: lib/command.php:373
#, php-format
msgid "Could not remove user %s to group %s"
msgstr "ユーザ %s をグループ %s から削除することができません"
-#: lib/command.php:280
+#: lib/command.php:378
#, php-format
msgid "%s left group %s"
msgstr "%s はグループ %s に残りました。"
-#: lib/command.php:309
+#: lib/command.php:401
#, php-format
msgid "Fullname: %s"
msgstr "フルネーム: %s"
-#: lib/command.php:312 lib/mail.php:258
+#: lib/command.php:404 lib/mail.php:258
#, php-format
msgid "Location: %s"
msgstr "場所: %s"
-#: lib/command.php:315 lib/mail.php:260
+#: lib/command.php:407 lib/mail.php:260
#, php-format
msgid "Homepage: %s"
msgstr "ホームページ: %s"
-#: lib/command.php:318
+#: lib/command.php:410
#, php-format
msgid "About: %s"
msgstr "About: %s"
-#: lib/command.php:349
+#: lib/command.php:437
+#, php-format
+msgid ""
+"%s is a remote profile; you can only send direct messages to users on the "
+"same server."
+msgstr ""
+
+#: lib/command.php:450
#, php-format
msgid "Message too long - maximum is %d characters, you sent %d"
msgstr "メッセージが長すぎます - 最大 %d 字、あなたが送ったのは %d"
-#: lib/command.php:367
+#: lib/command.php:468
#, php-format
msgid "Direct message to %s sent"
msgstr "ダイレクトメッセージを %s に送りました"
-#: lib/command.php:369
+#: lib/command.php:470
msgid "Error sending direct message."
msgstr "ダイレクトメッセージ送信エラー。"
-#: lib/command.php:413
+#: lib/command.php:490
msgid "Cannot repeat your own notice"
msgstr "自分のつぶやきを繰り返すことはできません"
-#: lib/command.php:418
+#: lib/command.php:495
msgid "Already repeated that notice"
msgstr "すでにこのつぶやきは繰り返されています"
-#: lib/command.php:426
+#: lib/command.php:503
#, php-format
msgid "Notice from %s repeated"
msgstr "%s からつぶやきが繰り返されています"
-#: lib/command.php:428
+#: lib/command.php:505
msgid "Error repeating notice."
msgstr "つぶやき繰り返しエラー"
-#: lib/command.php:482
+#: lib/command.php:536
#, php-format
msgid "Notice too long - maximum is %d characters, you sent %d"
msgstr "つぶやきが長すぎます - 最大 %d 字、あなたが送ったのは %d"
-#: lib/command.php:491
+#: lib/command.php:545
#, php-format
msgid "Reply to %s sent"
msgstr "%s へ返信を送りました"
-#: lib/command.php:493
+#: lib/command.php:547
msgid "Error saving notice."
msgstr "つぶやき保存エラー。"
-#: lib/command.php:547
+#: lib/command.php:594
msgid "Specify the name of the user to subscribe to"
msgstr "フォローするユーザの名前を指定してください"
-#: lib/command.php:554 lib/command.php:589
+#: lib/command.php:602
#, fuzzy
-msgid "No such user"
-msgstr "そのようなユーザはいません。"
+msgid "Can't subscribe to OMB profiles by command."
+msgstr "あなたはそのプロファイルにフォローされていません。"
-#: lib/command.php:561
+#: lib/command.php:608
#, php-format
msgid "Subscribed to %s"
msgstr "%s をフォローしました"
-#: lib/command.php:582 lib/command.php:685
+#: lib/command.php:629 lib/command.php:728
msgid "Specify the name of the user to unsubscribe from"
msgstr "フォローをやめるユーザの名前を指定してください"
-#: lib/command.php:595
+#: lib/command.php:638
#, php-format
msgid "Unsubscribed from %s"
msgstr "%s のフォローをやめる"
-#: lib/command.php:613 lib/command.php:636
+#: lib/command.php:656 lib/command.php:679
msgid "Command not yet implemented."
msgstr "コマンドはまだ実装されていません。"
-#: lib/command.php:616
+#: lib/command.php:659
msgid "Notification off."
msgstr "通知オフ。"
-#: lib/command.php:618
+#: lib/command.php:661
msgid "Can't turn off notification."
msgstr "通知をオフできません。"
-#: lib/command.php:639
+#: lib/command.php:682
msgid "Notification on."
msgstr "通知オン。"
-#: lib/command.php:641
+#: lib/command.php:684
msgid "Can't turn on notification."
msgstr "通知をオンできません。"
-#: lib/command.php:654
+#: lib/command.php:697
msgid "Login command is disabled"
msgstr "ログインコマンドが無効になっています。"
-#: lib/command.php:665
+#: lib/command.php:708
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr "このリンクは、かつてだけ使用可能であり、2分間だけ良いです: %s"
-#: lib/command.php:692
+#: lib/command.php:735
#, fuzzy, php-format
msgid "Unsubscribed %s"
msgstr "%s のフォローをやめる"
-#: lib/command.php:709
+#: lib/command.php:752
msgid "You are not subscribed to anyone."
msgstr "あなたはだれにもフォローされていません。"
-#: lib/command.php:711
+#: lib/command.php:754
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "あなたはこの人にフォローされています:"
-#: lib/command.php:731
+#: lib/command.php:774
msgid "No one is subscribed to you."
msgstr "誰もフォローしていません。"
-#: lib/command.php:733
+#: lib/command.php:776
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "この人はあなたにフォローされている:"
-#: lib/command.php:753
+#: lib/command.php:796
msgid "You are not a member of any groups."
msgstr "あなたはどのグループのメンバーでもありません。"
-#: lib/command.php:755
+#: lib/command.php:798
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "あなたはこのグループのメンバーではありません:"
-#: lib/command.php:769
+#: lib/command.php:812
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5419,21 +5444,21 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:148
+#: lib/common.php:135
msgid "No configuration file found. "
msgstr "コンフィギュレーションファイルがありません。 "
-#: lib/common.php:149
+#: lib/common.php:136
msgid "I looked for configuration files in the following places: "
msgstr "私は以下の場所でコンフィギュレーションファイルを探しました: "
-#: lib/common.php:151
+#: lib/common.php:138
msgid "You may wish to run the installer to fix this."
msgstr ""
"あなたは、これを修理するためにインストーラを動かしたがっているかもしれませ"
"ん。"
-#: lib/common.php:152
+#: lib/common.php:139
msgid "Go to the installer."
msgstr "インストーラへ。"
@@ -5609,49 +5634,49 @@ msgstr "%s グループのつぶやきにあるタグ"
msgid "This page is not available in a media type you accept"
msgstr "このページはあなたが承認したメディアタイプでは利用できません。"
-#: lib/imagefile.php:75
+#: lib/imagefile.php:72
+msgid "Unsupported image file format."
+msgstr "サポート外の画像形式です。"
+
+#: lib/imagefile.php:88
#, php-format
msgid "That file is too big. The maximum file size is %s."
msgstr "ファイルが大きすぎます。最大ファイルサイズは %s 。"
-#: lib/imagefile.php:80
+#: lib/imagefile.php:93
msgid "Partial upload."
msgstr "不完全なアップロード。"
-#: lib/imagefile.php:88 lib/mediafile.php:170
+#: lib/imagefile.php:101 lib/mediafile.php:170
msgid "System error uploading file."
msgstr "ファイルのアップロードでシステムエラー"
-#: lib/imagefile.php:96
+#: lib/imagefile.php:109
msgid "Not an image or corrupt file."
msgstr "画像ではないかファイルが破損しています。"
-#: lib/imagefile.php:109
-msgid "Unsupported image file format."
-msgstr "サポート外の画像形式です。"
-
#: lib/imagefile.php:122
msgid "Lost our file."
msgstr "ファイルを紛失。"
-#: lib/imagefile.php:166 lib/imagefile.php:231
+#: lib/imagefile.php:163 lib/imagefile.php:224
msgid "Unknown file type"
msgstr "不明なファイルタイプ"
-#: lib/imagefile.php:251
+#: lib/imagefile.php:244
msgid "MB"
msgstr "MB"
-#: lib/imagefile.php:253
+#: lib/imagefile.php:246
msgid "kB"
msgstr "kB"
-#: lib/jabber.php:220
+#: lib/jabber.php:387
#, php-format
msgid "[%s]"
msgstr ""
-#: lib/jabber.php:400
+#: lib/jabber.php:567
#, php-format
msgid "Unknown inbox source %d."
msgstr "不明な受信箱のソース %d。"
@@ -5931,7 +5956,7 @@ msgstr ""
"に引き込むプライベートメッセージを送ることができます。人々はあなただけへの"
"メッセージを送ることができます。"
-#: lib/mailbox.php:227 lib/noticelist.php:482
+#: lib/mailbox.php:227 lib/noticelist.php:486
msgid "from"
msgstr "from"
@@ -6065,52 +6090,52 @@ msgstr ""
"すみません、あなたの位置を検索するのが予想より長くかかっています、後でもう一"
"度試みてください"
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr ""
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
#, fuzzy
msgid "N"
msgstr "北"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
#, fuzzy
msgid "S"
msgstr "南"
-#: lib/noticelist.php:431
+#: lib/noticelist.php:432
#, fuzzy
msgid "E"
msgstr "東"
-#: lib/noticelist.php:431
+#: lib/noticelist.php:432
#, fuzzy
msgid "W"
msgstr "西"
-#: lib/noticelist.php:438
+#: lib/noticelist.php:439
msgid "at"
msgstr "at"
-#: lib/noticelist.php:566
+#: lib/noticelist.php:570
msgid "in context"
msgstr ""
-#: lib/noticelist.php:601
+#: lib/noticelist.php:605
msgid "Repeated by"
msgstr ""
-#: lib/noticelist.php:628
+#: lib/noticelist.php:632
msgid "Reply to this notice"
msgstr "このつぶやきへ返信"
-#: lib/noticelist.php:629
+#: lib/noticelist.php:633
msgid "Reply"
msgstr "返信"
-#: lib/noticelist.php:673
+#: lib/noticelist.php:677
msgid "Notice repeated"
msgstr "つぶやきを繰り返しました"
@@ -6183,7 +6208,7 @@ msgstr "%s のつぶやきのタグ"
msgid "Unknown"
msgstr "不明"
-#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr "フォロー"
@@ -6191,7 +6216,7 @@ msgstr "フォロー"
msgid "All subscriptions"
msgstr "すべてのフォロー"
-#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90
+#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr "フォローされている"
@@ -6199,15 +6224,20 @@ msgstr "フォローされている"
msgid "All subscribers"
msgstr "すべてのフォローされている"
-#: lib/profileaction.php:180
+#: lib/profileaction.php:186
msgid "User ID"
msgstr "ユーザID"
-#: lib/profileaction.php:185
+#: lib/profileaction.php:191
msgid "Member since"
msgstr "利用開始日"
-#: lib/profileaction.php:247
+#. TRANS: Average count of posts made per day since account registration
+#: lib/profileaction.php:230
+msgid "Daily average"
+msgstr ""
+
+#: lib/profileaction.php:259
msgid "All groups"
msgstr "全てのグループ"
@@ -6252,7 +6282,7 @@ msgstr "このつぶやきを繰り返す"
msgid "Revoke the \"%s\" role from this user"
msgstr "このグループからこのユーザをブロック"
-#: lib/router.php:671
+#: lib/router.php:704
msgid "No single user defined for single-user mode."
msgstr "single-user モードのためのシングルユーザが定義されていません。"
@@ -6378,93 +6408,102 @@ msgstr "この利用者からのフォローを解除する"
msgid "Unsubscribe"
msgstr "フォロー解除"
-#: lib/userprofile.php:116
+#: lib/usernoprofileexception.php:58
+#, fuzzy, php-format
+msgid "User %s (%d) has no profile record."
+msgstr "ユーザはプロフィールをもっていません。"
+
+#: lib/userprofile.php:117
msgid "Edit Avatar"
msgstr "アバターを編集する"
-#: lib/userprofile.php:236
+#: lib/userprofile.php:234 lib/userprofile.php:248
msgid "User actions"
msgstr "利用者アクション"
-#: lib/userprofile.php:251
+#: lib/userprofile.php:237
+msgid "User deletion in progress..."
+msgstr ""
+
+#: lib/userprofile.php:263
msgid "Edit profile settings"
msgstr "プロファイル設定編集"
-#: lib/userprofile.php:252
+#: lib/userprofile.php:264
msgid "Edit"
msgstr "編集"
-#: lib/userprofile.php:275
+#: lib/userprofile.php:287
msgid "Send a direct message to this user"
msgstr "この利用者にダイレクトメッセージを送る"
-#: lib/userprofile.php:276
+#: lib/userprofile.php:288
msgid "Message"
msgstr "メッセージ"
-#: lib/userprofile.php:314
+#: lib/userprofile.php:326
#, fuzzy
msgid "Moderate"
msgstr "管理"
-#: lib/userprofile.php:352
+#: lib/userprofile.php:364
#, fuzzy
msgid "User role"
msgstr "ユーザプロファイル"
-#: lib/userprofile.php:354
+#: lib/userprofile.php:366
#, fuzzy
msgctxt "role"
msgid "Administrator"
msgstr "管理者"
-#: lib/userprofile.php:355
+#: lib/userprofile.php:367
#, fuzzy
msgctxt "role"
msgid "Moderator"
msgstr "管理"
-#: lib/util.php:1015
+#: lib/util.php:1046
msgid "a few seconds ago"
msgstr "数秒前"
-#: lib/util.php:1017
+#: lib/util.php:1048
msgid "about a minute ago"
msgstr "約 1 分前"
-#: lib/util.php:1019
+#: lib/util.php:1050
#, php-format
msgid "about %d minutes ago"
msgstr "約 %d 分前"
-#: lib/util.php:1021
+#: lib/util.php:1052
msgid "about an hour ago"
msgstr "約 1 時間前"
-#: lib/util.php:1023
+#: lib/util.php:1054
#, php-format
msgid "about %d hours ago"
msgstr "約 %d 時間前"
-#: lib/util.php:1025
+#: lib/util.php:1056
msgid "about a day ago"
msgstr "約 1 日前"
-#: lib/util.php:1027
+#: lib/util.php:1058
#, php-format
msgid "about %d days ago"
msgstr "約 %d 日前"
-#: lib/util.php:1029
+#: lib/util.php:1060
msgid "about a month ago"
msgstr "約 1 ヵ月前"
-#: lib/util.php:1031
+#: lib/util.php:1062
#, php-format
msgid "about %d months ago"
msgstr "約 %d ヵ月前"
-#: lib/util.php:1033
+#: lib/util.php:1064
msgid "about a year ago"
msgstr "約 1 年前"
@@ -6478,7 +6517,7 @@ msgstr "%sは有効な色ではありません!"
msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr "%s は有効な色ではありません! 3か6の16進数を使ってください。"
-#: lib/xmppmanager.php:402
+#: lib/xmppmanager.php:403
#, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d."
msgstr "メッセージが長すぎます - 最大 %1$d 字、あなたが送ったのは %2$d。"
diff --git a/locale/ko/LC_MESSAGES/statusnet.po b/locale/ko/LC_MESSAGES/statusnet.po
index 69bf4efb9..4d85372bf 100644
--- a/locale/ko/LC_MESSAGES/statusnet.po
+++ b/locale/ko/LC_MESSAGES/statusnet.po
@@ -1,5 +1,6 @@
# Translation of StatusNet to Korean
#
+# Author@translatewiki.net: Twkang
# --
# This file is distributed under the same license as the StatusNet package.
#
@@ -7,12 +8,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-06 23:49+0000\n"
-"PO-Revision-Date: 2010-03-06 23:50:22+0000\n"
+"POT-Creation-Date: 2010-04-05 18:54+0000\n"
+"PO-Revision-Date: 2010-04-05 18:55:43+0000\n"
"Language-Team: Korean\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64621); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ko\n"
"X-Message-Group: out-statusnet\n"
@@ -21,64 +22,56 @@ msgstr ""
#. TRANS: Page title
#. TRANS: Menu item for site administration
#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:374
-#, fuzzy
msgid "Access"
-msgstr "수락"
+msgstr "접근"
#. TRANS: Page notice
#: actions/accessadminpanel.php:67
-#, fuzzy
msgid "Site access settings"
-msgstr "아바타 설정"
+msgstr "사이트 접근 설정"
#. TRANS: Form legend for registration form.
#: actions/accessadminpanel.php:161
-#, fuzzy
msgid "Registration"
-msgstr "회원가입"
+msgstr "등록"
#. TRANS: Checkbox instructions for admin setting "Private"
#: actions/accessadminpanel.php:165
msgid "Prohibit anonymous users (not logged in) from viewing site?"
-msgstr ""
+msgstr "로그인하지 않은 익명 이용자의 사이트 보기 금지"
#. TRANS: Checkbox label for prohibiting anonymous users from viewing site.
#: actions/accessadminpanel.php:167
-#, fuzzy
msgctxt "LABEL"
msgid "Private"
-msgstr "개인정보 취급방침"
+msgstr "비공개"
#. TRANS: Checkbox instructions for admin setting "Invite only"
#: actions/accessadminpanel.php:174
msgid "Make registration invitation only."
-msgstr ""
+msgstr "초대받은 경우만 등록허용"
#. TRANS: Checkbox label for configuring site as invite only.
#: actions/accessadminpanel.php:176
-#, fuzzy
msgid "Invite only"
-msgstr "초대"
+msgstr "초대 전용"
#. TRANS: Checkbox instructions for admin setting "Closed" (no new registrations)
#: actions/accessadminpanel.php:183
msgid "Disable new registrations."
-msgstr ""
+msgstr "신규회원등록 기능차단"
#. TRANS: Checkbox label for disabling new user registrations.
#: actions/accessadminpanel.php:185
-#, fuzzy
msgid "Closed"
-msgstr "차단하기"
+msgstr "폐쇄"
#. TRANS: Title / tooltip for button to save access settings in site admin panel
#: actions/accessadminpanel.php:202
-#, fuzzy
msgid "Save access settings"
-msgstr "아바타 설정"
+msgstr "접근 설정을 저장"
#: actions/accessadminpanel.php:203
-#, fuzzy
msgctxt "BUTTON"
msgid "Save"
msgstr "저장"
@@ -86,9 +79,8 @@ msgstr "저장"
#. TRANS: Server error when page not found (404)
#: actions/all.php:64 actions/public.php:98 actions/replies.php:93
#: actions/showfavorites.php:138 actions/tag.php:52
-#, fuzzy
msgid "No such page"
-msgstr "그러한 태그가 없습니다."
+msgstr "해당하는 페이지 없음"
#: actions/all.php:75 actions/allrss.php:68
#: actions/apiaccountupdatedeliverydevice.php:113
@@ -98,9 +90,9 @@ msgstr "그러한 태그가 없습니다."
#: 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:90
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78
+#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
@@ -109,18 +101,16 @@ msgstr "그러한 태그가 없습니다."
#: actions/remotesubscribe.php:154 actions/replies.php:73
#: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:163 lib/command.php:302
-#: lib/command.php:355 lib/command.php:401 lib/command.php:462
-#: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82
-#: lib/profileaction.php:77
+#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: lib/mailbox.php:82 lib/profileaction.php:77
msgid "No such user."
-msgstr "그러한 사용자는 없습니다."
+msgstr "해당하는 이용자 없음"
#. TRANS: Page title. %1$s is user nickname, %2$d is page number
#: actions/all.php:86
-#, fuzzy, php-format
+#, php-format
msgid "%1$s and friends, page %2$d"
-msgstr "%s 와 친구들, %d 페이지"
+msgstr "%s 및 친구들, %d 페이지"
#. TRANS: Page title. %1$s is user nickname
#. TRANS: H1 text. %1$s is user nickname
@@ -133,28 +123,28 @@ msgstr "%s 및 친구들"
#. TRANS: %1$s is user nickname
#: actions/all.php:103
-#, fuzzy, php-format
+#, php-format
msgid "Feed for friends of %s (RSS 1.0)"
-msgstr "%s의 친구들을 위한 피드"
+msgstr "%s의 친구들에 대한 피드 (RSS 1.0)"
#. TRANS: %1$s is user nickname
#: actions/all.php:112
-#, fuzzy, php-format
+#, php-format
msgid "Feed for friends of %s (RSS 2.0)"
-msgstr "%s의 친구들을 위한 피드"
+msgstr "%s의 친구들에 대한 피드 (RSS 2.0)"
#. TRANS: %1$s is user nickname
#: actions/all.php:121
-#, fuzzy, php-format
+#, php-format
msgid "Feed for friends of %s (Atom)"
-msgstr "%s의 친구들을 위한 피드"
+msgstr "%s의 친구들에 대한 피드 (Atom)"
#. TRANS: %1$s is user nickname
#: actions/all.php:134
#, php-format
msgid ""
"This is the timeline for %s and friends but no one has posted anything yet."
-msgstr ""
+msgstr "%s 및 친구들의 타임라인이지만, 아직 아무도 글을 작성하지 않았습니다."
#: actions/all.php:139
#, php-format
@@ -162,6 +152,8 @@ msgid ""
"Try subscribing to more people, [join a group](%%action.groups%%) or post "
"something yourself."
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
@@ -180,15 +172,14 @@ msgstr ""
#. TRANS: H1 text
#: actions/all.php:178
-#, fuzzy
msgid "You and friends"
-msgstr "%s 및 친구들"
+msgstr "당신 및 친구들"
#: actions/allrss.php:119 actions/apitimelinefriends.php:119
#: actions/apitimelinehome.php:120
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
-msgstr "%1$s 및 %2$s에 있는 친구들의 업데이트!"
+msgstr "%2$s에 있는 %1$s 및 친구들의 업데이트!"
#: actions/apiaccountratelimitstatus.php:70
#: actions/apiaccountupdatedeliverydevice.php:93
@@ -200,21 +191,20 @@ msgstr "%1$s 및 %2$s에 있는 친구들의 업데이트!"
#: 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:132
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:136
#: actions/apigrouplistall.php:120 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:135
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
-#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184
-#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148
+#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:174
+#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173
+#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
-#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
-#, fuzzy
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
+#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
msgid "API method not found."
-msgstr "API 메서드를 찾을 수 없습니다."
+msgstr "API 메서드 발견 안 됨."
#: actions/apiaccountupdatedeliverydevice.php:85
#: actions/apiaccountupdateprofile.php:89
@@ -225,10 +215,10 @@ msgstr "API 메서드를 찾을 수 없습니다."
#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65
-#: actions/apistatusesupdate.php:118
+#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
msgid "This method requires a POST."
-msgstr "이 메서드는 등록을 요구합니다."
+msgstr "이 메서드는 POST를 요구합니다."
#: actions/apiaccountupdatedeliverydevice.php:105
msgid ""
@@ -237,9 +227,8 @@ msgid ""
msgstr ""
#: actions/apiaccountupdatedeliverydevice.php:132
-#, fuzzy
msgid "Could not update user."
-msgstr "사용자를 업데이트 할 수 없습니다."
+msgstr "이용자를 업데이트 할 수 없습니다."
#: actions/apiaccountupdateprofile.php:112
#: actions/apiaccountupdateprofilebackgroundimage.php:194
@@ -252,12 +241,11 @@ msgid "User has no profile."
msgstr "이용자가 프로필을 가지고 있지 않습니다."
#: actions/apiaccountupdateprofile.php:147
-#, fuzzy
msgid "Could not save profile."
msgstr "프로필을 저장 할 수 없습니다."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:97
+#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
#: actions/designadminpanel.php:122 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
@@ -267,6 +255,8 @@ msgid ""
"The server was unable to handle that much POST data (%s bytes) due to its "
"current configuration."
msgstr ""
+"현재 설정으로 인해 너무 많은 POST 데이터(%s 바이트)는 서버에서 처리할 수 없습"
+"니다."
#: actions/apiaccountupdateprofilebackgroundimage.php:136
#: actions/apiaccountupdateprofilebackgroundimage.php:146
@@ -275,33 +265,30 @@ msgstr ""
#: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
-#, fuzzy
msgid "Unable to save your design settings."
-msgstr "트위터 환경설정을 저장할 수 없습니다."
+msgstr "디자인 설정을 저장할 수 없습니다."
#: actions/apiaccountupdateprofilebackgroundimage.php:187
#: actions/apiaccountupdateprofilecolors.php:142
-#, fuzzy
msgid "Could not update your design."
-msgstr "사용자를 업데이트 할 수 없습니다."
+msgstr "디자인을 업데이트 할 수 없습니다."
#: actions/apiblockcreate.php:105
-#, fuzzy
msgid "You cannot block yourself!"
-msgstr "사용자를 업데이트 할 수 없습니다."
+msgstr "자기 자신은 차단할 수 없습니다."
#: actions/apiblockcreate.php:126
msgid "Block user failed."
-msgstr "사용자 차단에 실패했습니다."
+msgstr "이용자 차단에 실패했습니다."
#: actions/apiblockdestroy.php:114
msgid "Unblock user failed."
-msgstr "사용자 차단 해제에 실패했습니다."
+msgstr "이용자 차단 해제에 실패했습니다."
#: actions/apidirectmessage.php:89
-#, fuzzy, php-format
+#, php-format
msgid "Direct messages from %s"
-msgstr "%s에게 직접 메시지"
+msgstr "%s으로부터 직접 메시지"
#: actions/apidirectmessage.php:93
#, php-format
@@ -323,9 +310,9 @@ msgid "No message text!"
msgstr "메시지 내용이 없습니다!"
#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
-#, fuzzy, php-format
+#, php-format
msgid "That's too long. Max message size is %d chars."
-msgstr "메시지가 너무 길어요. 최대로 140자까지 입력하실 수 있습니다."
+msgstr "너무 깁니다. 최대 메시지 길이는 %d 자까지입니다."
#: actions/apidirectmessagenew.php:146
msgid "Recipient user not found."
@@ -341,55 +328,49 @@ msgid "No status found with that ID."
msgstr "그 ID로 발견된 상태가 없습니다."
#: actions/apifavoritecreate.php:119
-#, fuzzy
msgid "This status is already a favorite."
-msgstr "이 게시글은 이미 좋아하는 게시글입니다."
+msgstr "이 소식은 이미 관심소식으로 등록되어 있습니다."
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
msgid "Could not create favorite."
-msgstr "좋아하는 게시글을 생성할 수 없습니다."
+msgstr "관심소식을 생성할 수 없습니다."
#: actions/apifavoritedestroy.php:122
-#, fuzzy
msgid "That status is not a favorite."
-msgstr "이 메시지는 favorite이 아닙니다."
+msgstr "이 소식은 관심소식이 아닙니다."
#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
msgid "Could not delete favorite."
-msgstr "favorite을 삭제할 수 없습니다."
+msgstr "관심소식을 삭제할 수 없습니다."
#: actions/apifriendshipscreate.php:109
msgid "Could not follow user: User not found."
-msgstr "따라가실 수 없습니다 : 사용자가 없습니다."
+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
-#, fuzzy
msgid "Could not unfollow user: User not found."
-msgstr "따라가실 수 없습니다 : 사용자가 없습니다."
+msgstr "언팔로우할 수 없습니다: 이용자 없음."
#: actions/apifriendshipsdestroy.php:120
-#, fuzzy
msgid "You cannot unfollow yourself."
-msgstr "사용자를 업데이트 할 수 없습니다."
+msgstr "자기 자신을 언팔로우할 수 없습니다."
#: actions/apifriendshipsexists.php:94
msgid "Two user ids or screen_names must be supplied."
msgstr "두 개의 사용자 ID나 대화명을 입력해야 합니다."
#: actions/apifriendshipsshow.php:134
-#, fuzzy
msgid "Could not determine source user."
-msgstr "공개 stream을 불러올 수 없습니다."
+msgstr "소스 이용자를 확인할 수 없습니다."
#: actions/apifriendshipsshow.php:142
-#, fuzzy
msgid "Could not find target user."
-msgstr "어떠한 상태도 찾을 수 없습니다."
+msgstr "타겟 이용자를 찾을 수 없습니다."
#: actions/apigroupcreate.php:166 actions/editgroup.php:186
#: actions/newgroup.php:126 actions/profilesettings.php:215
@@ -426,9 +407,9 @@ msgstr "실명이 너무 깁니다. (최대 255글자)"
#: actions/apigroupcreate.php:215 actions/editapplication.php:190
#: actions/newapplication.php:172
-#, fuzzy, php-format
+#, php-format
msgid "Description is too long (max %d chars)."
-msgstr "설명이 너무 길어요. (최대 140글자)"
+msgstr "설명이 너무 깁니다. (최대 %d 글자)"
#: actions/apigroupcreate.php:226 actions/editgroup.php:208
#: actions/newgroup.php:148 actions/profilesettings.php:232
@@ -444,15 +425,15 @@ msgstr ""
#: actions/apigroupcreate.php:266 actions/editgroup.php:228
#: actions/newgroup.php:168
-#, fuzzy, php-format
+#, php-format
msgid "Invalid alias: \"%s\""
-msgstr "유효하지 않은태그: \"%s\""
+msgstr "사용할 수 없는 별명 : \"%s\""
#: actions/apigroupcreate.php:275 actions/editgroup.php:232
#: actions/newgroup.php:172
-#, fuzzy, php-format
+#, php-format
msgid "Alias \"%s\" already in use. Try another one."
-msgstr "별명이 이미 사용중 입니다. 다른 별명을 시도해 보십시오."
+msgstr "별명 \"%s\" 이 이미 사용중 입니다. 다른 별명을 시도해 보십시오."
#: actions/apigroupcreate.php:288 actions/editgroup.php:238
#: actions/newgroup.php:178
@@ -462,26 +443,23 @@ msgstr ""
#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
-#, fuzzy
msgid "Group not found!"
-msgstr "API 메서드를 찾을 수 없습니다."
+msgstr "그룹을 찾을 수 없습니다."
#: actions/apigroupjoin.php:110 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:221
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
msgid "You have been blocked from that group by the admin."
msgstr ""
#: actions/apigroupjoin.php:138 actions/joingroup.php:134
-#, fuzzy, php-format
+#, php-format
msgid "Could not join user %1$s to group %2$s."
-msgstr "그룹 %s에 %s는 가입할 수 없습니다."
+msgstr "이용자 %1$s 의 그룹 %2$s 가입에 실패했습니다."
#: actions/apigroupleave.php:114
-#, fuzzy
msgid "You are not a member of this group."
msgstr "당신은 해당 그룹의 멤버가 아닙니다."
@@ -490,10 +468,17 @@ msgstr "당신은 해당 그룹의 멤버가 아닙니다."
msgid "Could not remove user %1$s from group %2$s."
msgstr "그룹 %s에서 %s 사용자를 제거할 수 없습니다."
-#: actions/apigrouplist.php:95
-#, fuzzy, php-format
+#. TRANS: %s is a user name
+#: actions/apigrouplist.php:97
+#, php-format
msgid "%s's groups"
-msgstr "%s 그룹"
+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
+#, fuzzy, php-format
+msgid "%1$s groups %2$s is a member of."
+msgstr "%s 그룹들은 의 멤버입니다."
#: actions/apigrouplistall.php:90 actions/usergroups.php:62
#, php-format
@@ -501,9 +486,9 @@ msgid "%s groups"
msgstr "%s 그룹"
#: actions/apigrouplistall.php:94
-#, fuzzy, php-format
+#, php-format
msgid "groups on %s"
-msgstr "그룹 행동"
+msgstr "%s 상의 그룹들"
#: actions/apioauthauthorize.php:101
msgid "No oauth_token parameter provided."
@@ -523,7 +508,7 @@ msgstr "옳지 않은 크기"
#: 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:337
+#: actions/profilesettings.php:194 actions/recoverpassword.php:350
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
@@ -538,14 +523,12 @@ msgid "Invalid nickname / password!"
msgstr "사용자 이름이나 비밀 번호가 틀렸습니다."
#: actions/apioauthauthorize.php:159
-#, fuzzy
msgid "Database error deleting OAuth application user."
-msgstr "사용자 세팅 오류"
+msgstr "OAuth 응용프로그램 사용자 삭제 중 데이터베이스 오류"
#: actions/apioauthauthorize.php:185
-#, fuzzy
msgid "Database error inserting OAuth application user."
-msgstr "해쉬테그를 추가 할 때에 데이타베이스 에러 : %s"
+msgstr "OAuth 응용 프로그램 사용자 추가 중 데이터베이스 오류"
#: actions/apioauthauthorize.php:214
#, php-format
@@ -570,11 +553,11 @@ msgstr "잘못된 폼 제출"
#: actions/apioauthauthorize.php:259
msgid "An application would like to connect to your account"
-msgstr ""
+msgstr "응용 프로그램이 계정에 연결하려고 할 것입니다."
#: actions/apioauthauthorize.php:276
msgid "Allow or deny access"
-msgstr ""
+msgstr "접근 허용 또는 거부"
#: actions/apioauthauthorize.php:292
#, php-format
@@ -583,16 +566,19 @@ msgid ""
"the ability to <strong>%3$s</strong> your %4$s account data. You should only "
"give access to your %4$s account to third parties you trust."
msgstr ""
+"<strong>%2$s</strong>의 응용 프로그램 <strong>%1$s</strong>이 %4$s 계정 정보"
+"에 대해 <strong>%3$s</strong> 할 수 있습니다 .믿을 수 있는 써드파티에게만 %4"
+"$s 계정의 접근을 허용해야 합니다."
-#: actions/apioauthauthorize.php:310 lib/action.php:438
+#: actions/apioauthauthorize.php:310 lib/action.php:437
msgid "Account"
msgstr "계정"
#: actions/apioauthauthorize.php:313 actions/login.php:230
#: actions/profilesettings.php:106 actions/register.php:424
-#: actions/showgroup.php:244 actions/tagother.php:94
+#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
-#: lib/userprofile.php:131
+#: lib/userprofile.php:132
msgid "Nickname"
msgstr "별명"
@@ -603,20 +589,19 @@ msgstr "비밀 번호"
#: actions/apioauthauthorize.php:328
msgid "Deny"
-msgstr ""
+msgstr "거부"
#: actions/apioauthauthorize.php:334
-#, fuzzy
msgid "Allow"
-msgstr "모든 것"
+msgstr "허용"
#: actions/apioauthauthorize.php:351
msgid "Allow or deny access to your account information."
-msgstr ""
+msgstr "계정 정보에 대한 접근을 허용 또는 거부합니다."
#: actions/apistatusesdestroy.php:107
msgid "This method requires a POST or DELETE."
-msgstr "이 메서드는 등록 또는 삭제를 요구합니다."
+msgstr "이 메서드는 POST 또는 DELETE를 요구합니다."
#: actions/apistatusesdestroy.php:130
msgid "You may not delete another user's status."
@@ -628,19 +613,16 @@ msgid "No such notice."
msgstr "그러한 통지는 없습니다."
#: actions/apistatusesretweet.php:83
-#, fuzzy
msgid "Cannot repeat your own notice."
-msgstr "알림을 켤 수 없습니다."
+msgstr "자기 자신의 소식은 재전송할 수 없습니다."
#: actions/apistatusesretweet.php:91
-#, fuzzy
msgid "Already repeated that notice."
-msgstr "이 게시글 삭제하기"
+msgstr "이미 재전송된 소식입니다."
#: actions/apistatusesshow.php:138
-#, fuzzy
msgid "Status deleted."
-msgstr "아바타가 업데이트 되었습니다."
+msgstr "삭제된 소식입니다."
#: actions/apistatusesshow.php:144
msgid "No status with that ID found."
@@ -648,9 +630,9 @@ msgstr "발견된 ID의 상태가 없습니다."
#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
#: lib/mailhandler.php:60
-#, fuzzy, php-format
+#, php-format
msgid "That's too long. Max notice size is %d chars."
-msgstr "너무 깁니다. 통지의 최대 길이는 140글자 입니다."
+msgstr "너무 깁니다. 통지의 최대 길이는 %d 글자 입니다."
#: actions/apistatusesupdate.php:202
msgid "Not found"
@@ -659,19 +641,18 @@ msgstr "찾지 못함"
#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
-msgstr ""
+msgstr "소식의 최대 길이는 첨부 URL을 포함하여 %d 글자입니다."
#: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261
-#, fuzzy
msgid "Unsupported format."
-msgstr "지원하지 않는 그림 파일 형식입니다."
+msgstr "지원하지 않는 형식입니다."
-#: actions/apitimelinefavorites.php:108
+#: actions/apitimelinefavorites.php:109
#, fuzzy, php-format
msgid "%1$s / Favorites from %2$s"
msgstr "%s / %s의 좋아하는 글들"
-#: actions/apitimelinefavorites.php:117
+#: actions/apitimelinefavorites.php:118
#, fuzzy, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "%s 좋아하는 글이 업데이트 됐습니다. %S에 의해 / %s."
@@ -681,7 +662,7 @@ msgstr "%s 좋아하는 글이 업데이트 됐습니다. %S에 의해 / %s."
msgid "%1$s / Updates mentioning %2$s"
msgstr "%1$s / %2$s에게 답신 업데이트"
-#: actions/apitimelinementions.php:127
+#: actions/apitimelinementions.php:130
#, php-format
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "%1$s님이 %2$s/%3$s의 업데이트에 답변했습니다."
@@ -691,7 +672,7 @@ msgstr "%1$s님이 %2$s/%3$s의 업데이트에 답변했습니다."
msgid "%s public timeline"
msgstr "%s 공개 타임라인"
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "모두로부터의 업데이트 %s개!"
@@ -706,12 +687,12 @@ msgstr "%s에 답신"
msgid "Repeats of %s"
msgstr "%s에 답신"
-#: actions/apitimelinetag.php:102 actions/tag.php:67
+#: actions/apitimelinetag.php:104 actions/tag.php:67
#, php-format
msgid "Notices tagged with %s"
msgstr "%s 태그된 통지"
-#: actions/apitimelinetag.php:104 actions/tagrss.php:65
+#: actions/apitimelinetag.php:106 actions/tagrss.php:65
#, fuzzy, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "%2$s에 있는 %1$s의 업데이트!"
@@ -721,9 +702,8 @@ msgid "Not found."
msgstr "찾을 수가 없습니다."
#: actions/attachment.php:73
-#, fuzzy
msgid "No such attachment."
-msgstr "그러한 문서는 없습니다."
+msgstr "해당하는 첨부파일이 없습니다."
#: actions/avatarbynickname.php:59 actions/blockedfromgroup.php:73
#: actions/editgroup.php:84 actions/groupdesignsettings.php:84
@@ -740,15 +720,15 @@ msgstr "사이즈가 없습니다."
msgid "Invalid size."
msgstr "옳지 않은 크기"
-#: actions/avatarsettings.php:67 actions/showgroup.php:229
+#: actions/avatarsettings.php:67 actions/showgroup.php:230
#: lib/accountsettingsaction.php:112
msgid "Avatar"
msgstr "아바타"
#: actions/avatarsettings.php:78
-#, fuzzy, php-format
+#, php-format
msgid "You can upload your personal avatar. The maximum file size is %s."
-msgstr "당신의 개인적인 아바타를 업로드할 수 있습니다."
+msgstr "당신의 개인 아바타를 업로드할 수 있습니다. 최대 파일 크기는 %s 입니다."
#: actions/avatarsettings.php:106 actions/avatarsettings.php:185
#: actions/remotesubscribe.php:191 actions/userauthorization.php:72
@@ -772,7 +752,7 @@ msgid "Preview"
msgstr "미리보기"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:655
+#: lib/deleteuserform.php:66 lib/noticelist.php:659
msgid "Delete"
msgstr "삭제"
@@ -784,31 +764,34 @@ msgstr "올리기"
msgid "Crop"
msgstr "자르기"
-#: actions/avatarsettings.php:328
+#: actions/avatarsettings.php:305
+#, fuzzy
+msgid "No file uploaded."
+msgstr "프로필을 지정하지 않았습니다."
+
+#: actions/avatarsettings.php:332
msgid "Pick a square area of the image to be your avatar"
msgstr "당신의 아바타가 될 이미지영역을 지정하세요."
-#: actions/avatarsettings.php:343 actions/grouplogo.php:380
+#: actions/avatarsettings.php:347 actions/grouplogo.php:380
msgid "Lost our file data."
msgstr "파일 데이터를 잃어버렸습니다."
-#: actions/avatarsettings.php:366
+#: actions/avatarsettings.php:370
msgid "Avatar updated."
msgstr "아바타가 업데이트 되었습니다."
-#: actions/avatarsettings.php:369
+#: actions/avatarsettings.php:373
msgid "Failed updating avatar."
msgstr "아바타 업데이트 실패"
-#: actions/avatarsettings.php:393
-#, fuzzy
+#: actions/avatarsettings.php:397
msgid "Avatar deleted."
-msgstr "아바타가 업데이트 되었습니다."
+msgstr "아바타가 삭제되었습니다."
#: actions/block.php:69
-#, fuzzy
msgid "You already blocked that user."
-msgstr "당신은 이미 이 사용자를 차단하고 있습니다."
+msgstr "이미 차단된 이용자입니다."
#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
msgid "Block user"
@@ -820,6 +803,8 @@ msgid ""
"unsubscribed from you, unable to subscribe to you in the future, and you "
"will not be notified of any @-replies from them."
msgstr ""
+"정말 이용자를 차단하시겠습니까? 차단된 이용자는 구독해제되고, 이후 당신을 구"
+"독할 수 없으며, 차단된 이용자로부터 @-답장의 통보를 받지 않게 됩니다."
#: actions/block.php:143 actions/deleteapplication.php:153
#: actions/deletenotice.php:145 actions/deleteuser.php:150
@@ -828,9 +813,8 @@ msgid "No"
msgstr "아니오"
#: actions/block.php:143 actions/deleteuser.php:150
-#, fuzzy
msgid "Do not block this user"
-msgstr "이 사용자를 차단해제합니다."
+msgstr "이용자를 차단하지 않는다."
#: actions/block.php:144 actions/deleteapplication.php:158
#: actions/deletenotice.php:146 actions/deleteuser.php:151
@@ -855,8 +839,8 @@ msgstr "정보차단을 저장하는데 실패했습니다."
#: actions/groupunblock.php:86 actions/joingroup.php:82
#: actions/joingroup.php:93 actions/leavegroup.php:82
#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212
-#: lib/command.php:260
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162
+#: lib/command.php:358
msgid "No such group."
msgstr "그러한 그룹이 없습니다."
@@ -876,9 +860,8 @@ msgid "A list of the users blocked from joining this group."
msgstr "이 그룹의 회원리스트"
#: actions/blockedfromgroup.php:288
-#, fuzzy
msgid "Unblock user from group"
-msgstr "사용자 차단 해제에 실패했습니다."
+msgstr "그룹 이용자는 차단해제"
#: actions/blockedfromgroup.php:320 lib/unblockform.php:69
msgid "Unblock"
@@ -928,9 +911,8 @@ msgid "Couldn't delete email confirmation."
msgstr "이메일 승인을 삭제 할 수 없습니다."
#: actions/confirmaddress.php:144
-#, fuzzy
msgid "Confirm address"
-msgstr "주소 인증"
+msgstr "주소 확인"
#: actions/confirmaddress.php:159
#, php-format
@@ -943,7 +925,7 @@ msgid "Conversation"
msgstr "인증 코드"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:218 lib/searchgroupnav.php:82
+#: lib/profileaction.php:224 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "통지"
@@ -965,7 +947,7 @@ msgstr "당신은 해당 그룹의 멤버가 아닙니다."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1217
+#: lib/action.php:1219
msgid "There was a problem with your session token."
msgstr "당신의 세션토큰관련 문제가 있습니다."
@@ -1027,7 +1009,7 @@ msgstr "정말로 통지를 삭제하시겠습니까?"
msgid "Do not delete this notice"
msgstr "이 통지를 지울 수 없습니다."
-#: actions/deletenotice.php:146 lib/noticelist.php:655
+#: actions/deletenotice.php:146 lib/noticelist.php:659
msgid "Delete this notice"
msgstr "이 게시글 삭제하기"
@@ -1042,9 +1024,8 @@ msgid "You can only delete local users."
msgstr "당신은 다른 사용자의 상태를 삭제하지 않아도 된다."
#: actions/deleteuser.php:110 actions/deleteuser.php:133
-#, fuzzy
msgid "Delete user"
-msgstr "삭제"
+msgstr "이용자 삭제"
#: actions/deleteuser.php:136
msgid ""
@@ -1064,79 +1045,73 @@ msgstr ""
#: actions/designadminpanel.php:73
msgid "Design settings for this StatusNet site."
-msgstr ""
+msgstr "이 StatusNet 사이트에 대한 디자인 설정"
#: actions/designadminpanel.php:275
-#, fuzzy
msgid "Invalid logo URL."
-msgstr "옳지 않은 크기"
+msgstr "잘못된 로고 URL 입니다."
#: actions/designadminpanel.php:279
-#, fuzzy, php-format
+#, php-format
msgid "Theme not available: %s"
-msgstr "이 페이지는 귀하가 승인한 미디어 타입에서는 이용할 수 없습니다."
+msgstr "테마를 이용할 수 없습니다: %s"
#: actions/designadminpanel.php:375
-#, fuzzy
msgid "Change logo"
-msgstr "비밀번호 바꾸기"
+msgstr "로고 변경"
#: actions/designadminpanel.php:380
-#, fuzzy
msgid "Site logo"
-msgstr "초대"
+msgstr "사이트 로고"
#: actions/designadminpanel.php:387
-#, fuzzy
msgid "Change theme"
-msgstr "변환"
+msgstr "테마 바꾸기"
#: actions/designadminpanel.php:404
-#, fuzzy
msgid "Site theme"
-msgstr "사이트 공지"
+msgstr "사이트 테마"
#: actions/designadminpanel.php:405
-#, fuzzy
msgid "Theme for the site."
-msgstr "이 사이트로부터 로그아웃"
+msgstr "사이트에 대한 테마"
#: actions/designadminpanel.php:417 lib/designsettings.php:101
msgid "Change background image"
-msgstr ""
+msgstr "배경 이미지 바꾸기"
#: actions/designadminpanel.php:422 actions/designadminpanel.php:497
#: lib/designsettings.php:178
msgid "Background"
-msgstr ""
+msgstr "배경"
#: actions/designadminpanel.php:427
-#, fuzzy, php-format
+#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
"$s."
-msgstr "당신그룹의 로고 이미지를 업로드할 수 있습니다."
+msgstr ""
+"사이트의 배경 이미지를 업로드할 수 있습니다. 최대 파일 크기는 %1$s 입니다."
#: actions/designadminpanel.php:457 lib/designsettings.php:139
msgid "On"
-msgstr ""
+msgstr "켜기"
#: actions/designadminpanel.php:473 lib/designsettings.php:155
msgid "Off"
-msgstr ""
+msgstr "끄기"
#: actions/designadminpanel.php:474 lib/designsettings.php:156
msgid "Turn background image on or off."
-msgstr ""
+msgstr "배경 이미지를 켜거나 끈다."
#: actions/designadminpanel.php:479 lib/designsettings.php:161
msgid "Tile background image"
-msgstr ""
+msgstr "배경 이미지를 반복 나열"
#: actions/designadminpanel.php:488 lib/designsettings.php:170
-#, fuzzy
msgid "Change colours"
-msgstr "비밀번호 바꾸기"
+msgstr "색상 변경"
#: actions/designadminpanel.php:510 lib/designsettings.php:191
#, fuzzy
@@ -1174,7 +1149,7 @@ msgstr ""
#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:208
+#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
#: actions/tagother.php:154 actions/useradminpanel.php:294
#: lib/applicationeditform.php:333 lib/applicationeditform.php:334
#: lib/designsettings.php:256 lib/groupeditform.php:202
@@ -1199,14 +1174,12 @@ msgid "No such document \"%s\""
msgstr "그러한 문서는 없습니다."
#: actions/editapplication.php:54
-#, fuzzy
msgid "Edit Application"
-msgstr "다른 옵션들"
+msgstr "응용 프로그램 수정"
#: actions/editapplication.php:66
-#, fuzzy
msgid "You must be logged in to edit an application."
-msgstr "그룹을 만들기 위해서는 로그인해야 합니다."
+msgstr "응용 프로그램 수정을 위해서는 로그인해야 합니다."
#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:166
#: actions/showapplication.php:87
@@ -1253,9 +1226,8 @@ msgid "Organization is required."
msgstr ""
#: actions/editapplication.php:206 actions/newapplication.php:191
-#, fuzzy
msgid "Organization is too long (max 255 chars)."
-msgstr "위치가 너무 깁니다. (최대 255글자)"
+msgstr "기관명이 너무 깁니다. (최대 255글자)"
#: actions/editapplication.php:209 actions/newapplication.php:194
msgid "Organization homepage is required."
@@ -1285,7 +1257,6 @@ msgstr "그룹을 만들기 위해서는 로그인해야 합니다."
#: actions/editgroup.php:107 actions/editgroup.php:172
#: actions/groupdesignsettings.php:107 actions/grouplogo.php:109
-#, fuzzy
msgid "You must be an admin to edit the group."
msgstr "관리자만 그룹을 편집할 수 있습니다."
@@ -1294,15 +1265,15 @@ msgid "Use this form to edit the group."
msgstr "다음 양식을 이용해 그룹을 편집하십시오."
#: actions/editgroup.php:205 actions/newgroup.php:145
-#, fuzzy, php-format
+#, php-format
msgid "description is too long (max %d chars)."
-msgstr "설명이 너무 길어요. (최대 140글자)"
+msgstr "설명이 너무 길어요. (최대 %d글자)"
#: actions/editgroup.php:258
msgid "Could not update group."
msgstr "그룹을 업데이트 할 수 없습니다."
-#: actions/editgroup.php:264 classes/User_group.php:493
+#: actions/editgroup.php:264 classes/User_group.php:496
#, fuzzy
msgid "Could not create aliases."
msgstr "좋아하는 게시글을 생성할 수 없습니다."
@@ -1312,9 +1283,8 @@ msgid "Options saved."
msgstr "옵션들이 저장되었습니다."
#: actions/emailsettings.php:60
-#, fuzzy
msgid "Email settings"
-msgstr "이메일 세팅"
+msgstr "이메일 설정"
#: actions/emailsettings.php:71
#, php-format
@@ -1351,7 +1321,6 @@ msgid "Cancel"
msgstr "취소"
#: actions/emailsettings.php:121
-#, fuzzy
msgid "Email address"
msgstr "이메일 주소"
@@ -1615,14 +1584,12 @@ msgid "Error updating remote profile"
msgstr "리모트 프로필 업데이트 오류"
#: actions/getfile.php:79
-#, fuzzy
msgid "No such file."
-msgstr "그러한 통지는 없습니다."
+msgstr "해당하는 파일이 없습니다."
#: actions/getfile.php:83
-#, fuzzy
msgid "Cannot read file."
-msgstr "파일을 잃어버렸습니다."
+msgstr "파일을 읽을 수 없습니다."
#: actions/grantrole.php:62 actions/revokerole.php:62
#, fuzzy
@@ -1725,9 +1692,8 @@ msgstr ""
#: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:186
#: lib/designsettings.php:391 lib/designsettings.php:413
-#, fuzzy
msgid "Couldn't update your design."
-msgstr "사용자를 업데이트 할 수 없습니다."
+msgstr "디자인을 수정할 수 없습니다."
#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:231
#, fuzzy
@@ -1750,9 +1716,8 @@ msgid "User without matching profile."
msgstr "프로필 매칭이 없는 사용자"
#: actions/grouplogo.php:365
-#, fuzzy
msgid "Pick a square area of the image to be the logo."
-msgstr "당신의 아바타가 될 이미지영역을 지정하세요."
+msgstr "이미지에서 로고로 사용할 사각 영역을 지정하세요."
#: actions/grouplogo.php:399
msgid "Logo updated."
@@ -1796,7 +1761,7 @@ msgstr "관리자"
#: actions/groupmembers.php:482
msgid "Make this user an admin"
-msgstr ""
+msgstr "이 이용자를 관리자로 만듦"
#: actions/grouprss.php:138 actions/userrss.php:93
#: lib/atomgroupnoticefeed.php:61 lib/atomusernoticefeed.php:67
@@ -1809,7 +1774,7 @@ msgstr "%s 타임라인"
msgid "Updates from members of %1$s on %2$s!"
msgstr "%2$s에 있는 %1$s의 업데이트!"
-#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232
+#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244
#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr "그룹"
@@ -1894,9 +1859,8 @@ msgstr ""
"래 당신의 주소와 환경설정을 조정하세요."
#: actions/imsettings.php:89
-#, fuzzy
msgid "IM is not available."
-msgstr "이 페이지는 귀하가 승인한 미디어 타입에서는 이용할 수 없습니다."
+msgstr "인스턴트 메신저를 사용할 수 없습니다."
#: actions/imsettings.php:106
msgid "Current confirmed Jabber/GTalk address."
@@ -2015,7 +1979,7 @@ msgstr "새 사용자를 초대"
msgid "You are already subscribed to these users:"
msgstr "당신은 다음 사용자를 이미 구독하고 있습니다."
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
#, php-format
msgid "%1$s (%2$s)"
msgstr "%1$s (%2$s)"
@@ -2140,7 +2104,7 @@ msgstr "%s 는 그룹 %s에 가입했습니다."
msgid "You must be logged in to leave a group."
msgstr "그룹을 떠나기 위해서는 로그인해야 합니다."
-#: actions/leavegroup.php:100 lib/command.php:265
+#: actions/leavegroup.php:100 lib/command.php:363
msgid "You are not a member of that group."
msgstr "당신은 해당 그룹의 멤버가 아닙니다."
@@ -2223,9 +2187,8 @@ msgid "No current status"
msgstr "현재 상태가 없습니다."
#: actions/newapplication.php:52
-#, fuzzy
msgid "New Application"
-msgstr "그러한 통지는 없습니다."
+msgstr "신규 응용 프로그램"
#: actions/newapplication.php:64
#, fuzzy
@@ -2258,12 +2221,12 @@ msgstr "새 그룹을 만들기 위해 이 양식을 사용하세요."
msgid "New message"
msgstr "새로운 메시지입니다."
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
msgid "You can't send a message to this user."
msgstr "당신은 이 사용자에게 메시지를 보낼 수 없습니다."
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342
-#: lib/command.php:475
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
+#: lib/command.php:529
msgid "No content!"
msgstr "내용이 없습니다!"
@@ -2271,7 +2234,7 @@ msgstr "내용이 없습니다!"
msgid "No recipient specified."
msgstr "수신자를 지정하지 않았습니다."
-#: actions/newmessage.php:164 lib/command.php:361
+#: actions/newmessage.php:164 lib/command.php:462
msgid ""
"Don't send a message to yourself; just say it to yourself quietly instead."
msgstr ""
@@ -2287,7 +2250,7 @@ msgstr "메시지"
msgid "Direct message to %s sent."
msgstr "%s에게 보낸 직접 메시지"
-#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189
msgid "Ajax Error"
msgstr "Ajax 에러입니다."
@@ -2295,7 +2258,7 @@ msgstr "Ajax 에러입니다."
msgid "New notice"
msgstr "새로운 통지"
-#: actions/newnotice.php:211
+#: actions/newnotice.php:217
msgid "Notice posted"
msgstr "게시글이 등록되었습니다."
@@ -2380,7 +2343,7 @@ msgstr ""
#: actions/oauthconnectionssettings.php:83
msgid "You have allowed the following applications to access you account."
-msgstr ""
+msgstr "다음 응용 프로그램이 계정에 접근하도록 허용되어 있습니다."
#: actions/oauthconnectionssettings.php:175
#, fuzzy
@@ -2404,7 +2367,7 @@ msgstr ""
msgid "Notice has no profile"
msgstr "통지에 프로필이 없습니다."
-#: actions/oembed.php:86 actions/shownotice.php:180
+#: actions/oembed.php:86 actions/shownotice.php:175
#, php-format
msgid "%1$s's status on %2$s"
msgstr "%1$s의 상태 (%2$s에서)"
@@ -2418,8 +2381,8 @@ msgstr "연결"
msgid "Only "
msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042
-#: lib/apiaction.php:1070 lib/apiaction.php:1179
+#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1068
+#: lib/apiaction.php:1096 lib/apiaction.php:1212
msgid "Not a supported data format."
msgstr "지원하는 형식의 데이터가 아닙니다."
@@ -2557,7 +2520,7 @@ msgstr "기존 비밀 번호가 틀렸습니다"
msgid "Error saving user; invalid."
msgstr "사용자 저장 오류; 무효한 사용자"
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
msgid "Can't save new password."
msgstr "새 비밀번호를 저장 할 수 없습니다."
@@ -2582,7 +2545,7 @@ msgstr "이 페이지는 귀하가 승인한 미디어 타입에서는 이용할
#: actions/pathsadminpanel.php:163
#, php-format
msgid "Avatar directory not writable: %s"
-msgstr ""
+msgstr "아바타 디렉토리에 쓸 수 없습니다 : %s"
#: actions/pathsadminpanel.php:169
#, php-format
@@ -2639,7 +2602,7 @@ msgstr ""
#: actions/pathsadminpanel.php:259
msgid "Theme"
-msgstr ""
+msgstr "테마"
#: actions/pathsadminpanel.php:264
msgid "Theme server"
@@ -2710,7 +2673,7 @@ msgstr ""
#: actions/pathsadminpanel.php:329
msgid "Use SSL"
-msgstr ""
+msgstr "SSL 사용"
#: actions/pathsadminpanel.php:330
msgid "When to use SSL"
@@ -2782,8 +2745,8 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr "1-64자 사이에 영소문자, 숫자로만 씁니다. 기호나 공백을 쓰면 안 됩니다."
#: actions/profilesettings.php:111 actions/register.php:448
-#: actions/showgroup.php:255 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:149
+#: actions/showgroup.php:256 actions/tagother.php:104
+#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "실명"
@@ -2811,9 +2774,9 @@ msgid "Bio"
msgstr "자기소개"
#: actions/profilesettings.php:132 actions/register.php:471
-#: actions/showgroup.php:264 actions/tagother.php:112
+#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
-#: lib/userprofile.php:164
+#: lib/userprofile.php:165
msgid "Location"
msgstr "위치"
@@ -2827,7 +2790,7 @@ msgstr ""
#: actions/profilesettings.php:145 actions/tagother.php:149
#: actions/tagother.php:209 lib/subscriptionlist.php:106
-#: lib/subscriptionlist.php:108 lib/userprofile.php:209
+#: lib/subscriptionlist.php:108 lib/userprofile.php:210
msgid "Tags"
msgstr "태그"
@@ -2936,6 +2899,7 @@ msgid ""
"This is the public timeline for %%site.name%% but no one has posted anything "
"yet."
msgstr ""
+"%%site.name%% 의 공개 타임라인이지만, 아직 아무도 글을 쓰지 않았습니다."
#: actions/public.php:191
msgid "Be the first to post!"
@@ -2982,7 +2946,7 @@ msgstr ""
#: actions/publictagcloud.php:72
msgid "Be the first to post one!"
-msgstr ""
+msgstr "글을 올린 첫번째 사람이 되세요!"
#: actions/publictagcloud.php:75
#, php-format
@@ -3057,7 +3021,7 @@ msgstr "비밀 번호 초기화"
msgid "Recover password"
msgstr "비밀 번호 복구"
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
msgid "Password recovery requested"
msgstr "비밀 번호 복구가 요청되었습니다."
@@ -3077,41 +3041,41 @@ msgstr "초기화"
msgid "Enter a nickname or email address."
msgstr "별명이나 이메일 계정을 입력하십시오."
-#: actions/recoverpassword.php:272
+#: actions/recoverpassword.php:282
msgid "No user with that email address or username."
msgstr "그러한 이메일 주소나 계정을 가진 사용자는 없습니다."
-#: actions/recoverpassword.php:287
+#: actions/recoverpassword.php:299
msgid "No registered email address for that user."
msgstr "그 사용자는 등록된 메일주소가 없습니다."
-#: actions/recoverpassword.php:301
+#: actions/recoverpassword.php:313
msgid "Error saving address confirmation."
msgstr "주소 확인 저장 에러"
-#: actions/recoverpassword.php:325
+#: actions/recoverpassword.php:338
msgid ""
"Instructions for recovering your password have been sent to the email "
"address registered to your account."
msgstr "가입하신 이메일로 비밀 번호 재발급에 관한 안내를 보냈습니다."
-#: actions/recoverpassword.php:344
+#: actions/recoverpassword.php:357
msgid "Unexpected password reset."
msgstr "잘못된 비밀 번호 지정"
-#: actions/recoverpassword.php:352
+#: actions/recoverpassword.php:365
msgid "Password must be 6 chars or more."
msgstr "비밀 번호는 6자 이상이어야 합니다."
-#: actions/recoverpassword.php:356
+#: actions/recoverpassword.php:369
msgid "Password and confirmation do not match."
msgstr "비밀 번호가 일치하지 않습니다."
-#: actions/recoverpassword.php:375 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:248
msgid "Error setting user."
msgstr "사용자 세팅 오류"
-#: actions/recoverpassword.php:382
+#: actions/recoverpassword.php:395
msgid "New password successfully saved. You are now logged in."
msgstr ""
"새로운 비밀 번호를 성공적으로 저장했습니다. 귀하는 이제 로그인 되었습니다."
@@ -3275,7 +3239,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "다른 마이크로블로깅 서비스의 귀하의 프로필 URL"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:394
+#: lib/userprofile.php:406
msgid "Subscribe"
msgstr "구독"
@@ -3309,24 +3273,21 @@ msgid "No notice specified."
msgstr "프로필을 지정하지 않았습니다."
#: actions/repeat.php:76
-#, fuzzy
msgid "You can't repeat your own notice."
-msgstr "라이선스에 동의하지 않는다면 등록할 수 없습니다."
+msgstr "자신의 글은 재전송할 수 없습니다."
#: actions/repeat.php:90
#, fuzzy
msgid "You already repeated that notice."
msgstr "당신은 이미 이 사용자를 차단하고 있습니다."
-#: actions/repeat.php:114 lib/noticelist.php:674
-#, fuzzy
+#: actions/repeat.php:114 lib/noticelist.php:678
msgid "Repeated"
-msgstr "생성"
+msgstr "재전송됨"
#: actions/repeat.php:119
-#, fuzzy
msgid "Repeated!"
-msgstr "생성"
+msgstr "재전송됨!"
#: actions/replies.php:126 actions/repliesrss.php:68
#: lib/personalgroupnav.php:105
@@ -3396,9 +3357,8 @@ msgid "StatusNet"
msgstr "아바타가 업데이트 되었습니다."
#: actions/sandbox.php:65 actions/unsandbox.php:65
-#, fuzzy
msgid "You cannot sandbox users on this site."
-msgstr "당신은 이 사용자에게 메시지를 보낼 수 없습니다."
+msgstr "이 사이트의 이용자에 대해 권한정지 할 수 없습니다."
#: actions/sandbox.php:72
#, fuzzy
@@ -3467,8 +3427,8 @@ msgstr "페이지수"
msgid "Description"
msgstr "설명"
-#: actions/showapplication.php:192 actions/showgroup.php:438
-#: lib/profileaction.php:176
+#: actions/showapplication.php:192 actions/showgroup.php:439
+#: lib/profileaction.php:182
msgid "Statistics"
msgstr "통계"
@@ -3579,68 +3539,68 @@ msgstr "%s 그룹"
msgid "%1$s group, page %2$d"
msgstr "%s 그룹 회원, %d페이지"
-#: actions/showgroup.php:226
+#: actions/showgroup.php:227
msgid "Group profile"
msgstr "그룹 프로필"
-#: actions/showgroup.php:271 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:177
+#: actions/showgroup.php:272 actions/tagother.php:118
+#: actions/userauthorization.php:175 lib/userprofile.php:178
msgid "URL"
msgstr "URL"
-#: actions/showgroup.php:282 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:194
+#: actions/showgroup.php:283 actions/tagother.php:128
+#: actions/userauthorization.php:187 lib/userprofile.php:195
msgid "Note"
msgstr "설명"
-#: actions/showgroup.php:292 lib/groupeditform.php:184
+#: actions/showgroup.php:293 lib/groupeditform.php:184
msgid "Aliases"
msgstr ""
-#: actions/showgroup.php:301
+#: actions/showgroup.php:302
msgid "Group actions"
msgstr "그룹 행동"
-#: actions/showgroup.php:337
-#, fuzzy, php-format
+#: actions/showgroup.php:338
+#, php-format
msgid "Notice feed for %s group (RSS 1.0)"
-msgstr "%s 그룹을 위한 공지피드"
+msgstr "%s 그룹을 위한 공지피드 (RSS 1.0)"
-#: actions/showgroup.php:343
-#, fuzzy, php-format
+#: actions/showgroup.php:344
+#, php-format
msgid "Notice feed for %s group (RSS 2.0)"
-msgstr "%s 그룹을 위한 공지피드"
+msgstr "%s 그룹을 위한 공지피드 (RSS 2.0)"
-#: actions/showgroup.php:349
-#, fuzzy, php-format
+#: actions/showgroup.php:350
+#, php-format
msgid "Notice feed for %s group (Atom)"
-msgstr "%s 그룹을 위한 공지피드"
+msgstr "%s 그룹을 위한 공지피드 (Atom)"
-#: actions/showgroup.php:354
+#: actions/showgroup.php:355
#, php-format
msgid "FOAF for %s group"
msgstr "%s의 보낸쪽지함"
-#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91
+#: actions/showgroup.php:391 actions/showgroup.php:448 lib/groupnav.php:91
msgid "Members"
msgstr "회원"
-#: actions/showgroup.php:395 lib/profileaction.php:117
-#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95
-#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71
+#: actions/showgroup.php:396 lib/profileaction.php:117
+#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95
+#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
msgid "(None)"
msgstr "(없습니다.)"
-#: actions/showgroup.php:401
+#: actions/showgroup.php:402
msgid "All members"
msgstr "모든 회원"
-#: actions/showgroup.php:441
+#: actions/showgroup.php:442
#, fuzzy
msgid "Created"
msgstr "생성"
-#: actions/showgroup.php:457
+#: actions/showgroup.php:458
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3650,7 +3610,7 @@ msgid ""
"of this group and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
-#: actions/showgroup.php:463
+#: actions/showgroup.php:464
#, fuzzy, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3661,7 +3621,7 @@ msgstr ""
"**%s** 는 %%%%site.name%%%% [마이크로블로깅)(http://en.wikipedia.org/wiki/"
"Micro-blogging)의 사용자 그룹입니다. "
-#: actions/showgroup.php:491
+#: actions/showgroup.php:492
#, fuzzy
msgid "Admins"
msgstr "관리자"
@@ -3734,6 +3694,8 @@ msgid ""
"Seen anything interesting recently? You haven't posted any notices yet, now "
"would be a good time to start :)"
msgstr ""
+"최근에 재미있는 일들이 있었나요? 아직 올린 글이 없느데, 지금 시작해 보면 어떨"
+"까요. :)"
#: actions/showstream.php:207
#, php-format
@@ -3795,7 +3757,7 @@ msgid "Unknown language \"%s\"."
msgstr ""
#: actions/siteadminpanel.php:165
-msgid "Minimum text limit is 140 characters."
+msgid "Minimum text limit is 0 (unlimited)."
msgstr ""
#: actions/siteadminpanel.php:171
@@ -4076,8 +4038,7 @@ msgstr "아바타 설정"
msgid "You are not subscribed to that profile."
msgstr "당신은 이 프로필에 구독되지 않고있습니다."
-#: actions/subedit.php:83 classes/Subscription.php:89
-#: classes/Subscription.php:116
+#: actions/subedit.php:83 classes/Subscription.php:132
msgid "Could not save subscription."
msgstr "구독을 저장할 수 없습니다."
@@ -4170,11 +4131,11 @@ msgstr ""
msgid "%s is not listening to anyone."
msgstr "%1$s 는 지금 듣고 있습니다."
-#: actions/subscriptions.php:199
+#: actions/subscriptions.php:208
msgid "Jabber"
msgstr "Jabber"
-#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:222 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr "SMS"
@@ -4208,12 +4169,12 @@ msgstr "id 인자가 없습니다."
msgid "Tag %s"
msgstr "태그 %s"
-#: actions/tagother.php:77 lib/userprofile.php:75
+#: actions/tagother.php:77 lib/userprofile.php:76
msgid "User profile"
msgstr "이용자 프로필"
#: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:102
+#: lib/userprofile.php:103
msgid "Photo"
msgstr "사진"
@@ -4542,36 +4503,34 @@ msgstr ""
msgid "Plugins"
msgstr ""
-#: actions/version.php:196 lib/action.php:767
-#, fuzzy
+#: actions/version.php:196 lib/action.php:766
msgid "Version"
-msgstr "개인적인"
+msgstr "버젼"
#: actions/version.php:197
msgid "Author(s)"
msgstr ""
-#: classes/File.php:144
+#: classes/File.php:169
#, 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:154
+#: classes/File.php:179
#, php-format
msgid "A file this large would exceed your user quota of %d bytes."
msgstr ""
-#: classes/File.php:161
+#: classes/File.php:186
#, php-format
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
#: classes/Group_member.php:41
-#, fuzzy
msgid "Group join failed."
-msgstr "그룹 프로필"
+msgstr "그룹에 가입하지 못했습니다."
#: classes/Group_member.php:53
#, fuzzy
@@ -4589,9 +4548,9 @@ msgid "Could not update local group."
msgstr "그룹을 업데이트 할 수 없습니다."
#: classes/Login_token.php:76
-#, fuzzy, php-format
+#, php-format
msgid "Could not create login token for %s"
-msgstr "OpenID를 작성 할 수 없습니다 : %s"
+msgstr "%s 에 대한 로그인 토큰을 만들 수 없습니다."
#: classes/Message.php:45
#, fuzzy
@@ -4606,28 +4565,28 @@ msgstr "메시지를 삽입할 수 없습니다."
msgid "Could not update message with new URI."
msgstr "새 URI와 함께 메시지를 업데이트할 수 없습니다."
-#: classes/Notice.php:172
+#: classes/Notice.php:175
#, php-format
msgid "DB error inserting hashtag: %s"
msgstr "해쉬테그를 추가 할 때에 데이타베이스 에러 : %s"
-#: classes/Notice.php:241
+#: classes/Notice.php:244
#, fuzzy
msgid "Problem saving notice. Too long."
msgstr "통지를 저장하는데 문제가 발생했습니다."
-#: classes/Notice.php:245
+#: classes/Notice.php:248
msgid "Problem saving notice. Unknown user."
msgstr "게시글 저장문제. 알려지지않은 회원"
-#: classes/Notice.php:250
+#: classes/Notice.php:253
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
"너무 많은 게시글이 너무 빠르게 올라옵니다. 한숨고르고 몇분후에 다시 포스트를 "
"해보세요."
-#: classes/Notice.php:256
+#: classes/Notice.php:259
#, fuzzy
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
@@ -4636,75 +4595,75 @@ msgstr ""
"너무 많은 게시글이 너무 빠르게 올라옵니다. 한숨고르고 몇분후에 다시 포스트를 "
"해보세요."
-#: classes/Notice.php:262
+#: classes/Notice.php:265
msgid "You are banned from posting notices on this site."
msgstr "이 사이트에 게시글 포스팅으로부터 당신은 금지되었습니다."
-#: classes/Notice.php:328 classes/Notice.php:354
+#: classes/Notice.php:331 classes/Notice.php:357
msgid "Problem saving notice."
msgstr "통지를 저장하는데 문제가 발생했습니다."
-#: classes/Notice.php:927
+#: classes/Notice.php:943
#, fuzzy
msgid "Problem saving group inbox."
msgstr "통지를 저장하는데 문제가 발생했습니다."
-#: classes/Notice.php:1459
+#: classes/Notice.php:1481
#, fuzzy, php-format
msgid "RT @%1$s %2$s"
msgstr "%1$s (%2$s)"
-#: classes/Subscription.php:66 lib/oauthstore.php:465
+#: classes/Subscription.php:74 lib/oauthstore.php:465
#, fuzzy
msgid "You have been banned from subscribing."
msgstr "이 회원은 구독으로부터 당신을 차단해왔다."
-#: classes/Subscription.php:70
+#: classes/Subscription.php:78
msgid "Already subscribed!"
msgstr ""
-#: classes/Subscription.php:74
+#: classes/Subscription.php:82
msgid "User has blocked you."
msgstr "회원이 당신을 차단해왔습니다."
-#: classes/Subscription.php:157
+#: classes/Subscription.php:167
#, fuzzy
msgid "Not subscribed!"
msgstr "구독하고 있지 않습니다!"
-#: classes/Subscription.php:163
+#: classes/Subscription.php:173
#, fuzzy
msgid "Couldn't delete self-subscription."
msgstr "예약 구독을 삭제 할 수 없습니다."
-#: classes/Subscription.php:190
+#: classes/Subscription.php:200
#, fuzzy
msgid "Couldn't delete subscription OMB token."
msgstr "예약 구독을 삭제 할 수 없습니다."
-#: classes/Subscription.php:201 lib/subs.php:69
+#: classes/Subscription.php:211
msgid "Couldn't delete subscription."
msgstr "예약 구독을 삭제 할 수 없습니다."
-#: classes/User.php:373
+#: classes/User.php:363
#, fuzzy, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "%2$s에서 %1$s까지 메시지"
-#: classes/User_group.php:477
+#: classes/User_group.php:480
msgid "Could not create group."
msgstr "새 그룹을 만들 수 없습니다."
-#: classes/User_group.php:486
+#: classes/User_group.php:489
#, fuzzy
msgid "Could not set group URI."
msgstr "그룹 맴버십을 세팅할 수 없습니다."
-#: classes/User_group.php:507
+#: classes/User_group.php:510
msgid "Could not set group membership."
msgstr "그룹 맴버십을 세팅할 수 없습니다."
-#: classes/User_group.php:521
+#: classes/User_group.php:524
#, fuzzy
msgid "Could not save local group info."
msgstr "구독을 저장할 수 없습니다."
@@ -4747,127 +4706,125 @@ msgstr "%1$s (%2$s)"
msgid "Untitled page"
msgstr "제목없는 페이지"
-#: lib/action.php:424
+#: lib/action.php:423
msgid "Primary site navigation"
msgstr "주 사이트 네비게이션"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:430
+#: lib/action.php:429
#, fuzzy
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr "개인 프로필과 친구 타임라인"
-#: lib/action.php:433
+#: lib/action.php:432
#, fuzzy
msgctxt "MENU"
msgid "Personal"
msgstr "개인적인"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:435
-#, fuzzy
+#: lib/action.php:434
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "당신의 이메일, 아바타, 비밀 번호, 프로필을 변경하세요."
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:440
+#: lib/action.php:439
#, fuzzy
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "서버에 재접속 할 수 없습니다 : %s"
-#: lib/action.php:443
+#: lib/action.php:442
msgid "Connect"
msgstr "연결"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:446
+#: lib/action.php:445
#, fuzzy
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "주 사이트 네비게이션"
-#: lib/action.php:449
+#: lib/action.php:448
#, fuzzy
msgctxt "MENU"
msgid "Admin"
msgstr "관리자"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:453
+#: lib/action.php:452
#, fuzzy, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "%s에 친구를 가입시키기 위해 친구와 동료를 초대합니다."
-#: lib/action.php:456
-#, fuzzy
+#: lib/action.php:455
msgctxt "MENU"
msgid "Invite"
msgstr "초대"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:462
+#: lib/action.php:461
#, fuzzy
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "이 사이트로부터 로그아웃"
-#: lib/action.php:465
+#: lib/action.php:464
#, fuzzy
msgctxt "MENU"
msgid "Logout"
msgstr "로그아웃"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:470
+#: lib/action.php:469
#, fuzzy
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "계정 만들기"
-#: lib/action.php:473
+#: lib/action.php:472
#, fuzzy
msgctxt "MENU"
msgid "Register"
msgstr "회원가입"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:476
+#: lib/action.php:475
#, fuzzy
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "이 사이트 로그인"
-#: lib/action.php:479
+#: lib/action.php:478
#, fuzzy
msgctxt "MENU"
msgid "Login"
msgstr "로그인"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:482
+#: lib/action.php:481
#, fuzzy
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "도움이 필요해!"
-#: lib/action.php:485
+#: lib/action.php:484
#, fuzzy
msgctxt "MENU"
msgid "Help"
msgstr "도움말"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:488
+#: lib/action.php:487
#, fuzzy
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "프로필이나 텍스트 검색"
-#: lib/action.php:491
+#: lib/action.php:490
#, fuzzy
msgctxt "MENU"
msgid "Search"
@@ -4875,60 +4832,60 @@ msgstr "검색"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:513 lib/adminpanelaction.php:398
+#: lib/action.php:512 lib/adminpanelaction.php:398
msgid "Site notice"
msgstr "사이트 공지"
-#: lib/action.php:579
+#: lib/action.php:578
msgid "Local views"
msgstr "로컬 뷰"
-#: lib/action.php:645
+#: lib/action.php:644
msgid "Page notice"
msgstr "페이지 공지"
-#: lib/action.php:747
+#: lib/action.php:746
msgid "Secondary site navigation"
msgstr "보조 사이트 네비게이션"
-#: lib/action.php:752
+#: lib/action.php:751
msgid "Help"
msgstr "도움말"
-#: lib/action.php:754
+#: lib/action.php:753
msgid "About"
msgstr "정보"
-#: lib/action.php:756
+#: lib/action.php:755
msgid "FAQ"
msgstr "자주 묻는 질문"
-#: lib/action.php:760
+#: lib/action.php:759
msgid "TOS"
msgstr ""
-#: lib/action.php:763
+#: lib/action.php:762
msgid "Privacy"
msgstr "개인정보 취급방침"
-#: lib/action.php:765
+#: lib/action.php:764
msgid "Source"
msgstr "소스 코드"
-#: lib/action.php:769
+#: lib/action.php:768
msgid "Contact"
msgstr "연락하기"
-#: lib/action.php:771
+#: lib/action.php:770
#, fuzzy
msgid "Badge"
msgstr "찔러 보기"
-#: lib/action.php:799
+#: lib/action.php:798
msgid "StatusNet software license"
msgstr "라코니카 소프트웨어 라이선스"
-#: lib/action.php:802
+#: lib/action.php:803
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4937,12 +4894,12 @@ msgstr ""
"**%%site.name%%** 는 [%%site.broughtby%%](%%site.broughtbyurl%%)가 제공하는 "
"마이크로블로깅서비스입니다."
-#: lib/action.php:804
+#: lib/action.php:805
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** 는 마이크로블로깅서비스입니다."
-#: lib/action.php:806
+#: lib/action.php:808
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4953,54 +4910,58 @@ msgstr ""
"을 사용합니다. StatusNet는 [GNU Affero General Public License](http://www."
"fsf.org/licensing/licenses/agpl-3.0.html) 라이선스에 따라 사용할 수 있습니다."
-#: lib/action.php:821
+#: lib/action.php:823
#, fuzzy
msgid "Site content license"
msgstr "라코니카 소프트웨어 라이선스"
-#: lib/action.php:826
+#: lib/action.php:828
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
-#: lib/action.php:831
+#: lib/action.php:833
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
-#: lib/action.php:834
+#: lib/action.php:836
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
-#: lib/action.php:847
+#: lib/action.php:849
msgid "All "
msgstr "모든 것"
-#: lib/action.php:853
+#: lib/action.php:855
msgid "license."
msgstr "라이선스"
-#: lib/action.php:1152
+#: lib/action.php:1154
msgid "Pagination"
msgstr "페이지수"
-#: lib/action.php:1161
+#: lib/action.php:1163
msgid "After"
msgstr "뒷 페이지"
-#: lib/action.php:1169
+#: lib/action.php:1171
msgid "Before"
msgstr "앞 페이지"
-#: lib/activity.php:453
+#: lib/activity.php:120
+msgid "Expecting a root feed element but got a whole XML document."
+msgstr ""
+
+#: lib/activityutils.php:208
msgid "Can't handle remote content yet."
msgstr ""
-#: lib/activity.php:481
+#: lib/activityutils.php:236
msgid "Can't handle embedded XML content yet."
msgstr ""
-#: lib/activity.php:485
+#: lib/activityutils.php:240
msgid "Can't handle embedded Base64 content yet."
msgstr ""
@@ -5105,7 +5066,7 @@ msgstr "SMS 인증"
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
-#: lib/apiauth.php:272
+#: lib/apiauth.php:276
#, php-format
msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s"
msgstr ""
@@ -5184,11 +5145,11 @@ msgstr "삭제"
msgid "Attachments"
msgstr ""
-#: lib/attachmentlist.php:265
+#: lib/attachmentlist.php:263
msgid "Author"
msgstr ""
-#: lib/attachmentlist.php:278
+#: lib/attachmentlist.php:276
#, fuzzy
msgid "Provider"
msgstr "프로필"
@@ -5211,37 +5172,51 @@ msgstr "비밀번호 변경"
msgid "Password changing is not allowed"
msgstr "비밀번호 변경"
-#: lib/channel.php:138 lib/channel.php:158
+#: lib/channel.php:157 lib/channel.php:177
msgid "Command results"
msgstr "실행결과"
-#: lib/channel.php:210 lib/mailhandler.php:142
+#: lib/channel.php:229 lib/mailhandler.php:142
msgid "Command complete"
msgstr "실행 완료"
-#: lib/channel.php:221
+#: lib/channel.php:240
msgid "Command failed"
msgstr "실행 실패"
-#: lib/command.php:44
-msgid "Sorry, this command is not yet implemented."
-msgstr "죄송합니다. 이 명령은 아직 실행되지 않았습니다."
+#: lib/command.php:83 lib/command.php:105
+#, fuzzy
+msgid "Notice with that id does not exist"
+msgstr "해당 id의 프로필이 없습니다."
+
+#: lib/command.php:99 lib/command.php:570
+msgid "User has no last notice"
+msgstr "이용자의 지속적인 게시글이 없습니다."
-#: lib/command.php:88
+#: lib/command.php:125
#, fuzzy, php-format
msgid "Could not find a user with nickname %s"
msgstr "이 이메일 주소로 사용자를 업데이트 할 수 없습니다."
-#: lib/command.php:92
+#: lib/command.php:143
+#, fuzzy, php-format
+msgid "Could not find a local user with nickname %s"
+msgstr "이 이메일 주소로 사용자를 업데이트 할 수 없습니다."
+
+#: lib/command.php:176
+msgid "Sorry, this command is not yet implemented."
+msgstr "죄송합니다. 이 명령은 아직 실행되지 않았습니다."
+
+#: lib/command.php:221
msgid "It does not make a lot of sense to nudge yourself!"
msgstr ""
-#: lib/command.php:99
+#: lib/command.php:228
#, fuzzy, php-format
msgid "Nudge sent to %s"
msgstr "찔러 보기를 보냈습니다."
-#: lib/command.php:126
+#: lib/command.php:254
#, php-format
msgid ""
"Subscriptions: %1$s\n"
@@ -5249,200 +5224,198 @@ msgid ""
"Notices: %3$s"
msgstr ""
-#: lib/command.php:152 lib/command.php:390 lib/command.php:451
-#, fuzzy
-msgid "Notice with that id does not exist"
-msgstr "해당 id의 프로필이 없습니다."
-
-#: lib/command.php:168 lib/command.php:406 lib/command.php:467
-#: lib/command.php:523
-msgid "User has no last notice"
-msgstr "이용자의 지속적인 게시글이 없습니다."
-
-#: lib/command.php:190
+#: lib/command.php:296
msgid "Notice marked as fave."
msgstr "게시글이 좋아하는 글로 지정되었습니다."
-#: lib/command.php:217
+#: lib/command.php:317
msgid "You are already a member of that group"
msgstr "당신은 이미 이 그룹의 멤버입니다."
-#: lib/command.php:231
+#: lib/command.php:331
#, php-format
msgid "Could not join user %s to group %s"
msgstr "그룹 %s에 %s는 가입할 수 없습니다."
-#: lib/command.php:236
+#: lib/command.php:336
#, php-format
msgid "%s joined group %s"
msgstr "%s 는 그룹 %s에 가입했습니다."
-#: lib/command.php:275
+#: lib/command.php:373
#, php-format
msgid "Could not remove user %s to group %s"
msgstr "그룹 %s에서 %s 사용자를 제거할 수 없습니다."
-#: lib/command.php:280
+#: lib/command.php:378
#, php-format
msgid "%s left group %s"
msgstr "%s가 그룹%s를 떠났습니다."
-#: lib/command.php:309
+#: lib/command.php:401
#, php-format
msgid "Fullname: %s"
msgstr "전체이름: %s"
-#: lib/command.php:312 lib/mail.php:258
+#: lib/command.php:404 lib/mail.php:258
#, php-format
msgid "Location: %s"
msgstr "위치: %s"
-#: lib/command.php:315 lib/mail.php:260
+#: lib/command.php:407 lib/mail.php:260
#, php-format
msgid "Homepage: %s"
msgstr "홈페이지: %s"
-#: lib/command.php:318
+#: lib/command.php:410
#, php-format
msgid "About: %s"
msgstr "자기소개: %s"
-#: lib/command.php:349
+#: lib/command.php:437
+#, php-format
+msgid ""
+"%s is a remote profile; you can only send direct messages to users on the "
+"same server."
+msgstr ""
+
+#: lib/command.php:450
#, fuzzy, php-format
msgid "Message too long - maximum is %d characters, you sent %d"
msgstr "당신이 보낸 메시지가 너무 길어요. 최대 140글자까지입니다."
-#: lib/command.php:367
+#: lib/command.php:468
#, php-format
msgid "Direct message to %s sent"
msgstr "%s에게 보낸 직접 메시지"
-#: lib/command.php:369
+#: lib/command.php:470
msgid "Error sending direct message."
msgstr "직접 메시지 보내기 오류."
-#: lib/command.php:413
+#: lib/command.php:490
#, fuzzy
msgid "Cannot repeat your own notice"
msgstr "알림을 켤 수 없습니다."
-#: lib/command.php:418
+#: lib/command.php:495
#, fuzzy
msgid "Already repeated that notice"
msgstr "이 게시글 삭제하기"
-#: lib/command.php:426
+#: lib/command.php:503
#, fuzzy, php-format
msgid "Notice from %s repeated"
msgstr "게시글이 등록되었습니다."
-#: lib/command.php:428
+#: lib/command.php:505
#, fuzzy
msgid "Error repeating notice."
msgstr "통지를 저장하는데 문제가 발생했습니다."
-#: lib/command.php:482
+#: lib/command.php:536
#, fuzzy, php-format
msgid "Notice too long - maximum is %d characters, you sent %d"
msgstr "당신이 보낸 메시지가 너무 길어요. 최대 140글자까지입니다."
-#: lib/command.php:491
+#: lib/command.php:545
#, fuzzy, php-format
msgid "Reply to %s sent"
msgstr "이 게시글에 대해 답장하기"
-#: lib/command.php:493
+#: lib/command.php:547
#, fuzzy
msgid "Error saving notice."
msgstr "통지를 저장하는데 문제가 발생했습니다."
-#: lib/command.php:547
+#: lib/command.php:594
msgid "Specify the name of the user to subscribe to"
msgstr "구독하려는 사용자의 이름을 지정하십시오."
-#: lib/command.php:554 lib/command.php:589
-msgid "No such user"
-msgstr "그러한 사용자는 없습니다."
+#: lib/command.php:602
+#, fuzzy
+msgid "Can't subscribe to OMB profiles by command."
+msgstr "당신은 이 프로필에 구독되지 않고있습니다."
-#: lib/command.php:561
+#: lib/command.php:608
#, php-format
msgid "Subscribed to %s"
msgstr "%s에게 구독되었습니다."
-#: lib/command.php:582 lib/command.php:685
+#: lib/command.php:629 lib/command.php:728
msgid "Specify the name of the user to unsubscribe from"
msgstr "구독을 해제하려는 사용자의 이름을 지정하십시오."
-#: lib/command.php:595
+#: lib/command.php:638
#, php-format
msgid "Unsubscribed from %s"
msgstr "%s에서 구독을 해제했습니다."
-#: lib/command.php:613 lib/command.php:636
+#: lib/command.php:656 lib/command.php:679
msgid "Command not yet implemented."
msgstr "명령이 아직 실행되지 않았습니다."
-#: lib/command.php:616
+#: lib/command.php:659
msgid "Notification off."
msgstr "알림끄기."
-#: lib/command.php:618
+#: lib/command.php:661
msgid "Can't turn off notification."
msgstr "알림을 끌 수 없습니다."
-#: lib/command.php:639
+#: lib/command.php:682
msgid "Notification on."
msgstr "알림이 켜졌습니다."
-#: lib/command.php:641
+#: lib/command.php:684
msgid "Can't turn on notification."
msgstr "알림을 켤 수 없습니다."
-#: lib/command.php:654
+#: lib/command.php:697
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:665
+#: lib/command.php:708
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:692
+#: lib/command.php:735
#, fuzzy, php-format
msgid "Unsubscribed %s"
msgstr "%s에서 구독을 해제했습니다."
-#: lib/command.php:709
+#: lib/command.php:752
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "당신은 이 프로필에 구독되지 않고있습니다."
-#: lib/command.php:711
+#: lib/command.php:754
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "당신은 다음 사용자를 이미 구독하고 있습니다."
-#: lib/command.php:731
+#: lib/command.php:774
#, fuzzy
msgid "No one is subscribed to you."
msgstr "다른 사람을 구독 하실 수 없습니다."
-#: lib/command.php:733
+#: lib/command.php:776
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "다른 사람을 구독 하실 수 없습니다."
-#: lib/command.php:753
+#: lib/command.php:796
#, fuzzy
msgid "You are not a member of any groups."
msgstr "당신은 해당 그룹의 멤버가 아닙니다."
-#: lib/command.php:755
+#: lib/command.php:798
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "당신은 해당 그룹의 멤버가 아닙니다."
-#: lib/command.php:769
+#: lib/command.php:812
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5484,20 +5457,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:148
+#: lib/common.php:135
#, fuzzy
msgid "No configuration file found. "
msgstr "확인 코드가 없습니다."
-#: lib/common.php:149
+#: lib/common.php:136
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:151
+#: lib/common.php:138
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:152
+#: lib/common.php:139
#, fuzzy
msgid "Go to the installer."
msgstr "이 사이트 로그인"
@@ -5678,49 +5651,49 @@ msgstr "%s 그룹 게시글의 태그"
msgid "This page is not available in a media type you accept"
msgstr "이 페이지는 귀하가 승인한 미디어 타입에서는 이용할 수 없습니다."
-#: lib/imagefile.php:75
+#: lib/imagefile.php:72
+msgid "Unsupported image file format."
+msgstr "지원하지 않는 그림 파일 형식입니다."
+
+#: lib/imagefile.php:88
#, fuzzy, php-format
msgid "That file is too big. The maximum file size is %s."
msgstr "당신그룹의 로고 이미지를 업로드할 수 있습니다."
-#: lib/imagefile.php:80
+#: lib/imagefile.php:93
msgid "Partial upload."
msgstr "불완전한 업로드."
-#: lib/imagefile.php:88 lib/mediafile.php:170
+#: lib/imagefile.php:101 lib/mediafile.php:170
msgid "System error uploading file."
msgstr "파일을 올리는데 시스템 오류 발생"
-#: lib/imagefile.php:96
+#: lib/imagefile.php:109
msgid "Not an image or corrupt file."
msgstr "그림 파일이 아니거나 손상된 파일 입니다."
-#: lib/imagefile.php:109
-msgid "Unsupported image file format."
-msgstr "지원하지 않는 그림 파일 형식입니다."
-
#: lib/imagefile.php:122
msgid "Lost our file."
msgstr "파일을 잃어버렸습니다."
-#: lib/imagefile.php:166 lib/imagefile.php:231
+#: lib/imagefile.php:163 lib/imagefile.php:224
msgid "Unknown file type"
msgstr "알 수 없는 종류의 파일입니다"
-#: lib/imagefile.php:251
+#: lib/imagefile.php:244
msgid "MB"
msgstr ""
-#: lib/imagefile.php:253
+#: lib/imagefile.php:246
msgid "kB"
msgstr ""
-#: lib/jabber.php:220
+#: lib/jabber.php:387
#, php-format
msgid "[%s]"
msgstr ""
-#: lib/jabber.php:400
+#: lib/jabber.php:567
#, php-format
msgid "Unknown inbox source %d."
msgstr ""
@@ -5923,7 +5896,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:482
+#: lib/mailbox.php:227 lib/noticelist.php:486
#, fuzzy
msgid "from"
msgstr "다음에서:"
@@ -6053,51 +6026,51 @@ msgid ""
"try again later"
msgstr ""
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr ""
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
#, fuzzy
msgid "N"
msgstr "아니오"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "S"
msgstr ""
-#: lib/noticelist.php:431
+#: lib/noticelist.php:432
msgid "E"
msgstr ""
-#: lib/noticelist.php:431
+#: lib/noticelist.php:432
msgid "W"
msgstr ""
-#: lib/noticelist.php:438
+#: lib/noticelist.php:439
msgid "at"
msgstr ""
-#: lib/noticelist.php:566
+#: lib/noticelist.php:570
#, fuzzy
msgid "in context"
msgstr "내용이 없습니다!"
-#: lib/noticelist.php:601
+#: lib/noticelist.php:605
#, fuzzy
msgid "Repeated by"
msgstr "생성"
-#: lib/noticelist.php:628
+#: lib/noticelist.php:632
msgid "Reply to this notice"
msgstr "이 게시글에 대해 답장하기"
-#: lib/noticelist.php:629
+#: lib/noticelist.php:633
msgid "Reply"
msgstr "답장하기"
-#: lib/noticelist.php:673
+#: lib/noticelist.php:677
#, fuzzy
msgid "Notice repeated"
msgstr "게시글이 등록되었습니다."
@@ -6173,7 +6146,7 @@ msgstr "%s의 게시글의 태그"
msgid "Unknown"
msgstr "알려지지 않은 행동"
-#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr "구독"
@@ -6181,7 +6154,7 @@ msgstr "구독"
msgid "All subscriptions"
msgstr "모든 예약 구독"
-#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90
+#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr "구독자"
@@ -6189,16 +6162,21 @@ msgstr "구독자"
msgid "All subscribers"
msgstr "모든 구독자"
-#: lib/profileaction.php:180
+#: lib/profileaction.php:186
#, fuzzy
msgid "User ID"
msgstr "이용자"
-#: lib/profileaction.php:185
+#: lib/profileaction.php:191
msgid "Member since"
msgstr "가입한 때"
-#: lib/profileaction.php:247
+#. TRANS: Average count of posts made per day since account registration
+#: lib/profileaction.php:230
+msgid "Daily average"
+msgstr ""
+
+#: lib/profileaction.php:259
msgid "All groups"
msgstr "모든 그룹"
@@ -6246,7 +6224,7 @@ msgstr "이 게시글에 대해 답장하기"
msgid "Revoke the \"%s\" role from this user"
msgstr "이 그룹의 회원리스트"
-#: lib/router.php:671
+#: lib/router.php:704
msgid "No single user defined for single-user mode."
msgstr ""
@@ -6380,93 +6358,102 @@ msgstr "이 사용자로부터 구독취소합니다."
msgid "Unsubscribe"
msgstr "구독 해제"
-#: lib/userprofile.php:116
+#: lib/usernoprofileexception.php:58
+#, fuzzy, php-format
+msgid "User %s (%d) has no profile record."
+msgstr "이용자가 프로필을 가지고 있지 않습니다."
+
+#: lib/userprofile.php:117
#, fuzzy
msgid "Edit Avatar"
msgstr "아바타"
-#: lib/userprofile.php:236
+#: lib/userprofile.php:234 lib/userprofile.php:248
msgid "User actions"
msgstr "사용자 동작"
-#: lib/userprofile.php:251
+#: lib/userprofile.php:237
+msgid "User deletion in progress..."
+msgstr ""
+
+#: lib/userprofile.php:263
#, fuzzy
msgid "Edit profile settings"
msgstr "프로필 세팅"
-#: lib/userprofile.php:252
+#: lib/userprofile.php:264
msgid "Edit"
msgstr ""
-#: lib/userprofile.php:275
+#: lib/userprofile.php:287
msgid "Send a direct message to this user"
msgstr "이 회원에게 직접 메시지를 보냅니다."
-#: lib/userprofile.php:276
+#: lib/userprofile.php:288
msgid "Message"
msgstr "메시지"
-#: lib/userprofile.php:314
+#: lib/userprofile.php:326
msgid "Moderate"
msgstr ""
-#: lib/userprofile.php:352
+#: lib/userprofile.php:364
#, fuzzy
msgid "User role"
msgstr "이용자 프로필"
-#: lib/userprofile.php:354
+#: lib/userprofile.php:366
#, fuzzy
msgctxt "role"
msgid "Administrator"
msgstr "관리자"
-#: lib/userprofile.php:355
+#: lib/userprofile.php:367
msgctxt "role"
msgid "Moderator"
msgstr ""
-#: lib/util.php:1015
+#: lib/util.php:1046
msgid "a few seconds ago"
msgstr "몇 초 전"
-#: lib/util.php:1017
+#: lib/util.php:1048
msgid "about a minute ago"
msgstr "1분 전"
-#: lib/util.php:1019
+#: lib/util.php:1050
#, php-format
msgid "about %d minutes ago"
msgstr "%d분 전"
-#: lib/util.php:1021
+#: lib/util.php:1052
msgid "about an hour ago"
msgstr "1시간 전"
-#: lib/util.php:1023
+#: lib/util.php:1054
#, php-format
msgid "about %d hours ago"
msgstr "%d시간 전"
-#: lib/util.php:1025
+#: lib/util.php:1056
msgid "about a day ago"
msgstr "하루 전"
-#: lib/util.php:1027
+#: lib/util.php:1058
#, php-format
msgid "about %d days ago"
msgstr "%d일 전"
-#: lib/util.php:1029
+#: lib/util.php:1060
msgid "about a month ago"
msgstr "1달 전"
-#: lib/util.php:1031
+#: lib/util.php:1062
#, php-format
msgid "about %d months ago"
msgstr "%d달 전"
-#: lib/util.php:1033
+#: lib/util.php:1064
msgid "about a year ago"
msgstr "1년 전"
@@ -6480,7 +6467,7 @@ msgstr "홈페이지 주소형식이 올바르지 않습니다."
msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr ""
-#: lib/xmppmanager.php:402
+#: lib/xmppmanager.php:403
#, fuzzy, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d."
msgstr "당신이 보낸 메시지가 너무 길어요. 최대 140글자까지입니다."
diff --git a/locale/mk/LC_MESSAGES/statusnet.po b/locale/mk/LC_MESSAGES/statusnet.po
index 74b9cb228..a2b691bfd 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-03-06 23:49+0000\n"
-"PO-Revision-Date: 2010-03-06 23:50:24+0000\n"
+"POT-Creation-Date: 2010-04-06 22:53+0000\n"
+"PO-Revision-Date: 2010-04-06 22:54:54+0000\n"
"Language-Team: Macedonian\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64665); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: mk\n"
"X-Message-Group: out-statusnet\n"
@@ -93,9 +93,9 @@ msgstr "Нема таква страница"
#: 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:90
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78
+#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
@@ -104,10 +104,8 @@ msgstr "Нема таква страница"
#: actions/remotesubscribe.php:154 actions/replies.php:73
#: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:163 lib/command.php:302
-#: lib/command.php:355 lib/command.php:401 lib/command.php:462
-#: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82
-#: lib/profileaction.php:77
+#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: lib/mailbox.php:82 lib/profileaction.php:77
msgid "No such user."
msgstr "Нема таков корисник."
@@ -203,18 +201,18 @@ msgstr "Подновувања од %1$s и пријатели на %2$s!"
#: 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:132
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:136
#: actions/apigrouplistall.php:120 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:135
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
-#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184
-#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148
+#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:174
+#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173
+#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
-#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
+#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
msgid "API method not found."
msgstr "API методот не е пронајден."
@@ -227,8 +225,8 @@ msgstr "API методот не е пронајден."
#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65
-#: actions/apistatusesupdate.php:118
+#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
msgid "This method requires a POST."
msgstr "Овој метод бара POST."
@@ -259,7 +257,7 @@ msgid "Could not save profile."
msgstr "Не може да се зачува профил."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:97
+#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
#: actions/designadminpanel.php:122 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
@@ -346,7 +344,7 @@ msgstr "Нема пронајдено статус со таков ID."
msgid "This status is already a favorite."
msgstr "Овој статус веќе Ви е омилен."
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
msgid "Could not create favorite."
msgstr "Не можам да создадам омилина забелешка."
@@ -465,7 +463,7 @@ msgstr "Групата не е пронајдена!"
msgid "You are already a member of that group."
msgstr "Веќе членувате во таа група."
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:221
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
msgid "You have been blocked from that group by the admin."
msgstr "Блокирани сте од таа група од администраторот."
@@ -483,11 +481,18 @@ msgstr "Не членувате во оваа група."
msgid "Could not remove user %1$s from group %2$s."
msgstr "Не можев да го отстранам корисникот %1$s од групата %2$s."
-#: actions/apigrouplist.php:95
+#. TRANS: %s is a user name
+#: actions/apigrouplist.php:97
#, 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
+#, php-format
+msgid "%1$s groups %2$s is a member of."
+msgstr "%1$s групи кадешто членува %2$s."
+
#: actions/apigrouplistall.php:90 actions/usergroups.php:62
#, php-format
msgid "%s groups"
@@ -515,7 +520,7 @@ msgstr "Погрешен жетон."
#: 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:337
+#: actions/profilesettings.php:194 actions/recoverpassword.php:350
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
@@ -578,15 +583,15 @@ msgstr ""
"<strong>%3$s</strong> податоците за Вашата %4$s сметка. Треба да дозволувате "
"пристап до Вашата %4$s сметка само на трети страни на кои им верувате."
-#: actions/apioauthauthorize.php:310 lib/action.php:438
+#: actions/apioauthauthorize.php:310 lib/action.php:437
msgid "Account"
msgstr "Сметка"
#: actions/apioauthauthorize.php:313 actions/login.php:230
#: actions/profilesettings.php:106 actions/register.php:424
-#: actions/showgroup.php:244 actions/tagother.php:94
+#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
-#: lib/userprofile.php:131
+#: lib/userprofile.php:132
msgid "Nickname"
msgstr "Прекар"
@@ -657,12 +662,12 @@ msgstr ""
msgid "Unsupported format."
msgstr "Неподдржан формат."
-#: actions/apitimelinefavorites.php:108
+#: actions/apitimelinefavorites.php:109
#, php-format
msgid "%1$s / Favorites from %2$s"
msgstr "%1$s / Омилени од %2$s"
-#: actions/apitimelinefavorites.php:117
+#: actions/apitimelinefavorites.php:118
#, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "Подновувања на %1$s омилени на %2$s / %2$s."
@@ -672,7 +677,7 @@ msgstr "Подновувања на %1$s омилени на %2$s / %2$s."
msgid "%1$s / Updates mentioning %2$s"
msgstr "%1$s / Подновувања кои споменуваат %2$s"
-#: actions/apitimelinementions.php:127
+#: actions/apitimelinementions.php:130
#, php-format
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "%1$s подновувања коишто се одговор на подновувањата од %2$s / %3$s."
@@ -682,7 +687,7 @@ msgstr "%1$s подновувања коишто се одговор на под
msgid "%s public timeline"
msgstr "Јавна историја на %s"
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "%s подновуввања од сите!"
@@ -697,12 +702,12 @@ msgstr "Повторено за %s"
msgid "Repeats of %s"
msgstr "Повторувања на %s"
-#: actions/apitimelinetag.php:102 actions/tag.php:67
+#: actions/apitimelinetag.php:104 actions/tag.php:67
#, php-format
msgid "Notices tagged with %s"
msgstr "Забелешки означени со %s"
-#: actions/apitimelinetag.php:104 actions/tagrss.php:65
+#: actions/apitimelinetag.php:106 actions/tagrss.php:65
#, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Подновувањата се означени со %1$s на %2$s!"
@@ -730,7 +735,7 @@ msgstr "Нема големина."
msgid "Invalid size."
msgstr "Погрешна големина."
-#: actions/avatarsettings.php:67 actions/showgroup.php:229
+#: actions/avatarsettings.php:67 actions/showgroup.php:230
#: lib/accountsettingsaction.php:112
msgid "Avatar"
msgstr "Аватар"
@@ -764,7 +769,7 @@ msgid "Preview"
msgstr "Преглед"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:655
+#: lib/deleteuserform.php:66 lib/noticelist.php:659
msgid "Delete"
msgstr "Бриши"
@@ -776,23 +781,27 @@ msgstr "Подигни"
msgid "Crop"
msgstr "Отсечи"
-#: actions/avatarsettings.php:328
+#: actions/avatarsettings.php:305
+msgid "No file uploaded."
+msgstr "Нема подигнато податотека."
+
+#: actions/avatarsettings.php:332
msgid "Pick a square area of the image to be your avatar"
msgstr "Одберете квадратна површина од сликата за аватар"
-#: actions/avatarsettings.php:343 actions/grouplogo.php:380
+#: actions/avatarsettings.php:347 actions/grouplogo.php:380
msgid "Lost our file data."
msgstr "Податоците за податотеката се изгубени."
-#: actions/avatarsettings.php:366
+#: actions/avatarsettings.php:370
msgid "Avatar updated."
msgstr "Аватарот е подновен."
-#: actions/avatarsettings.php:369
+#: actions/avatarsettings.php:373
msgid "Failed updating avatar."
msgstr "Подновата на аватарот не успеа."
-#: actions/avatarsettings.php:393
+#: actions/avatarsettings.php:397
msgid "Avatar deleted."
msgstr "Аватарот е избришан."
@@ -831,7 +840,7 @@ msgstr "Не го блокирај корисников"
msgid "Yes"
msgstr "Да"
-#: actions/block.php:144 actions/groupmembers.php:355 lib/blockform.php:80
+#: actions/block.php:144 actions/groupmembers.php:373 lib/blockform.php:80
msgid "Block this user"
msgstr "Блокирај го корисников"
@@ -848,8 +857,8 @@ msgstr "Не можев да ги снимам инофрмациите за б
#: actions/groupunblock.php:86 actions/joingroup.php:82
#: actions/joingroup.php:93 actions/leavegroup.php:82
#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212
-#: lib/command.php:260
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162
+#: lib/command.php:358
msgid "No such group."
msgstr "Нема таква група."
@@ -931,7 +940,7 @@ msgid "Conversation"
msgstr "Разговор"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:218 lib/searchgroupnav.php:82
+#: lib/profileaction.php:229 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "Забелешки"
@@ -950,7 +959,7 @@ msgstr "Не сте сопственик на овој програм."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1217
+#: lib/action.php:1219
msgid "There was a problem with your session token."
msgstr "Се појави проблем со Вашиот сесиски жетон."
@@ -1011,7 +1020,7 @@ msgstr "Дали сте сигурни дека сакате да ја избр
msgid "Do not delete this notice"
msgstr "Не ја бриши оваа забелешка"
-#: actions/deletenotice.php:146 lib/noticelist.php:655
+#: actions/deletenotice.php:146 lib/noticelist.php:659
msgid "Delete this notice"
msgstr "Бриши ја оваа забелешка"
@@ -1148,7 +1157,7 @@ msgstr "Врати по основно"
#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:208
+#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
#: actions/tagother.php:154 actions/useradminpanel.php:294
#: lib/applicationeditform.php:333 lib/applicationeditform.php:334
#: lib/designsettings.php:256 lib/groupeditform.php:202
@@ -1264,7 +1273,7 @@ msgstr "описот е предолг (максимум %d знаци)"
msgid "Could not update group."
msgstr "Не можев да ја подновам групата."
-#: actions/editgroup.php:264 classes/User_group.php:493
+#: actions/editgroup.php:264 classes/User_group.php:496
msgid "Could not create aliases."
msgstr "Не можеше да се создадат алијаси."
@@ -1568,11 +1577,11 @@ msgstr "Не можев да ги претворам жетоните за ба
#: actions/finishremotesubscribe.php:118
msgid "Remote service uses unknown version of OMB protocol."
-msgstr "Оддалечената служба користи непозната верзија на OMB протокол."
+msgstr "Далечинската служба користи непозната верзија на OMB протокол."
#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
msgid "Error updating remote profile"
-msgstr "Грешка во подновувањето на оддалечениот профил"
+msgstr "Грешка во подновувањето на далечинскиот профил"
#: actions/getfile.php:79
msgid "No such file."
@@ -1627,7 +1636,7 @@ msgstr "Корисникот е веќе блокиран од оваа груп
msgid "User is not a member of group."
msgstr "Корисникот не членува во групата."
-#: actions/groupblock.php:136 actions/groupmembers.php:323
+#: actions/groupblock.php:136 actions/groupmembers.php:341
msgid "Block user from group"
msgstr "Блокирај корисник од група"
@@ -1731,19 +1740,19 @@ msgstr "Листа на корисниците на овааг група."
msgid "Admin"
msgstr "Администратор"
-#: actions/groupmembers.php:355 lib/blockform.php:69
+#: actions/groupmembers.php:373 lib/blockform.php:69
msgid "Block"
msgstr "Блокирај"
-#: actions/groupmembers.php:450
+#: actions/groupmembers.php:468
msgid "Make user an admin of the group"
msgstr "Направи го корисникот администратор на групата"
-#: actions/groupmembers.php:482
+#: actions/groupmembers.php:500
msgid "Make Admin"
msgstr "Направи го/ја администратор"
-#: actions/groupmembers.php:482
+#: actions/groupmembers.php:500
msgid "Make this user an admin"
msgstr "Направи го корисникот администратор"
@@ -1758,7 +1767,7 @@ msgstr "Историја на %s"
msgid "Updates from members of %1$s on %2$s!"
msgstr "Подновувања од членови на %1$s на %2$s!"
-#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232
+#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249
#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr "Групи"
@@ -1973,7 +1982,7 @@ msgstr "Покани нови корисници"
msgid "You are already subscribed to these users:"
msgstr "Веќе сте претплатени на овие корисници:"
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
#, php-format
msgid "%1$s (%2$s)"
msgstr "%1$s (%2$s)"
@@ -2104,7 +2113,7 @@ msgstr "%1$s се зачлени во групата %2$s"
msgid "You must be logged in to leave a group."
msgstr "Мора да сте најавени за да можете да ја напуштите групата."
-#: actions/leavegroup.php:100 lib/command.php:265
+#: actions/leavegroup.php:100 lib/command.php:363
msgid "You are not a member of that group."
msgstr "Не членувате во таа група."
@@ -2219,12 +2228,12 @@ msgstr "Овој образец служи за создавање нова гр
msgid "New message"
msgstr "Нова порака"
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
msgid "You can't send a message to this user."
msgstr "Не можете да испратите порака до овојо корисник."
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342
-#: lib/command.php:475
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
+#: lib/command.php:529
msgid "No content!"
msgstr "Нема содржина!"
@@ -2232,7 +2241,7 @@ msgstr "Нема содржина!"
msgid "No recipient specified."
msgstr "Нема назначено примач."
-#: actions/newmessage.php:164 lib/command.php:361
+#: actions/newmessage.php:164 lib/command.php:462
msgid ""
"Don't send a message to yourself; just say it to yourself quietly instead."
msgstr ""
@@ -2248,7 +2257,7 @@ msgstr "Пораката е испратена"
msgid "Direct message to %s sent."
msgstr "Директната порака до %s е испратена."
-#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189
msgid "Ajax Error"
msgstr "Ajax-грешка"
@@ -2256,7 +2265,7 @@ msgstr "Ajax-грешка"
msgid "New notice"
msgstr "Ново забелешка"
-#: actions/newnotice.php:211
+#: actions/newnotice.php:217
msgid "Notice posted"
msgstr "Забелешката е објавена"
@@ -2369,7 +2378,7 @@ msgstr ""
msgid "Notice has no profile"
msgstr "Забелешката нема профил"
-#: actions/oembed.php:86 actions/shownotice.php:180
+#: actions/oembed.php:86 actions/shownotice.php:175
#, php-format
msgid "%1$s's status on %2$s"
msgstr "%1$s статус на %2$s"
@@ -2382,8 +2391,8 @@ msgstr "тип на содржини "
msgid "Only "
msgstr "Само "
-#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042
-#: lib/apiaction.php:1070 lib/apiaction.php:1179
+#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1068
+#: lib/apiaction.php:1096 lib/apiaction.php:1212
msgid "Not a supported data format."
msgstr "Ова не е поддржан формат на податотека."
@@ -2516,7 +2525,7 @@ msgstr "Неточна стара лозинка"
msgid "Error saving user; invalid."
msgstr "Грешка во зачувувањето на корисникот; неправилен."
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
msgid "Can't save new password."
msgstr "Не можам да ја зачувам новата лозинка."
@@ -2691,12 +2700,12 @@ msgstr ""
msgid "People search"
msgstr "Пребарување на луѓе"
-#: actions/peopletag.php:70
+#: actions/peopletag.php:68
#, php-format
msgid "Not a valid people tag: %s"
msgstr "Не е важечка ознака за луѓе: %s"
-#: actions/peopletag.php:144
+#: actions/peopletag.php:142
#, php-format
msgid "Users self-tagged with %1$s - page %2$d"
msgstr "Користници самоозначени со %1$s - стр. %2$d"
@@ -2732,8 +2741,8 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr "1-64 мали букви или бројки. Без интерпукциски знаци и празни места."
#: actions/profilesettings.php:111 actions/register.php:448
-#: actions/showgroup.php:255 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:149
+#: actions/showgroup.php:256 actions/tagother.php:104
+#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Цело име"
@@ -2760,9 +2769,9 @@ msgid "Bio"
msgstr "Биографија"
#: actions/profilesettings.php:132 actions/register.php:471
-#: actions/showgroup.php:264 actions/tagother.php:112
+#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
-#: lib/userprofile.php:164
+#: lib/userprofile.php:165
msgid "Location"
msgstr "Локација"
@@ -2776,7 +2785,7 @@ msgstr "Сподели ја мојата тековна локација при
#: actions/profilesettings.php:145 actions/tagother.php:149
#: actions/tagother.php:209 lib/subscriptionlist.php:106
-#: lib/subscriptionlist.php:108 lib/userprofile.php:209
+#: lib/subscriptionlist.php:108 lib/userprofile.php:210
msgid "Tags"
msgstr "Ознаки"
@@ -3021,7 +3030,7 @@ msgstr "Рестетирај ја лозинката"
msgid "Recover password"
msgstr "Пронаоѓање на лозинка"
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
msgid "Password recovery requested"
msgstr "Побарано е пронаоѓање на лозинката"
@@ -3041,19 +3050,19 @@ msgstr "Врати одново"
msgid "Enter a nickname or email address."
msgstr "Внесете прекар или е-пошта"
-#: actions/recoverpassword.php:272
+#: actions/recoverpassword.php:282
msgid "No user with that email address or username."
msgstr "Нема корисник со таа е-поштенска адреса или корисничко име."
-#: actions/recoverpassword.php:287
+#: actions/recoverpassword.php:299
msgid "No registered email address for that user."
msgstr "Нема регистрирана адреса за е-пошта за тој корисник."
-#: actions/recoverpassword.php:301
+#: actions/recoverpassword.php:313
msgid "Error saving address confirmation."
msgstr "Грешка при зачувувањето на потврдата за адреса."
-#: actions/recoverpassword.php:325
+#: actions/recoverpassword.php:338
msgid ""
"Instructions for recovering your password have been sent to the email "
"address registered to your account."
@@ -3061,23 +3070,23 @@ msgstr ""
"Упатството за пронаоѓање на Вашата лозинка е испратено до адресата за е-"
"пошта што е регистрирана со Вашата сметка."
-#: actions/recoverpassword.php:344
+#: actions/recoverpassword.php:357
msgid "Unexpected password reset."
msgstr "Неочекувано подновување на лозинката."
-#: actions/recoverpassword.php:352
+#: actions/recoverpassword.php:365
msgid "Password must be 6 chars or more."
msgstr "Лозинката мора да биде од најмалку 6 знаци."
-#: actions/recoverpassword.php:356
+#: actions/recoverpassword.php:369
msgid "Password and confirmation do not match."
msgstr "Двете лозинки не се совпаѓаат."
-#: actions/recoverpassword.php:375 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:248
msgid "Error setting user."
msgstr "Грешка во поставувањето на корисникот."
-#: actions/recoverpassword.php:382
+#: actions/recoverpassword.php:395
msgid "New password successfully saved. You are now logged in."
msgstr "Новата лозинка е успешно зачувана. Сега сте најавени."
@@ -3224,7 +3233,7 @@ msgstr "Оддалечена претплата"
#: actions/remotesubscribe.php:124
msgid "Subscribe to a remote user"
-msgstr "Претплати се на оддалечен корисник"
+msgstr "Претплати се на далечински корисник"
#: actions/remotesubscribe.php:129
msgid "User nickname"
@@ -3243,7 +3252,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "URL на Вашиот профил на друга компатибилна служба за микроблогирање."
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:394
+#: lib/userprofile.php:406
msgid "Subscribe"
msgstr "Претплати се"
@@ -3281,7 +3290,7 @@ msgstr "Не можете да повторувате сопствена заб
msgid "You already repeated that notice."
msgstr "Веќе ја имате повторено таа забелешка."
-#: actions/repeat.php:114 lib/noticelist.php:674
+#: actions/repeat.php:114 lib/noticelist.php:678
msgid "Repeated"
msgstr "Повторено"
@@ -3424,8 +3433,8 @@ msgstr "Организација"
msgid "Description"
msgstr "Опис"
-#: actions/showapplication.php:192 actions/showgroup.php:438
-#: lib/profileaction.php:176
+#: actions/showapplication.php:192 actions/showgroup.php:444
+#: lib/profileaction.php:187
msgid "Statistics"
msgstr "Статистики"
@@ -3547,67 +3556,67 @@ msgstr "Група %s"
msgid "%1$s group, page %2$d"
msgstr "Група %1$s, стр. %2$d"
-#: actions/showgroup.php:226
+#: actions/showgroup.php:227
msgid "Group profile"
msgstr "Профил на група"
-#: actions/showgroup.php:271 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:177
+#: actions/showgroup.php:272 actions/tagother.php:118
+#: actions/userauthorization.php:175 lib/userprofile.php:178
msgid "URL"
msgstr "URL"
-#: actions/showgroup.php:282 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:194
+#: actions/showgroup.php:283 actions/tagother.php:128
+#: actions/userauthorization.php:187 lib/userprofile.php:195
msgid "Note"
msgstr "Забелешка"
-#: actions/showgroup.php:292 lib/groupeditform.php:184
+#: actions/showgroup.php:293 lib/groupeditform.php:184
msgid "Aliases"
msgstr "Алијаси"
-#: actions/showgroup.php:301
+#: actions/showgroup.php:302
msgid "Group actions"
msgstr "Групни дејства"
-#: actions/showgroup.php:337
+#: actions/showgroup.php:338
#, php-format
msgid "Notice feed for %s group (RSS 1.0)"
msgstr "Канал со забелешки за групата %s (RSS 1.0)"
-#: actions/showgroup.php:343
+#: actions/showgroup.php:344
#, php-format
msgid "Notice feed for %s group (RSS 2.0)"
msgstr "Канал со забелешки за групата %s (RSS 2.0)"
-#: actions/showgroup.php:349
+#: actions/showgroup.php:350
#, php-format
msgid "Notice feed for %s group (Atom)"
msgstr "Канал со забелешки за групата%s (Atom)"
-#: actions/showgroup.php:354
+#: actions/showgroup.php:355
#, php-format
msgid "FOAF for %s group"
msgstr "FOAF за групата %s"
-#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91
+#: actions/showgroup.php:393 actions/showgroup.php:453 lib/groupnav.php:91
msgid "Members"
msgstr "Членови"
-#: actions/showgroup.php:395 lib/profileaction.php:117
-#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95
-#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71
+#: actions/showgroup.php:398 lib/profileaction.php:117
+#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95
+#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
msgid "(None)"
msgstr "(Нема)"
-#: actions/showgroup.php:401
+#: actions/showgroup.php:404
msgid "All members"
msgstr "Сите членови"
-#: actions/showgroup.php:441
+#: actions/showgroup.php:447
msgid "Created"
msgstr "Создадено"
-#: actions/showgroup.php:457
+#: actions/showgroup.php:463
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3623,7 +3632,7 @@ msgstr ""
"се](%%%%action.register%%%%) за да станете дел од оваа група и многу повеќе! "
"([Прочитајте повеќе](%%%%doc.help%%%%))"
-#: actions/showgroup.php:463
+#: actions/showgroup.php:469
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3636,7 +3645,7 @@ msgstr ""
"слободната програмска алатка [StatusNet](http://status.net/). Нејзините "
"членови си разменуваат кратки пораки за нивниот живот и интереси. "
-#: actions/showgroup.php:491
+#: actions/showgroup.php:497
msgid "Admins"
msgstr "Администратори"
@@ -3775,8 +3784,8 @@ msgid "Unknown language \"%s\"."
msgstr "Непознат јазик „%s“"
#: actions/siteadminpanel.php:165
-msgid "Minimum text limit is 140 characters."
-msgstr "Минималното ограничување на текстот изнесува 140 знаци."
+msgid "Minimum text limit is 0 (unlimited)."
+msgstr "Минималниот дозволен текст изнесува 0 (неограничено)."
#: actions/siteadminpanel.php:171
msgid "Dupe limit must 1 or more seconds."
@@ -4051,8 +4060,7 @@ msgstr "Зачувај поставки за снимки"
msgid "You are not subscribed to that profile."
msgstr "Не сте претплатени на тој профил."
-#: actions/subedit.php:83 classes/Subscription.php:89
-#: classes/Subscription.php:116
+#: actions/subedit.php:83 classes/Subscription.php:132
msgid "Could not save subscription."
msgstr "Не можев да ја зачувам претплатата."
@@ -4067,7 +4075,7 @@ msgstr "Нема таков профил."
#: actions/subscribe.php:117
msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
msgstr ""
-"Не можете да се претплатите на OMB 0.1 оддалечен профил со ова дејство."
+"Не можете да се претплатите на OMB 0.1 далечински профил со ова дејство."
#: actions/subscribe.php:145
msgid "Subscribed"
@@ -4153,11 +4161,11 @@ msgstr ""
msgid "%s is not listening to anyone."
msgstr "%s не следи никого."
-#: actions/subscriptions.php:199
+#: actions/subscriptions.php:208
msgid "Jabber"
msgstr "Jabber"
-#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:222 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr "СМС"
@@ -4190,12 +4198,12 @@ msgstr "Нема ID-аргумент."
msgid "Tag %s"
msgstr "Означи %s"
-#: actions/tagother.php:77 lib/userprofile.php:75
+#: actions/tagother.php:77 lib/userprofile.php:76
msgid "User profile"
msgstr "Кориснички профил"
#: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:102
+#: lib/userprofile.php:103
msgid "Photo"
msgstr "Фото"
@@ -4530,7 +4538,7 @@ msgstr ""
msgid "Plugins"
msgstr "Приклучоци"
-#: actions/version.php:196 lib/action.php:767
+#: actions/version.php:196 lib/action.php:766
msgid "Version"
msgstr "Верзија"
@@ -4538,7 +4546,7 @@ msgstr "Верзија"
msgid "Author(s)"
msgstr "Автор(и)"
-#: classes/File.php:144
+#: classes/File.php:169
#, php-format
msgid ""
"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
@@ -4547,13 +4555,13 @@ msgstr ""
"Ниедна податотека не смее да биде поголема од %d бајти, а подаотеката што ја "
"испративте содржи %d бајти. Подигнете помала верзија."
-#: classes/File.php:154
+#: classes/File.php:179
#, php-format
msgid "A file this large would exceed your user quota of %d bytes."
msgstr ""
"Волку голема податотека ќе ја надмине Вашата корисничка квота од %d бајти."
-#: classes/File.php:161
+#: classes/File.php:186
#, php-format
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr "ВОлку голема податотека ќе ја надмине Вашата месечна квота од %d бајти"
@@ -4591,27 +4599,27 @@ msgstr "Не можев да ја испратам пораката."
msgid "Could not update message with new URI."
msgstr "Не можев да ја подновам пораката со нов URI."
-#: classes/Notice.php:172
+#: classes/Notice.php:175
#, php-format
msgid "DB error inserting hashtag: %s"
msgstr "Грешка во базата на податоци при вметнувањето на хеш-ознака: %s"
-#: classes/Notice.php:241
+#: classes/Notice.php:244
msgid "Problem saving notice. Too long."
msgstr "Проблем со зачувувањето на белешката. Премногу долго."
-#: classes/Notice.php:245
+#: classes/Notice.php:248
msgid "Problem saving notice. Unknown user."
msgstr "Проблем со зачувувањето на белешката. Непознат корисник."
-#: classes/Notice.php:250
+#: classes/Notice.php:253
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
"Премногу забелњшки за прекратко време; здивнете малку и продолжете за "
"неколку минути."
-#: classes/Notice.php:256
+#: classes/Notice.php:259
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
@@ -4619,70 +4627,70 @@ msgstr ""
"Премногу дуплирани пораки во прекратко време; здивнете малку и продолжете за "
"неколку минути."
-#: classes/Notice.php:262
+#: classes/Notice.php:265
msgid "You are banned from posting notices on this site."
msgstr "Забрането Ви е да објавувате забелешки на оваа веб-страница."
-#: classes/Notice.php:328 classes/Notice.php:354
+#: classes/Notice.php:331 classes/Notice.php:357
msgid "Problem saving notice."
msgstr "Проблем во зачувувањето на белешката."
-#: classes/Notice.php:927
+#: classes/Notice.php:943
msgid "Problem saving group inbox."
msgstr "Проблем при зачувувањето на групното приемно сандаче."
-#: classes/Notice.php:1459
+#: classes/Notice.php:1481
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
-#: classes/Subscription.php:66 lib/oauthstore.php:465
+#: classes/Subscription.php:74 lib/oauthstore.php:465
msgid "You have been banned from subscribing."
msgstr "Блокирани сте од претплаќање."
-#: classes/Subscription.php:70
+#: classes/Subscription.php:78
msgid "Already subscribed!"
msgstr "Веќе претплатено!"
-#: classes/Subscription.php:74
+#: classes/Subscription.php:82
msgid "User has blocked you."
msgstr "Корисникот Ве има блокирано."
-#: classes/Subscription.php:157
+#: classes/Subscription.php:167
#, fuzzy
msgid "Not subscribed!"
msgstr "Не сте претплатени!"
-#: classes/Subscription.php:163
+#: classes/Subscription.php:173
msgid "Couldn't delete self-subscription."
msgstr "Не можам да ја избришам самопретплатата."
-#: classes/Subscription.php:190
+#: classes/Subscription.php:200
msgid "Couldn't delete subscription OMB token."
msgstr "Не можете да го избришете OMB-жетонот за претплата."
-#: classes/Subscription.php:201 lib/subs.php:69
+#: classes/Subscription.php:211
msgid "Couldn't delete subscription."
msgstr "Претплата не може да се избрише."
-#: classes/User.php:373
+#: classes/User.php:363
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Добредојдовте на %1$s, @%2$s!"
-#: classes/User_group.php:477
+#: classes/User_group.php:480
msgid "Could not create group."
msgstr "Не можев да ја создадам групата."
-#: classes/User_group.php:486
+#: classes/User_group.php:489
msgid "Could not set group URI."
msgstr "Не можев да поставам URI на групата."
-#: classes/User_group.php:507
+#: classes/User_group.php:510
msgid "Could not set group membership."
msgstr "Не можев да назначам членство во групата."
-#: classes/User_group.php:521
+#: classes/User_group.php:524
msgid "Could not save local group info."
msgstr "Не можев да ги зачувам информациите за локалните групи."
@@ -4723,170 +4731,170 @@ msgstr "%1$s - %2$s"
msgid "Untitled page"
msgstr "Страница без наслов"
-#: lib/action.php:424
+#: lib/action.php:423
msgid "Primary site navigation"
msgstr "Главна навигација"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:430
+#: lib/action.php:429
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr "Личен профил и хронологија на пријатели"
-#: lib/action.php:433
+#: lib/action.php:432
msgctxt "MENU"
msgid "Personal"
msgstr "Лично"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:435
+#: lib/action.php:434
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "Промена на е-пошта, аватар, лозинка, профил"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:440
+#: lib/action.php:439
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "Поврзи се со услуги"
-#: lib/action.php:443
+#: lib/action.php:442
msgid "Connect"
msgstr "Поврзи се"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:446
+#: lib/action.php:445
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "Промена на поставките на веб-страницата"
-#: lib/action.php:449
+#: lib/action.php:448
msgctxt "MENU"
msgid "Admin"
msgstr "Админ"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:453
+#: lib/action.php:452
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "Поканете пријатели и колеги да Ви се придружат на %s"
-#: lib/action.php:456
+#: lib/action.php:455
msgctxt "MENU"
msgid "Invite"
msgstr "Покани"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:462
+#: lib/action.php:461
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "Одјава"
-#: lib/action.php:465
+#: lib/action.php:464
msgctxt "MENU"
msgid "Logout"
msgstr "Одјава"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:470
+#: lib/action.php:469
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Создај сметка"
-#: lib/action.php:473
+#: lib/action.php:472
msgctxt "MENU"
msgid "Register"
msgstr "Регистрација"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:476
+#: lib/action.php:475
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Најава"
-#: lib/action.php:479
+#: lib/action.php:478
msgctxt "MENU"
msgid "Login"
msgstr "Најава"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:482
+#: lib/action.php:481
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Напомош!"
-#: lib/action.php:485
+#: lib/action.php:484
msgctxt "MENU"
msgid "Help"
msgstr "Помош"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:488
+#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "Пребарајте луѓе или текст"
-#: lib/action.php:491
+#: lib/action.php:490
msgctxt "MENU"
msgid "Search"
msgstr "Барај"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:513 lib/adminpanelaction.php:398
+#: lib/action.php:512 lib/adminpanelaction.php:398
msgid "Site notice"
msgstr "Напомена за веб-страницата"
-#: lib/action.php:579
+#: lib/action.php:578
msgid "Local views"
msgstr "Локални прегледи"
-#: lib/action.php:645
+#: lib/action.php:644
msgid "Page notice"
msgstr "Напомена за страницата"
-#: lib/action.php:747
+#: lib/action.php:746
msgid "Secondary site navigation"
msgstr "Споредна навигација"
-#: lib/action.php:752
+#: lib/action.php:751
msgid "Help"
msgstr "Помош"
-#: lib/action.php:754
+#: lib/action.php:753
msgid "About"
msgstr "За"
-#: lib/action.php:756
+#: lib/action.php:755
msgid "FAQ"
msgstr "ЧПП"
-#: lib/action.php:760
+#: lib/action.php:759
msgid "TOS"
msgstr "Услови"
-#: lib/action.php:763
+#: lib/action.php:762
msgid "Privacy"
msgstr "Приватност"
-#: lib/action.php:765
+#: lib/action.php:764
msgid "Source"
msgstr "Изворен код"
-#: lib/action.php:769
+#: lib/action.php:768
msgid "Contact"
msgstr "Контакт"
-#: lib/action.php:771
+#: lib/action.php:770
msgid "Badge"
msgstr "Значка"
-#: lib/action.php:799
+#: lib/action.php:798
msgid "StatusNet software license"
msgstr "Лиценца на програмот StatusNet"
-#: lib/action.php:802
+#: lib/action.php:803
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4895,12 +4903,12 @@ msgstr ""
"**%%site.name%%** е сервис за микроблогирање што ви го овозможува [%%site."
"broughtby%%](%%site.broughtbyurl%%). "
-#: lib/action.php:804
+#: lib/action.php:805
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** е сервис за микроблогирање."
-#: lib/action.php:806
+#: lib/action.php:808
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4911,57 +4919,61 @@ msgstr ""
"верзија %s, достапен пд [GNU Affero General Public License](http://www.fsf."
"org/licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:821
+#: lib/action.php:823
msgid "Site content license"
msgstr "Лиценца на содржините на веб-страницата"
-#: lib/action.php:826
+#: lib/action.php:828
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr "Содржината и податоците на %1$s се лични и доверливи."
-#: lib/action.php:831
+#: lib/action.php:833
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
"Авторските права на содржината и податоците се во сопственост на %1$s. Сите "
"права задржани."
-#: lib/action.php:834
+#: lib/action.php:836
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
"Авторските права на содржината и податоците им припаѓаат на учесниците. Сите "
"права задржани."
-#: lib/action.php:847
+#: lib/action.php:849
msgid "All "
msgstr "Сите "
-#: lib/action.php:853
+#: lib/action.php:855
msgid "license."
msgstr "лиценца."
-#: lib/action.php:1152
+#: lib/action.php:1154
msgid "Pagination"
msgstr "Прелом на страници"
-#: lib/action.php:1161
+#: lib/action.php:1163
msgid "After"
msgstr "По"
-#: lib/action.php:1169
+#: lib/action.php:1171
msgid "Before"
msgstr "Пред"
-#: lib/activity.php:453
+#: lib/activity.php:120
+msgid "Expecting a root feed element but got a whole XML document."
+msgstr "Се очекува коренски каналски елемент, но добив цел XML документ."
+
+#: lib/activityutils.php:208
msgid "Can't handle remote content yet."
-msgstr "Сè уште не е поддржана обработката на оддалечена содржина."
+msgstr "Сè уште не е поддржана обработката на далечинска содржина."
-#: lib/activity.php:481
+#: lib/activityutils.php:236
msgid "Can't handle embedded XML content yet."
msgstr "Сè уште не е поддржана обработката на XML содржина."
-#: lib/activity.php:485
+#: lib/activityutils.php:240
msgid "Can't handle embedded Base64 content yet."
msgstr "Сè уште не е достапна обработката на вметната Base64 содржина."
@@ -5053,7 +5065,7 @@ msgstr ""
"API-ресурсот бара да може и да чита и да запишува, а вие можете само да "
"читате."
-#: lib/apiauth.php:272
+#: lib/apiauth.php:276
#, php-format
msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s"
msgstr "Неуспешен обид за API-заверка, прекар = %1$s, прокси = %2$s, IP = %3$s"
@@ -5128,11 +5140,11 @@ msgstr "Одземи"
msgid "Attachments"
msgstr "Прилози"
-#: lib/attachmentlist.php:265
+#: lib/attachmentlist.php:263
msgid "Author"
msgstr "Автор"
-#: lib/attachmentlist.php:278
+#: lib/attachmentlist.php:276
msgid "Provider"
msgstr "Обезбедувач"
@@ -5152,37 +5164,50 @@ msgstr "Менувањето на лозинката не успеа"
msgid "Password changing is not allowed"
msgstr "Менувањето на лозинка не е дозволено"
-#: lib/channel.php:138 lib/channel.php:158
+#: lib/channel.php:157 lib/channel.php:177
msgid "Command results"
msgstr "Резултати од наредбата"
-#: lib/channel.php:210 lib/mailhandler.php:142
+#: lib/channel.php:229 lib/mailhandler.php:142
msgid "Command complete"
msgstr "Наредбата е завршена"
-#: lib/channel.php:221
+#: lib/channel.php:240
msgid "Command failed"
msgstr "Наредбата не успеа"
-#: lib/command.php:44
-msgid "Sorry, this command is not yet implemented."
-msgstr "Жалиме, оваа наредба сè уште не е имплементирана."
+#: lib/command.php:83 lib/command.php:105
+msgid "Notice with that id does not exist"
+msgstr "Не постои забелешка со таков id"
+
+#: lib/command.php:99 lib/command.php:570
+msgid "User has no last notice"
+msgstr "Корисникот нема последна забелешка"
-#: lib/command.php:88
+#: lib/command.php:125
#, php-format
msgid "Could not find a user with nickname %s"
msgstr "Не можев да пронајдам корисник со прекар %s"
-#: lib/command.php:92
+#: lib/command.php:143
+#, php-format
+msgid "Could not find a local user with nickname %s"
+msgstr "Не можев да пронајдам локален корисник со прекар %s"
+
+#: lib/command.php:176
+msgid "Sorry, this command is not yet implemented."
+msgstr "Жалиме, оваа наредба сè уште не е имплементирана."
+
+#: lib/command.php:221
msgid "It does not make a lot of sense to nudge yourself!"
msgstr "Нема баш логика да се подбуцнувате сами себеси."
-#: lib/command.php:99
+#: lib/command.php:228
#, php-format
msgid "Nudge sent to %s"
msgstr "Испратено подбуцнување на %s"
-#: lib/command.php:126
+#: lib/command.php:254
#, php-format
msgid ""
"Subscriptions: %1$s\n"
@@ -5193,198 +5218,198 @@ msgstr ""
"Претплатници: %2$s\n"
"Забелешки: %3$s"
-#: lib/command.php:152 lib/command.php:390 lib/command.php:451
-msgid "Notice with that id does not exist"
-msgstr "Не постои забелешка со таков id"
-
-#: lib/command.php:168 lib/command.php:406 lib/command.php:467
-#: lib/command.php:523
-msgid "User has no last notice"
-msgstr "Корисникот нема последна забелешка"
-
-#: lib/command.php:190
+#: lib/command.php:296
msgid "Notice marked as fave."
msgstr "Забелешката е обележана како омилена."
-#: lib/command.php:217
+#: lib/command.php:317
msgid "You are already a member of that group"
msgstr "Веќе членувате во таа група"
-#: lib/command.php:231
+#: lib/command.php:331
#, php-format
msgid "Could not join user %s to group %s"
msgstr "Не можев да го зачленам корисникот %s во групата %s"
-#: lib/command.php:236
+#: lib/command.php:336
#, php-format
msgid "%s joined group %s"
msgstr "%s се зачлени во групата %s"
-#: lib/command.php:275
+#: lib/command.php:373
#, php-format
msgid "Could not remove user %s to group %s"
msgstr "Не можев да го отстранам корисникот %s од групата %s"
-#: lib/command.php:280
+#: lib/command.php:378
#, php-format
msgid "%s left group %s"
msgstr "%s ја напушти групата %s"
-#: lib/command.php:309
+#: lib/command.php:401
#, php-format
msgid "Fullname: %s"
msgstr "Име и презиме: %s"
-#: lib/command.php:312 lib/mail.php:258
+#: lib/command.php:404 lib/mail.php:258
#, php-format
msgid "Location: %s"
msgstr "Локација: %s"
-#: lib/command.php:315 lib/mail.php:260
+#: lib/command.php:407 lib/mail.php:260
#, php-format
msgid "Homepage: %s"
msgstr "Домашна страница: %s"
-#: lib/command.php:318
+#: lib/command.php:410
#, php-format
msgid "About: %s"
msgstr "За: %s"
-#: lib/command.php:349
+#: lib/command.php:437
+#, php-format
+msgid ""
+"%s is a remote profile; you can only send direct messages to users on the "
+"same server."
+msgstr ""
+"%s е далечински профил; можете да праќате директни пораки само до корисници "
+"на истиот сервер."
+
+#: lib/command.php:450
#, php-format
msgid "Message too long - maximum is %d characters, you sent %d"
msgstr ""
"Пораката е предолга - дозволени се највеќе %d знаци, а вие испративте %d"
-#: lib/command.php:367
+#: lib/command.php:468
#, php-format
msgid "Direct message to %s sent"
msgstr "Директната порака до %s е испратена"
-#: lib/command.php:369
+#: lib/command.php:470
msgid "Error sending direct message."
msgstr "Грашка при испаќањето на директната порака."
-#: lib/command.php:413
+#: lib/command.php:490
msgid "Cannot repeat your own notice"
msgstr "Не можете да повторувате сопствени забалешки"
-#: lib/command.php:418
+#: lib/command.php:495
msgid "Already repeated that notice"
msgstr "Оваа забелешка е веќе повторена"
-#: lib/command.php:426
+#: lib/command.php:503
#, php-format
msgid "Notice from %s repeated"
msgstr "Забелешката од %s е повторена"
-#: lib/command.php:428
+#: lib/command.php:505
msgid "Error repeating notice."
msgstr "Грешка при повторувањето на белешката."
-#: lib/command.php:482
+#: lib/command.php:536
#, php-format
msgid "Notice too long - maximum is %d characters, you sent %d"
msgstr ""
"Забелешката е предолга - треба да нема повеќе од %d знаци, а Вие испративте %"
"d"
-#: lib/command.php:491
+#: lib/command.php:545
#, php-format
msgid "Reply to %s sent"
msgstr "Одговорот на %s е испратен"
-#: lib/command.php:493
+#: lib/command.php:547
msgid "Error saving notice."
msgstr "Грешка при зачувувањето на белешката."
-#: lib/command.php:547
+#: lib/command.php:594
msgid "Specify the name of the user to subscribe to"
msgstr "Назначете го името на корисникот на којшто сакате да се претплатите"
-#: lib/command.php:554 lib/command.php:589
-msgid "No such user"
-msgstr "Нема таков корисник"
+#: lib/command.php:602
+msgid "Can't subscribe to OMB profiles by command."
+msgstr "Не можете да се претплаќате на OMB профили по наредба."
-#: lib/command.php:561
+#: lib/command.php:608
#, php-format
msgid "Subscribed to %s"
msgstr "Претплатено на %s"
-#: lib/command.php:582 lib/command.php:685
+#: lib/command.php:629 lib/command.php:728
msgid "Specify the name of the user to unsubscribe from"
msgstr "Назначете го името на корисникот од кого откажувате претплата."
-#: lib/command.php:595
+#: lib/command.php:638
#, php-format
msgid "Unsubscribed from %s"
msgstr "Претплатата на %s е откажана"
-#: lib/command.php:613 lib/command.php:636
+#: lib/command.php:656 lib/command.php:679
msgid "Command not yet implemented."
msgstr "Наредбата сè уште не е имплементирана."
-#: lib/command.php:616
+#: lib/command.php:659
msgid "Notification off."
msgstr "Известувањето е исклучено."
-#: lib/command.php:618
+#: lib/command.php:661
msgid "Can't turn off notification."
msgstr "Не можам да исклучам известување."
-#: lib/command.php:639
+#: lib/command.php:682
msgid "Notification on."
msgstr "Известувањето е вклучено."
-#: lib/command.php:641
+#: lib/command.php:684
msgid "Can't turn on notification."
msgstr "Не можам да вклучам известување."
-#: lib/command.php:654
+#: lib/command.php:697
msgid "Login command is disabled"
msgstr "Наредбата за најава е оневозможена"
-#: lib/command.php:665
+#: lib/command.php:708
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr "Оваа врска може да се употреби само еднаш, и трае само 2 минути: %s"
-#: lib/command.php:692
+#: lib/command.php:735
#, php-format
msgid "Unsubscribed %s"
msgstr "Откажана претплата на %s"
-#: lib/command.php:709
+#: lib/command.php:752
msgid "You are not subscribed to anyone."
msgstr "Не сте претплатени никому."
-#: lib/command.php:711
+#: lib/command.php:754
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Не ни го испративте тој профил."
msgstr[1] "Не ни го испративте тој профил."
-#: lib/command.php:731
+#: lib/command.php:774
msgid "No one is subscribed to you."
msgstr "Никој не е претплатен на Вас."
-#: lib/command.php:733
+#: lib/command.php:776
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Оддалечена претплата"
msgstr[1] "Оддалечена претплата"
-#: lib/command.php:753
+#: lib/command.php:796
msgid "You are not a member of any groups."
msgstr "Не членувате во ниедна група."
-#: lib/command.php:755
+#: lib/command.php:798
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Не ни го испративте тој профил."
msgstr[1] "Не ни го испративте тој профил."
-#: lib/command.php:769
+#: lib/command.php:812
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5463,19 +5488,19 @@ msgstr ""
"tracks - сè уште не е имплементирано.\n"
"tracking - сè уште не е имплементирано.\n"
-#: lib/common.php:148
+#: lib/common.php:135
msgid "No configuration file found. "
msgstr "Нема пронајдено конфигурациска податотека. "
-#: lib/common.php:149
+#: lib/common.php:136
msgid "I looked for configuration files in the following places: "
msgstr "Побарав конфигурациони податотеки на следниве места: "
-#: lib/common.php:151
+#: lib/common.php:138
msgid "You may wish to run the installer to fix this."
msgstr "Препорачуваме да го пуштите инсталатерот за да го поправите ова."
-#: lib/common.php:152
+#: lib/common.php:139
msgid "Go to the installer."
msgstr "Оди на инсталаторот."
@@ -5653,49 +5678,49 @@ msgstr "Ознаки во забелешките на групата %s"
msgid "This page is not available in a media type you accept"
msgstr "Оваа страница не е достапна во форматот кој Вие го прифаќате."
-#: lib/imagefile.php:75
+#: lib/imagefile.php:72
+msgid "Unsupported image file format."
+msgstr "Неподдржан фомрат на слики."
+
+#: lib/imagefile.php:88
#, fuzzy, php-format
msgid "That file is too big. The maximum file size is %s."
msgstr "Ова е предолго. Максималната должина е 140 знаци."
-#: lib/imagefile.php:80
+#: lib/imagefile.php:93
msgid "Partial upload."
msgstr "Делумно подигање."
-#: lib/imagefile.php:88 lib/mediafile.php:170
+#: lib/imagefile.php:101 lib/mediafile.php:170
msgid "System error uploading file."
msgstr "Системска грешка при подигањето на податотеката."
-#: lib/imagefile.php:96
+#: lib/imagefile.php:109
msgid "Not an image or corrupt file."
msgstr "Не е слика или податотеката е пореметена."
-#: lib/imagefile.php:109
-msgid "Unsupported image file format."
-msgstr "Неподдржан фомрат на слики."
-
#: lib/imagefile.php:122
msgid "Lost our file."
msgstr "Податотеката е изгубена."
-#: lib/imagefile.php:166 lib/imagefile.php:231
+#: lib/imagefile.php:163 lib/imagefile.php:224
msgid "Unknown file type"
msgstr "Непознат тип на податотека"
-#: lib/imagefile.php:251
+#: lib/imagefile.php:244
msgid "MB"
msgstr "МБ"
-#: lib/imagefile.php:253
+#: lib/imagefile.php:246
msgid "kB"
msgstr "кб"
-#: lib/jabber.php:220
+#: lib/jabber.php:387
#, php-format
msgid "[%s]"
msgstr "[%s]"
-#: lib/jabber.php:400
+#: lib/jabber.php:567
#, php-format
msgid "Unknown inbox source %d."
msgstr "Непознат извор на приемна пошта %d."
@@ -5978,7 +6003,7 @@ msgstr ""
"впуштите во разговор со други корисници. Луѓето можат да ви испраќаат пораки "
"што ќе можете да ги видите само Вие."
-#: lib/mailbox.php:227 lib/noticelist.php:482
+#: lib/mailbox.php:227 lib/noticelist.php:486
msgid "from"
msgstr "од"
@@ -6093,7 +6118,7 @@ msgstr "Приложи"
#: lib/noticeform.php:196
msgid "Attach a file"
-msgstr "Прикажи податотека"
+msgstr "Приложи податотека"
#: lib/noticeform.php:212
msgid "Share my location"
@@ -6111,48 +6136,48 @@ msgstr ""
"Жалиме, но добивањето на Вашата местоположба трае подолго од очекуваното. "
"Обидете се подоцна."
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "N"
msgstr "С"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "S"
msgstr "Ј"
-#: lib/noticelist.php:431
+#: lib/noticelist.php:432
msgid "E"
msgstr "И"
-#: lib/noticelist.php:431
+#: lib/noticelist.php:432
msgid "W"
msgstr "З"
-#: lib/noticelist.php:438
+#: lib/noticelist.php:439
msgid "at"
msgstr "во"
-#: lib/noticelist.php:566
+#: lib/noticelist.php:570
msgid "in context"
msgstr "во контекст"
-#: lib/noticelist.php:601
+#: lib/noticelist.php:605
msgid "Repeated by"
msgstr "Повторено од"
-#: lib/noticelist.php:628
+#: lib/noticelist.php:632
msgid "Reply to this notice"
msgstr "Одговори на забелешкава"
-#: lib/noticelist.php:629
+#: lib/noticelist.php:633
msgid "Reply"
msgstr "Одговор"
-#: lib/noticelist.php:673
+#: lib/noticelist.php:677
msgid "Notice repeated"
msgstr "Забелешката е повторена"
@@ -6178,7 +6203,7 @@ msgstr "Грешка во внесувањето на аватарот"
#: lib/oauthstore.php:311
msgid "Error inserting remote profile"
-msgstr "Грешка во внесувањето на оддалечениот профил"
+msgstr "Грешка во внесувањето на далечинскиот профил"
#: lib/oauthstore.php:345
msgid "Duplicate notice"
@@ -6225,7 +6250,7 @@ msgstr "Ознаки во забелешките на %s"
msgid "Unknown"
msgstr "Непознато"
-#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr "Претплати"
@@ -6233,23 +6258,28 @@ msgstr "Претплати"
msgid "All subscriptions"
msgstr "Сите претплати"
-#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90
+#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr "Претплатници"
-#: lib/profileaction.php:159
+#: lib/profileaction.php:161
msgid "All subscribers"
msgstr "Сите претплатници"
-#: lib/profileaction.php:180
+#: lib/profileaction.php:191
msgid "User ID"
msgstr "Кориснички ID"
-#: lib/profileaction.php:185
+#: lib/profileaction.php:196
msgid "Member since"
msgstr "Член од"
-#: lib/profileaction.php:247
+#. TRANS: Average count of posts made per day since account registration
+#: lib/profileaction.php:235
+msgid "Daily average"
+msgstr "Дневен просек"
+
+#: lib/profileaction.php:264
msgid "All groups"
msgstr "Сите групи"
@@ -6294,7 +6324,7 @@ msgstr "Повтори ја забелешкава"
msgid "Revoke the \"%s\" role from this user"
msgstr "Одземи му ја улогата „%s“ на корисников"
-#: lib/router.php:671
+#: lib/router.php:704
msgid "No single user defined for single-user mode."
msgstr "Не е зададен корисник за еднокорисничкиот режим."
@@ -6420,89 +6450,98 @@ msgstr "Откажи претплата од овој корсиник"
msgid "Unsubscribe"
msgstr "Откажи ја претплатата"
-#: lib/userprofile.php:116
+#: lib/usernoprofileexception.php:58
+#, php-format
+msgid "User %s (%d) has no profile record."
+msgstr "Корисникот %s (%d) нема профилен запис."
+
+#: lib/userprofile.php:117
msgid "Edit Avatar"
msgstr "Уреди аватар"
-#: lib/userprofile.php:236
+#: lib/userprofile.php:234 lib/userprofile.php:248
msgid "User actions"
msgstr "Кориснички дејства"
-#: lib/userprofile.php:251
+#: lib/userprofile.php:237
+msgid "User deletion in progress..."
+msgstr "Бришењето на корисникот е во тек..."
+
+#: lib/userprofile.php:263
msgid "Edit profile settings"
msgstr "Уреди нагодувања на профилот"
-#: lib/userprofile.php:252
+#: lib/userprofile.php:264
msgid "Edit"
msgstr "Уреди"
-#: lib/userprofile.php:275
+#: lib/userprofile.php:287
msgid "Send a direct message to this user"
msgstr "Испрати му директна порака на корисников"
-#: lib/userprofile.php:276
+#: lib/userprofile.php:288
msgid "Message"
msgstr "Порака"
-#: lib/userprofile.php:314
+#: lib/userprofile.php:326
msgid "Moderate"
msgstr "Модерирај"
-#: lib/userprofile.php:352
+#: lib/userprofile.php:364
msgid "User role"
msgstr "Корисничка улога"
-#: lib/userprofile.php:354
+#: lib/userprofile.php:366
msgctxt "role"
msgid "Administrator"
msgstr "Администратор"
-#: lib/userprofile.php:355
+#: lib/userprofile.php:367
msgctxt "role"
msgid "Moderator"
msgstr "Модератор"
-#: lib/util.php:1015
+#: lib/util.php:1046
msgid "a few seconds ago"
msgstr "пред неколку секунди"
-#: lib/util.php:1017
+#: lib/util.php:1048
msgid "about a minute ago"
msgstr "пред една минута"
-#: lib/util.php:1019
+#: lib/util.php:1050
#, php-format
msgid "about %d minutes ago"
msgstr "пред %d минути"
-#: lib/util.php:1021
+#: lib/util.php:1052
msgid "about an hour ago"
msgstr "пред еден час"
-#: lib/util.php:1023
+#: lib/util.php:1054
#, php-format
msgid "about %d hours ago"
msgstr "пред %d часа"
-#: lib/util.php:1025
+#: lib/util.php:1056
msgid "about a day ago"
msgstr "пред еден ден"
-#: lib/util.php:1027
+#: lib/util.php:1058
#, php-format
msgid "about %d days ago"
msgstr "пред %d денови"
-#: lib/util.php:1029
+#: lib/util.php:1060
msgid "about a month ago"
msgstr "пред еден месец"
-#: lib/util.php:1031
+#: lib/util.php:1062
#, php-format
msgid "about %d months ago"
msgstr "пред %d месеца"
-#: lib/util.php:1033
+#: lib/util.php:1064
msgid "about a year ago"
msgstr "пред една година"
@@ -6516,7 +6555,7 @@ msgstr "%s не е важечка боја!"
msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr "%s не е важечка боја! Користете 3 или 6 шеснаесетни (hex) знаци."
-#: lib/xmppmanager.php:402
+#: lib/xmppmanager.php:403
#, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d."
msgstr ""
diff --git a/locale/nb/LC_MESSAGES/statusnet.po b/locale/nb/LC_MESSAGES/statusnet.po
index b687e445e..dfc9c4397 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-03-06 23:49+0000\n"
-"PO-Revision-Date: 2010-03-08 21:11:29+0000\n"
+"POT-Creation-Date: 2010-04-05 18:54+0000\n"
+"PO-Revision-Date: 2010-04-05 18:55:50+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 (r63415); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64621); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: no\n"
"X-Message-Group: out-statusnet\n"
@@ -91,9 +91,9 @@ msgstr "Ingen slik side"
#: 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:90
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78
+#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
@@ -102,10 +102,8 @@ msgstr "Ingen slik side"
#: actions/remotesubscribe.php:154 actions/replies.php:73
#: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:163 lib/command.php:302
-#: lib/command.php:355 lib/command.php:401 lib/command.php:462
-#: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82
-#: lib/profileaction.php:77
+#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: lib/mailbox.php:82 lib/profileaction.php:77
msgid "No such user."
msgstr "Ingen slik bruker"
@@ -199,18 +197,18 @@ msgstr "Oppdateringer fra %1$s og venner på %2$s!"
#: 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:132
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:136
#: actions/apigrouplistall.php:120 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:135
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
-#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184
-#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148
+#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:174
+#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173
+#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
-#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
+#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
#, fuzzy
msgid "API method not found."
msgstr "API-metode ikke funnet!"
@@ -224,8 +222,8 @@ msgstr "API-metode ikke funnet!"
#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65
-#: actions/apistatusesupdate.php:118
+#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
msgid "This method requires a POST."
msgstr "Denne metoden krever en POST."
@@ -256,7 +254,7 @@ msgid "Could not save profile."
msgstr "Klarte ikke å lagre profil."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:97
+#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
#: actions/designadminpanel.php:122 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
@@ -343,7 +341,7 @@ msgstr "Fant ingen status med den ID-en."
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:176
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
msgid "Could not create favorite."
msgstr "Kunne ikke opprette favoritt."
@@ -460,7 +458,7 @@ msgstr "Gruppe ikke funnet!"
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:221
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
msgid "You have been blocked from that group by the admin."
msgstr "Du har blitt blokkert fra den gruppen av administratoren."
@@ -478,11 +476,18 @@ msgstr "Du er ikke et medlem av denne gruppen."
msgid "Could not remove user %1$s from group %2$s."
msgstr "Kunne ikke fjerne bruker %1$s fra gruppe %2$s."
-#: actions/apigrouplist.php:95
+#. TRANS: %s is a user name
+#: actions/apigrouplist.php:97
#, 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
+#, fuzzy, php-format
+msgid "%1$s groups %2$s is a member of."
+msgstr "%s er ikke medlem av noen gruppe."
+
#: actions/apigrouplistall.php:90 actions/usergroups.php:62
#, php-format
msgid "%s groups"
@@ -510,7 +515,7 @@ msgstr "Ugyldig symbol."
#: 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:337
+#: actions/profilesettings.php:194 actions/recoverpassword.php:350
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
@@ -571,15 +576,15 @@ msgstr ""
"<strong>%3$s</strong> dine %4$s-kontodata. Du bør bare gi tilgang til din %4"
"$s-konto til tredjeparter du stoler på."
-#: actions/apioauthauthorize.php:310 lib/action.php:438
+#: actions/apioauthauthorize.php:310 lib/action.php:437
msgid "Account"
msgstr "Konto"
#: actions/apioauthauthorize.php:313 actions/login.php:230
#: actions/profilesettings.php:106 actions/register.php:424
-#: actions/showgroup.php:244 actions/tagother.php:94
+#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
-#: lib/userprofile.php:131
+#: lib/userprofile.php:132
msgid "Nickname"
msgstr "Nick"
@@ -648,12 +653,12 @@ msgstr "Maks notisstørrelse er %d tegn, inklusive vedleggs-URL."
msgid "Unsupported format."
msgstr "Formatet støttes ikke."
-#: actions/apitimelinefavorites.php:108
+#: actions/apitimelinefavorites.php:109
#, php-format
msgid "%1$s / Favorites from %2$s"
msgstr "%1$s / Favoritter fra %2$s"
-#: actions/apitimelinefavorites.php:117
+#: actions/apitimelinefavorites.php:118
#, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "%1$s oppdateringer markert som favoritt av %2$s / %2$s."
@@ -663,7 +668,7 @@ msgstr "%1$s oppdateringer markert som favoritt av %2$s / %2$s."
msgid "%1$s / Updates mentioning %2$s"
msgstr "%1$s / Oppdateringer som nevner %2$s"
-#: actions/apitimelinementions.php:127
+#: actions/apitimelinementions.php:130
#, 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."
@@ -673,7 +678,7 @@ msgstr "%1$s oppdateringer som svarer på oppdateringer fra %2$s / %3$s."
msgid "%s public timeline"
msgstr "%s offentlig tidslinje"
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "%s oppdateringer fra alle sammen!"
@@ -688,12 +693,12 @@ msgstr "Gjentatt til %s"
msgid "Repeats of %s"
msgstr "Repetisjoner av %s"
-#: actions/apitimelinetag.php:102 actions/tag.php:67
+#: actions/apitimelinetag.php:104 actions/tag.php:67
#, php-format
msgid "Notices tagged with %s"
msgstr "Notiser merket med %s"
-#: actions/apitimelinetag.php:104 actions/tagrss.php:65
+#: actions/apitimelinetag.php:106 actions/tagrss.php:65
#, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Oppdateringer merket med %1$s på %2$s!"
@@ -721,7 +726,7 @@ msgstr "Ingen størrelse."
msgid "Invalid size."
msgstr "Ugyldig størrelse"
-#: actions/avatarsettings.php:67 actions/showgroup.php:229
+#: actions/avatarsettings.php:67 actions/showgroup.php:230
#: lib/accountsettingsaction.php:112
msgid "Avatar"
msgstr "Brukerbilde"
@@ -753,7 +758,7 @@ msgid "Preview"
msgstr "Forhåndsvis"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:655
+#: lib/deleteuserform.php:66 lib/noticelist.php:659
msgid "Delete"
msgstr "Slett"
@@ -765,23 +770,27 @@ msgstr "Last opp"
msgid "Crop"
msgstr "Beskjær"
-#: actions/avatarsettings.php:328
+#: actions/avatarsettings.php:305
+msgid "No file uploaded."
+msgstr "Ingen fil lastet opp."
+
+#: actions/avatarsettings.php:332
msgid "Pick a square area of the image to be your avatar"
msgstr "Velg et kvadratisk utsnitt av bildet som din avatar."
-#: actions/avatarsettings.php:343 actions/grouplogo.php:380
+#: actions/avatarsettings.php:347 actions/grouplogo.php:380
msgid "Lost our file data."
msgstr "Mistet våre fildata."
-#: actions/avatarsettings.php:366
+#: actions/avatarsettings.php:370
msgid "Avatar updated."
msgstr "Brukerbildet har blitt oppdatert."
-#: actions/avatarsettings.php:369
+#: actions/avatarsettings.php:373
msgid "Failed updating avatar."
msgstr "Oppdatering av avatar mislyktes."
-#: actions/avatarsettings.php:393
+#: actions/avatarsettings.php:397
msgid "Avatar deleted."
msgstr "Avatar slettet."
@@ -836,8 +845,8 @@ msgstr "Kunne ikke lagre blokkeringsinformasjon."
#: actions/groupunblock.php:86 actions/joingroup.php:82
#: actions/joingroup.php:93 actions/leavegroup.php:82
#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212
-#: lib/command.php:260
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162
+#: lib/command.php:358
msgid "No such group."
msgstr "Ingen slik gruppe."
@@ -919,7 +928,7 @@ msgid "Conversation"
msgstr "Samtale"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:218 lib/searchgroupnav.php:82
+#: lib/profileaction.php:224 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "Notiser"
@@ -938,7 +947,7 @@ msgstr "Du er ikke eieren av dette programmet."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1217
+#: lib/action.php:1219
msgid "There was a problem with your session token."
msgstr ""
@@ -999,7 +1008,7 @@ msgstr "Er du sikker på at du vil slette denne notisen?"
msgid "Do not delete this notice"
msgstr "Ikke slett denne notisen"
-#: actions/deletenotice.php:146 lib/noticelist.php:655
+#: actions/deletenotice.php:146 lib/noticelist.php:659
msgid "Delete this notice"
msgstr "Slett denne notisen"
@@ -1136,7 +1145,7 @@ msgstr "Tilbakestill til standardverdier"
#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:208
+#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
#: actions/tagother.php:154 actions/useradminpanel.php:294
#: lib/applicationeditform.php:333 lib/applicationeditform.php:334
#: lib/designsettings.php:256 lib/groupeditform.php:202
@@ -1252,7 +1261,7 @@ msgstr "beskrivelse er for lang (maks %d tegn)"
msgid "Could not update group."
msgstr "Kunne ikke oppdatere gruppe."
-#: actions/editgroup.php:264 classes/User_group.php:493
+#: actions/editgroup.php:264 classes/User_group.php:496
msgid "Could not create aliases."
msgstr "Kunne ikke opprette alias."
@@ -1334,7 +1343,7 @@ msgstr "Innstillinger"
#: actions/emailsettings.php:158
msgid "Send me notices of new subscriptions through email."
-msgstr ""
+msgstr "Send meg varsler om nye abonnementer gjennom e-post."
#: actions/emailsettings.php:163
msgid "Send me email when someone adds my notice as a favorite."
@@ -1350,7 +1359,7 @@ msgstr "Send meg en e-post når noen sender meg et «@-svar»."
#: actions/emailsettings.php:179
msgid "Allow friends to nudge me and send me an email."
-msgstr ""
+msgstr "Tillat venner å knuffe meg og sende meg en e-post."
#: actions/emailsettings.php:185
msgid "I want to post notices by email."
@@ -1482,7 +1491,7 @@ msgstr ""
#: lib/personalgroupnav.php:115
#, php-format
msgid "%s's favorite notices"
-msgstr ""
+msgstr "%s sine favorittnotiser"
#: actions/favoritesrss.php:115
#, php-format
@@ -1502,7 +1511,7 @@ msgstr ""
#: actions/featured.php:99
#, php-format
msgid "A selection of some great users on %s"
-msgstr ""
+msgstr "Et utvalg av noen store brukere på %s"
#: actions/file.php:34
msgid "No notice ID."
@@ -1598,9 +1607,8 @@ msgid "Only an admin can block group members."
msgstr ""
#: actions/groupblock.php:95
-#, fuzzy
msgid "User is already blocked from group."
-msgstr "Du er allerede logget inn!"
+msgstr "Bruker er allerede blokkert fra gruppe."
#: actions/groupblock.php:100
msgid "User is not a member of group."
@@ -1624,7 +1632,7 @@ msgstr "Ikke blokker denne brukeren fra denne gruppa"
#: actions/groupblock.php:179
msgid "Block this user from this group"
-msgstr ""
+msgstr "Blokker denne brukeren fra denne gruppen"
#: actions/groupblock.php:196
msgid "Database error blocking user from group."
@@ -1666,12 +1674,11 @@ msgstr "Gruppelogo"
#, php-format
msgid ""
"You can upload a logo image for your group. The maximum file size is %s."
-msgstr ""
+msgstr "Du kan laste opp en logo for gruppen din. Maks filstørrelse er %s."
#: actions/grouplogo.php:181
-#, fuzzy
msgid "User without matching profile."
-msgstr "Brukeren har ingen profil."
+msgstr "Bruker uten samsvarende profil."
#: actions/grouplogo.php:365
msgid "Pick a square area of the image to be the logo."
@@ -1730,7 +1737,7 @@ msgstr "%s tidslinje"
msgid "Updates from members of %1$s on %2$s!"
msgstr "Oppdateringer fra medlemmer av %1$s på %2$s!"
-#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232
+#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244
#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr "Grupper"
@@ -1749,6 +1756,11 @@ msgid ""
"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
"%%%%)"
msgstr ""
+"%%%%site.name%%%%-grupper lar deg finne og snakke med mennesker med lignende "
+"interesser. Etter at du blir med i en gruppe kan du sende meldinger til alle "
+"andre medlemmer med syntaksen «!gruppenavn». Ser du ikke en gruppe du liker? "
+"Prøv å [søke etter en](%%%%action.groupsearch%%%%) eller [start din egen.](%%"
+"%%action.newgroup%%%%)"
#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
msgid "Create a new group"
@@ -1760,6 +1772,8 @@ msgid ""
"Search for groups on %%site.name%% by their name, location, or description. "
"Separate the terms by spaces; they must be 3 characters or more."
msgstr ""
+"Søk etter grupper på %%site.name%% etter navn, lokasjon eller beskrivelse. "
+"Skill nøkkelord med mellomrom; de må være minst 3 tegn eller lengre."
#: actions/groupsearch.php:58
msgid "Group search"
@@ -1776,6 +1790,8 @@ msgid ""
"If you can't find the group you're looking for, you can [create it](%%action."
"newgroup%%) yourself."
msgstr ""
+"Om du ikke finner gruppen du søker etter kan du [opprette den](%%action."
+"newgroup%%) selv."
#: actions/groupsearch.php:85
#, php-format
@@ -1790,16 +1806,15 @@ msgstr ""
#: actions/groupunblock.php:95
msgid "User is not blocked from group."
-msgstr ""
+msgstr "Bruker er ikke blokkert fra gruppe."
#: actions/groupunblock.php:128 actions/unblock.php:86
msgid "Error removing the block."
msgstr "Feil under oppheving av blokkering."
#: actions/imsettings.php:59
-#, fuzzy
msgid "IM settings"
-msgstr "Innstillinger for IM"
+msgstr "Innstillinger for direktemeldinger"
#: actions/imsettings.php:70
#, php-format
@@ -1826,9 +1841,8 @@ msgstr ""
"instruksjoner (la du %s til vennelisten din?)"
#: actions/imsettings.php:124
-#, fuzzy
msgid "IM address"
-msgstr "IM-adresse"
+msgstr "Direktemeldingsadresse"
#: actions/imsettings.php:126
#, php-format
@@ -1899,6 +1913,7 @@ msgstr "Innboks for %s"
#: actions/inbox.php:115
msgid "This is your inbox, which lists your incoming private messages."
msgstr ""
+"Dette er innboksen din som innholder dine innkommende private meldinger."
#: actions/invite.php:39
msgid "Invites have been disabled."
@@ -1907,7 +1922,7 @@ msgstr "Invitasjoner har blitt deaktivert."
#: actions/invite.php:41
#, php-format
msgid "You must be logged in to invite other users to use %s"
-msgstr ""
+msgstr "Du må være innlogget for å invitere andre brukere til å bruke %s"
#: actions/invite.php:72
#, php-format
@@ -1926,7 +1941,7 @@ msgstr "Inviter nye brukere"
msgid "You are already subscribed to these users:"
msgstr ""
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
#, php-format
msgid "%1$s (%2$s)"
msgstr "%1$s (%2$s)"
@@ -2041,15 +2056,15 @@ msgstr "ngen kallenavn eller ID."
#: actions/joingroup.php:141
#, php-format
msgid "%1$s joined group %2$s"
-msgstr ""
+msgstr "%1$s ble med i gruppen %2$s"
#: actions/leavegroup.php:60
msgid "You must be logged in to leave a group."
-msgstr ""
+msgstr "Du må være innlogget for å forlate en gruppe."
-#: actions/leavegroup.php:100 lib/command.php:265
+#: actions/leavegroup.php:100 lib/command.php:363
msgid "You are not a member of that group."
-msgstr ""
+msgstr "Du er ikke et medlem av den gruppen."
#: actions/leavegroup.php:137
#, php-format
@@ -2075,7 +2090,7 @@ msgstr "Logg inn"
#: actions/login.php:227
msgid "Login to site"
-msgstr ""
+msgstr "Logg inn på nettstedet"
#: actions/login.php:236 actions/register.php:478
msgid "Remember me"
@@ -2102,15 +2117,17 @@ msgid ""
"Login with your username and password. Don't have a username yet? [Register]"
"(%%action.register%%) a new account."
msgstr ""
+"Logg inn med ditt brukernavn og passord. Har du ikke et brukernavn ennå? "
+"[Opprett](%%action.register%%) en ny konto."
#: actions/makeadmin.php:92
msgid "Only an admin can make another user an admin."
-msgstr ""
+msgstr "Bare en administrator kan gjøre en annen bruker til administrator."
#: actions/makeadmin.php:96
-#, fuzzy, php-format
+#, php-format
msgid "%1$s is already an admin for group \"%2$s\"."
-msgstr "Du er allerede logget inn!"
+msgstr "%1$s er allerede en administrator for gruppen «%2$s»."
#: actions/makeadmin.php:133
#, fuzzy, php-format
@@ -2118,18 +2135,17 @@ msgid "Can't get membership record for %1$s in group %2$s."
msgstr "Klarte ikke å oppdatere bruker."
#: actions/makeadmin.php:146
-#, fuzzy, php-format
+#, php-format
msgid "Can't make %1$s an admin for group %2$s."
-msgstr "Gjør brukeren til en administrator for gruppen"
+msgstr "Kan ikke gjøre %1$s til administrator for gruppen %2$s."
#: actions/microsummary.php:69
msgid "No current status"
msgstr "Ingen nåværende status"
#: actions/newapplication.php:52
-#, fuzzy
msgid "New Application"
-msgstr "Ingen slik side"
+msgstr "Nytt program"
#: actions/newapplication.php:64
msgid "You must be logged in to register an application."
@@ -2160,12 +2176,12 @@ msgstr "Bruk dette skjemaet for å opprette en ny gruppe."
msgid "New message"
msgstr "Ny melding"
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
msgid "You can't send a message to this user."
msgstr "Du kan ikke sende en melding til denne brukeren."
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342
-#: lib/command.php:475
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
+#: lib/command.php:529
msgid "No content!"
msgstr "Inget innhold."
@@ -2173,7 +2189,7 @@ msgstr "Inget innhold."
msgid "No recipient specified."
msgstr "Ingen mottaker oppgitt."
-#: actions/newmessage.php:164 lib/command.php:361
+#: actions/newmessage.php:164 lib/command.php:462
msgid ""
"Don't send a message to yourself; just say it to yourself quietly instead."
msgstr ""
@@ -2183,11 +2199,11 @@ msgid "Message sent"
msgstr "Melding sendt"
#: actions/newmessage.php:185
-#, fuzzy, php-format
+#, php-format
msgid "Direct message to %s sent."
-msgstr "Direktemeldinger til %s"
+msgstr "Direktemelding til %s sendt."
-#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189
msgid "Ajax Error"
msgstr "Ajax-feil"
@@ -2195,7 +2211,7 @@ msgstr "Ajax-feil"
msgid "New notice"
msgstr "Ny notis"
-#: actions/newnotice.php:211
+#: actions/newnotice.php:217
msgid "Notice posted"
msgstr "Notis postet"
@@ -2211,9 +2227,9 @@ msgid "Text search"
msgstr "Tekst-søk"
#: actions/noticesearch.php:91
-#, fuzzy, php-format
+#, php-format
msgid "Search results for \"%1$s\" on %2$s"
-msgstr "Søkestrøm for «%s»"
+msgstr "Søkeresultat for «%1$s» på %2$s"
#: actions/noticesearch.php:121
#, php-format
@@ -2232,17 +2248,19 @@ msgstr ""
#: actions/noticesearchrss.php:96
#, php-format
msgid "Updates with \"%s\""
-msgstr ""
+msgstr "Oppdateringer med «%s»"
#: actions/noticesearchrss.php:98
-#, fuzzy, php-format
+#, php-format
msgid "Updates matching search term \"%1$s\" on %2$s!"
-msgstr "Alle oppdateringer for søket: «%s»"
+msgstr "Oppdateringer som samsvarer søkestrengen «%1$s» på %2$s."
#: actions/nudge.php:85
msgid ""
"This user doesn't allow nudges or hasn't confirmed or set his email yet."
msgstr ""
+"Denne brukeren tillater ikke knuffing eller har ikke bekreftet eller angitt "
+"sin e-post ennå."
#: actions/nudge.php:94
msgid "Nudge sent"
@@ -2258,7 +2276,7 @@ msgstr ""
#: actions/oauthappssettings.php:74
msgid "OAuth applications"
-msgstr ""
+msgstr "OAuth-program"
#: actions/oauthappssettings.php:85
msgid "Applications you have registered"
@@ -2275,21 +2293,20 @@ msgstr ""
#: actions/oauthconnectionssettings.php:83
msgid "You have allowed the following applications to access you account."
-msgstr ""
+msgstr "Du har tillatt følgende programmer å få tilgang til den konto."
#: actions/oauthconnectionssettings.php:175
-#, fuzzy
msgid "You are not a user of that application."
-msgstr "Du er allerede logget inn!"
+msgstr "Du er ikke bruker av dette programmet."
#: actions/oauthconnectionssettings.php:186
msgid "Unable to revoke access for app: "
-msgstr ""
+msgstr "Kunne ikke tilbakekalle tilgang for programmet: "
#: actions/oauthconnectionssettings.php:198
#, php-format
msgid "You have not authorized any applications to use your account."
-msgstr ""
+msgstr "Du har ikke tillatt noen programmer å bruke din konto."
#: actions/oauthconnectionssettings.php:211
msgid "Developers can edit the registration settings for their applications "
@@ -2299,7 +2316,7 @@ msgstr ""
msgid "Notice has no profile"
msgstr ""
-#: actions/oembed.php:86 actions/shownotice.php:180
+#: actions/oembed.php:86 actions/shownotice.php:175
#, php-format
msgid "%1$s's status on %2$s"
msgstr "%1$s sin status på %2$s"
@@ -2312,18 +2329,18 @@ msgstr "innholdstype "
msgid "Only "
msgstr "Bare "
-#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042
-#: lib/apiaction.php:1070 lib/apiaction.php:1179
+#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1068
+#: lib/apiaction.php:1096 lib/apiaction.php:1212
msgid "Not a supported data format."
-msgstr ""
+msgstr "Ikke et støttet dataformat."
#: actions/opensearch.php:64
msgid "People Search"
-msgstr ""
+msgstr "Personsøk"
#: actions/opensearch.php:67
msgid "Notice Search"
-msgstr ""
+msgstr "Notissøk"
#: actions/othersettings.php:60
msgid "Other settings"
@@ -2359,9 +2376,8 @@ msgid "URL shortening service is too long (max 50 chars)."
msgstr "Bioen er for lang (max 140 tegn)"
#: actions/otp.php:69
-#, fuzzy
msgid "No user ID specified."
-msgstr "Nytt nick"
+msgstr "Ingen bruker-ID spesifisert."
#: actions/otp.php:83
#, fuzzy
@@ -2446,9 +2462,9 @@ msgstr "Feil gammelt passord"
#: actions/passwordsettings.php:181
msgid "Error saving user; invalid."
-msgstr ""
+msgstr "Feil ved lagring av bruker; ugyldig."
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
msgid "Can't save new password."
msgstr "Klarer ikke å lagre nytt passord."
@@ -2487,11 +2503,11 @@ msgstr ""
#: actions/pathsadminpanel.php:183
msgid "Invalid SSL server. The maximum length is 255 characters."
-msgstr ""
+msgstr "Ugyldig SSL-tjener. Maks lengde er 255 tegn."
#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
msgid "Site"
-msgstr ""
+msgstr "Nettsted"
#: actions/pathsadminpanel.php:238
msgid "Server"
@@ -2499,7 +2515,7 @@ msgstr "Tjener"
#: actions/pathsadminpanel.php:238
msgid "Site's server hostname."
-msgstr ""
+msgstr "Vertsnavn for nettstedets tjener."
#: actions/pathsadminpanel.php:242
msgid "Path"
@@ -2527,55 +2543,51 @@ msgstr ""
#: actions/pathsadminpanel.php:259
msgid "Theme"
-msgstr ""
+msgstr "Tema"
#: actions/pathsadminpanel.php:264
msgid "Theme server"
-msgstr ""
+msgstr "Tematjener"
#: actions/pathsadminpanel.php:268
msgid "Theme path"
-msgstr ""
+msgstr "Temasti"
#: actions/pathsadminpanel.php:272
msgid "Theme directory"
-msgstr ""
+msgstr "Temamappe"
#: actions/pathsadminpanel.php:279
-#, fuzzy
msgid "Avatars"
-msgstr "Brukerbilde"
+msgstr "Avatarer"
#: actions/pathsadminpanel.php:284
-#, fuzzy
msgid "Avatar server"
-msgstr "Innstillinger for IM"
+msgstr "Avatartjener"
#: actions/pathsadminpanel.php:288
-#, fuzzy
msgid "Avatar path"
-msgstr "Brukerbildet har blitt oppdatert."
+msgstr "Avatarsti"
#: actions/pathsadminpanel.php:292
-#, fuzzy
msgid "Avatar directory"
-msgstr "Brukerbildet har blitt oppdatert."
+msgstr "Avatarmappe"
#: actions/pathsadminpanel.php:301
msgid "Backgrounds"
-msgstr ""
+msgstr "Bakgrunner"
#: actions/pathsadminpanel.php:305
msgid "Background server"
-msgstr ""
+msgstr "Bakgrunnstjener"
#: actions/pathsadminpanel.php:309
msgid "Background path"
-msgstr ""
+msgstr "Bakgrunnssti"
#: actions/pathsadminpanel.php:313
msgid "Background directory"
-msgstr ""
+msgstr "Bakgrunnsmappe"
#: actions/pathsadminpanel.php:320
msgid "SSL"
@@ -2599,16 +2611,15 @@ msgstr "Bruk SSL"
#: actions/pathsadminpanel.php:330
msgid "When to use SSL"
-msgstr ""
+msgstr "Når SSL skal brukes"
#: actions/pathsadminpanel.php:335
-#, fuzzy
msgid "SSL server"
-msgstr "Gjenopprett"
+msgstr "SSL-tjener"
#: actions/pathsadminpanel.php:336
msgid "Server to direct SSL requests to"
-msgstr ""
+msgstr "Tjener SSL-forespørsler skal vises til"
#: actions/pathsadminpanel.php:352
msgid "Save paths"
@@ -2620,10 +2631,12 @@ msgid ""
"Search for people on %%site.name%% by their name, location, or interests. "
"Separate the terms by spaces; they must be 3 characters or more."
msgstr ""
+"Søk etter personer på %%site.name%% etter deres navn, lokasjon eller "
+"interesser. Skill nøkkelord med mellomrom; de må være 3 tegn eller lengre."
#: actions/peoplesearch.php:58
msgid "People search"
-msgstr ""
+msgstr "Personsøk"
#: actions/peopletag.php:70
#, fuzzy, php-format
@@ -2646,24 +2659,26 @@ msgstr ""
#: actions/profilesettings.php:60
msgid "Profile settings"
-msgstr ""
+msgstr "Profilinnstillinger"
#: actions/profilesettings.php:71
msgid ""
"You can update your personal profile info here so people know more about you."
msgstr ""
+"Du kan oppdater din personlige profilinformasjon slik at personer får vite "
+"mer om deg."
#: actions/profilesettings.php:99
msgid "Profile information"
-msgstr ""
+msgstr "Profilinformasjon"
#: actions/profilesettings.php:108 lib/groupeditform.php:154
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr "1-64 små bokstaver eller nummer, ingen punktum eller mellomrom"
#: actions/profilesettings.php:111 actions/register.php:448
-#: actions/showgroup.php:255 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:149
+#: actions/showgroup.php:256 actions/tagother.php:104
+#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Fullt navn"
@@ -2677,23 +2692,22 @@ 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
-#, fuzzy, php-format
+#, php-format
msgid "Describe yourself and your interests in %d chars"
-msgstr "Beskriv degselv og dine interesser med 140 tegn"
+msgstr "Beskriv degselv og dine interesser med %d tegn"
#: actions/profilesettings.php:125 actions/register.php:464
-#, fuzzy
msgid "Describe yourself and your interests"
-msgstr "Beskriv degselv og dine interesser med 140 tegn"
+msgstr "Beskriv degselv og dine interesser"
#: actions/profilesettings.php:127 actions/register.php:466
msgid "Bio"
msgstr "Om meg"
#: actions/profilesettings.php:132 actions/register.php:471
-#: actions/showgroup.php:264 actions/tagother.php:112
+#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
-#: lib/userprofile.php:164
+#: lib/userprofile.php:165
msgid "Location"
msgstr ""
@@ -2707,7 +2721,7 @@ msgstr ""
#: actions/profilesettings.php:145 actions/tagother.php:149
#: actions/tagother.php:209 lib/subscriptionlist.php:106
-#: lib/subscriptionlist.php:108 lib/userprofile.php:209
+#: lib/subscriptionlist.php:108 lib/userprofile.php:210
msgid "Tags"
msgstr "Tagger"
@@ -2777,16 +2791,16 @@ msgstr "Klarte ikke å lagre profil."
#. TRANS: Message after successful saving of administrative settings.
#: actions/profilesettings.php:391 lib/adminpanelaction.php:141
msgid "Settings saved."
-msgstr ""
+msgstr "Innstillinger lagret."
#: actions/public.php:83
#, php-format
msgid "Beyond the page limit (%s)"
-msgstr ""
+msgstr "Over sidegrensen (%s)"
#: actions/public.php:92
msgid "Could not retrieve public stream."
-msgstr ""
+msgstr "Kunne ikke hente offentlig strøm."
#: actions/public.php:130
#, php-format
@@ -2799,16 +2813,15 @@ msgstr ""
#: actions/public.php:160
msgid "Public Stream Feed (RSS 1.0)"
-msgstr ""
+msgstr "Offentlig strømmating (RSS 1.0)"
#: actions/public.php:164
msgid "Public Stream Feed (RSS 2.0)"
-msgstr ""
+msgstr "Offentlig strømmating (RSS 2.0)"
#: actions/public.php:168
-#, fuzzy
msgid "Public Stream Feed (Atom)"
-msgstr "%s offentlig strøm"
+msgstr "Offentlig strømmating (Atom)"
#: actions/public.php:188
#, php-format
@@ -2891,11 +2904,11 @@ msgstr ""
#: actions/recoverpassword.php:86
msgid "Error with confirmation code."
-msgstr ""
+msgstr "Bekreftelseskodefeil."
#: actions/recoverpassword.php:97
msgid "This confirmation code is too old. Please start again."
-msgstr ""
+msgstr "Denne bekreftelseskoden er for gammel. Start på nytt."
#: actions/recoverpassword.php:111
msgid "Could not update user with confirmed email address."
@@ -2935,13 +2948,13 @@ msgstr ""
msgid "Recover password"
msgstr ""
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
msgid "Password recovery requested"
msgstr ""
#: actions/recoverpassword.php:213
msgid "Unknown action"
-msgstr ""
+msgstr "Ukjent handling"
#: actions/recoverpassword.php:236
msgid "6 or more characters, and don't forget it!"
@@ -2955,19 +2968,19 @@ msgstr "Nullstill"
msgid "Enter a nickname or email address."
msgstr ""
-#: actions/recoverpassword.php:272
+#: actions/recoverpassword.php:282
msgid "No user with that email address or username."
msgstr ""
-#: actions/recoverpassword.php:287
+#: actions/recoverpassword.php:299
msgid "No registered email address for that user."
msgstr ""
-#: actions/recoverpassword.php:301
+#: actions/recoverpassword.php:313
msgid "Error saving address confirmation."
msgstr ""
-#: actions/recoverpassword.php:325
+#: actions/recoverpassword.php:338
msgid ""
"Instructions for recovering your password have been sent to the email "
"address registered to your account."
@@ -2975,23 +2988,23 @@ msgstr ""
"Instruksjoner om hvordan du kan gjenopprette ditt passord har blitt sendt "
"til din registrerte e-postadresse."
-#: actions/recoverpassword.php:344
+#: actions/recoverpassword.php:357
msgid "Unexpected password reset."
msgstr ""
-#: actions/recoverpassword.php:352
+#: actions/recoverpassword.php:365
msgid "Password must be 6 chars or more."
msgstr "Passordet må bestå av 6 eller flere tegn."
-#: actions/recoverpassword.php:356
+#: actions/recoverpassword.php:369
msgid "Password and confirmation do not match."
msgstr ""
-#: actions/recoverpassword.php:375 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:248
msgid "Error setting user."
msgstr ""
-#: actions/recoverpassword.php:382
+#: actions/recoverpassword.php:395
msgid "New password successfully saved. You are now logged in."
msgstr ""
@@ -3149,7 +3162,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr ""
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:394
+#: lib/userprofile.php:406
msgid "Subscribe"
msgstr ""
@@ -3187,7 +3200,7 @@ msgstr ""
msgid "You already repeated that notice."
msgstr "Du er allerede logget inn!"
-#: actions/repeat.php:114 lib/noticelist.php:674
+#: actions/repeat.php:114 lib/noticelist.php:678
msgid "Repeated"
msgstr "Gjentatt"
@@ -3332,8 +3345,8 @@ msgstr "Organisasjon"
msgid "Description"
msgstr "Beskrivelse"
-#: actions/showapplication.php:192 actions/showgroup.php:438
-#: lib/profileaction.php:176
+#: actions/showapplication.php:192 actions/showgroup.php:439
+#: lib/profileaction.php:182
msgid "Statistics"
msgstr "Statistikk"
@@ -3386,28 +3399,28 @@ msgid "Are you sure you want to reset your consumer key and secret?"
msgstr "Er du sikker på at du vil slette denne notisen?"
#: actions/showfavorites.php:79
-#, fuzzy, php-format
+#, php-format
msgid "%1$s's favorite notices, page %2$d"
-msgstr "%s og venner"
+msgstr "%1$s sine favorittnotiser, side %2$d"
#: actions/showfavorites.php:132
msgid "Could not retrieve favorite notices."
-msgstr ""
+msgstr "Kunne ikke hente favorittnotiser."
#: actions/showfavorites.php:171
-#, fuzzy, php-format
+#, php-format
msgid "Feed for favorites of %s (RSS 1.0)"
-msgstr "Feed for %s sine venner"
+msgstr "Mating for favoritter av %s (RSS 1.0)"
#: actions/showfavorites.php:178
-#, fuzzy, php-format
+#, php-format
msgid "Feed for favorites of %s (RSS 2.0)"
-msgstr "Feed for %s sine venner"
+msgstr "Mating for favoritter av %s (RSS 2.0)"
#: actions/showfavorites.php:185
-#, fuzzy, php-format
+#, php-format
msgid "Feed for favorites of %s (Atom)"
-msgstr "Feed for %s sine venner"
+msgstr "Mating for favoritter av %s (Atom)"
#: actions/showfavorites.php:206
msgid ""
@@ -3437,77 +3450,74 @@ msgstr ""
#: actions/showgroup.php:82 lib/groupnav.php:86
#, php-format
msgid "%s group"
-msgstr ""
+msgstr "%s gruppe"
#: actions/showgroup.php:84
-#, fuzzy, php-format
+#, php-format
msgid "%1$s group, page %2$d"
-msgstr "Alle abonnementer"
+msgstr "%1$s gruppe, side %2$d"
-#: actions/showgroup.php:226
-#, fuzzy
+#: actions/showgroup.php:227
msgid "Group profile"
-msgstr "Klarte ikke å lagre profil."
+msgstr "Gruppeprofil"
-#: actions/showgroup.php:271 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:177
+#: actions/showgroup.php:272 actions/tagother.php:118
+#: actions/userauthorization.php:175 lib/userprofile.php:178
msgid "URL"
-msgstr ""
+msgstr "Nettadresse"
-#: actions/showgroup.php:282 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:194
+#: actions/showgroup.php:283 actions/tagother.php:128
+#: actions/userauthorization.php:187 lib/userprofile.php:195
msgid "Note"
msgstr ""
-#: actions/showgroup.php:292 lib/groupeditform.php:184
+#: actions/showgroup.php:293 lib/groupeditform.php:184
msgid "Aliases"
-msgstr ""
+msgstr "Alias"
-#: actions/showgroup.php:301
+#: actions/showgroup.php:302
msgid "Group actions"
-msgstr ""
+msgstr "Gruppehandlinger"
-#: actions/showgroup.php:337
+#: actions/showgroup.php:338
#, php-format
msgid "Notice feed for %s group (RSS 1.0)"
-msgstr ""
+msgstr "Notismating for %s gruppe (RSS 1.0)"
-#: actions/showgroup.php:343
+#: actions/showgroup.php:344
#, php-format
msgid "Notice feed for %s group (RSS 2.0)"
-msgstr ""
+msgstr "Notismating for %s gruppe (RSS 2.0)"
-#: actions/showgroup.php:349
+#: actions/showgroup.php:350
#, php-format
msgid "Notice feed for %s group (Atom)"
-msgstr ""
+msgstr "Notismating for %s gruppe (Atom)"
-#: actions/showgroup.php:354
+#: actions/showgroup.php:355
#, fuzzy, php-format
msgid "FOAF for %s group"
msgstr "Klarte ikke å lagre profil."
-#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91
-#, fuzzy
+#: actions/showgroup.php:391 actions/showgroup.php:448 lib/groupnav.php:91
msgid "Members"
-msgstr "Medlem siden"
+msgstr "Medlemmer"
-#: actions/showgroup.php:395 lib/profileaction.php:117
-#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95
-#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71
+#: actions/showgroup.php:396 lib/profileaction.php:117
+#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95
+#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
msgid "(None)"
-msgstr ""
+msgstr "(Ingen)"
-#: actions/showgroup.php:401
+#: actions/showgroup.php:402
msgid "All members"
-msgstr ""
+msgstr "Alle medlemmer"
-#: actions/showgroup.php:441
-#, fuzzy
+#: actions/showgroup.php:442
msgid "Created"
-msgstr "Opprett"
+msgstr "Opprettet"
-#: actions/showgroup.php:457
+#: actions/showgroup.php:458
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3516,8 +3526,14 @@ msgid ""
"their life and interests. [Join now](%%%%action.register%%%%) to become part "
"of this group and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
+"**%s** er en brukergruppe på %%%%site.name%%%%, en [mikrobloggingstjeneste]"
+"(http://no.wikipedia.org/wiki/Mikroblogg) basert på det frie "
+"programvareverktøyet [StatusNet](http://status.net/). Dets medlemmer deler "
+"korte meldinger om deres liv og interesser. [Bli med nå](%%%%action.register%"
+"%%%) for å bli medlem av denne gruppen og mange fler. ([Les mer](%%%%doc.help"
+"%%%%))"
-#: actions/showgroup.php:463
+#: actions/showgroup.php:464
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3525,14 +3541,18 @@ msgid ""
"[StatusNet](http://status.net/) tool. Its members share short messages about "
"their life and interests. "
msgstr ""
+"**%s** er en brukergruppe på %%%%site.name%%%%, en [mikrobloggingstjeneste]"
+"(http://no.wikipedia.org/wiki/Mikroblogg) basert på det frie "
+"programvareverktøyet [StatusNet](http://status.net/). Dets medlemmer deler "
+"korte meldinger om deres liv og interesser. "
-#: actions/showgroup.php:491
+#: actions/showgroup.php:492
msgid "Admins"
-msgstr ""
+msgstr "Administratorer"
#: actions/showmessage.php:81
msgid "No such message."
-msgstr ""
+msgstr "Ingen slik melding."
#: actions/showmessage.php:98
msgid "Only the sender and recipient may read this message."
@@ -3541,16 +3561,16 @@ msgstr ""
#: actions/showmessage.php:108
#, php-format
msgid "Message to %1$s on %2$s"
-msgstr ""
+msgstr "Melding til %1$s på %2$s"
#: actions/showmessage.php:113
#, php-format
msgid "Message from %1$s on %2$s"
-msgstr ""
+msgstr "Melding fra %1$s på %2$s"
#: actions/shownotice.php:90
msgid "Notice deleted."
-msgstr ""
+msgstr "Notis slettet."
#: actions/showstream.php:73
#, fuzzy, php-format
@@ -3558,29 +3578,29 @@ msgid " tagged %s"
msgstr "Tagger"
#: actions/showstream.php:79
-#, fuzzy, php-format
+#, php-format
msgid "%1$s, page %2$d"
-msgstr "%s og venner"
+msgstr "%1$s, side %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 for taggen %s"
+msgstr "Notismating for %1$s merket %2$s (RSS 1.0)"
#: actions/showstream.php:129
#, php-format
msgid "Notice feed for %s (RSS 1.0)"
-msgstr ""
+msgstr "Notismating for %s (RSS 1.0)"
#: actions/showstream.php:136
#, php-format
msgid "Notice feed for %s (RSS 2.0)"
-msgstr ""
+msgstr "Notismating for %s (RSS 2.0)"
#: actions/showstream.php:143
#, php-format
msgid "Notice feed for %s (Atom)"
-msgstr ""
+msgstr "Notismating for %s (Atom)"
#: actions/showstream.php:148
#, fuzzy, php-format
@@ -3616,6 +3636,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** har en konto på %%%%site.name%%%%, en [mikrobloggingstjeneste] "
+"(http://no.wikipedia.org/wiki/Mikroblogg) basert på det frie "
+"programvareverktøyet [StatusNet](http://status.net/). [Bli med nå](%%%%"
+"action.register%%%%) for å følge **%s** og mange flere sine notiser. ([Les "
+"mer](%%%%doc.help%%%%))"
#: actions/showstream.php:248
#, php-format
@@ -3624,11 +3649,14 @@ msgid ""
"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
"[StatusNet](http://status.net/) tool. "
msgstr ""
+"**%s** har en konto på %%%%site.name%%%%, en [mikrobloggingstjeneste] "
+"(http://no.wikipedia.org/wiki/Mikroblogg) basert på det frie "
+"programvareverktøyet [StatusNet](http://status.net/). "
#: actions/showstream.php:305
-#, fuzzy, php-format
+#, php-format
msgid "Repeat of %s"
-msgstr "Svar til %s"
+msgstr "Repetisjon av %s"
#: actions/silence.php:65 actions/unsilence.php:65
msgid "You cannot silence users on this site."
@@ -3648,17 +3676,16 @@ msgid "Site name must have non-zero length."
msgstr ""
#: actions/siteadminpanel.php:141
-#, fuzzy
msgid "You must have a valid contact email address."
-msgstr "Ugyldig e-postadresse"
+msgstr "Du må ha en gyldig e-postadresse."
#: actions/siteadminpanel.php:159
#, php-format
msgid "Unknown language \"%s\"."
-msgstr ""
+msgstr "Ukjent språk «%s»."
#: actions/siteadminpanel.php:165
-msgid "Minimum text limit is 140 characters."
+msgid "Minimum text limit is 0 (unlimited)."
msgstr ""
#: actions/siteadminpanel.php:171
@@ -3667,11 +3694,11 @@ msgstr ""
#: actions/siteadminpanel.php:221
msgid "General"
-msgstr ""
+msgstr "Generell"
#: actions/siteadminpanel.php:224
msgid "Site name"
-msgstr ""
+msgstr "Nettstedsnavn"
#: actions/siteadminpanel.php:225
msgid "The name of your site, like \"Yourcompany Microblog\""
@@ -3703,16 +3730,15 @@ msgstr ""
#: actions/siteadminpanel.php:256
msgid "Default timezone"
-msgstr ""
+msgstr "Standard tidssone"
#: actions/siteadminpanel.php:257
msgid "Default timezone for the site; usually UTC."
-msgstr ""
+msgstr "Standard tidssone for nettstedet; vanligvis UTC."
#: actions/siteadminpanel.php:262
-#, fuzzy
msgid "Default language"
-msgstr "Foretrukket språk"
+msgstr "Standardspråk"
#: actions/siteadminpanel.php:263
msgid "Site language when autodetection from browser settings is not available"
@@ -3720,28 +3746,28 @@ msgstr ""
#: actions/siteadminpanel.php:271
msgid "Limits"
-msgstr ""
+msgstr "Grenser"
#: actions/siteadminpanel.php:274
msgid "Text limit"
-msgstr ""
+msgstr "Tekstgrense"
#: actions/siteadminpanel.php:274
msgid "Maximum number of characters for notices."
-msgstr ""
+msgstr "Maks antall tegn for notiser."
#: actions/siteadminpanel.php:278
msgid "Dupe limit"
-msgstr ""
+msgstr "Duplikatsgrense"
#: actions/siteadminpanel.php:278
msgid "How long users must wait (in seconds) to post the same thing again."
msgstr ""
+"Hvor lenge en bruker må vente (i sekund) for å poste den samme tingen igjen."
#: actions/sitenoticeadminpanel.php:56
-#, fuzzy
msgid "Site Notice"
-msgstr "Notiser"
+msgstr "Nettstedsnotis"
#: actions/sitenoticeadminpanel.php:67
msgid "Edit site-wide message"
@@ -3771,18 +3797,17 @@ msgid "Save site notice"
msgstr "Innstillinger for IM"
#: actions/smssettings.php:58
-#, fuzzy
msgid "SMS settings"
-msgstr "Innstillinger for SMS"
+msgstr "SMS-innstillinger"
#: actions/smssettings.php:69
#, php-format
msgid "You can receive SMS messages through email from %%site.name%%."
-msgstr ""
+msgstr "Du kan motta SMS-meldinger gjennom e-post fra %%site.name%%."
#: actions/smssettings.php:91
msgid "SMS is not available."
-msgstr ""
+msgstr "SMS er ikke tilgjengelig."
#: actions/smssettings.php:112
msgid "Current confirmed SMS-enabled phone number."
@@ -3798,10 +3823,9 @@ msgstr "Bekreftelseskode"
#: actions/smssettings.php:131
msgid "Enter the code you received on your phone."
-msgstr ""
+msgstr "Skriv inn koden du mottok på telefonen din."
#: actions/smssettings.php:138
-#, fuzzy
msgid "SMS phone number"
msgstr "Telefonnummer for SMS"
@@ -3817,11 +3841,11 @@ msgstr ""
#: actions/smssettings.php:306
msgid "No phone number."
-msgstr ""
+msgstr "Ingen telefonnummer."
#: actions/smssettings.php:311
msgid "No carrier selected."
-msgstr ""
+msgstr "Ingen operatør valgt."
#: actions/smssettings.php:318
msgid "That is already your phone number."
@@ -3850,11 +3874,11 @@ msgstr "Det er ikke ditt telefonnummer."
#: actions/smssettings.php:465
msgid "Mobile carrier"
-msgstr ""
+msgstr "Mobiloperatør"
#: actions/smssettings.php:469
msgid "Select a carrier"
-msgstr ""
+msgstr "Velg en operatør"
#: actions/smssettings.php:476
#, php-format
@@ -3907,7 +3931,7 @@ msgstr ""
#: actions/snapshotadminpanel.php:217
msgid "Frequency"
-msgstr ""
+msgstr "Frekvens"
#: actions/snapshotadminpanel.php:218
msgid "Snapshots will be sent once every N web hits"
@@ -3930,8 +3954,7 @@ msgstr "Innstillinger for IM"
msgid "You are not subscribed to that profile."
msgstr ""
-#: actions/subedit.php:83 classes/Subscription.php:89
-#: classes/Subscription.php:116
+#: actions/subedit.php:83 classes/Subscription.php:132
#, fuzzy
msgid "Could not save subscription."
msgstr "Klarte ikke å lagre avatar-informasjonen"
@@ -4020,18 +4043,17 @@ msgid ""
msgstr ""
#: actions/subscriptions.php:128 actions/subscriptions.php:132
-#, fuzzy, php-format
+#, php-format
msgid "%s is not listening to anyone."
-msgstr "%1$s lytter nå til dine notiser på %2$s."
+msgstr "%s lytter ikke til noen."
-#: actions/subscriptions.php:199
-#, fuzzy
+#: actions/subscriptions.php:208
msgid "Jabber"
-msgstr "Ingen Jabber ID."
+msgstr "Jabber"
-#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:222 lib/connectsettingsaction.php:115
msgid "SMS"
-msgstr ""
+msgstr "SMS"
#: actions/tag.php:69
#, fuzzy, php-format
@@ -4062,15 +4084,14 @@ msgstr ""
msgid "Tag %s"
msgstr "Tagger"
-#: actions/tagother.php:77 lib/userprofile.php:75
-#, fuzzy
+#: actions/tagother.php:77 lib/userprofile.php:76
msgid "User profile"
-msgstr "Klarte ikke å lagre profil."
+msgstr "Brukerprofil"
#: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:102
+#: lib/userprofile.php:103
msgid "Photo"
-msgstr ""
+msgstr "Foto"
#: actions/tagother.php:141
#, fuzzy
@@ -4106,9 +4127,8 @@ msgid "API method under construction."
msgstr "API-metode under utvikling."
#: actions/unblock.php:59
-#, fuzzy
msgid "You haven't blocked that user."
-msgstr "Du er allerede logget inn!"
+msgstr "Du har ikke blokkert den brukeren."
#: actions/unsandbox.php:72
msgid "User is not sandboxed."
@@ -4136,24 +4156,24 @@ msgstr ""
#: actions/useradminpanel.php:59
msgctxt "TITLE"
msgid "User"
-msgstr ""
+msgstr "Bruker"
#: actions/useradminpanel.php:70
msgid "User settings for this StatusNet site."
-msgstr ""
+msgstr "Brukerinnstillinger for dette StatusNet-nettstedet."
#: actions/useradminpanel.php:149
msgid "Invalid bio limit. Must be numeric."
-msgstr ""
+msgstr "Ugyldig biografigrense. Må være numerisk."
#: actions/useradminpanel.php:155
msgid "Invalid welcome text. Max length is 255 characters."
-msgstr ""
+msgstr "Ugyldig velkomsttekst. Maks lengde er 255 tegn."
#: actions/useradminpanel.php:165
#, php-format
msgid "Invalid default subscripton: '%1$s' is not user."
-msgstr ""
+msgstr "Ugyldig standardabonnement: '%1$s' er ikke bruker."
#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108
#: lib/personalgroupnav.php:109
@@ -4162,48 +4182,43 @@ msgstr "Profil"
#: actions/useradminpanel.php:222
msgid "Bio Limit"
-msgstr ""
+msgstr "Biografigrense"
#: actions/useradminpanel.php:223
msgid "Maximum length of a profile bio in characters."
-msgstr ""
+msgstr "Maks lengde på en profilbiografi i tegn."
#: actions/useradminpanel.php:231
-#, fuzzy
msgid "New users"
-msgstr "slett"
+msgstr "Nye brukere"
#: actions/useradminpanel.php:235
msgid "New user welcome"
-msgstr ""
+msgstr "Velkomst av ny bruker"
#: actions/useradminpanel.php:236
msgid "Welcome text for new users (Max 255 chars)."
-msgstr ""
+msgstr "Velkomsttekst for nye brukere (Maks 255 tegn)."
#: actions/useradminpanel.php:241
-#, fuzzy
msgid "Default subscription"
-msgstr "Alle abonnementer"
+msgstr "Standardabonnement"
#: actions/useradminpanel.php:242
-#, fuzzy
msgid "Automatically subscribe new users to this user."
-msgstr ""
-"Abonner automatisk på de som abonnerer på meg (best for ikke-mennesker)"
+msgstr "Legger automatisk til et abonnement på denne brukeren til nye brukere."
#: actions/useradminpanel.php:251
-#, fuzzy
msgid "Invitations"
-msgstr "Bekreftelseskode"
+msgstr "Invitasjoner"
#: actions/useradminpanel.php:256
msgid "Invitations enabled"
-msgstr ""
+msgstr "Invitasjoner aktivert"
#: actions/useradminpanel.php:258
msgid "Whether to allow users to invite new users."
-msgstr ""
+msgstr "Hvorvidt brukere tillates å invitere nye brukere."
#: actions/userauthorization.php:105
msgid "Authorize subscription"
@@ -4218,7 +4233,7 @@ msgstr ""
#: actions/userauthorization.php:196 actions/version.php:165
msgid "License"
-msgstr ""
+msgstr "Lisens"
#: actions/userauthorization.php:217
msgid "Accept"
@@ -4227,16 +4242,15 @@ msgstr "Godta"
#: actions/userauthorization.php:218 lib/subscribeform.php:115
#: lib/subscribeform.php:139
msgid "Subscribe to this user"
-msgstr ""
+msgstr "Abonner på denne brukeren"
#: actions/userauthorization.php:219
msgid "Reject"
-msgstr ""
+msgstr "Avvis"
#: actions/userauthorization.php:220
-#, fuzzy
msgid "Reject this subscription"
-msgstr "Alle abonnementer"
+msgstr "Avvis dette abonnementet"
#: actions/userauthorization.php:232
msgid "No authorization request!"
@@ -4312,7 +4326,7 @@ msgstr ""
#: actions/userdesignsettings.php:282
msgid "Enjoy your hotdog!"
-msgstr ""
+msgstr "Bon appétit."
#: actions/usergroups.php:64
#, fuzzy, php-format
@@ -4321,17 +4335,17 @@ msgstr "Alle abonnementer"
#: actions/usergroups.php:130
msgid "Search for more groups"
-msgstr ""
+msgstr "Søk etter flere grupper"
#: actions/usergroups.php:157
-#, fuzzy, php-format
+#, php-format
msgid "%s is not a member of any group."
-msgstr "Du er allerede logget inn!"
+msgstr "%s er ikke medlem av noen gruppe."
#: actions/usergroups.php:162
#, php-format
msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
-msgstr ""
+msgstr "Prøv å [søke etter grupper](%%action.groupsearch%%) og bli med i dem."
#: actions/userrss.php:95 lib/atomgroupnoticefeed.php:66
#: lib/atomusernoticefeed.php:72
@@ -4340,9 +4354,9 @@ msgid "Updates from %1$s on %2$s!"
msgstr "Oppdateringar fra %1$s på %2$s!"
#: actions/version.php:73
-#, fuzzy, php-format
+#, php-format
msgid "StatusNet %s"
-msgstr "Statistikk"
+msgstr "StatusNet %s"
#: actions/version.php:153
#, php-format
@@ -4350,10 +4364,12 @@ msgid ""
"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
"Inc. and contributors."
msgstr ""
+"Dette nettstedet drives av %1$s versjon %2$s, Copyright 2008-2010 StatusNet, "
+"Inc. og andre bidragsytere."
#: actions/version.php:161
msgid "Contributors"
-msgstr ""
+msgstr "Bidragsytere"
#: actions/version.php:168
msgid ""
@@ -4380,30 +4396,29 @@ msgstr ""
#: actions/version.php:189
msgid "Plugins"
-msgstr ""
+msgstr "Programtillegg"
-#: actions/version.php:196 lib/action.php:767
-#, fuzzy
+#: actions/version.php:196 lib/action.php:766
msgid "Version"
-msgstr "Personlig"
+msgstr "Versjon"
#: actions/version.php:197
msgid "Author(s)"
-msgstr ""
+msgstr "Forfatter(e)"
-#: classes/File.php:144
+#: classes/File.php:169
#, 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:154
+#: classes/File.php:179
#, php-format
msgid "A file this large would exceed your user quota of %d bytes."
msgstr ""
-#: classes/File.php:161
+#: classes/File.php:186
#, php-format
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
@@ -4445,102 +4460,98 @@ msgstr ""
msgid "Could not update message with new URI."
msgstr ""
-#: classes/Notice.php:172
+#: classes/Notice.php:175
#, php-format
msgid "DB error inserting hashtag: %s"
msgstr ""
-#: classes/Notice.php:241
+#: classes/Notice.php:244
msgid "Problem saving notice. Too long."
-msgstr ""
+msgstr "Problem ved lagring av notis. For lang."
-#: classes/Notice.php:245
+#: classes/Notice.php:248
msgid "Problem saving notice. Unknown user."
-msgstr ""
+msgstr "Problem ved lagring av notis. Ukjent bruker."
-#: classes/Notice.php:250
+#: classes/Notice.php:253
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
-#: classes/Notice.php:256
+#: classes/Notice.php:259
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
msgstr ""
-#: classes/Notice.php:262
+#: classes/Notice.php:265
msgid "You are banned from posting notices on this site."
msgstr ""
-#: classes/Notice.php:328 classes/Notice.php:354
+#: classes/Notice.php:331 classes/Notice.php:357
msgid "Problem saving notice."
-msgstr ""
+msgstr "Problem ved lagring av notis."
-#: classes/Notice.php:927
+#: classes/Notice.php:943
msgid "Problem saving group inbox."
-msgstr ""
+msgstr "Problem ved lagring av gruppeinnboks."
-#: classes/Notice.php:1459
+#: classes/Notice.php:1481
#, php-format
msgid "RT @%1$s %2$s"
-msgstr ""
+msgstr "RT @%1$s %2$s"
-#: classes/Subscription.php:66 lib/oauthstore.php:465
+#: classes/Subscription.php:74 lib/oauthstore.php:465
msgid "You have been banned from subscribing."
msgstr ""
-#: classes/Subscription.php:70
+#: classes/Subscription.php:78
msgid "Already subscribed!"
msgstr ""
-#: classes/Subscription.php:74
+#: classes/Subscription.php:82
msgid "User has blocked you."
-msgstr ""
+msgstr "Bruker har blokkert deg."
-#: classes/Subscription.php:157
+#: classes/Subscription.php:167
#, fuzzy
msgid "Not subscribed!"
msgstr "Alle abonnementer"
-#: classes/Subscription.php:163
+#: classes/Subscription.php:173
#, fuzzy
msgid "Couldn't delete self-subscription."
msgstr "Klarte ikke å lagre avatar-informasjonen"
-#: classes/Subscription.php:190
+#: classes/Subscription.php:200
#, fuzzy
msgid "Couldn't delete subscription OMB token."
msgstr "Klarte ikke å lagre avatar-informasjonen"
-#: classes/Subscription.php:201 lib/subs.php:69
+#: classes/Subscription.php:211
msgid "Couldn't delete subscription."
msgstr ""
-#: classes/User.php:373
+#: classes/User.php:363
#, php-format
msgid "Welcome to %1$s, @%2$s!"
-msgstr ""
+msgstr "Velkommen til %1$s, @%2$s."
-#: classes/User_group.php:477
-#, fuzzy
+#: classes/User_group.php:480
msgid "Could not create group."
-msgstr "Klarte ikke å lagre avatar-informasjonen"
+msgstr "Kunne ikke opprette gruppe."
-#: classes/User_group.php:486
-#, fuzzy
+#: classes/User_group.php:489
msgid "Could not set group URI."
-msgstr "Klarte ikke å lagre avatar-informasjonen"
+msgstr "Kunne ikke stille inn gruppe-URI."
-#: classes/User_group.php:507
-#, fuzzy
+#: classes/User_group.php:510
msgid "Could not set group membership."
-msgstr "Klarte ikke å lagre avatar-informasjonen"
+msgstr "Kunne ikke stille inn gruppemedlemskap."
-#: classes/User_group.php:521
-#, fuzzy
+#: classes/User_group.php:524
msgid "Could not save local group info."
-msgstr "Klarte ikke å lagre avatar-informasjonen"
+msgstr "Kunne ikke lagre lokal gruppeinformasjon."
#: lib/accountsettingsaction.php:108
msgid "Change your profile settings"
@@ -4548,7 +4559,7 @@ msgstr "Endre profilinnstillingene dine"
#: lib/accountsettingsaction.php:112
msgid "Upload an avatar"
-msgstr ""
+msgstr "Last opp en avatar"
#: lib/accountsettingsaction.php:116
msgid "Change your password"
@@ -4565,189 +4576,186 @@ msgstr "Klarte ikke å lagre profil."
#: lib/accountsettingsaction.php:128
msgid "Other"
-msgstr ""
+msgstr "Andre"
#: lib/accountsettingsaction.php:128
msgid "Other options"
-msgstr ""
+msgstr "Andre valg"
#: lib/action.php:144
-#, fuzzy, php-format
+#, php-format
msgid "%1$s - %2$s"
-msgstr "%1$s sin status på %2$s"
+msgstr "%1$s - %2$s"
#: lib/action.php:159
msgid "Untitled page"
-msgstr ""
+msgstr "Side uten tittel"
-#: lib/action.php:424
+#: lib/action.php:423
msgid "Primary site navigation"
msgstr ""
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:430
+#: lib/action.php:429
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr ""
-#: lib/action.php:433
-#, fuzzy
+#: lib/action.php:432
msgctxt "MENU"
msgid "Personal"
msgstr "Personlig"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:435
+#: lib/action.php:434
#, fuzzy
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "Endre passordet ditt"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:440
-#, fuzzy
+#: lib/action.php:439
msgctxt "TOOLTIP"
msgid "Connect to services"
-msgstr "Koble til"
+msgstr "Koble til tjenester"
-#: lib/action.php:443
+#: lib/action.php:442
msgid "Connect"
msgstr "Koble til"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:446
+#: lib/action.php:445
msgctxt "TOOLTIP"
msgid "Change site configuration"
-msgstr ""
+msgstr "Endre nettstedskonfigurasjon"
-#: lib/action.php:449
-#, fuzzy
+#: lib/action.php:448
msgctxt "MENU"
msgid "Admin"
msgstr "Administrator"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:453
+#: lib/action.php:452
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr ""
-#: lib/action.php:456
+#: lib/action.php:455
msgctxt "MENU"
msgid "Invite"
msgstr "Inviter"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:462
+#: lib/action.php:461
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "Logg ut fra nettstedet"
-#: lib/action.php:465
+#: lib/action.php:464
msgctxt "MENU"
msgid "Logout"
msgstr "Logg ut"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:470
+#: lib/action.php:469
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Opprett en konto"
-#: lib/action.php:473
+#: lib/action.php:472
msgctxt "MENU"
msgid "Register"
msgstr "Registrer"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:476
+#: lib/action.php:475
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Log inn på nettstedet"
-#: lib/action.php:479
+#: lib/action.php:478
msgctxt "MENU"
msgid "Login"
msgstr "Logg inn"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:482
+#: lib/action.php:481
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Hjelp meg."
-#: lib/action.php:485
+#: lib/action.php:484
msgctxt "MENU"
msgid "Help"
msgstr "Hjelp"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:488
+#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "Søk etter personer eller tekst"
-#: lib/action.php:491
+#: lib/action.php:490
msgctxt "MENU"
msgid "Search"
msgstr "Søk"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:513 lib/adminpanelaction.php:398
+#: lib/action.php:512 lib/adminpanelaction.php:398
msgid "Site notice"
msgstr ""
-#: lib/action.php:579
+#: lib/action.php:578
msgid "Local views"
msgstr ""
-#: lib/action.php:645
+#: lib/action.php:644
msgid "Page notice"
msgstr ""
-#: lib/action.php:747
+#: lib/action.php:746
msgid "Secondary site navigation"
msgstr ""
-#: lib/action.php:752
+#: lib/action.php:751
msgid "Help"
msgstr "Hjelp"
-#: lib/action.php:754
+#: lib/action.php:753
msgid "About"
msgstr "Om"
-#: lib/action.php:756
+#: lib/action.php:755
msgid "FAQ"
msgstr "OSS/FAQ"
-#: lib/action.php:760
+#: lib/action.php:759
msgid "TOS"
msgstr ""
-#: lib/action.php:763
+#: lib/action.php:762
msgid "Privacy"
msgstr ""
-#: lib/action.php:765
+#: lib/action.php:764
msgid "Source"
msgstr "Kilde"
-#: lib/action.php:769
+#: lib/action.php:768
msgid "Contact"
msgstr "Kontakt"
-#: lib/action.php:771
+#: lib/action.php:770
msgid "Badge"
msgstr ""
-#: lib/action.php:799
+#: lib/action.php:798
msgid "StatusNet software license"
-msgstr ""
+msgstr "Programvarelisens for StatusNet"
-#: lib/action.php:802
+#: lib/action.php:803
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4756,12 +4764,12 @@ msgstr ""
"**%%site.name%%** er en mikrobloggingtjeneste av [%%site.broughtby%%](%%site."
"broughtbyurl%%). "
-#: lib/action.php:804
+#: lib/action.php:805
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** er en mikrobloggingtjeneste. "
-#: lib/action.php:806
+#: lib/action.php:808
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4769,53 +4777,57 @@ msgid ""
"org/licensing/licenses/agpl-3.0.html)."
msgstr ""
-#: lib/action.php:821
+#: lib/action.php:823
msgid "Site content license"
msgstr ""
-#: lib/action.php:826
+#: lib/action.php:828
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
-#: lib/action.php:831
+#: lib/action.php:833
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
-#: lib/action.php:834
+#: lib/action.php:836
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
-#: lib/action.php:847
+#: lib/action.php:849
msgid "All "
msgstr "Alle "
-#: lib/action.php:853
+#: lib/action.php:855
msgid "license."
msgstr "lisens."
-#: lib/action.php:1152
+#: lib/action.php:1154
msgid "Pagination"
msgstr ""
-#: lib/action.php:1161
+#: lib/action.php:1163
msgid "After"
msgstr "Etter"
-#: lib/action.php:1169
+#: lib/action.php:1171
msgid "Before"
msgstr "Før"
-#: lib/activity.php:453
+#: lib/activity.php:120
+msgid "Expecting a root feed element but got a whole XML document."
+msgstr ""
+
+#: lib/activityutils.php:208
msgid "Can't handle remote content yet."
msgstr ""
-#: lib/activity.php:481
+#: lib/activityutils.php:236
msgid "Can't handle embedded XML content yet."
msgstr ""
-#: lib/activity.php:485
+#: lib/activityutils.php:240
msgid "Can't handle embedded Base64 content yet."
msgstr ""
@@ -4832,12 +4844,12 @@ msgstr ""
#. TRANS: Client error message
#: lib/adminpanelaction.php:229
msgid "showForm() not implemented."
-msgstr ""
+msgstr "showForm() ikke implementert."
#. TRANS: Client error message
#: lib/adminpanelaction.php:259
msgid "saveSettings() not implemented."
-msgstr ""
+msgstr "saveSettings() ikke implementert."
#. TRANS: Client error message
#: lib/adminpanelaction.php:283
@@ -4851,10 +4863,9 @@ msgstr ""
#. TRANS: Menu item for site administration
#: lib/adminpanelaction.php:350
-#, fuzzy
msgctxt "MENU"
msgid "Site"
-msgstr "Nettstedslogo"
+msgstr "Nettsted"
#. TRANS: Menu item title/tooltip
#: lib/adminpanelaction.php:356
@@ -4871,22 +4882,22 @@ msgstr "Personlig"
#. TRANS: Menu item title/tooltip
#: lib/adminpanelaction.php:364
msgid "User configuration"
-msgstr ""
+msgstr "Brukerkonfigurasjon"
#. TRANS: Menu item for site administration
#: lib/adminpanelaction.php:366 lib/personalgroupnav.php:115
msgid "User"
-msgstr ""
+msgstr "Bruker"
#. TRANS: Menu item title/tooltip
#: lib/adminpanelaction.php:372
msgid "Access configuration"
-msgstr ""
+msgstr "Tilgangskonfigurasjon"
#. TRANS: Menu item title/tooltip
#: lib/adminpanelaction.php:380
msgid "Paths configuration"
-msgstr ""
+msgstr "Stikonfigurasjon"
#. TRANS: Menu item title/tooltip
#: lib/adminpanelaction.php:388
@@ -4895,9 +4906,8 @@ msgstr ""
#. TRANS: Menu item title/tooltip
#: lib/adminpanelaction.php:396
-#, fuzzy
msgid "Edit site notice"
-msgstr "Slett notis"
+msgstr "Rediger nettstedsnotis"
#. TRANS: Menu item title/tooltip
#: lib/adminpanelaction.php:404
@@ -4908,47 +4918,43 @@ msgstr ""
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
-#: lib/apiauth.php:272
+#: lib/apiauth.php:276
#, php-format
msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s"
msgstr ""
#: lib/applicationeditform.php:136
msgid "Edit application"
-msgstr ""
+msgstr "Rediger program"
#: lib/applicationeditform.php:184
msgid "Icon for this application"
-msgstr ""
+msgstr "Ikon for dette programmet"
#: lib/applicationeditform.php:204
-#, fuzzy, php-format
+#, php-format
msgid "Describe your application in %d characters"
-msgstr "Beskriv degselv og dine interesser med 140 tegn"
+msgstr "Beskriv programmet ditt med %d tegn"
#: lib/applicationeditform.php:207
-#, fuzzy
msgid "Describe your application"
-msgstr "Beskriv degselv og dine interesser med 140 tegn"
+msgstr "Beskriv programmet ditt"
#: lib/applicationeditform.php:216
-#, fuzzy
msgid "Source URL"
-msgstr "Kilde"
+msgstr "Nettadresse til kilde"
#: lib/applicationeditform.php:218
-#, fuzzy
msgid "URL of the homepage of this application"
-msgstr "URL til din hjemmeside, blogg, eller profil på annen nettside."
+msgstr "Nettadresse til hjemmesiden for dette programmet"
#: lib/applicationeditform.php:224
msgid "Organization responsible for this application"
msgstr ""
#: lib/applicationeditform.php:230
-#, fuzzy
msgid "URL for the homepage of the organization"
-msgstr "URL til din hjemmeside, blogg, eller profil på annen nettside."
+msgstr "URL til organisasjonens hjemmeside"
#: lib/applicationeditform.php:236
msgid "URL to redirect to after authentication"
@@ -4956,298 +4962,306 @@ msgstr ""
#: lib/applicationeditform.php:258
msgid "Browser"
-msgstr ""
+msgstr "Nettleser"
#: lib/applicationeditform.php:274
msgid "Desktop"
-msgstr ""
+msgstr "Skrivebord"
#: lib/applicationeditform.php:275
msgid "Type of application, browser or desktop"
-msgstr ""
+msgstr "Type program, nettleser eller skrivebord"
#: lib/applicationeditform.php:297
msgid "Read-only"
-msgstr ""
+msgstr "Skrivebeskyttet"
#: lib/applicationeditform.php:315
msgid "Read-write"
-msgstr ""
+msgstr "Les og skriv"
#: lib/applicationeditform.php:316
msgid "Default access for this application: read-only, or read-write"
msgstr ""
+"Standardtilgang for dette programmet: skrivebeskyttet eller lese- og "
+"skrivetilgang"
#: lib/applicationlist.php:154
-#, fuzzy
msgid "Revoke"
-msgstr "Fjern"
+msgstr "Tilbakekall"
#: lib/attachmentlist.php:87
msgid "Attachments"
-msgstr ""
+msgstr "Vedlegg"
-#: lib/attachmentlist.php:265
+#: lib/attachmentlist.php:263
msgid "Author"
-msgstr ""
+msgstr "Forfatter"
-#: lib/attachmentlist.php:278
-#, fuzzy
+#: lib/attachmentlist.php:276
msgid "Provider"
-msgstr "Profil"
+msgstr "Leverandør"
#: lib/attachmentnoticesection.php:67
msgid "Notices where this attachment appears"
-msgstr ""
+msgstr "Notiser hvor dette vedlegget forekommer"
#: lib/attachmenttagcloudsection.php:48
msgid "Tags for this attachment"
msgstr ""
#: lib/authenticationplugin.php:220 lib/authenticationplugin.php:225
-#, fuzzy
msgid "Password changing failed"
-msgstr "Passordet ble lagret"
+msgstr "Endring av passord mislyktes"
#: lib/authenticationplugin.php:235
-#, fuzzy
msgid "Password changing is not allowed"
-msgstr "Passordet ble lagret"
+msgstr "Endring av passord er ikke tillatt"
-#: lib/channel.php:138 lib/channel.php:158
+#: lib/channel.php:157 lib/channel.php:177
msgid "Command results"
msgstr ""
-#: lib/channel.php:210 lib/mailhandler.php:142
+#: lib/channel.php:229 lib/mailhandler.php:142
msgid "Command complete"
msgstr ""
-#: lib/channel.php:221
+#: lib/channel.php:240
msgid "Command failed"
msgstr ""
-#: lib/command.php:44
-msgid "Sorry, this command is not yet implemented."
-msgstr ""
+#: lib/command.php:83 lib/command.php:105
+msgid "Notice with that id does not exist"
+msgstr "Notis med den id'en finnes ikke"
-#: lib/command.php:88
-#, fuzzy, php-format
+#: lib/command.php:99 lib/command.php:570
+msgid "User has no last notice"
+msgstr "Bruker har ingen siste notis"
+
+#: lib/command.php:125
+#, php-format
msgid "Could not find a user with nickname %s"
-msgstr "Klarte ikke å oppdatere bruker med bekreftet e-post."
+msgstr "Fant ingen bruker med kallenavn %s"
-#: lib/command.php:92
-msgid "It does not make a lot of sense to nudge yourself!"
+#: lib/command.php:143
+#, fuzzy, php-format
+msgid "Could not find a local user with nickname %s"
+msgstr "Fant ingen bruker med kallenavn %s"
+
+#: lib/command.php:176
+msgid "Sorry, this command is not yet implemented."
msgstr ""
-#: lib/command.php:99
-#, fuzzy, php-format
+#: lib/command.php:221
+msgid "It does not make a lot of sense to nudge yourself!"
+msgstr "Det gir ikke så mye mening å knuffe seg selv."
+
+#: lib/command.php:228
+#, php-format
msgid "Nudge sent to %s"
-msgstr "Svar til %s"
+msgstr "Knuff sendt til %s"
-#: lib/command.php:126
+#: lib/command.php:254
#, php-format
msgid ""
"Subscriptions: %1$s\n"
"Subscribers: %2$s\n"
"Notices: %3$s"
msgstr ""
+"Abonnement: %1$s\n"
+"Abonnenter: %2$s\n"
+"Notiser: %3$s"
-#: lib/command.php:152 lib/command.php:390 lib/command.php:451
-msgid "Notice with that id does not exist"
-msgstr ""
-
-#: lib/command.php:168 lib/command.php:406 lib/command.php:467
-#: lib/command.php:523
-#, fuzzy
-msgid "User has no last notice"
-msgstr "Brukeren har ingen profil."
-
-#: lib/command.php:190
+#: lib/command.php:296
msgid "Notice marked as fave."
-msgstr ""
+msgstr "Notis markert som favoritt."
-#: lib/command.php:217
+#: lib/command.php:317
msgid "You are already a member of that group"
msgstr "Du er allerede medlem av den gruppen."
-#: lib/command.php:231
+#: lib/command.php:331
#, fuzzy, php-format
msgid "Could not join user %s to group %s"
msgstr "Klarte ikke å oppdatere bruker."
-#: lib/command.php:236
-#, fuzzy, php-format
+#: lib/command.php:336
+#, php-format
msgid "%s joined group %s"
-msgstr "%1$s sin status på %2$s"
+msgstr "%s ble med i gruppen %s"
-#: lib/command.php:275
-#, fuzzy, php-format
+#: lib/command.php:373
+#, php-format
msgid "Could not remove user %s to group %s"
-msgstr "Klarte ikke å oppdatere bruker."
+msgstr "Kunne ikke fjerne brukeren %s fra gruppen %s"
-#: lib/command.php:280
-#, fuzzy, php-format
+#: lib/command.php:378
+#, php-format
msgid "%s left group %s"
-msgstr "%1$s sin status på %2$s"
+msgstr "%s forlot gruppen %s"
-#: lib/command.php:309
-#, fuzzy, php-format
+#: lib/command.php:401
+#, php-format
msgid "Fullname: %s"
-msgstr "Fullt navn"
+msgstr "Fullt navn: %s"
-#: lib/command.php:312 lib/mail.php:258
+#: lib/command.php:404 lib/mail.php:258
#, php-format
msgid "Location: %s"
-msgstr ""
+msgstr "Posisjon: %s"
-#: lib/command.php:315 lib/mail.php:260
+#: lib/command.php:407 lib/mail.php:260
#, php-format
msgid "Homepage: %s"
-msgstr ""
+msgstr "Hjemmeside: %s"
-#: lib/command.php:318
+#: lib/command.php:410
#, php-format
msgid "About: %s"
+msgstr "Om: %s"
+
+#: lib/command.php:437
+#, php-format
+msgid ""
+"%s is a remote profile; you can only send direct messages to users on the "
+"same server."
msgstr ""
-#: lib/command.php:349
+#: lib/command.php:450
#, php-format
msgid "Message too long - maximum is %d characters, you sent %d"
-msgstr ""
+msgstr "Melding for lang - maks er %d tegn, du sendte %d"
-#: lib/command.php:367
-#, fuzzy, php-format
+#: lib/command.php:468
+#, php-format
msgid "Direct message to %s sent"
-msgstr "Direktemeldinger til %s"
+msgstr "Direktemelding til %s sendt"
-#: lib/command.php:369
+#: lib/command.php:470
msgid "Error sending direct message."
-msgstr ""
+msgstr "Feil ved sending av direktemelding."
-#: lib/command.php:413
-#, fuzzy
+#: lib/command.php:490
msgid "Cannot repeat your own notice"
-msgstr "Kan ikke slette notisen."
+msgstr "Kan ikke repetere din egen notis"
-#: lib/command.php:418
-#, fuzzy
+#: lib/command.php:495
msgid "Already repeated that notice"
-msgstr "Kan ikke slette notisen."
+msgstr "Allerede repetert den notisen"
-#: lib/command.php:426
-#, fuzzy, php-format
+#: lib/command.php:503
+#, php-format
msgid "Notice from %s repeated"
-msgstr "Nytt nick"
+msgstr "Notis fra %s repetert"
-#: lib/command.php:428
+#: lib/command.php:505
msgid "Error repeating notice."
-msgstr ""
+msgstr "Feil ved repetering av notis."
-#: lib/command.php:482
+#: lib/command.php:536
#, php-format
msgid "Notice too long - maximum is %d characters, you sent %d"
-msgstr ""
+msgstr "Notis for lang - maks er %d tegn, du sendte %d"
-#: lib/command.php:491
-#, fuzzy, php-format
+#: lib/command.php:545
+#, php-format
msgid "Reply to %s sent"
-msgstr "Svar til %s"
+msgstr "Svar til %s sendt"
-#: lib/command.php:493
+#: lib/command.php:547
msgid "Error saving notice."
-msgstr ""
+msgstr "Feil ved lagring av notis."
-#: lib/command.php:547
+#: lib/command.php:594
msgid "Specify the name of the user to subscribe to"
msgstr ""
-#: lib/command.php:554 lib/command.php:589
-#, fuzzy
-msgid "No such user"
-msgstr "Ingen slik bruker"
+#: lib/command.php:602
+msgid "Can't subscribe to OMB profiles by command."
+msgstr ""
-#: lib/command.php:561
+#: lib/command.php:608
#, php-format
msgid "Subscribed to %s"
msgstr ""
-#: lib/command.php:582 lib/command.php:685
+#: lib/command.php:629 lib/command.php:728
msgid "Specify the name of the user to unsubscribe from"
msgstr ""
-#: lib/command.php:595
+#: lib/command.php:638
#, php-format
msgid "Unsubscribed from %s"
msgstr ""
-#: lib/command.php:613 lib/command.php:636
+#: lib/command.php:656 lib/command.php:679
msgid "Command not yet implemented."
msgstr ""
-#: lib/command.php:616
+#: lib/command.php:659
msgid "Notification off."
msgstr ""
-#: lib/command.php:618
+#: lib/command.php:661
msgid "Can't turn off notification."
msgstr ""
-#: lib/command.php:639
+#: lib/command.php:682
msgid "Notification on."
msgstr ""
-#: lib/command.php:641
+#: lib/command.php:684
msgid "Can't turn on notification."
msgstr ""
-#: lib/command.php:654
+#: lib/command.php:697
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:665
+#: lib/command.php:708
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:692
+#: lib/command.php:735
#, fuzzy, php-format
msgid "Unsubscribed %s"
msgstr "Svar til %s"
-#: lib/command.php:709
+#: lib/command.php:752
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "Ikke autorisert."
-#: lib/command.php:711
+#: lib/command.php:754
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Ikke autorisert."
msgstr[1] "Ikke autorisert."
-#: lib/command.php:731
+#: lib/command.php:774
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Svar til %s"
-#: lib/command.php:733
+#: lib/command.php:776
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Svar til %s"
msgstr[1] "Svar til %s"
-#: lib/command.php:753
+#: lib/command.php:796
#, fuzzy
msgid "You are not a member of any groups."
msgstr "Du er allerede logget inn!"
-#: lib/command.php:755
+#: lib/command.php:798
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Du er allerede logget inn!"
msgstr[1] "Du er allerede logget inn!"
-#: lib/command.php:769
+#: lib/command.php:812
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5289,20 +5303,19 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:148
-#, fuzzy
+#: lib/common.php:135
msgid "No configuration file found. "
-msgstr "Fant ikke bekreftelseskode."
+msgstr "Ingen konfigurasjonsfil funnet. "
-#: lib/common.php:149
+#: lib/common.php:136
msgid "I looked for configuration files in the following places: "
-msgstr ""
+msgstr "Jeg så etter konfigurasjonfiler på følgende seter: "
-#: lib/common.php:151
+#: lib/common.php:138
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:152
+#: lib/common.php:139
msgid "Go to the installer."
msgstr ""
@@ -5316,12 +5329,11 @@ msgstr ""
#: lib/connectsettingsaction.php:116
msgid "Updates by SMS"
-msgstr ""
+msgstr "Oppdatert med SMS"
#: lib/connectsettingsaction.php:120
-#, fuzzy
msgid "Connections"
-msgstr "Koble til"
+msgstr "Tilkoblinger"
#: lib/connectsettingsaction.php:121
msgid "Authorized connected applications"
@@ -5329,12 +5341,11 @@ msgstr ""
#: lib/dberroraction.php:60
msgid "Database error"
-msgstr ""
+msgstr "Databasefeil"
#: lib/designsettings.php:105
-#, fuzzy
msgid "Upload file"
-msgstr "Last opp"
+msgstr "Last opp fil"
#: lib/designsettings.php:109
msgid ""
@@ -5359,23 +5370,23 @@ msgstr ""
#: lib/feed.php:85
msgid "RSS 1.0"
-msgstr ""
+msgstr "RSS 1.0"
#: lib/feed.php:87
msgid "RSS 2.0"
-msgstr ""
+msgstr "RSS 2.0"
#: lib/feed.php:89
msgid "Atom"
-msgstr ""
+msgstr "Atom"
#: lib/feed.php:91
msgid "FOAF"
-msgstr ""
+msgstr "Venn av en venn"
#: lib/feedlist.php:64
msgid "Export data"
-msgstr ""
+msgstr "Eksporter data"
#: lib/galleryaction.php:121
#, fuzzy
@@ -5384,7 +5395,7 @@ msgstr "Feed for taggen %s"
#: lib/galleryaction.php:131
msgid "All"
-msgstr ""
+msgstr "Alle"
#: lib/galleryaction.php:139
msgid "Select tag to filter"
@@ -5406,7 +5417,7 @@ msgstr ""
#: lib/grantroleform.php:91
#, php-format
msgid "Grant this user the \"%s\" role"
-msgstr ""
+msgstr "Innvilg denne brukeren rollen «%s»"
#: lib/groupeditform.php:163
#, fuzzy
@@ -5482,49 +5493,49 @@ msgstr ""
msgid "This page is not available in a media type you accept"
msgstr "Denne siden er ikke tilgjengelig i en mediatype du aksepterer"
-#: lib/imagefile.php:75
+#: lib/imagefile.php:72
+msgid "Unsupported image file format."
+msgstr "Bildefilformatet støttes ikke."
+
+#: lib/imagefile.php:88
#, php-format
msgid "That file is too big. The maximum file size is %s."
msgstr "Filen er for stor. Maks filstørrelse er %s."
-#: lib/imagefile.php:80
+#: lib/imagefile.php:93
msgid "Partial upload."
msgstr "Delvis opplasting."
-#: lib/imagefile.php:88 lib/mediafile.php:170
+#: lib/imagefile.php:101 lib/mediafile.php:170
msgid "System error uploading file."
msgstr "Systemfeil ved opplasting av fil."
-#: lib/imagefile.php:96
+#: lib/imagefile.php:109
msgid "Not an image or corrupt file."
msgstr "Ikke et bilde eller en korrupt fil."
-#: lib/imagefile.php:109
-msgid "Unsupported image file format."
-msgstr "Bildefilformatet støttes ikke."
-
#: lib/imagefile.php:122
msgid "Lost our file."
msgstr "Mistet filen vår."
-#: lib/imagefile.php:166 lib/imagefile.php:231
+#: lib/imagefile.php:163 lib/imagefile.php:224
msgid "Unknown file type"
msgstr "Ukjent filtype"
-#: lib/imagefile.php:251
+#: lib/imagefile.php:244
msgid "MB"
msgstr "MB"
-#: lib/imagefile.php:253
+#: lib/imagefile.php:246
msgid "kB"
msgstr "kB"
-#: lib/jabber.php:220
+#: lib/jabber.php:387
#, php-format
msgid "[%s]"
msgstr "[%s]"
-#: lib/jabber.php:400
+#: lib/jabber.php:567
#, php-format
msgid "Unknown inbox source %d."
msgstr "Ukjent innbokskilde %d."
@@ -5804,7 +5815,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:482
+#: lib/mailbox.php:227 lib/noticelist.php:486
msgid "from"
msgstr "fra"
@@ -5931,48 +5942,48 @@ msgstr ""
"Beklager, henting av din geoposisjon tar lenger tid enn forventet, prøv "
"igjen senere"
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "N"
msgstr "N"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "S"
msgstr "S"
-#: lib/noticelist.php:431
+#: lib/noticelist.php:432
msgid "E"
msgstr "Ø"
-#: lib/noticelist.php:431
+#: lib/noticelist.php:432
msgid "W"
msgstr "V"
-#: lib/noticelist.php:438
+#: lib/noticelist.php:439
msgid "at"
msgstr ""
-#: lib/noticelist.php:566
+#: lib/noticelist.php:570
msgid "in context"
msgstr ""
-#: lib/noticelist.php:601
+#: lib/noticelist.php:605
msgid "Repeated by"
msgstr "Repetert av"
-#: lib/noticelist.php:628
+#: lib/noticelist.php:632
msgid "Reply to this notice"
msgstr "Svar på denne notisen"
-#: lib/noticelist.php:629
+#: lib/noticelist.php:633
msgid "Reply"
msgstr "Svar"
-#: lib/noticelist.php:673
+#: lib/noticelist.php:677
msgid "Notice repeated"
msgstr "Notis repetert"
@@ -6045,7 +6056,7 @@ msgstr ""
msgid "Unknown"
msgstr "Ukjent"
-#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr "Abonnement"
@@ -6053,7 +6064,7 @@ msgstr "Abonnement"
msgid "All subscriptions"
msgstr "Alle abonnementer"
-#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90
+#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr "Abonnenter"
@@ -6061,15 +6072,20 @@ msgstr "Abonnenter"
msgid "All subscribers"
msgstr "Alle abonnenter"
-#: lib/profileaction.php:180
+#: lib/profileaction.php:186
msgid "User ID"
msgstr "Bruker-ID"
-#: lib/profileaction.php:185
+#: lib/profileaction.php:191
msgid "Member since"
msgstr "Medlem siden"
-#: lib/profileaction.php:247
+#. TRANS: Average count of posts made per day since account registration
+#: lib/profileaction.php:230
+msgid "Daily average"
+msgstr ""
+
+#: lib/profileaction.php:259
msgid "All groups"
msgstr "Alle grupper"
@@ -6115,7 +6131,7 @@ msgstr "Repeter denne notisen"
msgid "Revoke the \"%s\" role from this user"
msgstr ""
-#: lib/router.php:671
+#: lib/router.php:704
msgid "No single user defined for single-user mode."
msgstr ""
@@ -6245,90 +6261,99 @@ msgstr ""
msgid "Unsubscribe"
msgstr ""
-#: lib/userprofile.php:116
+#: lib/usernoprofileexception.php:58
+#, fuzzy, php-format
+msgid "User %s (%d) has no profile record."
+msgstr "Brukeren har ingen profil."
+
+#: lib/userprofile.php:117
#, fuzzy
msgid "Edit Avatar"
msgstr "Brukerbilde"
-#: lib/userprofile.php:236
+#: lib/userprofile.php:234 lib/userprofile.php:248
msgid "User actions"
msgstr ""
-#: lib/userprofile.php:251
+#: lib/userprofile.php:237
+msgid "User deletion in progress..."
+msgstr ""
+
+#: lib/userprofile.php:263
msgid "Edit profile settings"
msgstr "Endre profilinnstillinger"
-#: lib/userprofile.php:252
+#: lib/userprofile.php:264
msgid "Edit"
msgstr "Rediger"
-#: lib/userprofile.php:275
+#: lib/userprofile.php:287
msgid "Send a direct message to this user"
msgstr "Send en direktemelding til denne brukeren"
-#: lib/userprofile.php:276
+#: lib/userprofile.php:288
msgid "Message"
msgstr "Melding"
-#: lib/userprofile.php:314
+#: lib/userprofile.php:326
msgid "Moderate"
msgstr "Moderer"
-#: lib/userprofile.php:352
+#: lib/userprofile.php:364
msgid "User role"
msgstr "Brukerrolle"
-#: lib/userprofile.php:354
+#: lib/userprofile.php:366
msgctxt "role"
msgid "Administrator"
msgstr "Administrator"
-#: lib/userprofile.php:355
+#: lib/userprofile.php:367
msgctxt "role"
msgid "Moderator"
msgstr "Moderator"
-#: lib/util.php:1015
+#: lib/util.php:1046
msgid "a few seconds ago"
msgstr "noen få sekunder siden"
-#: lib/util.php:1017
+#: lib/util.php:1048
msgid "about a minute ago"
msgstr "omtrent ett minutt siden"
-#: lib/util.php:1019
+#: lib/util.php:1050
#, php-format
msgid "about %d minutes ago"
msgstr "omtrent %d minutter siden"
-#: lib/util.php:1021
+#: lib/util.php:1052
msgid "about an hour ago"
msgstr "omtrent én time siden"
-#: lib/util.php:1023
+#: lib/util.php:1054
#, php-format
msgid "about %d hours ago"
msgstr "omtrent %d timer siden"
-#: lib/util.php:1025
+#: lib/util.php:1056
msgid "about a day ago"
msgstr "omtrent én dag siden"
-#: lib/util.php:1027
+#: lib/util.php:1058
#, php-format
msgid "about %d days ago"
msgstr "omtrent %d dager siden"
-#: lib/util.php:1029
+#: lib/util.php:1060
msgid "about a month ago"
msgstr "omtrent én måned siden"
-#: lib/util.php:1031
+#: lib/util.php:1062
#, php-format
msgid "about %d months ago"
msgstr "omtrent %d måneder siden"
-#: lib/util.php:1033
+#: lib/util.php:1064
msgid "about a year ago"
msgstr "omtrent ett år siden"
@@ -6342,7 +6367,7 @@ msgstr "%s er ikke en gyldig farge."
msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr "%s er ikke en gyldig farge. Bruk 3 eller 6 heksadesimale tegn."
-#: lib/xmppmanager.php:402
+#: lib/xmppmanager.php:403
#, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d."
msgstr "Melding for lang - maks er %1$d tegn, du sendte %2$d."
diff --git a/locale/nl/LC_MESSAGES/statusnet.po b/locale/nl/LC_MESSAGES/statusnet.po
index c73771f84..39caa923f 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-03-06 23:49+0000\n"
-"PO-Revision-Date: 2010-03-06 23:50:33+0000\n"
+"POT-Creation-Date: 2010-04-06 22:53+0000\n"
+"PO-Revision-Date: 2010-04-06 22:55:04+0000\n"
"Language-Team: Dutch\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64665); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: nl\n"
"X-Message-Group: out-statusnet\n"
@@ -92,9 +92,9 @@ msgstr "Deze pagina bestaat niet"
#: 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:90
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78
+#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
@@ -103,10 +103,8 @@ msgstr "Deze pagina bestaat niet"
#: actions/remotesubscribe.php:154 actions/replies.php:73
#: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:163 lib/command.php:302
-#: lib/command.php:355 lib/command.php:401 lib/command.php:462
-#: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82
-#: lib/profileaction.php:77
+#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: lib/mailbox.php:82 lib/profileaction.php:77
msgid "No such user."
msgstr "Onbekende gebruiker."
@@ -202,18 +200,18 @@ msgstr "Updates van %1$s en vrienden op %2$s."
#: 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:132
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:136
#: actions/apigrouplistall.php:120 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:135
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
-#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184
-#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148
+#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:174
+#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173
+#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
-#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
+#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
msgid "API method not found."
msgstr "De API-functie is niet aangetroffen."
@@ -226,8 +224,8 @@ msgstr "De API-functie is niet aangetroffen."
#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65
-#: actions/apistatusesupdate.php:118
+#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
msgid "This method requires a POST."
msgstr "Deze methode vereist een POST."
@@ -258,7 +256,7 @@ msgid "Could not save profile."
msgstr "Het was niet mogelijk het profiel op te slaan."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:97
+#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
#: actions/designadminpanel.php:122 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
@@ -346,7 +344,7 @@ msgstr "Er is geen status gevonden met dit ID."
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:176
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
msgid "Could not create favorite."
msgstr "Het was niet mogelijk een favoriet aan te maken."
@@ -469,7 +467,7 @@ msgstr "De groep is niet aangetroffen!"
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:221
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
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."
@@ -487,11 +485,18 @@ msgstr "U bent geen lid van deze groep."
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."
-#: actions/apigrouplist.php:95
+#. TRANS: %s is a user name
+#: actions/apigrouplist.php:97
#, 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
+#, 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."
+
#: actions/apigrouplistall.php:90 actions/usergroups.php:62
#, php-format
msgid "%s groups"
@@ -519,7 +524,7 @@ msgstr "Ongeldig token."
#: 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:337
+#: actions/profilesettings.php:194 actions/recoverpassword.php:350
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
@@ -588,15 +593,15 @@ msgstr ""
"van het type \"<strong>%3$s</strong> tot uw gebruikersgegevens. Geef alleen "
"toegang tot uw gebruiker bij %4$s aan derde partijen die u vertrouwt."
-#: actions/apioauthauthorize.php:310 lib/action.php:438
+#: actions/apioauthauthorize.php:310 lib/action.php:437
msgid "Account"
msgstr "Gebruiker"
#: actions/apioauthauthorize.php:313 actions/login.php:230
#: actions/profilesettings.php:106 actions/register.php:424
-#: actions/showgroup.php:244 actions/tagother.php:94
+#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
-#: lib/userprofile.php:131
+#: lib/userprofile.php:132
msgid "Nickname"
msgstr "Gebruikersnaam"
@@ -667,12 +672,12 @@ msgstr ""
msgid "Unsupported format."
msgstr "Niet-ondersteund bestandsformaat."
-#: actions/apitimelinefavorites.php:108
+#: actions/apitimelinefavorites.php:109
#, php-format
msgid "%1$s / Favorites from %2$s"
msgstr "%1$s / Favorieten van %2$s"
-#: actions/apitimelinefavorites.php:117
+#: actions/apitimelinefavorites.php:118
#, 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"
@@ -682,7 +687,7 @@ msgstr "%1$s updates op de favorietenlijst geplaatst door %2$s / %3$s"
msgid "%1$s / Updates mentioning %2$s"
msgstr "%1$s / Updates over %2$s"
-#: actions/apitimelinementions.php:127
+#: actions/apitimelinementions.php:130
#, 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."
@@ -692,7 +697,7 @@ msgstr "%1$s updates die een reactie zijn op updates van %2$s / %3$s."
msgid "%s public timeline"
msgstr "%s publieke tijdlijn"
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "%s updates van iedereen"
@@ -707,12 +712,12 @@ msgstr "Herhaald naar %s"
msgid "Repeats of %s"
msgstr "Herhaald van %s"
-#: actions/apitimelinetag.php:102 actions/tag.php:67
+#: actions/apitimelinetag.php:104 actions/tag.php:67
#, php-format
msgid "Notices tagged with %s"
msgstr "Mededelingen met het label %s"
-#: actions/apitimelinetag.php:104 actions/tagrss.php:65
+#: actions/apitimelinetag.php:106 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!"
@@ -740,7 +745,7 @@ msgstr "Geen afmeting."
msgid "Invalid size."
msgstr "Ongeldige afmetingen."
-#: actions/avatarsettings.php:67 actions/showgroup.php:229
+#: actions/avatarsettings.php:67 actions/showgroup.php:230
#: lib/accountsettingsaction.php:112
msgid "Avatar"
msgstr "Avatar"
@@ -773,7 +778,7 @@ msgid "Preview"
msgstr "Voorvertoning"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:655
+#: lib/deleteuserform.php:66 lib/noticelist.php:659
msgid "Delete"
msgstr "Verwijderen"
@@ -785,24 +790,28 @@ msgstr "Uploaden"
msgid "Crop"
msgstr "Uitsnijden"
-#: actions/avatarsettings.php:328
+#: actions/avatarsettings.php:305
+msgid "No file uploaded."
+msgstr "Er is geen bestand geüpload."
+
+#: actions/avatarsettings.php:332
msgid "Pick a square area of the image to be your avatar"
msgstr ""
"Selecteer een vierkant in de afbeelding om deze als uw avatar in te stellen"
-#: actions/avatarsettings.php:343 actions/grouplogo.php:380
+#: actions/avatarsettings.php:347 actions/grouplogo.php:380
msgid "Lost our file data."
msgstr "Ons bestand is verloren gegaan."
-#: actions/avatarsettings.php:366
+#: actions/avatarsettings.php:370
msgid "Avatar updated."
msgstr "De avatar is bijgewerkt."
-#: actions/avatarsettings.php:369
+#: actions/avatarsettings.php:373
msgid "Failed updating avatar."
msgstr "Het bijwerken van de avatar is mislukt."
-#: actions/avatarsettings.php:393
+#: actions/avatarsettings.php:397
msgid "Avatar deleted."
msgstr "De avatar is verwijderd."
@@ -840,7 +849,7 @@ msgstr "Gebruiker niet blokkeren"
msgid "Yes"
msgstr "Ja"
-#: actions/block.php:144 actions/groupmembers.php:355 lib/blockform.php:80
+#: actions/block.php:144 actions/groupmembers.php:373 lib/blockform.php:80
msgid "Block this user"
msgstr "Deze gebruiker blokkeren"
@@ -857,8 +866,8 @@ msgstr "Het was niet mogelijk om de blokkadeinformatie op te slaan."
#: actions/groupunblock.php:86 actions/joingroup.php:82
#: actions/joingroup.php:93 actions/leavegroup.php:82
#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212
-#: lib/command.php:260
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162
+#: lib/command.php:358
msgid "No such group."
msgstr "De opgegeven groep bestaat niet."
@@ -940,7 +949,7 @@ msgid "Conversation"
msgstr "Dialoog"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:218 lib/searchgroupnav.php:82
+#: lib/profileaction.php:229 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "Mededelingen"
@@ -959,7 +968,7 @@ msgstr "U bent niet de eigenaar van deze applicatie."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1217
+#: lib/action.php:1219
msgid "There was a problem with your session token."
msgstr "Er is een probleem met uw sessietoken."
@@ -1020,7 +1029,7 @@ msgstr "Weet u zeker dat u deze aankondiging wilt verwijderen?"
msgid "Do not delete this notice"
msgstr "Deze mededeling niet verwijderen"
-#: actions/deletenotice.php:146 lib/noticelist.php:655
+#: actions/deletenotice.php:146 lib/noticelist.php:659
msgid "Delete this notice"
msgstr "Deze mededeling verwijderen"
@@ -1158,7 +1167,7 @@ msgstr "Standaardinstellingen toepassen"
#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:208
+#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
#: actions/tagother.php:154 actions/useradminpanel.php:294
#: lib/applicationeditform.php:333 lib/applicationeditform.php:334
#: lib/designsettings.php:256 lib/groupeditform.php:202
@@ -1274,7 +1283,7 @@ msgstr "de beschrijving is te lang (maximaal %d tekens)"
msgid "Could not update group."
msgstr "Het was niet mogelijk de groep bij te werken."
-#: actions/editgroup.php:264 classes/User_group.php:493
+#: actions/editgroup.php:264 classes/User_group.php:496
msgid "Could not create aliases."
msgstr "Het was niet mogelijk de aliassen aan te maken."
@@ -1641,7 +1650,7 @@ msgstr "Deze gebruiker is al de toegang tot de groep ontzegd."
msgid "User is not a member of group."
msgstr "De gebruiker is geen lid van de groep."
-#: actions/groupblock.php:136 actions/groupmembers.php:323
+#: actions/groupblock.php:136 actions/groupmembers.php:341
msgid "Block user from group"
msgstr "Gebruiker toegang tot de groep blokkeren"
@@ -1745,19 +1754,19 @@ msgstr "Ledenlijst van deze groep"
msgid "Admin"
msgstr "Beheerder"
-#: actions/groupmembers.php:355 lib/blockform.php:69
+#: actions/groupmembers.php:373 lib/blockform.php:69
msgid "Block"
msgstr "Blokkeren"
-#: actions/groupmembers.php:450
+#: actions/groupmembers.php:468
msgid "Make user an admin of the group"
msgstr "Deze gebruiker groepsbeheerder maken"
-#: actions/groupmembers.php:482
+#: actions/groupmembers.php:500
msgid "Make Admin"
msgstr "Beheerder maken"
-#: actions/groupmembers.php:482
+#: actions/groupmembers.php:500
msgid "Make this user an admin"
msgstr "Deze gebruiker beheerder maken"
@@ -1772,7 +1781,7 @@ msgstr "%s tijdlijn"
msgid "Updates from members of %1$s on %2$s!"
msgstr "Updates voor leden van %1$s op %2$s."
-#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232
+#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249
#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr "Groepen"
@@ -1987,7 +1996,7 @@ msgstr "Nieuwe gebruikers uitnodigen"
msgid "You are already subscribed to these users:"
msgstr "U bent als geabonneerd op deze gebruikers:"
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
#, php-format
msgid "%1$s (%2$s)"
msgstr "%1$s (%2$s)"
@@ -2120,7 +2129,7 @@ msgstr "%1$s is lid geworden van de groep %2$s"
msgid "You must be logged in to leave a group."
msgstr "U moet aangemeld zijn om een groep te kunnen verlaten."
-#: actions/leavegroup.php:100 lib/command.php:265
+#: actions/leavegroup.php:100 lib/command.php:363
msgid "You are not a member of that group."
msgstr "U bent geen lid van deze groep"
@@ -2235,12 +2244,12 @@ msgstr "Gebruik dit formulier om een nieuwe groep aan te maken."
msgid "New message"
msgstr "Nieuw bericht"
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
msgid "You can't send a message to this user."
msgstr "U kunt geen bericht naar deze gebruiker zenden."
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342
-#: lib/command.php:475
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
+#: lib/command.php:529
msgid "No content!"
msgstr "Geen inhoud!"
@@ -2248,7 +2257,7 @@ msgstr "Geen inhoud!"
msgid "No recipient specified."
msgstr "Er is geen ontvanger aangegeven."
-#: actions/newmessage.php:164 lib/command.php:361
+#: actions/newmessage.php:164 lib/command.php:462
msgid ""
"Don't send a message to yourself; just say it to yourself quietly instead."
msgstr "Stuur geen berichten naar uzelf. Zeg het gewoon in uw hoofd."
@@ -2262,7 +2271,7 @@ msgstr "Bericht verzonden."
msgid "Direct message to %s sent."
msgstr "Het directe bericht aan %s is verzonden."
-#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189
msgid "Ajax Error"
msgstr "Er is een Ajax-fout opgetreden"
@@ -2270,7 +2279,7 @@ msgstr "Er is een Ajax-fout opgetreden"
msgid "New notice"
msgstr "Nieuw bericht"
-#: actions/newnotice.php:211
+#: actions/newnotice.php:217
msgid "Notice posted"
msgstr "De mededeling is verzonden"
@@ -2388,7 +2397,7 @@ msgstr ""
msgid "Notice has no profile"
msgstr "Mededeling heeft geen profiel"
-#: actions/oembed.php:86 actions/shownotice.php:180
+#: actions/oembed.php:86 actions/shownotice.php:175
#, php-format
msgid "%1$s's status on %2$s"
msgstr "Status van %1$s op %2$s"
@@ -2401,8 +2410,8 @@ msgstr "inhoudstype "
msgid "Only "
msgstr "Alleen "
-#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042
-#: lib/apiaction.php:1070 lib/apiaction.php:1179
+#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1068
+#: lib/apiaction.php:1096 lib/apiaction.php:1212
msgid "Not a supported data format."
msgstr "Geen ondersteund gegevensformaat."
@@ -2533,7 +2542,7 @@ msgstr "Het oude wachtwoord is onjuist"
msgid "Error saving user; invalid."
msgstr "Fout bij opslaan gebruiker; ongeldig."
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
msgid "Can't save new password."
msgstr "Het was niet mogelijk het nieuwe wachtwoord op te slaan."
@@ -2708,12 +2717,12 @@ msgstr ""
msgid "People search"
msgstr "Gebruikers zoeken"
-#: actions/peopletag.php:70
+#: actions/peopletag.php:68
#, php-format
msgid "Not a valid people tag: %s"
msgstr "Geen geldig gebruikerslabel: %s"
-#: actions/peopletag.php:144
+#: actions/peopletag.php:142
#, php-format
msgid "Users self-tagged with %1$s - page %2$d"
msgstr "Gebruikers die zichzelf met %1$s hebben gelabeld - pagina %2$d"
@@ -2749,8 +2758,8 @@ 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/showgroup.php:255 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:149
+#: actions/showgroup.php:256 actions/tagother.php:104
+#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Volledige naam"
@@ -2777,9 +2786,9 @@ msgid "Bio"
msgstr "Beschrijving"
#: actions/profilesettings.php:132 actions/register.php:471
-#: actions/showgroup.php:264 actions/tagother.php:112
+#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
-#: lib/userprofile.php:164
+#: lib/userprofile.php:165
msgid "Location"
msgstr "Locatie"
@@ -2793,7 +2802,7 @@ msgstr "Mijn huidige locatie weergeven bij het plaatsen van mededelingen"
#: actions/profilesettings.php:145 actions/tagother.php:149
#: actions/tagother.php:209 lib/subscriptionlist.php:106
-#: lib/subscriptionlist.php:108 lib/userprofile.php:209
+#: lib/subscriptionlist.php:108 lib/userprofile.php:210
msgid "Tags"
msgstr "Labels"
@@ -3042,7 +3051,7 @@ msgstr "Wachtwoord herstellen"
msgid "Recover password"
msgstr "Wachtwoord herstellen"
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
msgid "Password recovery requested"
msgstr "Wachtwoordherstel aangevraagd"
@@ -3062,21 +3071,21 @@ msgstr "Herstellen"
msgid "Enter a nickname or email address."
msgstr "Voer een gebruikersnaam of e-mailadres in."
-#: actions/recoverpassword.php:272
+#: actions/recoverpassword.php:282
msgid "No user with that email address or username."
msgstr ""
"Er bestaat geen gebruiker met het opgegeven e-mailadres of de opgegeven "
"gebruikersnaam."
-#: actions/recoverpassword.php:287
+#: actions/recoverpassword.php:299
msgid "No registered email address for that user."
msgstr "Die gebruiker heeft geen e-mailadres geregistreerd."
-#: actions/recoverpassword.php:301
+#: actions/recoverpassword.php:313
msgid "Error saving address confirmation."
msgstr "Er is een fout opgetreden bij het opslaan van de adresbevestiging."
-#: actions/recoverpassword.php:325
+#: actions/recoverpassword.php:338
msgid ""
"Instructions for recovering your password have been sent to the email "
"address registered to your account."
@@ -3084,23 +3093,23 @@ msgstr ""
"De instructies om uw wachtwoord te herstellen zijn verstuurd naar het e-"
"mailadres dat voor uw gebruiker is geregistreerd."
-#: actions/recoverpassword.php:344
+#: actions/recoverpassword.php:357
msgid "Unexpected password reset."
msgstr "Het wachtwoord is onverwacht opnieuw ingesteld."
-#: actions/recoverpassword.php:352
+#: actions/recoverpassword.php:365
msgid "Password must be 6 chars or more."
msgstr "Het wachtwoord moet uit zes of meer tekens bestaan."
-#: actions/recoverpassword.php:356
+#: actions/recoverpassword.php:369
msgid "Password and confirmation do not match."
msgstr "Het wachtwoord en de bevestiging komen niet overeen."
-#: actions/recoverpassword.php:375 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:248
msgid "Error setting user."
msgstr "Er is een fout opgetreden tijdens het instellen van de gebruiker."
-#: actions/recoverpassword.php:382
+#: actions/recoverpassword.php:395
msgid "New password successfully saved. You are now logged in."
msgstr "Het nieuwe wachtwoord is opgeslagen. U bent nu aangemeld."
@@ -3264,7 +3273,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "De URL van uw profiel bij een andere, compatibele microblogdienst"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:394
+#: lib/userprofile.php:406
msgid "Subscribe"
msgstr "Abonneren"
@@ -3302,7 +3311,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:674
+#: actions/repeat.php:114 lib/noticelist.php:678
msgid "Repeated"
msgstr "Herhaald"
@@ -3445,8 +3454,8 @@ msgstr "Organisatie"
msgid "Description"
msgstr "Beschrijving"
-#: actions/showapplication.php:192 actions/showgroup.php:438
-#: lib/profileaction.php:176
+#: actions/showapplication.php:192 actions/showgroup.php:444
+#: lib/profileaction.php:187
msgid "Statistics"
msgstr "Statistieken"
@@ -3568,67 +3577,67 @@ msgstr "%s groep"
msgid "%1$s group, page %2$d"
msgstr "Groep %1$s, pagina %2$d"
-#: actions/showgroup.php:226
+#: actions/showgroup.php:227
msgid "Group profile"
msgstr "Groepsprofiel"
-#: actions/showgroup.php:271 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:177
+#: actions/showgroup.php:272 actions/tagother.php:118
+#: actions/userauthorization.php:175 lib/userprofile.php:178
msgid "URL"
msgstr "URL"
-#: actions/showgroup.php:282 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:194
+#: actions/showgroup.php:283 actions/tagother.php:128
+#: actions/userauthorization.php:187 lib/userprofile.php:195
msgid "Note"
msgstr "Opmerking"
-#: actions/showgroup.php:292 lib/groupeditform.php:184
+#: actions/showgroup.php:293 lib/groupeditform.php:184
msgid "Aliases"
msgstr "Aliassen"
-#: actions/showgroup.php:301
+#: actions/showgroup.php:302
msgid "Group actions"
msgstr "Groepshandelingen"
-#: actions/showgroup.php:337
+#: actions/showgroup.php:338
#, php-format
msgid "Notice feed for %s group (RSS 1.0)"
msgstr "Mededelingenfeed voor groep %s (RSS 1.0)"
-#: actions/showgroup.php:343
+#: actions/showgroup.php:344
#, php-format
msgid "Notice feed for %s group (RSS 2.0)"
msgstr "Mededelingenfeed voor groep %s (RSS 2.0)"
-#: actions/showgroup.php:349
+#: actions/showgroup.php:350
#, php-format
msgid "Notice feed for %s group (Atom)"
msgstr "Mededelingenfeed voor groep %s (Atom)"
-#: actions/showgroup.php:354
+#: actions/showgroup.php:355
#, php-format
msgid "FOAF for %s group"
msgstr "Vriend van een vriend voor de groep %s"
-#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91
+#: actions/showgroup.php:393 actions/showgroup.php:453 lib/groupnav.php:91
msgid "Members"
msgstr "Leden"
-#: actions/showgroup.php:395 lib/profileaction.php:117
-#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95
-#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71
+#: actions/showgroup.php:398 lib/profileaction.php:117
+#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95
+#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
msgid "(None)"
msgstr "(geen)"
-#: actions/showgroup.php:401
+#: actions/showgroup.php:404
msgid "All members"
msgstr "Alle leden"
-#: actions/showgroup.php:441
+#: actions/showgroup.php:447
msgid "Created"
msgstr "Aangemaakt"
-#: actions/showgroup.php:457
+#: actions/showgroup.php:463
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3644,7 +3653,7 @@ msgstr ""
"lid te worden van deze groep en nog veel meer! [Meer lezen...](%%%%doc.help%%"
"%%)"
-#: actions/showgroup.php:463
+#: actions/showgroup.php:469
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3657,7 +3666,7 @@ msgstr ""
"[StatusNet](http://status.net/). De leden wisselen korte mededelingen uit "
"over hun ervaringen en interesses. "
-#: actions/showgroup.php:491
+#: actions/showgroup.php:497
msgid "Admins"
msgstr "Beheerders"
@@ -3798,8 +3807,8 @@ msgid "Unknown language \"%s\"."
msgstr "De taal \"%s\" is niet bekend."
#: actions/siteadminpanel.php:165
-msgid "Minimum text limit is 140 characters."
-msgstr "De minimale tekstlimiet is 140 tekens."
+msgid "Minimum text limit is 0 (unlimited)."
+msgstr "De minimale tekstlimiet is 0 tekens (ongelimiteerd)."
#: actions/siteadminpanel.php:171
msgid "Dupe limit must 1 or more seconds."
@@ -4077,8 +4086,7 @@ msgstr "Snapshotinstellingen opslaan"
msgid "You are not subscribed to that profile."
msgstr "U bent niet geabonneerd op dat profiel."
-#: actions/subedit.php:83 classes/Subscription.php:89
-#: classes/Subscription.php:116
+#: actions/subedit.php:83 classes/Subscription.php:132
msgid "Could not save subscription."
msgstr "Het was niet mogelijk het abonnement op te slaan."
@@ -4181,11 +4189,11 @@ msgstr ""
msgid "%s is not listening to anyone."
msgstr "%s volgt niemand."
-#: actions/subscriptions.php:199
+#: actions/subscriptions.php:208
msgid "Jabber"
msgstr "Jabber"
-#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:222 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr "SMS"
@@ -4218,12 +4226,12 @@ msgstr "Geen ID-argument."
msgid "Tag %s"
msgstr "Label %s"
-#: actions/tagother.php:77 lib/userprofile.php:75
+#: actions/tagother.php:77 lib/userprofile.php:76
msgid "User profile"
msgstr "Gebruikersprofiel"
#: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:102
+#: lib/userprofile.php:103
msgid "Photo"
msgstr "Foto"
@@ -4560,7 +4568,7 @@ msgstr ""
msgid "Plugins"
msgstr "Plug-ins"
-#: actions/version.php:196 lib/action.php:767
+#: actions/version.php:196 lib/action.php:766
msgid "Version"
msgstr "Versie"
@@ -4568,7 +4576,7 @@ msgstr "Versie"
msgid "Author(s)"
msgstr "Auteur(s)"
-#: classes/File.php:144
+#: classes/File.php:169
#, php-format
msgid ""
"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
@@ -4577,13 +4585,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:154
+#: classes/File.php:179
#, 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:161
+#: classes/File.php:186
#, php-format
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
@@ -4622,31 +4630,31 @@ msgstr "Het was niet mogelijk het bericht in te voegen."
msgid "Could not update message with new URI."
msgstr "Het was niet mogelijk het bericht bij te werken met de nieuwe URI."
-#: classes/Notice.php:172
+#: classes/Notice.php:175
#, php-format
msgid "DB error inserting hashtag: %s"
msgstr "Er is een databasefout opgetreden bij de invoer van de hashtag: %s"
-#: classes/Notice.php:241
+#: classes/Notice.php:244
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:245
+#: classes/Notice.php:248
msgid "Problem saving notice. Unknown user."
msgstr ""
"Er was een probleem bij het opslaan van de mededeling. De gebruiker is "
"onbekend."
-#: classes/Notice.php:250
+#: classes/Notice.php:253
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:256
+#: classes/Notice.php:259
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
@@ -4654,73 +4662,73 @@ msgstr ""
"Te veel duplicaatberichten te snel achter elkaar. Neem een adempauze en "
"plaats over een aantal minuten pas weer een bericht."
-#: classes/Notice.php:262
+#: classes/Notice.php:265
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:328 classes/Notice.php:354
+#: classes/Notice.php:331 classes/Notice.php:357
msgid "Problem saving notice."
msgstr "Er is een probleem opgetreden bij het opslaan van de mededeling."
-#: classes/Notice.php:927
+#: classes/Notice.php:943
msgid "Problem saving group inbox."
msgstr ""
"Er is een probleem opgetreden bij het opslaan van het Postvak IN van de "
"groep."
-#: classes/Notice.php:1459
+#: classes/Notice.php:1481
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
-#: classes/Subscription.php:66 lib/oauthstore.php:465
+#: classes/Subscription.php:74 lib/oauthstore.php:465
msgid "You have been banned from subscribing."
msgstr "U mag zich niet abonneren."
-#: classes/Subscription.php:70
+#: classes/Subscription.php:78
msgid "Already subscribed!"
msgstr "U bent al gebonneerd!"
-#: classes/Subscription.php:74
+#: classes/Subscription.php:82
msgid "User has blocked you."
msgstr "Deze gebruiker negeert u."
-#: classes/Subscription.php:157
+#: classes/Subscription.php:167
msgid "Not subscribed!"
msgstr "Niet geabonneerd!"
-#: classes/Subscription.php:163
+#: classes/Subscription.php:173
msgid "Couldn't delete self-subscription."
msgstr "Het was niet mogelijk het abonnement op uzelf te verwijderen."
-#: classes/Subscription.php:190
+#: classes/Subscription.php:200
msgid "Couldn't delete subscription OMB token."
msgstr ""
"Het was niet mogelijk om het OMB-token voor het abonnement te verwijderen."
-#: classes/Subscription.php:201 lib/subs.php:69
+#: classes/Subscription.php:211
msgid "Couldn't delete subscription."
msgstr "Kon abonnement niet verwijderen."
-#: classes/User.php:373
+#: classes/User.php:363
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Welkom bij %1$s, @%2$s!"
-#: classes/User_group.php:477
+#: classes/User_group.php:480
msgid "Could not create group."
msgstr "Het was niet mogelijk de groep aan te maken."
-#: classes/User_group.php:486
+#: classes/User_group.php:489
msgid "Could not set group URI."
msgstr "Het was niet mogelijk de groeps-URI in te stellen."
-#: classes/User_group.php:507
+#: classes/User_group.php:510
msgid "Could not set group membership."
msgstr "Het was niet mogelijk het groepslidmaatschap in te stellen."
-#: classes/User_group.php:521
+#: classes/User_group.php:524
msgid "Could not save local group info."
msgstr "Het was niet mogelijk de lokale groepsinformatie op te slaan."
@@ -4761,170 +4769,170 @@ msgstr "%1$s - %2$s"
msgid "Untitled page"
msgstr "Naamloze pagina"
-#: lib/action.php:424
+#: lib/action.php:423
msgid "Primary site navigation"
msgstr "Primaire sitenavigatie"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:430
+#: lib/action.php:429
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr "Persoonlijk profiel en tijdlijn van vrienden"
-#: lib/action.php:433
+#: lib/action.php:432
msgctxt "MENU"
msgid "Personal"
msgstr "Persoonlijk"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:435
+#: lib/action.php:434
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "Uw e-mailadres, avatar, wachtwoord of profiel wijzigen"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:440
+#: lib/action.php:439
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "Met andere diensten koppelen"
-#: lib/action.php:443
+#: lib/action.php:442
msgid "Connect"
msgstr "Koppelen"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:446
+#: lib/action.php:445
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "Websiteinstellingen wijzigen"
-#: lib/action.php:449
+#: lib/action.php:448
msgctxt "MENU"
msgid "Admin"
msgstr "Beheer"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:453
+#: lib/action.php:452
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "Vrienden en collega's uitnodigen om u te vergezellen op %s"
-#: lib/action.php:456
+#: lib/action.php:455
msgctxt "MENU"
msgid "Invite"
msgstr "Uitnodigingen"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:462
+#: lib/action.php:461
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "Gebruiker afmelden"
-#: lib/action.php:465
+#: lib/action.php:464
msgctxt "MENU"
msgid "Logout"
msgstr "Afmelden"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:470
+#: lib/action.php:469
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Gebruiker aanmaken"
-#: lib/action.php:473
+#: lib/action.php:472
msgctxt "MENU"
msgid "Register"
msgstr "Registreren"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:476
+#: lib/action.php:475
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Gebruiker aanmelden"
-#: lib/action.php:479
+#: lib/action.php:478
msgctxt "MENU"
msgid "Login"
msgstr "Aanmelden"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:482
+#: lib/action.php:481
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Help me!"
-#: lib/action.php:485
+#: lib/action.php:484
msgctxt "MENU"
msgid "Help"
msgstr "Help"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:488
+#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "Naar gebruikers of tekst zoeken"
-#: lib/action.php:491
+#: lib/action.php:490
msgctxt "MENU"
msgid "Search"
msgstr "Zoeken"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:513 lib/adminpanelaction.php:398
+#: lib/action.php:512 lib/adminpanelaction.php:398
msgid "Site notice"
msgstr "Mededeling van de website"
-#: lib/action.php:579
+#: lib/action.php:578
msgid "Local views"
msgstr "Lokale weergaven"
-#: lib/action.php:645
+#: lib/action.php:644
msgid "Page notice"
msgstr "Mededeling van de pagina"
-#: lib/action.php:747
+#: lib/action.php:746
msgid "Secondary site navigation"
msgstr "Secundaire sitenavigatie"
-#: lib/action.php:752
+#: lib/action.php:751
msgid "Help"
msgstr "Help"
-#: lib/action.php:754
+#: lib/action.php:753
msgid "About"
msgstr "Over"
-#: lib/action.php:756
+#: lib/action.php:755
msgid "FAQ"
msgstr "Veel gestelde vragen"
-#: lib/action.php:760
+#: lib/action.php:759
msgid "TOS"
msgstr "Gebruiksvoorwaarden"
-#: lib/action.php:763
+#: lib/action.php:762
msgid "Privacy"
msgstr "Privacy"
-#: lib/action.php:765
+#: lib/action.php:764
msgid "Source"
msgstr "Broncode"
-#: lib/action.php:769
+#: lib/action.php:768
msgid "Contact"
msgstr "Contact"
-#: lib/action.php:771
+#: lib/action.php:770
msgid "Badge"
msgstr "Widget"
-#: lib/action.php:799
+#: lib/action.php:798
msgid "StatusNet software license"
msgstr "Licentie van de StatusNet-software"
-#: lib/action.php:802
+#: lib/action.php:803
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4933,12 +4941,12 @@ msgstr ""
"**%%site.name%%** is een microblogdienst van [%%site.broughtby%%](%%site."
"broughtbyurl%%). "
-#: lib/action.php:804
+#: lib/action.php:805
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** is een microblogdienst. "
-#: lib/action.php:806
+#: lib/action.php:808
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4949,57 +4957,61 @@ msgstr ""
"versie %s, beschikbaar onder de [GNU Affero General Public License](http://"
"www.fsf.org/licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:821
+#: lib/action.php:823
msgid "Site content license"
msgstr "Licentie voor siteinhoud"
-#: lib/action.php:826
+#: lib/action.php:828
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr "Inhoud en gegevens van %1$s zijn persoonlijk en vertrouwelijk."
-#: lib/action.php:831
+#: lib/action.php:833
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
"Auteursrechten op inhoud en gegevens rusten bij %1$s. Alle rechten "
"voorbehouden."
-#: lib/action.php:834
+#: lib/action.php:836
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
"Auteursrechten op inhoud en gegevens rusten bij de respectievelijke "
"gebruikers. Alle rechten voorbehouden."
-#: lib/action.php:847
+#: lib/action.php:849
msgid "All "
msgstr "Alle "
-#: lib/action.php:853
+#: lib/action.php:855
msgid "license."
msgstr "licentie."
-#: lib/action.php:1152
+#: lib/action.php:1154
msgid "Pagination"
msgstr "Paginering"
-#: lib/action.php:1161
+#: lib/action.php:1163
msgid "After"
msgstr "Later"
-#: lib/action.php:1169
+#: lib/action.php:1171
msgid "Before"
msgstr "Eerder"
-#: lib/activity.php:453
+#: lib/activity.php:120
+msgid "Expecting a root feed element but got a whole XML document."
+msgstr "Verwachtte een root-feed element maar kreeg een heel XML-document."
+
+#: lib/activityutils.php:208
msgid "Can't handle remote content yet."
msgstr "Het is nog niet mogelijk inhoud uit andere omgevingen te verwerken."
-#: lib/activity.php:481
+#: lib/activityutils.php:236
msgid "Can't handle embedded XML content yet."
msgstr "Het is nog niet mogelijk ingebedde XML-inhoud te verwerken"
-#: lib/activity.php:485
+#: lib/activityutils.php:240
msgid "Can't handle embedded Base64 content yet."
msgstr "Het is nog niet mogelijk ingebedde Base64-inhoud te verwerken"
@@ -5091,7 +5103,7 @@ msgstr ""
"Het API-programma heeft lezen-en-schrijventoegang nodig, maar u hebt alleen "
"maar leestoegang."
-#: lib/apiauth.php:272
+#: lib/apiauth.php:276
#, php-format
msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s"
msgstr ""
@@ -5167,11 +5179,11 @@ msgstr "Intrekken"
msgid "Attachments"
msgstr "Bijlagen"
-#: lib/attachmentlist.php:265
+#: lib/attachmentlist.php:263
msgid "Author"
msgstr "Auteur"
-#: lib/attachmentlist.php:278
+#: lib/attachmentlist.php:276
msgid "Provider"
msgstr "Provider"
@@ -5191,37 +5203,50 @@ msgstr "Wachtwoord wijzigen is mislukt"
msgid "Password changing is not allowed"
msgstr "Wachtwoord wijzigen is niet toegestaan"
-#: lib/channel.php:138 lib/channel.php:158
+#: lib/channel.php:157 lib/channel.php:177
msgid "Command results"
msgstr "Commandoresultaten"
-#: lib/channel.php:210 lib/mailhandler.php:142
+#: lib/channel.php:229 lib/mailhandler.php:142
msgid "Command complete"
msgstr "Het commando is uitgevoerd"
-#: lib/channel.php:221
+#: lib/channel.php:240
msgid "Command failed"
msgstr "Het uitvoeren van het commando is mislukt"
-#: lib/command.php:44
-msgid "Sorry, this command is not yet implemented."
-msgstr "Dit commando is nog niet geïmplementeerd."
+#: lib/command.php:83 lib/command.php:105
+msgid "Notice with that id does not exist"
+msgstr "Er bestaat geen mededeling met dat ID"
+
+#: lib/command.php:99 lib/command.php:570
+msgid "User has no last notice"
+msgstr "Deze gebruiker heeft geen laatste mededeling"
-#: lib/command.php:88
+#: lib/command.php:125
#, php-format
msgid "Could not find a user with nickname %s"
msgstr "De gebruiker %s is niet aangetroffen"
-#: lib/command.php:92
+#: lib/command.php:143
+#, php-format
+msgid "Could not find a local user with nickname %s"
+msgstr "De lokale gebruiker %s is niet aangetroffen"
+
+#: lib/command.php:176
+msgid "Sorry, this command is not yet implemented."
+msgstr "Dit commando is nog niet geïmplementeerd."
+
+#: lib/command.php:221
msgid "It does not make a lot of sense to nudge yourself!"
msgstr "Het heeft niet zoveel zin om uzelf te porren..."
-#: lib/command.php:99
+#: lib/command.php:228
#, php-format
msgid "Nudge sent to %s"
msgstr "De por naar %s is verzonden"
-#: lib/command.php:126
+#: lib/command.php:254
#, php-format
msgid ""
"Subscriptions: %1$s\n"
@@ -5232,202 +5257,202 @@ msgstr ""
"Abonnees: %2$s\n"
"Mededelingen: %3$s"
-#: lib/command.php:152 lib/command.php:390 lib/command.php:451
-msgid "Notice with that id does not exist"
-msgstr "Er bestaat geen mededeling met dat ID"
-
-#: lib/command.php:168 lib/command.php:406 lib/command.php:467
-#: lib/command.php:523
-msgid "User has no last notice"
-msgstr "Deze gebruiker heeft geen laatste mededeling"
-
-#: lib/command.php:190
+#: lib/command.php:296
msgid "Notice marked as fave."
msgstr "De mededeling is op de favorietenlijst geplaatst."
-#: lib/command.php:217
+#: lib/command.php:317
msgid "You are already a member of that group"
msgstr "U bent al lid van deze groep"
-#: lib/command.php:231
+#: lib/command.php:331
#, php-format
msgid "Could not join user %s to group %s"
msgstr "Het was niet mogelijk om de gebruiker %s toe te voegen aan de groep %s"
-#: lib/command.php:236
+#: lib/command.php:336
#, php-format
msgid "%s joined group %s"
msgstr "%s is lid geworden van de groep %s"
-#: lib/command.php:275
+#: lib/command.php:373
#, php-format
msgid "Could not remove user %s to group %s"
msgstr "De gebruiker %s kon niet uit de groep %s verwijderd worden"
-#: lib/command.php:280
+#: lib/command.php:378
#, php-format
msgid "%s left group %s"
msgstr "%s heeft de groep %s verlaten"
-#: lib/command.php:309
+#: lib/command.php:401
#, php-format
msgid "Fullname: %s"
msgstr "Volledige naam: %s"
-#: lib/command.php:312 lib/mail.php:258
+#: lib/command.php:404 lib/mail.php:258
#, php-format
msgid "Location: %s"
msgstr "Locatie: %s"
-#: lib/command.php:315 lib/mail.php:260
+#: lib/command.php:407 lib/mail.php:260
#, php-format
msgid "Homepage: %s"
msgstr "Thuispagina: %s"
-#: lib/command.php:318
+#: lib/command.php:410
#, php-format
msgid "About: %s"
msgstr "Over: %s"
-#: lib/command.php:349
+#: lib/command.php:437
+#, php-format
+msgid ""
+"%s is a remote profile; you can only send direct messages to users on the "
+"same server."
+msgstr ""
+"%s is een profiel op afstand. U kunt alle privéberichten verzenden aan "
+"gebruikers op dezelfde server."
+
+#: lib/command.php:450
#, php-format
msgid "Message too long - maximum is %d characters, you sent %d"
msgstr ""
"Het bericht te is lang. De maximale lengte is %d tekens. De lengte van uw "
"bericht was %d"
-#: lib/command.php:367
+#: lib/command.php:468
#, php-format
msgid "Direct message to %s sent"
msgstr "Het directe bericht aan %s is verzonden"
-#: lib/command.php:369
+#: lib/command.php:470
msgid "Error sending direct message."
msgstr "Er is een fout opgetreden bij het verzonden van het directe bericht."
-#: lib/command.php:413
+#: lib/command.php:490
msgid "Cannot repeat your own notice"
msgstr "U kunt uw eigen mededelingen niet herhalen."
-#: lib/command.php:418
+#: lib/command.php:495
msgid "Already repeated that notice"
msgstr "U hebt die mededeling al herhaald."
-#: lib/command.php:426
+#: lib/command.php:503
#, php-format
msgid "Notice from %s repeated"
msgstr "De mededeling van %s is herhaald"
-#: lib/command.php:428
+#: lib/command.php:505
msgid "Error repeating notice."
msgstr "Er is een fout opgetreden bij het herhalen van de mededeling."
-#: lib/command.php:482
+#: lib/command.php:536
#, php-format
msgid "Notice too long - maximum is %d characters, you sent %d"
msgstr ""
"De mededeling is te lang. De maximale lengte is %d tekens. Uw mededeling "
"bevatte %d tekens"
-#: lib/command.php:491
+#: lib/command.php:545
#, php-format
msgid "Reply to %s sent"
msgstr "Het antwoord aan %s is verzonden"
-#: lib/command.php:493
+#: lib/command.php:547
msgid "Error saving notice."
msgstr "Er is een fout opgetreden bij het opslaan van de mededeling."
-#: lib/command.php:547
+#: lib/command.php:594
msgid "Specify the name of the user to subscribe to"
msgstr "Geef de naam op van de gebruiker waarop u wilt abonneren"
-#: lib/command.php:554 lib/command.php:589
-msgid "No such user"
-msgstr "De opgegeven gebruiker bestaat niet"
+#: lib/command.php:602
+msgid "Can't subscribe to OMB profiles by command."
+msgstr "Abonneren op OMB-profielen op commando is niet mogelijk."
-#: lib/command.php:561
+#: lib/command.php:608
#, php-format
msgid "Subscribed to %s"
msgstr "Geabonneerd op %s"
-#: lib/command.php:582 lib/command.php:685
+#: lib/command.php:629 lib/command.php:728
msgid "Specify the name of the user to unsubscribe from"
msgstr ""
"Geef de naam op van de gebruiker waarvoor u het abonnement wilt opzeggen"
-#: lib/command.php:595
+#: lib/command.php:638
#, php-format
msgid "Unsubscribed from %s"
msgstr "Uw abonnement op %s is opgezegd"
-#: lib/command.php:613 lib/command.php:636
+#: lib/command.php:656 lib/command.php:679
msgid "Command not yet implemented."
msgstr "Dit commando is nog niet geïmplementeerd."
-#: lib/command.php:616
+#: lib/command.php:659
msgid "Notification off."
msgstr "Notificaties uitgeschakeld."
-#: lib/command.php:618
+#: lib/command.php:661
msgid "Can't turn off notification."
msgstr "Het is niet mogelijk de mededelingen uit te schakelen."
-#: lib/command.php:639
+#: lib/command.php:682
msgid "Notification on."
msgstr "Notificaties ingeschakeld."
-#: lib/command.php:641
+#: lib/command.php:684
msgid "Can't turn on notification."
msgstr "Het is niet mogelijk de notificatie uit te schakelen."
-#: lib/command.php:654
+#: lib/command.php:697
msgid "Login command is disabled"
msgstr "Het aanmeldcommando is uitgeschakeld"
-#: lib/command.php:665
+#: lib/command.php:708
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
"Deze verwijzing kan slechts één keer gebruikt worden en is twee minuten "
"geldig: %s"
-#: lib/command.php:692
+#: lib/command.php:735
#, php-format
msgid "Unsubscribed %s"
msgstr "Het abonnement van %s is opgeheven"
-#: lib/command.php:709
+#: lib/command.php:752
msgid "You are not subscribed to anyone."
msgstr "U bent op geen enkele gebruiker geabonneerd."
-#: lib/command.php:711
+#: lib/command.php:754
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "U bent geabonneerd op deze gebruiker:"
msgstr[1] "U bent geabonneerd op deze gebruikers:"
-#: lib/command.php:731
+#: lib/command.php:774
msgid "No one is subscribed to you."
msgstr "Niemand heeft een abonnenment op u."
-#: lib/command.php:733
+#: lib/command.php:776
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Deze gebruiker is op u geabonneerd:"
msgstr[1] "Deze gebruikers zijn op u geabonneerd:"
-#: lib/command.php:753
+#: lib/command.php:796
msgid "You are not a member of any groups."
msgstr "U bent lid van geen enkele groep."
-#: lib/command.php:755
+#: lib/command.php:798
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "U bent lid van deze groep:"
msgstr[1] "U bent lid van deze groepen:"
-#: lib/command.php:769
+#: lib/command.php:812
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5509,20 +5534,20 @@ msgstr ""
"tracks - nog niet beschikbaar\n"
"tracking - nog niet beschikbaar\n"
-#: lib/common.php:148
+#: lib/common.php:135
msgid "No configuration file found. "
msgstr "Er is geen instellingenbestand aangetroffen. "
-#: lib/common.php:149
+#: lib/common.php:136
msgid "I looked for configuration files in the following places: "
msgstr "Er is gezocht naar instellingenbestanden op de volgende plaatsen: "
-#: lib/common.php:151
+#: lib/common.php:138
msgid "You may wish to run the installer to fix this."
msgstr ""
"U kunt proberen de installer uit te voeren om dit probleem op te lossen."
-#: lib/common.php:152
+#: lib/common.php:139
msgid "Go to the installer."
msgstr "Naar het installatieprogramma gaan."
@@ -5700,49 +5725,49 @@ msgstr "Labels in de groepsmededelingen van %s"
msgid "This page is not available in a media type you accept"
msgstr "Deze pagina is niet beschikbaar in een mediatype dat u accepteert"
-#: lib/imagefile.php:75
+#: lib/imagefile.php:72
+msgid "Unsupported image file format."
+msgstr "Niet ondersteund beeldbestandsformaat."
+
+#: lib/imagefile.php:88
#, php-format
msgid "That file is too big. The maximum file size is %s."
msgstr "Dat bestand is te groot. De maximale bestandsgrootte is %s."
-#: lib/imagefile.php:80
+#: lib/imagefile.php:93
msgid "Partial upload."
msgstr "Gedeeltelijke upload."
-#: lib/imagefile.php:88 lib/mediafile.php:170
+#: lib/imagefile.php:101 lib/mediafile.php:170
msgid "System error uploading file."
msgstr "Er is een systeemfout opgetreden tijdens het uploaden van het bestand."
-#: lib/imagefile.php:96
+#: lib/imagefile.php:109
msgid "Not an image or corrupt file."
msgstr "Het bestand is geen afbeelding of het bestand is beschadigd."
-#: lib/imagefile.php:109
-msgid "Unsupported image file format."
-msgstr "Niet ondersteund beeldbestandsformaat."
-
#: lib/imagefile.php:122
msgid "Lost our file."
msgstr "Het bestand is zoekgeraakt."
-#: lib/imagefile.php:166 lib/imagefile.php:231
+#: lib/imagefile.php:163 lib/imagefile.php:224
msgid "Unknown file type"
msgstr "Onbekend bestandstype"
-#: lib/imagefile.php:251
+#: lib/imagefile.php:244
msgid "MB"
msgstr "MB"
-#: lib/imagefile.php:253
+#: lib/imagefile.php:246
msgid "kB"
msgstr "kB"
-#: lib/jabber.php:220
+#: lib/jabber.php:387
#, php-format
msgid "[%s]"
msgstr "[%s]"
-#: lib/jabber.php:400
+#: lib/jabber.php:567
#, php-format
msgid "Unknown inbox source %d."
msgstr "Onbekende bron Postvak IN %d."
@@ -6024,7 +6049,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:482
+#: lib/mailbox.php:227 lib/noticelist.php:486
msgid "from"
msgstr "van"
@@ -6157,48 +6182,48 @@ msgstr ""
"Het ophalen van uw geolocatie duurt langer dan verwacht. Probeer het later "
"nog eens"
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "N"
msgstr "N"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "S"
msgstr "Z"
-#: lib/noticelist.php:431
+#: lib/noticelist.php:432
msgid "E"
msgstr "O"
-#: lib/noticelist.php:431
+#: lib/noticelist.php:432
msgid "W"
msgstr "W"
-#: lib/noticelist.php:438
+#: lib/noticelist.php:439
msgid "at"
msgstr "op"
-#: lib/noticelist.php:566
+#: lib/noticelist.php:570
msgid "in context"
msgstr "in context"
-#: lib/noticelist.php:601
+#: lib/noticelist.php:605
msgid "Repeated by"
msgstr "Herhaald door"
-#: lib/noticelist.php:628
+#: lib/noticelist.php:632
msgid "Reply to this notice"
msgstr "Op deze mededeling antwoorden"
-#: lib/noticelist.php:629
+#: lib/noticelist.php:633
msgid "Reply"
msgstr "Antwoorden"
-#: lib/noticelist.php:673
+#: lib/noticelist.php:677
msgid "Notice repeated"
msgstr "Mededeling herhaald"
@@ -6272,7 +6297,7 @@ msgstr "Labels in de mededelingen van %s"
msgid "Unknown"
msgstr "Onbekend"
-#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr "Abonnementen"
@@ -6280,23 +6305,28 @@ msgstr "Abonnementen"
msgid "All subscriptions"
msgstr "Alle abonnementen"
-#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90
+#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr "Abonnees"
-#: lib/profileaction.php:159
+#: lib/profileaction.php:161
msgid "All subscribers"
msgstr "Alle abonnees"
-#: lib/profileaction.php:180
+#: lib/profileaction.php:191
msgid "User ID"
msgstr "Gebruikers-ID"
-#: lib/profileaction.php:185
+#: lib/profileaction.php:196
msgid "Member since"
msgstr "Lid sinds"
-#: lib/profileaction.php:247
+#. TRANS: Average count of posts made per day since account registration
+#: lib/profileaction.php:235
+msgid "Daily average"
+msgstr "Dagelijks gemiddelde"
+
+#: lib/profileaction.php:264
msgid "All groups"
msgstr "Alle groepen"
@@ -6341,7 +6371,7 @@ msgstr "Deze mededeling herhalen"
msgid "Revoke the \"%s\" role from this user"
msgstr "De gebruikersrol \"%s\" voor deze gebruiker intrekken"
-#: lib/router.php:671
+#: lib/router.php:704
msgid "No single user defined for single-user mode."
msgstr "Er is geen gebruiker gedefinieerd voor single-usermodus."
@@ -6467,89 +6497,98 @@ msgstr "Uitschrijven van deze gebruiker"
msgid "Unsubscribe"
msgstr "Abonnement opheffen"
-#: lib/userprofile.php:116
+#: lib/usernoprofileexception.php:58
+#, php-format
+msgid "User %s (%d) has no profile record."
+msgstr "Gebruiker %s (%d) heeft geen profielrecord."
+
+#: lib/userprofile.php:117
msgid "Edit Avatar"
msgstr "Avatar bewerken"
-#: lib/userprofile.php:236
+#: lib/userprofile.php:234 lib/userprofile.php:248
msgid "User actions"
msgstr "Gebruikershandelingen"
-#: lib/userprofile.php:251
+#: lib/userprofile.php:237
+msgid "User deletion in progress..."
+msgstr "Bezig met het verwijderen van de gebruiker..."
+
+#: lib/userprofile.php:263
msgid "Edit profile settings"
msgstr "Profielinstellingen bewerken"
-#: lib/userprofile.php:252
+#: lib/userprofile.php:264
msgid "Edit"
msgstr "Bewerken"
-#: lib/userprofile.php:275
+#: lib/userprofile.php:287
msgid "Send a direct message to this user"
msgstr "Deze gebruiker een direct bericht zenden"
-#: lib/userprofile.php:276
+#: lib/userprofile.php:288
msgid "Message"
msgstr "Bericht"
-#: lib/userprofile.php:314
+#: lib/userprofile.php:326
msgid "Moderate"
msgstr "Modereren"
-#: lib/userprofile.php:352
+#: lib/userprofile.php:364
msgid "User role"
msgstr "Gebruikersrol"
-#: lib/userprofile.php:354
+#: lib/userprofile.php:366
msgctxt "role"
msgid "Administrator"
msgstr "Beheerder"
-#: lib/userprofile.php:355
+#: lib/userprofile.php:367
msgctxt "role"
msgid "Moderator"
msgstr "Moderator"
-#: lib/util.php:1015
+#: lib/util.php:1046
msgid "a few seconds ago"
msgstr "een paar seconden geleden"
-#: lib/util.php:1017
+#: lib/util.php:1048
msgid "about a minute ago"
msgstr "ongeveer een minuut geleden"
-#: lib/util.php:1019
+#: lib/util.php:1050
#, php-format
msgid "about %d minutes ago"
msgstr "ongeveer %d minuten geleden"
-#: lib/util.php:1021
+#: lib/util.php:1052
msgid "about an hour ago"
msgstr "ongeveer een uur geleden"
-#: lib/util.php:1023
+#: lib/util.php:1054
#, php-format
msgid "about %d hours ago"
msgstr "ongeveer %d uur geleden"
-#: lib/util.php:1025
+#: lib/util.php:1056
msgid "about a day ago"
msgstr "ongeveer een dag geleden"
-#: lib/util.php:1027
+#: lib/util.php:1058
#, php-format
msgid "about %d days ago"
msgstr "ongeveer %d dagen geleden"
-#: lib/util.php:1029
+#: lib/util.php:1060
msgid "about a month ago"
msgstr "ongeveer een maand geleden"
-#: lib/util.php:1031
+#: lib/util.php:1062
#, php-format
msgid "about %d months ago"
msgstr "ongeveer %d maanden geleden"
-#: lib/util.php:1033
+#: lib/util.php:1064
msgid "about a year ago"
msgstr "ongeveer een jaar geleden"
@@ -6563,7 +6602,7 @@ msgstr "%s is geen geldige kleur."
msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr "%s is geen geldige kleur. Gebruik drie of zes hexadecimale tekens."
-#: lib/xmppmanager.php:402
+#: lib/xmppmanager.php:403
#, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d."
msgstr ""
diff --git a/locale/nn/LC_MESSAGES/statusnet.po b/locale/nn/LC_MESSAGES/statusnet.po
index a16e15649..12b3089fb 100644
--- a/locale/nn/LC_MESSAGES/statusnet.po
+++ b/locale/nn/LC_MESSAGES/statusnet.po
@@ -7,12 +7,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-06 23:49+0000\n"
-"PO-Revision-Date: 2010-03-06 23:50:30+0000\n"
+"POT-Creation-Date: 2010-04-05 18:54+0000\n"
+"PO-Revision-Date: 2010-04-05 18:55:53+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 (r63350); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64621); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: nn\n"
"X-Message-Group: out-statusnet\n"
@@ -98,9 +98,9 @@ msgstr "Dette emneord finst ikkje."
#: 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:90
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78
+#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
@@ -109,10 +109,8 @@ msgstr "Dette emneord finst ikkje."
#: actions/remotesubscribe.php:154 actions/replies.php:73
#: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:163 lib/command.php:302
-#: lib/command.php:355 lib/command.php:401 lib/command.php:462
-#: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82
-#: lib/profileaction.php:77
+#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: lib/mailbox.php:82 lib/profileaction.php:77
msgid "No such user."
msgstr "Brukaren finst ikkje."
@@ -200,18 +198,18 @@ msgstr "Oppdateringar frå %1$s og vener på %2$s!"
#: 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:132
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:136
#: actions/apigrouplistall.php:120 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:135
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
-#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184
-#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148
+#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:174
+#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173
+#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
-#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
+#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
#, fuzzy
msgid "API method not found."
msgstr "Fann ikkje API-metode."
@@ -225,8 +223,8 @@ msgstr "Fann ikkje API-metode."
#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65
-#: actions/apistatusesupdate.php:118
+#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
msgid "This method requires a POST."
msgstr "Dette krev ein POST."
@@ -257,7 +255,7 @@ msgid "Could not save profile."
msgstr "Kan ikkje lagra profil."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:97
+#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
#: actions/designadminpanel.php:122 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
@@ -345,7 +343,7 @@ msgstr "Fann ingen status med den ID-en."
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:176
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
msgid "Could not create favorite."
msgstr "Kunne ikkje lagre favoritt."
@@ -469,7 +467,7 @@ msgstr "Fann ikkje API-metode."
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:221
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
msgid "You have been blocked from that group by the admin."
msgstr ""
@@ -488,11 +486,18 @@ msgstr "Du er ikkje medlem av den gruppa."
msgid "Could not remove user %1$s from group %2$s."
msgstr "Kunne ikkje fjerne %s fra %s gruppa "
-#: actions/apigrouplist.php:95
+#. TRANS: %s is a user name
+#: actions/apigrouplist.php:97
#, 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
+#, fuzzy, php-format
+msgid "%1$s groups %2$s is a member of."
+msgstr "Grupper %s er medlem av"
+
#: actions/apigrouplistall.php:90 actions/usergroups.php:62
#, php-format
msgid "%s groups"
@@ -521,7 +526,7 @@ msgstr "Ugyldig storleik."
#: 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:337
+#: actions/profilesettings.php:194 actions/recoverpassword.php:350
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
@@ -582,15 +587,15 @@ msgid ""
"give access to your %4$s account to third parties you trust."
msgstr ""
-#: actions/apioauthauthorize.php:310 lib/action.php:438
+#: actions/apioauthauthorize.php:310 lib/action.php:437
msgid "Account"
msgstr "Konto"
#: actions/apioauthauthorize.php:313 actions/login.php:230
#: actions/profilesettings.php:106 actions/register.php:424
-#: actions/showgroup.php:244 actions/tagother.php:94
+#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
-#: lib/userprofile.php:131
+#: lib/userprofile.php:132
msgid "Nickname"
msgstr "Kallenamn"
@@ -664,12 +669,12 @@ msgstr ""
msgid "Unsupported format."
msgstr "Støttar ikkje bileteformatet."
-#: actions/apitimelinefavorites.php:108
+#: actions/apitimelinefavorites.php:109
#, fuzzy, php-format
msgid "%1$s / Favorites from %2$s"
msgstr "%s / Favorittar frå %s"
-#: actions/apitimelinefavorites.php:117
+#: actions/apitimelinefavorites.php:118
#, fuzzy, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "%s oppdateringar favorisert av %s / %s."
@@ -679,7 +684,7 @@ msgstr "%s oppdateringar favorisert av %s / %s."
msgid "%1$s / Updates mentioning %2$s"
msgstr "%1$s / Oppdateringar som svarar til %2$s"
-#: actions/apitimelinementions.php:127
+#: actions/apitimelinementions.php:130
#, 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."
@@ -689,7 +694,7 @@ msgstr "%1$s oppdateringar som svarar på oppdateringar frå %2$s / %3$s."
msgid "%s public timeline"
msgstr "%s offentleg tidsline"
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "%s oppdateringar frå alle saman!"
@@ -704,12 +709,12 @@ msgstr "Svar til %s"
msgid "Repeats of %s"
msgstr "Svar til %s"
-#: actions/apitimelinetag.php:102 actions/tag.php:67
+#: actions/apitimelinetag.php:104 actions/tag.php:67
#, php-format
msgid "Notices tagged with %s"
msgstr "Notisar merka med %s"
-#: actions/apitimelinetag.php:104 actions/tagrss.php:65
+#: actions/apitimelinetag.php:106 actions/tagrss.php:65
#, fuzzy, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Oppdateringar frå %1$s på %2$s!"
@@ -738,7 +743,7 @@ msgstr "Ingen storleik."
msgid "Invalid size."
msgstr "Ugyldig storleik."
-#: actions/avatarsettings.php:67 actions/showgroup.php:229
+#: actions/avatarsettings.php:67 actions/showgroup.php:230
#: lib/accountsettingsaction.php:112
msgid "Avatar"
msgstr "Brukarbilete"
@@ -770,7 +775,7 @@ msgid "Preview"
msgstr "Forhandsvis"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:655
+#: lib/deleteuserform.php:66 lib/noticelist.php:659
msgid "Delete"
msgstr "Slett"
@@ -782,23 +787,28 @@ msgstr "Last opp"
msgid "Crop"
msgstr "Skaler"
-#: actions/avatarsettings.php:328
+#: actions/avatarsettings.php:305
+#, fuzzy
+msgid "No file uploaded."
+msgstr "Ingen vald profil."
+
+#: actions/avatarsettings.php:332
msgid "Pick a square area of the image to be your avatar"
msgstr "Velg eit utvalg av bildet som vil blir din avatar."
-#: actions/avatarsettings.php:343 actions/grouplogo.php:380
+#: actions/avatarsettings.php:347 actions/grouplogo.php:380
msgid "Lost our file data."
msgstr "Fant ikkje igjen fil data."
-#: actions/avatarsettings.php:366
+#: actions/avatarsettings.php:370
msgid "Avatar updated."
msgstr "Lasta opp brukarbilete."
-#: actions/avatarsettings.php:369
+#: actions/avatarsettings.php:373
msgid "Failed updating avatar."
msgstr "Feil ved oppdatering av brukarbilete."
-#: actions/avatarsettings.php:393
+#: actions/avatarsettings.php:397
#, fuzzy
msgid "Avatar deleted."
msgstr "Lasta opp brukarbilete."
@@ -853,8 +863,8 @@ msgstr "Lagring av informasjon feila."
#: actions/groupunblock.php:86 actions/joingroup.php:82
#: actions/joingroup.php:93 actions/leavegroup.php:82
#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212
-#: lib/command.php:260
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162
+#: lib/command.php:358
msgid "No such group."
msgstr "Denne gruppa finst ikkje."
@@ -941,7 +951,7 @@ msgid "Conversation"
msgstr "Stadfestingskode"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:218 lib/searchgroupnav.php:82
+#: lib/profileaction.php:224 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "Notisar"
@@ -963,7 +973,7 @@ msgstr "Du er ikkje medlem av den gruppa."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1217
+#: lib/action.php:1219
msgid "There was a problem with your session token."
msgstr "Det var eit problem med sesjons billetten din."
@@ -1026,7 +1036,7 @@ msgstr "Sikker på at du vil sletta notisen?"
msgid "Do not delete this notice"
msgstr "Kan ikkje sletta notisen."
-#: actions/deletenotice.php:146 lib/noticelist.php:655
+#: actions/deletenotice.php:146 lib/noticelist.php:659
msgid "Delete this notice"
msgstr "Slett denne notisen"
@@ -1173,7 +1183,7 @@ msgstr ""
#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:208
+#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
#: actions/tagother.php:154 actions/useradminpanel.php:294
#: lib/applicationeditform.php:333 lib/applicationeditform.php:334
#: lib/designsettings.php:256 lib/groupeditform.php:202
@@ -1301,7 +1311,7 @@ msgstr "skildringa er for lang (maks 140 teikn)."
msgid "Could not update group."
msgstr "Kann ikkje oppdatera gruppa."
-#: actions/editgroup.php:264 classes/User_group.php:493
+#: actions/editgroup.php:264 classes/User_group.php:496
#, fuzzy
msgid "Could not create aliases."
msgstr "Kunne ikkje lagre favoritt."
@@ -1809,7 +1819,7 @@ msgstr "%s tidsline"
msgid "Updates from members of %1$s on %2$s!"
msgstr "Oppdateringar frå %1$s på %2$s!"
-#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232
+#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244
#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr "Grupper"
@@ -2014,7 +2024,7 @@ msgstr "Invitér nye brukarar"
msgid "You are already subscribed to these users:"
msgstr "Du tingar allereie oppdatering frå desse brukarane:"
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
#, php-format
msgid "%1$s (%2$s)"
msgstr "%1$s (%2$s)"
@@ -2142,7 +2152,7 @@ msgstr "%s blei medlem av gruppe %s"
msgid "You must be logged in to leave a group."
msgstr "Du må være innlogga for å melde deg ut av ei gruppe."
-#: actions/leavegroup.php:100 lib/command.php:265
+#: actions/leavegroup.php:100 lib/command.php:363
msgid "You are not a member of that group."
msgstr "Du er ikkje medlem av den gruppa."
@@ -2261,12 +2271,12 @@ msgstr "Bruk dette skjemaet for å lage ein ny gruppe."
msgid "New message"
msgstr "Ny melding"
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
msgid "You can't send a message to this user."
msgstr "Du kan ikkje sende melding til denne brukaren."
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342
-#: lib/command.php:475
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
+#: lib/command.php:529
msgid "No content!"
msgstr "Ingen innhald."
@@ -2274,7 +2284,7 @@ msgstr "Ingen innhald."
msgid "No recipient specified."
msgstr "Ingen mottakar spesifisert."
-#: actions/newmessage.php:164 lib/command.php:361
+#: actions/newmessage.php:164 lib/command.php:462
msgid ""
"Don't send a message to yourself; just say it to yourself quietly instead."
msgstr ""
@@ -2291,7 +2301,7 @@ msgstr "Melding"
msgid "Direct message to %s sent."
msgstr "Direkte melding til %s sendt"
-#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189
msgid "Ajax Error"
msgstr "Ajax feil"
@@ -2299,7 +2309,7 @@ msgstr "Ajax feil"
msgid "New notice"
msgstr "Ny notis"
-#: actions/newnotice.php:211
+#: actions/newnotice.php:217
msgid "Notice posted"
msgstr "Melding lagra"
@@ -2409,7 +2419,7 @@ msgstr ""
msgid "Notice has no profile"
msgstr "Notisen har ingen profil"
-#: actions/oembed.php:86 actions/shownotice.php:180
+#: actions/oembed.php:86 actions/shownotice.php:175
#, php-format
msgid "%1$s's status on %2$s"
msgstr "%1$s sin status på %2$s"
@@ -2423,8 +2433,8 @@ msgstr "Kopla til"
msgid "Only "
msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042
-#: lib/apiaction.php:1070 lib/apiaction.php:1179
+#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1068
+#: lib/apiaction.php:1096 lib/apiaction.php:1212
msgid "Not a supported data format."
msgstr "Ikkje eit støtta dataformat."
@@ -2562,7 +2572,7 @@ msgstr "Det gamle passordet stemmer ikkje"
msgid "Error saving user; invalid."
msgstr "Feil ved lagring av brukar; fungerer ikkje."
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
msgid "Can't save new password."
msgstr "Klarar ikkje lagra nytt passord."
@@ -2788,8 +2798,8 @@ msgstr ""
"1-64 små bokstavar eller tal, ingen punktum (og liknande) eller mellomrom"
#: actions/profilesettings.php:111 actions/register.php:448
-#: actions/showgroup.php:255 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:149
+#: actions/showgroup.php:256 actions/tagother.php:104
+#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Fullt namn"
@@ -2817,9 +2827,9 @@ msgid "Bio"
msgstr "Om meg"
#: actions/profilesettings.php:132 actions/register.php:471
-#: actions/showgroup.php:264 actions/tagother.php:112
+#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
-#: lib/userprofile.php:164
+#: lib/userprofile.php:165
msgid "Location"
msgstr "Plassering"
@@ -2833,7 +2843,7 @@ msgstr ""
#: actions/profilesettings.php:145 actions/tagother.php:149
#: actions/tagother.php:209 lib/subscriptionlist.php:106
-#: lib/subscriptionlist.php:108 lib/userprofile.php:209
+#: lib/subscriptionlist.php:108 lib/userprofile.php:210
msgid "Tags"
msgstr "Merkelappar"
@@ -3066,7 +3076,7 @@ msgstr "Tilbakestill passord"
msgid "Recover password"
msgstr "Hent fram passord"
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
msgid "Password recovery requested"
msgstr "Passord opphenting etterspurt"
@@ -3086,19 +3096,19 @@ msgstr "Avbryt"
msgid "Enter a nickname or email address."
msgstr "Skriv inn kallenamn eller epostadresse."
-#: actions/recoverpassword.php:272
+#: actions/recoverpassword.php:282
msgid "No user with that email address or username."
msgstr "Ingen brukar med den epostadressa eller det brukarnamnet."
-#: actions/recoverpassword.php:287
+#: actions/recoverpassword.php:299
msgid "No registered email address for that user."
msgstr "Ingen registrert epostadresse for den brukaren."
-#: actions/recoverpassword.php:301
+#: actions/recoverpassword.php:313
msgid "Error saving address confirmation."
msgstr "Feil med lagring av adressestadfesting."
-#: actions/recoverpassword.php:325
+#: actions/recoverpassword.php:338
msgid ""
"Instructions for recovering your password have been sent to the email "
"address registered to your account."
@@ -3106,23 +3116,23 @@ msgstr ""
"Instruksjonar for å få att passordet ditt er send til epostadressa som er "
"lagra i kontoen din."
-#: actions/recoverpassword.php:344
+#: actions/recoverpassword.php:357
msgid "Unexpected password reset."
msgstr "Uventa passordnullstilling."
-#: actions/recoverpassword.php:352
+#: actions/recoverpassword.php:365
msgid "Password must be 6 chars or more."
msgstr "Passord må vera 6 tekn eller meir."
-#: actions/recoverpassword.php:356
+#: actions/recoverpassword.php:369
msgid "Password and confirmation do not match."
msgstr "Passord og stadfesting stemmer ikkje."
-#: actions/recoverpassword.php:375 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:248
msgid "Error setting user."
msgstr "Feil ved å setja brukar."
-#: actions/recoverpassword.php:382
+#: actions/recoverpassword.php:395
msgid "New password successfully saved. You are now logged in."
msgstr "Lagra det nye passordet. Du er logga inn."
@@ -3288,7 +3298,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "URL til profilsida di på ei anna kompatibel mikrobloggingteneste."
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:394
+#: lib/userprofile.php:406
msgid "Subscribe"
msgstr "Ting"
@@ -3331,7 +3341,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:674
+#: actions/repeat.php:114 lib/noticelist.php:678
#, fuzzy
msgid "Repeated"
msgstr "Lag"
@@ -3480,8 +3490,8 @@ msgstr "Paginering"
msgid "Description"
msgstr "Beskriving"
-#: actions/showapplication.php:192 actions/showgroup.php:438
-#: lib/profileaction.php:176
+#: actions/showapplication.php:192 actions/showgroup.php:439
+#: lib/profileaction.php:182
msgid "Statistics"
msgstr "Statistikk"
@@ -3592,68 +3602,68 @@ msgstr "%s gruppe"
msgid "%1$s group, page %2$d"
msgstr "%s medlemmar i gruppa, side %d"
-#: actions/showgroup.php:226
+#: actions/showgroup.php:227
msgid "Group profile"
msgstr "Gruppe profil"
-#: actions/showgroup.php:271 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:177
+#: actions/showgroup.php:272 actions/tagother.php:118
+#: actions/userauthorization.php:175 lib/userprofile.php:178
msgid "URL"
msgstr "URL"
-#: actions/showgroup.php:282 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:194
+#: actions/showgroup.php:283 actions/tagother.php:128
+#: actions/userauthorization.php:187 lib/userprofile.php:195
msgid "Note"
msgstr "Merknad"
-#: actions/showgroup.php:292 lib/groupeditform.php:184
+#: actions/showgroup.php:293 lib/groupeditform.php:184
msgid "Aliases"
msgstr ""
-#: actions/showgroup.php:301
+#: actions/showgroup.php:302
msgid "Group actions"
msgstr "Gruppe handlingar"
-#: actions/showgroup.php:337
+#: actions/showgroup.php:338
#, fuzzy, php-format
msgid "Notice feed for %s group (RSS 1.0)"
msgstr "Notisstraum for %s gruppa"
-#: actions/showgroup.php:343
+#: actions/showgroup.php:344
#, fuzzy, php-format
msgid "Notice feed for %s group (RSS 2.0)"
msgstr "Notisstraum for %s gruppa"
-#: actions/showgroup.php:349
+#: actions/showgroup.php:350
#, fuzzy, php-format
msgid "Notice feed for %s group (Atom)"
msgstr "Notisstraum for %s gruppa"
-#: actions/showgroup.php:354
+#: actions/showgroup.php:355
#, php-format
msgid "FOAF for %s group"
msgstr "Utboks for %s"
-#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91
+#: actions/showgroup.php:391 actions/showgroup.php:448 lib/groupnav.php:91
msgid "Members"
msgstr "Medlemmar"
-#: actions/showgroup.php:395 lib/profileaction.php:117
-#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95
-#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71
+#: actions/showgroup.php:396 lib/profileaction.php:117
+#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95
+#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
msgid "(None)"
msgstr "(Ingen)"
-#: actions/showgroup.php:401
+#: actions/showgroup.php:402
msgid "All members"
msgstr "Alle medlemmar"
-#: actions/showgroup.php:441
+#: actions/showgroup.php:442
#, fuzzy
msgid "Created"
msgstr "Lag"
-#: actions/showgroup.php:457
+#: actions/showgroup.php:458
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3663,7 +3673,7 @@ msgid ""
"of this group and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
-#: actions/showgroup.php:463
+#: actions/showgroup.php:464
#, fuzzy, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3674,7 +3684,7 @@ msgstr ""
"**%s** er ei brukargruppe på %%%%site.name%%%%, ei [mikroblogging](http://en."
"wikipedia.org/wiki/Micro-blogging)-teneste"
-#: actions/showgroup.php:491
+#: actions/showgroup.php:492
#, fuzzy
msgid "Admins"
msgstr "Administrator"
@@ -3808,7 +3818,7 @@ msgid "Unknown language \"%s\"."
msgstr ""
#: actions/siteadminpanel.php:165
-msgid "Minimum text limit is 140 characters."
+msgid "Minimum text limit is 0 (unlimited)."
msgstr ""
#: actions/siteadminpanel.php:171
@@ -4090,8 +4100,7 @@ msgstr "Avatar-innstillingar"
msgid "You are not subscribed to that profile."
msgstr "Du tingar ikkje oppdateringar til den profilen."
-#: actions/subedit.php:83 classes/Subscription.php:89
-#: classes/Subscription.php:116
+#: actions/subedit.php:83 classes/Subscription.php:132
msgid "Could not save subscription."
msgstr "Kunne ikkje lagra abonnement."
@@ -4184,11 +4193,11 @@ msgstr ""
msgid "%s is not listening to anyone."
msgstr "%1$s høyrer no på"
-#: actions/subscriptions.php:199
+#: actions/subscriptions.php:208
msgid "Jabber"
msgstr "Jabber"
-#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:222 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr "SMS"
@@ -4222,12 +4231,12 @@ msgstr "Manglar argumentet ID."
msgid "Tag %s"
msgstr "Merkelapp %s"
-#: actions/tagother.php:77 lib/userprofile.php:75
+#: actions/tagother.php:77 lib/userprofile.php:76
msgid "User profile"
msgstr "Brukarprofil"
#: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:102
+#: lib/userprofile.php:103
msgid "Photo"
msgstr "Bilete"
@@ -4561,7 +4570,7 @@ msgstr ""
msgid "Plugins"
msgstr ""
-#: actions/version.php:196 lib/action.php:767
+#: actions/version.php:196 lib/action.php:766
#, fuzzy
msgid "Version"
msgstr "Personleg"
@@ -4570,19 +4579,19 @@ msgstr "Personleg"
msgid "Author(s)"
msgstr ""
-#: classes/File.php:144
+#: classes/File.php:169
#, 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:154
+#: classes/File.php:179
#, php-format
msgid "A file this large would exceed your user quota of %d bytes."
msgstr ""
-#: classes/File.php:161
+#: classes/File.php:186
#, php-format
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
@@ -4625,27 +4634,27 @@ msgstr "Kunne ikkje lagre melding."
msgid "Could not update message with new URI."
msgstr "Kunne ikkje oppdatere melding med ny URI."
-#: classes/Notice.php:172
+#: classes/Notice.php:175
#, php-format
msgid "DB error inserting hashtag: %s"
msgstr "databasefeil ved innsetjing av skigardmerkelapp (#merkelapp): %s"
-#: classes/Notice.php:241
+#: classes/Notice.php:244
#, fuzzy
msgid "Problem saving notice. Too long."
msgstr "Eit problem oppstod ved lagring av notis."
-#: classes/Notice.php:245
+#: classes/Notice.php:248
msgid "Problem saving notice. Unknown user."
msgstr "Feil ved lagring av notis. Ukjend brukar."
-#: classes/Notice.php:250
+#: classes/Notice.php:253
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:256
+#: classes/Notice.php:259
#, fuzzy
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
@@ -4653,75 +4662,75 @@ msgid ""
msgstr ""
"For mange notisar for raskt; tek ei pause, og prøv igjen om eit par minutt."
-#: classes/Notice.php:262
+#: classes/Notice.php:265
msgid "You are banned from posting notices on this site."
msgstr "Du kan ikkje lengre legge inn notisar på denne sida."
-#: classes/Notice.php:328 classes/Notice.php:354
+#: classes/Notice.php:331 classes/Notice.php:357
msgid "Problem saving notice."
msgstr "Eit problem oppstod ved lagring av notis."
-#: classes/Notice.php:927
+#: classes/Notice.php:943
#, fuzzy
msgid "Problem saving group inbox."
msgstr "Eit problem oppstod ved lagring av notis."
-#: classes/Notice.php:1459
+#: classes/Notice.php:1481
#, fuzzy, php-format
msgid "RT @%1$s %2$s"
msgstr "%1$s (%2$s)"
-#: classes/Subscription.php:66 lib/oauthstore.php:465
+#: classes/Subscription.php:74 lib/oauthstore.php:465
#, fuzzy
msgid "You have been banned from subscribing."
msgstr "Brukaren tillet deg ikkje å tinga meldingane sine."
-#: classes/Subscription.php:70
+#: classes/Subscription.php:78
msgid "Already subscribed!"
msgstr ""
-#: classes/Subscription.php:74
+#: classes/Subscription.php:82
msgid "User has blocked you."
msgstr "Brukar har blokkert deg."
-#: classes/Subscription.php:157
+#: classes/Subscription.php:167
#, fuzzy
msgid "Not subscribed!"
msgstr "Ikkje tinga."
-#: classes/Subscription.php:163
+#: classes/Subscription.php:173
#, fuzzy
msgid "Couldn't delete self-subscription."
msgstr "Kan ikkje sletta tinging."
-#: classes/Subscription.php:190
+#: classes/Subscription.php:200
#, fuzzy
msgid "Couldn't delete subscription OMB token."
msgstr "Kan ikkje sletta tinging."
-#: classes/Subscription.php:201 lib/subs.php:69
+#: classes/Subscription.php:211
msgid "Couldn't delete subscription."
msgstr "Kan ikkje sletta tinging."
-#: classes/User.php:373
+#: classes/User.php:363
#, fuzzy, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Melding til %1$s på %2$s"
-#: classes/User_group.php:477
+#: classes/User_group.php:480
msgid "Could not create group."
msgstr "Kunne ikkje laga gruppa."
-#: classes/User_group.php:486
+#: classes/User_group.php:489
#, fuzzy
msgid "Could not set group URI."
msgstr "Kunne ikkje bli med i gruppa."
-#: classes/User_group.php:507
+#: classes/User_group.php:510
msgid "Could not set group membership."
msgstr "Kunne ikkje bli med i gruppa."
-#: classes/User_group.php:521
+#: classes/User_group.php:524
#, fuzzy
msgid "Could not save local group info."
msgstr "Kunne ikkje lagra abonnement."
@@ -4764,127 +4773,127 @@ msgstr "%1$s (%2$s)"
msgid "Untitled page"
msgstr "Ingen tittel"
-#: lib/action.php:424
+#: lib/action.php:423
msgid "Primary site navigation"
msgstr "Navigasjon for hovudsida"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:430
+#: lib/action.php:429
#, fuzzy
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr "Personleg profil og oversyn over vener"
-#: lib/action.php:433
+#: lib/action.php:432
#, fuzzy
msgctxt "MENU"
msgid "Personal"
msgstr "Personleg"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:435
+#: lib/action.php:434
#, fuzzy
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "Endra e-posten, avataren, passordet eller profilen"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:440
+#: lib/action.php:439
#, fuzzy
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "Klarte ikkje å omdirigera til tenaren: %s"
-#: lib/action.php:443
+#: lib/action.php:442
msgid "Connect"
msgstr "Kopla til"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:446
+#: lib/action.php:445
#, fuzzy
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "Navigasjon for hovudsida"
-#: lib/action.php:449
+#: lib/action.php:448
#, fuzzy
msgctxt "MENU"
msgid "Admin"
msgstr "Administrator"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:453
+#: lib/action.php:452
#, fuzzy, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "Inviter vennar og kollega til å bli med deg på %s"
-#: lib/action.php:456
+#: lib/action.php:455
#, fuzzy
msgctxt "MENU"
msgid "Invite"
msgstr "Invitér"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:462
+#: lib/action.php:461
#, fuzzy
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "Logg ut or sida"
-#: lib/action.php:465
+#: lib/action.php:464
#, fuzzy
msgctxt "MENU"
msgid "Logout"
msgstr "Logg ut"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:470
+#: lib/action.php:469
#, fuzzy
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Opprett ny konto"
-#: lib/action.php:473
+#: lib/action.php:472
#, fuzzy
msgctxt "MENU"
msgid "Register"
msgstr "Registrér"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:476
+#: lib/action.php:475
#, fuzzy
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Logg inn or sida"
-#: lib/action.php:479
+#: lib/action.php:478
#, fuzzy
msgctxt "MENU"
msgid "Login"
msgstr "Logg inn"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:482
+#: lib/action.php:481
#, fuzzy
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Hjelp meg!"
-#: lib/action.php:485
+#: lib/action.php:484
#, fuzzy
msgctxt "MENU"
msgid "Help"
msgstr "Hjelp"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:488
+#: lib/action.php:487
#, fuzzy
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "Søk etter folk eller innhald"
-#: lib/action.php:491
+#: lib/action.php:490
#, fuzzy
msgctxt "MENU"
msgid "Search"
@@ -4892,60 +4901,60 @@ msgstr "Søk"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:513 lib/adminpanelaction.php:398
+#: lib/action.php:512 lib/adminpanelaction.php:398
msgid "Site notice"
msgstr "Statusmelding"
-#: lib/action.php:579
+#: lib/action.php:578
msgid "Local views"
msgstr "Lokale syningar"
-#: lib/action.php:645
+#: lib/action.php:644
msgid "Page notice"
msgstr "Sidenotis"
-#: lib/action.php:747
+#: lib/action.php:746
msgid "Secondary site navigation"
msgstr "Andrenivås side navigasjon"
-#: lib/action.php:752
+#: lib/action.php:751
msgid "Help"
msgstr "Hjelp"
-#: lib/action.php:754
+#: lib/action.php:753
msgid "About"
msgstr "Om"
-#: lib/action.php:756
+#: lib/action.php:755
msgid "FAQ"
msgstr "OSS"
-#: lib/action.php:760
+#: lib/action.php:759
msgid "TOS"
msgstr ""
-#: lib/action.php:763
+#: lib/action.php:762
msgid "Privacy"
msgstr "Personvern"
-#: lib/action.php:765
+#: lib/action.php:764
msgid "Source"
msgstr "Kjeldekode"
-#: lib/action.php:769
+#: lib/action.php:768
msgid "Contact"
msgstr "Kontakt"
-#: lib/action.php:771
+#: lib/action.php:770
#, fuzzy
msgid "Badge"
msgstr "Dult"
-#: lib/action.php:799
+#: lib/action.php:798
msgid "StatusNet software license"
msgstr "StatusNets programvarelisens"
-#: lib/action.php:802
+#: lib/action.php:803
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4954,12 +4963,12 @@ msgstr ""
"**%%site.name%%** er ei mikrobloggingteneste av [%%site.broughtby%%](%%site."
"broughtbyurl%%). "
-#: lib/action.php:804
+#: lib/action.php:805
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** er ei mikrobloggingteneste. "
-#: lib/action.php:806
+#: lib/action.php:808
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4970,54 +4979,58 @@ msgstr ""
"%s, tilgjengeleg under [GNU Affero General Public License](http://www.fsf."
"org/licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:821
+#: lib/action.php:823
#, fuzzy
msgid "Site content license"
msgstr "StatusNets programvarelisens"
-#: lib/action.php:826
+#: lib/action.php:828
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
-#: lib/action.php:831
+#: lib/action.php:833
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
-#: lib/action.php:834
+#: lib/action.php:836
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
-#: lib/action.php:847
+#: lib/action.php:849
msgid "All "
msgstr "Alle"
-#: lib/action.php:853
+#: lib/action.php:855
msgid "license."
msgstr "lisens."
-#: lib/action.php:1152
+#: lib/action.php:1154
msgid "Pagination"
msgstr "Paginering"
-#: lib/action.php:1161
+#: lib/action.php:1163
msgid "After"
msgstr "« Etter"
-#: lib/action.php:1169
+#: lib/action.php:1171
msgid "Before"
msgstr "Før »"
-#: lib/activity.php:453
+#: lib/activity.php:120
+msgid "Expecting a root feed element but got a whole XML document."
+msgstr ""
+
+#: lib/activityutils.php:208
msgid "Can't handle remote content yet."
msgstr ""
-#: lib/activity.php:481
+#: lib/activityutils.php:236
msgid "Can't handle embedded XML content yet."
msgstr ""
-#: lib/activity.php:485
+#: lib/activityutils.php:240
msgid "Can't handle embedded Base64 content yet."
msgstr ""
@@ -5122,7 +5135,7 @@ msgstr "SMS bekreftelse"
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
-#: lib/apiauth.php:272
+#: lib/apiauth.php:276
#, php-format
msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s"
msgstr ""
@@ -5201,11 +5214,11 @@ msgstr "Fjern"
msgid "Attachments"
msgstr ""
-#: lib/attachmentlist.php:265
+#: lib/attachmentlist.php:263
msgid "Author"
msgstr ""
-#: lib/attachmentlist.php:278
+#: lib/attachmentlist.php:276
#, fuzzy
msgid "Provider"
msgstr "Profil"
@@ -5228,37 +5241,51 @@ msgstr "Endra passord"
msgid "Password changing is not allowed"
msgstr "Endra passord"
-#: lib/channel.php:138 lib/channel.php:158
+#: lib/channel.php:157 lib/channel.php:177
msgid "Command results"
msgstr "Resultat frå kommandoen"
-#: lib/channel.php:210 lib/mailhandler.php:142
+#: lib/channel.php:229 lib/mailhandler.php:142
msgid "Command complete"
msgstr "Kommandoen utførd"
-#: lib/channel.php:221
+#: lib/channel.php:240
msgid "Command failed"
msgstr "Kommandoen feila"
-#: lib/command.php:44
-msgid "Sorry, this command is not yet implemented."
-msgstr "Orsak, men kommandoen er ikkje laga enno."
+#: lib/command.php:83 lib/command.php:105
+#, fuzzy
+msgid "Notice with that id does not exist"
+msgstr "Fann ingen profil med den IDen."
+
+#: lib/command.php:99 lib/command.php:570
+msgid "User has no last notice"
+msgstr "Brukaren har ikkje siste notis"
-#: lib/command.php:88
+#: lib/command.php:125
#, fuzzy, php-format
msgid "Could not find a user with nickname %s"
msgstr "Kan ikkje oppdatera brukar med stadfesta e-postadresse."
-#: lib/command.php:92
+#: lib/command.php:143
+#, fuzzy, php-format
+msgid "Could not find a local user with nickname %s"
+msgstr "Kan ikkje oppdatera brukar med stadfesta e-postadresse."
+
+#: lib/command.php:176
+msgid "Sorry, this command is not yet implemented."
+msgstr "Orsak, men kommandoen er ikkje laga enno."
+
+#: lib/command.php:221
msgid "It does not make a lot of sense to nudge yourself!"
msgstr ""
-#: lib/command.php:99
+#: lib/command.php:228
#, fuzzy, php-format
msgid "Nudge sent to %s"
msgstr "Dytta!"
-#: lib/command.php:126
+#: lib/command.php:254
#, php-format
msgid ""
"Subscriptions: %1$s\n"
@@ -5266,203 +5293,201 @@ msgid ""
"Notices: %3$s"
msgstr ""
-#: lib/command.php:152 lib/command.php:390 lib/command.php:451
-#, fuzzy
-msgid "Notice with that id does not exist"
-msgstr "Fann ingen profil med den IDen."
-
-#: lib/command.php:168 lib/command.php:406 lib/command.php:467
-#: lib/command.php:523
-msgid "User has no last notice"
-msgstr "Brukaren har ikkje siste notis"
-
-#: lib/command.php:190
+#: lib/command.php:296
msgid "Notice marked as fave."
msgstr "Notis markert som favoritt."
-#: lib/command.php:217
+#: lib/command.php:317
msgid "You are already a member of that group"
msgstr "Du er allereie medlem av den gruppa"
-#: lib/command.php:231
+#: lib/command.php:331
#, php-format
msgid "Could not join user %s to group %s"
msgstr "Kunne ikkje melde brukaren %s inn i gruppa %s"
-#: lib/command.php:236
+#: lib/command.php:336
#, php-format
msgid "%s joined group %s"
msgstr "%s blei medlem av gruppe %s"
-#: lib/command.php:275
+#: lib/command.php:373
#, php-format
msgid "Could not remove user %s to group %s"
msgstr "Kunne ikkje fjerne %s fra %s gruppa "
-#: lib/command.php:280
+#: lib/command.php:378
#, php-format
msgid "%s left group %s"
msgstr "%s forlot %s gruppa"
-#: lib/command.php:309
+#: lib/command.php:401
#, php-format
msgid "Fullname: %s"
msgstr "Fullt namn: %s"
-#: lib/command.php:312 lib/mail.php:258
+#: lib/command.php:404 lib/mail.php:258
#, php-format
msgid "Location: %s"
msgstr "Stad: %s"
-#: lib/command.php:315 lib/mail.php:260
+#: lib/command.php:407 lib/mail.php:260
#, php-format
msgid "Homepage: %s"
msgstr "Heimeside: %s"
-#: lib/command.php:318
+#: lib/command.php:410
#, php-format
msgid "About: %s"
msgstr "Om: %s"
-#: lib/command.php:349
+#: lib/command.php:437
+#, php-format
+msgid ""
+"%s is a remote profile; you can only send direct messages to users on the "
+"same server."
+msgstr ""
+
+#: lib/command.php:450
#, fuzzy, php-format
msgid "Message too long - maximum is %d characters, you sent %d"
msgstr "Melding for lang - maksimum 140 teikn, du skreiv %d"
-#: lib/command.php:367
+#: lib/command.php:468
#, php-format
msgid "Direct message to %s sent"
msgstr "Direkte melding til %s sendt"
-#: lib/command.php:369
+#: lib/command.php:470
msgid "Error sending direct message."
msgstr "Ein feil oppstod ved sending av direkte melding."
-#: lib/command.php:413
+#: lib/command.php:490
#, fuzzy
msgid "Cannot repeat your own notice"
msgstr "Kan ikkje slå på notifikasjon."
-#: lib/command.php:418
+#: lib/command.php:495
#, fuzzy
msgid "Already repeated that notice"
msgstr "Slett denne notisen"
-#: lib/command.php:426
+#: lib/command.php:503
#, fuzzy, php-format
msgid "Notice from %s repeated"
msgstr "Melding lagra"
-#: lib/command.php:428
+#: lib/command.php:505
#, fuzzy
msgid "Error repeating notice."
msgstr "Eit problem oppstod ved lagring av notis."
-#: lib/command.php:482
+#: lib/command.php:536
#, fuzzy, php-format
msgid "Notice too long - maximum is %d characters, you sent %d"
msgstr "Melding for lang - maksimum 140 teikn, du skreiv %d"
-#: lib/command.php:491
+#: lib/command.php:545
#, fuzzy, php-format
msgid "Reply to %s sent"
msgstr "Svar på denne notisen"
-#: lib/command.php:493
+#: lib/command.php:547
#, fuzzy
msgid "Error saving notice."
msgstr "Eit problem oppstod ved lagring av notis."
-#: lib/command.php:547
+#: lib/command.php:594
msgid "Specify the name of the user to subscribe to"
msgstr "Spesifer namnet til brukaren du vil tinge"
-#: lib/command.php:554 lib/command.php:589
-msgid "No such user"
-msgstr "Brukaren finst ikkje."
+#: lib/command.php:602
+#, fuzzy
+msgid "Can't subscribe to OMB profiles by command."
+msgstr "Du tingar ikkje oppdateringar til den profilen."
-#: lib/command.php:561
+#: lib/command.php:608
#, php-format
msgid "Subscribed to %s"
msgstr "Tingar %s"
-#: lib/command.php:582 lib/command.php:685
+#: lib/command.php:629 lib/command.php:728
msgid "Specify the name of the user to unsubscribe from"
msgstr "Spesifer namnet til brukar du vil fjerne tinging på"
-#: lib/command.php:595
+#: lib/command.php:638
#, php-format
msgid "Unsubscribed from %s"
msgstr "Tingar ikkje %s lengre"
-#: lib/command.php:613 lib/command.php:636
+#: lib/command.php:656 lib/command.php:679
msgid "Command not yet implemented."
msgstr "Kommando ikkje implementert."
-#: lib/command.php:616
+#: lib/command.php:659
msgid "Notification off."
msgstr "Notifikasjon av."
-#: lib/command.php:618
+#: lib/command.php:661
msgid "Can't turn off notification."
msgstr "Kan ikkje skru av notifikasjon."
-#: lib/command.php:639
+#: lib/command.php:682
msgid "Notification on."
msgstr "Notifikasjon på."
-#: lib/command.php:641
+#: lib/command.php:684
msgid "Can't turn on notification."
msgstr "Kan ikkje slå på notifikasjon."
-#: lib/command.php:654
+#: lib/command.php:697
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:665
+#: lib/command.php:708
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:692
+#: lib/command.php:735
#, fuzzy, php-format
msgid "Unsubscribed %s"
msgstr "Tingar ikkje %s lengre"
-#: lib/command.php:709
+#: lib/command.php:752
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "Du tingar ikkje oppdateringar til den profilen."
-#: lib/command.php:711
+#: lib/command.php:754
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Du tingar allereie oppdatering frå desse brukarane:"
msgstr[1] "Du tingar allereie oppdatering frå desse brukarane:"
-#: lib/command.php:731
+#: lib/command.php:774
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Kan ikkje tinga andre til deg."
-#: lib/command.php:733
+#: lib/command.php:776
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Kan ikkje tinga andre til deg."
msgstr[1] "Kan ikkje tinga andre til deg."
-#: lib/command.php:753
+#: lib/command.php:796
#, fuzzy
msgid "You are not a member of any groups."
msgstr "Du er ikkje medlem av den gruppa."
-#: lib/command.php:755
+#: lib/command.php:798
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Du er ikkje medlem av den gruppa."
msgstr[1] "Du er ikkje medlem av den gruppa."
-#: lib/command.php:769
+#: lib/command.php:812
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5504,20 +5529,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:148
+#: lib/common.php:135
#, fuzzy
msgid "No configuration file found. "
msgstr "Ingen stadfestingskode."
-#: lib/common.php:149
+#: lib/common.php:136
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:151
+#: lib/common.php:138
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:152
+#: lib/common.php:139
#, fuzzy
msgid "Go to the installer."
msgstr "Logg inn or sida"
@@ -5698,49 +5723,49 @@ msgstr "Merkelappar i %s gruppa sine notisar"
msgid "This page is not available in a media type you accept"
msgstr "Denne sida er ikkje tilgjengeleg i nokon mediatype du aksepterer."
-#: lib/imagefile.php:75
+#: lib/imagefile.php:72
+msgid "Unsupported image file format."
+msgstr "Støttar ikkje bileteformatet."
+
+#: lib/imagefile.php:88
#, fuzzy, php-format
msgid "That file is too big. The maximum file size is %s."
msgstr "Du kan lasta opp ein logo for gruppa."
-#: lib/imagefile.php:80
+#: lib/imagefile.php:93
msgid "Partial upload."
msgstr "Hallvegs opplasta."
-#: lib/imagefile.php:88 lib/mediafile.php:170
+#: lib/imagefile.php:101 lib/mediafile.php:170
msgid "System error uploading file."
msgstr "Systemfeil ved opplasting av fil."
-#: lib/imagefile.php:96
+#: lib/imagefile.php:109
msgid "Not an image or corrupt file."
msgstr "Korrupt bilete."
-#: lib/imagefile.php:109
-msgid "Unsupported image file format."
-msgstr "Støttar ikkje bileteformatet."
-
#: lib/imagefile.php:122
msgid "Lost our file."
msgstr "Mista fila vår."
-#: lib/imagefile.php:166 lib/imagefile.php:231
+#: lib/imagefile.php:163 lib/imagefile.php:224
msgid "Unknown file type"
msgstr "Ukjend fil type"
-#: lib/imagefile.php:251
+#: lib/imagefile.php:244
msgid "MB"
msgstr ""
-#: lib/imagefile.php:253
+#: lib/imagefile.php:246
msgid "kB"
msgstr ""
-#: lib/jabber.php:220
+#: lib/jabber.php:387
#, php-format
msgid "[%s]"
msgstr ""
-#: lib/jabber.php:400
+#: lib/jabber.php:567
#, php-format
msgid "Unknown inbox source %d."
msgstr ""
@@ -5950,7 +5975,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:482
+#: lib/mailbox.php:227 lib/noticelist.php:486
#, fuzzy
msgid "from"
msgstr " frå "
@@ -6080,51 +6105,51 @@ msgid ""
"try again later"
msgstr ""
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr ""
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
#, fuzzy
msgid "N"
msgstr "Nei"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "S"
msgstr ""
-#: lib/noticelist.php:431
+#: lib/noticelist.php:432
msgid "E"
msgstr ""
-#: lib/noticelist.php:431
+#: lib/noticelist.php:432
msgid "W"
msgstr ""
-#: lib/noticelist.php:438
+#: lib/noticelist.php:439
msgid "at"
msgstr ""
-#: lib/noticelist.php:566
+#: lib/noticelist.php:570
#, fuzzy
msgid "in context"
msgstr "Ingen innhald."
-#: lib/noticelist.php:601
+#: lib/noticelist.php:605
#, fuzzy
msgid "Repeated by"
msgstr "Lag"
-#: lib/noticelist.php:628
+#: lib/noticelist.php:632
msgid "Reply to this notice"
msgstr "Svar på denne notisen"
-#: lib/noticelist.php:629
+#: lib/noticelist.php:633
msgid "Reply"
msgstr "Svar"
-#: lib/noticelist.php:673
+#: lib/noticelist.php:677
#, fuzzy
msgid "Notice repeated"
msgstr "Melding lagra"
@@ -6200,7 +6225,7 @@ msgstr "Merkelappar i %s sine notisar"
msgid "Unknown"
msgstr "Uventa handling."
-#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr "Tingingar"
@@ -6208,7 +6233,7 @@ msgstr "Tingingar"
msgid "All subscriptions"
msgstr "Alle tingingar"
-#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90
+#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr "Tingarar"
@@ -6216,16 +6241,21 @@ msgstr "Tingarar"
msgid "All subscribers"
msgstr "Tingarar"
-#: lib/profileaction.php:180
+#: lib/profileaction.php:186
#, fuzzy
msgid "User ID"
msgstr "Brukar"
-#: lib/profileaction.php:185
+#: lib/profileaction.php:191
msgid "Member since"
msgstr "Medlem sidan"
-#: lib/profileaction.php:247
+#. TRANS: Average count of posts made per day since account registration
+#: lib/profileaction.php:230
+msgid "Daily average"
+msgstr ""
+
+#: lib/profileaction.php:259
msgid "All groups"
msgstr "Alle gruppar"
@@ -6273,7 +6303,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:671
+#: lib/router.php:704
msgid "No single user defined for single-user mode."
msgstr ""
@@ -6407,93 +6437,102 @@ msgstr "Fjern tinging fra denne brukaren"
msgid "Unsubscribe"
msgstr "Fjern tinging"
-#: lib/userprofile.php:116
+#: lib/usernoprofileexception.php:58
+#, fuzzy, php-format
+msgid "User %s (%d) has no profile record."
+msgstr "Brukaren har inga profil."
+
+#: lib/userprofile.php:117
#, fuzzy
msgid "Edit Avatar"
msgstr "Brukarbilete"
-#: lib/userprofile.php:236
+#: lib/userprofile.php:234 lib/userprofile.php:248
msgid "User actions"
msgstr "Brukarverkty"
-#: lib/userprofile.php:251
+#: lib/userprofile.php:237
+msgid "User deletion in progress..."
+msgstr ""
+
+#: lib/userprofile.php:263
#, fuzzy
msgid "Edit profile settings"
msgstr "Profilinnstillingar"
-#: lib/userprofile.php:252
+#: lib/userprofile.php:264
msgid "Edit"
msgstr ""
-#: lib/userprofile.php:275
+#: lib/userprofile.php:287
msgid "Send a direct message to this user"
msgstr "Send ei direktemelding til denne brukaren"
-#: lib/userprofile.php:276
+#: lib/userprofile.php:288
msgid "Message"
msgstr "Melding"
-#: lib/userprofile.php:314
+#: lib/userprofile.php:326
msgid "Moderate"
msgstr ""
-#: lib/userprofile.php:352
+#: lib/userprofile.php:364
#, fuzzy
msgid "User role"
msgstr "Brukarprofil"
-#: lib/userprofile.php:354
+#: lib/userprofile.php:366
#, fuzzy
msgctxt "role"
msgid "Administrator"
msgstr "Administrator"
-#: lib/userprofile.php:355
+#: lib/userprofile.php:367
msgctxt "role"
msgid "Moderator"
msgstr ""
-#: lib/util.php:1015
+#: lib/util.php:1046
msgid "a few seconds ago"
msgstr "eit par sekund sidan"
-#: lib/util.php:1017
+#: lib/util.php:1048
msgid "about a minute ago"
msgstr "omtrent eitt minutt sidan"
-#: lib/util.php:1019
+#: lib/util.php:1050
#, php-format
msgid "about %d minutes ago"
msgstr "~%d minutt sidan"
-#: lib/util.php:1021
+#: lib/util.php:1052
msgid "about an hour ago"
msgstr "omtrent ein time sidan"
-#: lib/util.php:1023
+#: lib/util.php:1054
#, php-format
msgid "about %d hours ago"
msgstr "~%d timar sidan"
-#: lib/util.php:1025
+#: lib/util.php:1056
msgid "about a day ago"
msgstr "omtrent ein dag sidan"
-#: lib/util.php:1027
+#: lib/util.php:1058
#, php-format
msgid "about %d days ago"
msgstr "~%d dagar sidan"
-#: lib/util.php:1029
+#: lib/util.php:1060
msgid "about a month ago"
msgstr "omtrent ein månad sidan"
-#: lib/util.php:1031
+#: lib/util.php:1062
#, php-format
msgid "about %d months ago"
msgstr "~%d månadar sidan"
-#: lib/util.php:1033
+#: lib/util.php:1064
msgid "about a year ago"
msgstr "omtrent eitt år sidan"
@@ -6507,7 +6546,7 @@ msgstr "Heimesida er ikkje ei gyldig internettadresse."
msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr ""
-#: lib/xmppmanager.php:402
+#: lib/xmppmanager.php:403
#, fuzzy, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d."
msgstr "Melding for lang - maksimum 140 teikn, du skreiv %d"
diff --git a/locale/pl/LC_MESSAGES/statusnet.po b/locale/pl/LC_MESSAGES/statusnet.po
index 3a0bd39c3..922767c6d 100644
--- a/locale/pl/LC_MESSAGES/statusnet.po
+++ b/locale/pl/LC_MESSAGES/statusnet.po
@@ -2,6 +2,7 @@
#
# Author@translatewiki.net: McDutchie
# Author@translatewiki.net: Raven
+# Author@translatewiki.net: Sp5uhe
# --
# Paweł Wilk <siefca@gnu.org>, 2008.
# Piotr Drąg <piotrdrag@gmail.com>, 2009.
@@ -10,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-06 23:49+0000\n"
-"PO-Revision-Date: 2010-03-06 23:50:36+0000\n"
+"POT-Creation-Date: 2010-04-06 22:53+0000\n"
+"PO-Revision-Date: 2010-04-06 22:55:08+0000\n"
"Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
"Language-Team: Polish <pl@li.org>\n"
"MIME-Version: 1.0\n"
@@ -19,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 (r63350); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64665); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: pl\n"
"X-Message-Group: out-statusnet\n"
@@ -95,9 +96,9 @@ msgstr "Nie ma takiej strony"
#: 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:90
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78
+#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
@@ -106,10 +107,8 @@ msgstr "Nie ma takiej strony"
#: actions/remotesubscribe.php:154 actions/replies.php:73
#: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:163 lib/command.php:302
-#: lib/command.php:355 lib/command.php:401 lib/command.php:462
-#: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82
-#: lib/profileaction.php:77
+#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: lib/mailbox.php:82 lib/profileaction.php:77
msgid "No such user."
msgstr "Brak takiego użytkownika."
@@ -205,18 +204,18 @@ msgstr "Aktualizacje z %1$s i przyjaciół na %2$s."
#: 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:132
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:136
#: actions/apigrouplistall.php:120 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:135
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
-#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184
-#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148
+#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:174
+#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173
+#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
-#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
+#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
msgid "API method not found."
msgstr "Nie odnaleziono metody API."
@@ -229,8 +228,8 @@ msgstr "Nie odnaleziono metody API."
#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65
-#: actions/apistatusesupdate.php:118
+#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
msgid "This method requires a POST."
msgstr "Ta metoda wymaga POST."
@@ -260,7 +259,7 @@ msgid "Could not save profile."
msgstr "Nie można zapisać profilu."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:97
+#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
#: actions/designadminpanel.php:122 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
@@ -348,7 +347,7 @@ msgstr "Nie odnaleziono stanów z tym identyfikatorem."
msgid "This status is already a favorite."
msgstr "Ten stan jest już ulubiony."
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
msgid "Could not create favorite."
msgstr "Nie można utworzyć ulubionego wpisu."
@@ -466,7 +465,7 @@ msgstr "Nie odnaleziono grupy."
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:221
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
msgid "You have been blocked from that group by the admin."
msgstr "Zostałeś zablokowany w tej grupie przez administratora."
@@ -484,11 +483,18 @@ msgstr "Nie jesteś członkiem tej grupy."
msgid "Could not remove user %1$s from group %2$s."
msgstr "Nie można usunąć użytkownika %1$s z grupy %2$s."
-#: actions/apigrouplist.php:95
+#. TRANS: %s is a user name
+#: actions/apigrouplist.php:97
#, 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
+#, php-format
+msgid "%1$s groups %2$s is a member of."
+msgstr "%2$s jest członkiem grup %1$s."
+
#: actions/apigrouplistall.php:90 actions/usergroups.php:62
#, php-format
msgid "%s groups"
@@ -516,7 +522,7 @@ msgstr "Nieprawidłowy token."
#: 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:337
+#: actions/profilesettings.php:194 actions/recoverpassword.php:350
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
@@ -578,15 +584,15 @@ msgstr ""
"uzyskać możliwość <strong>%3$s</strong> danych konta %4$s. Dostęp do konta %4"
"$s powinien być udostępniany tylko zaufanym osobom trzecim."
-#: actions/apioauthauthorize.php:310 lib/action.php:438
+#: actions/apioauthauthorize.php:310 lib/action.php:437
msgid "Account"
msgstr "Konto"
#: actions/apioauthauthorize.php:313 actions/login.php:230
#: actions/profilesettings.php:106 actions/register.php:424
-#: actions/showgroup.php:244 actions/tagother.php:94
+#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
-#: lib/userprofile.php:131
+#: lib/userprofile.php:132
msgid "Nickname"
msgstr "Pseudonim"
@@ -655,12 +661,12 @@ msgstr "Maksymalny rozmiar wpisu wynosi %d znaków, w tym adres URL załącznika
msgid "Unsupported format."
msgstr "Nieobsługiwany format."
-#: actions/apitimelinefavorites.php:108
+#: actions/apitimelinefavorites.php:109
#, php-format
msgid "%1$s / Favorites from %2$s"
msgstr "%1$s/ulubione wpisy od %2$s"
-#: actions/apitimelinefavorites.php:117
+#: actions/apitimelinefavorites.php:118
#, 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."
@@ -670,7 +676,7 @@ msgstr "Użytkownik %1$s aktualizuje ulubione według %2$s/%2$s."
msgid "%1$s / Updates mentioning %2$s"
msgstr "%1$s/aktualizacje wspominające %2$s"
-#: actions/apitimelinementions.php:127
+#: actions/apitimelinementions.php:130
#, 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."
@@ -680,7 +686,7 @@ msgstr "%1$s aktualizuje tę odpowiedź na aktualizacje od %2$s/%3$s."
msgid "%s public timeline"
msgstr "Publiczna oś czasu użytkownika %s"
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "Użytkownik %s aktualizuje od każdego."
@@ -695,12 +701,12 @@ msgstr "Powtórzone dla %s"
msgid "Repeats of %s"
msgstr "Powtórzenia %s"
-#: actions/apitimelinetag.php:102 actions/tag.php:67
+#: actions/apitimelinetag.php:104 actions/tag.php:67
#, php-format
msgid "Notices tagged with %s"
msgstr "Wpisy ze znacznikiem %s"
-#: actions/apitimelinetag.php:104 actions/tagrss.php:65
+#: actions/apitimelinetag.php:106 actions/tagrss.php:65
#, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Aktualizacje ze znacznikiem %1$s na %2$s."
@@ -728,7 +734,7 @@ msgstr "Brak rozmiaru."
msgid "Invalid size."
msgstr "Nieprawidłowy rozmiar."
-#: actions/avatarsettings.php:67 actions/showgroup.php:229
+#: actions/avatarsettings.php:67 actions/showgroup.php:230
#: lib/accountsettingsaction.php:112
msgid "Avatar"
msgstr "Awatar"
@@ -760,7 +766,7 @@ msgid "Preview"
msgstr "Podgląd"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:655
+#: lib/deleteuserform.php:66 lib/noticelist.php:659
msgid "Delete"
msgstr "Usuń"
@@ -772,23 +778,27 @@ msgstr "Wyślij"
msgid "Crop"
msgstr "Przytnij"
-#: actions/avatarsettings.php:328
+#: actions/avatarsettings.php:305
+msgid "No file uploaded."
+msgstr "Nie wysłano pliku."
+
+#: actions/avatarsettings.php:332
msgid "Pick a square area of the image to be your avatar"
msgstr "Wybierz kwadratowy obszar obrazu do awatara"
-#: actions/avatarsettings.php:343 actions/grouplogo.php:380
+#: actions/avatarsettings.php:347 actions/grouplogo.php:380
msgid "Lost our file data."
msgstr "Utracono dane pliku."
-#: actions/avatarsettings.php:366
+#: actions/avatarsettings.php:370
msgid "Avatar updated."
msgstr "Zaktualizowano awatar."
-#: actions/avatarsettings.php:369
+#: actions/avatarsettings.php:373
msgid "Failed updating avatar."
msgstr "Zaktualizowanie awatara nie powiodło się."
-#: actions/avatarsettings.php:393
+#: actions/avatarsettings.php:397
msgid "Avatar deleted."
msgstr "Usunięto awatar."
@@ -826,7 +836,7 @@ msgstr "Nie blokuj tego użytkownika"
msgid "Yes"
msgstr "Tak"
-#: actions/block.php:144 actions/groupmembers.php:355 lib/blockform.php:80
+#: actions/block.php:144 actions/groupmembers.php:373 lib/blockform.php:80
msgid "Block this user"
msgstr "Zablokuj tego użytkownika"
@@ -843,8 +853,8 @@ msgstr "Zapisanie informacji o blokadzie nie powiodło się."
#: actions/groupunblock.php:86 actions/joingroup.php:82
#: actions/joingroup.php:93 actions/leavegroup.php:82
#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212
-#: lib/command.php:260
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162
+#: lib/command.php:358
msgid "No such group."
msgstr "Nie ma takiej grupy."
@@ -926,7 +936,7 @@ msgid "Conversation"
msgstr "Rozmowa"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:218 lib/searchgroupnav.php:82
+#: lib/profileaction.php:229 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "Wpisy"
@@ -945,7 +955,7 @@ msgstr "Nie jesteś właścicielem tej aplikacji."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1217
+#: lib/action.php:1219
msgid "There was a problem with your session token."
msgstr "Wystąpił problem z tokenem sesji."
@@ -1005,7 +1015,7 @@ msgstr "Jesteś pewien, że chcesz usunąć ten wpis?"
msgid "Do not delete this notice"
msgstr "Nie usuwaj tego wpisu"
-#: actions/deletenotice.php:146 lib/noticelist.php:655
+#: actions/deletenotice.php:146 lib/noticelist.php:659
msgid "Delete this notice"
msgstr "Usuń ten wpis"
@@ -1140,7 +1150,7 @@ msgstr "Przywróć domyślne ustawienia"
#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:208
+#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
#: actions/tagother.php:154 actions/useradminpanel.php:294
#: lib/applicationeditform.php:333 lib/applicationeditform.php:334
#: lib/designsettings.php:256 lib/groupeditform.php:202
@@ -1256,7 +1266,7 @@ msgstr "opis jest za długi (maksymalnie %d znaków)."
msgid "Could not update group."
msgstr "Nie można zaktualizować grupy."
-#: actions/editgroup.php:264 classes/User_group.php:493
+#: actions/editgroup.php:264 classes/User_group.php:496
msgid "Could not create aliases."
msgstr "Nie można utworzyć aliasów."
@@ -1617,7 +1627,7 @@ msgstr "Użytkownik został już zablokował w grupie."
msgid "User is not a member of group."
msgstr "Użytkownik nie jest członkiem grupy."
-#: actions/groupblock.php:136 actions/groupmembers.php:323
+#: actions/groupblock.php:136 actions/groupmembers.php:341
msgid "Block user from group"
msgstr "Zablokuj użytkownika w grupie"
@@ -1715,19 +1725,19 @@ msgstr "Lista użytkowników znajdujących się w tej grupie."
msgid "Admin"
msgstr "Administrator"
-#: actions/groupmembers.php:355 lib/blockform.php:69
+#: actions/groupmembers.php:373 lib/blockform.php:69
msgid "Block"
msgstr "Zablokuj"
-#: actions/groupmembers.php:450
+#: actions/groupmembers.php:468
msgid "Make user an admin of the group"
msgstr "Uczyń użytkownika administratorem grupy"
-#: actions/groupmembers.php:482
+#: actions/groupmembers.php:500
msgid "Make Admin"
msgstr "Uczyń administratorem"
-#: actions/groupmembers.php:482
+#: actions/groupmembers.php:500
msgid "Make this user an admin"
msgstr "Uczyń tego użytkownika administratorem"
@@ -1742,7 +1752,7 @@ msgstr "Oś czasu użytkownika %s"
msgid "Updates from members of %1$s on %2$s!"
msgstr "Aktualizacje od członków %1$s na %2$s."
-#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232
+#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249
#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr "Grupy"
@@ -1955,7 +1965,7 @@ msgstr "Zaproś nowych użytkowników"
msgid "You are already subscribed to these users:"
msgstr "Jesteś już subskrybowany do tych użytkowników:"
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
#, php-format
msgid "%1$s (%2$s)"
msgstr "%1$s (%2$s)"
@@ -2086,7 +2096,7 @@ msgstr "Użytkownik %1$s dołączył do grupy %2$s"
msgid "You must be logged in to leave a group."
msgstr "Musisz być zalogowany, aby opuścić grupę."
-#: actions/leavegroup.php:100 lib/command.php:265
+#: actions/leavegroup.php:100 lib/command.php:363
msgid "You are not a member of that group."
msgstr "Nie jesteś członkiem tej grupy."
@@ -2201,12 +2211,12 @@ msgstr "Użyj tego formularza, aby utworzyć nową grupę."
msgid "New message"
msgstr "Nowa wiadomość"
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
msgid "You can't send a message to this user."
msgstr "Nie można wysłać wiadomości do tego użytkownika."
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342
-#: lib/command.php:475
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
+#: lib/command.php:529
msgid "No content!"
msgstr "Brak treści."
@@ -2214,7 +2224,7 @@ msgstr "Brak treści."
msgid "No recipient specified."
msgstr "Nie podano odbiorcy."
-#: actions/newmessage.php:164 lib/command.php:361
+#: actions/newmessage.php:164 lib/command.php:462
msgid ""
"Don't send a message to yourself; just say it to yourself quietly instead."
msgstr "Nie wysyłaj wiadomości do siebie, po prostu powiedz to sobie po cichu."
@@ -2228,7 +2238,7 @@ msgstr "Wysłano wiadomość"
msgid "Direct message to %s sent."
msgstr "Wysłano bezpośrednią wiadomość do użytkownika %s."
-#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189
msgid "Ajax Error"
msgstr "Błąd AJAX"
@@ -2236,7 +2246,7 @@ msgstr "Błąd AJAX"
msgid "New notice"
msgstr "Nowy wpis"
-#: actions/newnotice.php:211
+#: actions/newnotice.php:217
msgid "Notice posted"
msgstr "Wysłano wpis"
@@ -2348,7 +2358,7 @@ msgstr "Programiści mogą zmodyfikować ustawienia rejestracji swoich aplikacji
msgid "Notice has no profile"
msgstr "Wpis nie posiada profilu"
-#: actions/oembed.php:86 actions/shownotice.php:180
+#: actions/oembed.php:86 actions/shownotice.php:175
#, php-format
msgid "%1$s's status on %2$s"
msgstr "Stan użytkownika %1$s na %2$s"
@@ -2361,8 +2371,8 @@ msgstr "typ zawartości "
msgid "Only "
msgstr "Tylko "
-#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042
-#: lib/apiaction.php:1070 lib/apiaction.php:1179
+#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1068
+#: lib/apiaction.php:1096 lib/apiaction.php:1212
msgid "Not a supported data format."
msgstr "To nie jest obsługiwany format danych."
@@ -2493,7 +2503,7 @@ msgstr "Niepoprawne poprzednie hasło"
msgid "Error saving user; invalid."
msgstr "Błąd podczas zapisywania użytkownika; nieprawidłowy."
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
msgid "Can't save new password."
msgstr "Nie można zapisać nowego hasła."
@@ -2670,12 +2680,12 @@ msgstr ""
msgid "People search"
msgstr "Wyszukiwanie osób"
-#: actions/peopletag.php:70
+#: actions/peopletag.php:68
#, php-format
msgid "Not a valid people tag: %s"
msgstr "Nieprawidłowy znacznik osób: %s"
-#: actions/peopletag.php:144
+#: actions/peopletag.php:142
#, php-format
msgid "Users self-tagged with %1$s - page %2$d"
msgstr "Użytkownicy używający znacznika %1$s - strona %2$d"
@@ -2709,8 +2719,8 @@ 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/showgroup.php:255 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:149
+#: actions/showgroup.php:256 actions/tagother.php:104
+#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Imię i nazwisko"
@@ -2737,9 +2747,9 @@ msgid "Bio"
msgstr "O mnie"
#: actions/profilesettings.php:132 actions/register.php:471
-#: actions/showgroup.php:264 actions/tagother.php:112
+#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
-#: lib/userprofile.php:164
+#: lib/userprofile.php:165
msgid "Location"
msgstr "Położenie"
@@ -2753,7 +2763,7 @@ msgstr "Podziel się swoim obecnym położeniem podczas wysyłania wpisów"
#: actions/profilesettings.php:145 actions/tagother.php:149
#: actions/tagother.php:209 lib/subscriptionlist.php:106
-#: lib/subscriptionlist.php:108 lib/userprofile.php:209
+#: lib/subscriptionlist.php:108 lib/userprofile.php:210
msgid "Tags"
msgstr "Znaczniki"
@@ -2995,7 +3005,7 @@ msgstr "Przywróć hasło"
msgid "Recover password"
msgstr "Przywróć hasło"
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
msgid "Password recovery requested"
msgstr "Zażądano przywracania hasła"
@@ -3015,19 +3025,19 @@ msgstr "Przywróć"
msgid "Enter a nickname or email address."
msgstr "Podaj pseudonim lub adres e-mail."
-#: actions/recoverpassword.php:272
+#: actions/recoverpassword.php:282
msgid "No user with that email address or username."
msgstr "Brak użytkownika z tym adresem e-mail lub nazwą użytkownika."
-#: actions/recoverpassword.php:287
+#: actions/recoverpassword.php:299
msgid "No registered email address for that user."
msgstr "Brak zarejestrowanych adresów e-mail dla tego użytkownika."
-#: actions/recoverpassword.php:301
+#: actions/recoverpassword.php:313
msgid "Error saving address confirmation."
msgstr "Błąd podczas zapisywania potwierdzenia adresu."
-#: actions/recoverpassword.php:325
+#: actions/recoverpassword.php:338
msgid ""
"Instructions for recovering your password have been sent to the email "
"address registered to your account."
@@ -3035,23 +3045,23 @@ msgstr ""
"Instrukcje przywracania hasła zostały wysłane na adres e-mail zarejestrowany "
"z twoim kontem."
-#: actions/recoverpassword.php:344
+#: actions/recoverpassword.php:357
msgid "Unexpected password reset."
msgstr "Nieoczekiwane przywrócenie hasła."
-#: actions/recoverpassword.php:352
+#: actions/recoverpassword.php:365
msgid "Password must be 6 chars or more."
msgstr "Hasło musi mieć sześć lub więcej znaków."
-#: actions/recoverpassword.php:356
+#: actions/recoverpassword.php:369
msgid "Password and confirmation do not match."
msgstr "Hasło i potwierdzenie nie pasują do siebie."
-#: actions/recoverpassword.php:375 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:248
msgid "Error setting user."
msgstr "Błąd podczas ustawiania użytkownika."
-#: actions/recoverpassword.php:382
+#: actions/recoverpassword.php:395
msgid "New password successfully saved. You are now logged in."
msgstr "Pomyślnie zapisano nowe hasło. Jesteś teraz zalogowany."
@@ -3216,7 +3226,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "Adres URL profilu na innej, zgodnej usłudze mikroblogowania"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:394
+#: lib/userprofile.php:406
msgid "Subscribe"
msgstr "Subskrybuj"
@@ -3254,7 +3264,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:674
+#: actions/repeat.php:114 lib/noticelist.php:678
msgid "Repeated"
msgstr "Powtórzono"
@@ -3397,8 +3407,8 @@ msgstr "Organizacja"
msgid "Description"
msgstr "Opis"
-#: actions/showapplication.php:192 actions/showgroup.php:438
-#: lib/profileaction.php:176
+#: actions/showapplication.php:192 actions/showgroup.php:444
+#: lib/profileaction.php:187
msgid "Statistics"
msgstr "Statystyki"
@@ -3518,67 +3528,67 @@ msgstr "Grupa %s"
msgid "%1$s group, page %2$d"
msgstr "Grupa %1$s, strona %2$d"
-#: actions/showgroup.php:226
+#: actions/showgroup.php:227
msgid "Group profile"
msgstr "Profil grupy"
-#: actions/showgroup.php:271 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:177
+#: actions/showgroup.php:272 actions/tagother.php:118
+#: actions/userauthorization.php:175 lib/userprofile.php:178
msgid "URL"
msgstr "Adres URL"
-#: actions/showgroup.php:282 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:194
+#: actions/showgroup.php:283 actions/tagother.php:128
+#: actions/userauthorization.php:187 lib/userprofile.php:195
msgid "Note"
msgstr "Wpis"
-#: actions/showgroup.php:292 lib/groupeditform.php:184
+#: actions/showgroup.php:293 lib/groupeditform.php:184
msgid "Aliases"
msgstr "Aliasy"
-#: actions/showgroup.php:301
+#: actions/showgroup.php:302
msgid "Group actions"
msgstr "Działania grupy"
-#: actions/showgroup.php:337
+#: actions/showgroup.php:338
#, php-format
msgid "Notice feed for %s group (RSS 1.0)"
msgstr "Kanał wpisów dla grupy %s (RSS 1.0)"
-#: actions/showgroup.php:343
+#: actions/showgroup.php:344
#, php-format
msgid "Notice feed for %s group (RSS 2.0)"
msgstr "Kanał wpisów dla grupy %s (RSS 2.0)"
-#: actions/showgroup.php:349
+#: actions/showgroup.php:350
#, php-format
msgid "Notice feed for %s group (Atom)"
msgstr "Kanał wpisów dla grupy %s (Atom)"
-#: actions/showgroup.php:354
+#: actions/showgroup.php:355
#, php-format
msgid "FOAF for %s group"
msgstr "FOAF dla grupy %s"
-#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91
+#: actions/showgroup.php:393 actions/showgroup.php:453 lib/groupnav.php:91
msgid "Members"
msgstr "Członkowie"
-#: actions/showgroup.php:395 lib/profileaction.php:117
-#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95
-#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71
+#: actions/showgroup.php:398 lib/profileaction.php:117
+#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95
+#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
msgid "(None)"
msgstr "(Brak)"
-#: actions/showgroup.php:401
+#: actions/showgroup.php:404
msgid "All members"
msgstr "Wszyscy członkowie"
-#: actions/showgroup.php:441
+#: actions/showgroup.php:447
msgid "Created"
msgstr "Utworzono"
-#: actions/showgroup.php:457
+#: actions/showgroup.php:463
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3594,7 +3604,7 @@ msgstr ""
"action.register%%%%), aby stać się częścią tej grupy i wiele więcej. "
"([Przeczytaj więcej](%%%%doc.help%%%%))"
-#: actions/showgroup.php:463
+#: actions/showgroup.php:469
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3607,7 +3617,7 @@ msgstr ""
"narzędziu [StatusNet](http://status.net/). Jej członkowie dzielą się "
"krótkimi wiadomościami o swoim życiu i zainteresowaniach. "
-#: actions/showgroup.php:491
+#: actions/showgroup.php:497
msgid "Admins"
msgstr "Administratorzy"
@@ -3747,8 +3757,8 @@ msgid "Unknown language \"%s\"."
msgstr "Nieznany język \"%s\"."
#: actions/siteadminpanel.php:165
-msgid "Minimum text limit is 140 characters."
-msgstr "Maksymalne ograniczenie tekstu to 14 znaków."
+msgid "Minimum text limit is 0 (unlimited)."
+msgstr "Minimalne ograniczenie tekstu to 0 (bez ograniczenia)."
#: actions/siteadminpanel.php:171
msgid "Dupe limit must 1 or more seconds."
@@ -4020,8 +4030,7 @@ msgstr "Zapisz ustawienia migawki"
msgid "You are not subscribed to that profile."
msgstr "Nie jesteś subskrybowany do tego profilu."
-#: actions/subedit.php:83 classes/Subscription.php:89
-#: classes/Subscription.php:116
+#: actions/subedit.php:83 classes/Subscription.php:132
msgid "Could not save subscription."
msgstr "Nie można zapisać subskrypcji."
@@ -4124,11 +4133,11 @@ msgstr ""
msgid "%s is not listening to anyone."
msgstr "Użytkownik %s nie obserwuje nikogo."
-#: actions/subscriptions.php:199
+#: actions/subscriptions.php:208
msgid "Jabber"
msgstr "Jabber"
-#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:222 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr "SMS"
@@ -4161,12 +4170,12 @@ msgstr "Brak parametru identyfikatora."
msgid "Tag %s"
msgstr "Znacznik %s"
-#: actions/tagother.php:77 lib/userprofile.php:75
+#: actions/tagother.php:77 lib/userprofile.php:76
msgid "User profile"
msgstr "Profil użytkownika"
#: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:102
+#: lib/userprofile.php:103
msgid "Photo"
msgstr "Zdjęcie"
@@ -4499,7 +4508,7 @@ msgstr ""
msgid "Plugins"
msgstr "Wtyczki"
-#: actions/version.php:196 lib/action.php:767
+#: actions/version.php:196 lib/action.php:766
msgid "Version"
msgstr "Wersja"
@@ -4507,7 +4516,7 @@ msgstr "Wersja"
msgid "Author(s)"
msgstr "Autorzy"
-#: classes/File.php:144
+#: classes/File.php:169
#, php-format
msgid ""
"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
@@ -4516,13 +4525,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:154
+#: classes/File.php:179
#, 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:161
+#: classes/File.php:186
#, php-format
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
@@ -4562,27 +4571,27 @@ msgstr "Nie można wprowadzić wiadomości."
msgid "Could not update message with new URI."
msgstr "Nie można zaktualizować wiadomości za pomocą nowego adresu URL."
-#: classes/Notice.php:172
+#: classes/Notice.php:175
#, php-format
msgid "DB error inserting hashtag: %s"
msgstr "Błąd bazy danych podczas wprowadzania znacznika mieszania: %s"
-#: classes/Notice.php:241
+#: classes/Notice.php:244
msgid "Problem saving notice. Too long."
msgstr "Problem podczas zapisywania wpisu. Za długi."
-#: classes/Notice.php:245
+#: classes/Notice.php:248
msgid "Problem saving notice. Unknown user."
msgstr "Problem podczas zapisywania wpisu. Nieznany użytkownik."
-#: classes/Notice.php:250
+#: classes/Notice.php:253
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:256
+#: classes/Notice.php:259
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
@@ -4590,69 +4599,69 @@ 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:262
+#: classes/Notice.php:265
msgid "You are banned from posting notices on this site."
msgstr "Zabroniono ci wysyłania wpisów na tej witrynie."
-#: classes/Notice.php:328 classes/Notice.php:354
+#: classes/Notice.php:331 classes/Notice.php:357
msgid "Problem saving notice."
msgstr "Problem podczas zapisywania wpisu."
-#: classes/Notice.php:927
+#: classes/Notice.php:943
msgid "Problem saving group inbox."
msgstr "Problem podczas zapisywania skrzynki odbiorczej grupy."
-#: classes/Notice.php:1459
+#: classes/Notice.php:1481
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
-#: classes/Subscription.php:66 lib/oauthstore.php:465
+#: classes/Subscription.php:74 lib/oauthstore.php:465
msgid "You have been banned from subscribing."
msgstr "Zablokowano subskrybowanie."
-#: classes/Subscription.php:70
+#: classes/Subscription.php:78
msgid "Already subscribed!"
msgstr "Już subskrybowane."
-#: classes/Subscription.php:74
+#: classes/Subscription.php:82
msgid "User has blocked you."
msgstr "Użytkownik zablokował cię."
-#: classes/Subscription.php:157
+#: classes/Subscription.php:167
msgid "Not subscribed!"
msgstr "Niesubskrybowane."
-#: classes/Subscription.php:163
+#: classes/Subscription.php:173
msgid "Couldn't delete self-subscription."
msgstr "Nie można usunąć autosubskrypcji."
-#: classes/Subscription.php:190
+#: classes/Subscription.php:200
msgid "Couldn't delete subscription OMB token."
msgstr "Nie można usunąć tokenu subskrypcji OMB."
-#: classes/Subscription.php:201 lib/subs.php:69
+#: classes/Subscription.php:211
msgid "Couldn't delete subscription."
msgstr "Nie można usunąć subskrypcji."
-#: classes/User.php:373
+#: classes/User.php:363
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Witaj w %1$s, @%2$s."
-#: classes/User_group.php:477
+#: classes/User_group.php:480
msgid "Could not create group."
msgstr "Nie można utworzyć grupy."
-#: classes/User_group.php:486
+#: classes/User_group.php:489
msgid "Could not set group URI."
msgstr "Nie można ustawić adresu URI grupy."
-#: classes/User_group.php:507
+#: classes/User_group.php:510
msgid "Could not set group membership."
msgstr "Nie można ustawić członkostwa w grupie."
-#: classes/User_group.php:521
+#: classes/User_group.php:524
msgid "Could not save local group info."
msgstr "Nie można zapisać informacji o lokalnej grupie."
@@ -4693,170 +4702,170 @@ msgstr "%1$s - %2$s"
msgid "Untitled page"
msgstr "Strona bez nazwy"
-#: lib/action.php:424
+#: lib/action.php:423
msgid "Primary site navigation"
msgstr "Główna nawigacja witryny"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:430
+#: lib/action.php:429
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr "Profil osobisty i oś czasu przyjaciół"
-#: lib/action.php:433
+#: lib/action.php:432
msgctxt "MENU"
msgid "Personal"
msgstr "Osobiste"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:435
+#: lib/action.php:434
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "Zmień adres e-mail, awatar, hasło, profil"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:440
+#: lib/action.php:439
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "Połącz z serwisami"
-#: lib/action.php:443
+#: lib/action.php:442
msgid "Connect"
msgstr "Połącz"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:446
+#: lib/action.php:445
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "Zmień konfigurację witryny"
-#: lib/action.php:449
+#: lib/action.php:448
msgctxt "MENU"
msgid "Admin"
msgstr "Administrator"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:453
+#: lib/action.php:452
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "Zaproś przyjaciół i kolegów do dołączenia do ciebie na %s"
-#: lib/action.php:456
+#: lib/action.php:455
msgctxt "MENU"
msgid "Invite"
msgstr "Zaproś"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:462
+#: lib/action.php:461
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "Wyloguj się z witryny"
-#: lib/action.php:465
+#: lib/action.php:464
msgctxt "MENU"
msgid "Logout"
msgstr "Wyloguj się"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:470
+#: lib/action.php:469
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Utwórz konto"
-#: lib/action.php:473
+#: lib/action.php:472
msgctxt "MENU"
msgid "Register"
msgstr "Zarejestruj się"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:476
+#: lib/action.php:475
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Zaloguj się na witrynie"
-#: lib/action.php:479
+#: lib/action.php:478
msgctxt "MENU"
msgid "Login"
msgstr "Zaloguj się"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:482
+#: lib/action.php:481
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Pomóż mi."
-#: lib/action.php:485
+#: lib/action.php:484
msgctxt "MENU"
msgid "Help"
msgstr "Pomoc"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:488
+#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "Wyszukaj osoby lub tekst"
-#: lib/action.php:491
+#: lib/action.php:490
msgctxt "MENU"
msgid "Search"
msgstr "Wyszukaj"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:513 lib/adminpanelaction.php:398
+#: lib/action.php:512 lib/adminpanelaction.php:398
msgid "Site notice"
msgstr "Wpis witryny"
-#: lib/action.php:579
+#: lib/action.php:578
msgid "Local views"
msgstr "Lokalne widoki"
-#: lib/action.php:645
+#: lib/action.php:644
msgid "Page notice"
msgstr "Wpis strony"
-#: lib/action.php:747
+#: lib/action.php:746
msgid "Secondary site navigation"
msgstr "Druga nawigacja witryny"
-#: lib/action.php:752
+#: lib/action.php:751
msgid "Help"
msgstr "Pomoc"
-#: lib/action.php:754
+#: lib/action.php:753
msgid "About"
msgstr "O usłudze"
-#: lib/action.php:756
+#: lib/action.php:755
msgid "FAQ"
msgstr "FAQ"
-#: lib/action.php:760
+#: lib/action.php:759
msgid "TOS"
msgstr "TOS"
-#: lib/action.php:763
+#: lib/action.php:762
msgid "Privacy"
msgstr "Prywatność"
-#: lib/action.php:765
+#: lib/action.php:764
msgid "Source"
msgstr "Kod źródłowy"
-#: lib/action.php:769
+#: lib/action.php:768
msgid "Contact"
msgstr "Kontakt"
-#: lib/action.php:771
+#: lib/action.php:770
msgid "Badge"
msgstr "Odznaka"
-#: lib/action.php:799
+#: lib/action.php:798
msgid "StatusNet software license"
msgstr "Licencja oprogramowania StatusNet"
-#: lib/action.php:802
+#: lib/action.php:803
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4865,12 +4874,12 @@ msgstr ""
"**%%site.name%%** jest usługą mikroblogowania prowadzoną przez [%%site."
"broughtby%%](%%site.broughtbyurl%%). "
-#: lib/action.php:804
+#: lib/action.php:805
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** jest usługą mikroblogowania. "
-#: lib/action.php:806
+#: lib/action.php:808
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4881,57 +4890,61 @@ msgstr ""
"status.net/) w wersji %s, dostępnego na [Powszechnej Licencji Publicznej GNU "
"Affero](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:821
+#: lib/action.php:823
msgid "Site content license"
msgstr "Licencja zawartości witryny"
-#: lib/action.php:826
+#: lib/action.php:828
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr "Treść i dane %1$s są prywatne i poufne."
-#: lib/action.php:831
+#: lib/action.php:833
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
"Prawa autorskie do treści i danych są własnością %1$s. Wszystkie prawa "
"zastrzeżone."
-#: lib/action.php:834
+#: lib/action.php:836
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
"Prawa autorskie do treści i danych są własnością współtwórców. Wszystkie "
"prawa zastrzeżone."
-#: lib/action.php:847
+#: lib/action.php:849
msgid "All "
msgstr "Wszystko "
-#: lib/action.php:853
+#: lib/action.php:855
msgid "license."
msgstr "licencja."
-#: lib/action.php:1152
+#: lib/action.php:1154
msgid "Pagination"
msgstr "Paginacja"
-#: lib/action.php:1161
+#: lib/action.php:1163
msgid "After"
msgstr "Później"
-#: lib/action.php:1169
+#: lib/action.php:1171
msgid "Before"
msgstr "Wcześniej"
-#: lib/activity.php:453
+#: lib/activity.php:120
+msgid "Expecting a root feed element but got a whole XML document."
+msgstr "Oczekiwano elementu kanału roota, ale otrzymano cały dokument XML."
+
+#: lib/activityutils.php:208
msgid "Can't handle remote content yet."
msgstr "Nie można jeszcze obsługiwać zdalnej treści."
-#: lib/activity.php:481
+#: lib/activityutils.php:236
msgid "Can't handle embedded XML content yet."
msgstr "Nie można jeszcze obsługiwać zagnieżdżonej treści XML."
-#: lib/activity.php:485
+#: lib/activityutils.php:240
msgid "Can't handle embedded Base64 content yet."
msgstr "Nie można jeszcze obsługiwać zagnieżdżonej treści Base64."
@@ -5023,7 +5036,7 @@ msgstr ""
"Zasób API wymaga dostępu do zapisu i do odczytu, ale powiadasz dostęp tylko "
"do odczytu."
-#: lib/apiauth.php:272
+#: lib/apiauth.php:276
#, php-format
msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s"
msgstr ""
@@ -5100,11 +5113,11 @@ msgstr "Unieważnij"
msgid "Attachments"
msgstr "Załączniki"
-#: lib/attachmentlist.php:265
+#: lib/attachmentlist.php:263
msgid "Author"
msgstr "Autor"
-#: lib/attachmentlist.php:278
+#: lib/attachmentlist.php:276
msgid "Provider"
msgstr "Dostawca"
@@ -5124,37 +5137,50 @@ msgstr "Zmiana hasła nie powiodła się"
msgid "Password changing is not allowed"
msgstr "Zmiana hasła nie jest dozwolona"
-#: lib/channel.php:138 lib/channel.php:158
+#: lib/channel.php:157 lib/channel.php:177
msgid "Command results"
msgstr "Wyniki polecenia"
-#: lib/channel.php:210 lib/mailhandler.php:142
+#: lib/channel.php:229 lib/mailhandler.php:142
msgid "Command complete"
msgstr "Zakończono polecenie"
-#: lib/channel.php:221
+#: lib/channel.php:240
msgid "Command failed"
msgstr "Polecenie nie powiodło się"
-#: lib/command.php:44
-msgid "Sorry, this command is not yet implemented."
-msgstr "Te polecenie nie zostało jeszcze zaimplementowane."
+#: lib/command.php:83 lib/command.php:105
+msgid "Notice with that id does not exist"
+msgstr "Wpis z tym identyfikatorem nie istnieje."
+
+#: lib/command.php:99 lib/command.php:570
+msgid "User has no last notice"
+msgstr "Użytkownik nie posiada ostatniego wpisu."
-#: lib/command.php:88
+#: lib/command.php:125
#, php-format
msgid "Could not find a user with nickname %s"
msgstr "Nie można odnaleźć użytkownika z pseudonimem %s."
-#: lib/command.php:92
+#: lib/command.php:143
+#, php-format
+msgid "Could not find a local user with nickname %s"
+msgstr "Nie można odnaleźć lokalnego użytkownika z pseudonimem %s."
+
+#: lib/command.php:176
+msgid "Sorry, this command is not yet implemented."
+msgstr "Te polecenie nie zostało jeszcze zaimplementowane."
+
+#: lib/command.php:221
msgid "It does not make a lot of sense to nudge yourself!"
msgstr "Szturchanie samego siebie nie ma zbyt wiele sensu."
-#: lib/command.php:99
+#: lib/command.php:228
#, php-format
msgid "Nudge sent to %s"
msgstr "Wysłano szturchnięcie do użytkownika %s."
-#: lib/command.php:126
+#: lib/command.php:254
#, php-format
msgid ""
"Subscriptions: %1$s\n"
@@ -5165,200 +5191,200 @@ msgstr ""
"Subskrybenci: %2$s\n"
"Wpisy: %3$s"
-#: lib/command.php:152 lib/command.php:390 lib/command.php:451
-msgid "Notice with that id does not exist"
-msgstr "Wpis z tym identyfikatorem nie istnieje."
-
-#: lib/command.php:168 lib/command.php:406 lib/command.php:467
-#: lib/command.php:523
-msgid "User has no last notice"
-msgstr "Użytkownik nie posiada ostatniego wpisu."
-
-#: lib/command.php:190
+#: lib/command.php:296
msgid "Notice marked as fave."
msgstr "Zaznaczono wpis jako ulubiony."
-#: lib/command.php:217
+#: lib/command.php:317
msgid "You are already a member of that group"
msgstr "Jesteś już członkiem tej grupy."
-#: lib/command.php:231
+#: lib/command.php:331
#, php-format
msgid "Could not join user %s to group %s"
msgstr "Nie można dołączyć użytkownika %1$s do grupy %2$s."
-#: lib/command.php:236
+#: lib/command.php:336
#, php-format
msgid "%s joined group %s"
msgstr "Użytkownik %1$s dołączył do grupy %2$s"
-#: lib/command.php:275
+#: lib/command.php:373
#, php-format
msgid "Could not remove user %s to group %s"
msgstr "Nie można usunąć użytkownika %1$s z grupy %2$s."
-#: lib/command.php:280
+#: lib/command.php:378
#, php-format
msgid "%s left group %s"
msgstr "Użytkownik %1$s opuścił grupę %2$s"
-#: lib/command.php:309
+#: lib/command.php:401
#, php-format
msgid "Fullname: %s"
msgstr "Imię i nazwisko: %s"
-#: lib/command.php:312 lib/mail.php:258
+#: lib/command.php:404 lib/mail.php:258
#, php-format
msgid "Location: %s"
msgstr "Położenie: %s"
-#: lib/command.php:315 lib/mail.php:260
+#: lib/command.php:407 lib/mail.php:260
#, php-format
msgid "Homepage: %s"
msgstr "Strona domowa: %s"
-#: lib/command.php:318
+#: lib/command.php:410
#, php-format
msgid "About: %s"
msgstr "O mnie: %s"
-#: lib/command.php:349
+#: lib/command.php:437
+#, php-format
+msgid ""
+"%s is a remote profile; you can only send direct messages to users on the "
+"same server."
+msgstr ""
+"%s to zdalny profil; można wysyłać bezpośrednie wiadomości tylko do "
+"użytkowników na tym samym serwerze."
+
+#: lib/command.php:450
#, php-format
msgid "Message too long - maximum is %d characters, you sent %d"
msgstr "Wiadomość jest za długa - maksymalnie %1$d znaków, wysłano %2$d."
-#: lib/command.php:367
+#: lib/command.php:468
#, php-format
msgid "Direct message to %s sent"
msgstr "Wysłano bezpośrednią wiadomość do użytkownika %s."
-#: lib/command.php:369
+#: lib/command.php:470
msgid "Error sending direct message."
msgstr "Błąd podczas wysyłania bezpośredniej wiadomości."
-#: lib/command.php:413
+#: lib/command.php:490
msgid "Cannot repeat your own notice"
msgstr "Nie można powtórzyć własnego wpisu"
-#: lib/command.php:418
+#: lib/command.php:495
msgid "Already repeated that notice"
msgstr "Już powtórzono ten wpis"
-#: lib/command.php:426
+#: lib/command.php:503
#, php-format
msgid "Notice from %s repeated"
msgstr "Powtórzono wpis od użytkownika %s"
-#: lib/command.php:428
+#: lib/command.php:505
msgid "Error repeating notice."
msgstr "Błąd podczas powtarzania wpisu."
-#: lib/command.php:482
+#: lib/command.php:536
#, php-format
msgid "Notice too long - maximum is %d characters, you sent %d"
msgstr "Wpis jest za długi - maksymalnie %1$d znaków, wysłano %2$d."
-#: lib/command.php:491
+#: lib/command.php:545
#, php-format
msgid "Reply to %s sent"
msgstr "Wysłano odpowiedź do %s."
-#: lib/command.php:493
+#: lib/command.php:547
msgid "Error saving notice."
msgstr "Błąd podczas zapisywania wpisu."
-#: lib/command.php:547
+#: lib/command.php:594
msgid "Specify the name of the user to subscribe to"
msgstr "Podaj nazwę użytkownika do subskrybowania."
-#: lib/command.php:554 lib/command.php:589
-msgid "No such user"
-msgstr "Brak takiego użytkownika."
+#: lib/command.php:602
+msgid "Can't subscribe to OMB profiles by command."
+msgstr "Nie można subskrybować profili OMB za pomocą polecenia."
-#: lib/command.php:561
+#: lib/command.php:608
#, php-format
msgid "Subscribed to %s"
msgstr "Subskrybowano użytkownika %s"
-#: lib/command.php:582 lib/command.php:685
+#: lib/command.php:629 lib/command.php:728
msgid "Specify the name of the user to unsubscribe from"
msgstr "Podaj nazwę użytkownika do usunięcia subskrypcji."
-#: lib/command.php:595
+#: lib/command.php:638
#, php-format
msgid "Unsubscribed from %s"
msgstr "Usunięto subskrypcję użytkownika %s"
-#: lib/command.php:613 lib/command.php:636
+#: lib/command.php:656 lib/command.php:679
msgid "Command not yet implemented."
msgstr "Nie zaimplementowano polecenia."
-#: lib/command.php:616
+#: lib/command.php:659
msgid "Notification off."
msgstr "Wyłączono powiadomienia."
-#: lib/command.php:618
+#: lib/command.php:661
msgid "Can't turn off notification."
msgstr "Nie można wyłączyć powiadomień."
-#: lib/command.php:639
+#: lib/command.php:682
msgid "Notification on."
msgstr "Włączono powiadomienia."
-#: lib/command.php:641
+#: lib/command.php:684
msgid "Can't turn on notification."
msgstr "Nie można włączyć powiadomień."
-#: lib/command.php:654
+#: lib/command.php:697
msgid "Login command is disabled"
msgstr "Polecenie logowania jest wyłączone"
-#: lib/command.php:665
+#: lib/command.php:708
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
"Tego odnośnika można użyć tylko raz i będzie prawidłowy tylko przez dwie "
"minuty: %s."
-#: lib/command.php:692
+#: lib/command.php:735
#, php-format
msgid "Unsubscribed %s"
msgstr "Usunięto subskrypcję użytkownika %s"
-#: lib/command.php:709
+#: lib/command.php:752
msgid "You are not subscribed to anyone."
msgstr "Nie subskrybujesz nikogo."
-#: lib/command.php:711
+#: lib/command.php:754
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Subskrybujesz tę osobę:"
msgstr[1] "Subskrybujesz te osoby:"
msgstr[2] "Subskrybujesz te osoby:"
-#: lib/command.php:731
+#: lib/command.php:774
msgid "No one is subscribed to you."
msgstr "Nikt cię nie subskrybuje."
-#: lib/command.php:733
+#: lib/command.php:776
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Ta osoba cię subskrybuje:"
msgstr[1] "Te osoby cię subskrybują:"
msgstr[2] "Te osoby cię subskrybują:"
-#: lib/command.php:753
+#: lib/command.php:796
msgid "You are not a member of any groups."
msgstr "Nie jesteś członkiem żadnej grupy."
-#: lib/command.php:755
+#: lib/command.php:798
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Jesteś członkiem tej grupy:"
msgstr[1] "Jesteś członkiem tych grup:"
msgstr[2] "Jesteś członkiem tych grup:"
-#: lib/command.php:769
+#: lib/command.php:812
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5440,19 +5466,19 @@ msgstr ""
"tracks - jeszcze nie zaimplementowano\n"
"tracking - jeszcze nie zaimplementowano\n"
-#: lib/common.php:148
+#: lib/common.php:135
msgid "No configuration file found. "
msgstr "Nie odnaleziono pliku konfiguracji."
-#: lib/common.php:149
+#: lib/common.php:136
msgid "I looked for configuration files in the following places: "
msgstr "Szukano plików konfiguracji w następujących miejscach: "
-#: lib/common.php:151
+#: lib/common.php:138
msgid "You may wish to run the installer to fix this."
msgstr "Należy uruchomić instalator, aby to naprawić."
-#: lib/common.php:152
+#: lib/common.php:139
msgid "Go to the installer."
msgstr "Przejdź do instalatora."
@@ -5630,49 +5656,49 @@ msgstr "Znaczniki we wpisach grupy %s"
msgid "This page is not available in a media type you accept"
msgstr "Ta strona jest niedostępna dla akceptowanego typu medium"
-#: lib/imagefile.php:75
+#: lib/imagefile.php:72
+msgid "Unsupported image file format."
+msgstr "Nieobsługiwany format pliku obrazu."
+
+#: lib/imagefile.php:88
#, php-format
msgid "That file is too big. The maximum file size is %s."
msgstr "Ten plik jest za duży. Maksymalny rozmiar pliku to %s."
-#: lib/imagefile.php:80
+#: lib/imagefile.php:93
msgid "Partial upload."
msgstr "Częściowo wysłano."
-#: lib/imagefile.php:88 lib/mediafile.php:170
+#: lib/imagefile.php:101 lib/mediafile.php:170
msgid "System error uploading file."
msgstr "Błąd systemu podczas wysyłania pliku."
-#: lib/imagefile.php:96
+#: lib/imagefile.php:109
msgid "Not an image or corrupt file."
msgstr "To nie jest obraz lub lub plik jest uszkodzony."
-#: lib/imagefile.php:109
-msgid "Unsupported image file format."
-msgstr "Nieobsługiwany format pliku obrazu."
-
#: lib/imagefile.php:122
msgid "Lost our file."
msgstr "Utracono plik."
-#: lib/imagefile.php:166 lib/imagefile.php:231
+#: lib/imagefile.php:163 lib/imagefile.php:224
msgid "Unknown file type"
msgstr "Nieznany typ pliku"
-#: lib/imagefile.php:251
+#: lib/imagefile.php:244
msgid "MB"
msgstr "MB"
-#: lib/imagefile.php:253
+#: lib/imagefile.php:246
msgid "kB"
msgstr "KB"
-#: lib/jabber.php:220
+#: lib/jabber.php:387
#, php-format
msgid "[%s]"
msgstr "[%s]"
-#: lib/jabber.php:400
+#: lib/jabber.php:567
#, php-format
msgid "Unknown inbox source %d."
msgstr "Nieznane źródło skrzynki odbiorczej %d."
@@ -5954,7 +5980,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:482
+#: lib/mailbox.php:227 lib/noticelist.php:486
msgid "from"
msgstr "z"
@@ -6082,48 +6108,48 @@ msgstr ""
"Pobieranie danych geolokalizacji trwa dłużej niż powinno, proszę spróbować "
"ponownie później"
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "N"
msgstr "Północ"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "S"
msgstr "Południe"
-#: lib/noticelist.php:431
+#: lib/noticelist.php:432
msgid "E"
msgstr "Wschód"
-#: lib/noticelist.php:431
+#: lib/noticelist.php:432
msgid "W"
msgstr "Zachód"
-#: lib/noticelist.php:438
+#: lib/noticelist.php:439
msgid "at"
msgstr "w"
-#: lib/noticelist.php:566
+#: lib/noticelist.php:570
msgid "in context"
msgstr "w rozmowie"
-#: lib/noticelist.php:601
+#: lib/noticelist.php:605
msgid "Repeated by"
msgstr "Powtórzone przez"
-#: lib/noticelist.php:628
+#: lib/noticelist.php:632
msgid "Reply to this notice"
msgstr "Odpowiedz na ten wpis"
-#: lib/noticelist.php:629
+#: lib/noticelist.php:633
msgid "Reply"
msgstr "Odpowiedz"
-#: lib/noticelist.php:673
+#: lib/noticelist.php:677
msgid "Notice repeated"
msgstr "Powtórzono wpis"
@@ -6196,7 +6222,7 @@ msgstr "Znaczniki we wpisach użytkownika %s"
msgid "Unknown"
msgstr "Nieznane"
-#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr "Subskrypcje"
@@ -6204,23 +6230,28 @@ msgstr "Subskrypcje"
msgid "All subscriptions"
msgstr "Wszystkie subskrypcje"
-#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90
+#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr "Subskrybenci"
-#: lib/profileaction.php:159
+#: lib/profileaction.php:161
msgid "All subscribers"
msgstr "Wszyscy subskrybenci"
-#: lib/profileaction.php:180
+#: lib/profileaction.php:191
msgid "User ID"
msgstr "Identyfikator użytkownika"
-#: lib/profileaction.php:185
+#: lib/profileaction.php:196
msgid "Member since"
msgstr "Członek od"
-#: lib/profileaction.php:247
+#. TRANS: Average count of posts made per day since account registration
+#: lib/profileaction.php:235
+msgid "Daily average"
+msgstr "Dziennie średnio"
+
+#: lib/profileaction.php:264
msgid "All groups"
msgstr "Wszystkie grupy"
@@ -6265,7 +6296,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:671
+#: lib/router.php:704
msgid "No single user defined for single-user mode."
msgstr ""
"Nie określono pojedynczego użytkownika dla trybu pojedynczego użytkownika."
@@ -6392,89 +6423,98 @@ msgstr "Zrezygnuj z subskrypcji tego użytkownika"
msgid "Unsubscribe"
msgstr "Zrezygnuj z subskrypcji"
-#: lib/userprofile.php:116
+#: lib/usernoprofileexception.php:58
+#, php-format
+msgid "User %s (%d) has no profile record."
+msgstr "Użytkownik %s (%d) nie posiada wpisu profilu."
+
+#: lib/userprofile.php:117
msgid "Edit Avatar"
msgstr "Zmodyfikuj awatar"
-#: lib/userprofile.php:236
+#: lib/userprofile.php:234 lib/userprofile.php:248
msgid "User actions"
msgstr "Czynności użytkownika"
-#: lib/userprofile.php:251
+#: lib/userprofile.php:237
+msgid "User deletion in progress..."
+msgstr "Trwa usuwanie użytkownika..."
+
+#: lib/userprofile.php:263
msgid "Edit profile settings"
msgstr "Zmodyfikuj ustawienia profilu"
-#: lib/userprofile.php:252
+#: lib/userprofile.php:264
msgid "Edit"
msgstr "Edycja"
-#: lib/userprofile.php:275
+#: lib/userprofile.php:287
msgid "Send a direct message to this user"
msgstr "Wyślij bezpośrednią wiadomość do tego użytkownika"
-#: lib/userprofile.php:276
+#: lib/userprofile.php:288
msgid "Message"
msgstr "Wiadomość"
-#: lib/userprofile.php:314
+#: lib/userprofile.php:326
msgid "Moderate"
msgstr "Moderuj"
-#: lib/userprofile.php:352
+#: lib/userprofile.php:364
msgid "User role"
msgstr "Rola użytkownika"
-#: lib/userprofile.php:354
+#: lib/userprofile.php:366
msgctxt "role"
msgid "Administrator"
msgstr "Administrator"
-#: lib/userprofile.php:355
+#: lib/userprofile.php:367
msgctxt "role"
msgid "Moderator"
msgstr "Moderator"
-#: lib/util.php:1015
+#: lib/util.php:1046
msgid "a few seconds ago"
msgstr "kilka sekund temu"
-#: lib/util.php:1017
+#: lib/util.php:1048
msgid "about a minute ago"
msgstr "około minutę temu"
-#: lib/util.php:1019
+#: lib/util.php:1050
#, php-format
msgid "about %d minutes ago"
msgstr "około %d minut temu"
-#: lib/util.php:1021
+#: lib/util.php:1052
msgid "about an hour ago"
msgstr "około godzinę temu"
-#: lib/util.php:1023
+#: lib/util.php:1054
#, php-format
msgid "about %d hours ago"
msgstr "około %d godzin temu"
-#: lib/util.php:1025
+#: lib/util.php:1056
msgid "about a day ago"
msgstr "blisko dzień temu"
-#: lib/util.php:1027
+#: lib/util.php:1058
#, php-format
msgid "about %d days ago"
msgstr "około %d dni temu"
-#: lib/util.php:1029
+#: lib/util.php:1060
msgid "about a month ago"
msgstr "około miesiąc temu"
-#: lib/util.php:1031
+#: lib/util.php:1062
#, php-format
msgid "about %d months ago"
msgstr "około %d miesięcy temu"
-#: lib/util.php:1033
+#: lib/util.php:1064
msgid "about a year ago"
msgstr "około rok temu"
@@ -6490,7 +6530,7 @@ msgstr ""
"%s nie jest prawidłowym kolorem. Użyj trzech lub sześciu znaków "
"szesnastkowych."
-#: lib/xmppmanager.php:402
+#: lib/xmppmanager.php:403
#, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d."
msgstr "Wiadomość jest za długa - maksymalnie %1$d znaków, wysłano %2$d."
diff --git a/locale/pt/LC_MESSAGES/statusnet.po b/locale/pt/LC_MESSAGES/statusnet.po
index 7041bea81..1ef583e91 100644
--- a/locale/pt/LC_MESSAGES/statusnet.po
+++ b/locale/pt/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-06 23:49+0000\n"
-"PO-Revision-Date: 2010-03-06 23:50:48+0000\n"
+"POT-Creation-Date: 2010-04-05 18:54+0000\n"
+"PO-Revision-Date: 2010-04-05 18:56:03+0000\n"
"Language-Team: Portuguese\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64621); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: pt\n"
"X-Message-Group: out-statusnet\n"
@@ -96,9 +96,9 @@ msgstr "Página não encontrada."
#: 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:90
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78
+#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
@@ -107,10 +107,8 @@ msgstr "Página não encontrada."
#: actions/remotesubscribe.php:154 actions/replies.php:73
#: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:163 lib/command.php:302
-#: lib/command.php:355 lib/command.php:401 lib/command.php:462
-#: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82
-#: lib/profileaction.php:77
+#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: lib/mailbox.php:82 lib/profileaction.php:77
msgid "No such user."
msgstr "Utilizador não encontrado."
@@ -204,18 +202,18 @@ msgstr "Actualizações de %1$s e amigos no %2$s!"
#: 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:132
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:136
#: actions/apigrouplistall.php:120 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:135
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
-#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184
-#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148
+#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:174
+#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173
+#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
-#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
+#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
msgid "API method not found."
msgstr "Método da API não encontrado."
@@ -228,8 +226,8 @@ msgstr "Método da API não encontrado."
#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65
-#: actions/apistatusesupdate.php:118
+#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
msgid "This method requires a POST."
msgstr "Este método requer um POST."
@@ -259,7 +257,7 @@ msgid "Could not save profile."
msgstr "Não foi possível gravar o perfil."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:97
+#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
#: actions/designadminpanel.php:122 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
@@ -346,7 +344,7 @@ msgstr "Nenhum estado encontrado com esse ID."
msgid "This status is already a favorite."
msgstr "Este estado já é um favorito."
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
msgid "Could not create favorite."
msgstr "Não foi possível criar o favorito."
@@ -464,7 +462,7 @@ msgstr "Grupo não foi encontrado!"
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:221
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
msgid "You have been blocked from that group by the admin."
msgstr "Foi bloqueado desse grupo pelo gestor."
@@ -482,11 +480,18 @@ msgstr "Não é membro deste grupo."
msgid "Could not remove user %1$s from group %2$s."
msgstr "Não foi possível remover %1$s do grupo %2$s."
-#: actions/apigrouplist.php:95
+#. TRANS: %s is a user name
+#: actions/apigrouplist.php:97
#, php-format
msgid "%s's groups"
msgstr "Grupos de %s"
+#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s
+#: actions/apigrouplist.php:107
+#, fuzzy, php-format
+msgid "%1$s groups %2$s is a member of."
+msgstr "Grupos de que %s é membro"
+
#: actions/apigrouplistall.php:90 actions/usergroups.php:62
#, php-format
msgid "%s groups"
@@ -515,7 +520,7 @@ msgstr "Tamanho inválido."
#: 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:337
+#: actions/profilesettings.php:194 actions/recoverpassword.php:350
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
@@ -576,15 +581,15 @@ msgid ""
"give access to your %4$s account to third parties you trust."
msgstr ""
-#: actions/apioauthauthorize.php:310 lib/action.php:438
+#: actions/apioauthauthorize.php:310 lib/action.php:437
msgid "Account"
msgstr "Conta"
#: actions/apioauthauthorize.php:313 actions/login.php:230
#: actions/profilesettings.php:106 actions/register.php:424
-#: actions/showgroup.php:244 actions/tagother.php:94
+#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
-#: lib/userprofile.php:131
+#: lib/userprofile.php:132
msgid "Nickname"
msgstr "Utilizador"
@@ -655,12 +660,12 @@ 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:108
+#: actions/apitimelinefavorites.php:109
#, php-format
msgid "%1$s / Favorites from %2$s"
msgstr "%1$s / Favoritas de %2$s"
-#: actions/apitimelinefavorites.php:117
+#: actions/apitimelinefavorites.php:118
#, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "%1$s actualizações preferidas por %2$s / %2$s."
@@ -670,7 +675,7 @@ msgstr "%1$s actualizações preferidas por %2$s / %2$s."
msgid "%1$s / Updates mentioning %2$s"
msgstr "%1$s / Actualizações que mencionam %2$s"
-#: actions/apitimelinementions.php:127
+#: actions/apitimelinementions.php:130
#, 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."
@@ -680,7 +685,7 @@ msgstr "%1$s actualizações em resposta a actualizações de %2$s / %3$s."
msgid "%s public timeline"
msgstr "Notas públicas de %s"
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "%s actualizações de todos!"
@@ -693,14 +698,14 @@ msgstr "Repetida para %s"
#: actions/apitimelineretweetsofme.php:114
#, php-format
msgid "Repeats of %s"
-msgstr "Repetências de %s"
+msgstr "Repetições de %s"
-#: actions/apitimelinetag.php:102 actions/tag.php:67
+#: actions/apitimelinetag.php:104 actions/tag.php:67
#, php-format
msgid "Notices tagged with %s"
msgstr "Notas categorizadas com %s"
-#: actions/apitimelinetag.php:104 actions/tagrss.php:65
+#: actions/apitimelinetag.php:106 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!"
@@ -728,7 +733,7 @@ msgstr "Tamanho não definido."
msgid "Invalid size."
msgstr "Tamanho inválido."
-#: actions/avatarsettings.php:67 actions/showgroup.php:229
+#: actions/avatarsettings.php:67 actions/showgroup.php:230
#: lib/accountsettingsaction.php:112
msgid "Avatar"
msgstr "Avatar"
@@ -760,7 +765,7 @@ msgid "Preview"
msgstr "Antevisão"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:655
+#: lib/deleteuserform.php:66 lib/noticelist.php:659
msgid "Delete"
msgstr "Apagar"
@@ -772,23 +777,28 @@ msgstr "Carregar"
msgid "Crop"
msgstr "Cortar"
-#: actions/avatarsettings.php:328
+#: actions/avatarsettings.php:305
+#, fuzzy
+msgid "No file uploaded."
+msgstr "Não foi especificado um perfil."
+
+#: actions/avatarsettings.php:332
msgid "Pick a square area of the image to be your avatar"
msgstr "Escolha uma área quadrada da imagem para ser o seu avatar"
-#: actions/avatarsettings.php:343 actions/grouplogo.php:380
+#: actions/avatarsettings.php:347 actions/grouplogo.php:380
msgid "Lost our file data."
msgstr "Perdi os dados do nosso ficheiro."
-#: actions/avatarsettings.php:366
+#: actions/avatarsettings.php:370
msgid "Avatar updated."
msgstr "Avatar actualizado."
-#: actions/avatarsettings.php:369
+#: actions/avatarsettings.php:373
msgid "Failed updating avatar."
msgstr "Falha ao actualizar avatar."
-#: actions/avatarsettings.php:393
+#: actions/avatarsettings.php:397
msgid "Avatar deleted."
msgstr "Avatar apagado."
@@ -843,8 +853,8 @@ msgstr "Não foi possível gravar informação do bloqueio."
#: actions/groupunblock.php:86 actions/joingroup.php:82
#: actions/joingroup.php:93 actions/leavegroup.php:82
#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212
-#: lib/command.php:260
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162
+#: lib/command.php:358
msgid "No such group."
msgstr "Grupo não foi encontrado."
@@ -927,7 +937,7 @@ msgid "Conversation"
msgstr "Conversação"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:218 lib/searchgroupnav.php:82
+#: lib/profileaction.php:224 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "Notas"
@@ -949,7 +959,7 @@ msgstr "Não é membro deste grupo."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1217
+#: lib/action.php:1219
msgid "There was a problem with your session token."
msgstr "Ocorreu um problema com a sua sessão."
@@ -1013,7 +1023,7 @@ msgstr "Tem a certeza de que quer apagar esta nota?"
msgid "Do not delete this notice"
msgstr "Não apagar esta nota"
-#: actions/deletenotice.php:146 lib/noticelist.php:655
+#: actions/deletenotice.php:146 lib/noticelist.php:659
msgid "Delete this notice"
msgstr "Apagar esta nota"
@@ -1150,7 +1160,7 @@ msgstr "Repor predefinição"
#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:208
+#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
#: actions/tagother.php:154 actions/useradminpanel.php:294
#: lib/applicationeditform.php:333 lib/applicationeditform.php:334
#: lib/designsettings.php:256 lib/groupeditform.php:202
@@ -1278,7 +1288,7 @@ msgstr "descrição é demasiada extensa (máx. %d caracteres)."
msgid "Could not update group."
msgstr "Não foi possível actualizar o grupo."
-#: actions/editgroup.php:264 classes/User_group.php:493
+#: actions/editgroup.php:264 classes/User_group.php:496
msgid "Could not create aliases."
msgstr "Não foi possível criar sinónimos."
@@ -1774,7 +1784,7 @@ msgstr "Notas de %s"
msgid "Updates from members of %1$s on %2$s!"
msgstr "Actualizações dos membros de %1$s em %2$s!"
-#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232
+#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244
#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr "Grupos"
@@ -1989,7 +1999,7 @@ msgstr "Convidar novos utilizadores"
msgid "You are already subscribed to these users:"
msgstr "Já subscreveu estes utilizadores:"
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
#, php-format
msgid "%1$s (%2$s)"
msgstr "%1$s (%2$s)"
@@ -2120,7 +2130,7 @@ msgstr "%1$s juntou-se ao grupo %2$s"
msgid "You must be logged in to leave a group."
msgstr "Precisa de iniciar uma sessão para deixar um grupo."
-#: actions/leavegroup.php:100 lib/command.php:265
+#: actions/leavegroup.php:100 lib/command.php:363
msgid "You are not a member of that group."
msgstr "Não é um membro desse grupo."
@@ -2239,12 +2249,12 @@ msgstr "Use este formulário para criar um grupo novo."
msgid "New message"
msgstr "Mensagem nova"
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
msgid "You can't send a message to this user."
msgstr "Não pode enviar uma mensagem a este utilizador."
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342
-#: lib/command.php:475
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
+#: lib/command.php:529
msgid "No content!"
msgstr "Sem conteúdo!"
@@ -2252,7 +2262,7 @@ msgstr "Sem conteúdo!"
msgid "No recipient specified."
msgstr "Não especificou um destinatário."
-#: actions/newmessage.php:164 lib/command.php:361
+#: actions/newmessage.php:164 lib/command.php:462
msgid ""
"Don't send a message to yourself; just say it to yourself quietly instead."
msgstr "Não auto-envie uma mensagem; basta lê-la baixinho a si próprio."
@@ -2266,7 +2276,7 @@ msgstr "Mensagem enviada"
msgid "Direct message to %s sent."
msgstr "Mensagem directa para %s foi enviada."
-#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189
msgid "Ajax Error"
msgstr "Erro do Ajax"
@@ -2274,7 +2284,7 @@ msgstr "Erro do Ajax"
msgid "New notice"
msgstr "Nota nova"
-#: actions/newnotice.php:211
+#: actions/newnotice.php:217
msgid "Notice posted"
msgstr "Nota publicada"
@@ -2388,7 +2398,7 @@ msgstr ""
msgid "Notice has no profile"
msgstr "Nota não tem perfil"
-#: actions/oembed.php:86 actions/shownotice.php:180
+#: actions/oembed.php:86 actions/shownotice.php:175
#, php-format
msgid "%1$s's status on %2$s"
msgstr "Estado de %1$s em %2$s"
@@ -2401,8 +2411,8 @@ msgstr "tipo de conteúdo "
msgid "Only "
msgstr "Apenas "
-#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042
-#: lib/apiaction.php:1070 lib/apiaction.php:1179
+#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1068
+#: lib/apiaction.php:1096 lib/apiaction.php:1212
msgid "Not a supported data format."
msgstr "Formato de dados não suportado."
@@ -2540,7 +2550,7 @@ msgstr "Senha antiga incorrecta."
msgid "Error saving user; invalid."
msgstr "Erro ao guardar utilizador; inválido."
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
msgid "Can't save new password."
msgstr "Não é possível guardar a nova senha."
@@ -2755,8 +2765,8 @@ 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/showgroup.php:255 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:149
+#: actions/showgroup.php:256 actions/tagother.php:104
+#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Nome completo"
@@ -2783,9 +2793,9 @@ msgid "Bio"
msgstr "Biografia"
#: actions/profilesettings.php:132 actions/register.php:471
-#: actions/showgroup.php:264 actions/tagother.php:112
+#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
-#: lib/userprofile.php:164
+#: lib/userprofile.php:165
msgid "Location"
msgstr "Localidade"
@@ -2799,7 +2809,7 @@ msgstr "Compartilhar a minha localização presente ao publicar notas"
#: actions/profilesettings.php:145 actions/tagother.php:149
#: actions/tagother.php:209 lib/subscriptionlist.php:106
-#: lib/subscriptionlist.php:108 lib/userprofile.php:209
+#: lib/subscriptionlist.php:108 lib/userprofile.php:210
msgid "Tags"
msgstr "Categorias"
@@ -3043,7 +3053,7 @@ msgstr "Reiniciar senha"
msgid "Recover password"
msgstr "Recuperar senha"
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
msgid "Password recovery requested"
msgstr "Solicitada recuperação da senha"
@@ -3063,20 +3073,20 @@ msgstr "Reiniciar"
msgid "Enter a nickname or email address."
msgstr "Introduza uma utilizador ou um endereço de correio electrónico."
-#: actions/recoverpassword.php:272
+#: actions/recoverpassword.php:282
msgid "No user with that email address or username."
msgstr ""
"Não existe nenhum utilizador com esse correio electrónico nem com esse nome."
-#: actions/recoverpassword.php:287
+#: actions/recoverpassword.php:299
msgid "No registered email address for that user."
msgstr "Nenhum endereço de email registado para esse utilizador."
-#: actions/recoverpassword.php:301
+#: actions/recoverpassword.php:313
msgid "Error saving address confirmation."
msgstr "Erro ao guardar confirmação do endereço."
-#: actions/recoverpassword.php:325
+#: actions/recoverpassword.php:338
msgid ""
"Instructions for recovering your password have been sent to the email "
"address registered to your account."
@@ -3084,23 +3094,23 @@ msgstr ""
"Instruções para recuperação da sua senha foram enviadas para o correio "
"electrónico registado na sua conta."
-#: actions/recoverpassword.php:344
+#: actions/recoverpassword.php:357
msgid "Unexpected password reset."
msgstr "Reinício inesperado da senha."
-#: actions/recoverpassword.php:352
+#: actions/recoverpassword.php:365
msgid "Password must be 6 chars or more."
msgstr "Senha tem de ter 6 ou mais caracteres."
-#: actions/recoverpassword.php:356
+#: actions/recoverpassword.php:369
msgid "Password and confirmation do not match."
msgstr "A senha e a confirmação não coincidem."
-#: actions/recoverpassword.php:375 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:248
msgid "Error setting user."
msgstr "Erro ao configurar utilizador."
-#: actions/recoverpassword.php:382
+#: actions/recoverpassword.php:395
msgid "New password successfully saved. You are now logged in."
msgstr "A senha nova foi gravada com sucesso. Iniciou uma sessão."
@@ -3264,7 +3274,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "URL do seu perfil noutro serviço de microblogues compatível"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:394
+#: lib/userprofile.php:406
msgid "Subscribe"
msgstr "Subscrever"
@@ -3302,7 +3312,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:674
+#: actions/repeat.php:114 lib/noticelist.php:678
msgid "Repeated"
msgstr "Repetida"
@@ -3451,8 +3461,8 @@ msgstr "Paginação"
msgid "Description"
msgstr "Descrição"
-#: actions/showapplication.php:192 actions/showgroup.php:438
-#: lib/profileaction.php:176
+#: actions/showapplication.php:192 actions/showgroup.php:439
+#: lib/profileaction.php:182
msgid "Statistics"
msgstr "Estatísticas"
@@ -3572,67 +3582,67 @@ msgstr "Grupo %s"
msgid "%1$s group, page %2$d"
msgstr "Membros do grupo %1$s, página %2$d"
-#: actions/showgroup.php:226
+#: actions/showgroup.php:227
msgid "Group profile"
msgstr "Perfil do grupo"
-#: actions/showgroup.php:271 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:177
+#: actions/showgroup.php:272 actions/tagother.php:118
+#: actions/userauthorization.php:175 lib/userprofile.php:178
msgid "URL"
msgstr "URL"
-#: actions/showgroup.php:282 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:194
+#: actions/showgroup.php:283 actions/tagother.php:128
+#: actions/userauthorization.php:187 lib/userprofile.php:195
msgid "Note"
msgstr "Anotação"
-#: actions/showgroup.php:292 lib/groupeditform.php:184
+#: actions/showgroup.php:293 lib/groupeditform.php:184
msgid "Aliases"
msgstr "Sinónimos"
-#: actions/showgroup.php:301
+#: actions/showgroup.php:302
msgid "Group actions"
msgstr "Acções do grupo"
-#: actions/showgroup.php:337
+#: actions/showgroup.php:338
#, php-format
msgid "Notice feed for %s group (RSS 1.0)"
msgstr "Fonte de notas do grupo %s (RSS 1.0)"
-#: actions/showgroup.php:343
+#: actions/showgroup.php:344
#, php-format
msgid "Notice feed for %s group (RSS 2.0)"
msgstr "Fonte de notas do grupo %s (RSS 2.0)"
-#: actions/showgroup.php:349
+#: actions/showgroup.php:350
#, php-format
msgid "Notice feed for %s group (Atom)"
msgstr "Fonte de notas do grupo %s (Atom)"
-#: actions/showgroup.php:354
+#: actions/showgroup.php:355
#, php-format
msgid "FOAF for %s group"
msgstr "FOAF do grupo %s"
-#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91
+#: actions/showgroup.php:391 actions/showgroup.php:448 lib/groupnav.php:91
msgid "Members"
msgstr "Membros"
-#: actions/showgroup.php:395 lib/profileaction.php:117
-#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95
-#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71
+#: actions/showgroup.php:396 lib/profileaction.php:117
+#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95
+#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
msgid "(None)"
msgstr "(Nenhum)"
-#: actions/showgroup.php:401
+#: actions/showgroup.php:402
msgid "All members"
msgstr "Todos os membros"
-#: actions/showgroup.php:441
+#: actions/showgroup.php:442
msgid "Created"
msgstr "Criado"
-#: actions/showgroup.php:457
+#: actions/showgroup.php:458
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3648,7 +3658,7 @@ msgstr ""
"[Registe-se agora](%%action.register%%) para se juntar a este grupo e a "
"muitos mais! ([Saber mais](%%doc.help%%))"
-#: actions/showgroup.php:463
+#: actions/showgroup.php:464
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3661,7 +3671,7 @@ msgstr ""
"programa de Software Livre [StatusNet](http://status.net/). Os membros deste "
"grupo partilham mensagens curtas acerca das suas vidas e interesses. "
-#: actions/showgroup.php:491
+#: actions/showgroup.php:492
msgid "Admins"
msgstr "Gestores"
@@ -3700,7 +3710,7 @@ msgstr "Perfis bloqueados de %1$s, página %2$d"
#: actions/showstream.php:122
#, php-format
msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
-msgstr "Feed de notas de %1$s com a categoria %2$s (RSS 1.0)"
+msgstr "Fonte de notas de %1$s com a categoria %2$s (RSS 1.0)"
#: actions/showstream.php:129
#, php-format
@@ -3772,7 +3782,7 @@ msgstr ""
#: actions/showstream.php:305
#, php-format
msgid "Repeat of %s"
-msgstr "Repetência de %s"
+msgstr "Repetições de %s"
#: actions/silence.php:65 actions/unsilence.php:65
msgid "You cannot silence users on this site."
@@ -3801,7 +3811,8 @@ msgid "Unknown language \"%s\"."
msgstr "Língua desconhecida \"%s\"."
#: actions/siteadminpanel.php:165
-msgid "Minimum text limit is 140 characters."
+#, fuzzy
+msgid "Minimum text limit is 0 (unlimited)."
msgstr "O valor mínimo de limite para o texto é 140 caracteres."
#: actions/siteadminpanel.php:171
@@ -4080,8 +4091,7 @@ msgstr "Gravar configurações do site"
msgid "You are not subscribed to that profile."
msgstr "Não subscreveu esse perfil."
-#: actions/subedit.php:83 classes/Subscription.php:89
-#: classes/Subscription.php:116
+#: actions/subedit.php:83 classes/Subscription.php:132
msgid "Could not save subscription."
msgstr "Não foi possível gravar a subscrição."
@@ -4184,11 +4194,11 @@ msgstr ""
msgid "%s is not listening to anyone."
msgstr "%s não está a ouvir ninguém."
-#: actions/subscriptions.php:199
+#: actions/subscriptions.php:208
msgid "Jabber"
msgstr "Jabber"
-#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:222 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr "SMS"
@@ -4221,12 +4231,12 @@ msgstr "Argumento de identificação (ID) em falta."
msgid "Tag %s"
msgstr "Categoria %s"
-#: actions/tagother.php:77 lib/userprofile.php:75
+#: actions/tagother.php:77 lib/userprofile.php:76
msgid "User profile"
msgstr "Perfil"
#: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:102
+#: lib/userprofile.php:103
msgid "Photo"
msgstr "Foto"
@@ -4559,7 +4569,7 @@ msgstr ""
msgid "Plugins"
msgstr "Plugins"
-#: actions/version.php:196 lib/action.php:767
+#: actions/version.php:196 lib/action.php:766
msgid "Version"
msgstr "Versão"
@@ -4567,7 +4577,7 @@ msgstr "Versão"
msgid "Author(s)"
msgstr "Autores"
-#: classes/File.php:144
+#: classes/File.php:169
#, php-format
msgid ""
"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
@@ -4576,13 +4586,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:154
+#: classes/File.php:179
#, 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:161
+#: classes/File.php:186
#, 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."
@@ -4624,27 +4634,27 @@ msgstr "Não foi possível inserir a mensagem."
msgid "Could not update message with new URI."
msgstr "Não foi possível actualizar a mensagem com a nova URI."
-#: classes/Notice.php:172
+#: classes/Notice.php:175
#, php-format
msgid "DB error inserting hashtag: %s"
msgstr "Erro na base de dados ao inserir a marca: %s"
-#: classes/Notice.php:241
+#: classes/Notice.php:244
msgid "Problem saving notice. Too long."
msgstr "Problema na gravação da nota. Demasiado longa."
-#: classes/Notice.php:245
+#: classes/Notice.php:248
msgid "Problem saving notice. Unknown user."
msgstr "Problema na gravação da nota. Utilizador desconhecido."
-#: classes/Notice.php:250
+#: classes/Notice.php:253
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:256
+#: classes/Notice.php:259
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
@@ -4652,72 +4662,72 @@ msgstr ""
"Demasiadas mensagens duplicadas, demasiado rápido; descanse e volte a "
"publicar daqui a alguns minutos."
-#: classes/Notice.php:262
+#: classes/Notice.php:265
msgid "You are banned from posting notices on this site."
msgstr "Está proibido de publicar notas neste site."
-#: classes/Notice.php:328 classes/Notice.php:354
+#: classes/Notice.php:331 classes/Notice.php:357
msgid "Problem saving notice."
msgstr "Problema na gravação da nota."
-#: classes/Notice.php:927
+#: classes/Notice.php:943
#, fuzzy
msgid "Problem saving group inbox."
msgstr "Problema na gravação da nota."
-#: classes/Notice.php:1459
+#: classes/Notice.php:1481
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
-#: classes/Subscription.php:66 lib/oauthstore.php:465
+#: classes/Subscription.php:74 lib/oauthstore.php:465
msgid "You have been banned from subscribing."
msgstr "Foi bloqueado de fazer subscrições"
-#: classes/Subscription.php:70
+#: classes/Subscription.php:78
msgid "Already subscribed!"
msgstr "Já subscrito!"
-#: classes/Subscription.php:74
+#: classes/Subscription.php:82
msgid "User has blocked you."
msgstr "O utilizador bloqueou-o."
-#: classes/Subscription.php:157
+#: classes/Subscription.php:167
msgid "Not subscribed!"
msgstr "Não subscrito!"
-#: classes/Subscription.php:163
+#: classes/Subscription.php:173
msgid "Couldn't delete self-subscription."
msgstr "Não foi possível apagar a auto-subscrição."
-#: classes/Subscription.php:190
+#: classes/Subscription.php:200
#, fuzzy
msgid "Couldn't delete subscription OMB token."
msgstr "Não foi possível apagar a subscrição."
-#: classes/Subscription.php:201 lib/subs.php:69
+#: classes/Subscription.php:211
msgid "Couldn't delete subscription."
msgstr "Não foi possível apagar a subscrição."
-#: classes/User.php:373
+#: classes/User.php:363
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "%1$s dá-lhe as boas-vindas, @%2$s!"
-#: classes/User_group.php:477
+#: classes/User_group.php:480
msgid "Could not create group."
msgstr "Não foi possível criar o grupo."
-#: classes/User_group.php:486
+#: classes/User_group.php:489
#, fuzzy
msgid "Could not set group URI."
msgstr "Não foi possível configurar membros do grupo."
-#: classes/User_group.php:507
+#: classes/User_group.php:510
msgid "Could not set group membership."
msgstr "Não foi possível configurar membros do grupo."
-#: classes/User_group.php:521
+#: classes/User_group.php:524
#, fuzzy
msgid "Could not save local group info."
msgstr "Não foi possível gravar a subscrição."
@@ -4759,127 +4769,127 @@ msgstr "%1$s (%2$s)"
msgid "Untitled page"
msgstr "Página sem título"
-#: lib/action.php:424
+#: lib/action.php:423
msgid "Primary site navigation"
msgstr "Navegação primária deste site"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:430
+#: lib/action.php:429
#, fuzzy
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr "Perfil pessoal e notas dos amigos"
-#: lib/action.php:433
+#: lib/action.php:432
#, fuzzy
msgctxt "MENU"
msgid "Personal"
msgstr "Pessoal"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:435
+#: lib/action.php:434
#, fuzzy
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "Altere o seu endereço electrónico, avatar, senha, perfil"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:440
+#: lib/action.php:439
#, fuzzy
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "Ligar aos serviços"
-#: lib/action.php:443
+#: lib/action.php:442
msgid "Connect"
msgstr "Ligar"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:446
+#: lib/action.php:445
#, fuzzy
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "Alterar a configuração do site"
-#: lib/action.php:449
+#: lib/action.php:448
#, fuzzy
msgctxt "MENU"
msgid "Admin"
msgstr "Gestor"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:453
+#: lib/action.php:452
#, fuzzy, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "Convidar amigos e colegas para se juntarem a si em %s"
-#: lib/action.php:456
+#: lib/action.php:455
#, fuzzy
msgctxt "MENU"
msgid "Invite"
msgstr "Convidar"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:462
+#: lib/action.php:461
#, fuzzy
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "Terminar esta sessão"
-#: lib/action.php:465
+#: lib/action.php:464
#, fuzzy
msgctxt "MENU"
msgid "Logout"
msgstr "Sair"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:470
+#: lib/action.php:469
#, fuzzy
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Criar uma conta"
-#: lib/action.php:473
+#: lib/action.php:472
#, fuzzy
msgctxt "MENU"
msgid "Register"
msgstr "Registar"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:476
+#: lib/action.php:475
#, fuzzy
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Iniciar uma sessão"
-#: lib/action.php:479
+#: lib/action.php:478
#, fuzzy
msgctxt "MENU"
msgid "Login"
msgstr "Entrar"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:482
+#: lib/action.php:481
#, fuzzy
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Ajudem-me!"
-#: lib/action.php:485
+#: lib/action.php:484
#, fuzzy
msgctxt "MENU"
msgid "Help"
msgstr "Ajuda"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:488
+#: lib/action.php:487
#, fuzzy
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "Procurar pessoas ou pesquisar texto"
-#: lib/action.php:491
+#: lib/action.php:490
#, fuzzy
msgctxt "MENU"
msgid "Search"
@@ -4887,59 +4897,59 @@ msgstr "Pesquisa"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:513 lib/adminpanelaction.php:398
+#: lib/action.php:512 lib/adminpanelaction.php:398
msgid "Site notice"
msgstr "Aviso do site"
-#: lib/action.php:579
+#: lib/action.php:578
msgid "Local views"
msgstr "Vistas locais"
-#: lib/action.php:645
+#: lib/action.php:644
msgid "Page notice"
msgstr "Aviso da página"
-#: lib/action.php:747
+#: lib/action.php:746
msgid "Secondary site navigation"
msgstr "Navegação secundária deste site"
-#: lib/action.php:752
+#: lib/action.php:751
msgid "Help"
msgstr "Ajuda"
-#: lib/action.php:754
+#: lib/action.php:753
msgid "About"
msgstr "Sobre"
-#: lib/action.php:756
+#: lib/action.php:755
msgid "FAQ"
msgstr "FAQ"
-#: lib/action.php:760
+#: lib/action.php:759
msgid "TOS"
msgstr "Termos"
-#: lib/action.php:763
+#: lib/action.php:762
msgid "Privacy"
msgstr "Privacidade"
-#: lib/action.php:765
+#: lib/action.php:764
msgid "Source"
msgstr "Código"
-#: lib/action.php:769
+#: lib/action.php:768
msgid "Contact"
msgstr "Contacto"
-#: lib/action.php:771
+#: lib/action.php:770
msgid "Badge"
msgstr "Emblema"
-#: lib/action.php:799
+#: lib/action.php:798
msgid "StatusNet software license"
msgstr "Licença de software do StatusNet"
-#: lib/action.php:802
+#: lib/action.php:803
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4948,12 +4958,12 @@ msgstr ""
"**%%site.name%%** é um serviço de microblogues disponibilizado por [%%site."
"broughtby%%](%%site.broughtbyurl%%). "
-#: lib/action.php:804
+#: lib/action.php:805
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** é um serviço de microblogues. "
-#: lib/action.php:806
+#: lib/action.php:808
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4964,53 +4974,57 @@ msgstr ""
"disponibilizado nos termos da [GNU Affero General Public License](http://www."
"fsf.org/licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:821
+#: lib/action.php:823
msgid "Site content license"
msgstr "Licença de conteúdos do site"
-#: lib/action.php:826
+#: lib/action.php:828
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
-#: lib/action.php:831
+#: lib/action.php:833
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
-#: lib/action.php:834
+#: lib/action.php:836
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
-#: lib/action.php:847
+#: lib/action.php:849
msgid "All "
msgstr "Tudo "
-#: lib/action.php:853
+#: lib/action.php:855
msgid "license."
msgstr "licença."
-#: lib/action.php:1152
+#: lib/action.php:1154
msgid "Pagination"
msgstr "Paginação"
-#: lib/action.php:1161
+#: lib/action.php:1163
msgid "After"
msgstr "Posteriores"
-#: lib/action.php:1169
+#: lib/action.php:1171
msgid "Before"
msgstr "Anteriores"
-#: lib/activity.php:453
+#: lib/activity.php:120
+msgid "Expecting a root feed element but got a whole XML document."
+msgstr ""
+
+#: lib/activityutils.php:208
msgid "Can't handle remote content yet."
msgstr ""
-#: lib/activity.php:481
+#: lib/activityutils.php:236
msgid "Can't handle embedded XML content yet."
msgstr ""
-#: lib/activity.php:485
+#: lib/activityutils.php:240
msgid "Can't handle embedded Base64 content yet."
msgstr ""
@@ -5107,7 +5121,7 @@ msgstr "Configuração das localizações"
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
-#: lib/apiauth.php:272
+#: lib/apiauth.php:276
#, php-format
msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s"
msgstr ""
@@ -5186,11 +5200,11 @@ msgstr "Remover"
msgid "Attachments"
msgstr "Anexos"
-#: lib/attachmentlist.php:265
+#: lib/attachmentlist.php:263
msgid "Author"
msgstr "Autor"
-#: lib/attachmentlist.php:278
+#: lib/attachmentlist.php:276
msgid "Provider"
msgstr "Fornecedor"
@@ -5210,37 +5224,50 @@ msgstr "Não foi possível mudar a palavra-chave"
msgid "Password changing is not allowed"
msgstr "Não é permitido mudar a palavra-chave"
-#: lib/channel.php:138 lib/channel.php:158
+#: lib/channel.php:157 lib/channel.php:177
msgid "Command results"
msgstr "Resultados do comando"
-#: lib/channel.php:210 lib/mailhandler.php:142
+#: lib/channel.php:229 lib/mailhandler.php:142
msgid "Command complete"
msgstr "Comando terminado"
-#: lib/channel.php:221
+#: lib/channel.php:240
msgid "Command failed"
msgstr "Comando falhou"
-#: lib/command.php:44
-msgid "Sorry, this command is not yet implemented."
-msgstr "Desculpe, este comando ainda não foi implementado."
+#: lib/command.php:83 lib/command.php:105
+msgid "Notice with that id does not exist"
+msgstr "Não existe nenhuma nota com essa identificação"
-#: lib/command.php:88
+#: lib/command.php:99 lib/command.php:570
+msgid "User has no last notice"
+msgstr "Utilizador não tem nenhuma última nota"
+
+#: lib/command.php:125
#, php-format
msgid "Could not find a user with nickname %s"
msgstr "Não foi encontrado um utilizador com a alcunha %s"
-#: lib/command.php:92
+#: lib/command.php:143
+#, fuzzy, php-format
+msgid "Could not find a local user with nickname %s"
+msgstr "Não foi encontrado um utilizador com a alcunha %s"
+
+#: lib/command.php:176
+msgid "Sorry, this command is not yet implemented."
+msgstr "Desculpe, este comando ainda não foi implementado."
+
+#: lib/command.php:221
msgid "It does not make a lot of sense to nudge yourself!"
msgstr "Não faz muito sentido tocar-nos a nós mesmos!"
-#: lib/command.php:99
+#: lib/command.php:228
#, php-format
msgid "Nudge sent to %s"
msgstr "Cotovelada enviada a %s"
-#: lib/command.php:126
+#: lib/command.php:254
#, php-format
msgid ""
"Subscriptions: %1$s\n"
@@ -5251,198 +5278,196 @@ msgstr ""
"Subscritores: %2$s\n"
"Notas: %3$s"
-#: lib/command.php:152 lib/command.php:390 lib/command.php:451
-msgid "Notice with that id does not exist"
-msgstr "Não existe nenhuma nota com essa identificação"
-
-#: lib/command.php:168 lib/command.php:406 lib/command.php:467
-#: lib/command.php:523
-msgid "User has no last notice"
-msgstr "Utilizador não tem nenhuma última nota"
-
-#: lib/command.php:190
+#: lib/command.php:296
msgid "Notice marked as fave."
msgstr "Nota marcada como favorita."
-#: lib/command.php:217
+#: lib/command.php:317
msgid "You are already a member of that group"
msgstr "Já é membro desse grupo"
-#: lib/command.php:231
+#: lib/command.php:331
#, php-format
msgid "Could not join user %s to group %s"
msgstr "Não foi possível juntar o utilizador %s ao grupo %s"
-#: lib/command.php:236
+#: lib/command.php:336
#, php-format
msgid "%s joined group %s"
msgstr "%s juntou-se ao grupo %s"
-#: lib/command.php:275
+#: lib/command.php:373
#, php-format
msgid "Could not remove user %s to group %s"
msgstr "Não foi possível remover o utilizador %s do grupo %s"
-#: lib/command.php:280
+#: lib/command.php:378
#, php-format
msgid "%s left group %s"
msgstr "%s deixou o grupo %s"
-#: lib/command.php:309
+#: lib/command.php:401
#, php-format
msgid "Fullname: %s"
msgstr "Nome completo: %s"
-#: lib/command.php:312 lib/mail.php:258
+#: lib/command.php:404 lib/mail.php:258
#, php-format
msgid "Location: %s"
msgstr "Localidade: %s"
-#: lib/command.php:315 lib/mail.php:260
+#: lib/command.php:407 lib/mail.php:260
#, php-format
msgid "Homepage: %s"
msgstr "Página pessoal: %s"
-#: lib/command.php:318
+#: lib/command.php:410
#, php-format
msgid "About: %s"
msgstr "Sobre: %s"
-#: lib/command.php:349
+#: lib/command.php:437
+#, php-format
+msgid ""
+"%s is a remote profile; you can only send direct messages to users on the "
+"same server."
+msgstr ""
+
+#: lib/command.php:450
#, php-format
msgid "Message too long - maximum is %d characters, you sent %d"
msgstr "Mensagem demasiado extensa - máx. %d caracteres, enviou %d"
-#: lib/command.php:367
+#: lib/command.php:468
#, php-format
msgid "Direct message to %s sent"
msgstr "Mensagem directa para %s enviada"
-#: lib/command.php:369
+#: lib/command.php:470
msgid "Error sending direct message."
msgstr "Erro no envio da mensagem directa."
-#: lib/command.php:413
+#: lib/command.php:490
msgid "Cannot repeat your own notice"
msgstr "Não pode repetir a sua própria nota"
-#: lib/command.php:418
+#: lib/command.php:495
msgid "Already repeated that notice"
msgstr "Já repetiu essa nota"
-#: lib/command.php:426
+#: lib/command.php:503
#, php-format
msgid "Notice from %s repeated"
msgstr "Nota de %s repetida"
-#: lib/command.php:428
+#: lib/command.php:505
msgid "Error repeating notice."
msgstr "Erro ao repetir nota."
-#: lib/command.php:482
+#: lib/command.php:536
#, php-format
msgid "Notice too long - maximum is %d characters, you sent %d"
msgstr "Nota demasiado extensa - máx. %d caracteres, enviou %d"
-#: lib/command.php:491
+#: lib/command.php:545
#, php-format
msgid "Reply to %s sent"
msgstr "Resposta a %s enviada"
-#: lib/command.php:493
+#: lib/command.php:547
msgid "Error saving notice."
msgstr "Erro ao gravar nota."
-#: lib/command.php:547
+#: lib/command.php:594
msgid "Specify the name of the user to subscribe to"
msgstr "Introduza o nome do utilizador para subscrever"
-#: lib/command.php:554 lib/command.php:589
+#: lib/command.php:602
#, fuzzy
-msgid "No such user"
-msgstr "Utilizador não encontrado."
+msgid "Can't subscribe to OMB profiles by command."
+msgstr "Não subscreveu esse perfil."
-#: lib/command.php:561
+#: lib/command.php:608
#, php-format
msgid "Subscribed to %s"
msgstr "Subscreveu %s"
-#: lib/command.php:582 lib/command.php:685
+#: lib/command.php:629 lib/command.php:728
msgid "Specify the name of the user to unsubscribe from"
msgstr "Introduza o nome do utilizador para deixar de subscrever"
-#: lib/command.php:595
+#: lib/command.php:638
#, php-format
msgid "Unsubscribed from %s"
msgstr "Deixou de subscrever %s"
-#: lib/command.php:613 lib/command.php:636
+#: lib/command.php:656 lib/command.php:679
msgid "Command not yet implemented."
msgstr "Comando ainda não implementado."
-#: lib/command.php:616
+#: lib/command.php:659
msgid "Notification off."
msgstr "Notificação desligada."
-#: lib/command.php:618
+#: lib/command.php:661
msgid "Can't turn off notification."
msgstr "Não foi possível desligar a notificação."
-#: lib/command.php:639
+#: lib/command.php:682
msgid "Notification on."
msgstr "Notificação ligada."
-#: lib/command.php:641
+#: lib/command.php:684
msgid "Can't turn on notification."
msgstr "Não foi possível ligar a notificação."
-#: lib/command.php:654
+#: lib/command.php:697
msgid "Login command is disabled"
msgstr "Comando para iniciar sessão foi desactivado"
-#: lib/command.php:665
+#: lib/command.php:708
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
"Esta ligação é utilizável uma única vez e só durante os próximos 2 minutos: %"
"s"
-#: lib/command.php:692
+#: lib/command.php:735
#, fuzzy, php-format
msgid "Unsubscribed %s"
msgstr "Deixou de subscrever %s"
-#: lib/command.php:709
+#: lib/command.php:752
msgid "You are not subscribed to anyone."
msgstr "Não subscreveu ninguém."
-#: lib/command.php:711
+#: lib/command.php:754
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Subscreveu esta pessoa:"
msgstr[1] "Subscreveu estas pessoas:"
-#: lib/command.php:731
+#: lib/command.php:774
msgid "No one is subscribed to you."
msgstr "Ninguém subscreve as suas notas."
-#: lib/command.php:733
+#: lib/command.php:776
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Esta pessoa subscreve as suas notas:"
msgstr[1] "Estas pessoas subscrevem as suas notas:"
-#: lib/command.php:753
+#: lib/command.php:796
msgid "You are not a member of any groups."
msgstr "Não está em nenhum grupo."
-#: lib/command.php:755
+#: lib/command.php:798
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Está no grupo:"
msgstr[1] "Está nos grupos:"
-#: lib/command.php:769
+#: lib/command.php:812
#, fuzzy
msgid ""
"Commands:\n"
@@ -5522,19 +5547,19 @@ msgstr ""
"tracks - ainda não implementado.\n"
"tracking - ainda não implementado.\n"
-#: lib/common.php:148
+#: lib/common.php:135
msgid "No configuration file found. "
msgstr "Ficheiro de configuração não encontrado. "
-#: lib/common.php:149
+#: lib/common.php:136
msgid "I looked for configuration files in the following places: "
msgstr "Procurei ficheiros de configuração nos seguintes sítios: "
-#: lib/common.php:151
+#: lib/common.php:138
msgid "You may wish to run the installer to fix this."
msgstr "Talvez queira correr o instalador para resolver esta questão."
-#: lib/common.php:152
+#: lib/common.php:139
msgid "Go to the installer."
msgstr "Ir para o instalador."
@@ -5712,49 +5737,49 @@ msgstr "Categorias nas notas do grupo %s"
msgid "This page is not available in a media type you accept"
msgstr "Esta página não está disponível num formato que você aceite"
-#: lib/imagefile.php:75
+#: lib/imagefile.php:72
+msgid "Unsupported image file format."
+msgstr "Formato do ficheiro da imagem não é suportado."
+
+#: lib/imagefile.php:88
#, php-format
msgid "That file is too big. The maximum file size is %s."
msgstr "Esse ficheiro é demasiado grande. O tamanho máximo de ficheiro é %s."
-#: lib/imagefile.php:80
+#: lib/imagefile.php:93
msgid "Partial upload."
msgstr "Transferência parcial."
-#: lib/imagefile.php:88 lib/mediafile.php:170
+#: lib/imagefile.php:101 lib/mediafile.php:170
msgid "System error uploading file."
msgstr "Ocorreu um erro de sistema ao transferir o ficheiro."
-#: lib/imagefile.php:96
+#: lib/imagefile.php:109
msgid "Not an image or corrupt file."
msgstr "Ficheiro não é uma imagem ou está corrompido."
-#: lib/imagefile.php:109
-msgid "Unsupported image file format."
-msgstr "Formato do ficheiro da imagem não é suportado."
-
#: lib/imagefile.php:122
msgid "Lost our file."
msgstr "Perdi o nosso ficheiro."
-#: lib/imagefile.php:166 lib/imagefile.php:231
+#: lib/imagefile.php:163 lib/imagefile.php:224
msgid "Unknown file type"
msgstr "Tipo do ficheiro é desconhecido"
-#: lib/imagefile.php:251
+#: lib/imagefile.php:244
msgid "MB"
msgstr "MB"
-#: lib/imagefile.php:253
+#: lib/imagefile.php:246
msgid "kB"
msgstr "kB"
-#: lib/jabber.php:220
+#: lib/jabber.php:387
#, php-format
msgid "[%s]"
msgstr "[%s]"
-#: lib/jabber.php:400
+#: lib/jabber.php:567
#, fuzzy, php-format
msgid "Unknown inbox source %d."
msgstr "Língua desconhecida \"%s\"."
@@ -6035,7 +6060,7 @@ msgstr ""
"conversa com outros utilizadores. Outros podem enviar-lhe mensagens, a que "
"só você terá acesso."
-#: lib/mailbox.php:227 lib/noticelist.php:482
+#: lib/mailbox.php:227 lib/noticelist.php:486
msgid "from"
msgstr "de"
@@ -6166,48 +6191,48 @@ msgid ""
"try again later"
msgstr ""
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "N"
msgstr "N"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "S"
msgstr "S"
-#: lib/noticelist.php:431
+#: lib/noticelist.php:432
msgid "E"
msgstr "E"
-#: lib/noticelist.php:431
+#: lib/noticelist.php:432
msgid "W"
msgstr "O"
-#: lib/noticelist.php:438
+#: lib/noticelist.php:439
msgid "at"
msgstr "coords."
-#: lib/noticelist.php:566
+#: lib/noticelist.php:570
msgid "in context"
msgstr "no contexto"
-#: lib/noticelist.php:601
+#: lib/noticelist.php:605
msgid "Repeated by"
msgstr "Repetida por"
-#: lib/noticelist.php:628
+#: lib/noticelist.php:632
msgid "Reply to this notice"
msgstr "Responder a esta nota"
-#: lib/noticelist.php:629
+#: lib/noticelist.php:633
msgid "Reply"
msgstr "Responder"
-#: lib/noticelist.php:673
+#: lib/noticelist.php:677
msgid "Notice repeated"
msgstr "Nota repetida"
@@ -6280,7 +6305,7 @@ msgstr "Categorias nas notas de %s"
msgid "Unknown"
msgstr "Desconhecida"
-#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr "Subscrições"
@@ -6288,7 +6313,7 @@ msgstr "Subscrições"
msgid "All subscriptions"
msgstr "Todas as subscrições"
-#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90
+#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr "Subscritores"
@@ -6296,15 +6321,20 @@ msgstr "Subscritores"
msgid "All subscribers"
msgstr "Todos os subscritores"
-#: lib/profileaction.php:180
+#: lib/profileaction.php:186
msgid "User ID"
msgstr "ID do utilizador"
-#: lib/profileaction.php:185
+#: lib/profileaction.php:191
msgid "Member since"
msgstr "Membro desde"
-#: lib/profileaction.php:247
+#. TRANS: Average count of posts made per day since account registration
+#: lib/profileaction.php:230
+msgid "Daily average"
+msgstr ""
+
+#: lib/profileaction.php:259
msgid "All groups"
msgstr "Todos os grupos"
@@ -6349,7 +6379,7 @@ msgstr "Repetir esta nota"
msgid "Revoke the \"%s\" role from this user"
msgstr "Bloquear acesso deste utilizador a este grupo"
-#: lib/router.php:671
+#: lib/router.php:704
msgid "No single user defined for single-user mode."
msgstr ""
@@ -6475,92 +6505,101 @@ msgstr "Deixar de subscrever este utilizador"
msgid "Unsubscribe"
msgstr "Abandonar"
-#: lib/userprofile.php:116
+#: lib/usernoprofileexception.php:58
+#, fuzzy, php-format
+msgid "User %s (%d) has no profile record."
+msgstr "Utilizador não tem perfil."
+
+#: lib/userprofile.php:117
msgid "Edit Avatar"
msgstr "Editar Avatar"
-#: lib/userprofile.php:236
+#: lib/userprofile.php:234 lib/userprofile.php:248
msgid "User actions"
msgstr "Acções do utilizador"
-#: lib/userprofile.php:251
+#: lib/userprofile.php:237
+msgid "User deletion in progress..."
+msgstr ""
+
+#: lib/userprofile.php:263
msgid "Edit profile settings"
msgstr "Editar configurações do perfil"
-#: lib/userprofile.php:252
+#: lib/userprofile.php:264
msgid "Edit"
msgstr "Editar"
-#: lib/userprofile.php:275
+#: lib/userprofile.php:287
msgid "Send a direct message to this user"
msgstr "Enviar mensagem directa a este utilizador"
-#: lib/userprofile.php:276
+#: lib/userprofile.php:288
msgid "Message"
msgstr "Mensagem"
-#: lib/userprofile.php:314
+#: lib/userprofile.php:326
msgid "Moderate"
msgstr "Moderar"
-#: lib/userprofile.php:352
+#: lib/userprofile.php:364
#, fuzzy
msgid "User role"
msgstr "Perfil"
-#: lib/userprofile.php:354
+#: lib/userprofile.php:366
#, fuzzy
msgctxt "role"
msgid "Administrator"
msgstr "Gestores"
-#: lib/userprofile.php:355
+#: lib/userprofile.php:367
#, fuzzy
msgctxt "role"
msgid "Moderator"
msgstr "Moderar"
-#: lib/util.php:1015
+#: lib/util.php:1046
msgid "a few seconds ago"
msgstr "há alguns segundos"
-#: lib/util.php:1017
+#: lib/util.php:1048
msgid "about a minute ago"
msgstr "há cerca de um minuto"
-#: lib/util.php:1019
+#: lib/util.php:1050
#, php-format
msgid "about %d minutes ago"
msgstr "há cerca de %d minutos"
-#: lib/util.php:1021
+#: lib/util.php:1052
msgid "about an hour ago"
msgstr "há cerca de uma hora"
-#: lib/util.php:1023
+#: lib/util.php:1054
#, php-format
msgid "about %d hours ago"
msgstr "há cerca de %d horas"
-#: lib/util.php:1025
+#: lib/util.php:1056
msgid "about a day ago"
msgstr "há cerca de um dia"
-#: lib/util.php:1027
+#: lib/util.php:1058
#, php-format
msgid "about %d days ago"
msgstr "há cerca de %d dias"
-#: lib/util.php:1029
+#: lib/util.php:1060
msgid "about a month ago"
msgstr "há cerca de um mês"
-#: lib/util.php:1031
+#: lib/util.php:1062
#, php-format
msgid "about %d months ago"
msgstr "há cerca de %d meses"
-#: lib/util.php:1033
+#: lib/util.php:1064
msgid "about a year ago"
msgstr "há cerca de um ano"
@@ -6574,7 +6613,7 @@ msgstr "%s não é uma cor válida!"
msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr "%s não é uma cor válida! Use 3 ou 6 caracteres hexadecimais."
-#: lib/xmppmanager.php:402
+#: lib/xmppmanager.php:403
#, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d."
msgstr "Mensagem demasiado extensa - máx. %1$d caracteres, enviou %2$d."
diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.po b/locale/pt_BR/LC_MESSAGES/statusnet.po
index 51d926eba..9de76c2cf 100644
--- a/locale/pt_BR/LC_MESSAGES/statusnet.po
+++ b/locale/pt_BR/LC_MESSAGES/statusnet.po
@@ -2,6 +2,7 @@
#
# Author@translatewiki.net: Aracnus
# Author@translatewiki.net: Ewout
+# Author@translatewiki.net: Luckas Blade
# Author@translatewiki.net: McDutchie
# Author@translatewiki.net: Vuln
# --
@@ -11,12 +12,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-06 23:49+0000\n"
-"PO-Revision-Date: 2010-03-06 23:50:51+0000\n"
+"POT-Creation-Date: 2010-04-05 18:54+0000\n"
+"PO-Revision-Date: 2010-04-05 18:56:06+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 (r63350); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64621); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: pt-br\n"
"X-Message-Group: out-statusnet\n"
@@ -45,10 +46,9 @@ msgstr "Impedir usuários anônimos (não autenticados) de visualizar o site?"
#. TRANS: Checkbox label for prohibiting anonymous users from viewing site.
#: actions/accessadminpanel.php:167
-#, fuzzy
msgctxt "LABEL"
msgid "Private"
-msgstr "Particular"
+msgstr "Privado"
#. TRANS: Checkbox instructions for admin setting "Invite only"
#: actions/accessadminpanel.php:174
@@ -76,7 +76,6 @@ msgid "Save access settings"
msgstr "Salvar as configurações de acesso"
#: actions/accessadminpanel.php:203
-#, fuzzy
msgctxt "BUTTON"
msgid "Save"
msgstr "Salvar"
@@ -95,9 +94,9 @@ msgstr "Esta página não existe."
#: 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:90
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78
+#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
@@ -106,10 +105,8 @@ msgstr "Esta página não existe."
#: actions/remotesubscribe.php:154 actions/replies.php:73
#: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:163 lib/command.php:302
-#: lib/command.php:355 lib/command.php:401 lib/command.php:462
-#: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82
-#: lib/profileaction.php:77
+#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: lib/mailbox.php:82 lib/profileaction.php:77
msgid "No such user."
msgstr "Este usuário não existe."
@@ -205,18 +202,18 @@ msgstr "Atualizações de %1$s e amigos no %2$s!"
#: 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:132
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:136
#: actions/apigrouplistall.php:120 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:135
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
-#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184
-#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148
+#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:174
+#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173
+#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
-#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
+#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
msgid "API method not found."
msgstr "O método da API não foi encontrado!"
@@ -229,8 +226,8 @@ msgstr "O método da API não foi encontrado!"
#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65
-#: actions/apistatusesupdate.php:118
+#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
msgid "This method requires a POST."
msgstr "Este método requer um POST."
@@ -261,7 +258,7 @@ msgid "Could not save profile."
msgstr "Não foi possível salvar o perfil."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:97
+#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
#: actions/designadminpanel.php:122 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
@@ -349,7 +346,7 @@ msgstr "Não foi encontrado nenhum status com esse ID."
msgid "This status is already a favorite."
msgstr "Esta mensagem já é favorita!"
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
msgid "Could not create favorite."
msgstr "Não foi possível criar a favorita."
@@ -468,7 +465,7 @@ msgstr "O grupo não foi encontrado!"
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:221
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
msgid "You have been blocked from that group by the admin."
msgstr "O administrador desse grupo bloqueou sua inscrição."
@@ -486,11 +483,18 @@ msgstr "Você não é membro deste grupo."
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."
-#: actions/apigrouplist.php:95
+#. TRANS: %s is a user name
+#: actions/apigrouplist.php:97
#, php-format
msgid "%s's groups"
msgstr "Grupos de %s"
+#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s
+#: actions/apigrouplist.php:107
+#, fuzzy, php-format
+msgid "%1$s groups %2$s is a member of."
+msgstr "Grupos dos quais %s é membro"
+
#: actions/apigrouplistall.php:90 actions/usergroups.php:62
#, php-format
msgid "%s groups"
@@ -518,7 +522,7 @@ msgstr "Token inválido."
#: 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:337
+#: actions/profilesettings.php:194 actions/recoverpassword.php:350
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
@@ -585,15 +589,15 @@ msgstr ""
"fornecer acesso à sua conta %4$s somente para terceiros nos quais você "
"confia."
-#: actions/apioauthauthorize.php:310 lib/action.php:438
+#: actions/apioauthauthorize.php:310 lib/action.php:437
msgid "Account"
msgstr "Conta"
#: actions/apioauthauthorize.php:313 actions/login.php:230
#: actions/profilesettings.php:106 actions/register.php:424
-#: actions/showgroup.php:244 actions/tagother.php:94
+#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
-#: lib/userprofile.php:131
+#: lib/userprofile.php:132
msgid "Nickname"
msgstr "Usuário"
@@ -629,7 +633,7 @@ msgstr "Essa mensagem não existe."
#: actions/apistatusesretweet.php:83
msgid "Cannot repeat your own notice."
-msgstr "Você não pode repetria sua própria mensagem."
+msgstr "Você não pode repetir a sua própria mensagem."
#: actions/apistatusesretweet.php:91
msgid "Already repeated that notice."
@@ -662,12 +666,12 @@ msgstr "O tamanho máximo da mensagem é de %s caracteres"
msgid "Unsupported format."
msgstr "Formato não suportado."
-#: actions/apitimelinefavorites.php:108
+#: actions/apitimelinefavorites.php:109
#, php-format
msgid "%1$s / Favorites from %2$s"
msgstr "%1$s / Favoritas de %2$s"
-#: actions/apitimelinefavorites.php:117
+#: actions/apitimelinefavorites.php:118
#, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "%1$s marcadas como favoritas por %2$s / %2$s."
@@ -677,7 +681,7 @@ msgstr "%1$s marcadas como favoritas por %2$s / %2$s."
msgid "%1$s / Updates mentioning %2$s"
msgstr "%1$s / Mensagens mencionando %2$s"
-#: actions/apitimelinementions.php:127
+#: actions/apitimelinementions.php:130
#, 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."
@@ -687,7 +691,7 @@ msgstr "%1$s mensagens em resposta a mensagens de %2$s / %3$s."
msgid "%s public timeline"
msgstr "Mensagens públicas de %s"
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "%s mensagens de todo mundo!"
@@ -702,12 +706,12 @@ msgstr "Repetida para %s"
msgid "Repeats of %s"
msgstr "Repetições de %s"
-#: actions/apitimelinetag.php:102 actions/tag.php:67
+#: actions/apitimelinetag.php:104 actions/tag.php:67
#, php-format
msgid "Notices tagged with %s"
msgstr "Mensagens etiquetadas como %s"
-#: actions/apitimelinetag.php:104 actions/tagrss.php:65
+#: actions/apitimelinetag.php:106 actions/tagrss.php:65
#, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Mensagens etiquetadas como %1$s no %2$s!"
@@ -735,7 +739,7 @@ msgstr "Sem tamanho definido."
msgid "Invalid size."
msgstr "Tamanho inválido."
-#: actions/avatarsettings.php:67 actions/showgroup.php:229
+#: actions/avatarsettings.php:67 actions/showgroup.php:230
#: lib/accountsettingsaction.php:112
msgid "Avatar"
msgstr "Avatar"
@@ -768,7 +772,7 @@ msgid "Preview"
msgstr "Visualização"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:655
+#: lib/deleteuserform.php:66 lib/noticelist.php:659
msgid "Delete"
msgstr "Excluir"
@@ -780,23 +784,27 @@ msgstr "Enviar"
msgid "Crop"
msgstr "Cortar"
-#: actions/avatarsettings.php:328
+#: actions/avatarsettings.php:305
+msgid "No file uploaded."
+msgstr "Não foi enviado nenhum arquivo."
+
+#: actions/avatarsettings.php:332
msgid "Pick a square area of the image to be your avatar"
msgstr "Selecione uma área quadrada da imagem para ser seu avatar"
-#: actions/avatarsettings.php:343 actions/grouplogo.php:380
+#: actions/avatarsettings.php:347 actions/grouplogo.php:380
msgid "Lost our file data."
msgstr "Os dados do nosso arquivo foram perdidos."
-#: actions/avatarsettings.php:366
+#: actions/avatarsettings.php:370
msgid "Avatar updated."
msgstr "O avatar foi atualizado."
-#: actions/avatarsettings.php:369
+#: actions/avatarsettings.php:373
msgid "Failed updating avatar."
msgstr "Não foi possível atualizar o avatar."
-#: actions/avatarsettings.php:393
+#: actions/avatarsettings.php:397
msgid "Avatar deleted."
msgstr "O avatar foi excluído."
@@ -852,8 +860,8 @@ msgstr "Não foi possível salvar a informação de bloqueio."
#: actions/groupunblock.php:86 actions/joingroup.php:82
#: actions/joingroup.php:93 actions/leavegroup.php:82
#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212
-#: lib/command.php:260
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162
+#: lib/command.php:358
msgid "No such group."
msgstr "Esse grupo não existe."
@@ -935,7 +943,7 @@ msgid "Conversation"
msgstr "Conversa"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:218 lib/searchgroupnav.php:82
+#: lib/profileaction.php:224 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "Mensagens"
@@ -954,7 +962,7 @@ msgstr "Você não é o dono desta aplicação."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1217
+#: lib/action.php:1219
msgid "There was a problem with your session token."
msgstr "Ocorreu um problema com o seu token de sessão."
@@ -1015,7 +1023,7 @@ msgstr "Tem certeza que deseja excluir esta mensagem?"
msgid "Do not delete this notice"
msgstr "Não excluir esta mensagem."
-#: actions/deletenotice.php:146 lib/noticelist.php:655
+#: actions/deletenotice.php:146 lib/noticelist.php:659
msgid "Delete this notice"
msgstr "Excluir esta mensagem"
@@ -1152,7 +1160,7 @@ msgstr "Restaura de volta ao padrão"
#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:208
+#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
#: actions/tagother.php:154 actions/useradminpanel.php:294
#: lib/applicationeditform.php:333 lib/applicationeditform.php:334
#: lib/designsettings.php:256 lib/groupeditform.php:202
@@ -1268,7 +1276,7 @@ msgstr "descrição muito extensa (máximo %d caracteres)."
msgid "Could not update group."
msgstr "Não foi possível atualizar o grupo."
-#: actions/editgroup.php:264 classes/User_group.php:493
+#: actions/editgroup.php:264 classes/User_group.php:496
msgid "Could not create aliases."
msgstr "Não foi possível criar os apelidos."
@@ -1589,23 +1597,20 @@ msgid "Cannot read file."
msgstr "Não foi possível ler o arquivo."
#: actions/grantrole.php:62 actions/revokerole.php:62
-#, fuzzy
msgid "Invalid role."
-msgstr "Token inválido."
+msgstr "Papel inválido."
#: actions/grantrole.php:66 actions/revokerole.php:66
msgid "This role is reserved and cannot be set."
-msgstr ""
+msgstr "Este papel está reservado e não pode ser definido."
#: actions/grantrole.php:75
-#, fuzzy
msgid "You cannot grant user roles on this site."
-msgstr "Você não pode colocar usuários deste site em isolamento."
+msgstr "Você não pode definir papéis para os usuários neste site."
#: actions/grantrole.php:82
-#, fuzzy
msgid "User already has this role."
-msgstr "O usuário já está silenciado."
+msgstr "O usuário já possui este papel."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
@@ -1766,7 +1771,7 @@ msgstr "Mensagens de %s"
msgid "Updates from members of %1$s on %2$s!"
msgstr "Atualizações dos membros de %1$s no %2$s!"
-#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232
+#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244
#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr "Grupos"
@@ -1982,7 +1987,7 @@ msgstr "Convidar novos usuários"
msgid "You are already subscribed to these users:"
msgstr "Você já está assinando esses usuários:"
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
#, php-format
msgid "%1$s (%2$s)"
msgstr "%1$s (%2$s)"
@@ -2029,7 +2034,6 @@ msgstr "Você pode, opcionalmente, adicionar uma mensagem pessoal ao convite."
#. TRANS: Send button for inviting friends
#: actions/invite.php:198
-#, fuzzy
msgctxt "BUTTON"
msgid "Send"
msgstr "Enviar"
@@ -2101,9 +2105,8 @@ msgid "You must be logged in to join a group."
msgstr "Você deve estar autenticado para se associar a um grupo."
#: actions/joingroup.php:88 actions/leavegroup.php:88
-#, fuzzy
msgid "No nickname or ID."
-msgstr "Nenhuma identificação."
+msgstr "Nenhum apelido ou identificação."
#: actions/joingroup.php:141
#, php-format
@@ -2114,7 +2117,7 @@ msgstr "%1$s associou-se ao grupo %2$s"
msgid "You must be logged in to leave a group."
msgstr "Você deve estar autenticado para sair de um grupo."
-#: actions/leavegroup.php:100 lib/command.php:265
+#: actions/leavegroup.php:100 lib/command.php:363
msgid "You are not a member of that group."
msgstr "Você não é um membro desse grupo."
@@ -2232,12 +2235,12 @@ msgstr "Utilize este formulário para criar um novo grupo."
msgid "New message"
msgstr "Nova mensagem"
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
msgid "You can't send a message to this user."
msgstr "Você não pode enviar mensagens para este usuário."
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342
-#: lib/command.php:475
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
+#: lib/command.php:529
msgid "No content!"
msgstr "Nenhum conteúdo!"
@@ -2245,7 +2248,7 @@ msgstr "Nenhum conteúdo!"
msgid "No recipient specified."
msgstr "Não foi especificado nenhum destinatário."
-#: actions/newmessage.php:164 lib/command.php:361
+#: actions/newmessage.php:164 lib/command.php:462
msgid ""
"Don't send a message to yourself; just say it to yourself quietly instead."
msgstr ""
@@ -2261,7 +2264,7 @@ msgstr "A mensagem foi enviada"
msgid "Direct message to %s sent."
msgstr "A mensagem direta para %s foi enviada."
-#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189
msgid "Ajax Error"
msgstr "Erro no Ajax"
@@ -2269,7 +2272,7 @@ msgstr "Erro no Ajax"
msgid "New notice"
msgstr "Nova mensagem"
-#: actions/newnotice.php:211
+#: actions/newnotice.php:217
msgid "Notice posted"
msgstr "A mensagem foi publicada"
@@ -2383,7 +2386,7 @@ msgstr ""
msgid "Notice has no profile"
msgstr "A mensagem não está associada a nenhum perfil"
-#: actions/oembed.php:86 actions/shownotice.php:180
+#: actions/oembed.php:86 actions/shownotice.php:175
#, php-format
msgid "%1$s's status on %2$s"
msgstr "Mensagem de %1$s no %2$s"
@@ -2396,8 +2399,8 @@ msgstr "tipo de conteúdo "
msgid "Only "
msgstr "Apenas "
-#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042
-#: lib/apiaction.php:1070 lib/apiaction.php:1179
+#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1068
+#: lib/apiaction.php:1096 lib/apiaction.php:1212
msgid "Not a supported data format."
msgstr "Não é um formato de dados suportado."
@@ -2530,7 +2533,7 @@ msgstr "A senha anterior está errada"
msgid "Error saving user; invalid."
msgstr "Erro ao salvar usuário; inválido."
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
msgid "Can't save new password."
msgstr "Não é possível salvar a nova senha."
@@ -2745,8 +2748,8 @@ 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/showgroup.php:255 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:149
+#: actions/showgroup.php:256 actions/tagother.php:104
+#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Nome completo"
@@ -2773,9 +2776,9 @@ msgid "Bio"
msgstr "Descrição"
#: actions/profilesettings.php:132 actions/register.php:471
-#: actions/showgroup.php:264 actions/tagother.php:112
+#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
-#: lib/userprofile.php:164
+#: lib/userprofile.php:165
msgid "Location"
msgstr "Localização"
@@ -2789,7 +2792,7 @@ msgstr "Compartilhe minha localização atual ao publicar mensagens"
#: actions/profilesettings.php:145 actions/tagother.php:149
#: actions/tagother.php:209 lib/subscriptionlist.php:106
-#: lib/subscriptionlist.php:108 lib/userprofile.php:209
+#: lib/subscriptionlist.php:108 lib/userprofile.php:210
msgid "Tags"
msgstr "Etiquetas"
@@ -3032,7 +3035,7 @@ msgstr "Restaurar a senha"
msgid "Recover password"
msgstr "Recuperar a senha"
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
msgid "Password recovery requested"
msgstr "Foi solicitada a recuperação da senha"
@@ -3052,21 +3055,21 @@ msgstr "Restaurar"
msgid "Enter a nickname or email address."
msgstr "Digite a identificação ou endereço de e-mail."
-#: actions/recoverpassword.php:272
+#: actions/recoverpassword.php:282
msgid "No user with that email address or username."
msgstr ""
"Não foi encontrado nenhum usuário com essa identificação ou endereço de "
"email."
-#: actions/recoverpassword.php:287
+#: actions/recoverpassword.php:299
msgid "No registered email address for that user."
msgstr "Nenhum endereço de e-mail registrado para esse usuário."
-#: actions/recoverpassword.php:301
+#: actions/recoverpassword.php:313
msgid "Error saving address confirmation."
msgstr "Erro ao salvar o endereço de confirmação."
-#: actions/recoverpassword.php:325
+#: actions/recoverpassword.php:338
msgid ""
"Instructions for recovering your password have been sent to the email "
"address registered to your account."
@@ -3074,23 +3077,23 @@ msgstr ""
"As instruções para recuperar a sua senha foram enviadas para o endereço de e-"
"mail informado no seu cadastro."
-#: actions/recoverpassword.php:344
+#: actions/recoverpassword.php:357
msgid "Unexpected password reset."
msgstr "Restauração inesperada da senha."
-#: actions/recoverpassword.php:352
+#: actions/recoverpassword.php:365
msgid "Password must be 6 chars or more."
msgstr "A senha deve ter 6 ou mais caracteres."
-#: actions/recoverpassword.php:356
+#: actions/recoverpassword.php:369
msgid "Password and confirmation do not match."
msgstr "A senha e a confirmação não coincidem."
-#: actions/recoverpassword.php:375 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:248
msgid "Error setting user."
msgstr "Erro na configuração do usuário."
-#: actions/recoverpassword.php:382
+#: actions/recoverpassword.php:395
msgid "New password successfully saved. You are now logged in."
msgstr ""
"A nova senha foi salva com sucesso. A partir de agora você já está "
@@ -3256,7 +3259,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "URL do seu perfil em outro serviço de microblog compatível"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:394
+#: lib/userprofile.php:406
msgid "Subscribe"
msgstr "Assinar"
@@ -3293,7 +3296,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:674
+#: actions/repeat.php:114 lib/noticelist.php:678
msgid "Repeated"
msgstr "Repetida"
@@ -3361,14 +3364,12 @@ msgid "Replies to %1$s on %2$s!"
msgstr "Respostas para %1$s no %2$s"
#: actions/revokerole.php:75
-#, fuzzy
msgid "You cannot revoke user roles on this site."
-msgstr "Você não pode silenciar os usuários neste site."
+msgstr "Não é possível revogar os papéis dos usuários neste site."
#: actions/revokerole.php:82
-#, fuzzy
msgid "User doesn't have this role."
-msgstr "Usuário sem um perfil correspondente"
+msgstr "O usuário não possui este papel."
#: actions/rsd.php:146 actions/version.php:157
msgid "StatusNet"
@@ -3398,7 +3399,7 @@ msgstr "Gerenciar sessões"
#: actions/sessionsadminpanel.php:177
msgid "Whether to handle sessions ourselves."
-msgstr "Define se nós cuidamos do gerenciamento das sessões."
+msgstr "Define se as sessões terão gerenciamento próprio."
#: actions/sessionsadminpanel.php:181
msgid "Session debugging"
@@ -3439,8 +3440,8 @@ msgstr "Organização"
msgid "Description"
msgstr "Descrição"
-#: actions/showapplication.php:192 actions/showgroup.php:438
-#: lib/profileaction.php:176
+#: actions/showapplication.php:192 actions/showgroup.php:439
+#: lib/profileaction.php:182
msgid "Statistics"
msgstr "Estatísticas"
@@ -3560,67 +3561,67 @@ msgstr "Grupo %s"
msgid "%1$s group, page %2$d"
msgstr "Grupo %1$s, pág. %2$d"
-#: actions/showgroup.php:226
+#: actions/showgroup.php:227
msgid "Group profile"
msgstr "Perfil do grupo"
-#: actions/showgroup.php:271 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:177
+#: actions/showgroup.php:272 actions/tagother.php:118
+#: actions/userauthorization.php:175 lib/userprofile.php:178
msgid "URL"
msgstr "Site"
-#: actions/showgroup.php:282 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:194
+#: actions/showgroup.php:283 actions/tagother.php:128
+#: actions/userauthorization.php:187 lib/userprofile.php:195
msgid "Note"
msgstr "Mensagem"
-#: actions/showgroup.php:292 lib/groupeditform.php:184
+#: actions/showgroup.php:293 lib/groupeditform.php:184
msgid "Aliases"
msgstr "Apelidos"
-#: actions/showgroup.php:301
+#: actions/showgroup.php:302
msgid "Group actions"
msgstr "Ações do grupo"
-#: actions/showgroup.php:337
+#: actions/showgroup.php:338
#, php-format
msgid "Notice feed for %s group (RSS 1.0)"
msgstr "Fonte de mensagens do grupo %s (RSS 1.0)"
-#: actions/showgroup.php:343
+#: actions/showgroup.php:344
#, php-format
msgid "Notice feed for %s group (RSS 2.0)"
msgstr "Fonte de mensagens do grupo %s (RSS 2.0)"
-#: actions/showgroup.php:349
+#: actions/showgroup.php:350
#, php-format
msgid "Notice feed for %s group (Atom)"
msgstr "Fonte de mensagens do grupo %s (Atom)"
-#: actions/showgroup.php:354
+#: actions/showgroup.php:355
#, php-format
msgid "FOAF for %s group"
msgstr "FOAF para o grupo %s"
-#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91
+#: actions/showgroup.php:391 actions/showgroup.php:448 lib/groupnav.php:91
msgid "Members"
msgstr "Membros"
-#: actions/showgroup.php:395 lib/profileaction.php:117
-#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95
-#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71
+#: actions/showgroup.php:396 lib/profileaction.php:117
+#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95
+#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
msgid "(None)"
msgstr "(Nenhum)"
-#: actions/showgroup.php:401
+#: actions/showgroup.php:402
msgid "All members"
msgstr "Todos os membros"
-#: actions/showgroup.php:441
+#: actions/showgroup.php:442
msgid "Created"
msgstr "Criado"
-#: actions/showgroup.php:457
+#: actions/showgroup.php:458
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3636,7 +3637,7 @@ msgstr ""
"para se tornar parte deste grupo e muito mais! ([Saiba mais](%%%%doc.help%%%"
"%))"
-#: actions/showgroup.php:463
+#: actions/showgroup.php:464
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3649,7 +3650,7 @@ msgstr ""
"[StatusNet](http://status.net/). Seus membros compartilham mensagens curtas "
"sobre suas vidas e interesses. "
-#: actions/showgroup.php:491
+#: actions/showgroup.php:492
msgid "Admins"
msgstr "Administradores"
@@ -3773,7 +3774,6 @@ msgid "User is already silenced."
msgstr "O usuário já está silenciado."
#: actions/siteadminpanel.php:69
-#, fuzzy
msgid "Basic settings for this StatusNet site"
msgstr "Configurações básicas para esta instância do StatusNet."
@@ -3791,8 +3791,8 @@ msgid "Unknown language \"%s\"."
msgstr "Idioma \"%s\" desconhecido."
#: actions/siteadminpanel.php:165
-msgid "Minimum text limit is 140 characters."
-msgstr "O comprimento máximo do texto é de 140 caracteres."
+msgid "Minimum text limit is 0 (unlimited)."
+msgstr "O valor mínimo para o limite de texto é 0 (sem limites)."
#: actions/siteadminpanel.php:171
msgid "Dupe limit must 1 or more seconds."
@@ -3843,13 +3843,14 @@ msgid "Default timezone for the site; usually UTC."
msgstr "Fuso horário padrão para o seu site; geralmente UTC."
#: actions/siteadminpanel.php:262
-#, fuzzy
msgid "Default language"
-msgstr "Idioma padrão do site"
+msgstr "Idioma padrão"
#: actions/siteadminpanel.php:263
msgid "Site language when autodetection from browser settings is not available"
msgstr ""
+"Idioma do site quando as configurações de autodetecção a partir do navegador "
+"não estiverem disponíveis"
#: actions/siteadminpanel.php:271
msgid "Limits"
@@ -3874,37 +3875,32 @@ msgstr ""
"coisa novamente."
#: actions/sitenoticeadminpanel.php:56
-#, fuzzy
msgid "Site Notice"
-msgstr "Mensagem do site"
+msgstr "Avisos do site"
#: actions/sitenoticeadminpanel.php:67
-#, fuzzy
msgid "Edit site-wide message"
-msgstr "Nova mensagem"
+msgstr "Editar os avisos do site (exibidos em todas as páginas)"
#: actions/sitenoticeadminpanel.php:103
-#, fuzzy
msgid "Unable to save site notice."
-msgstr "Não foi possível salvar suas configurações de aparência."
+msgstr "Não foi possível salvar os avisos do site."
#: actions/sitenoticeadminpanel.php:113
msgid "Max length for the site-wide notice is 255 chars"
-msgstr ""
+msgstr "O tamanho máximo para os avisos é de 255 caracteres."
#: actions/sitenoticeadminpanel.php:176
-#, fuzzy
msgid "Site notice text"
-msgstr "Mensagem do site"
+msgstr "Texto dos avisos"
#: actions/sitenoticeadminpanel.php:178
msgid "Site-wide notice text (255 chars max; HTML okay)"
-msgstr ""
+msgstr "Texto dos avisos do site (no máximo 255 caracteres; pode usar HTML)"
#: actions/sitenoticeadminpanel.php:198
-#, fuzzy
msgid "Save site notice"
-msgstr "Mensagem do site"
+msgstr "Salvar os avisos do site"
#: actions/smssettings.php:58
msgid "SMS settings"
@@ -4011,9 +4007,8 @@ msgid "Snapshots"
msgstr "Estatísticas"
#: actions/snapshotadminpanel.php:65
-#, fuzzy
msgid "Manage snapshot configuration"
-msgstr "Mude as configurações do site"
+msgstr "Gerenciar as configurações das estatísticas"
#: actions/snapshotadminpanel.php:127
msgid "Invalid snapshot run value."
@@ -4060,32 +4055,28 @@ msgid "Snapshots will be sent to this URL"
msgstr "As estatísticas serão enviadas para esta URL"
#: actions/snapshotadminpanel.php:248
-#, fuzzy
msgid "Save snapshot settings"
-msgstr "Salvar as configurações do site"
+msgstr "Salvar as configurações de estatísticas"
#: actions/subedit.php:70
msgid "You are not subscribed to that profile."
msgstr "Você não está assinando esse perfil."
-#: actions/subedit.php:83 classes/Subscription.php:89
-#: classes/Subscription.php:116
+#: actions/subedit.php:83 classes/Subscription.php:132
msgid "Could not save subscription."
msgstr "Não foi possível salvar a assinatura."
#: actions/subscribe.php:77
msgid "This action only accepts POST requests."
-msgstr ""
+msgstr "Esta ação aceita somente requisições POST."
#: actions/subscribe.php:107
-#, fuzzy
msgid "No such profile."
-msgstr "Esse arquivo não existe."
+msgstr "Este perfil não existe."
#: actions/subscribe.php:117
-#, fuzzy
msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
-msgstr "Você não está assinando esse perfil."
+msgstr "Não é possível assinar um perfil OMB 0.1 remoto com essa ação."
#: actions/subscribe.php:145
msgid "Subscribed"
@@ -4172,11 +4163,11 @@ msgstr ""
msgid "%s is not listening to anyone."
msgstr "%s não está acompanhando ninguém."
-#: actions/subscriptions.php:199
+#: actions/subscriptions.php:208
msgid "Jabber"
msgstr "Jabber"
-#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:222 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr "SMS"
@@ -4209,12 +4200,12 @@ msgstr "Nenhum argumento de ID."
msgid "Tag %s"
msgstr "Etiqueta %s"
-#: actions/tagother.php:77 lib/userprofile.php:75
+#: actions/tagother.php:77 lib/userprofile.php:76
msgid "User profile"
msgstr "Perfil do usuário"
#: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:102
+#: lib/userprofile.php:103
msgid "Photo"
msgstr "Imagem"
@@ -4283,7 +4274,6 @@ msgstr ""
#. TRANS: User admin panel title
#: actions/useradminpanel.php:59
-#, fuzzy
msgctxt "TITLE"
msgid "User"
msgstr "Usuário"
@@ -4551,7 +4541,7 @@ msgstr ""
msgid "Plugins"
msgstr "Plugins"
-#: actions/version.php:196 lib/action.php:767
+#: actions/version.php:196 lib/action.php:766
msgid "Version"
msgstr "Versão"
@@ -4559,7 +4549,7 @@ msgstr "Versão"
msgid "Author(s)"
msgstr "Autor(es)"
-#: classes/File.php:144
+#: classes/File.php:169
#, php-format
msgid ""
"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
@@ -4568,12 +4558,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:154
+#: classes/File.php:179
#, 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:161
+#: classes/File.php:186
#, 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."
@@ -4591,9 +4581,8 @@ msgid "Group leave failed."
msgstr "Não foi possível deixar o grupo."
#: classes/Local_group.php:41
-#, fuzzy
msgid "Could not update local group."
-msgstr "Não foi possível atualizar o grupo."
+msgstr "Não foi possível atualizar o grupo local."
#: classes/Login_token.php:76
#, php-format
@@ -4612,27 +4601,27 @@ msgstr "Não foi possível inserir a mensagem."
msgid "Could not update message with new URI."
msgstr "Não foi possível atualizar a mensagem com a nova URI."
-#: classes/Notice.php:172
+#: classes/Notice.php:175
#, php-format
msgid "DB error inserting hashtag: %s"
msgstr "Erro no banco de dados durante a inserção da hashtag: %s"
-#: classes/Notice.php:241
+#: classes/Notice.php:244
msgid "Problem saving notice. Too long."
msgstr "Problema no salvamento da mensagem. Ela é muito extensa."
-#: classes/Notice.php:245
+#: classes/Notice.php:248
msgid "Problem saving notice. Unknown user."
msgstr "Problema no salvamento da mensagem. Usuário desconhecido."
-#: classes/Notice.php:250
+#: classes/Notice.php:253
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:256
+#: classes/Notice.php:259
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
@@ -4640,74 +4629,71 @@ msgstr ""
"Muitas mensagens duplicadas em um período curto de tempo; dê uma respirada e "
"publique novamente daqui a alguns minutos."
-#: classes/Notice.php:262
+#: classes/Notice.php:265
msgid "You are banned from posting notices on this site."
msgstr "Você está proibido de publicar mensagens neste site."
-#: classes/Notice.php:328 classes/Notice.php:354
+#: classes/Notice.php:331 classes/Notice.php:357
msgid "Problem saving notice."
msgstr "Problema no salvamento da mensagem."
-#: classes/Notice.php:927
+#: classes/Notice.php:943
msgid "Problem saving group inbox."
msgstr "Problema no salvamento das mensagens recebidas do grupo."
-#: classes/Notice.php:1459
+#: classes/Notice.php:1481
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
-#: classes/Subscription.php:66 lib/oauthstore.php:465
+#: classes/Subscription.php:74 lib/oauthstore.php:465
msgid "You have been banned from subscribing."
msgstr "Você está proibido de assinar."
-#: classes/Subscription.php:70
+#: classes/Subscription.php:78
msgid "Already subscribed!"
msgstr "Já assinado!"
-#: classes/Subscription.php:74
+#: classes/Subscription.php:82
msgid "User has blocked you."
msgstr "O usuário bloqueou você."
-#: classes/Subscription.php:157
+#: classes/Subscription.php:167
msgid "Not subscribed!"
msgstr "Não assinado!"
-#: classes/Subscription.php:163
+#: classes/Subscription.php:173
msgid "Couldn't delete self-subscription."
msgstr "Não foi possível excluir a auto-assinatura."
-#: classes/Subscription.php:190
-#, fuzzy
+#: classes/Subscription.php:200
msgid "Couldn't delete subscription OMB token."
-msgstr "Não foi possível excluir a assinatura."
+msgstr "Não foi possível excluir o token de assinatura OMB."
-#: classes/Subscription.php:201 lib/subs.php:69
+#: classes/Subscription.php:211
msgid "Couldn't delete subscription."
msgstr "Não foi possível excluir a assinatura."
-#: classes/User.php:373
+#: classes/User.php:363
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Bem vindo(a) a %1$s, @%2$s!"
-#: classes/User_group.php:477
+#: classes/User_group.php:480
msgid "Could not create group."
msgstr "Não foi possível criar o grupo."
-#: classes/User_group.php:486
-#, fuzzy
+#: classes/User_group.php:489
msgid "Could not set group URI."
-msgstr "Não foi possível configurar a associação ao grupo."
+msgstr "Não foi possível definir a URI do grupo."
-#: classes/User_group.php:507
+#: classes/User_group.php:510
msgid "Could not set group membership."
msgstr "Não foi possível configurar a associação ao grupo."
-#: classes/User_group.php:521
-#, fuzzy
+#: classes/User_group.php:524
msgid "Could not save local group info."
-msgstr "Não foi possível salvar a assinatura."
+msgstr "Não foi possível salvar a informação do grupo local."
#: lib/accountsettingsaction.php:108
msgid "Change your profile settings"
@@ -4746,187 +4732,170 @@ msgstr "%1$s - %2$s"
msgid "Untitled page"
msgstr "Página sem título"
-#: lib/action.php:424
+#: lib/action.php:423
msgid "Primary site navigation"
msgstr "Navegação primária no site"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:430
-#, fuzzy
+#: lib/action.php:429
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr "Perfil pessoal e fluxo de mensagens dos amigos"
-#: lib/action.php:433
-#, fuzzy
+#: lib/action.php:432
msgctxt "MENU"
msgid "Personal"
msgstr "Pessoal"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:435
-#, fuzzy
+#: lib/action.php:434
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
-msgstr "Mude seu e-mail, avatar, senha, perfil"
+msgstr "Altere seu e-mail, avatar, senha, perfil"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:440
-#, fuzzy
+#: lib/action.php:439
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "Conecte-se a outros serviços"
-#: lib/action.php:443
+#: lib/action.php:442
msgid "Connect"
msgstr "Conectar"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:446
-#, fuzzy
+#: lib/action.php:445
msgctxt "TOOLTIP"
msgid "Change site configuration"
-msgstr "Mude as configurações do site"
+msgstr "Altere as configurações do site"
-#: lib/action.php:449
-#, fuzzy
+#: lib/action.php:448
msgctxt "MENU"
msgid "Admin"
-msgstr "Admin"
+msgstr "Administrar"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:453
-#, fuzzy, php-format
+#: lib/action.php:452
+#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "Convide seus amigos e colegas para unir-se a você no %s"
-#: lib/action.php:456
-#, fuzzy
+#: lib/action.php:455
msgctxt "MENU"
msgid "Invite"
msgstr "Convidar"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:462
-#, fuzzy
+#: lib/action.php:461
msgctxt "TOOLTIP"
msgid "Logout from the site"
-msgstr "Sai do site"
+msgstr "Sair do site"
-#: lib/action.php:465
-#, fuzzy
+#: lib/action.php:464
msgctxt "MENU"
msgid "Logout"
msgstr "Sair"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:470
-#, fuzzy
+#: lib/action.php:469
msgctxt "TOOLTIP"
msgid "Create an account"
-msgstr "Cria uma conta"
+msgstr "Criar uma conta"
-#: lib/action.php:473
-#, fuzzy
+#: lib/action.php:472
msgctxt "MENU"
msgid "Register"
msgstr "Registrar-se"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:476
-#, fuzzy
+#: lib/action.php:475
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Autentique-se no site"
-#: lib/action.php:479
-#, fuzzy
+#: lib/action.php:478
msgctxt "MENU"
msgid "Login"
msgstr "Entrar"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:482
-#, fuzzy
+#: lib/action.php:481
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Ajudem-me!"
-#: lib/action.php:485
-#, fuzzy
+#: lib/action.php:484
msgctxt "MENU"
msgid "Help"
msgstr "Ajuda"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:488
-#, fuzzy
+#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Search for people or text"
-msgstr "Procura por pessoas ou textos"
+msgstr "Procure por pessoas ou textos"
-#: lib/action.php:491
-#, fuzzy
+#: lib/action.php:490
msgctxt "MENU"
msgid "Search"
-msgstr "Procurar"
+msgstr "Pesquisar"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:513 lib/adminpanelaction.php:398
+#: lib/action.php:512 lib/adminpanelaction.php:398
msgid "Site notice"
msgstr "Mensagem do site"
-#: lib/action.php:579
+#: lib/action.php:578
msgid "Local views"
msgstr "Visualizações locais"
-#: lib/action.php:645
+#: lib/action.php:644
msgid "Page notice"
msgstr "Notícia da página"
-#: lib/action.php:747
+#: lib/action.php:746
msgid "Secondary site navigation"
msgstr "Navegação secundária no site"
-#: lib/action.php:752
+#: lib/action.php:751
msgid "Help"
msgstr "Ajuda"
-#: lib/action.php:754
+#: lib/action.php:753
msgid "About"
msgstr "Sobre"
-#: lib/action.php:756
+#: lib/action.php:755
msgid "FAQ"
msgstr "FAQ"
-#: lib/action.php:760
+#: lib/action.php:759
msgid "TOS"
msgstr "Termos de uso"
-#: lib/action.php:763
+#: lib/action.php:762
msgid "Privacy"
msgstr "Privacidade"
-#: lib/action.php:765
+#: lib/action.php:764
msgid "Source"
msgstr "Fonte"
-#: lib/action.php:769
+#: lib/action.php:768
msgid "Contact"
msgstr "Contato"
-#: lib/action.php:771
+#: lib/action.php:770
msgid "Badge"
msgstr "Mini-aplicativo"
-#: lib/action.php:799
+#: lib/action.php:798
msgid "StatusNet software license"
msgstr "Licença do software StatusNet"
-#: lib/action.php:802
+#: lib/action.php:803
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4935,12 +4904,12 @@ msgstr ""
"**%%site.name%%** é um serviço de microblog disponibilizado por [%%site."
"broughtby%%](%%site.broughtbyurl%%). "
-#: lib/action.php:804
+#: lib/action.php:805
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** é um serviço de microblog. "
-#: lib/action.php:806
+#: lib/action.php:808
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4951,57 +4920,63 @@ msgstr ""
"versão %s, disponível sob a [GNU Affero General Public License] (http://www."
"fsf.org/licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:821
+#: lib/action.php:823
msgid "Site content license"
msgstr "Licença do conteúdo do site"
-#: lib/action.php:826
+#: lib/action.php:828
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr "O conteúdo e os dados de %1$s são privados e confidenciais."
-#: lib/action.php:831
+#: lib/action.php:833
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr "Conteúdo e dados licenciados sob %1$s. Todos os direitos reservados."
-#: lib/action.php:834
+#: lib/action.php:836
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
"Conteúdo e dados licenciados pelos colaboradores. Todos os direitos "
"reservados."
-#: lib/action.php:847
+#: lib/action.php:849
msgid "All "
msgstr "Todas "
-#: lib/action.php:853
+#: lib/action.php:855
msgid "license."
msgstr "licença."
-#: lib/action.php:1152
+#: lib/action.php:1154
msgid "Pagination"
msgstr "Paginação"
-#: lib/action.php:1161
+#: lib/action.php:1163
msgid "After"
msgstr "Próximo"
-#: lib/action.php:1169
+#: lib/action.php:1171
msgid "Before"
msgstr "Anterior"
-#: lib/activity.php:453
-msgid "Can't handle remote content yet."
+#: lib/activity.php:120
+msgid "Expecting a root feed element but got a whole XML document."
msgstr ""
+"Era esperado um elemento raiz da fonte, mas foi obtido o documento XML "
+"inteiro."
-#: lib/activity.php:481
+#: lib/activityutils.php:208
+msgid "Can't handle remote content yet."
+msgstr "Ainda não é possível manipular conteúdo remoto."
+
+#: lib/activityutils.php:236
msgid "Can't handle embedded XML content yet."
-msgstr ""
+msgstr "Ainda não é possível manipular conteúdo XML incorporado."
-#: lib/activity.php:485
+#: lib/activityutils.php:240
msgid "Can't handle embedded Base64 content yet."
-msgstr ""
+msgstr "Ainda não é possível manipular conteúdo Base64."
#. TRANS: Client error message
#: lib/adminpanelaction.php:98
@@ -5035,7 +5010,6 @@ msgstr "Configuração básica do site"
#. TRANS: Menu item for site administration
#: lib/adminpanelaction.php:350
-#, fuzzy
msgctxt "MENU"
msgid "Site"
msgstr "Site"
@@ -5047,7 +5021,6 @@ msgstr "Configuração da aparência"
#. TRANS: Menu item for site administration
#: lib/adminpanelaction.php:358
-#, fuzzy
msgctxt "MENU"
msgid "Design"
msgstr "Aparência"
@@ -5079,15 +5052,13 @@ msgstr "Configuração das sessões"
#. TRANS: Menu item title/tooltip
#: lib/adminpanelaction.php:396
-#, fuzzy
msgid "Edit site notice"
-msgstr "Mensagem do site"
+msgstr "Editar os avisos do site"
#. TRANS: Menu item title/tooltip
#: lib/adminpanelaction.php:404
-#, fuzzy
msgid "Snapshots configuration"
-msgstr "Configuração dos caminhos"
+msgstr "Configurações das estatísticas"
#: lib/apiauth.php:94
msgid "API resource requires read-write access, but you only have read access."
@@ -5095,7 +5066,7 @@ msgstr ""
"Os recursos de API exigem acesso de leitura e escrita, mas você possui "
"somente acesso de leitura."
-#: lib/apiauth.php:272
+#: lib/apiauth.php:276
#, php-format
msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s"
msgstr ""
@@ -5172,11 +5143,11 @@ msgstr "Revogar"
msgid "Attachments"
msgstr "Anexos"
-#: lib/attachmentlist.php:265
+#: lib/attachmentlist.php:263
msgid "Author"
msgstr "Autor"
-#: lib/attachmentlist.php:278
+#: lib/attachmentlist.php:276
msgid "Provider"
msgstr "Operadora"
@@ -5196,37 +5167,50 @@ msgstr "Não foi possível alterar a senha"
msgid "Password changing is not allowed"
msgstr "Não é permitido alterar a senha"
-#: lib/channel.php:138 lib/channel.php:158
+#: lib/channel.php:157 lib/channel.php:177
msgid "Command results"
msgstr "Resultados do comando"
-#: lib/channel.php:210 lib/mailhandler.php:142
+#: lib/channel.php:229 lib/mailhandler.php:142
msgid "Command complete"
msgstr "O comando foi completado"
-#: lib/channel.php:221
+#: lib/channel.php:240
msgid "Command failed"
msgstr "O comando falhou"
-#: lib/command.php:44
-msgid "Sorry, this command is not yet implemented."
-msgstr "Desculpe, mas esse comando ainda não foi implementado."
+#: lib/command.php:83 lib/command.php:105
+msgid "Notice with that id does not exist"
+msgstr "Não existe uma mensagem com essa id"
-#: lib/command.php:88
+#: lib/command.php:99 lib/command.php:570
+msgid "User has no last notice"
+msgstr "O usuário não tem uma \"última mensagem\""
+
+#: lib/command.php:125
#, php-format
msgid "Could not find a user with nickname %s"
msgstr "Não foi possível encontrar um usuário com a identificação %s"
-#: lib/command.php:92
+#: lib/command.php:143
+#, php-format
+msgid "Could not find a local user with nickname %s"
+msgstr "Não foi possível encontrar um usuário local com a identificação %s"
+
+#: lib/command.php:176
+msgid "Sorry, this command is not yet implemented."
+msgstr "Desculpe, mas esse comando ainda não foi implementado."
+
+#: lib/command.php:221
msgid "It does not make a lot of sense to nudge yourself!"
msgstr "Não faz muito sentido chamar a sua própria atenção!"
-#: lib/command.php:99
+#: lib/command.php:228
#, php-format
msgid "Nudge sent to %s"
msgstr "Foi enviada a chamada de atenção para %s"
-#: lib/command.php:126
+#: lib/command.php:254
#, php-format
msgid ""
"Subscriptions: %1$s\n"
@@ -5237,200 +5221,199 @@ msgstr ""
"Assinantes: %2$s\n"
"Mensagens: %3$s"
-#: lib/command.php:152 lib/command.php:390 lib/command.php:451
-msgid "Notice with that id does not exist"
-msgstr "Não existe uma mensagem com essa id"
-
-#: lib/command.php:168 lib/command.php:406 lib/command.php:467
-#: lib/command.php:523
-msgid "User has no last notice"
-msgstr "O usuário não tem uma \"última mensagem\""
-
-#: lib/command.php:190
+#: lib/command.php:296
msgid "Notice marked as fave."
msgstr "Mensagem marcada como favorita."
-#: lib/command.php:217
+#: lib/command.php:317
msgid "You are already a member of that group"
msgstr "Você já é um membro desse grupo."
-#: lib/command.php:231
+#: lib/command.php:331
#, php-format
msgid "Could not join user %s to group %s"
msgstr "Não foi possível associar o usuário %s ao grupo %s"
-#: lib/command.php:236
+#: lib/command.php:336
#, php-format
msgid "%s joined group %s"
msgstr "%s associou-se ao grupo %s"
-#: lib/command.php:275
+#: lib/command.php:373
#, php-format
msgid "Could not remove user %s to group %s"
msgstr "Não foi possível remover o usuário %s do grupo %s"
-#: lib/command.php:280
+#: lib/command.php:378
#, php-format
msgid "%s left group %s"
msgstr "%s deixou o grupo %s"
-#: lib/command.php:309
+#: lib/command.php:401
#, php-format
msgid "Fullname: %s"
msgstr "Nome completo: %s"
-#: lib/command.php:312 lib/mail.php:258
+#: lib/command.php:404 lib/mail.php:258
#, php-format
msgid "Location: %s"
msgstr "Localização: %s"
-#: lib/command.php:315 lib/mail.php:260
+#: lib/command.php:407 lib/mail.php:260
#, php-format
msgid "Homepage: %s"
msgstr "Site: %s"
-#: lib/command.php:318
+#: lib/command.php:410
#, php-format
msgid "About: %s"
msgstr "Sobre: %s"
-#: lib/command.php:349
+#: lib/command.php:437
+#, php-format
+msgid ""
+"%s is a remote profile; you can only send direct messages to users on the "
+"same server."
+msgstr ""
+"%s é um perfil remoto; você pode só pode enviar mensagens diretas para "
+"usuários do mesmo servidor."
+
+#: lib/command.php:450
#, php-format
msgid "Message too long - maximum is %d characters, you sent %d"
msgstr ""
"A mensagem é muito extensa - o máximo são %d caracteres e você enviou %d"
-#: lib/command.php:367
+#: lib/command.php:468
#, php-format
msgid "Direct message to %s sent"
msgstr "A mensagem direta para %s foi enviada"
-#: lib/command.php:369
+#: lib/command.php:470
msgid "Error sending direct message."
msgstr "Ocorreu um erro durante o envio da mensagem direta."
-#: lib/command.php:413
+#: lib/command.php:490
msgid "Cannot repeat your own notice"
msgstr "Você não pode repetir sua própria mensagem"
-#: lib/command.php:418
+#: lib/command.php:495
msgid "Already repeated that notice"
msgstr "Você já repetiu essa mensagem"
-#: lib/command.php:426
+#: lib/command.php:503
#, php-format
msgid "Notice from %s repeated"
msgstr "Mensagem de %s repetida"
-#: lib/command.php:428
+#: lib/command.php:505
msgid "Error repeating notice."
msgstr "Erro na repetição da mensagem."
-#: lib/command.php:482
+#: lib/command.php:536
#, php-format
msgid "Notice too long - maximum is %d characters, you sent %d"
msgstr ""
"A mensagem é muito extensa - o máximo são %d caracteres e você enviou %d"
-#: lib/command.php:491
+#: lib/command.php:545
#, php-format
msgid "Reply to %s sent"
msgstr "A resposta a %s foi enviada"
-#: lib/command.php:493
+#: lib/command.php:547
msgid "Error saving notice."
msgstr "Erro no salvamento da mensagem."
-#: lib/command.php:547
+#: lib/command.php:594
msgid "Specify the name of the user to subscribe to"
msgstr "Especifique o nome do usuário que será assinado"
-#: lib/command.php:554 lib/command.php:589
-msgid "No such user"
-msgstr "Este usuário não existe."
+#: lib/command.php:602
+msgid "Can't subscribe to OMB profiles by command."
+msgstr "Não é possível assinar perfis OMB com comandos."
-#: lib/command.php:561
+#: lib/command.php:608
#, php-format
msgid "Subscribed to %s"
msgstr "Efetuada a assinatura de %s"
-#: lib/command.php:582 lib/command.php:685
+#: lib/command.php:629 lib/command.php:728
msgid "Specify the name of the user to unsubscribe from"
msgstr "Especifique o nome do usuário cuja assinatura será cancelada"
-#: lib/command.php:595
+#: lib/command.php:638
#, php-format
msgid "Unsubscribed from %s"
msgstr "Cancelada a assinatura de %s"
-#: lib/command.php:613 lib/command.php:636
+#: lib/command.php:656 lib/command.php:679
msgid "Command not yet implemented."
msgstr "O comando não foi implementado ainda."
-#: lib/command.php:616
+#: lib/command.php:659
msgid "Notification off."
msgstr "Notificação desligada."
-#: lib/command.php:618
+#: lib/command.php:661
msgid "Can't turn off notification."
msgstr "Não é possível desligar a notificação."
-#: lib/command.php:639
+#: lib/command.php:682
msgid "Notification on."
msgstr "Notificação ligada."
-#: lib/command.php:641
+#: lib/command.php:684
msgid "Can't turn on notification."
msgstr "Não é possível ligar a notificação."
-#: lib/command.php:654
+#: lib/command.php:697
msgid "Login command is disabled"
msgstr "O comando para autenticação está desabilitado"
-#: lib/command.php:665
+#: lib/command.php:708
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
"Este link é utilizável somente uma vez e é válido somente por dois minutos: %"
"s"
-#: lib/command.php:692
-#, fuzzy, php-format
+#: lib/command.php:735
+#, php-format
msgid "Unsubscribed %s"
msgstr "Cancelada a assinatura de %s"
-#: lib/command.php:709
+#: lib/command.php:752
msgid "You are not subscribed to anyone."
msgstr "Você não está assinando ninguém."
-#: lib/command.php:711
+#: lib/command.php:754
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Você já está assinando esta pessoa:"
msgstr[1] "Você já está assinando estas pessoas:"
-#: lib/command.php:731
+#: lib/command.php:774
msgid "No one is subscribed to you."
msgstr "Ninguém o assinou ainda."
-#: lib/command.php:733
+#: lib/command.php:776
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Esta pessoa está assinando você:"
msgstr[1] "Estas pessoas estão assinando você:"
-#: lib/command.php:753
+#: lib/command.php:796
msgid "You are not a member of any groups."
msgstr "Você não é membro de nenhum grupo."
-#: lib/command.php:755
+#: lib/command.php:798
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Você é membro deste grupo:"
msgstr[1] "Você é membro destes grupos:"
-#: lib/command.php:769
-#, fuzzy
+#: lib/command.php:812
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5481,8 +5464,9 @@ msgstr ""
"subscribers - lista as pessoas que seguem você\n"
"leave <identificação> - deixa de assinar o usuário\n"
"d <identificação> <texto> - mensagem direta para o usuário\n"
-"get <nickname> - obtém a última mensagem do usuário\n"
-"whois <nickname> - obtém as informações do perfil do usuário\n"
+"get <identificação> - obtém a última mensagem do usuário\n"
+"whois <identificação> - obtém as informações do perfil do usuário\n"
+"lose <identificação> - obriga o usuário a deixar de segui-lo\n"
"fav <identificação> - adiciona a último mensagem do usuário como uma "
"'favorita'\n"
"fav #<id_da_mensagem> - adiciona a mensagem identificada como 'favorita'\n"
@@ -5510,19 +5494,19 @@ msgstr ""
"tracks - não implementado ainda\n"
"tracking - não implementado ainda\n"
-#: lib/common.php:148
+#: lib/common.php:135
msgid "No configuration file found. "
msgstr "Não foi encontrado nenhum arquivo de configuração. "
-#: lib/common.php:149
+#: lib/common.php:136
msgid "I looked for configuration files in the following places: "
msgstr "Eu procurei pelos arquivos de configuração nos seguintes lugares: "
-#: lib/common.php:151
+#: lib/common.php:138
msgid "You may wish to run the installer to fix this."
msgstr "Você pode querer executar o instalador para corrigir isto."
-#: lib/common.php:152
+#: lib/common.php:139
msgid "Go to the installer."
msgstr "Ir para o instalador."
@@ -5623,7 +5607,7 @@ msgstr "Ir"
#: lib/grantroleform.php:91
#, php-format
msgid "Grant this user the \"%s\" role"
-msgstr ""
+msgstr "Associa o papel \"%s\" a este usuário"
#: lib/groupeditform.php:163
msgid "URL of the homepage or blog of the group or topic"
@@ -5700,49 +5684,49 @@ msgstr "Etiquetas nas mensagens do grupo %s"
msgid "This page is not available in a media type you accept"
msgstr "Esta página não está disponível em um tipo de mídia que você aceita"
-#: lib/imagefile.php:75
+#: lib/imagefile.php:72
+msgid "Unsupported image file format."
+msgstr "Formato de imagem não suportado."
+
+#: lib/imagefile.php:88
#, php-format
msgid "That file is too big. The maximum file size is %s."
msgstr "O arquivo é muito grande. O tamanho máximo é de %s."
-#: lib/imagefile.php:80
+#: lib/imagefile.php:93
msgid "Partial upload."
msgstr "Envio parcial."
-#: lib/imagefile.php:88 lib/mediafile.php:170
+#: lib/imagefile.php:101 lib/mediafile.php:170
msgid "System error uploading file."
msgstr "Erro no sistema durante o envio do arquivo."
-#: lib/imagefile.php:96
+#: lib/imagefile.php:109
msgid "Not an image or corrupt file."
msgstr "Imagem inválida ou arquivo corrompido."
-#: lib/imagefile.php:109
-msgid "Unsupported image file format."
-msgstr "Formato de imagem não suportado."
-
#: lib/imagefile.php:122
msgid "Lost our file."
msgstr "Nosso arquivo foi perdido."
-#: lib/imagefile.php:166 lib/imagefile.php:231
+#: lib/imagefile.php:163 lib/imagefile.php:224
msgid "Unknown file type"
msgstr "Tipo de arquivo desconhecido"
-#: lib/imagefile.php:251
+#: lib/imagefile.php:244
msgid "MB"
msgstr "Mb"
-#: lib/imagefile.php:253
+#: lib/imagefile.php:246
msgid "kB"
msgstr "Kb"
-#: lib/jabber.php:220
+#: lib/jabber.php:387
#, php-format
msgid "[%s]"
msgstr "[%s]"
-#: lib/jabber.php:400
+#: lib/jabber.php:567
#, php-format
msgid "Unknown inbox source %d."
msgstr "Fonte da caixa de entrada desconhecida %d."
@@ -6022,7 +6006,7 @@ msgstr ""
"privadas para envolver outras pessoas em uma conversa. Você também pode "
"receber mensagens privadas."
-#: lib/mailbox.php:227 lib/noticelist.php:482
+#: lib/mailbox.php:227 lib/noticelist.php:486
msgid "from"
msgstr "de"
@@ -6118,7 +6102,6 @@ msgid "Available characters"
msgstr "Caracteres disponíveis"
#: lib/messageform.php:178 lib/noticeform.php:236
-#, fuzzy
msgctxt "Send button for sending notice"
msgid "Send"
msgstr "Enviar"
@@ -6156,48 +6139,48 @@ msgstr ""
"Desculpe, mas recuperar a sua geolocalização está demorando mais que o "
"esperado. Por favor, tente novamente mais tarde."
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "N"
msgstr "N"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "S"
msgstr "S"
-#: lib/noticelist.php:431
+#: lib/noticelist.php:432
msgid "E"
msgstr "L"
-#: lib/noticelist.php:431
+#: lib/noticelist.php:432
msgid "W"
msgstr "O"
-#: lib/noticelist.php:438
+#: lib/noticelist.php:439
msgid "at"
msgstr "em"
-#: lib/noticelist.php:566
+#: lib/noticelist.php:570
msgid "in context"
msgstr "no contexto"
-#: lib/noticelist.php:601
+#: lib/noticelist.php:605
msgid "Repeated by"
msgstr "Repetida por"
-#: lib/noticelist.php:628
+#: lib/noticelist.php:632
msgid "Reply to this notice"
msgstr "Responder a esta mensagem"
-#: lib/noticelist.php:629
+#: lib/noticelist.php:633
msgid "Reply"
msgstr "Responder"
-#: lib/noticelist.php:673
+#: lib/noticelist.php:677
msgid "Notice repeated"
msgstr "Mensagem repetida"
@@ -6270,7 +6253,7 @@ msgstr "Etiquetas nas mensagens de %s"
msgid "Unknown"
msgstr "Desconhecido"
-#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr "Assinaturas"
@@ -6278,7 +6261,7 @@ msgstr "Assinaturas"
msgid "All subscriptions"
msgstr "Todas as assinaturas"
-#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90
+#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr "Assinantes"
@@ -6286,15 +6269,20 @@ msgstr "Assinantes"
msgid "All subscribers"
msgstr "Todos os assinantes"
-#: lib/profileaction.php:180
+#: lib/profileaction.php:186
msgid "User ID"
msgstr "ID do usuário"
-#: lib/profileaction.php:185
+#: lib/profileaction.php:191
msgid "Member since"
msgstr "Membro desde"
-#: lib/profileaction.php:247
+#. TRANS: Average count of posts made per day since account registration
+#: lib/profileaction.php:230
+msgid "Daily average"
+msgstr "Média diária"
+
+#: lib/profileaction.php:259
msgid "All groups"
msgstr "Todos os grupos"
@@ -6335,11 +6323,11 @@ msgid "Repeat this notice"
msgstr "Repetir esta mensagem"
#: lib/revokeroleform.php:91
-#, fuzzy, php-format
+#, php-format
msgid "Revoke the \"%s\" role from this user"
-msgstr "Bloquear este usuário neste grupo"
+msgstr "Revoga o papel \"%s\" deste usuário"
-#: lib/router.php:671
+#: lib/router.php:704
msgid "No single user defined for single-user mode."
msgstr "Nenhum usuário definido para o modo de usuário único."
@@ -6465,92 +6453,98 @@ msgstr "Cancelar a assinatura deste usuário"
msgid "Unsubscribe"
msgstr "Cancelar"
-#: lib/userprofile.php:116
+#: lib/usernoprofileexception.php:58
+#, php-format
+msgid "User %s (%d) has no profile record."
+msgstr "O usuário %s (%d) não tem nenhum registro do perfil."
+
+#: lib/userprofile.php:117
msgid "Edit Avatar"
msgstr "Editar o avatar"
-#: lib/userprofile.php:236
+#: lib/userprofile.php:234 lib/userprofile.php:248
msgid "User actions"
msgstr "Ações do usuário"
-#: lib/userprofile.php:251
+#: lib/userprofile.php:237
+msgid "User deletion in progress..."
+msgstr "Exclusão do usuário em andamento..."
+
+#: lib/userprofile.php:263
msgid "Edit profile settings"
msgstr "Editar as configurações do perfil"
-#: lib/userprofile.php:252
+#: lib/userprofile.php:264
msgid "Edit"
msgstr "Editar"
-#: lib/userprofile.php:275
+#: lib/userprofile.php:287
msgid "Send a direct message to this user"
msgstr "Enviar uma mensagem para este usuário."
-#: lib/userprofile.php:276
+#: lib/userprofile.php:288
msgid "Message"
msgstr "Mensagem"
-#: lib/userprofile.php:314
+#: lib/userprofile.php:326
msgid "Moderate"
msgstr "Moderar"
-#: lib/userprofile.php:352
-#, fuzzy
+#: lib/userprofile.php:364
msgid "User role"
-msgstr "Perfil do usuário"
+msgstr "Papel do usuário"
-#: lib/userprofile.php:354
-#, fuzzy
+#: lib/userprofile.php:366
msgctxt "role"
msgid "Administrator"
-msgstr "Administradores"
+msgstr "Administrador"
-#: lib/userprofile.php:355
-#, fuzzy
+#: lib/userprofile.php:367
msgctxt "role"
msgid "Moderator"
-msgstr "Moderar"
+msgstr "Moderador"
-#: lib/util.php:1015
+#: lib/util.php:1046
msgid "a few seconds ago"
msgstr "alguns segundos atrás"
-#: lib/util.php:1017
+#: lib/util.php:1048
msgid "about a minute ago"
msgstr "cerca de 1 minuto atrás"
-#: lib/util.php:1019
+#: lib/util.php:1050
#, php-format
msgid "about %d minutes ago"
msgstr "cerca de %d minutos atrás"
-#: lib/util.php:1021
+#: lib/util.php:1052
msgid "about an hour ago"
msgstr "cerca de 1 hora atrás"
-#: lib/util.php:1023
+#: lib/util.php:1054
#, php-format
msgid "about %d hours ago"
msgstr "cerca de %d horas atrás"
-#: lib/util.php:1025
+#: lib/util.php:1056
msgid "about a day ago"
msgstr "cerca de 1 dia atrás"
-#: lib/util.php:1027
+#: lib/util.php:1058
#, php-format
msgid "about %d days ago"
msgstr "cerca de %d dias atrás"
-#: lib/util.php:1029
+#: lib/util.php:1060
msgid "about a month ago"
msgstr "cerca de 1 mês atrás"
-#: lib/util.php:1031
+#: lib/util.php:1062
#, php-format
msgid "about %d months ago"
msgstr "cerca de %d meses atrás"
-#: lib/util.php:1033
+#: lib/util.php:1064
msgid "about a year ago"
msgstr "cerca de 1 ano atrás"
@@ -6564,7 +6558,7 @@ msgstr "%s não é uma cor válida!"
msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr "%s não é uma cor válida! Utilize 3 ou 6 caracteres hexadecimais."
-#: lib/xmppmanager.php:402
+#: lib/xmppmanager.php:403
#, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d."
msgstr ""
diff --git a/locale/ru/LC_MESSAGES/statusnet.po b/locale/ru/LC_MESSAGES/statusnet.po
index 03aaa074a..f3d163068 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-03-06 23:49+0000\n"
-"PO-Revision-Date: 2010-03-06 23:50:54+0000\n"
+"POT-Creation-Date: 2010-04-06 22:53+0000\n"
+"PO-Revision-Date: 2010-04-06 22:55:17+0000\n"
"Language-Team: Russian\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64665); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ru\n"
"X-Message-Group: out-statusnet\n"
@@ -96,9 +96,9 @@ msgstr "Нет такой страницы"
#: 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:90
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78
+#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
@@ -107,10 +107,8 @@ msgstr "Нет такой страницы"
#: actions/remotesubscribe.php:154 actions/replies.php:73
#: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:163 lib/command.php:302
-#: lib/command.php:355 lib/command.php:401 lib/command.php:462
-#: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82
-#: lib/profileaction.php:77
+#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: lib/mailbox.php:82 lib/profileaction.php:77
msgid "No such user."
msgstr "Нет такого пользователя."
@@ -204,18 +202,18 @@ msgstr "Обновлено от %1$s и его друзей на %2$s!"
#: 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:132
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:136
#: actions/apigrouplistall.php:120 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:135
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
-#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184
-#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148
+#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:174
+#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173
+#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
-#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
+#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
msgid "API method not found."
msgstr "Метод API не найден."
@@ -228,8 +226,8 @@ msgstr "Метод API не найден."
#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65
-#: actions/apistatusesupdate.php:118
+#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
msgid "This method requires a POST."
msgstr "Этот метод требует POST."
@@ -258,7 +256,7 @@ msgid "Could not save profile."
msgstr "Не удаётся сохранить профиль."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:97
+#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
#: actions/designadminpanel.php:122 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
@@ -346,7 +344,7 @@ msgstr "Нет статуса с таким ID."
msgid "This status is already a favorite."
msgstr "Этот статус уже входит в число любимых."
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
msgid "Could not create favorite."
msgstr "Не удаётся создать любимую запись."
@@ -468,7 +466,7 @@ msgstr "Группа не найдена!"
msgid "You are already a member of that group."
msgstr "Вы уже являетесь членом этой группы."
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:221
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
msgid "You have been blocked from that group by the admin."
msgstr "Вы заблокированы из этой группы администратором."
@@ -486,11 +484,18 @@ msgstr "Вы не являетесь членом этой группы."
msgid "Could not remove user %1$s from group %2$s."
msgstr "Не удаётся удалить пользователя %1$s из группы %2$s."
-#: actions/apigrouplist.php:95
+#. TRANS: %s is a user name
+#: actions/apigrouplist.php:97
#, 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
+#, php-format
+msgid "%1$s groups %2$s is a member of."
+msgstr "Группы %1$s, в которых состоит %2$s."
+
#: actions/apigrouplistall.php:90 actions/usergroups.php:62
#, php-format
msgid "%s groups"
@@ -518,7 +523,7 @@ msgstr "Неправильный токен"
#: 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:337
+#: actions/profilesettings.php:194 actions/recoverpassword.php:350
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
@@ -581,15 +586,15 @@ msgstr ""
"предоставлять разрешение на доступ к вашей учётной записи %4$s только тем "
"сторонним приложениям, которым вы доверяете."
-#: actions/apioauthauthorize.php:310 lib/action.php:438
+#: actions/apioauthauthorize.php:310 lib/action.php:437
msgid "Account"
msgstr "Настройки"
#: actions/apioauthauthorize.php:313 actions/login.php:230
#: actions/profilesettings.php:106 actions/register.php:424
-#: actions/showgroup.php:244 actions/tagother.php:94
+#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
-#: lib/userprofile.php:131
+#: lib/userprofile.php:132
msgid "Nickname"
msgstr "Имя"
@@ -658,12 +663,12 @@ msgstr "Максимальная длина записи — %d символов
msgid "Unsupported format."
msgstr "Неподдерживаемый формат."
-#: actions/apitimelinefavorites.php:108
+#: actions/apitimelinefavorites.php:109
#, php-format
msgid "%1$s / Favorites from %2$s"
msgstr "%1$s / Любимое от %2$s"
-#: actions/apitimelinefavorites.php:117
+#: actions/apitimelinefavorites.php:118
#, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "Обновления %1$s, отмеченные как любимые %2$s / %2$s."
@@ -673,7 +678,7 @@ msgstr "Обновления %1$s, отмеченные как любимые %2
msgid "%1$s / Updates mentioning %2$s"
msgstr "%1$s / Обновления, упоминающие %2$s"
-#: actions/apitimelinementions.php:127
+#: actions/apitimelinementions.php:130
#, php-format
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "%1$s обновил этот ответ на сообщение: %2$s / %3$s."
@@ -683,7 +688,7 @@ msgstr "%1$s обновил этот ответ на сообщение: %2$s /
msgid "%s public timeline"
msgstr "Общая лента %s"
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "Обновления %s от всех!"
@@ -698,12 +703,12 @@ msgstr "Повторено для %s"
msgid "Repeats of %s"
msgstr "Повторы за %s"
-#: actions/apitimelinetag.php:102 actions/tag.php:67
+#: actions/apitimelinetag.php:104 actions/tag.php:67
#, php-format
msgid "Notices tagged with %s"
msgstr "Записи с тегом %s"
-#: actions/apitimelinetag.php:104 actions/tagrss.php:65
+#: actions/apitimelinetag.php:106 actions/tagrss.php:65
#, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Обновления с тегом %1$s на %2$s!"
@@ -731,7 +736,7 @@ msgstr "Нет размера."
msgid "Invalid size."
msgstr "Неверный размер."
-#: actions/avatarsettings.php:67 actions/showgroup.php:229
+#: actions/avatarsettings.php:67 actions/showgroup.php:230
#: lib/accountsettingsaction.php:112
msgid "Avatar"
msgstr "Аватара"
@@ -764,7 +769,7 @@ msgid "Preview"
msgstr "Просмотр"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:655
+#: lib/deleteuserform.php:66 lib/noticelist.php:659
msgid "Delete"
msgstr "Удалить"
@@ -776,23 +781,27 @@ msgstr "Загрузить"
msgid "Crop"
msgstr "Обрезать"
-#: actions/avatarsettings.php:328
+#: actions/avatarsettings.php:305
+msgid "No file uploaded."
+msgstr "Файл не загружен."
+
+#: actions/avatarsettings.php:332
msgid "Pick a square area of the image to be your avatar"
msgstr "Подберите нужный квадратный участок для вашей аватары"
-#: actions/avatarsettings.php:343 actions/grouplogo.php:380
+#: actions/avatarsettings.php:347 actions/grouplogo.php:380
msgid "Lost our file data."
msgstr "Потеряна информация о файле."
-#: actions/avatarsettings.php:366
+#: actions/avatarsettings.php:370
msgid "Avatar updated."
msgstr "Аватара обновлена."
-#: actions/avatarsettings.php:369
+#: actions/avatarsettings.php:373
msgid "Failed updating avatar."
msgstr "Неудача при обновлении аватары."
-#: actions/avatarsettings.php:393
+#: actions/avatarsettings.php:397
msgid "Avatar deleted."
msgstr "Аватара удалена."
@@ -830,7 +839,7 @@ msgstr "Не блокировать этого пользователя"
msgid "Yes"
msgstr "Да"
-#: actions/block.php:144 actions/groupmembers.php:355 lib/blockform.php:80
+#: actions/block.php:144 actions/groupmembers.php:373 lib/blockform.php:80
msgid "Block this user"
msgstr "Заблокировать пользователя."
@@ -847,8 +856,8 @@ msgstr "Не удаётся сохранить информацию о блок
#: actions/groupunblock.php:86 actions/joingroup.php:82
#: actions/joingroup.php:93 actions/leavegroup.php:82
#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212
-#: lib/command.php:260
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162
+#: lib/command.php:358
msgid "No such group."
msgstr "Нет такой группы."
@@ -930,7 +939,7 @@ msgid "Conversation"
msgstr "Дискуссия"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:218 lib/searchgroupnav.php:82
+#: lib/profileaction.php:229 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "Записи"
@@ -949,7 +958,7 @@ msgstr "Вы не являетесь владельцем этого прило
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1217
+#: lib/action.php:1219
msgid "There was a problem with your session token."
msgstr "Проблема с Вашей сессией. Попробуйте ещё раз, пожалуйста."
@@ -1010,7 +1019,7 @@ msgstr "Вы уверены, что хотите удалить эту запи
msgid "Do not delete this notice"
msgstr "Не удалять эту запись"
-#: actions/deletenotice.php:146 lib/noticelist.php:655
+#: actions/deletenotice.php:146 lib/noticelist.php:659
msgid "Delete this notice"
msgstr "Удалить эту запись"
@@ -1147,7 +1156,7 @@ msgstr "Восстановить значения по умолчанию"
#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:208
+#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
#: actions/tagother.php:154 actions/useradminpanel.php:294
#: lib/applicationeditform.php:333 lib/applicationeditform.php:334
#: lib/designsettings.php:256 lib/groupeditform.php:202
@@ -1263,7 +1272,7 @@ msgstr "Слишком длинное описание (максимум %d си
msgid "Could not update group."
msgstr "Не удаётся обновить информацию о группе."
-#: actions/editgroup.php:264 classes/User_group.php:493
+#: actions/editgroup.php:264 classes/User_group.php:496
msgid "Could not create aliases."
msgstr "Не удаётся создать алиасы."
@@ -1633,7 +1642,7 @@ msgstr "Пользователь уже заблокирован из групп
msgid "User is not a member of group."
msgstr "Пользователь не является членом этой группы."
-#: actions/groupblock.php:136 actions/groupmembers.php:323
+#: actions/groupblock.php:136 actions/groupmembers.php:341
msgid "Block user from group"
msgstr "Заблокировать пользователя из группы."
@@ -1735,19 +1744,19 @@ msgstr "Список пользователей, являющихся члена
msgid "Admin"
msgstr "Настройки"
-#: actions/groupmembers.php:355 lib/blockform.php:69
+#: actions/groupmembers.php:373 lib/blockform.php:69
msgid "Block"
msgstr "Блокировать"
-#: actions/groupmembers.php:450
+#: actions/groupmembers.php:468
msgid "Make user an admin of the group"
msgstr "Сделать пользователя администратором группы"
-#: actions/groupmembers.php:482
+#: actions/groupmembers.php:500
msgid "Make Admin"
msgstr "Сделать администратором"
-#: actions/groupmembers.php:482
+#: actions/groupmembers.php:500
msgid "Make this user an admin"
msgstr "Сделать этого пользователя администратором"
@@ -1762,7 +1771,7 @@ msgstr "Лента %s"
msgid "Updates from members of %1$s on %2$s!"
msgstr "Обновления участников %1$s на %2$s!"
-#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232
+#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249
#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr "Группы"
@@ -1978,7 +1987,7 @@ msgstr "Пригласить новых пользователей"
msgid "You are already subscribed to these users:"
msgstr "Вы уже подписаны на пользователя:"
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
#, php-format
msgid "%1$s (%2$s)"
msgstr "%1$s (%2$s)"
@@ -2108,7 +2117,7 @@ msgstr "%1$s вступил в группу %2$s"
msgid "You must be logged in to leave a group."
msgstr "Вы должны авторизоваться, чтобы покинуть группу."
-#: actions/leavegroup.php:100 lib/command.php:265
+#: actions/leavegroup.php:100 lib/command.php:363
msgid "You are not a member of that group."
msgstr "Вы не являетесь членом этой группы."
@@ -2222,12 +2231,12 @@ msgstr "Используйте эту форму для создания нов
msgid "New message"
msgstr "Новое сообщение"
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
msgid "You can't send a message to this user."
msgstr "Вы не можете послать сообщение этому пользователю."
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342
-#: lib/command.php:475
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
+#: lib/command.php:529
msgid "No content!"
msgstr "Нет контента!"
@@ -2235,7 +2244,7 @@ msgstr "Нет контента!"
msgid "No recipient specified."
msgstr "Нет адресата."
-#: actions/newmessage.php:164 lib/command.php:361
+#: actions/newmessage.php:164 lib/command.php:462
msgid ""
"Don't send a message to yourself; just say it to yourself quietly instead."
msgstr "Не посылайте сообщения сами себе; просто потихоньку скажите это себе."
@@ -2249,7 +2258,7 @@ msgstr "Сообщение отправлено"
msgid "Direct message to %s sent."
msgstr "Прямое сообщение для %s послано."
-#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189
msgid "Ajax Error"
msgstr "Ошибка AJAX"
@@ -2257,7 +2266,7 @@ msgstr "Ошибка AJAX"
msgid "New notice"
msgstr "Новая запись"
-#: actions/newnotice.php:211
+#: actions/newnotice.php:217
msgid "Notice posted"
msgstr "Запись опубликована"
@@ -2368,7 +2377,7 @@ msgstr "Разработчики могут изменять настройки
msgid "Notice has no profile"
msgstr "Запись без профиля"
-#: actions/oembed.php:86 actions/shownotice.php:180
+#: actions/oembed.php:86 actions/shownotice.php:175
#, php-format
msgid "%1$s's status on %2$s"
msgstr "Статус %1$s на %2$s"
@@ -2381,8 +2390,8 @@ msgstr "тип содержимого "
msgid "Only "
msgstr "Только "
-#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042
-#: lib/apiaction.php:1070 lib/apiaction.php:1179
+#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1068
+#: lib/apiaction.php:1096 lib/apiaction.php:1212
msgid "Not a supported data format."
msgstr "Неподдерживаемый формат данных."
@@ -2515,7 +2524,7 @@ msgstr "Некорректный старый пароль"
msgid "Error saving user; invalid."
msgstr "Ошибка сохранения пользователя; неверное имя."
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
msgid "Can't save new password."
msgstr "Не удаётся сохранить новый пароль."
@@ -2689,12 +2698,12 @@ msgstr ""
msgid "People search"
msgstr "Поиск людей"
-#: actions/peopletag.php:70
+#: actions/peopletag.php:68
#, php-format
msgid "Not a valid people tag: %s"
msgstr "Неверный тег человека: %s"
-#: actions/peopletag.php:144
+#: actions/peopletag.php:142
#, php-format
msgid "Users self-tagged with %1$s - page %2$d"
msgstr "Пользователи, установившие себе тег %1$s — страница %2$d"
@@ -2728,8 +2737,8 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr "1-64 латинских строчных буквы или цифры, без пробелов"
#: actions/profilesettings.php:111 actions/register.php:448
-#: actions/showgroup.php:255 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:149
+#: actions/showgroup.php:256 actions/tagother.php:104
+#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Полное имя"
@@ -2756,9 +2765,9 @@ msgid "Bio"
msgstr "Биография"
#: actions/profilesettings.php:132 actions/register.php:471
-#: actions/showgroup.php:264 actions/tagother.php:112
+#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
-#: lib/userprofile.php:164
+#: lib/userprofile.php:165
msgid "Location"
msgstr "Месторасположение"
@@ -2772,7 +2781,7 @@ msgstr "Делиться своим текущим местоположение
#: actions/profilesettings.php:145 actions/tagother.php:149
#: actions/tagother.php:209 lib/subscriptionlist.php:106
-#: lib/subscriptionlist.php:108 lib/userprofile.php:209
+#: lib/subscriptionlist.php:108 lib/userprofile.php:210
msgid "Tags"
msgstr "Теги"
@@ -3012,7 +3021,7 @@ msgstr "Переустановить пароль"
msgid "Recover password"
msgstr "Восстановление пароля"
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
msgid "Password recovery requested"
msgstr "Запрошено восстановление пароля"
@@ -3032,19 +3041,19 @@ msgstr "Сбросить"
msgid "Enter a nickname or email address."
msgstr "Введите имя или электронный адрес."
-#: actions/recoverpassword.php:272
+#: actions/recoverpassword.php:282
msgid "No user with that email address or username."
msgstr "Нет пользователя с таким электронным адресом или именем."
-#: actions/recoverpassword.php:287
+#: actions/recoverpassword.php:299
msgid "No registered email address for that user."
msgstr "Нет зарегистрированных электронных адресов для этого пользователя."
-#: actions/recoverpassword.php:301
+#: actions/recoverpassword.php:313
msgid "Error saving address confirmation."
msgstr "Ошибка сохранения подтверждённого адреса."
-#: actions/recoverpassword.php:325
+#: actions/recoverpassword.php:338
msgid ""
"Instructions for recovering your password have been sent to the email "
"address registered to your account."
@@ -3052,23 +3061,23 @@ msgstr ""
"Инструкции по восстановлению пароля посланы на электронный адрес, который Вы "
"указали при регистрации вашего аккаунта."
-#: actions/recoverpassword.php:344
+#: actions/recoverpassword.php:357
msgid "Unexpected password reset."
msgstr "Нетиповая переустановка пароля."
-#: actions/recoverpassword.php:352
+#: actions/recoverpassword.php:365
msgid "Password must be 6 chars or more."
msgstr "Пароль должен быть длиной не менее 6 символов."
-#: actions/recoverpassword.php:356
+#: actions/recoverpassword.php:369
msgid "Password and confirmation do not match."
msgstr "Пароль и его подтверждение не совпадают."
-#: actions/recoverpassword.php:375 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:248
msgid "Error setting user."
msgstr "Ошибка в установках пользователя."
-#: actions/recoverpassword.php:382
+#: actions/recoverpassword.php:395
msgid "New password successfully saved. You are now logged in."
msgstr "Новый пароль успешно сохранён. Вы авторизовались."
@@ -3235,7 +3244,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "Адрес URL твоего профиля на другом подходящем сервисе микроблогинга"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:394
+#: lib/userprofile.php:406
msgid "Subscribe"
msgstr "Подписаться"
@@ -3271,7 +3280,7 @@ msgstr "Вы не можете повторить собственную зап
msgid "You already repeated that notice."
msgstr "Вы уже повторили эту запись."
-#: actions/repeat.php:114 lib/noticelist.php:674
+#: actions/repeat.php:114 lib/noticelist.php:678
msgid "Repeated"
msgstr "Повторено"
@@ -3415,8 +3424,8 @@ msgstr "Организация"
msgid "Description"
msgstr "Описание"
-#: actions/showapplication.php:192 actions/showgroup.php:438
-#: lib/profileaction.php:176
+#: actions/showapplication.php:192 actions/showgroup.php:444
+#: lib/profileaction.php:187
msgid "Statistics"
msgstr "Статистика"
@@ -3536,67 +3545,67 @@ msgstr "Группа %s"
msgid "%1$s group, page %2$d"
msgstr "Группа %1$s, страница %2$d"
-#: actions/showgroup.php:226
+#: actions/showgroup.php:227
msgid "Group profile"
msgstr "Профиль группы"
-#: actions/showgroup.php:271 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:177
+#: actions/showgroup.php:272 actions/tagother.php:118
+#: actions/userauthorization.php:175 lib/userprofile.php:178
msgid "URL"
msgstr "URL"
-#: actions/showgroup.php:282 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:194
+#: actions/showgroup.php:283 actions/tagother.php:128
+#: actions/userauthorization.php:187 lib/userprofile.php:195
msgid "Note"
msgstr "Запись"
-#: actions/showgroup.php:292 lib/groupeditform.php:184
+#: actions/showgroup.php:293 lib/groupeditform.php:184
msgid "Aliases"
msgstr "Алиасы"
-#: actions/showgroup.php:301
+#: actions/showgroup.php:302
msgid "Group actions"
msgstr "Действия группы"
-#: actions/showgroup.php:337
+#: actions/showgroup.php:338
#, php-format
msgid "Notice feed for %s group (RSS 1.0)"
msgstr "Лента записей группы %s (RSS 1.0)"
-#: actions/showgroup.php:343
+#: actions/showgroup.php:344
#, php-format
msgid "Notice feed for %s group (RSS 2.0)"
msgstr "Лента записей группы %s (RSS 2.0)"
-#: actions/showgroup.php:349
+#: actions/showgroup.php:350
#, php-format
msgid "Notice feed for %s group (Atom)"
msgstr "Лента записей группы %s (Atom)"
-#: actions/showgroup.php:354
+#: actions/showgroup.php:355
#, php-format
msgid "FOAF for %s group"
msgstr "FOAF для группы %s"
-#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91
+#: actions/showgroup.php:393 actions/showgroup.php:453 lib/groupnav.php:91
msgid "Members"
msgstr "Участники"
-#: actions/showgroup.php:395 lib/profileaction.php:117
-#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95
-#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71
+#: actions/showgroup.php:398 lib/profileaction.php:117
+#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95
+#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
msgid "(None)"
msgstr "(пока ничего нет)"
-#: actions/showgroup.php:401
+#: actions/showgroup.php:404
msgid "All members"
msgstr "Все участники"
-#: actions/showgroup.php:441
+#: actions/showgroup.php:447
msgid "Created"
msgstr "Создано"
-#: actions/showgroup.php:457
+#: actions/showgroup.php:463
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3612,7 +3621,7 @@ msgstr ""
"action.register%%%%), чтобы стать участником группы и получить множество "
"других возможностей! ([Читать далее](%%%%doc.help%%%%))"
-#: actions/showgroup.php:463
+#: actions/showgroup.php:469
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3625,7 +3634,7 @@ msgstr ""
"обеспечении [StatusNet](http://status.net/). Участники обмениваются "
"короткими сообщениями о своей жизни и интересах. "
-#: actions/showgroup.php:491
+#: actions/showgroup.php:497
msgid "Admins"
msgstr "Администраторы"
@@ -3767,8 +3776,8 @@ msgid "Unknown language \"%s\"."
msgstr "Неизвестный язык «%s»."
#: actions/siteadminpanel.php:165
-msgid "Minimum text limit is 140 characters."
-msgstr "Минимальное ограничение текста составляет 140 символов."
+msgid "Minimum text limit is 0 (unlimited)."
+msgstr "Минимальное ограничение текста составляет 0 (без ограничений)."
#: actions/siteadminpanel.php:171
msgid "Dupe limit must 1 or more seconds."
@@ -4041,8 +4050,7 @@ msgstr "Сохранить настройки снимка"
msgid "You are not subscribed to that profile."
msgstr "Вы не подписаны на этот профиль."
-#: actions/subedit.php:83 classes/Subscription.php:89
-#: classes/Subscription.php:116
+#: actions/subedit.php:83 classes/Subscription.php:132
msgid "Could not save subscription."
msgstr "Не удаётся сохранить подписку."
@@ -4145,11 +4153,11 @@ msgstr ""
msgid "%s is not listening to anyone."
msgstr "%s не просматривает ничьи записи."
-#: actions/subscriptions.php:199
+#: actions/subscriptions.php:208
msgid "Jabber"
msgstr "Jabber"
-#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:222 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr "СМС"
@@ -4182,12 +4190,12 @@ msgstr "Нет аргумента ID."
msgid "Tag %s"
msgstr "Теги %s"
-#: actions/tagother.php:77 lib/userprofile.php:75
+#: actions/tagother.php:77 lib/userprofile.php:76
msgid "User profile"
msgstr "Профиль пользователя"
#: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:102
+#: lib/userprofile.php:103
msgid "Photo"
msgstr "Фото"
@@ -4520,7 +4528,7 @@ msgstr ""
msgid "Plugins"
msgstr "Плагины"
-#: actions/version.php:196 lib/action.php:767
+#: actions/version.php:196 lib/action.php:766
msgid "Version"
msgstr "Версия"
@@ -4528,7 +4536,7 @@ msgstr "Версия"
msgid "Author(s)"
msgstr "Автор(ы)"
-#: classes/File.php:144
+#: classes/File.php:169
#, php-format
msgid ""
"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
@@ -4537,12 +4545,12 @@ msgstr ""
"Файл не может быть больше %d байт, тогда как отправленный вами файл содержал "
"%d байт. Попробуйте загрузить меньшую версию."
-#: classes/File.php:154
+#: classes/File.php:179
#, php-format
msgid "A file this large would exceed your user quota of %d bytes."
msgstr "Файл такого размера превысит вашу пользовательскую квоту в %d байта."
-#: classes/File.php:161
+#: classes/File.php:186
#, php-format
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr "Файл такого размера превысит вашу месячную квоту в %d байта."
@@ -4580,27 +4588,27 @@ msgstr "Не удаётся вставить сообщение."
msgid "Could not update message with new URI."
msgstr "Не удаётся обновить сообщение с новым URI."
-#: classes/Notice.php:172
+#: classes/Notice.php:175
#, php-format
msgid "DB error inserting hashtag: %s"
msgstr "Ошибка баз данных при вставке хеш-тегов для %s"
-#: classes/Notice.php:241
+#: classes/Notice.php:244
msgid "Problem saving notice. Too long."
msgstr "Проблемы с сохранением записи. Слишком длинно."
-#: classes/Notice.php:245
+#: classes/Notice.php:248
msgid "Problem saving notice. Unknown user."
msgstr "Проблема при сохранении записи. Неизвестный пользователь."
-#: classes/Notice.php:250
+#: classes/Notice.php:253
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
"Слишком много записей за столь короткий срок; передохните немного и "
"попробуйте вновь через пару минут."
-#: classes/Notice.php:256
+#: classes/Notice.php:259
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
@@ -4608,69 +4616,69 @@ msgstr ""
"Слишком много одинаковых записей за столь короткий срок; передохните немного "
"и попробуйте вновь через пару минут."
-#: classes/Notice.php:262
+#: classes/Notice.php:265
msgid "You are banned from posting notices on this site."
msgstr "Вам запрещено поститься на этом сайте (бан)"
-#: classes/Notice.php:328 classes/Notice.php:354
+#: classes/Notice.php:331 classes/Notice.php:357
msgid "Problem saving notice."
msgstr "Проблемы с сохранением записи."
-#: classes/Notice.php:927
+#: classes/Notice.php:943
msgid "Problem saving group inbox."
msgstr "Проблемы с сохранением входящих сообщений группы."
-#: classes/Notice.php:1459
+#: classes/Notice.php:1481
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
-#: classes/Subscription.php:66 lib/oauthstore.php:465
+#: classes/Subscription.php:74 lib/oauthstore.php:465
msgid "You have been banned from subscribing."
msgstr "Вы заблокированы от подписки."
-#: classes/Subscription.php:70
+#: classes/Subscription.php:78
msgid "Already subscribed!"
msgstr "Уже подписаны!"
-#: classes/Subscription.php:74
+#: classes/Subscription.php:82
msgid "User has blocked you."
msgstr "Пользователь заблокировал Вас."
-#: classes/Subscription.php:157
+#: classes/Subscription.php:167
msgid "Not subscribed!"
msgstr "Не подписаны!"
-#: classes/Subscription.php:163
+#: classes/Subscription.php:173
msgid "Couldn't delete self-subscription."
msgstr "Невозможно удалить самоподписку."
-#: classes/Subscription.php:190
+#: classes/Subscription.php:200
msgid "Couldn't delete subscription OMB token."
msgstr "Не удаётся удалить подписочный жетон OMB."
-#: classes/Subscription.php:201 lib/subs.php:69
+#: classes/Subscription.php:211
msgid "Couldn't delete subscription."
msgstr "Не удаётся удалить подписку."
-#: classes/User.php:373
+#: classes/User.php:363
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Добро пожаловать на %1$s, @%2$s!"
-#: classes/User_group.php:477
+#: classes/User_group.php:480
msgid "Could not create group."
msgstr "Не удаётся создать группу."
-#: classes/User_group.php:486
+#: classes/User_group.php:489
msgid "Could not set group URI."
msgstr "Не удаётся назначить URI группы."
-#: classes/User_group.php:507
+#: classes/User_group.php:510
msgid "Could not set group membership."
msgstr "Не удаётся назначить членство в группе."
-#: classes/User_group.php:521
+#: classes/User_group.php:524
msgid "Could not save local group info."
msgstr "Не удаётся сохранить информацию о локальной группе."
@@ -4711,170 +4719,170 @@ msgstr "%1$s — %2$s"
msgid "Untitled page"
msgstr "Страница без названия"
-#: lib/action.php:424
+#: lib/action.php:423
msgid "Primary site navigation"
msgstr "Главная навигация"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:430
+#: lib/action.php:429
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr "Личный профиль и лента друзей"
-#: lib/action.php:433
+#: lib/action.php:432
msgctxt "MENU"
msgid "Personal"
msgstr "Личное"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:435
+#: lib/action.php:434
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "Изменить ваш email, аватар, пароль, профиль"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:440
+#: lib/action.php:439
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "Соединить с сервисами"
-#: lib/action.php:443
+#: lib/action.php:442
msgid "Connect"
msgstr "Соединить"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:446
+#: lib/action.php:445
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "Изменить конфигурацию сайта"
-#: lib/action.php:449
+#: lib/action.php:448
msgctxt "MENU"
msgid "Admin"
msgstr "Настройки"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:453
+#: lib/action.php:452
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "Пригласите друзей и коллег стать такими же как Вы участниками %s"
-#: lib/action.php:456
+#: lib/action.php:455
msgctxt "MENU"
msgid "Invite"
msgstr "Пригласить"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:462
+#: lib/action.php:461
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "Выйти"
-#: lib/action.php:465
+#: lib/action.php:464
msgctxt "MENU"
msgid "Logout"
msgstr "Выход"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:470
+#: lib/action.php:469
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Создать новый аккаунт"
-#: lib/action.php:473
+#: lib/action.php:472
msgctxt "MENU"
msgid "Register"
msgstr "Регистрация"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:476
+#: lib/action.php:475
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Войти"
-#: lib/action.php:479
+#: lib/action.php:478
msgctxt "MENU"
msgid "Login"
msgstr "Вход"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:482
+#: lib/action.php:481
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Помощь"
-#: lib/action.php:485
+#: lib/action.php:484
msgctxt "MENU"
msgid "Help"
msgstr "Помощь"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:488
+#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "Искать людей или текст"
-#: lib/action.php:491
+#: lib/action.php:490
msgctxt "MENU"
msgid "Search"
msgstr "Поиск"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:513 lib/adminpanelaction.php:398
+#: lib/action.php:512 lib/adminpanelaction.php:398
msgid "Site notice"
msgstr "Новая запись"
-#: lib/action.php:579
+#: lib/action.php:578
msgid "Local views"
msgstr "Локальные виды"
-#: lib/action.php:645
+#: lib/action.php:644
msgid "Page notice"
msgstr "Новая запись"
-#: lib/action.php:747
+#: lib/action.php:746
msgid "Secondary site navigation"
msgstr "Навигация по подпискам"
-#: lib/action.php:752
+#: lib/action.php:751
msgid "Help"
msgstr "Помощь"
-#: lib/action.php:754
+#: lib/action.php:753
msgid "About"
msgstr "О проекте"
-#: lib/action.php:756
+#: lib/action.php:755
msgid "FAQ"
msgstr "ЧаВо"
-#: lib/action.php:760
+#: lib/action.php:759
msgid "TOS"
msgstr "TOS"
-#: lib/action.php:763
+#: lib/action.php:762
msgid "Privacy"
msgstr "Пользовательское соглашение"
-#: lib/action.php:765
+#: lib/action.php:764
msgid "Source"
msgstr "Исходный код"
-#: lib/action.php:769
+#: lib/action.php:768
msgid "Contact"
msgstr "Контактная информация"
-#: lib/action.php:771
+#: lib/action.php:770
msgid "Badge"
msgstr "Бедж"
-#: lib/action.php:799
+#: lib/action.php:798
msgid "StatusNet software license"
msgstr "StatusNet лицензия"
-#: lib/action.php:802
+#: lib/action.php:803
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4883,12 +4891,12 @@ msgstr ""
"**%%site.name%%** — это сервис микроблогинга, созданный для вас при помощи [%"
"%site.broughtby%%](%%site.broughtbyurl%%). "
-#: lib/action.php:804
+#: lib/action.php:805
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** — сервис микроблогинга. "
-#: lib/action.php:806
+#: lib/action.php:808
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4900,56 +4908,60 @@ msgstr ""
"лицензией [GNU Affero General Public License](http://www.fsf.org/licensing/"
"licenses/agpl-3.0.html)."
-#: lib/action.php:821
+#: lib/action.php:823
msgid "Site content license"
msgstr "Лицензия содержимого сайта"
-#: lib/action.php:826
+#: lib/action.php:828
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr "Содержание и данные %1$s являются личными и конфиденциальными."
-#: lib/action.php:831
+#: lib/action.php:833
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
"Авторские права на содержание и данные принадлежат %1$s. Все права защищены."
-#: lib/action.php:834
+#: lib/action.php:836
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
"Авторские права на содержание и данные принадлежат разработчикам. Все права "
"защищены."
-#: lib/action.php:847
+#: lib/action.php:849
msgid "All "
msgstr "All "
-#: lib/action.php:853
+#: lib/action.php:855
msgid "license."
msgstr "license."
-#: lib/action.php:1152
+#: lib/action.php:1154
msgid "Pagination"
msgstr "Разбиение на страницы"
-#: lib/action.php:1161
+#: lib/action.php:1163
msgid "After"
msgstr "Сюда"
-#: lib/action.php:1169
+#: lib/action.php:1171
msgid "Before"
msgstr "Туда"
-#: lib/activity.php:453
+#: lib/activity.php:120
+msgid "Expecting a root feed element but got a whole XML document."
+msgstr "Ожидался корневой элемент потока, а получен XML-документ целиком."
+
+#: lib/activityutils.php:208
msgid "Can't handle remote content yet."
msgstr "Пока ещё нельзя обрабатывать удалённое содержимое."
-#: lib/activity.php:481
+#: lib/activityutils.php:236
msgid "Can't handle embedded XML content yet."
msgstr "Пока ещё нельзя обрабатывать встроенный XML."
-#: lib/activity.php:485
+#: lib/activityutils.php:240
msgid "Can't handle embedded Base64 content yet."
msgstr "Пока ещё нельзя обрабатывать встроенное содержание Base64."
@@ -5041,7 +5053,7 @@ msgstr ""
"API ресурса требует доступ для чтения и записи, но у вас есть только доступ "
"для чтения."
-#: lib/apiauth.php:272
+#: lib/apiauth.php:276
#, php-format
msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s"
msgstr ""
@@ -5118,11 +5130,11 @@ msgstr "Отозвать"
msgid "Attachments"
msgstr "Вложения"
-#: lib/attachmentlist.php:265
+#: lib/attachmentlist.php:263
msgid "Author"
msgstr "Автор"
-#: lib/attachmentlist.php:278
+#: lib/attachmentlist.php:276
msgid "Provider"
msgstr "Сервис"
@@ -5142,37 +5154,50 @@ msgstr "Изменение пароля не удалось"
msgid "Password changing is not allowed"
msgstr "Смена пароля не разрешена"
-#: lib/channel.php:138 lib/channel.php:158
+#: lib/channel.php:157 lib/channel.php:177
msgid "Command results"
msgstr "Команда исполнена"
-#: lib/channel.php:210 lib/mailhandler.php:142
+#: lib/channel.php:229 lib/mailhandler.php:142
msgid "Command complete"
msgstr "Команда завершена"
-#: lib/channel.php:221
+#: lib/channel.php:240
msgid "Command failed"
msgstr "Команда неудачна"
-#: lib/command.php:44
-msgid "Sorry, this command is not yet implemented."
-msgstr "Простите, эта команда ещё не выполнена."
+#: lib/command.php:83 lib/command.php:105
+msgid "Notice with that id does not exist"
+msgstr "Записи с таким id не существует"
+
+#: lib/command.php:99 lib/command.php:570
+msgid "User has no last notice"
+msgstr "У пользователя нет последней записи."
-#: lib/command.php:88
+#: lib/command.php:125
#, php-format
msgid "Could not find a user with nickname %s"
msgstr "Не удаётся найти пользователя с именем %s"
-#: lib/command.php:92
+#: lib/command.php:143
+#, php-format
+msgid "Could not find a local user with nickname %s"
+msgstr "Не удаётся найти пользователя с именем %s"
+
+#: lib/command.php:176
+msgid "Sorry, this command is not yet implemented."
+msgstr "Простите, эта команда ещё не выполнена."
+
+#: lib/command.php:221
msgid "It does not make a lot of sense to nudge yourself!"
msgstr "Нет смысла «подталкивать» самого себя!"
-#: lib/command.php:99
+#: lib/command.php:228
#, php-format
msgid "Nudge sent to %s"
msgstr "«Подталкивание» послано %s"
-#: lib/command.php:126
+#: lib/command.php:254
#, php-format
msgid ""
"Subscriptions: %1$s\n"
@@ -5183,198 +5208,198 @@ msgstr ""
"Подписчиков: %2$s\n"
"Записей: %3$s"
-#: lib/command.php:152 lib/command.php:390 lib/command.php:451
-msgid "Notice with that id does not exist"
-msgstr "Записи с таким id не существует"
-
-#: lib/command.php:168 lib/command.php:406 lib/command.php:467
-#: lib/command.php:523
-msgid "User has no last notice"
-msgstr "У пользователя нет последней записи."
-
-#: lib/command.php:190
+#: lib/command.php:296
msgid "Notice marked as fave."
msgstr "Запись помечена как любимая."
-#: lib/command.php:217
+#: lib/command.php:317
msgid "You are already a member of that group"
msgstr "Вы уже являетесь членом этой группы."
-#: lib/command.php:231
+#: lib/command.php:331
#, php-format
msgid "Could not join user %s to group %s"
msgstr "Не удаётся присоединить пользователя %s к группе %s"
-#: lib/command.php:236
+#: lib/command.php:336
#, php-format
msgid "%s joined group %s"
msgstr "%1$s вступил в группу %2$s"
-#: lib/command.php:275
+#: lib/command.php:373
#, php-format
msgid "Could not remove user %s to group %s"
msgstr "Не удаётся удалить пользователя %1$s из группы %2$s."
-#: lib/command.php:280
+#: lib/command.php:378
#, php-format
msgid "%s left group %s"
msgstr "%1$s покинул группу %2$s"
-#: lib/command.php:309
+#: lib/command.php:401
#, php-format
msgid "Fullname: %s"
msgstr "Полное имя: %s"
-#: lib/command.php:312 lib/mail.php:258
+#: lib/command.php:404 lib/mail.php:258
#, php-format
msgid "Location: %s"
msgstr "Месторасположение: %s"
-#: lib/command.php:315 lib/mail.php:260
+#: lib/command.php:407 lib/mail.php:260
#, php-format
msgid "Homepage: %s"
msgstr "Домашняя страница: %s"
-#: lib/command.php:318
+#: lib/command.php:410
#, php-format
msgid "About: %s"
msgstr "О пользователе: %s"
-#: lib/command.php:349
+#: lib/command.php:437
+#, php-format
+msgid ""
+"%s is a remote profile; you can only send direct messages to users on the "
+"same server."
+msgstr ""
+"%s профиль другой системы; вы можете отсылать личное сообщение только "
+"пользователям этой системы."
+
+#: lib/command.php:450
#, php-format
msgid "Message too long - maximum is %d characters, you sent %d"
msgstr "Сообщение слишком длинное — не больше %d символов, вы посылаете %d"
-#: lib/command.php:367
+#: lib/command.php:468
#, php-format
msgid "Direct message to %s sent"
msgstr "Прямое сообщение для %s послано."
-#: lib/command.php:369
+#: lib/command.php:470
msgid "Error sending direct message."
msgstr "Ошибка при отправке прямого сообщения."
-#: lib/command.php:413
+#: lib/command.php:490
msgid "Cannot repeat your own notice"
msgstr "Невозможно повторить собственную запись."
-#: lib/command.php:418
+#: lib/command.php:495
msgid "Already repeated that notice"
msgstr "Эта запись уже повторена"
-#: lib/command.php:426
+#: lib/command.php:503
#, php-format
msgid "Notice from %s repeated"
msgstr "Запись %s повторена"
-#: lib/command.php:428
+#: lib/command.php:505
msgid "Error repeating notice."
msgstr "Ошибка при повторении записи."
-#: lib/command.php:482
+#: lib/command.php:536
#, php-format
msgid "Notice too long - maximum is %d characters, you sent %d"
msgstr "Запись слишком длинная — не больше %d символов, вы посылаете %d"
-#: lib/command.php:491
+#: lib/command.php:545
#, php-format
msgid "Reply to %s sent"
msgstr "Ответ %s отправлен"
-#: lib/command.php:493
+#: lib/command.php:547
msgid "Error saving notice."
msgstr "Проблемы с сохранением записи."
-#: lib/command.php:547
+#: lib/command.php:594
msgid "Specify the name of the user to subscribe to"
msgstr "Укажите имя пользователя для подписки."
-#: lib/command.php:554 lib/command.php:589
-msgid "No such user"
-msgstr "Нет такого пользователя."
+#: lib/command.php:602
+msgid "Can't subscribe to OMB profiles by command."
+msgstr "Невозможно подписаться командой на профили OMB."
-#: lib/command.php:561
+#: lib/command.php:608
#, php-format
msgid "Subscribed to %s"
msgstr "Подписано на %s"
-#: lib/command.php:582 lib/command.php:685
+#: lib/command.php:629 lib/command.php:728
msgid "Specify the name of the user to unsubscribe from"
msgstr "Укажите имя пользователя для отмены подписки."
-#: lib/command.php:595
+#: lib/command.php:638
#, php-format
msgid "Unsubscribed from %s"
msgstr "Отписано от %s"
-#: lib/command.php:613 lib/command.php:636
+#: lib/command.php:656 lib/command.php:679
msgid "Command not yet implemented."
msgstr "Команда ещё не выполнена."
-#: lib/command.php:616
+#: lib/command.php:659
msgid "Notification off."
msgstr "Оповещение отсутствует."
-#: lib/command.php:618
+#: lib/command.php:661
msgid "Can't turn off notification."
msgstr "Нет оповещения."
-#: lib/command.php:639
+#: lib/command.php:682
msgid "Notification on."
msgstr "Есть оповещение."
-#: lib/command.php:641
+#: lib/command.php:684
msgid "Can't turn on notification."
msgstr "Есть оповещение."
-#: lib/command.php:654
+#: lib/command.php:697
msgid "Login command is disabled"
msgstr "Команда входа отключена"
-#: lib/command.php:665
+#: lib/command.php:708
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr "Эта ссылка действительна только один раз в течение 2 минут: %s"
-#: lib/command.php:692
+#: lib/command.php:735
#, php-format
msgid "Unsubscribed %s"
msgstr "Отписано %s"
-#: lib/command.php:709
+#: lib/command.php:752
msgid "You are not subscribed to anyone."
msgstr "Вы ни на кого не подписаны."
-#: lib/command.php:711
+#: lib/command.php:754
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Вы подписаны на этих людей:"
msgstr[1] "Вы подписаны на этих людей:"
msgstr[2] "Вы подписаны на этих людей:"
-#: lib/command.php:731
+#: lib/command.php:774
msgid "No one is subscribed to you."
msgstr "Никто не подписан на вас."
-#: lib/command.php:733
+#: lib/command.php:776
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Эти люди подписались на вас:"
msgstr[1] "Эти люди подписались на вас:"
msgstr[2] "Эти люди подписались на вас:"
-#: lib/command.php:753
+#: lib/command.php:796
msgid "You are not a member of any groups."
msgstr "Вы не состоите ни в одной группе."
-#: lib/command.php:755
+#: lib/command.php:798
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Вы являетесь участником следующих групп:"
msgstr[1] "Вы являетесь участником следующих групп:"
msgstr[2] "Вы являетесь участником следующих групп:"
-#: lib/command.php:769
+#: lib/command.php:812
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5454,19 +5479,19 @@ msgstr ""
"tracks — пока не реализовано.\n"
"tracking — пока не реализовано.\n"
-#: lib/common.php:148
+#: lib/common.php:135
msgid "No configuration file found. "
msgstr "Конфигурационный файл не найден. "
-#: lib/common.php:149
+#: lib/common.php:136
msgid "I looked for configuration files in the following places: "
msgstr "Конфигурационные файлы искались в следующих местах: "
-#: lib/common.php:151
+#: lib/common.php:138
msgid "You may wish to run the installer to fix this."
msgstr "Возможно, вы решите запустить установщик для исправления этого."
-#: lib/common.php:152
+#: lib/common.php:139
msgid "Go to the installer."
msgstr "Перейти к установщику"
@@ -5644,49 +5669,49 @@ msgstr "Теги записей группы %s"
msgid "This page is not available in a media type you accept"
msgstr "Страница недоступна для того типа, который Вы задействовали."
-#: lib/imagefile.php:75
+#: lib/imagefile.php:72
+msgid "Unsupported image file format."
+msgstr "Неподдерживаемый формат файла изображения."
+
+#: lib/imagefile.php:88
#, php-format
msgid "That file is too big. The maximum file size is %s."
msgstr "Этот файл слишком большой. Максимальный размер файла составляет %s."
-#: lib/imagefile.php:80
+#: lib/imagefile.php:93
msgid "Partial upload."
msgstr "Частичная загрузка."
-#: lib/imagefile.php:88 lib/mediafile.php:170
+#: lib/imagefile.php:101 lib/mediafile.php:170
msgid "System error uploading file."
msgstr "Системная ошибка при загрузке файла."
-#: lib/imagefile.php:96
+#: lib/imagefile.php:109
msgid "Not an image or corrupt file."
msgstr "Не является изображением или повреждённый файл."
-#: lib/imagefile.php:109
-msgid "Unsupported image file format."
-msgstr "Неподдерживаемый формат файла изображения."
-
#: lib/imagefile.php:122
msgid "Lost our file."
msgstr "Потерян файл."
-#: lib/imagefile.php:166 lib/imagefile.php:231
+#: lib/imagefile.php:163 lib/imagefile.php:224
msgid "Unknown file type"
msgstr "Неподдерживаемый тип файла"
-#: lib/imagefile.php:251
+#: lib/imagefile.php:244
msgid "MB"
msgstr "МБ"
-#: lib/imagefile.php:253
+#: lib/imagefile.php:246
msgid "kB"
msgstr "КБ"
-#: lib/jabber.php:220
+#: lib/jabber.php:387
#, php-format
msgid "[%s]"
msgstr "[%s]"
-#: lib/jabber.php:400
+#: lib/jabber.php:567
#, php-format
msgid "Unknown inbox source %d."
msgstr "Неизвестный источник входящих сообщений %d."
@@ -5967,7 +5992,7 @@ msgstr ""
"вовлечения других пользователей в разговор. Сообщения, получаемые от других "
"людей, видите только вы."
-#: lib/mailbox.php:227 lib/noticelist.php:482
+#: lib/mailbox.php:227 lib/noticelist.php:486
msgid "from"
msgstr "от "
@@ -6097,48 +6122,48 @@ msgstr ""
"К сожалению, получение информации о вашем местонахождении заняло больше "
"времени, чем ожидалось; повторите попытку позже"
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr "%1$u°%2$u'%3$u\" %4$s %5$u°%6$u'%7$u\" %8$s"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "N"
msgstr "с. ш."
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "S"
msgstr "ю. ш."
-#: lib/noticelist.php:431
+#: lib/noticelist.php:432
msgid "E"
msgstr "в. д."
-#: lib/noticelist.php:431
+#: lib/noticelist.php:432
msgid "W"
msgstr "з. д."
-#: lib/noticelist.php:438
+#: lib/noticelist.php:439
msgid "at"
msgstr "на"
-#: lib/noticelist.php:566
+#: lib/noticelist.php:570
msgid "in context"
msgstr "в контексте"
-#: lib/noticelist.php:601
+#: lib/noticelist.php:605
msgid "Repeated by"
msgstr "Повторено"
-#: lib/noticelist.php:628
+#: lib/noticelist.php:632
msgid "Reply to this notice"
msgstr "Ответить на эту запись"
-#: lib/noticelist.php:629
+#: lib/noticelist.php:633
msgid "Reply"
msgstr "Ответить"
-#: lib/noticelist.php:673
+#: lib/noticelist.php:677
msgid "Notice repeated"
msgstr "Запись повторена"
@@ -6211,7 +6236,7 @@ msgstr "Теги записей пользователя %s"
msgid "Unknown"
msgstr "Неизвестно"
-#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr "Подписки"
@@ -6219,23 +6244,28 @@ msgstr "Подписки"
msgid "All subscriptions"
msgstr "Все подписки."
-#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90
+#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr "Подписчики"
-#: lib/profileaction.php:159
+#: lib/profileaction.php:161
msgid "All subscribers"
msgstr "Все подписчики"
-#: lib/profileaction.php:180
+#: lib/profileaction.php:191
msgid "User ID"
msgstr "ID пользователя"
-#: lib/profileaction.php:185
+#: lib/profileaction.php:196
msgid "Member since"
msgstr "Регистрация"
-#: lib/profileaction.php:247
+#. TRANS: Average count of posts made per day since account registration
+#: lib/profileaction.php:235
+msgid "Daily average"
+msgstr "Среднесуточная"
+
+#: lib/profileaction.php:264
msgid "All groups"
msgstr "Все группы"
@@ -6280,7 +6310,7 @@ msgstr "Повторить эту запись"
msgid "Revoke the \"%s\" role from this user"
msgstr "Отозвать у этого пользователя роль «%s»"
-#: lib/router.php:671
+#: lib/router.php:704
msgid "No single user defined for single-user mode."
msgstr "Ни задан пользователь для однопользовательского режима."
@@ -6406,89 +6436,98 @@ msgstr "Отписаться от этого пользователя"
msgid "Unsubscribe"
msgstr "Отписаться"
-#: lib/userprofile.php:116
+#: lib/usernoprofileexception.php:58
+#, php-format
+msgid "User %s (%d) has no profile record."
+msgstr "У пользователя %s (%d) нет профильной записи."
+
+#: lib/userprofile.php:117
msgid "Edit Avatar"
msgstr "Изменить аватару"
-#: lib/userprofile.php:236
+#: lib/userprofile.php:234 lib/userprofile.php:248
msgid "User actions"
msgstr "Действия пользователя"
-#: lib/userprofile.php:251
+#: lib/userprofile.php:237
+msgid "User deletion in progress..."
+msgstr "Идёт удаление пользователя…"
+
+#: lib/userprofile.php:263
msgid "Edit profile settings"
msgstr "Изменение настроек профиля"
-#: lib/userprofile.php:252
+#: lib/userprofile.php:264
msgid "Edit"
msgstr "Редактировать"
-#: lib/userprofile.php:275
+#: lib/userprofile.php:287
msgid "Send a direct message to this user"
msgstr "Послать приватное сообщение этому пользователю."
-#: lib/userprofile.php:276
+#: lib/userprofile.php:288
msgid "Message"
msgstr "Сообщение"
-#: lib/userprofile.php:314
+#: lib/userprofile.php:326
msgid "Moderate"
msgstr "Модерировать"
-#: lib/userprofile.php:352
+#: lib/userprofile.php:364
msgid "User role"
msgstr "Роль пользователя"
-#: lib/userprofile.php:354
+#: lib/userprofile.php:366
msgctxt "role"
msgid "Administrator"
msgstr "Администратор"
-#: lib/userprofile.php:355
+#: lib/userprofile.php:367
msgctxt "role"
msgid "Moderator"
msgstr "Модератор"
-#: lib/util.php:1015
+#: lib/util.php:1046
msgid "a few seconds ago"
msgstr "пару секунд назад"
-#: lib/util.php:1017
+#: lib/util.php:1048
msgid "about a minute ago"
msgstr "около минуты назад"
-#: lib/util.php:1019
+#: lib/util.php:1050
#, php-format
msgid "about %d minutes ago"
msgstr "около %d минут(ы) назад"
-#: lib/util.php:1021
+#: lib/util.php:1052
msgid "about an hour ago"
msgstr "около часа назад"
-#: lib/util.php:1023
+#: lib/util.php:1054
#, php-format
msgid "about %d hours ago"
msgstr "около %d часа(ов) назад"
-#: lib/util.php:1025
+#: lib/util.php:1056
msgid "about a day ago"
msgstr "около дня назад"
-#: lib/util.php:1027
+#: lib/util.php:1058
#, php-format
msgid "about %d days ago"
msgstr "около %d дня(ей) назад"
-#: lib/util.php:1029
+#: lib/util.php:1060
msgid "about a month ago"
msgstr "около месяца назад"
-#: lib/util.php:1031
+#: lib/util.php:1062
#, php-format
msgid "about %d months ago"
msgstr "около %d месяца(ев) назад"
-#: lib/util.php:1033
+#: lib/util.php:1064
msgid "about a year ago"
msgstr "около года назад"
@@ -6504,7 +6543,7 @@ msgstr ""
"%s не является допустимым цветом! Используйте 3 или 6 шестнадцатеричных "
"символов."
-#: lib/xmppmanager.php:402
+#: lib/xmppmanager.php:403
#, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d."
msgstr ""
diff --git a/locale/statusnet.pot b/locale/statusnet.pot
index 61d902a1a..53fdfd647 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-03-08 21:09+0000\n"
+"POT-Creation-Date: 2010-04-06 23:05+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"
@@ -88,9 +88,9 @@ msgstr ""
#: 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:90
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78
+#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
@@ -99,10 +99,8 @@ msgstr ""
#: actions/remotesubscribe.php:154 actions/replies.php:73
#: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:163 lib/command.php:302
-#: lib/command.php:355 lib/command.php:401 lib/command.php:462
-#: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82
-#: lib/profileaction.php:77
+#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: lib/mailbox.php:82 lib/profileaction.php:77
msgid "No such user."
msgstr ""
@@ -189,18 +187,18 @@ msgstr ""
#: 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:132
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:136
#: actions/apigrouplistall.php:120 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:135
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
-#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184
-#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148
+#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:174
+#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173
+#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
-#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
+#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
msgid "API method not found."
msgstr ""
@@ -213,8 +211,8 @@ msgstr ""
#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65
-#: actions/apistatusesupdate.php:118
+#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
msgid "This method requires a POST."
msgstr ""
@@ -243,7 +241,7 @@ msgid "Could not save profile."
msgstr ""
#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:97
+#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
#: actions/designadminpanel.php:122 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
@@ -327,7 +325,7 @@ msgstr ""
msgid "This status is already a favorite."
msgstr ""
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
msgid "Could not create favorite."
msgstr ""
@@ -444,7 +442,7 @@ msgstr ""
msgid "You are already a member of that group."
msgstr ""
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:221
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
msgid "You have been blocked from that group by the admin."
msgstr ""
@@ -462,11 +460,18 @@ msgstr ""
msgid "Could not remove user %1$s from group %2$s."
msgstr ""
-#: actions/apigrouplist.php:95
+#. TRANS: %s is a user name
+#: actions/apigrouplist.php:97
#, 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
+#, php-format
+msgid "%1$s groups %2$s is a member of."
+msgstr ""
+
#: actions/apigrouplistall.php:90 actions/usergroups.php:62
#, php-format
msgid "%s groups"
@@ -494,7 +499,7 @@ msgstr ""
#: 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:337
+#: actions/profilesettings.php:194 actions/recoverpassword.php:350
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
@@ -552,15 +557,15 @@ msgid ""
"give access to your %4$s account to third parties you trust."
msgstr ""
-#: actions/apioauthauthorize.php:310 lib/action.php:438
+#: actions/apioauthauthorize.php:310 lib/action.php:437
msgid "Account"
msgstr ""
#: actions/apioauthauthorize.php:313 actions/login.php:230
#: actions/profilesettings.php:106 actions/register.php:424
-#: actions/showgroup.php:244 actions/tagother.php:94
+#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
-#: lib/userprofile.php:131
+#: lib/userprofile.php:132
msgid "Nickname"
msgstr ""
@@ -629,12 +634,12 @@ msgstr ""
msgid "Unsupported format."
msgstr ""
-#: actions/apitimelinefavorites.php:108
+#: actions/apitimelinefavorites.php:109
#, php-format
msgid "%1$s / Favorites from %2$s"
msgstr ""
-#: actions/apitimelinefavorites.php:117
+#: actions/apitimelinefavorites.php:118
#, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr ""
@@ -644,7 +649,7 @@ msgstr ""
msgid "%1$s / Updates mentioning %2$s"
msgstr ""
-#: actions/apitimelinementions.php:127
+#: actions/apitimelinementions.php:130
#, php-format
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr ""
@@ -654,7 +659,7 @@ msgstr ""
msgid "%s public timeline"
msgstr ""
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr ""
@@ -669,12 +674,12 @@ msgstr ""
msgid "Repeats of %s"
msgstr ""
-#: actions/apitimelinetag.php:102 actions/tag.php:67
+#: actions/apitimelinetag.php:104 actions/tag.php:67
#, php-format
msgid "Notices tagged with %s"
msgstr ""
-#: actions/apitimelinetag.php:104 actions/tagrss.php:65
+#: actions/apitimelinetag.php:106 actions/tagrss.php:65
#, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr ""
@@ -702,7 +707,7 @@ msgstr ""
msgid "Invalid size."
msgstr ""
-#: actions/avatarsettings.php:67 actions/showgroup.php:229
+#: actions/avatarsettings.php:67 actions/showgroup.php:230
#: lib/accountsettingsaction.php:112
msgid "Avatar"
msgstr ""
@@ -734,7 +739,7 @@ msgid "Preview"
msgstr ""
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:655
+#: lib/deleteuserform.php:66 lib/noticelist.php:659
msgid "Delete"
msgstr ""
@@ -746,23 +751,27 @@ msgstr ""
msgid "Crop"
msgstr ""
-#: actions/avatarsettings.php:328
+#: actions/avatarsettings.php:305
+msgid "No file uploaded."
+msgstr ""
+
+#: actions/avatarsettings.php:332
msgid "Pick a square area of the image to be your avatar"
msgstr ""
-#: actions/avatarsettings.php:343 actions/grouplogo.php:380
+#: actions/avatarsettings.php:347 actions/grouplogo.php:380
msgid "Lost our file data."
msgstr ""
-#: actions/avatarsettings.php:366
+#: actions/avatarsettings.php:370
msgid "Avatar updated."
msgstr ""
-#: actions/avatarsettings.php:369
+#: actions/avatarsettings.php:373
msgid "Failed updating avatar."
msgstr ""
-#: actions/avatarsettings.php:393
+#: actions/avatarsettings.php:397
msgid "Avatar deleted."
msgstr ""
@@ -797,7 +806,7 @@ msgstr ""
msgid "Yes"
msgstr ""
-#: actions/block.php:144 actions/groupmembers.php:355 lib/blockform.php:80
+#: actions/block.php:144 actions/groupmembers.php:373 lib/blockform.php:80
msgid "Block this user"
msgstr ""
@@ -814,8 +823,8 @@ msgstr ""
#: actions/groupunblock.php:86 actions/joingroup.php:82
#: actions/joingroup.php:93 actions/leavegroup.php:82
#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212
-#: lib/command.php:260
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162
+#: lib/command.php:358
msgid "No such group."
msgstr ""
@@ -897,7 +906,7 @@ msgid "Conversation"
msgstr ""
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:218 lib/searchgroupnav.php:82
+#: lib/profileaction.php:229 lib/searchgroupnav.php:82
msgid "Notices"
msgstr ""
@@ -916,7 +925,7 @@ msgstr ""
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1217
+#: lib/action.php:1219
msgid "There was a problem with your session token."
msgstr ""
@@ -972,7 +981,7 @@ msgstr ""
msgid "Do not delete this notice"
msgstr ""
-#: actions/deletenotice.php:146 lib/noticelist.php:655
+#: actions/deletenotice.php:146 lib/noticelist.php:659
msgid "Delete this notice"
msgstr ""
@@ -1105,7 +1114,7 @@ msgstr ""
#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:208
+#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
#: actions/tagother.php:154 actions/useradminpanel.php:294
#: lib/applicationeditform.php:333 lib/applicationeditform.php:334
#: lib/designsettings.php:256 lib/groupeditform.php:202
@@ -1221,7 +1230,7 @@ msgstr ""
msgid "Could not update group."
msgstr ""
-#: actions/editgroup.php:264 classes/User_group.php:493
+#: actions/editgroup.php:264 classes/User_group.php:496
msgid "Could not create aliases."
msgstr ""
@@ -1570,7 +1579,7 @@ msgstr ""
msgid "User is not a member of group."
msgstr ""
-#: actions/groupblock.php:136 actions/groupmembers.php:323
+#: actions/groupblock.php:136 actions/groupmembers.php:341
msgid "Block user from group"
msgstr ""
@@ -1665,19 +1674,19 @@ msgstr ""
msgid "Admin"
msgstr ""
-#: actions/groupmembers.php:355 lib/blockform.php:69
+#: actions/groupmembers.php:373 lib/blockform.php:69
msgid "Block"
msgstr ""
-#: actions/groupmembers.php:450
+#: actions/groupmembers.php:468
msgid "Make user an admin of the group"
msgstr ""
-#: actions/groupmembers.php:482
+#: actions/groupmembers.php:500
msgid "Make Admin"
msgstr ""
-#: actions/groupmembers.php:482
+#: actions/groupmembers.php:500
msgid "Make this user an admin"
msgstr ""
@@ -1692,7 +1701,7 @@ msgstr ""
msgid "Updates from members of %1$s on %2$s!"
msgstr ""
-#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232
+#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249
#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr ""
@@ -1882,7 +1891,7 @@ msgstr ""
msgid "You are already subscribed to these users:"
msgstr ""
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
#, php-format
msgid "%1$s (%2$s)"
msgstr ""
@@ -1982,7 +1991,7 @@ msgstr ""
msgid "You must be logged in to leave a group."
msgstr ""
-#: actions/leavegroup.php:100 lib/command.php:265
+#: actions/leavegroup.php:100 lib/command.php:363
msgid "You are not a member of that group."
msgstr ""
@@ -2091,12 +2100,12 @@ msgstr ""
msgid "New message"
msgstr ""
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
msgid "You can't send a message to this user."
msgstr ""
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342
-#: lib/command.php:475
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
+#: lib/command.php:529
msgid "No content!"
msgstr ""
@@ -2104,7 +2113,7 @@ msgstr ""
msgid "No recipient specified."
msgstr ""
-#: actions/newmessage.php:164 lib/command.php:361
+#: actions/newmessage.php:164 lib/command.php:462
msgid ""
"Don't send a message to yourself; just say it to yourself quietly instead."
msgstr ""
@@ -2118,7 +2127,7 @@ msgstr ""
msgid "Direct message to %s sent."
msgstr ""
-#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189
msgid "Ajax Error"
msgstr ""
@@ -2126,7 +2135,7 @@ msgstr ""
msgid "New notice"
msgstr ""
-#: actions/newnotice.php:211
+#: actions/newnotice.php:217
msgid "Notice posted"
msgstr ""
@@ -2229,7 +2238,7 @@ msgstr ""
msgid "Notice has no profile"
msgstr ""
-#: actions/oembed.php:86 actions/shownotice.php:180
+#: actions/oembed.php:86 actions/shownotice.php:175
#, php-format
msgid "%1$s's status on %2$s"
msgstr ""
@@ -2242,8 +2251,8 @@ msgstr ""
msgid "Only "
msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042
-#: lib/apiaction.php:1070 lib/apiaction.php:1179
+#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1068
+#: lib/apiaction.php:1096 lib/apiaction.php:1212
msgid "Not a supported data format."
msgstr ""
@@ -2374,7 +2383,7 @@ msgstr ""
msgid "Error saving user; invalid."
msgstr ""
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
msgid "Can't save new password."
msgstr ""
@@ -2546,12 +2555,12 @@ msgstr ""
msgid "People search"
msgstr ""
-#: actions/peopletag.php:70
+#: actions/peopletag.php:68
#, php-format
msgid "Not a valid people tag: %s"
msgstr ""
-#: actions/peopletag.php:144
+#: actions/peopletag.php:142
#, php-format
msgid "Users self-tagged with %1$s - page %2$d"
msgstr ""
@@ -2583,8 +2592,8 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr ""
#: actions/profilesettings.php:111 actions/register.php:448
-#: actions/showgroup.php:255 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:149
+#: actions/showgroup.php:256 actions/tagother.php:104
+#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr ""
@@ -2611,9 +2620,9 @@ msgid "Bio"
msgstr ""
#: actions/profilesettings.php:132 actions/register.php:471
-#: actions/showgroup.php:264 actions/tagother.php:112
+#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
-#: lib/userprofile.php:164
+#: lib/userprofile.php:165
msgid "Location"
msgstr ""
@@ -2627,7 +2636,7 @@ msgstr ""
#: actions/profilesettings.php:145 actions/tagother.php:149
#: actions/tagother.php:209 lib/subscriptionlist.php:106
-#: lib/subscriptionlist.php:108 lib/userprofile.php:209
+#: lib/subscriptionlist.php:108 lib/userprofile.php:210
msgid "Tags"
msgstr ""
@@ -2851,7 +2860,7 @@ msgstr ""
msgid "Recover password"
msgstr ""
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
msgid "Password recovery requested"
msgstr ""
@@ -2871,41 +2880,41 @@ msgstr ""
msgid "Enter a nickname or email address."
msgstr ""
-#: actions/recoverpassword.php:272
+#: actions/recoverpassword.php:282
msgid "No user with that email address or username."
msgstr ""
-#: actions/recoverpassword.php:287
+#: actions/recoverpassword.php:299
msgid "No registered email address for that user."
msgstr ""
-#: actions/recoverpassword.php:301
+#: actions/recoverpassword.php:313
msgid "Error saving address confirmation."
msgstr ""
-#: actions/recoverpassword.php:325
+#: actions/recoverpassword.php:338
msgid ""
"Instructions for recovering your password have been sent to the email "
"address registered to your account."
msgstr ""
-#: actions/recoverpassword.php:344
+#: actions/recoverpassword.php:357
msgid "Unexpected password reset."
msgstr ""
-#: actions/recoverpassword.php:352
+#: actions/recoverpassword.php:365
msgid "Password must be 6 chars or more."
msgstr ""
-#: actions/recoverpassword.php:356
+#: actions/recoverpassword.php:369
msgid "Password and confirmation do not match."
msgstr ""
-#: actions/recoverpassword.php:375 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:248
msgid "Error setting user."
msgstr ""
-#: actions/recoverpassword.php:382
+#: actions/recoverpassword.php:395
msgid "New password successfully saved. You are now logged in."
msgstr ""
@@ -3044,7 +3053,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr ""
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:394
+#: lib/userprofile.php:406
msgid "Subscribe"
msgstr ""
@@ -3080,7 +3089,7 @@ msgstr ""
msgid "You already repeated that notice."
msgstr ""
-#: actions/repeat.php:114 lib/noticelist.php:674
+#: actions/repeat.php:114 lib/noticelist.php:678
msgid "Repeated"
msgstr ""
@@ -3217,8 +3226,8 @@ msgstr ""
msgid "Description"
msgstr ""
-#: actions/showapplication.php:192 actions/showgroup.php:438
-#: lib/profileaction.php:176
+#: actions/showapplication.php:192 actions/showgroup.php:444
+#: lib/profileaction.php:187
msgid "Statistics"
msgstr ""
@@ -3328,67 +3337,67 @@ msgstr ""
msgid "%1$s group, page %2$d"
msgstr ""
-#: actions/showgroup.php:226
+#: actions/showgroup.php:227
msgid "Group profile"
msgstr ""
-#: actions/showgroup.php:271 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:177
+#: actions/showgroup.php:272 actions/tagother.php:118
+#: actions/userauthorization.php:175 lib/userprofile.php:178
msgid "URL"
msgstr ""
-#: actions/showgroup.php:282 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:194
+#: actions/showgroup.php:283 actions/tagother.php:128
+#: actions/userauthorization.php:187 lib/userprofile.php:195
msgid "Note"
msgstr ""
-#: actions/showgroup.php:292 lib/groupeditform.php:184
+#: actions/showgroup.php:293 lib/groupeditform.php:184
msgid "Aliases"
msgstr ""
-#: actions/showgroup.php:301
+#: actions/showgroup.php:302
msgid "Group actions"
msgstr ""
-#: actions/showgroup.php:337
+#: actions/showgroup.php:338
#, php-format
msgid "Notice feed for %s group (RSS 1.0)"
msgstr ""
-#: actions/showgroup.php:343
+#: actions/showgroup.php:344
#, php-format
msgid "Notice feed for %s group (RSS 2.0)"
msgstr ""
-#: actions/showgroup.php:349
+#: actions/showgroup.php:350
#, php-format
msgid "Notice feed for %s group (Atom)"
msgstr ""
-#: actions/showgroup.php:354
+#: actions/showgroup.php:355
#, php-format
msgid "FOAF for %s group"
msgstr ""
-#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91
+#: actions/showgroup.php:393 actions/showgroup.php:453 lib/groupnav.php:91
msgid "Members"
msgstr ""
-#: actions/showgroup.php:395 lib/profileaction.php:117
-#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95
-#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71
+#: actions/showgroup.php:398 lib/profileaction.php:117
+#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95
+#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
msgid "(None)"
msgstr ""
-#: actions/showgroup.php:401
+#: actions/showgroup.php:404
msgid "All members"
msgstr ""
-#: actions/showgroup.php:441
+#: actions/showgroup.php:447
msgid "Created"
msgstr ""
-#: actions/showgroup.php:457
+#: actions/showgroup.php:463
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3398,7 +3407,7 @@ msgid ""
"of this group and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
-#: actions/showgroup.php:463
+#: actions/showgroup.php:469
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3407,7 +3416,7 @@ msgid ""
"their life and interests. "
msgstr ""
-#: actions/showgroup.php:491
+#: actions/showgroup.php:497
msgid "Admins"
msgstr ""
@@ -3534,7 +3543,7 @@ msgid "Unknown language \"%s\"."
msgstr ""
#: actions/siteadminpanel.php:165
-msgid "Minimum text limit is 140 characters."
+msgid "Minimum text limit is 0 (unlimited)."
msgstr ""
#: actions/siteadminpanel.php:171
@@ -3795,8 +3804,7 @@ msgstr ""
msgid "You are not subscribed to that profile."
msgstr ""
-#: actions/subedit.php:83 classes/Subscription.php:89
-#: classes/Subscription.php:116
+#: actions/subedit.php:83 classes/Subscription.php:132
msgid "Could not save subscription."
msgstr ""
@@ -3887,11 +3895,11 @@ msgstr ""
msgid "%s is not listening to anyone."
msgstr ""
-#: actions/subscriptions.php:199
+#: actions/subscriptions.php:208
msgid "Jabber"
msgstr ""
-#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:222 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr ""
@@ -3924,12 +3932,12 @@ msgstr ""
msgid "Tag %s"
msgstr ""
-#: actions/tagother.php:77 lib/userprofile.php:75
+#: actions/tagother.php:77 lib/userprofile.php:76
msgid "User profile"
msgstr ""
#: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:102
+#: lib/userprofile.php:103
msgid "Photo"
msgstr ""
@@ -4233,7 +4241,7 @@ msgstr ""
msgid "Plugins"
msgstr ""
-#: actions/version.php:196 lib/action.php:767
+#: actions/version.php:196 lib/action.php:766
msgid "Version"
msgstr ""
@@ -4241,19 +4249,19 @@ msgstr ""
msgid "Author(s)"
msgstr ""
-#: classes/File.php:144
+#: classes/File.php:169
#, 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:154
+#: classes/File.php:179
#, php-format
msgid "A file this large would exceed your user quota of %d bytes."
msgstr ""
-#: classes/File.php:161
+#: classes/File.php:186
#, php-format
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
@@ -4291,93 +4299,93 @@ msgstr ""
msgid "Could not update message with new URI."
msgstr ""
-#: classes/Notice.php:172
+#: classes/Notice.php:175
#, php-format
msgid "DB error inserting hashtag: %s"
msgstr ""
-#: classes/Notice.php:241
+#: classes/Notice.php:244
msgid "Problem saving notice. Too long."
msgstr ""
-#: classes/Notice.php:245
+#: classes/Notice.php:248
msgid "Problem saving notice. Unknown user."
msgstr ""
-#: classes/Notice.php:250
+#: classes/Notice.php:253
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
-#: classes/Notice.php:256
+#: classes/Notice.php:259
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
msgstr ""
-#: classes/Notice.php:262
+#: classes/Notice.php:265
msgid "You are banned from posting notices on this site."
msgstr ""
-#: classes/Notice.php:328 classes/Notice.php:354
+#: classes/Notice.php:331 classes/Notice.php:357
msgid "Problem saving notice."
msgstr ""
-#: classes/Notice.php:927
+#: classes/Notice.php:943
msgid "Problem saving group inbox."
msgstr ""
-#: classes/Notice.php:1459
+#: classes/Notice.php:1481
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
-#: classes/Subscription.php:66 lib/oauthstore.php:465
+#: classes/Subscription.php:74 lib/oauthstore.php:465
msgid "You have been banned from subscribing."
msgstr ""
-#: classes/Subscription.php:70
+#: classes/Subscription.php:78
msgid "Already subscribed!"
msgstr ""
-#: classes/Subscription.php:74
+#: classes/Subscription.php:82
msgid "User has blocked you."
msgstr ""
-#: classes/Subscription.php:157
+#: classes/Subscription.php:167
msgid "Not subscribed!"
msgstr ""
-#: classes/Subscription.php:163
+#: classes/Subscription.php:173
msgid "Couldn't delete self-subscription."
msgstr ""
-#: classes/Subscription.php:190
+#: classes/Subscription.php:200
msgid "Couldn't delete subscription OMB token."
msgstr ""
-#: classes/Subscription.php:201 lib/subs.php:69
+#: classes/Subscription.php:211
msgid "Couldn't delete subscription."
msgstr ""
-#: classes/User.php:373
+#: classes/User.php:363
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr ""
-#: classes/User_group.php:477
+#: classes/User_group.php:480
msgid "Could not create group."
msgstr ""
-#: classes/User_group.php:486
+#: classes/User_group.php:489
msgid "Could not set group URI."
msgstr ""
-#: classes/User_group.php:507
+#: classes/User_group.php:510
msgid "Could not set group membership."
msgstr ""
-#: classes/User_group.php:521
+#: classes/User_group.php:524
msgid "Could not save local group info."
msgstr ""
@@ -4418,182 +4426,182 @@ msgstr ""
msgid "Untitled page"
msgstr ""
-#: lib/action.php:424
+#: lib/action.php:423
msgid "Primary site navigation"
msgstr ""
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:430
+#: lib/action.php:429
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr ""
-#: lib/action.php:433
+#: lib/action.php:432
msgctxt "MENU"
msgid "Personal"
msgstr ""
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:435
+#: lib/action.php:434
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr ""
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:440
+#: lib/action.php:439
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr ""
-#: lib/action.php:443
+#: lib/action.php:442
msgid "Connect"
msgstr ""
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:446
+#: lib/action.php:445
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr ""
-#: lib/action.php:449
+#: lib/action.php:448
msgctxt "MENU"
msgid "Admin"
msgstr ""
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:453
+#: lib/action.php:452
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr ""
-#: lib/action.php:456
+#: lib/action.php:455
msgctxt "MENU"
msgid "Invite"
msgstr ""
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:462
+#: lib/action.php:461
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr ""
-#: lib/action.php:465
+#: lib/action.php:464
msgctxt "MENU"
msgid "Logout"
msgstr ""
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:470
+#: lib/action.php:469
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr ""
-#: lib/action.php:473
+#: lib/action.php:472
msgctxt "MENU"
msgid "Register"
msgstr ""
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:476
+#: lib/action.php:475
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr ""
-#: lib/action.php:479
+#: lib/action.php:478
msgctxt "MENU"
msgid "Login"
msgstr ""
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:482
+#: lib/action.php:481
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr ""
-#: lib/action.php:485
+#: lib/action.php:484
msgctxt "MENU"
msgid "Help"
msgstr ""
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:488
+#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr ""
-#: lib/action.php:491
+#: lib/action.php:490
msgctxt "MENU"
msgid "Search"
msgstr ""
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:513 lib/adminpanelaction.php:398
+#: lib/action.php:512 lib/adminpanelaction.php:398
msgid "Site notice"
msgstr ""
-#: lib/action.php:579
+#: lib/action.php:578
msgid "Local views"
msgstr ""
-#: lib/action.php:645
+#: lib/action.php:644
msgid "Page notice"
msgstr ""
-#: lib/action.php:747
+#: lib/action.php:746
msgid "Secondary site navigation"
msgstr ""
-#: lib/action.php:752
+#: lib/action.php:751
msgid "Help"
msgstr ""
-#: lib/action.php:754
+#: lib/action.php:753
msgid "About"
msgstr ""
-#: lib/action.php:756
+#: lib/action.php:755
msgid "FAQ"
msgstr ""
-#: lib/action.php:760
+#: lib/action.php:759
msgid "TOS"
msgstr ""
-#: lib/action.php:763
+#: lib/action.php:762
msgid "Privacy"
msgstr ""
-#: lib/action.php:765
+#: lib/action.php:764
msgid "Source"
msgstr ""
-#: lib/action.php:769
+#: lib/action.php:768
msgid "Contact"
msgstr ""
-#: lib/action.php:771
+#: lib/action.php:770
msgid "Badge"
msgstr ""
-#: lib/action.php:799
+#: lib/action.php:798
msgid "StatusNet software license"
msgstr ""
-#: lib/action.php:802
+#: lib/action.php:803
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
"broughtby%%](%%site.broughtbyurl%%). "
msgstr ""
-#: lib/action.php:804
+#: lib/action.php:805
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr ""
-#: lib/action.php:806
+#: lib/action.php:808
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4601,53 +4609,57 @@ msgid ""
"org/licensing/licenses/agpl-3.0.html)."
msgstr ""
-#: lib/action.php:821
+#: lib/action.php:823
msgid "Site content license"
msgstr ""
-#: lib/action.php:826
+#: lib/action.php:828
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
-#: lib/action.php:831
+#: lib/action.php:833
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
-#: lib/action.php:834
+#: lib/action.php:836
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
-#: lib/action.php:847
+#: lib/action.php:849
msgid "All "
msgstr ""
-#: lib/action.php:853
+#: lib/action.php:855
msgid "license."
msgstr ""
-#: lib/action.php:1152
+#: lib/action.php:1154
msgid "Pagination"
msgstr ""
-#: lib/action.php:1161
+#: lib/action.php:1163
msgid "After"
msgstr ""
-#: lib/action.php:1169
+#: lib/action.php:1171
msgid "Before"
msgstr ""
-#: lib/activity.php:453
+#: lib/activity.php:120
+msgid "Expecting a root feed element but got a whole XML document."
+msgstr ""
+
+#: lib/activityutils.php:208
msgid "Can't handle remote content yet."
msgstr ""
-#: lib/activity.php:481
+#: lib/activityutils.php:236
msgid "Can't handle embedded XML content yet."
msgstr ""
-#: lib/activity.php:485
+#: lib/activityutils.php:240
msgid "Can't handle embedded Base64 content yet."
msgstr ""
@@ -4737,7 +4749,7 @@ msgstr ""
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
-#: lib/apiauth.php:272
+#: lib/apiauth.php:276
#, php-format
msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s"
msgstr ""
@@ -4811,11 +4823,11 @@ msgstr ""
msgid "Attachments"
msgstr ""
-#: lib/attachmentlist.php:265
+#: lib/attachmentlist.php:263
msgid "Author"
msgstr ""
-#: lib/attachmentlist.php:278
+#: lib/attachmentlist.php:276
msgid "Provider"
msgstr ""
@@ -4835,37 +4847,50 @@ msgstr ""
msgid "Password changing is not allowed"
msgstr ""
-#: lib/channel.php:138 lib/channel.php:158
+#: lib/channel.php:157 lib/channel.php:177
msgid "Command results"
msgstr ""
-#: lib/channel.php:210 lib/mailhandler.php:142
+#: lib/channel.php:229 lib/mailhandler.php:142
msgid "Command complete"
msgstr ""
-#: lib/channel.php:221
+#: lib/channel.php:240
msgid "Command failed"
msgstr ""
-#: lib/command.php:44
-msgid "Sorry, this command is not yet implemented."
+#: lib/command.php:83 lib/command.php:105
+msgid "Notice with that id does not exist"
+msgstr ""
+
+#: lib/command.php:99 lib/command.php:570
+msgid "User has no last notice"
msgstr ""
-#: lib/command.php:88
+#: lib/command.php:125
#, php-format
msgid "Could not find a user with nickname %s"
msgstr ""
-#: lib/command.php:92
+#: lib/command.php:143
+#, php-format
+msgid "Could not find a local user with nickname %s"
+msgstr ""
+
+#: lib/command.php:176
+msgid "Sorry, this command is not yet implemented."
+msgstr ""
+
+#: lib/command.php:221
msgid "It does not make a lot of sense to nudge yourself!"
msgstr ""
-#: lib/command.php:99
+#: lib/command.php:228
#, php-format
msgid "Nudge sent to %s"
msgstr ""
-#: lib/command.php:126
+#: lib/command.php:254
#, php-format
msgid ""
"Subscriptions: %1$s\n"
@@ -4873,195 +4898,193 @@ msgid ""
"Notices: %3$s"
msgstr ""
-#: lib/command.php:152 lib/command.php:390 lib/command.php:451
-msgid "Notice with that id does not exist"
-msgstr ""
-
-#: lib/command.php:168 lib/command.php:406 lib/command.php:467
-#: lib/command.php:523
-msgid "User has no last notice"
-msgstr ""
-
-#: lib/command.php:190
+#: lib/command.php:296
msgid "Notice marked as fave."
msgstr ""
-#: lib/command.php:217
+#: lib/command.php:317
msgid "You are already a member of that group"
msgstr ""
-#: lib/command.php:231
+#: lib/command.php:331
#, php-format
msgid "Could not join user %s to group %s"
msgstr ""
-#: lib/command.php:236
+#: lib/command.php:336
#, php-format
msgid "%s joined group %s"
msgstr ""
-#: lib/command.php:275
+#: lib/command.php:373
#, php-format
msgid "Could not remove user %s to group %s"
msgstr ""
-#: lib/command.php:280
+#: lib/command.php:378
#, php-format
msgid "%s left group %s"
msgstr ""
-#: lib/command.php:309
+#: lib/command.php:401
#, php-format
msgid "Fullname: %s"
msgstr ""
-#: lib/command.php:312 lib/mail.php:258
+#: lib/command.php:404 lib/mail.php:258
#, php-format
msgid "Location: %s"
msgstr ""
-#: lib/command.php:315 lib/mail.php:260
+#: lib/command.php:407 lib/mail.php:260
#, php-format
msgid "Homepage: %s"
msgstr ""
-#: lib/command.php:318
+#: lib/command.php:410
#, php-format
msgid "About: %s"
msgstr ""
-#: lib/command.php:349
+#: lib/command.php:437
+#, php-format
+msgid ""
+"%s is a remote profile; you can only send direct messages to users on the "
+"same server."
+msgstr ""
+
+#: lib/command.php:450
#, php-format
msgid "Message too long - maximum is %d characters, you sent %d"
msgstr ""
-#: lib/command.php:367
+#: lib/command.php:468
#, php-format
msgid "Direct message to %s sent"
msgstr ""
-#: lib/command.php:369
+#: lib/command.php:470
msgid "Error sending direct message."
msgstr ""
-#: lib/command.php:413
+#: lib/command.php:490
msgid "Cannot repeat your own notice"
msgstr ""
-#: lib/command.php:418
+#: lib/command.php:495
msgid "Already repeated that notice"
msgstr ""
-#: lib/command.php:426
+#: lib/command.php:503
#, php-format
msgid "Notice from %s repeated"
msgstr ""
-#: lib/command.php:428
+#: lib/command.php:505
msgid "Error repeating notice."
msgstr ""
-#: lib/command.php:482
+#: lib/command.php:536
#, php-format
msgid "Notice too long - maximum is %d characters, you sent %d"
msgstr ""
-#: lib/command.php:491
+#: lib/command.php:545
#, php-format
msgid "Reply to %s sent"
msgstr ""
-#: lib/command.php:493
+#: lib/command.php:547
msgid "Error saving notice."
msgstr ""
-#: lib/command.php:547
+#: lib/command.php:594
msgid "Specify the name of the user to subscribe to"
msgstr ""
-#: lib/command.php:554 lib/command.php:589
-msgid "No such user"
+#: lib/command.php:602
+msgid "Can't subscribe to OMB profiles by command."
msgstr ""
-#: lib/command.php:561
+#: lib/command.php:608
#, php-format
msgid "Subscribed to %s"
msgstr ""
-#: lib/command.php:582 lib/command.php:685
+#: lib/command.php:629 lib/command.php:728
msgid "Specify the name of the user to unsubscribe from"
msgstr ""
-#: lib/command.php:595
+#: lib/command.php:638
#, php-format
msgid "Unsubscribed from %s"
msgstr ""
-#: lib/command.php:613 lib/command.php:636
+#: lib/command.php:656 lib/command.php:679
msgid "Command not yet implemented."
msgstr ""
-#: lib/command.php:616
+#: lib/command.php:659
msgid "Notification off."
msgstr ""
-#: lib/command.php:618
+#: lib/command.php:661
msgid "Can't turn off notification."
msgstr ""
-#: lib/command.php:639
+#: lib/command.php:682
msgid "Notification on."
msgstr ""
-#: lib/command.php:641
+#: lib/command.php:684
msgid "Can't turn on notification."
msgstr ""
-#: lib/command.php:654
+#: lib/command.php:697
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:665
+#: lib/command.php:708
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:692
+#: lib/command.php:735
#, php-format
msgid "Unsubscribed %s"
msgstr ""
-#: lib/command.php:709
+#: lib/command.php:752
msgid "You are not subscribed to anyone."
msgstr ""
-#: lib/command.php:711
+#: lib/command.php:754
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] ""
msgstr[1] ""
-#: lib/command.php:731
+#: lib/command.php:774
msgid "No one is subscribed to you."
msgstr ""
-#: lib/command.php:733
+#: lib/command.php:776
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] ""
msgstr[1] ""
-#: lib/command.php:753
+#: lib/command.php:796
msgid "You are not a member of any groups."
msgstr ""
-#: lib/command.php:755
+#: lib/command.php:798
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] ""
msgstr[1] ""
-#: lib/command.php:769
+#: lib/command.php:812
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5103,19 +5126,19 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:148
+#: lib/common.php:135
msgid "No configuration file found. "
msgstr ""
-#: lib/common.php:149
+#: lib/common.php:136
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:151
+#: lib/common.php:138
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:152
+#: lib/common.php:139
msgid "Go to the installer."
msgstr ""
@@ -5289,49 +5312,49 @@ msgstr ""
msgid "This page is not available in a media type you accept"
msgstr ""
-#: lib/imagefile.php:75
+#: lib/imagefile.php:72
+msgid "Unsupported image file format."
+msgstr ""
+
+#: lib/imagefile.php:88
#, php-format
msgid "That file is too big. The maximum file size is %s."
msgstr ""
-#: lib/imagefile.php:80
+#: lib/imagefile.php:93
msgid "Partial upload."
msgstr ""
-#: lib/imagefile.php:88 lib/mediafile.php:170
+#: lib/imagefile.php:101 lib/mediafile.php:170
msgid "System error uploading file."
msgstr ""
-#: lib/imagefile.php:96
-msgid "Not an image or corrupt file."
-msgstr ""
-
#: lib/imagefile.php:109
-msgid "Unsupported image file format."
+msgid "Not an image or corrupt file."
msgstr ""
#: lib/imagefile.php:122
msgid "Lost our file."
msgstr ""
-#: lib/imagefile.php:166 lib/imagefile.php:231
+#: lib/imagefile.php:163 lib/imagefile.php:224
msgid "Unknown file type"
msgstr ""
-#: lib/imagefile.php:251
+#: lib/imagefile.php:244
msgid "MB"
msgstr ""
-#: lib/imagefile.php:253
+#: lib/imagefile.php:246
msgid "kB"
msgstr ""
-#: lib/jabber.php:220
+#: lib/jabber.php:387
#, php-format
msgid "[%s]"
msgstr ""
-#: lib/jabber.php:400
+#: lib/jabber.php:567
#, php-format
msgid "Unknown inbox source %d."
msgstr ""
@@ -5526,7 +5549,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:482
+#: lib/mailbox.php:227 lib/noticelist.php:486
msgid "from"
msgstr ""
@@ -5651,48 +5674,48 @@ msgid ""
"try again later"
msgstr ""
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr ""
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "N"
msgstr ""
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "S"
msgstr ""
-#: lib/noticelist.php:431
+#: lib/noticelist.php:432
msgid "E"
msgstr ""
-#: lib/noticelist.php:431
+#: lib/noticelist.php:432
msgid "W"
msgstr ""
-#: lib/noticelist.php:438
+#: lib/noticelist.php:439
msgid "at"
msgstr ""
-#: lib/noticelist.php:566
+#: lib/noticelist.php:570
msgid "in context"
msgstr ""
-#: lib/noticelist.php:601
+#: lib/noticelist.php:605
msgid "Repeated by"
msgstr ""
-#: lib/noticelist.php:628
+#: lib/noticelist.php:632
msgid "Reply to this notice"
msgstr ""
-#: lib/noticelist.php:629
+#: lib/noticelist.php:633
msgid "Reply"
msgstr ""
-#: lib/noticelist.php:673
+#: lib/noticelist.php:677
msgid "Notice repeated"
msgstr ""
@@ -5765,7 +5788,7 @@ msgstr ""
msgid "Unknown"
msgstr ""
-#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr ""
@@ -5773,23 +5796,28 @@ msgstr ""
msgid "All subscriptions"
msgstr ""
-#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90
+#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr ""
-#: lib/profileaction.php:159
+#: lib/profileaction.php:161
msgid "All subscribers"
msgstr ""
-#: lib/profileaction.php:180
+#: lib/profileaction.php:191
msgid "User ID"
msgstr ""
-#: lib/profileaction.php:185
+#: lib/profileaction.php:196
msgid "Member since"
msgstr ""
-#: lib/profileaction.php:247
+#. TRANS: Average count of posts made per day since account registration
+#: lib/profileaction.php:235
+msgid "Daily average"
+msgstr ""
+
+#: lib/profileaction.php:264
msgid "All groups"
msgstr ""
@@ -5834,7 +5862,7 @@ msgstr ""
msgid "Revoke the \"%s\" role from this user"
msgstr ""
-#: lib/router.php:671
+#: lib/router.php:704
msgid "No single user defined for single-user mode."
msgstr ""
@@ -5960,89 +5988,98 @@ msgstr ""
msgid "Unsubscribe"
msgstr ""
-#: lib/userprofile.php:116
+#: lib/usernoprofileexception.php:58
+#, php-format
+msgid "User %s (%d) has no profile record."
+msgstr ""
+
+#: lib/userprofile.php:117
msgid "Edit Avatar"
msgstr ""
-#: lib/userprofile.php:236
+#: lib/userprofile.php:234 lib/userprofile.php:248
msgid "User actions"
msgstr ""
-#: lib/userprofile.php:251
+#: lib/userprofile.php:237
+msgid "User deletion in progress..."
+msgstr ""
+
+#: lib/userprofile.php:263
msgid "Edit profile settings"
msgstr ""
-#: lib/userprofile.php:252
+#: lib/userprofile.php:264
msgid "Edit"
msgstr ""
-#: lib/userprofile.php:275
+#: lib/userprofile.php:287
msgid "Send a direct message to this user"
msgstr ""
-#: lib/userprofile.php:276
+#: lib/userprofile.php:288
msgid "Message"
msgstr ""
-#: lib/userprofile.php:314
+#: lib/userprofile.php:326
msgid "Moderate"
msgstr ""
-#: lib/userprofile.php:352
+#: lib/userprofile.php:364
msgid "User role"
msgstr ""
-#: lib/userprofile.php:354
+#: lib/userprofile.php:366
msgctxt "role"
msgid "Administrator"
msgstr ""
-#: lib/userprofile.php:355
+#: lib/userprofile.php:367
msgctxt "role"
msgid "Moderator"
msgstr ""
-#: lib/util.php:1015
+#: lib/util.php:1046
msgid "a few seconds ago"
msgstr ""
-#: lib/util.php:1017
+#: lib/util.php:1048
msgid "about a minute ago"
msgstr ""
-#: lib/util.php:1019
+#: lib/util.php:1050
#, php-format
msgid "about %d minutes ago"
msgstr ""
-#: lib/util.php:1021
+#: lib/util.php:1052
msgid "about an hour ago"
msgstr ""
-#: lib/util.php:1023
+#: lib/util.php:1054
#, php-format
msgid "about %d hours ago"
msgstr ""
-#: lib/util.php:1025
+#: lib/util.php:1056
msgid "about a day ago"
msgstr ""
-#: lib/util.php:1027
+#: lib/util.php:1058
#, php-format
msgid "about %d days ago"
msgstr ""
-#: lib/util.php:1029
+#: lib/util.php:1060
msgid "about a month ago"
msgstr ""
-#: lib/util.php:1031
+#: lib/util.php:1062
#, php-format
msgid "about %d months ago"
msgstr ""
-#: lib/util.php:1033
+#: lib/util.php:1064
msgid "about a year ago"
msgstr ""
@@ -6056,7 +6093,7 @@ msgstr ""
msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr ""
-#: lib/xmppmanager.php:402
+#: lib/xmppmanager.php:403
#, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d."
msgstr ""
diff --git a/locale/sv/LC_MESSAGES/statusnet.po b/locale/sv/LC_MESSAGES/statusnet.po
index 2a508849f..fa45376a2 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-03-06 23:49+0000\n"
-"PO-Revision-Date: 2010-03-06 23:50:58+0000\n"
+"POT-Creation-Date: 2010-04-06 22:53+0000\n"
+"PO-Revision-Date: 2010-04-06 22:55:20+0000\n"
"Language-Team: Swedish\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64665); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: sv\n"
"X-Message-Group: out-statusnet\n"
@@ -92,9 +92,9 @@ msgstr "Ingen sådan sida"
#: 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:90
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78
+#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
@@ -103,10 +103,8 @@ msgstr "Ingen sådan sida"
#: actions/remotesubscribe.php:154 actions/replies.php:73
#: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:163 lib/command.php:302
-#: lib/command.php:355 lib/command.php:401 lib/command.php:462
-#: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82
-#: lib/profileaction.php:77
+#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: lib/mailbox.php:82 lib/profileaction.php:77
msgid "No such user."
msgstr "Ingen sådan användare."
@@ -200,18 +198,18 @@ msgstr "Uppdateringar från %1$s och vänner på %2$s!"
#: 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:132
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:136
#: actions/apigrouplistall.php:120 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:135
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
-#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184
-#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148
+#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:174
+#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173
+#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
-#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
+#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
msgid "API method not found."
msgstr "API-metod hittades inte."
@@ -224,8 +222,8 @@ msgstr "API-metod hittades inte."
#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65
-#: actions/apistatusesupdate.php:118
+#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
msgid "This method requires a POST."
msgstr "Denna metod kräver en POST."
@@ -254,7 +252,7 @@ msgid "Could not save profile."
msgstr "Kunde inte spara profil."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:97
+#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
#: actions/designadminpanel.php:122 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
@@ -340,7 +338,7 @@ msgstr "Ingen status hittad med det ID:t."
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:176
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
msgid "Could not create favorite."
msgstr "Kunde inte skapa favorit."
@@ -458,7 +456,7 @@ msgstr "Grupp hittades inte!"
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:221
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
msgid "You have been blocked from that group by the admin."
msgstr "Du har blivit blockerad från denna grupp av administratören."
@@ -476,11 +474,18 @@ msgstr "Du är inte en medlem i denna grupp."
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."
-#: actions/apigrouplist.php:95
+#. TRANS: %s is a user name
+#: actions/apigrouplist.php:97
#, 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
+#, php-format
+msgid "%1$s groups %2$s is a member of."
+msgstr "%1$s grupper %2$s är en medlem i."
+
#: actions/apigrouplistall.php:90 actions/usergroups.php:62
#, php-format
msgid "%s groups"
@@ -508,7 +513,7 @@ msgstr "Ogiltig token."
#: 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:337
+#: actions/profilesettings.php:194 actions/recoverpassword.php:350
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
@@ -569,15 +574,15 @@ msgstr ""
"möjligheten att <strong>%3$s</strong> din %4$s kontoinformation. Du bör bara "
"ge tillgång till ditt %4$s-konto till tredje-parter du litar på."
-#: actions/apioauthauthorize.php:310 lib/action.php:438
+#: actions/apioauthauthorize.php:310 lib/action.php:437
msgid "Account"
msgstr "Konto"
#: actions/apioauthauthorize.php:313 actions/login.php:230
#: actions/profilesettings.php:106 actions/register.php:424
-#: actions/showgroup.php:244 actions/tagother.php:94
+#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
-#: lib/userprofile.php:131
+#: lib/userprofile.php:132
msgid "Nickname"
msgstr "Smeknamn"
@@ -646,12 +651,12 @@ msgstr "Maximal notisstorlek är %d tecken, inklusive URL för bilaga."
msgid "Unsupported format."
msgstr "Format som inte stödjs."
-#: actions/apitimelinefavorites.php:108
+#: actions/apitimelinefavorites.php:109
#, php-format
msgid "%1$s / Favorites from %2$s"
msgstr "%1$s / Favoriter från %2$s"
-#: actions/apitimelinefavorites.php:117
+#: actions/apitimelinefavorites.php:118
#, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "%1$s uppdateringar markerade som favorit av %2$s / %2$s."
@@ -661,7 +666,7 @@ msgstr "%1$s uppdateringar markerade som favorit av %2$s / %2$s."
msgid "%1$s / Updates mentioning %2$s"
msgstr "%1$s / Uppdateringar som nämner %2$s"
-#: actions/apitimelinementions.php:127
+#: actions/apitimelinementions.php:130
#, 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."
@@ -671,7 +676,7 @@ msgstr "%1$s uppdateringar med svar på uppdatering från %2$s / %3$s."
msgid "%s public timeline"
msgstr "%s publika tidslinje"
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "%s uppdateringar från alla!"
@@ -686,12 +691,12 @@ msgstr "Upprepat till %s"
msgid "Repeats of %s"
msgstr "Upprepningar av %s"
-#: actions/apitimelinetag.php:102 actions/tag.php:67
+#: actions/apitimelinetag.php:104 actions/tag.php:67
#, php-format
msgid "Notices tagged with %s"
msgstr "Notiser taggade med %s"
-#: actions/apitimelinetag.php:104 actions/tagrss.php:65
+#: actions/apitimelinetag.php:106 actions/tagrss.php:65
#, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Uppdateringar taggade med %1$s på %2$s!"
@@ -719,7 +724,7 @@ msgstr "Ingen storlek."
msgid "Invalid size."
msgstr "Ogiltig storlek."
-#: actions/avatarsettings.php:67 actions/showgroup.php:229
+#: actions/avatarsettings.php:67 actions/showgroup.php:230
#: lib/accountsettingsaction.php:112
msgid "Avatar"
msgstr "Avatar"
@@ -752,7 +757,7 @@ msgid "Preview"
msgstr "Förhandsgranska"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:655
+#: lib/deleteuserform.php:66 lib/noticelist.php:659
msgid "Delete"
msgstr "Ta bort"
@@ -764,23 +769,27 @@ msgstr "Ladda upp"
msgid "Crop"
msgstr "Beskär"
-#: actions/avatarsettings.php:328
+#: actions/avatarsettings.php:305
+msgid "No file uploaded."
+msgstr "Ingen fil laddades upp."
+
+#: actions/avatarsettings.php:332
msgid "Pick a square area of the image to be your avatar"
msgstr "Välj ett kvadratiskt område i bilden som din avatar"
-#: actions/avatarsettings.php:343 actions/grouplogo.php:380
+#: actions/avatarsettings.php:347 actions/grouplogo.php:380
msgid "Lost our file data."
msgstr "Förlorade vår fildata."
-#: actions/avatarsettings.php:366
+#: actions/avatarsettings.php:370
msgid "Avatar updated."
msgstr "Avatar uppdaterad."
-#: actions/avatarsettings.php:369
+#: actions/avatarsettings.php:373
msgid "Failed updating avatar."
msgstr "Misslyckades uppdatera avatar."
-#: actions/avatarsettings.php:393
+#: actions/avatarsettings.php:397
msgid "Avatar deleted."
msgstr "Avatar borttagen."
@@ -818,7 +827,7 @@ msgstr "Blockera inte denna användare"
msgid "Yes"
msgstr "Ja"
-#: actions/block.php:144 actions/groupmembers.php:355 lib/blockform.php:80
+#: actions/block.php:144 actions/groupmembers.php:373 lib/blockform.php:80
msgid "Block this user"
msgstr "Blockera denna användare"
@@ -835,8 +844,8 @@ msgstr "Misslyckades att spara blockeringsinformation."
#: actions/groupunblock.php:86 actions/joingroup.php:82
#: actions/joingroup.php:93 actions/leavegroup.php:82
#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212
-#: lib/command.php:260
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162
+#: lib/command.php:358
msgid "No such group."
msgstr "Ingen sådan grupp."
@@ -919,7 +928,7 @@ msgid "Conversation"
msgstr "Konversationer"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:218 lib/searchgroupnav.php:82
+#: lib/profileaction.php:229 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "Notiser"
@@ -938,7 +947,7 @@ msgstr "Du är inte ägaren av denna applikation."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1217
+#: lib/action.php:1219
msgid "There was a problem with your session token."
msgstr "Det var ett problem med din sessions-token."
@@ -999,7 +1008,7 @@ msgstr "Är du säker på att du vill ta bort denna notis?"
msgid "Do not delete this notice"
msgstr "Ta inte bort denna notis"
-#: actions/deletenotice.php:146 lib/noticelist.php:655
+#: actions/deletenotice.php:146 lib/noticelist.php:659
msgid "Delete this notice"
msgstr "Ta bort denna notis"
@@ -1136,7 +1145,7 @@ msgstr "Återställ till standardvärde"
#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:208
+#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
#: actions/tagother.php:154 actions/useradminpanel.php:294
#: lib/applicationeditform.php:333 lib/applicationeditform.php:334
#: lib/designsettings.php:256 lib/groupeditform.php:202
@@ -1252,7 +1261,7 @@ msgstr "beskrivning är för lång (max %d tecken)."
msgid "Could not update group."
msgstr "Kunde inte uppdatera grupp."
-#: actions/editgroup.php:264 classes/User_group.php:493
+#: actions/editgroup.php:264 classes/User_group.php:496
msgid "Could not create aliases."
msgstr "Kunde inte skapa alias."
@@ -1613,7 +1622,7 @@ msgstr "Användaren är redan blockerad från grupp."
msgid "User is not a member of group."
msgstr "Användare är inte en gruppmedlem."
-#: actions/groupblock.php:136 actions/groupmembers.php:323
+#: actions/groupblock.php:136 actions/groupmembers.php:341
msgid "Block user from group"
msgstr "Blockera användare från grupp"
@@ -1714,19 +1723,19 @@ msgstr "En lista av användarna i denna grupp."
msgid "Admin"
msgstr "Administratör"
-#: actions/groupmembers.php:355 lib/blockform.php:69
+#: actions/groupmembers.php:373 lib/blockform.php:69
msgid "Block"
msgstr "Blockera"
-#: actions/groupmembers.php:450
+#: actions/groupmembers.php:468
msgid "Make user an admin of the group"
msgstr "Gör användare till en administratör för gruppen"
-#: actions/groupmembers.php:482
+#: actions/groupmembers.php:500
msgid "Make Admin"
msgstr "Gör till administratör"
-#: actions/groupmembers.php:482
+#: actions/groupmembers.php:500
msgid "Make this user an admin"
msgstr "Gör denna användare till administratör"
@@ -1741,7 +1750,7 @@ msgstr "%s tidslinje"
msgid "Updates from members of %1$s on %2$s!"
msgstr "Uppdateringar från medlemmar i %1$s på %2$s!"
-#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232
+#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249
#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr "Grupper"
@@ -1954,7 +1963,7 @@ msgstr "Bjud in nya användare"
msgid "You are already subscribed to these users:"
msgstr "Du prenumererar redan på dessa användare:"
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
#, php-format
msgid "%1$s (%2$s)"
msgstr "%1$s (%2$s)"
@@ -2086,7 +2095,7 @@ msgstr "%1$s gick med i grupp %2$s"
msgid "You must be logged in to leave a group."
msgstr "Du måste vara inloggad för att lämna en grupp."
-#: actions/leavegroup.php:100 lib/command.php:265
+#: actions/leavegroup.php:100 lib/command.php:363
msgid "You are not a member of that group."
msgstr "Du är inte en medlem i den gruppen."
@@ -2199,12 +2208,12 @@ msgstr "Använd detta formulär för att skapa en ny grupp."
msgid "New message"
msgstr "Nytt meddelande"
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
msgid "You can't send a message to this user."
msgstr "Du kan inte skicka ett meddelande till den användaren."
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342
-#: lib/command.php:475
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
+#: lib/command.php:529
msgid "No content!"
msgstr "Inget innehåll!"
@@ -2212,7 +2221,7 @@ msgstr "Inget innehåll!"
msgid "No recipient specified."
msgstr "Ingen mottagare angiven."
-#: actions/newmessage.php:164 lib/command.php:361
+#: actions/newmessage.php:164 lib/command.php:462
msgid ""
"Don't send a message to yourself; just say it to yourself quietly instead."
msgstr ""
@@ -2228,7 +2237,7 @@ msgstr "Meddelande skickat"
msgid "Direct message to %s sent."
msgstr "Direktmeddelande till %s skickat."
-#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189
msgid "Ajax Error"
msgstr "AJAX-fel"
@@ -2236,7 +2245,7 @@ msgstr "AJAX-fel"
msgid "New notice"
msgstr "Ny notis"
-#: actions/newnotice.php:211
+#: actions/newnotice.php:217
msgid "Notice posted"
msgstr "Notis postad"
@@ -2348,7 +2357,7 @@ msgstr ""
msgid "Notice has no profile"
msgstr "Notisen har ingen profil"
-#: actions/oembed.php:86 actions/shownotice.php:180
+#: actions/oembed.php:86 actions/shownotice.php:175
#, php-format
msgid "%1$s's status on %2$s"
msgstr "%1$ss status den %2$s"
@@ -2361,8 +2370,8 @@ msgstr "innehållstyp "
msgid "Only "
msgstr "Bara "
-#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042
-#: lib/apiaction.php:1070 lib/apiaction.php:1179
+#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1068
+#: lib/apiaction.php:1096 lib/apiaction.php:1212
msgid "Not a supported data format."
msgstr "Ett dataformat som inte stödjs"
@@ -2493,7 +2502,7 @@ msgstr "Felaktigt gammalt lösenord"
msgid "Error saving user; invalid."
msgstr "Fel vid sparande av användare; ogiltig."
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
msgid "Can't save new password."
msgstr "Kan inte spara nytt lösenord."
@@ -2668,12 +2677,12 @@ msgstr ""
msgid "People search"
msgstr "Personsökning"
-#: actions/peopletag.php:70
+#: actions/peopletag.php:68
#, php-format
msgid "Not a valid people tag: %s"
msgstr "Inte en giltig persontagg: %s"
-#: actions/peopletag.php:144
+#: actions/peopletag.php:142
#, php-format
msgid "Users self-tagged with %1$s - page %2$d"
msgstr "Användare som taggat sig själv med %1$s - sida %2$d"
@@ -2707,8 +2716,8 @@ 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/showgroup.php:255 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:149
+#: actions/showgroup.php:256 actions/tagother.php:104
+#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Fullständigt namn"
@@ -2735,9 +2744,9 @@ msgid "Bio"
msgstr "Biografi"
#: actions/profilesettings.php:132 actions/register.php:471
-#: actions/showgroup.php:264 actions/tagother.php:112
+#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
-#: lib/userprofile.php:164
+#: lib/userprofile.php:165
msgid "Location"
msgstr "Plats"
@@ -2751,7 +2760,7 @@ msgstr "Dela min nuvarande plats när jag skickar notiser"
#: actions/profilesettings.php:145 actions/tagother.php:149
#: actions/tagother.php:209 lib/subscriptionlist.php:106
-#: lib/subscriptionlist.php:108 lib/userprofile.php:209
+#: lib/subscriptionlist.php:108 lib/userprofile.php:210
msgid "Tags"
msgstr "Taggar"
@@ -2995,7 +3004,7 @@ msgstr "Återställ lösenord"
msgid "Recover password"
msgstr "Återskapa lösenord"
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
msgid "Password recovery requested"
msgstr "Återskapande av lösenord begärd"
@@ -3015,19 +3024,19 @@ msgstr "Återställ"
msgid "Enter a nickname or email address."
msgstr "Skriv in ett smeknamn eller en e-postadress."
-#: actions/recoverpassword.php:272
+#: actions/recoverpassword.php:282
msgid "No user with that email address or username."
msgstr "Ingen användare med den e-postadressen eller användarnamn."
-#: actions/recoverpassword.php:287
+#: actions/recoverpassword.php:299
msgid "No registered email address for that user."
msgstr "Ingen registrerad e-postadress för den användaren."
-#: actions/recoverpassword.php:301
+#: actions/recoverpassword.php:313
msgid "Error saving address confirmation."
msgstr "Fel vid sparande av adressbekräftelse."
-#: actions/recoverpassword.php:325
+#: actions/recoverpassword.php:338
msgid ""
"Instructions for recovering your password have been sent to the email "
"address registered to your account."
@@ -3035,23 +3044,23 @@ msgstr ""
"Instruktioner för att återställa ditt lösenord har skickats till e-"
"postadressen som är registrerat till ditt konto "
-#: actions/recoverpassword.php:344
+#: actions/recoverpassword.php:357
msgid "Unexpected password reset."
msgstr "Oväntad återställning av lösenord."
-#: actions/recoverpassword.php:352
+#: actions/recoverpassword.php:365
msgid "Password must be 6 chars or more."
msgstr "Lösenordet måste vara minst 6 tecken."
-#: actions/recoverpassword.php:356
+#: actions/recoverpassword.php:369
msgid "Password and confirmation do not match."
msgstr "Lösenord och bekräftelse matchar inte."
-#: actions/recoverpassword.php:375 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:248
msgid "Error setting user."
msgstr "Fel uppstog i användarens inställning"
-#: actions/recoverpassword.php:382
+#: actions/recoverpassword.php:395
msgid "New password successfully saved. You are now logged in."
msgstr "Nya lösenordet sparat. Du är nu inloggad."
@@ -3218,7 +3227,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "URL till din profil på en annan kompatibel mikrobloggtjänst"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:394
+#: lib/userprofile.php:406
msgid "Subscribe"
msgstr "Prenumerera"
@@ -3256,7 +3265,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:674
+#: actions/repeat.php:114 lib/noticelist.php:678
msgid "Repeated"
msgstr "Upprepad"
@@ -3327,9 +3336,8 @@ msgid "You cannot revoke user roles on this site."
msgstr "Du kan inte återkalla användarroller på denna webbplats."
#: actions/revokerole.php:82
-#, fuzzy
msgid "User doesn't have this role."
-msgstr "Användare utan matchande profil."
+msgstr "Användare har inte denna roll."
#: actions/rsd.php:146 actions/version.php:157
msgid "StatusNet"
@@ -3400,8 +3408,8 @@ msgstr "Organisation"
msgid "Description"
msgstr "Beskrivning"
-#: actions/showapplication.php:192 actions/showgroup.php:438
-#: lib/profileaction.php:176
+#: actions/showapplication.php:192 actions/showgroup.php:444
+#: lib/profileaction.php:187
msgid "Statistics"
msgstr "Statistik"
@@ -3522,67 +3530,67 @@ msgstr "%s grupp"
msgid "%1$s group, page %2$d"
msgstr "%1$s grupp, sida %2$d"
-#: actions/showgroup.php:226
+#: actions/showgroup.php:227
msgid "Group profile"
msgstr "Grupprofil"
-#: actions/showgroup.php:271 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:177
+#: actions/showgroup.php:272 actions/tagother.php:118
+#: actions/userauthorization.php:175 lib/userprofile.php:178
msgid "URL"
msgstr "URL"
-#: actions/showgroup.php:282 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:194
+#: actions/showgroup.php:283 actions/tagother.php:128
+#: actions/userauthorization.php:187 lib/userprofile.php:195
msgid "Note"
msgstr "Notis"
-#: actions/showgroup.php:292 lib/groupeditform.php:184
+#: actions/showgroup.php:293 lib/groupeditform.php:184
msgid "Aliases"
msgstr "Alias"
-#: actions/showgroup.php:301
+#: actions/showgroup.php:302
msgid "Group actions"
msgstr "Åtgärder för grupp"
-#: actions/showgroup.php:337
+#: actions/showgroup.php:338
#, php-format
msgid "Notice feed for %s group (RSS 1.0)"
msgstr "Flöde av notiser för %s grupp (RSS 1.0)"
-#: actions/showgroup.php:343
+#: actions/showgroup.php:344
#, php-format
msgid "Notice feed for %s group (RSS 2.0)"
msgstr "Flöde av notiser för %s grupp (RSS 2.0)"
-#: actions/showgroup.php:349
+#: actions/showgroup.php:350
#, php-format
msgid "Notice feed for %s group (Atom)"
msgstr "Flöde av notiser för %s grupp (Atom)"
-#: actions/showgroup.php:354
+#: actions/showgroup.php:355
#, php-format
msgid "FOAF for %s group"
msgstr "FOAF för %s grupp"
-#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91
+#: actions/showgroup.php:393 actions/showgroup.php:453 lib/groupnav.php:91
msgid "Members"
msgstr "Medlemmar"
-#: actions/showgroup.php:395 lib/profileaction.php:117
-#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95
-#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71
+#: actions/showgroup.php:398 lib/profileaction.php:117
+#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95
+#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
msgid "(None)"
msgstr "(Ingen)"
-#: actions/showgroup.php:401
+#: actions/showgroup.php:404
msgid "All members"
msgstr "Alla medlemmar"
-#: actions/showgroup.php:441
+#: actions/showgroup.php:447
msgid "Created"
msgstr "Skapad"
-#: actions/showgroup.php:457
+#: actions/showgroup.php:463
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3597,7 +3605,7 @@ msgstr ""
"sina liv och intressen. [Gå med nu](%%%%action.register%%%%) för att bli en "
"del av denna grupp och många fler! ([Läs mer](%%%%doc.help%%%%))"
-#: actions/showgroup.php:463
+#: actions/showgroup.php:469
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3610,7 +3618,7 @@ msgstr ""
"[StatusNet](http://status.net/). Dess medlemmar delar korta meddelande om "
"sina liv och intressen. "
-#: actions/showgroup.php:491
+#: actions/showgroup.php:497
msgid "Admins"
msgstr "Administratörer"
@@ -3731,7 +3739,6 @@ msgid "User is already silenced."
msgstr "Användaren är redan nedtystad."
#: actions/siteadminpanel.php:69
-#, fuzzy
msgid "Basic settings for this StatusNet site"
msgstr "Grundinställningar för din StatusNet-webbplats"
@@ -3749,8 +3756,8 @@ msgid "Unknown language \"%s\"."
msgstr "Okänt språk \"%s\"."
#: actions/siteadminpanel.php:165
-msgid "Minimum text limit is 140 characters."
-msgstr "Minsta textbegränsning är 140 tecken."
+msgid "Minimum text limit is 0 (unlimited)."
+msgstr "Minsta textbegränsning är 0 (obegränsat)."
#: actions/siteadminpanel.php:171
msgid "Dupe limit must 1 or more seconds."
@@ -3801,13 +3808,14 @@ msgid "Default timezone for the site; usually UTC."
msgstr "Standardtidzon för denna webbplats; vanligtvis UTC."
#: actions/siteadminpanel.php:262
-#, fuzzy
msgid "Default language"
-msgstr "Webbplatsens standardspråk"
+msgstr "Standardspråk"
#: actions/siteadminpanel.php:263
msgid "Site language when autodetection from browser settings is not available"
msgstr ""
+"Webbplatsspråk när automatisk identifiering av inställningar i webbläsaren "
+"inte är tillgänglig"
#: actions/siteadminpanel.php:271
msgid "Limits"
@@ -3831,37 +3839,32 @@ msgstr ""
"Hur länge användare måste vänta (i sekunder) för att posta samma sak igen."
#: actions/sitenoticeadminpanel.php:56
-#, fuzzy
msgid "Site Notice"
msgstr "Webbplatsnotis"
#: actions/sitenoticeadminpanel.php:67
-#, fuzzy
msgid "Edit site-wide message"
-msgstr "Nytt meddelande"
+msgstr "Redigera webbplastsnotis"
#: actions/sitenoticeadminpanel.php:103
-#, fuzzy
msgid "Unable to save site notice."
-msgstr "Kunde inte spara dina utseendeinställningar."
+msgstr "Kunde inte spara webbplatsnotis."
#: actions/sitenoticeadminpanel.php:113
msgid "Max length for the site-wide notice is 255 chars"
-msgstr ""
+msgstr "Maximal längd för webbplatsnotisen är 255 tecken"
#: actions/sitenoticeadminpanel.php:176
-#, fuzzy
msgid "Site notice text"
-msgstr "Webbplatsnotis"
+msgstr "Text för webbplatsnotis"
#: actions/sitenoticeadminpanel.php:178
msgid "Site-wide notice text (255 chars max; HTML okay)"
-msgstr ""
+msgstr "Text för webbplatsnotis (max 255 tecken; HTML ok)"
#: actions/sitenoticeadminpanel.php:198
-#, fuzzy
msgid "Save site notice"
-msgstr "Webbplatsnotis"
+msgstr "Spara webbplatsnotis"
#: actions/smssettings.php:58
msgid "SMS settings"
@@ -3966,12 +3969,11 @@ msgstr "Ingen kod ifylld"
#: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
#: lib/adminpanelaction.php:406
msgid "Snapshots"
-msgstr "Ögonblicksbild"
+msgstr "Ögonblicksbilder"
#: actions/snapshotadminpanel.php:65
-#, fuzzy
msgid "Manage snapshot configuration"
-msgstr "Ändra webbplatskonfiguration"
+msgstr "Hantera konfiguration för ögonblicksbild"
#: actions/snapshotadminpanel.php:127
msgid "Invalid snapshot run value."
@@ -4018,16 +4020,14 @@ msgid "Snapshots will be sent to this URL"
msgstr "Ögonblicksbild kommer skickat till denna URL"
#: actions/snapshotadminpanel.php:248
-#, fuzzy
msgid "Save snapshot settings"
-msgstr "Spara webbplatsinställningar"
+msgstr "Spara inställningar för ögonblicksbild"
#: actions/subedit.php:70
msgid "You are not subscribed to that profile."
msgstr "Du är inte prenumerat hos den profilen."
-#: actions/subedit.php:83 classes/Subscription.php:89
-#: classes/Subscription.php:116
+#: actions/subedit.php:83 classes/Subscription.php:132
msgid "Could not save subscription."
msgstr "Kunde inte spara prenumeration."
@@ -4128,11 +4128,11 @@ msgstr ""
msgid "%s is not listening to anyone."
msgstr "%s lyssnar inte på någon."
-#: actions/subscriptions.php:199
+#: actions/subscriptions.php:208
msgid "Jabber"
msgstr "Jabber"
-#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:222 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr "SMS"
@@ -4165,12 +4165,12 @@ msgstr "Inget ID-argument."
msgid "Tag %s"
msgstr "Tagg %s"
-#: actions/tagother.php:77 lib/userprofile.php:75
+#: actions/tagother.php:77 lib/userprofile.php:76
msgid "User profile"
msgstr "Användarprofil"
#: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:102
+#: lib/userprofile.php:103
msgid "Photo"
msgstr "Foto"
@@ -4506,7 +4506,7 @@ msgstr ""
msgid "Plugins"
msgstr "Insticksmoduler"
-#: actions/version.php:196 lib/action.php:767
+#: actions/version.php:196 lib/action.php:766
msgid "Version"
msgstr "Version"
@@ -4514,7 +4514,7 @@ msgstr "Version"
msgid "Author(s)"
msgstr "Författare"
-#: classes/File.php:144
+#: classes/File.php:169
#, php-format
msgid ""
"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
@@ -4523,12 +4523,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:154
+#: classes/File.php:179
#, 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:161
+#: classes/File.php:186
#, 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."
@@ -4566,27 +4566,27 @@ msgstr "Kunde inte infoga meddelande."
msgid "Could not update message with new URI."
msgstr "Kunde inte uppdatera meddelande med ny URI."
-#: classes/Notice.php:172
+#: classes/Notice.php:175
#, php-format
msgid "DB error inserting hashtag: %s"
msgstr "Databasfel vid infogning av hashtag: %s"
-#: classes/Notice.php:241
+#: classes/Notice.php:244
msgid "Problem saving notice. Too long."
msgstr "Problem vid sparande av notis. För långt."
-#: classes/Notice.php:245
+#: classes/Notice.php:248
msgid "Problem saving notice. Unknown user."
msgstr "Problem vid sparande av notis. Okänd användare."
-#: classes/Notice.php:250
+#: classes/Notice.php:253
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:256
+#: classes/Notice.php:259
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
@@ -4594,70 +4594,69 @@ msgstr ""
"För många duplicerade meddelanden för snabbt; ta en vilopaus och posta igen "
"om ett par minuter."
-#: classes/Notice.php:262
+#: classes/Notice.php:265
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:328 classes/Notice.php:354
+#: classes/Notice.php:331 classes/Notice.php:357
msgid "Problem saving notice."
msgstr "Problem med att spara notis."
-#: classes/Notice.php:927
+#: classes/Notice.php:943
msgid "Problem saving group inbox."
msgstr "Problem med att spara gruppinkorg."
-#: classes/Notice.php:1459
+#: classes/Notice.php:1481
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
-#: classes/Subscription.php:66 lib/oauthstore.php:465
+#: classes/Subscription.php:74 lib/oauthstore.php:465
msgid "You have been banned from subscribing."
msgstr "Du har blivit utestängd från att prenumerera."
-#: classes/Subscription.php:70
+#: classes/Subscription.php:78
msgid "Already subscribed!"
msgstr "Redan prenumerant!"
-#: classes/Subscription.php:74
+#: classes/Subscription.php:82
msgid "User has blocked you."
msgstr "Användaren har blockerat dig."
-#: classes/Subscription.php:157
+#: classes/Subscription.php:167
msgid "Not subscribed!"
msgstr "Inte prenumerant!"
-#: classes/Subscription.php:163
+#: classes/Subscription.php:173
msgid "Couldn't delete self-subscription."
msgstr "Kunde inte ta bort själv-prenumeration."
-#: classes/Subscription.php:190
-#, fuzzy
+#: classes/Subscription.php:200
msgid "Couldn't delete subscription OMB token."
-msgstr "Kunde inte ta bort prenumeration."
+msgstr "Kunde inte radera OMB prenumerations-token."
-#: classes/Subscription.php:201 lib/subs.php:69
+#: classes/Subscription.php:211
msgid "Couldn't delete subscription."
msgstr "Kunde inte ta bort prenumeration."
-#: classes/User.php:373
+#: classes/User.php:363
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Välkommen till %1$s, @%2$s!"
-#: classes/User_group.php:477
+#: classes/User_group.php:480
msgid "Could not create group."
msgstr "Kunde inte skapa grupp."
-#: classes/User_group.php:486
+#: classes/User_group.php:489
msgid "Could not set group URI."
msgstr "Kunde inte ställa in grupp-URI."
-#: classes/User_group.php:507
+#: classes/User_group.php:510
msgid "Could not set group membership."
msgstr "Kunde inte ställa in gruppmedlemskap."
-#: classes/User_group.php:521
+#: classes/User_group.php:524
msgid "Could not save local group info."
msgstr "Kunde inte spara lokal gruppinformation."
@@ -4698,170 +4697,170 @@ msgstr "%1$s - %2$s"
msgid "Untitled page"
msgstr "Namnlös sida"
-#: lib/action.php:424
+#: lib/action.php:423
msgid "Primary site navigation"
msgstr "Primär webbplatsnavigation"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:430
+#: lib/action.php:429
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr "Personlig profil och vänners tidslinje"
-#: lib/action.php:433
+#: lib/action.php:432
msgctxt "MENU"
msgid "Personal"
msgstr "Personligt"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:435
+#: lib/action.php:434
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "Ändra din e-post, avatar, lösenord, profil"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:440
+#: lib/action.php:439
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "Anslut till tjänster"
-#: lib/action.php:443
+#: lib/action.php:442
msgid "Connect"
msgstr "Anslut"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:446
+#: lib/action.php:445
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "Ändra webbplatskonfiguration"
-#: lib/action.php:449
+#: lib/action.php:448
msgctxt "MENU"
msgid "Admin"
msgstr "Administratör"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:453
+#: lib/action.php:452
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "Bjud in vänner och kollegor att gå med dig på %s"
-#: lib/action.php:456
+#: lib/action.php:455
msgctxt "MENU"
msgid "Invite"
msgstr "Bjud in"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:462
+#: lib/action.php:461
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "Logga ut från webbplatsen"
-#: lib/action.php:465
+#: lib/action.php:464
msgctxt "MENU"
msgid "Logout"
msgstr "Logga ut"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:470
+#: lib/action.php:469
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Skapa ett konto"
-#: lib/action.php:473
+#: lib/action.php:472
msgctxt "MENU"
msgid "Register"
msgstr "Registrera"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:476
+#: lib/action.php:475
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Logga in på webbplatsen"
-#: lib/action.php:479
+#: lib/action.php:478
msgctxt "MENU"
msgid "Login"
msgstr "Logga in"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:482
+#: lib/action.php:481
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Hjälp mig!"
-#: lib/action.php:485
+#: lib/action.php:484
msgctxt "MENU"
msgid "Help"
msgstr "Hjälp"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:488
+#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "Sök efter personer eller text"
-#: lib/action.php:491
+#: lib/action.php:490
msgctxt "MENU"
msgid "Search"
msgstr "Sök"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:513 lib/adminpanelaction.php:398
+#: lib/action.php:512 lib/adminpanelaction.php:398
msgid "Site notice"
msgstr "Webbplatsnotis"
-#: lib/action.php:579
+#: lib/action.php:578
msgid "Local views"
msgstr "Lokala vyer"
-#: lib/action.php:645
+#: lib/action.php:644
msgid "Page notice"
msgstr "Sidnotis"
-#: lib/action.php:747
+#: lib/action.php:746
msgid "Secondary site navigation"
msgstr "Sekundär webbplatsnavigation"
-#: lib/action.php:752
+#: lib/action.php:751
msgid "Help"
msgstr "Hjälp"
-#: lib/action.php:754
+#: lib/action.php:753
msgid "About"
msgstr "Om"
-#: lib/action.php:756
+#: lib/action.php:755
msgid "FAQ"
msgstr "Frågor & svar"
-#: lib/action.php:760
+#: lib/action.php:759
msgid "TOS"
msgstr "Användarvillkor"
-#: lib/action.php:763
+#: lib/action.php:762
msgid "Privacy"
msgstr "Sekretess"
-#: lib/action.php:765
+#: lib/action.php:764
msgid "Source"
msgstr "Källa"
-#: lib/action.php:769
+#: lib/action.php:768
msgid "Contact"
msgstr "Kontakt"
-#: lib/action.php:771
+#: lib/action.php:770
msgid "Badge"
msgstr "Emblem"
-#: lib/action.php:799
+#: lib/action.php:798
msgid "StatusNet software license"
msgstr "Programvarulicens för StatusNet"
-#: lib/action.php:802
+#: lib/action.php:803
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4870,12 +4869,12 @@ msgstr ""
"**%%site.name%%** är en mikrobloggtjänst tillhandahållen av [%%site.broughtby"
"%%](%%site.broughtbyurl%%). "
-#: lib/action.php:804
+#: lib/action.php:805
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** är en mikrobloggtjänst. "
-#: lib/action.php:806
+#: lib/action.php:808
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4886,54 +4885,58 @@ msgstr ""
"version %s, tillgänglig under [GNU Affero General Public License](http://www."
"fsf.org/licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:821
+#: lib/action.php:823
msgid "Site content license"
msgstr "Licens för webbplatsinnehåll"
-#: lib/action.php:826
+#: lib/action.php:828
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr "Innehåll och data av %1$s är privat och konfidensiell."
-#: lib/action.php:831
+#: lib/action.php:833
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr "Innehåll och data copyright av %1$s. Alla rättigheter reserverade."
-#: lib/action.php:834
+#: lib/action.php:836
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
"Innehåll och data copyright av medarbetare. Alla rättigheter reserverade."
-#: lib/action.php:847
+#: lib/action.php:849
msgid "All "
msgstr "Alla "
-#: lib/action.php:853
+#: lib/action.php:855
msgid "license."
msgstr "licens."
-#: lib/action.php:1152
+#: lib/action.php:1154
msgid "Pagination"
msgstr "Numrering av sidor"
-#: lib/action.php:1161
+#: lib/action.php:1163
msgid "After"
msgstr "Senare"
-#: lib/action.php:1169
+#: lib/action.php:1171
msgid "Before"
msgstr "Tidigare"
-#: lib/activity.php:453
+#: lib/activity.php:120
+msgid "Expecting a root feed element but got a whole XML document."
+msgstr "Förväntade ett flödes rotelement, men fick ett helt XML-dokument."
+
+#: lib/activityutils.php:208
msgid "Can't handle remote content yet."
msgstr "Kan inte hantera fjärrinnehåll ännu."
-#: lib/activity.php:481
+#: lib/activityutils.php:236
msgid "Can't handle embedded XML content yet."
msgstr "Kan inte hantera inbäddat XML-innehåll ännu."
-#: lib/activity.php:485
+#: lib/activityutils.php:240
msgid "Can't handle embedded Base64 content yet."
msgstr "Kan inte hantera inbäddat Base64-innehåll ännu."
@@ -5011,22 +5014,20 @@ msgstr "Konfiguration av sessioner"
#. TRANS: Menu item title/tooltip
#: lib/adminpanelaction.php:396
-#, fuzzy
msgid "Edit site notice"
-msgstr "Webbplatsnotis"
+msgstr "Redigera webbplatsnotis"
#. TRANS: Menu item title/tooltip
#: lib/adminpanelaction.php:404
-#, fuzzy
msgid "Snapshots configuration"
-msgstr "Konfiguration av sökvägar"
+msgstr "Konfiguration av ögonblicksbilder"
#: lib/apiauth.php:94
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
"API-resursen kräver läs- och skrivrättigheter, men du har bara läsrättighet."
-#: lib/apiauth.php:272
+#: lib/apiauth.php:276
#, php-format
msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s"
msgstr ""
@@ -5103,11 +5104,11 @@ msgstr "Återkalla"
msgid "Attachments"
msgstr "Bilagor"
-#: lib/attachmentlist.php:265
+#: lib/attachmentlist.php:263
msgid "Author"
msgstr "Författare"
-#: lib/attachmentlist.php:278
+#: lib/attachmentlist.php:276
msgid "Provider"
msgstr "Tillhandahållare"
@@ -5127,37 +5128,50 @@ msgstr "Byte av lösenord misslyckades"
msgid "Password changing is not allowed"
msgstr "Byte av lösenord är inte tillåtet"
-#: lib/channel.php:138 lib/channel.php:158
+#: lib/channel.php:157 lib/channel.php:177
msgid "Command results"
msgstr "Resultat av kommando"
-#: lib/channel.php:210 lib/mailhandler.php:142
+#: lib/channel.php:229 lib/mailhandler.php:142
msgid "Command complete"
msgstr "Kommando komplett"
-#: lib/channel.php:221
+#: lib/channel.php:240
msgid "Command failed"
msgstr "Kommando misslyckades"
-#: lib/command.php:44
-msgid "Sorry, this command is not yet implemented."
-msgstr "Tyvärr, detta kommando är inte implementerat än."
+#: lib/command.php:83 lib/command.php:105
+msgid "Notice with that id does not exist"
+msgstr "Notis med den ID:n finns inte"
-#: lib/command.php:88
+#: lib/command.php:99 lib/command.php:570
+msgid "User has no last notice"
+msgstr "Användare har ingen sista notis"
+
+#: lib/command.php:125
#, php-format
msgid "Could not find a user with nickname %s"
msgstr "Kunde inte hitta en användare med smeknamnet %s"
-#: lib/command.php:92
+#: lib/command.php:143
+#, php-format
+msgid "Could not find a local user with nickname %s"
+msgstr "Kunde inte hitta en lokal användare med smeknamnet %s"
+
+#: lib/command.php:176
+msgid "Sorry, this command is not yet implemented."
+msgstr "Tyvärr, detta kommando är inte implementerat än."
+
+#: lib/command.php:221
msgid "It does not make a lot of sense to nudge yourself!"
msgstr "Det verkar inte vara särskilt meningsfullt att knuffa dig själv!"
-#: lib/command.php:99
+#: lib/command.php:228
#, php-format
msgid "Nudge sent to %s"
msgstr "Knuff skickad till %s"
-#: lib/command.php:126
+#: lib/command.php:254
#, php-format
msgid ""
"Subscriptions: %1$s\n"
@@ -5168,196 +5182,196 @@ msgstr ""
"Prenumeranter: %2$s\n"
"Notiser: %3$s"
-#: lib/command.php:152 lib/command.php:390 lib/command.php:451
-msgid "Notice with that id does not exist"
-msgstr "Notis med den ID:n finns inte"
-
-#: lib/command.php:168 lib/command.php:406 lib/command.php:467
-#: lib/command.php:523
-msgid "User has no last notice"
-msgstr "Användare har ingen sista notis"
-
-#: lib/command.php:190
+#: lib/command.php:296
msgid "Notice marked as fave."
msgstr "Notis markerad som favorit."
-#: lib/command.php:217
+#: lib/command.php:317
msgid "You are already a member of that group"
msgstr "Du är redan en medlem i denna grupp"
-#: lib/command.php:231
+#: lib/command.php:331
#, php-format
msgid "Could not join user %s to group %s"
msgstr "Kunde inte ansluta användare %s till groupp %s"
-#: lib/command.php:236
+#: lib/command.php:336
#, php-format
msgid "%s joined group %s"
msgstr "%s gick med i grupp %s"
-#: lib/command.php:275
+#: lib/command.php:373
#, php-format
msgid "Could not remove user %s to group %s"
msgstr "Kunde inte ta bort användare %s från grupp %s"
-#: lib/command.php:280
+#: lib/command.php:378
#, php-format
msgid "%s left group %s"
msgstr "%s lämnade grupp %s"
-#: lib/command.php:309
+#: lib/command.php:401
#, php-format
msgid "Fullname: %s"
msgstr "Fullständigt namn: %s"
-#: lib/command.php:312 lib/mail.php:258
+#: lib/command.php:404 lib/mail.php:258
#, php-format
msgid "Location: %s"
msgstr "Plats: %s"
-#: lib/command.php:315 lib/mail.php:260
+#: lib/command.php:407 lib/mail.php:260
#, php-format
msgid "Homepage: %s"
msgstr "Hemsida: %s"
-#: lib/command.php:318
+#: lib/command.php:410
#, php-format
msgid "About: %s"
msgstr "Om: %s"
-#: lib/command.php:349
+#: lib/command.php:437
+#, php-format
+msgid ""
+"%s is a remote profile; you can only send direct messages to users on the "
+"same server."
+msgstr ""
+"%s är en fjärrprofil; du kan bara skicka direktmeddelanden till användare på "
+"samma server."
+
+#: lib/command.php:450
#, php-format
msgid "Message too long - maximum is %d characters, you sent %d"
msgstr "Meddelande för långt - maximum är %d tecken, du skickade %d"
-#: lib/command.php:367
+#: lib/command.php:468
#, php-format
msgid "Direct message to %s sent"
msgstr "Direktmeddelande till %s skickat"
-#: lib/command.php:369
+#: lib/command.php:470
msgid "Error sending direct message."
msgstr "Fel vid sändning av direktmeddelande."
-#: lib/command.php:413
+#: lib/command.php:490
msgid "Cannot repeat your own notice"
msgstr "Kan inte upprepa din egen notis"
-#: lib/command.php:418
+#: lib/command.php:495
msgid "Already repeated that notice"
msgstr "Redan upprepat denna notis"
-#: lib/command.php:426
+#: lib/command.php:503
#, php-format
msgid "Notice from %s repeated"
msgstr "Notis fron %s upprepad"
-#: lib/command.php:428
+#: lib/command.php:505
msgid "Error repeating notice."
msgstr "Fel vid upprepning av notis."
-#: lib/command.php:482
+#: lib/command.php:536
#, php-format
msgid "Notice too long - maximum is %d characters, you sent %d"
msgstr "Notis för långt - maximum är %d tecken, du skickade %d"
-#: lib/command.php:491
+#: lib/command.php:545
#, php-format
msgid "Reply to %s sent"
msgstr "Svar på %s skickat"
-#: lib/command.php:493
+#: lib/command.php:547
msgid "Error saving notice."
msgstr "Fel vid sparande av notis."
-#: lib/command.php:547
+#: lib/command.php:594
msgid "Specify the name of the user to subscribe to"
msgstr "Ange namnet på användaren att prenumerara på"
-#: lib/command.php:554 lib/command.php:589
-msgid "No such user"
-msgstr "Ingen sådan användare."
+#: lib/command.php:602
+msgid "Can't subscribe to OMB profiles by command."
+msgstr "Kan inte prenumera på OMB-profiler via kommando."
-#: lib/command.php:561
+#: lib/command.php:608
#, php-format
msgid "Subscribed to %s"
msgstr "Prenumerar på %s"
-#: lib/command.php:582 lib/command.php:685
+#: lib/command.php:629 lib/command.php:728
msgid "Specify the name of the user to unsubscribe from"
msgstr "Ange namnet på användaren att avsluta prenumeration på"
-#: lib/command.php:595
+#: lib/command.php:638
#, php-format
msgid "Unsubscribed from %s"
msgstr "Prenumeration hos %s avslutad"
-#: lib/command.php:613 lib/command.php:636
+#: lib/command.php:656 lib/command.php:679
msgid "Command not yet implemented."
msgstr "Kommando inte implementerat än."
-#: lib/command.php:616
+#: lib/command.php:659
msgid "Notification off."
msgstr "Notifikation av."
-#: lib/command.php:618
+#: lib/command.php:661
msgid "Can't turn off notification."
msgstr "Kan inte sätta på notifikation."
-#: lib/command.php:639
+#: lib/command.php:682
msgid "Notification on."
msgstr "Notifikation på."
-#: lib/command.php:641
+#: lib/command.php:684
msgid "Can't turn on notification."
msgstr "Kan inte stänga av notifikation."
-#: lib/command.php:654
+#: lib/command.php:697
msgid "Login command is disabled"
msgstr "Inloggningskommando är inaktiverat"
-#: lib/command.php:665
+#: lib/command.php:708
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
"Denna länk är endast användbar en gång, och gäller bara i 2 minuter: %s"
-#: lib/command.php:692
+#: lib/command.php:735
#, php-format
msgid "Unsubscribed %s"
msgstr "Prenumeration avslutad %s"
-#: lib/command.php:709
+#: lib/command.php:752
msgid "You are not subscribed to anyone."
msgstr "Du prenumererar inte på någon."
-#: lib/command.php:711
+#: lib/command.php:754
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Du prenumererar på denna person:"
msgstr[1] "Du prenumererar på dessa personer:"
-#: lib/command.php:731
+#: lib/command.php:774
msgid "No one is subscribed to you."
msgstr "Ingen prenumerar på dig."
-#: lib/command.php:733
+#: lib/command.php:776
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Denna person prenumererar på dig:"
msgstr[1] "Dessa personer prenumererar på dig:"
-#: lib/command.php:753
+#: lib/command.php:796
msgid "You are not a member of any groups."
msgstr "Du är inte medlem i några grupper."
-#: lib/command.php:755
+#: lib/command.php:798
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Du är en medlem i denna grupp:"
msgstr[1] "Du är en medlem i dessa grupper:"
-#: lib/command.php:769
+#: lib/command.php:812
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5437,19 +5451,19 @@ msgstr ""
"tracks - inte implementerat än.\n"
"tracking - inte implementerat än.\n"
-#: lib/common.php:148
+#: lib/common.php:135
msgid "No configuration file found. "
msgstr "Ingen konfigurationsfil hittades. "
-#: lib/common.php:149
+#: lib/common.php:136
msgid "I looked for configuration files in the following places: "
msgstr "Jag letade efter konfigurationsfiler på följande platser: "
-#: lib/common.php:151
+#: lib/common.php:138
msgid "You may wish to run the installer to fix this."
msgstr "Du kanske vill köra installeraren för att åtgärda detta."
-#: lib/common.php:152
+#: lib/common.php:139
msgid "Go to the installer."
msgstr "Gå till installeraren."
@@ -5551,7 +5565,7 @@ msgstr "Gå"
#: lib/grantroleform.php:91
#, php-format
msgid "Grant this user the \"%s\" role"
-msgstr ""
+msgstr "Bevilja denna användare \"%s\"-rollen"
#: lib/groupeditform.php:163
msgid "URL of the homepage or blog of the group or topic"
@@ -5625,49 +5639,49 @@ msgstr "Taggar i %s grupps notiser"
msgid "This page is not available in a media type you accept"
msgstr "Denna sida är inte tillgänglig i den mediatyp du accepterat"
-#: lib/imagefile.php:75
+#: lib/imagefile.php:72
+msgid "Unsupported image file format."
+msgstr "Bildfilens format stödjs inte."
+
+#: lib/imagefile.php:88
#, php-format
msgid "That file is too big. The maximum file size is %s."
msgstr "Denna fil är för stor. Den maximala filstorleken är %s."
-#: lib/imagefile.php:80
+#: lib/imagefile.php:93
msgid "Partial upload."
msgstr "Bitvis uppladdad."
-#: lib/imagefile.php:88 lib/mediafile.php:170
+#: lib/imagefile.php:101 lib/mediafile.php:170
msgid "System error uploading file."
msgstr "Systemfel vid uppladdning av fil."
-#: lib/imagefile.php:96
+#: lib/imagefile.php:109
msgid "Not an image or corrupt file."
msgstr "Inte en bildfil eller så är filen korrupt."
-#: lib/imagefile.php:109
-msgid "Unsupported image file format."
-msgstr "Bildfilens format stödjs inte."
-
#: lib/imagefile.php:122
msgid "Lost our file."
msgstr "Förlorade vår fil."
-#: lib/imagefile.php:166 lib/imagefile.php:231
+#: lib/imagefile.php:163 lib/imagefile.php:224
msgid "Unknown file type"
msgstr "Okänd filtyp"
-#: lib/imagefile.php:251
+#: lib/imagefile.php:244
msgid "MB"
msgstr "MB"
-#: lib/imagefile.php:253
+#: lib/imagefile.php:246
msgid "kB"
msgstr "kB"
-#: lib/jabber.php:220
+#: lib/jabber.php:387
#, php-format
msgid "[%s]"
msgstr "[%s]"
-#: lib/jabber.php:400
+#: lib/jabber.php:567
#, php-format
msgid "Unknown inbox source %d."
msgstr "Okänd källa för inkorg %d."
@@ -5947,7 +5961,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:482
+#: lib/mailbox.php:227 lib/noticelist.php:486
msgid "from"
msgstr "från"
@@ -6078,48 +6092,48 @@ msgstr ""
"Tyvärr, hämtning av din geografiska plats tar längre tid än förväntat, var "
"god försök igen senare"
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "N"
msgstr "N"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "S"
msgstr "S"
-#: lib/noticelist.php:431
+#: lib/noticelist.php:432
msgid "E"
msgstr "Ö"
-#: lib/noticelist.php:431
+#: lib/noticelist.php:432
msgid "W"
msgstr "V"
-#: lib/noticelist.php:438
+#: lib/noticelist.php:439
msgid "at"
msgstr "på"
-#: lib/noticelist.php:566
+#: lib/noticelist.php:570
msgid "in context"
msgstr "i sammanhang"
-#: lib/noticelist.php:601
+#: lib/noticelist.php:605
msgid "Repeated by"
msgstr "Upprepad av"
-#: lib/noticelist.php:628
+#: lib/noticelist.php:632
msgid "Reply to this notice"
msgstr "Svara på denna notis"
-#: lib/noticelist.php:629
+#: lib/noticelist.php:633
msgid "Reply"
msgstr "Svara"
-#: lib/noticelist.php:673
+#: lib/noticelist.php:677
msgid "Notice repeated"
msgstr "Notis upprepad"
@@ -6192,7 +6206,7 @@ msgstr "Taggar i %ss notiser"
msgid "Unknown"
msgstr "Okänd"
-#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr "Prenumerationer"
@@ -6200,23 +6214,28 @@ msgstr "Prenumerationer"
msgid "All subscriptions"
msgstr "Alla prenumerationer"
-#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90
+#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr "Prenumeranter"
-#: lib/profileaction.php:159
+#: lib/profileaction.php:161
msgid "All subscribers"
msgstr "Alla prenumeranter"
-#: lib/profileaction.php:180
+#: lib/profileaction.php:191
msgid "User ID"
msgstr "Användar-ID"
-#: lib/profileaction.php:185
+#: lib/profileaction.php:196
msgid "Member since"
msgstr "Medlem sedan"
-#: lib/profileaction.php:247
+#. TRANS: Average count of posts made per day since account registration
+#: lib/profileaction.php:235
+msgid "Daily average"
+msgstr "Dagligt genomsnitt"
+
+#: lib/profileaction.php:264
msgid "All groups"
msgstr "Alla grupper"
@@ -6257,11 +6276,11 @@ msgid "Repeat this notice"
msgstr "Upprepa denna notis"
#: lib/revokeroleform.php:91
-#, fuzzy, php-format
+#, php-format
msgid "Revoke the \"%s\" role from this user"
-msgstr "Blockera denna användare från denna grupp"
+msgstr "Återkalla rollen \"%s\" från denna användare"
-#: lib/router.php:671
+#: lib/router.php:704
msgid "No single user defined for single-user mode."
msgstr "Ingen enskild användare definierad för enanvändarläge."
@@ -6387,92 +6406,98 @@ msgstr "Avsluta prenumerationen på denna användare"
msgid "Unsubscribe"
msgstr "Avsluta pren."
-#: lib/userprofile.php:116
+#: lib/usernoprofileexception.php:58
+#, php-format
+msgid "User %s (%d) has no profile record."
+msgstr "Användare %s (%d) har inga profiluppgifter."
+
+#: lib/userprofile.php:117
msgid "Edit Avatar"
msgstr "Redigera avatar"
-#: lib/userprofile.php:236
+#: lib/userprofile.php:234 lib/userprofile.php:248
msgid "User actions"
msgstr "Åtgärder för användare"
-#: lib/userprofile.php:251
+#: lib/userprofile.php:237
+msgid "User deletion in progress..."
+msgstr "Borttagning av användare pågår..."
+
+#: lib/userprofile.php:263
msgid "Edit profile settings"
msgstr "Redigera profilinställningar"
-#: lib/userprofile.php:252
+#: lib/userprofile.php:264
msgid "Edit"
msgstr "Redigera"
-#: lib/userprofile.php:275
+#: lib/userprofile.php:287
msgid "Send a direct message to this user"
msgstr "Skicka ett direktmeddelande till denna användare"
-#: lib/userprofile.php:276
+#: lib/userprofile.php:288
msgid "Message"
msgstr "Meddelande"
-#: lib/userprofile.php:314
+#: lib/userprofile.php:326
msgid "Moderate"
msgstr "Moderera"
-#: lib/userprofile.php:352
-#, fuzzy
+#: lib/userprofile.php:364
msgid "User role"
-msgstr "Användarprofil"
+msgstr "Användarroll"
-#: lib/userprofile.php:354
-#, fuzzy
+#: lib/userprofile.php:366
msgctxt "role"
msgid "Administrator"
-msgstr "Administratörer"
+msgstr "Administratör"
-#: lib/userprofile.php:355
-#, fuzzy
+#: lib/userprofile.php:367
msgctxt "role"
msgid "Moderator"
-msgstr "Moderera"
+msgstr "Moderator"
-#: lib/util.php:1015
+#: lib/util.php:1046
msgid "a few seconds ago"
msgstr "ett par sekunder sedan"
-#: lib/util.php:1017
+#: lib/util.php:1048
msgid "about a minute ago"
msgstr "för nån minut sedan"
-#: lib/util.php:1019
+#: lib/util.php:1050
#, php-format
msgid "about %d minutes ago"
msgstr "för %d minuter sedan"
-#: lib/util.php:1021
+#: lib/util.php:1052
msgid "about an hour ago"
msgstr "för en timma sedan"
-#: lib/util.php:1023
+#: lib/util.php:1054
#, php-format
msgid "about %d hours ago"
msgstr "för %d timmar sedan"
-#: lib/util.php:1025
+#: lib/util.php:1056
msgid "about a day ago"
msgstr "för en dag sedan"
-#: lib/util.php:1027
+#: lib/util.php:1058
#, php-format
msgid "about %d days ago"
msgstr "för %d dagar sedan"
-#: lib/util.php:1029
+#: lib/util.php:1060
msgid "about a month ago"
msgstr "för en månad sedan"
-#: lib/util.php:1031
+#: lib/util.php:1062
#, php-format
msgid "about %d months ago"
msgstr "för %d månader sedan"
-#: lib/util.php:1033
+#: lib/util.php:1064
msgid "about a year ago"
msgstr "för ett år sedan"
@@ -6486,7 +6511,7 @@ msgstr "%s är inte en giltig färg!"
msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr "%s är inte en giltig färg! Använd 3 eller 6 hexadecimala tecken."
-#: lib/xmppmanager.php:402
+#: lib/xmppmanager.php:403
#, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d."
msgstr "Meddelande för långt - maximum är %1$d tecken, du skickade %2$d."
diff --git a/locale/te/LC_MESSAGES/statusnet.po b/locale/te/LC_MESSAGES/statusnet.po
index c8a2f5c1a..71dbc2c27 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-03-06 23:49+0000\n"
-"PO-Revision-Date: 2010-03-06 23:51:01+0000\n"
+"POT-Creation-Date: 2010-04-06 22:53+0000\n"
+"PO-Revision-Date: 2010-04-06 22:55:23+0000\n"
"Language-Team: Telugu\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64665); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: te\n"
"X-Message-Group: out-statusnet\n"
@@ -23,9 +23,8 @@ msgstr ""
#. TRANS: Page title
#. TRANS: Menu item for site administration
#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:374
-#, fuzzy
msgid "Access"
-msgstr "అంగీకరించు"
+msgstr "అందుబాటు"
#. TRANS: Page notice
#: actions/accessadminpanel.php:67
@@ -44,7 +43,6 @@ msgstr "అజ్ఞాత (ప్రవేశించని) వాడుక
#. TRANS: Checkbox label for prohibiting anonymous users from viewing site.
#: actions/accessadminpanel.php:167
-#, fuzzy
msgctxt "LABEL"
msgid "Private"
msgstr "అంతరంగికం"
@@ -66,18 +64,15 @@ msgstr "కొత్త నమోదులను అచేతనంచేయి.
#. TRANS: Checkbox label for disabling new user registrations.
#: actions/accessadminpanel.php:185
-#, fuzzy
msgid "Closed"
-msgstr "అటువంటి వాడుకరి లేరు."
+msgstr "మూసివేయబడింది"
#. TRANS: Title / tooltip for button to save access settings in site admin panel
#: actions/accessadminpanel.php:202
-#, fuzzy
msgid "Save access settings"
-msgstr "సైటు అమరికలను భద్రపరచు"
+msgstr "అందుబాటు అమరికలను భద్రపరచు"
#: actions/accessadminpanel.php:203
-#, fuzzy
msgctxt "BUTTON"
msgid "Save"
msgstr "భద్రపరచు"
@@ -96,9 +91,9 @@ msgstr "అటువంటి పేజీ లేదు"
#: 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:90
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78
+#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
@@ -107,10 +102,8 @@ msgstr "అటువంటి పేజీ లేదు"
#: actions/remotesubscribe.php:154 actions/replies.php:73
#: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:163 lib/command.php:302
-#: lib/command.php:355 lib/command.php:401 lib/command.php:462
-#: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82
-#: lib/profileaction.php:77
+#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: lib/mailbox.php:82 lib/profileaction.php:77
msgid "No such user."
msgstr "అటువంటి వాడుకరి లేరు."
@@ -197,18 +190,18 @@ msgstr ""
#: 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:132
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:136
#: actions/apigrouplistall.php:120 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:135
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
-#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184
-#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148
+#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:174
+#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173
+#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
-#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
+#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
#, fuzzy
msgid "API method not found."
msgstr "నిర్ధారణ సంకేతం కనబడలేదు."
@@ -222,8 +215,8 @@ msgstr "నిర్ధారణ సంకేతం కనబడలేదు."
#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65
-#: actions/apistatusesupdate.php:118
+#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
msgid "This method requires a POST."
msgstr ""
@@ -254,7 +247,7 @@ msgid "Could not save profile."
msgstr "ప్రొఫైలుని భద్రపరచలేకున్నాం."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:97
+#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
#: actions/designadminpanel.php:122 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
@@ -273,7 +266,7 @@ msgstr ""
#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
msgid "Unable to save your design settings."
-msgstr ""
+msgstr "మీ రూపురేఖల అమరికలని భద్రపరచలేకున్నాం."
#: actions/apiaccountupdateprofilebackgroundimage.php:187
#: actions/apiaccountupdateprofilecolors.php:142
@@ -339,7 +332,7 @@ msgstr ""
msgid "This status is already a favorite."
msgstr "ఈ నోటీసు ఇప్పటికే మీ ఇష్టాంశం."
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
msgid "Could not create favorite."
msgstr "ఇష్టాంశాన్ని సృష్టించలేకపోయాం."
@@ -459,7 +452,7 @@ msgstr "గుంపు దొరకలేదు!"
msgid "You are already a member of that group."
msgstr "మీరు ఇప్పటికే ఆ గుంపులో సభ్యులు."
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:221
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
msgid "You have been blocked from that group by the admin."
msgstr "నిర్వాహకులు ఆ గుంపు నుండి మిమ్మల్ని నిరోధించారు."
@@ -477,11 +470,18 @@ msgstr "మీరు ఈ గుంపులో సభ్యులు కాద
msgid "Could not remove user %1$s from group %2$s."
msgstr "వాడుకరి %sని %s గుంపు నుండి తొలగించలేకపోయాం."
-#: actions/apigrouplist.php:95
+#. TRANS: %s is a user name
+#: actions/apigrouplist.php:97
#, 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
+#, fuzzy, php-format
+msgid "%1$s groups %2$s is a member of."
+msgstr "%s సభ్యులుగా ఉన్న గుంపులు"
+
#: actions/apigrouplistall.php:90 actions/usergroups.php:62
#, php-format
msgid "%s groups"
@@ -510,7 +510,7 @@ msgstr "తప్పుడు పరిమాణం."
#: 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:337
+#: actions/profilesettings.php:194 actions/recoverpassword.php:350
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
@@ -556,11 +556,11 @@ msgstr ""
#: actions/apioauthauthorize.php:259
msgid "An application would like to connect to your account"
-msgstr ""
+msgstr "ఒక ఉపకరణం మీ ఖాతాకి అనుసంధానమవ్వాలనుకుంటూంది."
#: actions/apioauthauthorize.php:276
msgid "Allow or deny access"
-msgstr ""
+msgstr "అనుమతిని ఇవ్వండి లేదా తిరస్కరించండి"
#: actions/apioauthauthorize.php:292
#, php-format
@@ -570,15 +570,15 @@ msgid ""
"give access to your %4$s account to third parties you trust."
msgstr ""
-#: actions/apioauthauthorize.php:310 lib/action.php:438
+#: actions/apioauthauthorize.php:310 lib/action.php:437
msgid "Account"
msgstr "ఖాతా"
#: actions/apioauthauthorize.php:313 actions/login.php:230
#: actions/profilesettings.php:106 actions/register.php:424
-#: actions/showgroup.php:244 actions/tagother.php:94
+#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
-#: lib/userprofile.php:131
+#: lib/userprofile.php:132
msgid "Nickname"
msgstr "పేరు"
@@ -597,7 +597,7 @@ msgstr "అనుమతించు"
#: actions/apioauthauthorize.php:351
msgid "Allow or deny access to your account information."
-msgstr ""
+msgstr "మీ ఖాతా సమాచారాన్ని సంప్రాపించడానికి అనుమతించండి లేదా నిరాకరించండి."
#: actions/apistatusesdestroy.php:107
msgid "This method requires a POST or DELETE."
@@ -626,7 +626,7 @@ msgstr "స్థితిని తొలగించాం."
#: actions/apistatusesshow.php:144
msgid "No status with that ID found."
-msgstr ""
+msgstr "ఆ IDతో ఏ నోటీసు కనబడలేదు."
#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
#: lib/mailhandler.php:60
@@ -647,12 +647,12 @@ msgstr "గరిష్ఠ నోటీసు పొడవు %d అక్షర
msgid "Unsupported format."
msgstr ""
-#: actions/apitimelinefavorites.php:108
+#: actions/apitimelinefavorites.php:109
#, php-format
msgid "%1$s / Favorites from %2$s"
msgstr ""
-#: actions/apitimelinefavorites.php:117
+#: actions/apitimelinefavorites.php:118
#, fuzzy, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "%s యొక్క మైక్రోబ్లాగు"
@@ -662,7 +662,7 @@ msgstr "%s యొక్క మైక్రోబ్లాగు"
msgid "%1$s / Updates mentioning %2$s"
msgstr ""
-#: actions/apitimelinementions.php:127
+#: actions/apitimelinementions.php:130
#, php-format
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr ""
@@ -672,7 +672,7 @@ msgstr ""
msgid "%s public timeline"
msgstr "%s బహిరంగ కాలరేఖ"
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "అందరి నుండి %s తాజాకరణలు!"
@@ -687,12 +687,12 @@ msgstr "%sకి స్పందనలు"
msgid "Repeats of %s"
msgstr "%s యొక్క పునరావృతాలు"
-#: actions/apitimelinetag.php:102 actions/tag.php:67
+#: actions/apitimelinetag.php:104 actions/tag.php:67
#, php-format
msgid "Notices tagged with %s"
msgstr ""
-#: actions/apitimelinetag.php:104 actions/tagrss.php:65
+#: actions/apitimelinetag.php:106 actions/tagrss.php:65
#, fuzzy, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "%s యొక్క మైక్రోబ్లాగు"
@@ -721,7 +721,7 @@ msgstr "పరిమాణం లేదు."
msgid "Invalid size."
msgstr "తప్పుడు పరిమాణం."
-#: actions/avatarsettings.php:67 actions/showgroup.php:229
+#: actions/avatarsettings.php:67 actions/showgroup.php:230
#: lib/accountsettingsaction.php:112
msgid "Avatar"
msgstr "అవతారం"
@@ -753,7 +753,7 @@ msgid "Preview"
msgstr "మునుజూపు"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:655
+#: lib/deleteuserform.php:66 lib/noticelist.php:659
msgid "Delete"
msgstr "తొలగించు"
@@ -765,23 +765,28 @@ msgstr "ఎగుమతించు"
msgid "Crop"
msgstr "కత్తిరించు"
-#: actions/avatarsettings.php:328
+#: actions/avatarsettings.php:305
+#, fuzzy
+msgid "No file uploaded."
+msgstr "పాక్షిక ఎగుమతి."
+
+#: actions/avatarsettings.php:332
msgid "Pick a square area of the image to be your avatar"
msgstr "మీ అవతారానికి గానూ ఈ చిత్రం నుండి ఒక చతురస్రపు ప్రదేశాన్ని ఎంచుకోండి"
-#: actions/avatarsettings.php:343 actions/grouplogo.php:380
+#: actions/avatarsettings.php:347 actions/grouplogo.php:380
msgid "Lost our file data."
msgstr ""
-#: actions/avatarsettings.php:366
+#: actions/avatarsettings.php:370
msgid "Avatar updated."
msgstr "అవతారాన్ని తాజాకరించాం."
-#: actions/avatarsettings.php:369
+#: actions/avatarsettings.php:373
msgid "Failed updating avatar."
msgstr "అవతారపు తాజాకరణ విఫలమైంది."
-#: actions/avatarsettings.php:393
+#: actions/avatarsettings.php:397
msgid "Avatar deleted."
msgstr "అవతారాన్ని తొలగించాం."
@@ -799,6 +804,8 @@ msgid ""
"unsubscribed from you, unable to subscribe to you in the future, and you "
"will not be notified of any @-replies from them."
msgstr ""
+"మీరు ఈ వాడుకరిని నిజంగానే నిరోధించాలనుకుంటున్నారా? ఆ తర్వాత, వారు మీ నుండి చందా విరమింపబడతారు, "
+"భవిష్యత్తులో మీకు చందా చేరలేరు, మరియు వారి నుండి @-స్పందనలని మీకు తెలియజేయము."
#: actions/block.php:143 actions/deleteapplication.php:153
#: actions/deletenotice.php:145 actions/deleteuser.php:150
@@ -816,7 +823,7 @@ msgstr "ఈ వాడుకరిని నిరోధించకు"
msgid "Yes"
msgstr "అవును"
-#: actions/block.php:144 actions/groupmembers.php:355 lib/blockform.php:80
+#: actions/block.php:144 actions/groupmembers.php:373 lib/blockform.php:80
msgid "Block this user"
msgstr "ఈ వాడుకరిని నిరోధించు"
@@ -833,8 +840,8 @@ msgstr "నిరోధపు సమాచారాన్ని భద్రప
#: actions/groupunblock.php:86 actions/joingroup.php:82
#: actions/joingroup.php:93 actions/leavegroup.php:82
#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212
-#: lib/command.php:260
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162
+#: lib/command.php:358
msgid "No such group."
msgstr "అటువంటి గుంపు లేదు."
@@ -918,7 +925,7 @@ msgid "Conversation"
msgstr "సంభాషణ"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:218 lib/searchgroupnav.php:82
+#: lib/profileaction.php:229 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "సందేశాలు"
@@ -937,7 +944,7 @@ msgstr "మీరు ఈ ఉపకరణం యొక్క యజమాని
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1217
+#: lib/action.php:1219
msgid "There was a problem with your session token."
msgstr ""
@@ -995,7 +1002,7 @@ msgstr "మీరు నిజంగానే ఈ నోటీసుని త
msgid "Do not delete this notice"
msgstr "ఈ నోటీసుని తొలగించకు"
-#: actions/deletenotice.php:146 lib/noticelist.php:655
+#: actions/deletenotice.php:146 lib/noticelist.php:659
msgid "Delete this notice"
msgstr "ఈ నోటీసుని తొలగించు"
@@ -1115,7 +1122,7 @@ msgstr "లంకెలు"
#: actions/designadminpanel.php:577 lib/designsettings.php:247
msgid "Use defaults"
-msgstr ""
+msgstr "అప్రమేయాలని ఉపయోగించు"
#: actions/designadminpanel.php:578 lib/designsettings.php:248
msgid "Restore default designs"
@@ -1130,7 +1137,7 @@ msgstr ""
#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:208
+#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
#: actions/tagother.php:154 actions/useradminpanel.php:294
#: lib/applicationeditform.php:333 lib/applicationeditform.php:334
#: lib/designsettings.php:256 lib/groupeditform.php:202
@@ -1155,7 +1162,6 @@ msgid "No such document \"%s\""
msgstr "అటువంటి పత్రమేమీ లేదు."
#: actions/editapplication.php:54
-#, fuzzy
msgid "Edit Application"
msgstr "ఉపకరణాన్ని మార్చు"
@@ -1181,7 +1187,6 @@ msgid "Name is too long (max 255 chars)."
msgstr "పేరు చాలా పెద్దగా ఉంది (గరిష్ఠంగా 255 అక్షరాలు)."
#: actions/editapplication.php:183 actions/newapplication.php:162
-#, fuzzy
msgid "Name already in use. Try another one."
msgstr "ఆ పేరుని ఇప్పటికే వాడుతున్నారు. మరోటి ప్రయత్నించండి."
@@ -1250,7 +1255,7 @@ msgstr "వివరణ చాలా పెద్దదిగా ఉంది (1
msgid "Could not update group."
msgstr "గుంపుని తాజాకరించలేకున్నాం."
-#: actions/editgroup.php:264 classes/User_group.php:493
+#: actions/editgroup.php:264 classes/User_group.php:496
msgid "Could not create aliases."
msgstr "మారుపేర్లని సృష్టించలేకపోయాం."
@@ -1265,7 +1270,7 @@ msgstr "ఈమెయిల్ అమరికలు"
#: actions/emailsettings.php:71
#, php-format
msgid "Manage how you get email from %%site.name%%."
-msgstr ""
+msgstr "%%site.name%% నుండి మీకు ఎలా మెయిల్ వస్తూంతో సంభాళించుకోండి."
#: actions/emailsettings.php:100 actions/imsettings.php:100
#: actions/smssettings.php:104
@@ -1287,6 +1292,8 @@ msgid ""
"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
"a message with further instructions."
msgstr ""
+"ఈ చిరునామా నిర్ధారణకై వేచివున్నాం. తదుపరి సూచనలతో ఉన్న సందేశానికై మీ ఇన్‌బాక్స్‌లో (స్పామ్ బాక్సులో కూడా!) "
+"చూడండి."
#: actions/emailsettings.php:117 actions/imsettings.php:120
#: actions/smssettings.php:126 lib/applicationeditform.php:331
@@ -1556,23 +1563,20 @@ msgid "Cannot read file."
msgstr "ఫైలుని చదవలేకపోతున్నాం."
#: actions/grantrole.php:62 actions/revokerole.php:62
-#, fuzzy
msgid "Invalid role."
-msgstr "తప్పుడు పరిమాణం."
+msgstr "తప్పుడు పాత్ర."
#: actions/grantrole.php:66 actions/revokerole.php:66
msgid "This role is reserved and cannot be set."
msgstr ""
#: actions/grantrole.php:75
-#, fuzzy
msgid "You cannot grant user roles on this site."
-msgstr "మీరు ఇప్పటికే లోనికి ప్రవేశించారు!"
+msgstr "ఈ సైటులో మీరు వాడుకరలకి పాత్రలను ఇవ్వలేరు."
#: actions/grantrole.php:82
-#, fuzzy
msgid "User already has this role."
-msgstr "వాడుకరిని ఇప్పటికే గుంపునుండి నిరోధించారు."
+msgstr "వాడుకరికి ఇప్పటికే ఈ పాత్ర ఉంది."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
@@ -1603,7 +1607,7 @@ msgstr "వాడుకరిని ఇప్పటికే గుంపున
msgid "User is not a member of group."
msgstr "వాడుకరి ఈ గుంపులో సభ్యులు కాదు."
-#: actions/groupblock.php:136 actions/groupmembers.php:323
+#: actions/groupblock.php:136 actions/groupmembers.php:341
msgid "Block user from group"
msgstr "వాడుకరిని గుంపు నుండి నిరోధించు"
@@ -1646,7 +1650,7 @@ msgstr "గుంపు అలంకారం"
msgid ""
"Customize the way your group looks with a background image and a colour "
"palette of your choice."
-msgstr ""
+msgstr "నేపథ్య చిత్రం మరియు రంగుల ఎంపికతో మీ గుంపు ఎలా కనిపించాలో మలచుకోండి."
#: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:186
#: lib/designsettings.php:391 lib/designsettings.php:413
@@ -1701,21 +1705,21 @@ msgstr "ఈ గుంపులో వాడుకరులు జాబితా
#: actions/groupmembers.php:182 lib/groupnav.php:107
msgid "Admin"
-msgstr ""
+msgstr "నిర్వాహకులు"
-#: actions/groupmembers.php:355 lib/blockform.php:69
+#: actions/groupmembers.php:373 lib/blockform.php:69
msgid "Block"
msgstr "నిరోధించు"
-#: actions/groupmembers.php:450
+#: actions/groupmembers.php:468
msgid "Make user an admin of the group"
msgstr "వాడుకరిని గుంపుకి ఒక నిర్వాహకునిగా చేయి"
-#: actions/groupmembers.php:482
+#: actions/groupmembers.php:500
msgid "Make Admin"
msgstr "నిర్వాహకున్ని చేయి"
-#: actions/groupmembers.php:482
+#: actions/groupmembers.php:500
msgid "Make this user an admin"
msgstr "ఈ వాడుకరిని నిర్వాహకున్ని చేయి"
@@ -1730,7 +1734,7 @@ msgstr "%s కాలరేఖ"
msgid "Updates from members of %1$s on %2$s!"
msgstr "%s యొక్క మైక్రోబ్లాగు"
-#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232
+#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249
#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr "గుంపులు"
@@ -1890,9 +1894,9 @@ msgid "That is not your Jabber ID."
msgstr "ఇది మీ Jabber ID కాదు"
#: actions/inbox.php:59
-#, fuzzy, php-format
+#, php-format
msgid "Inbox for %1$s - page %2$d"
-msgstr "%sకి వచ్చినవి"
+msgstr "%1$sకి వచ్చినవి - %2$dవ పేజీ"
#: actions/inbox.php:62
#, php-format
@@ -1929,7 +1933,7 @@ msgstr "కొత్త వాడుకరులని ఆహ్వానిం
msgid "You are already subscribed to these users:"
msgstr "మీరు ఇప్పటికే ఈ వాడుకరులకు చందాచేరి ఉన్నారు:"
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
#, php-format
msgid "%1$s (%2$s)"
msgstr "%1$s (%2$s)"
@@ -1972,7 +1976,6 @@ msgstr "ఐచ్ఛికంగా ఆహ్వానానికి వ్య
#. TRANS: Send button for inviting friends
#: actions/invite.php:198
-#, fuzzy
msgctxt "BUTTON"
msgid "Send"
msgstr "పంపించు"
@@ -2031,7 +2034,7 @@ msgstr "%1$s %2$s గుంపులో చేరారు"
msgid "You must be logged in to leave a group."
msgstr "గుంపుని వదిలివెళ్ళడానికి మీరు ప్రవేశించి ఉండాలి."
-#: actions/leavegroup.php:100 lib/command.php:265
+#: actions/leavegroup.php:100 lib/command.php:363
msgid "You are not a member of that group."
msgstr "మీరు ఆ గుంపులో సభ్యులు కాదు."
@@ -2050,7 +2053,7 @@ msgstr "వాడుకరిపేరు లేదా సంకేతపదం
#: actions/login.php:132 actions/otp.php:120
msgid "Error setting user. You are probably not authorized."
-msgstr ""
+msgstr "వాడుకరిని అమర్చడంలో పొరపాటు. బహుశా మీకు అధీకరణ లేకపోవచ్చు."
#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
msgid "Login"
@@ -2144,12 +2147,12 @@ msgstr "కొత్త గుంపుని సృష్టిండాని
msgid "New message"
msgstr "కొత్త సందేశం"
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
msgid "You can't send a message to this user."
msgstr "ఈ వాడుకరికి మీరు సందేశాన్ని పంపించలేరు."
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342
-#: lib/command.php:475
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
+#: lib/command.php:529
msgid "No content!"
msgstr "విషయం లేదు!"
@@ -2157,7 +2160,7 @@ msgstr "విషయం లేదు!"
msgid "No recipient specified."
msgstr ""
-#: actions/newmessage.php:164 lib/command.php:361
+#: actions/newmessage.php:164 lib/command.php:462
msgid ""
"Don't send a message to yourself; just say it to yourself quietly instead."
msgstr "మీకు మీరే సందేశాన్ని పంపుకోకండి; దాని బదులు మీలో మీరే మెల్లగా చెప్పుకోండి."
@@ -2171,7 +2174,7 @@ msgstr "సందేశాన్ని పంపించాం"
msgid "Direct message to %s sent."
msgstr "%sకి నేరు సందేశాన్ని పంపించాం"
-#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189
msgid "Ajax Error"
msgstr "అజాక్స్ పొరపాటు"
@@ -2179,7 +2182,7 @@ msgstr "అజాక్స్ పొరపాటు"
msgid "New notice"
msgstr "కొత్త సందేశం"
-#: actions/newnotice.php:211
+#: actions/newnotice.php:217
#, fuzzy
msgid "Notice posted"
msgstr "సందేశాలు"
@@ -2287,10 +2290,10 @@ msgstr ""
msgid "Notice has no profile"
msgstr ""
-#: actions/oembed.php:86 actions/shownotice.php:180
+#: actions/oembed.php:86 actions/shownotice.php:175
#, php-format
msgid "%1$s's status on %2$s"
-msgstr ""
+msgstr "%2$sలో %1$s యొక్క స్థితి"
#: actions/oembed.php:157
msgid "content type "
@@ -2300,8 +2303,8 @@ msgstr "విషయ రకం "
msgid "Only "
msgstr "మాత్రమే "
-#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042
-#: lib/apiaction.php:1070 lib/apiaction.php:1179
+#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1068
+#: lib/apiaction.php:1096 lib/apiaction.php:1212
msgid "Not a supported data format."
msgstr ""
@@ -2437,7 +2440,7 @@ msgstr "పాత సంకేతపదం తప్పు"
msgid "Error saving user; invalid."
msgstr "వాడుకరిని భద్రపరచడంలో పొరపాటు: సరికాదు."
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
msgid "Can't save new password."
msgstr "కొత్త సంకేతపదాన్ని భద్రపరచలేము."
@@ -2448,7 +2451,7 @@ msgstr "సంకేతపదం భద్రమయ్యింది."
#. TRANS: Menu item for site administration
#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:382
msgid "Paths"
-msgstr ""
+msgstr "త్రోవలు"
#: actions/pathsadminpanel.php:70
msgid "Path and server settings for this StatusNet site."
@@ -2588,7 +2591,7 @@ msgstr ""
#: actions/pathsadminpanel.php:330
msgid "When to use SSL"
-msgstr ""
+msgstr "SSLని ఎప్పుడు ఉపయోగించాలి"
#: actions/pathsadminpanel.php:335
#, fuzzy
@@ -2617,12 +2620,12 @@ msgstr ""
msgid "People search"
msgstr "వ్యక్తుల అన్వేషణ"
-#: actions/peopletag.php:70
+#: actions/peopletag.php:68
#, fuzzy, php-format
msgid "Not a valid people tag: %s"
msgstr "సరైన ఈమెయిల్ చిరునామా కాదు:"
-#: actions/peopletag.php:144
+#: actions/peopletag.php:142
#, fuzzy, php-format
msgid "Users self-tagged with %1$s - page %2$d"
msgstr "%s యొక్క మైక్రోబ్లాగు"
@@ -2656,8 +2659,8 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr "1-64 చిన్నబడి అక్షరాలు లేదా అంకెలు, విరామచిహ్నాలు మరియు ఖాళీలు తప్ప"
#: actions/profilesettings.php:111 actions/register.php:448
-#: actions/showgroup.php:255 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:149
+#: actions/showgroup.php:256 actions/tagother.php:104
+#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "పూర్తి పేరు"
@@ -2684,9 +2687,9 @@ msgid "Bio"
msgstr "స్వపరిచయం"
#: actions/profilesettings.php:132 actions/register.php:471
-#: actions/showgroup.php:264 actions/tagother.php:112
+#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
-#: lib/userprofile.php:164
+#: lib/userprofile.php:165
msgid "Location"
msgstr "ప్రాంతం"
@@ -2700,7 +2703,7 @@ msgstr ""
#: actions/profilesettings.php:145 actions/tagother.php:149
#: actions/tagother.php:209 lib/subscriptionlist.php:106
-#: lib/subscriptionlist.php:108 lib/userprofile.php:209
+#: lib/subscriptionlist.php:108 lib/userprofile.php:210
msgid "Tags"
msgstr "ట్యాగులు"
@@ -2789,19 +2792,16 @@ msgid "Public timeline"
msgstr "ప్రజా కాలరేఖ"
#: actions/public.php:160
-#, fuzzy
msgid "Public Stream Feed (RSS 1.0)"
-msgstr "ప్రజా వాహిని ఫీడు"
+msgstr "ప్రజా వాహిని ఫీడు (RSS 1.0)"
#: actions/public.php:164
-#, fuzzy
msgid "Public Stream Feed (RSS 2.0)"
-msgstr "ప్రజా వాహిని ఫీడు"
+msgstr "ప్రజా వాహిని ఫీడు (RSS 2.0)"
#: actions/public.php:168
-#, fuzzy
msgid "Public Stream Feed (Atom)"
-msgstr "ప్రజా వాహిని ఫీడు"
+msgstr "ప్రజా వాహిని ఫీడు (ఆటమ్)"
#: actions/public.php:188
#, php-format
@@ -2818,7 +2818,7 @@ msgstr ""
#, php-format
msgid ""
"Why not [register an account](%%action.register%%) and be the first to post!"
-msgstr ""
+msgstr "[ఖాతా నమోదు చేసుకుని](%%action.register%%) మొదటగా వ్రాసేది మీరే ఎందుకు కాకూడదు!"
#: actions/public.php:242
#, php-format
@@ -2895,7 +2895,7 @@ msgstr "ఈ నిర్ధారణ సంకేతం చాలా పాత
#: actions/recoverpassword.php:111
msgid "Could not update user with confirmed email address."
-msgstr ""
+msgstr "నిర్ధారిత ఈమెయిలు చిరునామాతో వాడుకరిని తాజాకరించలేకపోయాం."
#: actions/recoverpassword.php:152
msgid ""
@@ -2932,7 +2932,7 @@ msgstr ""
msgid "Recover password"
msgstr ""
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
msgid "Password recovery requested"
msgstr ""
@@ -2952,41 +2952,41 @@ msgstr ""
msgid "Enter a nickname or email address."
msgstr "పేరు లేదా ఈమెయిల్ చిరునామా ఇవ్వండి."
-#: actions/recoverpassword.php:272
+#: actions/recoverpassword.php:282
msgid "No user with that email address or username."
msgstr "ఆ ఈమెయిలు చిరునామా లేదా వాడుకరిపేరుతో వాడుకరులెవరూ లేరు."
-#: actions/recoverpassword.php:287
+#: actions/recoverpassword.php:299
msgid "No registered email address for that user."
msgstr "ఈ వాడుకరికై నమోదైన ఈమెయిల్ చిరునామాలు ఏమీ లేవు."
-#: actions/recoverpassword.php:301
+#: actions/recoverpassword.php:313
msgid "Error saving address confirmation."
msgstr "చిరునామా నిర్ధారణని భద్రపరచడంలో పొరపాటు."
-#: actions/recoverpassword.php:325
+#: actions/recoverpassword.php:338
msgid ""
"Instructions for recovering your password have been sent to the email "
"address registered to your account."
msgstr "మీ సంకేతపదాన్ని తిరిగి పొందడానికై అవసరమైన సూచనలని మీ ఖాతాతో నమోదైన ఈమెయిల్ చిరునామాకి పంపించాం."
-#: actions/recoverpassword.php:344
+#: actions/recoverpassword.php:357
msgid "Unexpected password reset."
msgstr ""
-#: actions/recoverpassword.php:352
+#: actions/recoverpassword.php:365
msgid "Password must be 6 chars or more."
msgstr "సంకేతపదం 6 లేదా అంతకంటే ఎక్కవ అక్షరాలుండాలి."
-#: actions/recoverpassword.php:356
+#: actions/recoverpassword.php:369
msgid "Password and confirmation do not match."
msgstr "సంకేతపదం మరియు నిర్ధారణ సరిపోలేదు."
-#: actions/recoverpassword.php:375 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:248
msgid "Error setting user."
msgstr ""
-#: actions/recoverpassword.php:382
+#: actions/recoverpassword.php:395
msgid "New password successfully saved. You are now logged in."
msgstr "మీ కొత్త సంకేతపదం భద్రమైంది. మీరు ఇప్పుడు లోనికి ప్రవేశించారు."
@@ -3103,6 +3103,8 @@ msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
msgstr ""
+"(మీ ఈమెయిలు చిరునామాని ఎలా నిర్ధారించాలో తెలిపే సూచనలతో ఒక సందేశం మీరు ఈమెయిలు ద్వారా మరి కొద్దిసేపట్లోనే "
+"అందుతుంది.)"
#: actions/remotesubscribe.php:98
#, php-format
@@ -3111,6 +3113,9 @@ msgid ""
"register%%) a new account. If you already have an account on a [compatible "
"microblogging site](%%doc.openmublog%%), enter your profile URL below."
msgstr ""
+"చందా చేరడానికి, మీరు [ప్రవేశించవచ్చు](%%action.login%%), లేదా కొత్త ఖాతాని [నమోదుచేసుకోవచ్చు](%%"
+"action.register%%). ఒకవేళ మీకు ఇప్పటికే ఏదైనా [పొసగే మైక్రోబ్లాగింగు సైటులో](%%doc.openmublog%"
+"%) ఖాతా ఉంటే, మీ ప్రొఫైలు చిరునామాని క్రింద ఇవ్వండి."
#: actions/remotesubscribe.php:112
msgid "Remote subscribe"
@@ -3138,7 +3143,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr ""
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:394
+#: lib/userprofile.php:406
msgid "Subscribe"
msgstr "చందాచేరు"
@@ -3160,7 +3165,7 @@ msgstr ""
#: actions/repeat.php:57
msgid "Only logged-in users can repeat notices."
-msgstr ""
+msgstr "కేవలం ప్రవేశించిన వాడుకరులు మాత్రమే నోటీసులని పునరావృతించగలరు."
#: actions/repeat.php:64 actions/repeat.php:71
#, fuzzy
@@ -3168,16 +3173,14 @@ msgid "No notice specified."
msgstr "కొత్త సందేశం"
#: actions/repeat.php:76
-#, fuzzy
msgid "You can't repeat your own notice."
-msgstr "ఈ లైసెన్సుకి అంగీకరించకపోతే మీరు నమోదుచేసుకోలేరు."
+msgstr "మీ నోటీసుని మీరే పునరావృతించలేరు."
#: actions/repeat.php:90
-#, fuzzy
msgid "You already repeated that notice."
-msgstr "మీరు ఇప్పటికే ఆ వాడుకరిని నిరోధించారు."
+msgstr "మీరు ఇప్పటికే ఆ నోటీసుని పునరావృతించారు."
-#: actions/repeat.php:114 lib/noticelist.php:674
+#: actions/repeat.php:114 lib/noticelist.php:678
#, fuzzy
msgid "Repeated"
msgstr "సృష్టితం"
@@ -3194,24 +3197,24 @@ msgid "Replies to %s"
msgstr "%sకి స్పందనలు"
#: actions/replies.php:128
-#, fuzzy, php-format
+#, php-format
msgid "Replies to %1$s, page %2$d"
-msgstr "%sకి స్పందనలు"
+msgstr "%1$sకి స్పందనలు, %2$dవ పేజీ"
#: actions/replies.php:145
-#, fuzzy, php-format
+#, php-format
msgid "Replies feed for %s (RSS 1.0)"
-msgstr "%s యొక్క సందేశముల ఫీడు"
+msgstr "%s కొరకు స్పందనల ఫీడు (RSS 1.0)"
#: actions/replies.php:152
-#, fuzzy, php-format
+#, php-format
msgid "Replies feed for %s (RSS 2.0)"
-msgstr "%s యొక్క సందేశముల ఫీడు"
+msgstr "%s కొరకు స్పందనల ఫీడు (RSS 2.0)"
#: actions/replies.php:159
-#, fuzzy, php-format
+#, php-format
msgid "Replies feed for %s (Atom)"
-msgstr "%s యొక్క సందేశముల ఫీడు"
+msgstr "%s కొరకు స్పందనల ఫీడు (ఆటమ్)"
#: actions/replies.php:199
#, fuzzy, php-format
@@ -3237,9 +3240,9 @@ msgid ""
msgstr ""
#: actions/repliesrss.php:72
-#, fuzzy, php-format
+#, php-format
msgid "Replies to %1$s on %2$s!"
-msgstr "%sకి స్పందనలు"
+msgstr "%2$sలో %1$sకి స్పందనలు!"
#: actions/revokerole.php:75
#, fuzzy
@@ -3304,7 +3307,7 @@ msgstr "గుంపుని వదిలివెళ్ళడానికి
#: actions/showapplication.php:157
msgid "Application profile"
-msgstr ""
+msgstr "ఉపకరణ ప్రవర"
#: actions/showapplication.php:159 lib/applicationeditform.php:180
msgid "Icon"
@@ -3324,8 +3327,8 @@ msgstr "సంస్ధ"
msgid "Description"
msgstr "వివరణ"
-#: actions/showapplication.php:192 actions/showgroup.php:438
-#: lib/profileaction.php:176
+#: actions/showapplication.php:192 actions/showgroup.php:444
+#: lib/profileaction.php:187
msgid "Statistics"
msgstr "గణాంకాలు"
@@ -3433,71 +3436,71 @@ msgid "%s group"
msgstr "%s గుంపు"
#: actions/showgroup.php:84
-#, fuzzy, php-format
+#, php-format
msgid "%1$s group, page %2$d"
-msgstr "%1$s గుంపు సభ్యులు, పేజీ %2$d"
+msgstr "%1$s గుంపు , %2$dవ పేజీ"
-#: actions/showgroup.php:226
+#: actions/showgroup.php:227
msgid "Group profile"
msgstr "గుంపు ప్రొఫైలు"
-#: actions/showgroup.php:271 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:177
+#: actions/showgroup.php:272 actions/tagother.php:118
+#: actions/userauthorization.php:175 lib/userprofile.php:178
msgid "URL"
msgstr ""
-#: actions/showgroup.php:282 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:194
+#: actions/showgroup.php:283 actions/tagother.php:128
+#: actions/userauthorization.php:187 lib/userprofile.php:195
msgid "Note"
msgstr "గమనిక"
-#: actions/showgroup.php:292 lib/groupeditform.php:184
+#: actions/showgroup.php:293 lib/groupeditform.php:184
msgid "Aliases"
msgstr "మారుపేర్లు"
-#: actions/showgroup.php:301
+#: actions/showgroup.php:302
msgid "Group actions"
msgstr "గుంపు చర్యలు"
-#: actions/showgroup.php:337
+#: actions/showgroup.php:338
#, fuzzy, php-format
msgid "Notice feed for %s group (RSS 1.0)"
msgstr "%s యొక్క సందేశముల ఫీడు"
-#: actions/showgroup.php:343
+#: actions/showgroup.php:344
#, fuzzy, php-format
msgid "Notice feed for %s group (RSS 2.0)"
msgstr "%s యొక్క సందేశముల ఫీడు"
-#: actions/showgroup.php:349
+#: actions/showgroup.php:350
#, fuzzy, php-format
msgid "Notice feed for %s group (Atom)"
msgstr "%s యొక్క సందేశముల ఫీడు"
-#: actions/showgroup.php:354
+#: actions/showgroup.php:355
#, php-format
msgid "FOAF for %s group"
msgstr "%s గుంపు"
-#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91
+#: actions/showgroup.php:393 actions/showgroup.php:453 lib/groupnav.php:91
msgid "Members"
msgstr "సభ్యులు"
-#: actions/showgroup.php:395 lib/profileaction.php:117
-#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95
-#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71
+#: actions/showgroup.php:398 lib/profileaction.php:117
+#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95
+#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
msgid "(None)"
msgstr "(ఏమీలేదు)"
-#: actions/showgroup.php:401
+#: actions/showgroup.php:404
msgid "All members"
msgstr "అందరు సభ్యులూ"
-#: actions/showgroup.php:441
+#: actions/showgroup.php:447
msgid "Created"
msgstr "సృష్టితం"
-#: actions/showgroup.php:457
+#: actions/showgroup.php:463
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3507,7 +3510,7 @@ msgid ""
"of this group and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
-#: actions/showgroup.php:463
+#: actions/showgroup.php:469
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3516,7 +3519,7 @@ msgid ""
"their life and interests. "
msgstr ""
-#: actions/showgroup.php:491
+#: actions/showgroup.php:497
msgid "Admins"
msgstr "నిర్వాహకులు"
@@ -3548,9 +3551,9 @@ msgid " tagged %s"
msgstr ""
#: actions/showstream.php:79
-#, fuzzy, php-format
+#, php-format
msgid "%1$s, page %2$d"
-msgstr "%1$s మరియు మిత్రులు, పేజీ %2$d"
+msgstr "%1$s, %2$dవ పేజీ"
#: actions/showstream.php:122
#, fuzzy, php-format
@@ -3646,7 +3649,8 @@ msgid "Unknown language \"%s\"."
msgstr "గుర్తు తెలియని భాష \"%s\"."
#: actions/siteadminpanel.php:165
-msgid "Minimum text limit is 140 characters."
+#, fuzzy
+msgid "Minimum text limit is 0 (unlimited)."
msgstr "కనిష్ఠ పాఠ్య పరిమితి 140 అక్షరాలు."
#: actions/siteadminpanel.php:171
@@ -3667,7 +3671,7 @@ msgstr "మీ సైటు యొక్క పేరు, ఇలా \"మీక
#: actions/siteadminpanel.php:229
msgid "Brought by"
-msgstr ""
+msgstr "అందిస్తున్నవారు"
#: actions/siteadminpanel.php:230
msgid "Text used for credits link in footer of each page"
@@ -3675,16 +3679,15 @@ msgstr ""
#: actions/siteadminpanel.php:234
msgid "Brought by URL"
-msgstr ""
+msgstr "అందిస్తున్నవారి URL"
#: actions/siteadminpanel.php:235
msgid "URL used for credits link in footer of each page"
msgstr ""
#: actions/siteadminpanel.php:239
-#, fuzzy
msgid "Contact email address for your site"
-msgstr "ఈ వాడుకరికై నమోదైన ఈమెయిల్ చిరునామాలు ఏమీ లేవు."
+msgstr "మీ సైటుకి సంప్రదింపుల ఈమెయిల్ చిరునామా"
#: actions/siteadminpanel.php:245
msgid "Local"
@@ -3699,9 +3702,8 @@ msgid "Default timezone for the site; usually UTC."
msgstr ""
#: actions/siteadminpanel.php:262
-#, fuzzy
msgid "Default language"
-msgstr "అప్రమేయ సైటు భాష"
+msgstr "అప్రమేయ భాష"
#: actions/siteadminpanel.php:263
msgid "Site language when autodetection from browser settings is not available"
@@ -3728,7 +3730,6 @@ msgid "How long users must wait (in seconds) to post the same thing again."
msgstr ""
#: actions/sitenoticeadminpanel.php:56
-#, fuzzy
msgid "Site Notice"
msgstr "సైటు గమనిక"
@@ -3744,21 +3745,19 @@ msgstr "సందేశాన్ని భద్రపరచడంలో పొ
#: actions/sitenoticeadminpanel.php:113
msgid "Max length for the site-wide notice is 255 chars"
-msgstr ""
+msgstr "సైటు-వారీ నోటీసుకి గరిష్ఠ పొడవు 255 అక్షరాలు"
#: actions/sitenoticeadminpanel.php:176
-#, fuzzy
msgid "Site notice text"
-msgstr "సైటు గమనిక"
+msgstr "సైటు గమనిక పాఠ్యం"
#: actions/sitenoticeadminpanel.php:178
msgid "Site-wide notice text (255 chars max; HTML okay)"
-msgstr ""
+msgstr "సైటు-వారీ నోటీసు పాఠ్యం (255 అక్షరాలు గరిష్ఠం; HTML పర్లేదు)"
#: actions/sitenoticeadminpanel.php:198
-#, fuzzy
msgid "Save site notice"
-msgstr "సైటు గమనిక"
+msgstr "సైటు గమనికని భద్రపరచు"
#: actions/smssettings.php:58
msgid "SMS settings"
@@ -3918,8 +3917,7 @@ msgstr "సైటు అమరికలను భద్రపరచు"
msgid "You are not subscribed to that profile."
msgstr ""
-#: actions/subedit.php:83 classes/Subscription.php:89
-#: classes/Subscription.php:116
+#: actions/subedit.php:83 classes/Subscription.php:132
#, fuzzy
msgid "Could not save subscription."
msgstr "చందాని సృష్టించలేకపోయాం."
@@ -4012,13 +4010,13 @@ msgstr ""
#: actions/subscriptions.php:128 actions/subscriptions.php:132
#, php-format
msgid "%s is not listening to anyone."
-msgstr ""
+msgstr "%s ప్రస్తుతం ఎవరినీ వినడంలేదు."
-#: actions/subscriptions.php:199
+#: actions/subscriptions.php:208
msgid "Jabber"
msgstr "జాబర్"
-#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:222 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr ""
@@ -4052,12 +4050,12 @@ msgstr "అటువంటి పత్రమేమీ లేదు."
msgid "Tag %s"
msgstr ""
-#: actions/tagother.php:77 lib/userprofile.php:75
+#: actions/tagother.php:77 lib/userprofile.php:76
msgid "User profile"
msgstr "వాడుకరి ప్రొఫైలు"
#: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:102
+#: lib/userprofile.php:103
msgid "Photo"
msgstr "ఫొటో"
@@ -4123,7 +4121,6 @@ msgstr ""
#. TRANS: User admin panel title
#: actions/useradminpanel.php:59
-#, fuzzy
msgctxt "TITLE"
msgid "User"
msgstr "వాడుకరి"
@@ -4225,11 +4222,11 @@ msgstr "ఈ చందాని తిరస్కరించు"
#: actions/userauthorization.php:232
msgid "No authorization request!"
-msgstr ""
+msgstr "అధీకరణ అభ్యర్థన లేదు!"
#: actions/userauthorization.php:254
msgid "Subscription authorized"
-msgstr ""
+msgstr "చందాని అధీకరించారు"
#: actions/userauthorization.php:256
msgid ""
@@ -4299,9 +4296,9 @@ msgid "Enjoy your hotdog!"
msgstr ""
#: actions/usergroups.php:64
-#, fuzzy, php-format
+#, php-format
msgid "%1$s groups, page %2$d"
-msgstr "%1$s గుంపు సభ్యులు, పేజీ %2$d"
+msgstr "%1$s గుంపులు, %2$dవ పేజీ"
#: actions/usergroups.php:130
msgid "Search for more groups"
@@ -4366,7 +4363,7 @@ msgstr ""
msgid "Plugins"
msgstr ""
-#: actions/version.php:196 lib/action.php:767
+#: actions/version.php:196 lib/action.php:766
msgid "Version"
msgstr "సంచిక"
@@ -4374,19 +4371,19 @@ msgstr "సంచిక"
msgid "Author(s)"
msgstr "రచయిత(లు)"
-#: classes/File.php:144
+#: classes/File.php:169
#, 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:154
+#: classes/File.php:179
#, php-format
msgid "A file this large would exceed your user quota of %d bytes."
msgstr ""
-#: classes/File.php:161
+#: classes/File.php:186
#, php-format
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
@@ -4404,9 +4401,8 @@ msgid "Group leave failed."
msgstr "గుంపు నుండి వైదొలగడం విఫలమైంది."
#: classes/Local_group.php:41
-#, fuzzy
msgid "Could not update local group."
-msgstr "గుంపుని తాజాకరించలేకున్నాం."
+msgstr "స్థానిక గుంపుని తాజాకరించలేకున్నాం."
#: classes/Login_token.php:76
#, fuzzy, php-format
@@ -4425,100 +4421,100 @@ msgstr ""
msgid "Could not update message with new URI."
msgstr ""
-#: classes/Notice.php:172
+#: classes/Notice.php:175
#, php-format
msgid "DB error inserting hashtag: %s"
msgstr ""
-#: classes/Notice.php:241
+#: classes/Notice.php:244
#, fuzzy
msgid "Problem saving notice. Too long."
msgstr "సందేశాన్ని భద్రపరచడంలో పొరపాటు."
-#: classes/Notice.php:245
+#: classes/Notice.php:248
#, fuzzy
msgid "Problem saving notice. Unknown user."
msgstr "సందేశాన్ని భద్రపరచడంలో పొరపాటు."
-#: classes/Notice.php:250
+#: classes/Notice.php:253
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
-#: classes/Notice.php:256
+#: classes/Notice.php:259
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
msgstr ""
-#: classes/Notice.php:262
+#: classes/Notice.php:265
msgid "You are banned from posting notices on this site."
msgstr "ఈ సైటులో నోటీసులు రాయడం నుండి మిమ్మల్ని నిషేధించారు."
-#: classes/Notice.php:328 classes/Notice.php:354
+#: classes/Notice.php:331 classes/Notice.php:357
msgid "Problem saving notice."
msgstr "సందేశాన్ని భద్రపరచడంలో పొరపాటు."
-#: classes/Notice.php:927
+#: classes/Notice.php:943
#, fuzzy
msgid "Problem saving group inbox."
msgstr "సందేశాన్ని భద్రపరచడంలో పొరపాటు."
-#: classes/Notice.php:1459
+#: classes/Notice.php:1481
#, fuzzy, php-format
msgid "RT @%1$s %2$s"
msgstr "%1$s (%2$s)"
-#: classes/Subscription.php:66 lib/oauthstore.php:465
+#: classes/Subscription.php:74 lib/oauthstore.php:465
msgid "You have been banned from subscribing."
msgstr "చందాచేరడం నుండి మిమ్మల్ని నిషేధించారు."
-#: classes/Subscription.php:70
+#: classes/Subscription.php:78
msgid "Already subscribed!"
msgstr "ఇప్పటికే చందాచేరారు!"
-#: classes/Subscription.php:74
+#: classes/Subscription.php:82
msgid "User has blocked you."
msgstr "వాడుకరి మిమ్మల్ని నిరోధించారు."
-#: classes/Subscription.php:157
+#: classes/Subscription.php:167
#, fuzzy
msgid "Not subscribed!"
msgstr "చందాదార్లు"
-#: classes/Subscription.php:163
+#: classes/Subscription.php:173
#, fuzzy
msgid "Couldn't delete self-subscription."
msgstr "చందాని తొలగించలేకపోయాం."
-#: classes/Subscription.php:190
+#: classes/Subscription.php:200
#, fuzzy
msgid "Couldn't delete subscription OMB token."
msgstr "చందాని తొలగించలేకపోయాం."
-#: classes/Subscription.php:201 lib/subs.php:69
+#: classes/Subscription.php:211
msgid "Couldn't delete subscription."
msgstr "చందాని తొలగించలేకపోయాం."
-#: classes/User.php:373
+#: classes/User.php:363
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "@%2$s, %1$sకి స్వాగతం!"
-#: classes/User_group.php:477
+#: classes/User_group.php:480
msgid "Could not create group."
msgstr "గుంపుని సృష్టించలేకపోయాం."
-#: classes/User_group.php:486
+#: classes/User_group.php:489
#, fuzzy
msgid "Could not set group URI."
msgstr "గుంపు సభ్యత్వాన్ని అమర్చలేకపోయాం."
-#: classes/User_group.php:507
+#: classes/User_group.php:510
msgid "Could not set group membership."
msgstr "గుంపు సభ్యత్వాన్ని అమర్చలేకపోయాం."
-#: classes/User_group.php:521
+#: classes/User_group.php:524
#, fuzzy
msgid "Could not save local group info."
msgstr "చందాని సృష్టించలేకపోయాం."
@@ -4559,189 +4555,175 @@ msgstr "%1$s - %2$s"
#: lib/action.php:159
msgid "Untitled page"
-msgstr ""
+msgstr "శీర్షికలేని పేజీ"
-#: lib/action.php:424
+#: lib/action.php:423
msgid "Primary site navigation"
msgstr ""
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:430
+#: lib/action.php:429
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr ""
-#: lib/action.php:433
-#, fuzzy
+#: lib/action.php:432
msgctxt "MENU"
msgid "Personal"
msgstr "వ్యక్తిగత"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:435
+#: lib/action.php:434
#, fuzzy
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "మీ ఈమెయిలు, అవతారం, సంకేతపదం మరియు ప్రౌఫైళ్ళను మార్చుకోండి"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:440
+#: lib/action.php:439
#, fuzzy
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "అనుసంధానాలు"
-#: lib/action.php:443
+#: lib/action.php:442
msgid "Connect"
msgstr "అనుసంధానించు"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:446
-#, fuzzy
+#: lib/action.php:445
msgctxt "TOOLTIP"
msgid "Change site configuration"
-msgstr "చందాలు"
+msgstr "సైటు స్వరూపణాన్ని మార్చండి"
-#: lib/action.php:449
-#, fuzzy
+#: lib/action.php:448
msgctxt "MENU"
msgid "Admin"
msgstr "నిర్వాహకులు"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:453
+#: lib/action.php:452
#, fuzzy, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "ఈ ఫారాన్ని ఉపయోగించి మీ స్నేహితులను మరియు సహోద్యోగులను ఈ సేవను వినియోగించుకోమని ఆహ్వానించండి."
-#: lib/action.php:456
-#, fuzzy
+#: lib/action.php:455
msgctxt "MENU"
msgid "Invite"
msgstr "ఆహ్వానించు"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:462
-#, fuzzy
+#: lib/action.php:461
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "సైటు నుండి నిష్క్రమించు"
-#: lib/action.php:465
-#, fuzzy
+#: lib/action.php:464
msgctxt "MENU"
msgid "Logout"
msgstr "నిష్క్రమించు"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:470
-#, fuzzy
+#: lib/action.php:469
msgctxt "TOOLTIP"
msgid "Create an account"
-msgstr "కొత్త ఖాతా సృష్టించు"
+msgstr "ఖాతాని సృష్టించుకోండి"
-#: lib/action.php:473
-#, fuzzy
+#: lib/action.php:472
msgctxt "MENU"
msgid "Register"
msgstr "నమోదు"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:476
-#, fuzzy
+#: lib/action.php:475
msgctxt "TOOLTIP"
msgid "Login to the site"
-msgstr "సైటులోని ప్రవేశించు"
+msgstr "సైటు లోనికి ప్రవేశించండి"
-#: lib/action.php:479
-#, fuzzy
+#: lib/action.php:478
msgctxt "MENU"
msgid "Login"
-msgstr "ప్రవేశించండి"
+msgstr "ప్రవేశించు"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:482
-#, fuzzy
+#: lib/action.php:481
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "సహాయం కావాలి!"
-#: lib/action.php:485
-#, fuzzy
+#: lib/action.php:484
msgctxt "MENU"
msgid "Help"
msgstr "సహాయం"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:488
-#, fuzzy
+#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Search for people or text"
-msgstr "మరిన్ని గుంపులకై వెతుకు"
+msgstr "ప్రజలు లేదా పాఠ్యం కొరకు వెతకండి"
-#: lib/action.php:491
-#, fuzzy
+#: lib/action.php:490
msgctxt "MENU"
msgid "Search"
msgstr "వెతుకు"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:513 lib/adminpanelaction.php:398
+#: lib/action.php:512 lib/adminpanelaction.php:398
msgid "Site notice"
msgstr "సైటు గమనిక"
-#: lib/action.php:579
+#: lib/action.php:578
msgid "Local views"
msgstr "స్థానిక వీక్షణలు"
-#: lib/action.php:645
+#: lib/action.php:644
msgid "Page notice"
msgstr "పేజీ గమనిక"
-#: lib/action.php:747
+#: lib/action.php:746
#, fuzzy
msgid "Secondary site navigation"
msgstr "చందాలు"
-#: lib/action.php:752
+#: lib/action.php:751
msgid "Help"
msgstr "సహాయం"
-#: lib/action.php:754
+#: lib/action.php:753
msgid "About"
msgstr "గురించి"
-#: lib/action.php:756
+#: lib/action.php:755
msgid "FAQ"
msgstr "ప్రశ్నలు"
-#: lib/action.php:760
+#: lib/action.php:759
msgid "TOS"
msgstr "సేవా నియమాలు"
-#: lib/action.php:763
+#: lib/action.php:762
msgid "Privacy"
msgstr "అంతరంగికత"
-#: lib/action.php:765
+#: lib/action.php:764
msgid "Source"
msgstr "మూలము"
-#: lib/action.php:769
+#: lib/action.php:768
msgid "Contact"
msgstr "సంప్రదించు"
-#: lib/action.php:771
+#: lib/action.php:770
msgid "Badge"
msgstr "బాడ్జి"
-#: lib/action.php:799
+#: lib/action.php:798
msgid "StatusNet software license"
msgstr "స్టేటస్‌నెట్ మృదూపకరణ లైసెన్సు"
-#: lib/action.php:802
+#: lib/action.php:803
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4750,12 +4732,12 @@ msgstr ""
"**%%site.name%%** అనేది [%%site.broughtby%%](%%site.broughtbyurl%%) వారు "
"అందిస్తున్న మైక్రో బ్లాగింగు సదుపాయం. "
-#: lib/action.php:804
+#: lib/action.php:805
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** అనేది మైక్రో బ్లాగింగు సదుపాయం."
-#: lib/action.php:806
+#: lib/action.php:808
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4766,54 +4748,58 @@ msgstr ""
"html) కింద లభ్యమయ్యే [స్టేటస్&zwnj;నెట్](http://status.net/) మైక్రోబ్లాగింగ్ ఉపకరణం సంచిక %s "
"పై నడుస్తుంది."
-#: lib/action.php:821
+#: lib/action.php:823
#, fuzzy
msgid "Site content license"
msgstr "కొత్త సందేశం"
-#: lib/action.php:826
+#: lib/action.php:828
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
-#: lib/action.php:831
+#: lib/action.php:833
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
-#: lib/action.php:834
+#: lib/action.php:836
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
-#: lib/action.php:847
+#: lib/action.php:849
msgid "All "
msgstr "అన్నీ "
-#: lib/action.php:853
+#: lib/action.php:855
msgid "license."
-msgstr ""
+msgstr "లైసెన్సు."
-#: lib/action.php:1152
+#: lib/action.php:1154
msgid "Pagination"
msgstr "పేజీకరణ"
-#: lib/action.php:1161
+#: lib/action.php:1163
msgid "After"
msgstr "తర్వాత"
-#: lib/action.php:1169
+#: lib/action.php:1171
msgid "Before"
msgstr "ఇంతక్రితం"
-#: lib/activity.php:453
+#: lib/activity.php:120
+msgid "Expecting a root feed element but got a whole XML document."
+msgstr ""
+
+#: lib/activityutils.php:208
msgid "Can't handle remote content yet."
msgstr ""
-#: lib/activity.php:481
+#: lib/activityutils.php:236
msgid "Can't handle embedded XML content yet."
msgstr ""
-#: lib/activity.php:485
+#: lib/activityutils.php:240
msgid "Can't handle embedded Base64 content yet."
msgstr ""
@@ -4849,7 +4835,6 @@ msgstr "ప్రాథమిక సైటు స్వరూపణం"
#. TRANS: Menu item for site administration
#: lib/adminpanelaction.php:350
-#, fuzzy
msgctxt "MENU"
msgid "Site"
msgstr "సైటు"
@@ -4861,7 +4846,6 @@ msgstr "రూపకల్పన స్వరూపణం"
#. TRANS: Menu item for site administration
#: lib/adminpanelaction.php:358
-#, fuzzy
msgctxt "MENU"
msgid "Design"
msgstr "రూపురేఖలు"
@@ -4910,7 +4894,7 @@ msgstr "SMS నిర్ధారణ"
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
-#: lib/apiauth.php:272
+#: lib/apiauth.php:276
#, php-format
msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s"
msgstr ""
@@ -4960,11 +4944,11 @@ msgstr "విహారిణి"
#: lib/applicationeditform.php:274
msgid "Desktop"
-msgstr ""
+msgstr "మేజోపరి"
#: lib/applicationeditform.php:275
msgid "Type of application, browser or desktop"
-msgstr ""
+msgstr "ఉపకరణ రకం, విహారిణి లేదా మేజోపరి"
#: lib/applicationeditform.php:297
msgid "Read-only"
@@ -4987,11 +4971,11 @@ msgstr "తొలగించు"
msgid "Attachments"
msgstr "జోడింపులు"
-#: lib/attachmentlist.php:265
+#: lib/attachmentlist.php:263
msgid "Author"
msgstr "రచయిత"
-#: lib/attachmentlist.php:278
+#: lib/attachmentlist.php:276
#, fuzzy
msgid "Provider"
msgstr "ప్రొఫైలు"
@@ -5014,37 +4998,52 @@ msgstr "సంకేతపదం మార్పు"
msgid "Password changing is not allowed"
msgstr "సంకేతపదం మార్పు"
-#: lib/channel.php:138 lib/channel.php:158
+#: lib/channel.php:157 lib/channel.php:177
msgid "Command results"
msgstr "ఆదేశ ఫలితాలు"
-#: lib/channel.php:210 lib/mailhandler.php:142
+#: lib/channel.php:229 lib/mailhandler.php:142
msgid "Command complete"
msgstr "ఆదేశం పూర్తయ్యింది"
-#: lib/channel.php:221
+#: lib/channel.php:240
msgid "Command failed"
msgstr "ఆదేశం విఫలమైంది"
-#: lib/command.php:44
-msgid "Sorry, this command is not yet implemented."
-msgstr ""
+#: lib/command.php:83 lib/command.php:105
+#, fuzzy
+msgid "Notice with that id does not exist"
+msgstr "ఆ ఈమెయిలు చిరునామా లేదా వాడుకరిపేరుతో వాడుకరులెవరూ లేరు."
-#: lib/command.php:88
+#: lib/command.php:99 lib/command.php:570
+#, fuzzy
+msgid "User has no last notice"
+msgstr "వాడుకరికి ప్రొఫైలు లేదు."
+
+#: lib/command.php:125
#, php-format
msgid "Could not find a user with nickname %s"
msgstr "వాడుకరిని తాజాకరించలేకున్నాం."
-#: lib/command.php:92
+#: lib/command.php:143
+#, fuzzy, php-format
+msgid "Could not find a local user with nickname %s"
+msgstr "వాడుకరిని తాజాకరించలేకున్నాం."
+
+#: lib/command.php:176
+msgid "Sorry, this command is not yet implemented."
+msgstr "క్షమించండి, ఈ ఆదేశం ఇంకా అమలుపరచబడలేదు."
+
+#: lib/command.php:221
msgid "It does not make a lot of sense to nudge yourself!"
msgstr ""
-#: lib/command.php:99
+#: lib/command.php:228
#, fuzzy, php-format
msgid "Nudge sent to %s"
msgstr "%sకి స్పందనలు"
-#: lib/command.php:126
+#: lib/command.php:254
#, php-format
msgid ""
"Subscriptions: %1$s\n"
@@ -5055,199 +5054,195 @@ msgstr ""
"చందాదార్లు: %2$s\n"
"నోటీసులు: %3$s"
-#: lib/command.php:152 lib/command.php:390 lib/command.php:451
-#, fuzzy
-msgid "Notice with that id does not exist"
-msgstr "ఆ ఈమెయిలు చిరునామా లేదా వాడుకరిపేరుతో వాడుకరులెవరూ లేరు."
-
-#: lib/command.php:168 lib/command.php:406 lib/command.php:467
-#: lib/command.php:523
-#, fuzzy
-msgid "User has no last notice"
-msgstr "వాడుకరికి ప్రొఫైలు లేదు."
-
-#: lib/command.php:190
+#: lib/command.php:296
msgid "Notice marked as fave."
msgstr ""
-#: lib/command.php:217
+#: lib/command.php:317
msgid "You are already a member of that group"
msgstr "మీరు ఇప్పటికే ఆ గుంపులో సభ్యులు"
-#: lib/command.php:231
+#: lib/command.php:331
#, php-format
msgid "Could not join user %s to group %s"
msgstr "వాడుకరి %sని %s గుంపులో చేర్చలేకపోయాం"
-#: lib/command.php:236
+#: lib/command.php:336
#, php-format
msgid "%s joined group %s"
msgstr "%s %s గుంపులో చేరారు"
-#: lib/command.php:275
+#: lib/command.php:373
#, php-format
msgid "Could not remove user %s to group %s"
msgstr "వాడుకరి %sని %s గుంపు నుండి తొలగించలేకపోయాం"
-#: lib/command.php:280
+#: lib/command.php:378
#, php-format
msgid "%s left group %s"
msgstr "%2$s గుంపు నుండి %1$s వైదొలిగారు"
-#: lib/command.php:309
+#: lib/command.php:401
#, php-format
msgid "Fullname: %s"
msgstr "పూర్తిపేరు: %s"
-#: lib/command.php:312 lib/mail.php:258
+#: lib/command.php:404 lib/mail.php:258
#, php-format
msgid "Location: %s"
msgstr "ప్రాంతం: %s"
-#: lib/command.php:315 lib/mail.php:260
+#: lib/command.php:407 lib/mail.php:260
#, php-format
msgid "Homepage: %s"
msgstr "హోంపేజీ: %s"
-#: lib/command.php:318
+#: lib/command.php:410
#, php-format
msgid "About: %s"
msgstr "గురించి: %s"
-#: lib/command.php:349
+#: lib/command.php:437
+#, php-format
+msgid ""
+"%s is a remote profile; you can only send direct messages to users on the "
+"same server."
+msgstr ""
+
+#: lib/command.php:450
#, fuzzy, php-format
msgid "Message too long - maximum is %d characters, you sent %d"
msgstr "నోటిసు చాలా పొడవుగా ఉంది - %d అక్షరాలు గరిష్ఠం, మీరు %d పంపించారు"
-#: lib/command.php:367
+#: lib/command.php:468
#, php-format
msgid "Direct message to %s sent"
msgstr "%sకి నేరు సందేశాన్ని పంపించాం"
-#: lib/command.php:369
+#: lib/command.php:470
msgid "Error sending direct message."
msgstr ""
-#: lib/command.php:413
+#: lib/command.php:490
msgid "Cannot repeat your own notice"
msgstr "మీ నోటిసుని మీరే పునరావృతించలేరు"
-#: lib/command.php:418
+#: lib/command.php:495
msgid "Already repeated that notice"
msgstr "ఇప్పటికే ఈ నోటీసుని పునరావృతించారు"
-#: lib/command.php:426
+#: lib/command.php:503
#, fuzzy, php-format
msgid "Notice from %s repeated"
msgstr "సందేశాలు"
-#: lib/command.php:428
+#: lib/command.php:505
#, fuzzy
msgid "Error repeating notice."
msgstr "సందేశాన్ని భద్రపరచడంలో పొరపాటు."
-#: lib/command.php:482
+#: lib/command.php:536
#, php-format
msgid "Notice too long - maximum is %d characters, you sent %d"
msgstr "నోటిసు చాలా పొడవుగా ఉంది - %d అక్షరాలు గరిష్ఠం, మీరు %d పంపించారు"
-#: lib/command.php:491
+#: lib/command.php:545
#, fuzzy, php-format
msgid "Reply to %s sent"
msgstr "%sకి స్పందనలు"
-#: lib/command.php:493
+#: lib/command.php:547
#, fuzzy
msgid "Error saving notice."
msgstr "సందేశాన్ని భద్రపరచడంలో పొరపాటు."
-#: lib/command.php:547
+#: lib/command.php:594
msgid "Specify the name of the user to subscribe to"
msgstr "ఏవరికి చందా చేరాలనుకుంటున్నారో ఆ వాడుకరి పేరు తెలియజేయండి"
-#: lib/command.php:554 lib/command.php:589
-msgid "No such user"
-msgstr "అటువంటి వాడుకరి లేరు"
+#: lib/command.php:602
+msgid "Can't subscribe to OMB profiles by command."
+msgstr ""
-#: lib/command.php:561
+#: lib/command.php:608
#, php-format
msgid "Subscribed to %s"
msgstr "%sకి చందా చేరారు"
-#: lib/command.php:582 lib/command.php:685
+#: lib/command.php:629 lib/command.php:728
msgid "Specify the name of the user to unsubscribe from"
msgstr "ఎవరి నుండి చందా విరమించాలనుకుంటున్నారో ఆ వాడుకరి పేరు తెలియజేయండి"
-#: lib/command.php:595
+#: lib/command.php:638
#, php-format
msgid "Unsubscribed from %s"
msgstr "%s నుండి చందా విరమించారు"
-#: lib/command.php:613 lib/command.php:636
+#: lib/command.php:656 lib/command.php:679
msgid "Command not yet implemented."
msgstr ""
-#: lib/command.php:616
+#: lib/command.php:659
msgid "Notification off."
msgstr ""
-#: lib/command.php:618
+#: lib/command.php:661
msgid "Can't turn off notification."
msgstr ""
-#: lib/command.php:639
+#: lib/command.php:682
msgid "Notification on."
msgstr ""
-#: lib/command.php:641
+#: lib/command.php:684
msgid "Can't turn on notification."
msgstr ""
-#: lib/command.php:654
+#: lib/command.php:697
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:665
+#: lib/command.php:708
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr "ఈ లంకెని ఒకే సారి ఉపయోగించగలరు, మరియు అది పనిచేసేది 2 నిమిషాలు మాత్రమే: %s"
-#: lib/command.php:692
-#, fuzzy, php-format
+#: lib/command.php:735
+#, php-format
msgid "Unsubscribed %s"
msgstr "%s నుండి చందా విరమించారు"
-#: lib/command.php:709
+#: lib/command.php:752
msgid "You are not subscribed to anyone."
msgstr "మీరు ఎవరికీ చందాచేరలేదు."
-#: lib/command.php:711
+#: lib/command.php:754
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "%sకి స్పందనలు"
msgstr[1] "%sకి స్పందనలు"
-#: lib/command.php:731
+#: lib/command.php:774
msgid "No one is subscribed to you."
msgstr "మీకు చందాదార్లు ఎవరూ లేరు."
-#: lib/command.php:733
+#: lib/command.php:776
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "%sకి స్పందనలు"
msgstr[1] "%sకి స్పందనలు"
-#: lib/command.php:753
+#: lib/command.php:796
msgid "You are not a member of any groups."
msgstr "మీరు ఏ గుంపులోనూ సభ్యులు కాదు."
-#: lib/command.php:755
+#: lib/command.php:798
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "మీరు ఇప్పటికే లోనికి ప్రవేశించారు!"
msgstr[1] "మీరు ఇప్పటికే లోనికి ప్రవేశించారు!"
-#: lib/command.php:769
+#: lib/command.php:812
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5289,20 +5284,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:148
+#: lib/common.php:135
#, fuzzy
msgid "No configuration file found. "
msgstr "నిర్ధారణ సంకేతం లేదు."
-#: lib/common.php:149
+#: lib/common.php:136
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:151
+#: lib/common.php:138
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:152
+#: lib/common.php:139
msgid "Go to the installer."
msgstr ""
@@ -5324,7 +5319,7 @@ msgstr "అనుసంధానాలు"
#: lib/connectsettingsaction.php:121
msgid "Authorized connected applications"
-msgstr ""
+msgstr "అధీకృత అనుసంధాన ఉపకరణాలు"
#: lib/dberroraction.php:60
msgid "Database error"
@@ -5480,50 +5475,50 @@ msgstr ""
msgid "This page is not available in a media type you accept"
msgstr ""
-#: lib/imagefile.php:75
+#: lib/imagefile.php:72
+msgid "Unsupported image file format."
+msgstr ""
+
+#: lib/imagefile.php:88
#, fuzzy, php-format
msgid "That file is too big. The maximum file size is %s."
msgstr "ఇది చాలా పొడవుంది. గరిష్ఠ సందేశ పరిమాణం 140 అక్షరాలు."
-#: lib/imagefile.php:80
+#: lib/imagefile.php:93
msgid "Partial upload."
msgstr "పాక్షిక ఎగుమతి."
-#: lib/imagefile.php:88 lib/mediafile.php:170
+#: lib/imagefile.php:101 lib/mediafile.php:170
msgid "System error uploading file."
msgstr ""
-#: lib/imagefile.php:96
+#: lib/imagefile.php:109
msgid "Not an image or corrupt file."
msgstr "బొమ్మ కాదు లేదా పాడైపోయిన ఫైలు."
-#: lib/imagefile.php:109
-msgid "Unsupported image file format."
-msgstr ""
-
#: lib/imagefile.php:122
#, fuzzy
msgid "Lost our file."
msgstr "అటువంటి సందేశమేమీ లేదు."
-#: lib/imagefile.php:166 lib/imagefile.php:231
+#: lib/imagefile.php:163 lib/imagefile.php:224
msgid "Unknown file type"
msgstr "తెలియని ఫైలు రకం"
-#: lib/imagefile.php:251
+#: lib/imagefile.php:244
msgid "MB"
msgstr "మెబై"
-#: lib/imagefile.php:253
+#: lib/imagefile.php:246
msgid "kB"
msgstr "కిబై"
-#: lib/jabber.php:220
+#: lib/jabber.php:387
#, php-format
msgid "[%s]"
msgstr "[%s]"
-#: lib/jabber.php:400
+#: lib/jabber.php:567
#, fuzzy, php-format
msgid "Unknown inbox source %d."
msgstr "గుర్తు తెలియని భాష \"%s\""
@@ -5672,6 +5667,20 @@ msgid ""
"With kind regards,\n"
"%5$s\n"
msgstr ""
+"%1$s (%2$s) మీకు ఒక అంతరంగిక సందేశాన్ని పంపించారు:\n"
+"\n"
+"------------------------------------------------------\n"
+"%3$s\n"
+"------------------------------------------------------\n"
+"\n"
+"వారి సందేశానికి మీరు ఇక్కడ జవాబివ్వవచ్చు:\n"
+"\n"
+"%4$s\n"
+"\n"
+"ఈ ఈమెయిలుకి స్పందించకండి; ఇది వారికి వెళ్ళదు.\n"
+"\n"
+"శుభాకాంక్షలతో,\n"
+"%5$s\n"
#: lib/mail.php:568
#, php-format
@@ -5739,7 +5748,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:482
+#: lib/mailbox.php:227 lib/noticelist.php:486
msgid "from"
msgstr "నుండి"
@@ -5780,11 +5789,11 @@ msgstr ""
#: lib/mediafile.php:152
msgid "The uploaded file was only partially uploaded."
-msgstr ""
+msgstr "ఎక్కించిన ఫైలు కేవలం పాక్షికంగా మాత్రమే ఎక్కింది."
#: lib/mediafile.php:159
msgid "Missing a temporary folder."
-msgstr ""
+msgstr "తాత్కాలిక సంచయం కనబడటంలేదు."
#: lib/mediafile.php:162
msgid "Failed to write file to disk."
@@ -5830,7 +5839,6 @@ msgid "Available characters"
msgstr "అందుబాటులో ఉన్న అక్షరాలు"
#: lib/messageform.php:178 lib/noticeform.php:236
-#, fuzzy
msgctxt "Send button for sending notice"
msgid "Send"
msgstr "పంపించు"
@@ -5868,50 +5876,52 @@ msgid ""
"Sorry, retrieving your geo location is taking longer than expected, please "
"try again later"
msgstr ""
+"క్షమించండి, మీ భౌగోళిక ప్రాంతాన్ని తెలుసుకోవడం అనుకున్నదానికంటే ఎక్కవ సమయం తీసుకుంటూంది, దయచేసి "
+"కాసేపాగి ప్రయత్నించండి"
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "N"
msgstr "ఉ"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "S"
msgstr "ద"
-#: lib/noticelist.php:431
+#: lib/noticelist.php:432
msgid "E"
msgstr "తూ"
-#: lib/noticelist.php:431
+#: lib/noticelist.php:432
msgid "W"
msgstr "ప"
-#: lib/noticelist.php:438
+#: lib/noticelist.php:439
msgid "at"
msgstr ""
-#: lib/noticelist.php:566
+#: lib/noticelist.php:570
msgid "in context"
msgstr "సందర్భంలో"
-#: lib/noticelist.php:601
+#: lib/noticelist.php:605
#, fuzzy
msgid "Repeated by"
msgstr "సృష్టితం"
-#: lib/noticelist.php:628
+#: lib/noticelist.php:632
msgid "Reply to this notice"
msgstr "ఈ నోటీసుపై స్పందించండి"
-#: lib/noticelist.php:629
+#: lib/noticelist.php:633
msgid "Reply"
msgstr "స్పందించండి"
-#: lib/noticelist.php:673
+#: lib/noticelist.php:677
#, fuzzy
msgid "Notice repeated"
msgstr "నోటీసుని తొలగించాం."
@@ -5948,7 +5958,7 @@ msgstr "కొత్త సందేశం"
#: lib/oauthstore.php:490
msgid "Couldn't insert new subscription."
-msgstr ""
+msgstr "కొత్త చందాని చేర్చలేకపోయాం."
#: lib/personalgroupnav.php:99
msgid "Personal"
@@ -5987,7 +5997,7 @@ msgstr ""
msgid "Unknown"
msgstr ""
-#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr "చందాలు"
@@ -5995,23 +6005,28 @@ msgstr "చందాలు"
msgid "All subscriptions"
msgstr "అన్ని చందాలు"
-#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90
+#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr "చందాదార్లు"
-#: lib/profileaction.php:159
+#: lib/profileaction.php:161
msgid "All subscribers"
msgstr "అందరు చందాదార్లు"
-#: lib/profileaction.php:180
+#: lib/profileaction.php:191
msgid "User ID"
msgstr "వాడుకరి ID"
-#: lib/profileaction.php:185
+#: lib/profileaction.php:196
msgid "Member since"
msgstr "సభ్యులైన తేదీ"
-#: lib/profileaction.php:247
+#. TRANS: Average count of posts made per day since account registration
+#: lib/profileaction.php:235
+msgid "Daily average"
+msgstr ""
+
+#: lib/profileaction.php:264
msgid "All groups"
msgstr "అన్ని గుంపులు"
@@ -6057,7 +6072,7 @@ msgstr "ఈ నోటీసుని పునరావృతించు"
msgid "Revoke the \"%s\" role from this user"
msgstr "ఈ గుంపునుండి ఈ వాడుకరిని నిరోధించు"
-#: lib/router.php:671
+#: lib/router.php:704
msgid "No single user defined for single-user mode."
msgstr ""
@@ -6092,7 +6107,7 @@ msgstr "ప్రజలు"
#: lib/searchgroupnav.php:81
msgid "Find people on this site"
-msgstr ""
+msgstr "ఈ సైటులోని వ్యక్తులని కనుగొనండి"
#: lib/searchgroupnav.php:83
msgid "Find content of notices"
@@ -6100,11 +6115,11 @@ msgstr ""
#: lib/searchgroupnav.php:85
msgid "Find groups on this site"
-msgstr ""
+msgstr "ఈ సైటులోని గుంపులని కనుగొనండి"
#: lib/section.php:89
msgid "Untitled section"
-msgstr ""
+msgstr "శీర్షికలేని విభాగం"
#: lib/section.php:106
msgid "More..."
@@ -6142,7 +6157,7 @@ msgstr "ఆహ్వానించు"
#: lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
-msgstr ""
+msgstr "%sలో తోడుకై మీ స్నేహితులని మరియు సహోద్యోగులని ఆహ్వానించండి"
#: lib/subscriberspeopleselftagcloudsection.php:48
#: lib/subscriptionspeopleselftagcloudsection.php:48
@@ -6188,92 +6203,99 @@ msgstr "ఈ వాడుకరి నుండి చందామాను"
msgid "Unsubscribe"
msgstr "చందామాను"
-#: lib/userprofile.php:116
+#: lib/usernoprofileexception.php:58
+#, fuzzy, php-format
+msgid "User %s (%d) has no profile record."
+msgstr "వాడుకరికి ప్రొఫైలు లేదు."
+
+#: lib/userprofile.php:117
msgid "Edit Avatar"
msgstr "అవతారాన్ని మార్చు"
-#: lib/userprofile.php:236
+#: lib/userprofile.php:234 lib/userprofile.php:248
msgid "User actions"
msgstr "వాడుకరి చర్యలు"
-#: lib/userprofile.php:251
+#: lib/userprofile.php:237
+msgid "User deletion in progress..."
+msgstr ""
+
+#: lib/userprofile.php:263
#, fuzzy
msgid "Edit profile settings"
msgstr "ఫ్రొఫైలు అమరికలు"
-#: lib/userprofile.php:252
+#: lib/userprofile.php:264
msgid "Edit"
msgstr "మార్చు"
-#: lib/userprofile.php:275
+#: lib/userprofile.php:287
msgid "Send a direct message to this user"
msgstr "ఈ వాడుకరికి ఒక నేరు సందేశాన్ని పంపించండి"
-#: lib/userprofile.php:276
+#: lib/userprofile.php:288
msgid "Message"
msgstr "సందేశం"
-#: lib/userprofile.php:314
+#: lib/userprofile.php:326
msgid "Moderate"
msgstr ""
-#: lib/userprofile.php:352
-#, fuzzy
+#: lib/userprofile.php:364
msgid "User role"
-msgstr "వాడుకరి ప్రొఫైలు"
+msgstr "వాడుకరి పాత్ర"
-#: lib/userprofile.php:354
-#, fuzzy
+#: lib/userprofile.php:366
msgctxt "role"
msgid "Administrator"
msgstr "నిర్వాహకులు"
-#: lib/userprofile.php:355
+#: lib/userprofile.php:367
msgctxt "role"
msgid "Moderator"
-msgstr ""
+msgstr "సమన్వయకర్త"
-#: lib/util.php:1015
+#: lib/util.php:1046
msgid "a few seconds ago"
msgstr "కొన్ని క్షణాల క్రితం"
-#: lib/util.php:1017
+#: lib/util.php:1048
msgid "about a minute ago"
msgstr "ఓ నిమిషం క్రితం"
-#: lib/util.php:1019
+#: lib/util.php:1050
#, php-format
msgid "about %d minutes ago"
msgstr "%d నిమిషాల క్రితం"
-#: lib/util.php:1021
+#: lib/util.php:1052
msgid "about an hour ago"
msgstr "ఒక గంట క్రితం"
-#: lib/util.php:1023
+#: lib/util.php:1054
#, php-format
msgid "about %d hours ago"
msgstr "%d గంటల క్రితం"
-#: lib/util.php:1025
+#: lib/util.php:1056
msgid "about a day ago"
msgstr "ఓ రోజు క్రితం"
-#: lib/util.php:1027
+#: lib/util.php:1058
#, php-format
msgid "about %d days ago"
msgstr "%d రోజుల క్రితం"
-#: lib/util.php:1029
+#: lib/util.php:1060
msgid "about a month ago"
msgstr "ఓ నెల క్రితం"
-#: lib/util.php:1031
+#: lib/util.php:1062
#, php-format
msgid "about %d months ago"
msgstr "%d నెలల క్రితం"
-#: lib/util.php:1033
+#: lib/util.php:1064
msgid "about a year ago"
msgstr "ఒక సంవత్సరం క్రితం"
@@ -6287,7 +6309,7 @@ msgstr "%s అనేది సరైన రంగు కాదు!"
msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr "%s అనేది సరైన రంగు కాదు! 3 లేదా 6 హెక్స్ అక్షరాలను వాడండి."
-#: lib/xmppmanager.php:402
+#: lib/xmppmanager.php:403
#, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d."
msgstr "నోటిసు చాలా పొడవుగా ఉంది - %1$d అక్షరాలు గరిష్ఠం, మీరు %2$d పంపించారు."
diff --git a/locale/tr/LC_MESSAGES/statusnet.po b/locale/tr/LC_MESSAGES/statusnet.po
index 805e55268..cf73e2578 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-03-06 23:49+0000\n"
-"PO-Revision-Date: 2010-03-06 23:51:04+0000\n"
+"POT-Creation-Date: 2010-04-05 18:54+0000\n"
+"PO-Revision-Date: 2010-04-05 18:56:20+0000\n"
"Language-Team: Turkish\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64621); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: tr\n"
"X-Message-Group: out-statusnet\n"
@@ -99,9 +99,9 @@ msgstr "Böyle bir durum mesajı yok."
#: 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:90
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78
+#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
@@ -110,10 +110,8 @@ msgstr "Böyle bir durum mesajı yok."
#: actions/remotesubscribe.php:154 actions/replies.php:73
#: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:163 lib/command.php:302
-#: lib/command.php:355 lib/command.php:401 lib/command.php:462
-#: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82
-#: lib/profileaction.php:77
+#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: lib/mailbox.php:82 lib/profileaction.php:77
msgid "No such user."
msgstr "Böyle bir kullanıcı yok."
@@ -201,18 +199,18 @@ msgstr ""
#: 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:132
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:136
#: actions/apigrouplistall.php:120 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:135
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
-#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184
-#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148
+#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:174
+#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173
+#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
-#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
+#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
#, fuzzy
msgid "API method not found."
msgstr "Onay kodu bulunamadı."
@@ -226,8 +224,8 @@ msgstr "Onay kodu bulunamadı."
#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65
-#: actions/apistatusesupdate.php:118
+#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
msgid "This method requires a POST."
msgstr ""
@@ -258,7 +256,7 @@ msgid "Could not save profile."
msgstr "Profil kaydedilemedi."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:97
+#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
#: actions/designadminpanel.php:122 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
@@ -346,7 +344,7 @@ msgstr ""
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:176
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
msgid "Could not create favorite."
msgstr ""
@@ -471,7 +469,7 @@ msgstr "İstek bulunamadı!"
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:221
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
msgid "You have been blocked from that group by the admin."
msgstr ""
@@ -490,11 +488,18 @@ msgstr "Bize o profili yollamadınız"
msgid "Could not remove user %1$s from group %2$s."
msgstr "OpenID formu yaratılamadı: %s"
-#: actions/apigrouplist.php:95
+#. TRANS: %s is a user name
+#: actions/apigrouplist.php:97
#, 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
+#, fuzzy, php-format
+msgid "%1$s groups %2$s is a member of."
+msgstr "Bize o profili yollamadınız"
+
#: actions/apigrouplistall.php:90 actions/usergroups.php:62
#, php-format
msgid "%s groups"
@@ -523,7 +528,7 @@ msgstr "Geçersiz büyüklük."
#: 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:337
+#: actions/profilesettings.php:194 actions/recoverpassword.php:350
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
@@ -584,16 +589,16 @@ msgid ""
"give access to your %4$s account to third parties you trust."
msgstr ""
-#: actions/apioauthauthorize.php:310 lib/action.php:438
+#: actions/apioauthauthorize.php:310 lib/action.php:437
#, fuzzy
msgid "Account"
msgstr "Hakkında"
#: actions/apioauthauthorize.php:313 actions/login.php:230
#: actions/profilesettings.php:106 actions/register.php:424
-#: actions/showgroup.php:244 actions/tagother.php:94
+#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
-#: lib/userprofile.php:131
+#: lib/userprofile.php:132
msgid "Nickname"
msgstr "Takma ad"
@@ -667,12 +672,12 @@ msgstr ""
msgid "Unsupported format."
msgstr "Desteklenmeyen görüntü dosyası biçemi."
-#: actions/apitimelinefavorites.php:108
+#: actions/apitimelinefavorites.php:109
#, fuzzy, php-format
msgid "%1$s / Favorites from %2$s"
msgstr "%1$s'in %2$s'deki durum mesajları "
-#: actions/apitimelinefavorites.php:117
+#: actions/apitimelinefavorites.php:118
#, fuzzy, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "%s adli kullanicinin durum mesajlari"
@@ -682,7 +687,7 @@ msgstr "%s adli kullanicinin durum mesajlari"
msgid "%1$s / Updates mentioning %2$s"
msgstr "%1$s'in %2$s'deki durum mesajları "
-#: actions/apitimelinementions.php:127
+#: actions/apitimelinementions.php:130
#, php-format
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr ""
@@ -692,7 +697,7 @@ msgstr ""
msgid "%s public timeline"
msgstr ""
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr ""
@@ -707,12 +712,12 @@ msgstr "%s için cevaplar"
msgid "Repeats of %s"
msgstr "%s için cevaplar"
-#: actions/apitimelinetag.php:102 actions/tag.php:67
+#: actions/apitimelinetag.php:104 actions/tag.php:67
#, php-format
msgid "Notices tagged with %s"
msgstr ""
-#: actions/apitimelinetag.php:104 actions/tagrss.php:65
+#: actions/apitimelinetag.php:106 actions/tagrss.php:65
#, fuzzy, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "%s adli kullanicinin durum mesajlari"
@@ -742,7 +747,7 @@ msgstr ""
msgid "Invalid size."
msgstr "Geçersiz büyüklük."
-#: actions/avatarsettings.php:67 actions/showgroup.php:229
+#: actions/avatarsettings.php:67 actions/showgroup.php:230
#: lib/accountsettingsaction.php:112
msgid "Avatar"
msgstr "Avatar"
@@ -775,7 +780,7 @@ msgid "Preview"
msgstr ""
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:655
+#: lib/deleteuserform.php:66 lib/noticelist.php:659
msgid "Delete"
msgstr ""
@@ -787,23 +792,28 @@ msgstr "Yükle"
msgid "Crop"
msgstr ""
-#: actions/avatarsettings.php:328
+#: actions/avatarsettings.php:305
+#, fuzzy
+msgid "No file uploaded."
+msgstr "Kısmi yükleme."
+
+#: actions/avatarsettings.php:332
msgid "Pick a square area of the image to be your avatar"
msgstr ""
-#: actions/avatarsettings.php:343 actions/grouplogo.php:380
+#: actions/avatarsettings.php:347 actions/grouplogo.php:380
msgid "Lost our file data."
msgstr ""
-#: actions/avatarsettings.php:366
+#: actions/avatarsettings.php:370
msgid "Avatar updated."
msgstr "Avatar güncellendi."
-#: actions/avatarsettings.php:369
+#: actions/avatarsettings.php:373
msgid "Failed updating avatar."
msgstr "Avatar güncellemede hata."
-#: actions/avatarsettings.php:393
+#: actions/avatarsettings.php:397
#, fuzzy
msgid "Avatar deleted."
msgstr "Avatar güncellendi."
@@ -860,8 +870,8 @@ msgstr ""
#: actions/groupunblock.php:86 actions/joingroup.php:82
#: actions/joingroup.php:93 actions/leavegroup.php:82
#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212
-#: lib/command.php:260
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162
+#: lib/command.php:358
#, fuzzy
msgid "No such group."
msgstr "Böyle bir durum mesajı yok."
@@ -948,7 +958,7 @@ msgid "Conversation"
msgstr "Yer"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:218 lib/searchgroupnav.php:82
+#: lib/profileaction.php:224 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "Durum mesajları"
@@ -970,7 +980,7 @@ msgstr "Bize o profili yollamadınız"
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1217
+#: lib/action.php:1219
msgid "There was a problem with your session token."
msgstr ""
@@ -1030,7 +1040,7 @@ msgstr ""
msgid "Do not delete this notice"
msgstr "Böyle bir durum mesajı yok."
-#: actions/deletenotice.php:146 lib/noticelist.php:655
+#: actions/deletenotice.php:146 lib/noticelist.php:659
msgid "Delete this notice"
msgstr ""
@@ -1176,7 +1186,7 @@ msgstr ""
#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:208
+#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
#: actions/tagother.php:154 actions/useradminpanel.php:294
#: lib/applicationeditform.php:333 lib/applicationeditform.php:334
#: lib/designsettings.php:256 lib/groupeditform.php:202
@@ -1301,7 +1311,7 @@ msgstr "Hakkında bölümü çok uzun (azm 140 karakter)."
msgid "Could not update group."
msgstr "Kullanıcı güncellenemedi."
-#: actions/editgroup.php:264 classes/User_group.php:493
+#: actions/editgroup.php:264 classes/User_group.php:496
#, fuzzy
msgid "Could not create aliases."
msgstr "Avatar bilgisi kaydedilemedi"
@@ -1799,7 +1809,7 @@ msgstr ""
msgid "Updates from members of %1$s on %2$s!"
msgstr "%s adli kullanicinin durum mesajlari"
-#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232
+#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244
#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr ""
@@ -2009,7 +2019,7 @@ msgstr ""
msgid "You are already subscribed to these users:"
msgstr ""
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
#, php-format
msgid "%1$s (%2$s)"
msgstr ""
@@ -2111,7 +2121,7 @@ msgstr ""
msgid "You must be logged in to leave a group."
msgstr ""
-#: actions/leavegroup.php:100 lib/command.php:265
+#: actions/leavegroup.php:100 lib/command.php:363
#, fuzzy
msgid "You are not a member of that group."
msgstr "Bize o profili yollamadınız"
@@ -2230,12 +2240,12 @@ msgstr ""
msgid "New message"
msgstr ""
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
msgid "You can't send a message to this user."
msgstr ""
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342
-#: lib/command.php:475
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
+#: lib/command.php:529
msgid "No content!"
msgstr "İçerik yok!"
@@ -2243,7 +2253,7 @@ msgstr "İçerik yok!"
msgid "No recipient specified."
msgstr ""
-#: actions/newmessage.php:164 lib/command.php:361
+#: actions/newmessage.php:164 lib/command.php:462
msgid ""
"Don't send a message to yourself; just say it to yourself quietly instead."
msgstr ""
@@ -2257,7 +2267,7 @@ msgstr ""
msgid "Direct message to %s sent."
msgstr ""
-#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189
msgid "Ajax Error"
msgstr ""
@@ -2265,7 +2275,7 @@ msgstr ""
msgid "New notice"
msgstr "Yeni durum mesajı"
-#: actions/newnotice.php:211
+#: actions/newnotice.php:217
#, fuzzy
msgid "Notice posted"
msgstr "Durum mesajları"
@@ -2372,7 +2382,7 @@ msgstr ""
msgid "Notice has no profile"
msgstr "Bu durum mesajının ait oldugu kullanıcı profili yok"
-#: actions/oembed.php:86 actions/shownotice.php:180
+#: actions/oembed.php:86 actions/shownotice.php:175
#, php-format
msgid "%1$s's status on %2$s"
msgstr "%1$s'in %2$s'deki durum mesajları "
@@ -2386,8 +2396,8 @@ msgstr "Bağlan"
msgid "Only "
msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042
-#: lib/apiaction.php:1070 lib/apiaction.php:1179
+#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1068
+#: lib/apiaction.php:1096 lib/apiaction.php:1212
msgid "Not a supported data format."
msgstr ""
@@ -2527,7 +2537,7 @@ msgstr "Eski parola yanlış"
msgid "Error saving user; invalid."
msgstr "Kullanıcıyı kaydetmede hata oluştu; geçersiz."
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
msgid "Can't save new password."
msgstr "Yeni parola kaydedilemedi."
@@ -2753,8 +2763,8 @@ msgstr ""
"verilmez"
#: actions/profilesettings.php:111 actions/register.php:448
-#: actions/showgroup.php:255 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:149
+#: actions/showgroup.php:256 actions/tagother.php:104
+#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Tam İsim"
@@ -2783,9 +2793,9 @@ msgid "Bio"
msgstr "Hakkında"
#: actions/profilesettings.php:132 actions/register.php:471
-#: actions/showgroup.php:264 actions/tagother.php:112
+#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
-#: lib/userprofile.php:164
+#: lib/userprofile.php:165
msgid "Location"
msgstr "Yer"
@@ -2799,7 +2809,7 @@ msgstr ""
#: actions/profilesettings.php:145 actions/tagother.php:149
#: actions/tagother.php:209 lib/subscriptionlist.php:106
-#: lib/subscriptionlist.php:108 lib/userprofile.php:209
+#: lib/subscriptionlist.php:108 lib/userprofile.php:210
msgid "Tags"
msgstr ""
@@ -3029,7 +3039,7 @@ msgstr "Parolayı sıfırla"
msgid "Recover password"
msgstr "Parolanı geri al"
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
msgid "Password recovery requested"
msgstr "Parola geri alma isteği"
@@ -3049,19 +3059,19 @@ msgstr "Sıfırla"
msgid "Enter a nickname or email address."
msgstr "Bir takma ad veya eposta adresi girin."
-#: actions/recoverpassword.php:272
+#: actions/recoverpassword.php:282
msgid "No user with that email address or username."
msgstr ""
-#: actions/recoverpassword.php:287
+#: actions/recoverpassword.php:299
msgid "No registered email address for that user."
msgstr "Kullanıcı için kaydedilmiş eposta adresi yok."
-#: actions/recoverpassword.php:301
+#: actions/recoverpassword.php:313
msgid "Error saving address confirmation."
msgstr "Adres onayını kaydetmede hata."
-#: actions/recoverpassword.php:325
+#: actions/recoverpassword.php:338
msgid ""
"Instructions for recovering your password have been sent to the email "
"address registered to your account."
@@ -3069,23 +3079,23 @@ msgstr ""
"Hesabınıza eklemiş olduğunuz eposta adresine parolanızı geri getirmek için "
"gerekli olan talimatlar yollanmıştır."
-#: actions/recoverpassword.php:344
+#: actions/recoverpassword.php:357
msgid "Unexpected password reset."
msgstr "Beklemeğen parola sıfırlaması."
-#: actions/recoverpassword.php:352
+#: actions/recoverpassword.php:365
msgid "Password must be 6 chars or more."
msgstr "Parola 6 veya daha fazla karakterden oluşmalıdır."
-#: actions/recoverpassword.php:356
+#: actions/recoverpassword.php:369
msgid "Password and confirmation do not match."
msgstr "Parola ve onaylaması birbirini tutmuyor."
-#: actions/recoverpassword.php:375 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:248
msgid "Error setting user."
msgstr "Kullanıcı ayarlamada hata oluştu."
-#: actions/recoverpassword.php:382
+#: actions/recoverpassword.php:395
msgid "New password successfully saved. You are now logged in."
msgstr "Yeni parola başarıyla kaydedildi. Şimdi giriş yaptınız."
@@ -3230,7 +3240,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr ""
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:394
+#: lib/userprofile.php:406
msgid "Subscribe"
msgstr "Abone ol"
@@ -3270,7 +3280,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:674
+#: actions/repeat.php:114 lib/noticelist.php:678
#, fuzzy
msgid "Repeated"
msgstr "Yarat"
@@ -3419,8 +3429,8 @@ msgstr "Yer"
msgid "Description"
msgstr "Abonelikler"
-#: actions/showapplication.php:192 actions/showgroup.php:438
-#: lib/profileaction.php:176
+#: actions/showapplication.php:192 actions/showgroup.php:439
+#: lib/profileaction.php:182
msgid "Statistics"
msgstr "İstatistikler"
@@ -3530,71 +3540,71 @@ msgstr ""
msgid "%1$s group, page %2$d"
msgstr "Bütün abonelikler"
-#: actions/showgroup.php:226
+#: actions/showgroup.php:227
#, fuzzy
msgid "Group profile"
msgstr "Böyle bir durum mesajı yok."
-#: actions/showgroup.php:271 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:177
+#: actions/showgroup.php:272 actions/tagother.php:118
+#: actions/userauthorization.php:175 lib/userprofile.php:178
msgid "URL"
msgstr ""
-#: actions/showgroup.php:282 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:194
+#: actions/showgroup.php:283 actions/tagother.php:128
+#: actions/userauthorization.php:187 lib/userprofile.php:195
#, fuzzy
msgid "Note"
msgstr "Durum mesajları"
-#: actions/showgroup.php:292 lib/groupeditform.php:184
+#: actions/showgroup.php:293 lib/groupeditform.php:184
msgid "Aliases"
msgstr ""
-#: actions/showgroup.php:301
+#: actions/showgroup.php:302
msgid "Group actions"
msgstr ""
-#: actions/showgroup.php:337
+#: actions/showgroup.php:338
#, fuzzy, php-format
msgid "Notice feed for %s group (RSS 1.0)"
msgstr "%s için durum RSS beslemesi"
-#: actions/showgroup.php:343
+#: actions/showgroup.php:344
#, fuzzy, php-format
msgid "Notice feed for %s group (RSS 2.0)"
msgstr "%s için durum RSS beslemesi"
-#: actions/showgroup.php:349
+#: actions/showgroup.php:350
#, fuzzy, php-format
msgid "Notice feed for %s group (Atom)"
msgstr "%s için durum RSS beslemesi"
-#: actions/showgroup.php:354
+#: actions/showgroup.php:355
#, fuzzy, php-format
msgid "FOAF for %s group"
msgstr "%s için durum RSS beslemesi"
-#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91
+#: actions/showgroup.php:391 actions/showgroup.php:448 lib/groupnav.php:91
#, fuzzy
msgid "Members"
msgstr "Üyelik başlangıcı"
-#: actions/showgroup.php:395 lib/profileaction.php:117
-#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95
-#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71
+#: actions/showgroup.php:396 lib/profileaction.php:117
+#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95
+#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
msgid "(None)"
msgstr ""
-#: actions/showgroup.php:401
+#: actions/showgroup.php:402
msgid "All members"
msgstr ""
-#: actions/showgroup.php:441
+#: actions/showgroup.php:442
#, fuzzy
msgid "Created"
msgstr "Yarat"
-#: actions/showgroup.php:457
+#: actions/showgroup.php:458
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3604,7 +3614,7 @@ msgid ""
"of this group and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
-#: actions/showgroup.php:463
+#: actions/showgroup.php:464
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3613,7 +3623,7 @@ msgid ""
"their life and interests. "
msgstr ""
-#: actions/showgroup.php:491
+#: actions/showgroup.php:492
msgid "Admins"
msgstr ""
@@ -3743,7 +3753,7 @@ msgid "Unknown language \"%s\"."
msgstr ""
#: actions/siteadminpanel.php:165
-msgid "Minimum text limit is 140 characters."
+msgid "Minimum text limit is 0 (unlimited)."
msgstr ""
#: actions/siteadminpanel.php:171
@@ -4017,8 +4027,7 @@ msgstr "Ayarlar"
msgid "You are not subscribed to that profile."
msgstr "Bize o profili yollamadınız"
-#: actions/subedit.php:83 classes/Subscription.php:89
-#: classes/Subscription.php:116
+#: actions/subedit.php:83 classes/Subscription.php:132
#, fuzzy
msgid "Could not save subscription."
msgstr "Abonelik oluşturulamadı."
@@ -4113,12 +4122,12 @@ msgstr ""
msgid "%s is not listening to anyone."
msgstr "%1$s %2$s'da durumunuzu takip ediyor"
-#: actions/subscriptions.php:199
+#: actions/subscriptions.php:208
#, fuzzy
msgid "Jabber"
msgstr "JabberID yok."
-#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:222 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr ""
@@ -4152,13 +4161,13 @@ msgstr "Böyle bir belge yok."
msgid "Tag %s"
msgstr ""
-#: actions/tagother.php:77 lib/userprofile.php:75
+#: actions/tagother.php:77 lib/userprofile.php:76
#, fuzzy
msgid "User profile"
msgstr "Kullanıcının profili yok."
#: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:102
+#: lib/userprofile.php:103
msgid "Photo"
msgstr ""
@@ -4479,7 +4488,7 @@ msgstr ""
msgid "Plugins"
msgstr ""
-#: actions/version.php:196 lib/action.php:767
+#: actions/version.php:196 lib/action.php:766
#, fuzzy
msgid "Version"
msgstr "Kişisel"
@@ -4488,19 +4497,19 @@ msgstr "Kişisel"
msgid "Author(s)"
msgstr ""
-#: classes/File.php:144
+#: classes/File.php:169
#, 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:154
+#: classes/File.php:179
#, php-format
msgid "A file this large would exceed your user quota of %d bytes."
msgstr ""
-#: classes/File.php:161
+#: classes/File.php:186
#, php-format
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
@@ -4542,103 +4551,103 @@ msgstr ""
msgid "Could not update message with new URI."
msgstr ""
-#: classes/Notice.php:172
+#: classes/Notice.php:175
#, php-format
msgid "DB error inserting hashtag: %s"
msgstr ""
-#: classes/Notice.php:241
+#: classes/Notice.php:244
#, fuzzy
msgid "Problem saving notice. Too long."
msgstr "Durum mesajını kaydederken hata oluştu."
-#: classes/Notice.php:245
+#: classes/Notice.php:248
#, fuzzy
msgid "Problem saving notice. Unknown user."
msgstr "Durum mesajını kaydederken hata oluştu."
-#: classes/Notice.php:250
+#: classes/Notice.php:253
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
-#: classes/Notice.php:256
+#: classes/Notice.php:259
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
msgstr ""
-#: classes/Notice.php:262
+#: classes/Notice.php:265
msgid "You are banned from posting notices on this site."
msgstr ""
-#: classes/Notice.php:328 classes/Notice.php:354
+#: classes/Notice.php:331 classes/Notice.php:357
msgid "Problem saving notice."
msgstr "Durum mesajını kaydederken hata oluştu."
-#: classes/Notice.php:927
+#: classes/Notice.php:943
#, fuzzy
msgid "Problem saving group inbox."
msgstr "Durum mesajını kaydederken hata oluştu."
-#: classes/Notice.php:1459
+#: classes/Notice.php:1481
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
-#: classes/Subscription.php:66 lib/oauthstore.php:465
+#: classes/Subscription.php:74 lib/oauthstore.php:465
msgid "You have been banned from subscribing."
msgstr ""
-#: classes/Subscription.php:70
+#: classes/Subscription.php:78
msgid "Already subscribed!"
msgstr ""
-#: classes/Subscription.php:74
+#: classes/Subscription.php:82
#, fuzzy
msgid "User has blocked you."
msgstr "Kullanıcının profili yok."
-#: classes/Subscription.php:157
+#: classes/Subscription.php:167
#, fuzzy
msgid "Not subscribed!"
msgstr "Bu kullanıcıyı zaten takip etmiyorsunuz!"
-#: classes/Subscription.php:163
+#: classes/Subscription.php:173
#, fuzzy
msgid "Couldn't delete self-subscription."
msgstr "Abonelik silinemedi."
-#: classes/Subscription.php:190
+#: classes/Subscription.php:200
#, fuzzy
msgid "Couldn't delete subscription OMB token."
msgstr "Abonelik silinemedi."
-#: classes/Subscription.php:201 lib/subs.php:69
+#: classes/Subscription.php:211
msgid "Couldn't delete subscription."
msgstr "Abonelik silinemedi."
-#: classes/User.php:373
+#: classes/User.php:363
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr ""
-#: classes/User_group.php:477
+#: classes/User_group.php:480
#, fuzzy
msgid "Could not create group."
msgstr "Avatar bilgisi kaydedilemedi"
-#: classes/User_group.php:486
+#: classes/User_group.php:489
#, fuzzy
msgid "Could not set group URI."
msgstr "Abonelik oluşturulamadı."
-#: classes/User_group.php:507
+#: classes/User_group.php:510
#, fuzzy
msgid "Could not set group membership."
msgstr "Abonelik oluşturulamadı."
-#: classes/User_group.php:521
+#: classes/User_group.php:524
#, fuzzy
msgid "Could not save local group info."
msgstr "Abonelik oluşturulamadı."
@@ -4682,122 +4691,122 @@ msgstr "%1$s'in %2$s'deki durum mesajları "
msgid "Untitled page"
msgstr ""
-#: lib/action.php:424
+#: lib/action.php:423
msgid "Primary site navigation"
msgstr ""
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:430
+#: lib/action.php:429
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr ""
-#: lib/action.php:433
+#: lib/action.php:432
#, fuzzy
msgctxt "MENU"
msgid "Personal"
msgstr "Kişisel"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:435
+#: lib/action.php:434
#, fuzzy
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "Parolayı değiştir"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:440
+#: lib/action.php:439
#, fuzzy
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "Sunucuya yönlendirme yapılamadı: %s"
-#: lib/action.php:443
+#: lib/action.php:442
msgid "Connect"
msgstr "Bağlan"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:446
+#: lib/action.php:445
#, fuzzy
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "Abonelikler"
-#: lib/action.php:449
+#: lib/action.php:448
msgctxt "MENU"
msgid "Admin"
msgstr ""
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:453
+#: lib/action.php:452
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr ""
-#: lib/action.php:456
+#: lib/action.php:455
#, fuzzy
msgctxt "MENU"
msgid "Invite"
msgstr "Geçersiz büyüklük."
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:462
+#: lib/action.php:461
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr ""
-#: lib/action.php:465
+#: lib/action.php:464
#, fuzzy
msgctxt "MENU"
msgid "Logout"
msgstr "Çıkış"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:470
+#: lib/action.php:469
#, fuzzy
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Yeni hesap oluştur"
-#: lib/action.php:473
+#: lib/action.php:472
#, fuzzy
msgctxt "MENU"
msgid "Register"
msgstr "Kayıt"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:476
+#: lib/action.php:475
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr ""
-#: lib/action.php:479
+#: lib/action.php:478
#, fuzzy
msgctxt "MENU"
msgid "Login"
msgstr "Giriş"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:482
+#: lib/action.php:481
#, fuzzy
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Yardım"
-#: lib/action.php:485
+#: lib/action.php:484
#, fuzzy
msgctxt "MENU"
msgid "Help"
msgstr "Yardım"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:488
+#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr ""
-#: lib/action.php:491
+#: lib/action.php:490
#, fuzzy
msgctxt "MENU"
msgid "Search"
@@ -4805,62 +4814,62 @@ msgstr "Ara"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:513 lib/adminpanelaction.php:398
+#: lib/action.php:512 lib/adminpanelaction.php:398
#, fuzzy
msgid "Site notice"
msgstr "Yeni durum mesajı"
-#: lib/action.php:579
+#: lib/action.php:578
msgid "Local views"
msgstr ""
-#: lib/action.php:645
+#: lib/action.php:644
#, fuzzy
msgid "Page notice"
msgstr "Yeni durum mesajı"
-#: lib/action.php:747
+#: lib/action.php:746
#, fuzzy
msgid "Secondary site navigation"
msgstr "Abonelikler"
-#: lib/action.php:752
+#: lib/action.php:751
msgid "Help"
msgstr "Yardım"
-#: lib/action.php:754
+#: lib/action.php:753
msgid "About"
msgstr "Hakkında"
-#: lib/action.php:756
+#: lib/action.php:755
msgid "FAQ"
msgstr "SSS"
-#: lib/action.php:760
+#: lib/action.php:759
msgid "TOS"
msgstr ""
-#: lib/action.php:763
+#: lib/action.php:762
msgid "Privacy"
msgstr "Gizlilik"
-#: lib/action.php:765
+#: lib/action.php:764
msgid "Source"
msgstr "Kaynak"
-#: lib/action.php:769
+#: lib/action.php:768
msgid "Contact"
msgstr "İletişim"
-#: lib/action.php:771
+#: lib/action.php:770
msgid "Badge"
msgstr ""
-#: lib/action.php:799
+#: lib/action.php:798
msgid "StatusNet software license"
msgstr ""
-#: lib/action.php:802
+#: lib/action.php:803
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4869,12 +4878,12 @@ msgstr ""
"**%%site.name%%** [%%site.broughtby%%](%%site.broughtbyurl%%)\" tarafından "
"hazırlanan anında mesajlaşma ağıdır. "
-#: lib/action.php:804
+#: lib/action.php:805
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** bir aninda mesajlaşma sosyal ağıdır."
-#: lib/action.php:806
+#: lib/action.php:808
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4885,56 +4894,60 @@ msgstr ""
"licenses/agpl-3.0.html) lisansı ile korunan [StatusNet](http://status.net/) "
"microbloglama yazılımının %s. versiyonunu kullanmaktadır."
-#: lib/action.php:821
+#: lib/action.php:823
#, fuzzy
msgid "Site content license"
msgstr "Yeni durum mesajı"
-#: lib/action.php:826
+#: lib/action.php:828
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
-#: lib/action.php:831
+#: lib/action.php:833
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
-#: lib/action.php:834
+#: lib/action.php:836
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
-#: lib/action.php:847
+#: lib/action.php:849
msgid "All "
msgstr ""
-#: lib/action.php:853
+#: lib/action.php:855
msgid "license."
msgstr ""
-#: lib/action.php:1152
+#: lib/action.php:1154
msgid "Pagination"
msgstr ""
-#: lib/action.php:1161
+#: lib/action.php:1163
#, fuzzy
msgid "After"
msgstr "« Sonra"
-#: lib/action.php:1169
+#: lib/action.php:1171
#, fuzzy
msgid "Before"
msgstr "Önce »"
-#: lib/activity.php:453
+#: lib/activity.php:120
+msgid "Expecting a root feed element but got a whole XML document."
+msgstr ""
+
+#: lib/activityutils.php:208
msgid "Can't handle remote content yet."
msgstr ""
-#: lib/activity.php:481
+#: lib/activityutils.php:236
msgid "Can't handle embedded XML content yet."
msgstr ""
-#: lib/activity.php:485
+#: lib/activityutils.php:240
msgid "Can't handle embedded Base64 content yet."
msgstr ""
@@ -5034,7 +5047,7 @@ msgstr "Eposta adresi onayı"
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
-#: lib/apiauth.php:272
+#: lib/apiauth.php:276
#, php-format
msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s"
msgstr ""
@@ -5115,11 +5128,11 @@ msgstr "Kaldır"
msgid "Attachments"
msgstr ""
-#: lib/attachmentlist.php:265
+#: lib/attachmentlist.php:263
msgid "Author"
msgstr ""
-#: lib/attachmentlist.php:278
+#: lib/attachmentlist.php:276
#, fuzzy
msgid "Provider"
msgstr "Profil"
@@ -5142,37 +5155,51 @@ msgstr "Parola kaydedildi."
msgid "Password changing is not allowed"
msgstr "Parola kaydedildi."
-#: lib/channel.php:138 lib/channel.php:158
+#: lib/channel.php:157 lib/channel.php:177
msgid "Command results"
msgstr ""
-#: lib/channel.php:210 lib/mailhandler.php:142
+#: lib/channel.php:229 lib/mailhandler.php:142
msgid "Command complete"
msgstr ""
-#: lib/channel.php:221
+#: lib/channel.php:240
msgid "Command failed"
msgstr ""
-#: lib/command.php:44
-msgid "Sorry, this command is not yet implemented."
+#: lib/command.php:83 lib/command.php:105
+msgid "Notice with that id does not exist"
msgstr ""
-#: lib/command.php:88
+#: lib/command.php:99 lib/command.php:570
+#, fuzzy
+msgid "User has no last notice"
+msgstr "Kullanıcının profili yok."
+
+#: lib/command.php:125
#, php-format
msgid "Could not find a user with nickname %s"
msgstr "Kullanıcı güncellenemedi."
-#: lib/command.php:92
+#: lib/command.php:143
+#, fuzzy, php-format
+msgid "Could not find a local user with nickname %s"
+msgstr "Kullanıcı güncellenemedi."
+
+#: lib/command.php:176
+msgid "Sorry, this command is not yet implemented."
+msgstr ""
+
+#: lib/command.php:221
msgid "It does not make a lot of sense to nudge yourself!"
msgstr ""
-#: lib/command.php:99
+#: lib/command.php:228
#, fuzzy, php-format
msgid "Nudge sent to %s"
msgstr "%s için cevaplar"
-#: lib/command.php:126
+#: lib/command.php:254
#, php-format
msgid ""
"Subscriptions: %1$s\n"
@@ -5180,202 +5207,199 @@ msgid ""
"Notices: %3$s"
msgstr ""
-#: lib/command.php:152 lib/command.php:390 lib/command.php:451
-msgid "Notice with that id does not exist"
-msgstr ""
-
-#: lib/command.php:168 lib/command.php:406 lib/command.php:467
-#: lib/command.php:523
-#, fuzzy
-msgid "User has no last notice"
-msgstr "Kullanıcının profili yok."
-
-#: lib/command.php:190
+#: lib/command.php:296
msgid "Notice marked as fave."
msgstr ""
-#: lib/command.php:217
+#: lib/command.php:317
#, fuzzy
msgid "You are already a member of that group"
msgstr "Zaten giriş yapmış durumdasıznız!"
-#: lib/command.php:231
+#: lib/command.php:331
#, fuzzy, php-format
msgid "Could not join user %s to group %s"
msgstr "Sunucuya yönlendirme yapılamadı: %s"
-#: lib/command.php:236
+#: lib/command.php:336
#, fuzzy, php-format
msgid "%s joined group %s"
msgstr "%1$s'in %2$s'deki durum mesajları "
-#: lib/command.php:275
+#: lib/command.php:373
#, fuzzy, php-format
msgid "Could not remove user %s to group %s"
msgstr "OpenID formu yaratılamadı: %s"
-#: lib/command.php:280
+#: lib/command.php:378
#, fuzzy, php-format
msgid "%s left group %s"
msgstr "%1$s'in %2$s'deki durum mesajları "
-#: lib/command.php:309
+#: lib/command.php:401
#, fuzzy, php-format
msgid "Fullname: %s"
msgstr "Tam İsim"
-#: lib/command.php:312 lib/mail.php:258
+#: lib/command.php:404 lib/mail.php:258
#, php-format
msgid "Location: %s"
msgstr ""
-#: lib/command.php:315 lib/mail.php:260
+#: lib/command.php:407 lib/mail.php:260
#, php-format
msgid "Homepage: %s"
msgstr ""
-#: lib/command.php:318
+#: lib/command.php:410
#, php-format
msgid "About: %s"
msgstr ""
-#: lib/command.php:349
+#: lib/command.php:437
+#, php-format
+msgid ""
+"%s is a remote profile; you can only send direct messages to users on the "
+"same server."
+msgstr ""
+
+#: lib/command.php:450
#, php-format
msgid "Message too long - maximum is %d characters, you sent %d"
msgstr ""
-#: lib/command.php:367
+#: lib/command.php:468
#, php-format
msgid "Direct message to %s sent"
msgstr ""
-#: lib/command.php:369
+#: lib/command.php:470
msgid "Error sending direct message."
msgstr ""
-#: lib/command.php:413
+#: lib/command.php:490
#, fuzzy
msgid "Cannot repeat your own notice"
msgstr "Eğer lisansı kabul etmezseniz kayıt olamazsınız."
-#: lib/command.php:418
+#: lib/command.php:495
#, fuzzy
msgid "Already repeated that notice"
msgstr "Zaten giriş yapmış durumdasıznız!"
-#: lib/command.php:426
+#: lib/command.php:503
#, fuzzy, php-format
msgid "Notice from %s repeated"
msgstr "Durum mesajları"
-#: lib/command.php:428
+#: lib/command.php:505
#, fuzzy
msgid "Error repeating notice."
msgstr "Durum mesajını kaydederken hata oluştu."
-#: lib/command.php:482
+#: lib/command.php:536
#, php-format
msgid "Notice too long - maximum is %d characters, you sent %d"
msgstr ""
-#: lib/command.php:491
+#: lib/command.php:545
#, fuzzy, php-format
msgid "Reply to %s sent"
msgstr "%s için cevaplar"
-#: lib/command.php:493
+#: lib/command.php:547
#, fuzzy
msgid "Error saving notice."
msgstr "Durum mesajını kaydederken hata oluştu."
-#: lib/command.php:547
+#: lib/command.php:594
msgid "Specify the name of the user to subscribe to"
msgstr ""
-#: lib/command.php:554 lib/command.php:589
+#: lib/command.php:602
#, fuzzy
-msgid "No such user"
-msgstr "Böyle bir kullanıcı yok."
+msgid "Can't subscribe to OMB profiles by command."
+msgstr "Bize o profili yollamadınız"
-#: lib/command.php:561
+#: lib/command.php:608
#, php-format
msgid "Subscribed to %s"
msgstr ""
-#: lib/command.php:582 lib/command.php:685
+#: lib/command.php:629 lib/command.php:728
msgid "Specify the name of the user to unsubscribe from"
msgstr ""
-#: lib/command.php:595
+#: lib/command.php:638
#, php-format
msgid "Unsubscribed from %s"
msgstr ""
-#: lib/command.php:613 lib/command.php:636
+#: lib/command.php:656 lib/command.php:679
msgid "Command not yet implemented."
msgstr ""
-#: lib/command.php:616
+#: lib/command.php:659
msgid "Notification off."
msgstr ""
-#: lib/command.php:618
+#: lib/command.php:661
msgid "Can't turn off notification."
msgstr ""
-#: lib/command.php:639
+#: lib/command.php:682
msgid "Notification on."
msgstr ""
-#: lib/command.php:641
+#: lib/command.php:684
msgid "Can't turn on notification."
msgstr ""
-#: lib/command.php:654
+#: lib/command.php:697
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:665
+#: lib/command.php:708
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:692
+#: lib/command.php:735
#, fuzzy, php-format
msgid "Unsubscribed %s"
msgstr "Aboneliği sonlandır"
-#: lib/command.php:709
+#: lib/command.php:752
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "Bize o profili yollamadınız"
-#: lib/command.php:711
+#: lib/command.php:754
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Bize o profili yollamadınız"
-#: lib/command.php:731
+#: lib/command.php:774
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Uzaktan abonelik"
-#: lib/command.php:733
+#: lib/command.php:776
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Uzaktan abonelik"
-#: lib/command.php:753
+#: lib/command.php:796
#, fuzzy
msgid "You are not a member of any groups."
msgstr "Bize o profili yollamadınız"
-#: lib/command.php:755
+#: lib/command.php:798
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Bize o profili yollamadınız"
-#: lib/command.php:769
+#: lib/command.php:812
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5417,20 +5441,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:148
+#: lib/common.php:135
#, fuzzy
msgid "No configuration file found. "
msgstr "Onay kodu yok."
-#: lib/common.php:149
+#: lib/common.php:136
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:151
+#: lib/common.php:138
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:152
+#: lib/common.php:139
msgid "Go to the installer."
msgstr ""
@@ -5615,51 +5639,51 @@ msgstr ""
msgid "This page is not available in a media type you accept"
msgstr "Bu sayfa kabul ettiğiniz ortam türünde kullanılabilir değil"
-#: lib/imagefile.php:75
+#: lib/imagefile.php:72
+msgid "Unsupported image file format."
+msgstr "Desteklenmeyen görüntü dosyası biçemi."
+
+#: lib/imagefile.php:88
#, fuzzy, php-format
msgid "That file is too big. The maximum file size is %s."
msgstr ""
"Ah, durumunuz biraz uzun kaçtı. Azami 180 karaktere sığdırmaya ne dersiniz?"
-#: lib/imagefile.php:80
+#: lib/imagefile.php:93
msgid "Partial upload."
msgstr "Kısmi yükleme."
-#: lib/imagefile.php:88 lib/mediafile.php:170
+#: lib/imagefile.php:101 lib/mediafile.php:170
msgid "System error uploading file."
msgstr "Dosya yüklemede sistem hatası."
-#: lib/imagefile.php:96
+#: lib/imagefile.php:109
msgid "Not an image or corrupt file."
msgstr "Bu bir resim dosyası değil ya da dosyada hata var"
-#: lib/imagefile.php:109
-msgid "Unsupported image file format."
-msgstr "Desteklenmeyen görüntü dosyası biçemi."
-
#: lib/imagefile.php:122
#, fuzzy
msgid "Lost our file."
msgstr "Böyle bir durum mesajı yok."
-#: lib/imagefile.php:166 lib/imagefile.php:231
+#: lib/imagefile.php:163 lib/imagefile.php:224
msgid "Unknown file type"
msgstr ""
-#: lib/imagefile.php:251
+#: lib/imagefile.php:244
msgid "MB"
msgstr ""
-#: lib/imagefile.php:253
+#: lib/imagefile.php:246
msgid "kB"
msgstr ""
-#: lib/jabber.php:220
+#: lib/jabber.php:387
#, php-format
msgid "[%s]"
msgstr ""
-#: lib/jabber.php:400
+#: lib/jabber.php:567
#, php-format
msgid "Unknown inbox source %d."
msgstr ""
@@ -5864,7 +5888,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:482
+#: lib/mailbox.php:227 lib/noticelist.php:486
msgid "from"
msgstr ""
@@ -5995,51 +6019,51 @@ msgid ""
"try again later"
msgstr ""
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr ""
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "N"
msgstr ""
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "S"
msgstr ""
-#: lib/noticelist.php:431
+#: lib/noticelist.php:432
msgid "E"
msgstr ""
-#: lib/noticelist.php:431
+#: lib/noticelist.php:432
msgid "W"
msgstr ""
-#: lib/noticelist.php:438
+#: lib/noticelist.php:439
msgid "at"
msgstr ""
-#: lib/noticelist.php:566
+#: lib/noticelist.php:570
#, fuzzy
msgid "in context"
msgstr "İçerik yok!"
-#: lib/noticelist.php:601
+#: lib/noticelist.php:605
#, fuzzy
msgid "Repeated by"
msgstr "Yarat"
-#: lib/noticelist.php:628
+#: lib/noticelist.php:632
msgid "Reply to this notice"
msgstr ""
-#: lib/noticelist.php:629
+#: lib/noticelist.php:633
#, fuzzy
msgid "Reply"
msgstr "cevapla"
-#: lib/noticelist.php:673
+#: lib/noticelist.php:677
#, fuzzy
msgid "Notice repeated"
msgstr "Durum mesajları"
@@ -6114,7 +6138,7 @@ msgstr ""
msgid "Unknown"
msgstr ""
-#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr "Abonelikler"
@@ -6122,7 +6146,7 @@ msgstr "Abonelikler"
msgid "All subscriptions"
msgstr "Bütün abonelikler"
-#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90
+#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr "Abone olanlar"
@@ -6131,15 +6155,20 @@ msgstr "Abone olanlar"
msgid "All subscribers"
msgstr "Abone olanlar"
-#: lib/profileaction.php:180
+#: lib/profileaction.php:186
msgid "User ID"
msgstr ""
-#: lib/profileaction.php:185
+#: lib/profileaction.php:191
msgid "Member since"
msgstr "Üyelik başlangıcı"
-#: lib/profileaction.php:247
+#. TRANS: Average count of posts made per day since account registration
+#: lib/profileaction.php:230
+msgid "Daily average"
+msgstr ""
+
+#: lib/profileaction.php:259
msgid "All groups"
msgstr ""
@@ -6188,7 +6217,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:671
+#: lib/router.php:704
msgid "No single user defined for single-user mode."
msgstr ""
@@ -6321,92 +6350,101 @@ msgstr ""
msgid "Unsubscribe"
msgstr "Aboneliği sonlandır"
-#: lib/userprofile.php:116
+#: lib/usernoprofileexception.php:58
+#, fuzzy, php-format
+msgid "User %s (%d) has no profile record."
+msgstr "Kullanıcının profili yok."
+
+#: lib/userprofile.php:117
#, fuzzy
msgid "Edit Avatar"
msgstr "Avatar"
-#: lib/userprofile.php:236
+#: lib/userprofile.php:234 lib/userprofile.php:248
msgid "User actions"
msgstr ""
-#: lib/userprofile.php:251
+#: lib/userprofile.php:237
+msgid "User deletion in progress..."
+msgstr ""
+
+#: lib/userprofile.php:263
#, fuzzy
msgid "Edit profile settings"
msgstr "Profil ayarları"
-#: lib/userprofile.php:252
+#: lib/userprofile.php:264
msgid "Edit"
msgstr ""
-#: lib/userprofile.php:275
+#: lib/userprofile.php:287
msgid "Send a direct message to this user"
msgstr ""
-#: lib/userprofile.php:276
+#: lib/userprofile.php:288
msgid "Message"
msgstr ""
-#: lib/userprofile.php:314
+#: lib/userprofile.php:326
msgid "Moderate"
msgstr ""
-#: lib/userprofile.php:352
+#: lib/userprofile.php:364
#, fuzzy
msgid "User role"
msgstr "Kullanıcının profili yok."
-#: lib/userprofile.php:354
+#: lib/userprofile.php:366
msgctxt "role"
msgid "Administrator"
msgstr ""
-#: lib/userprofile.php:355
+#: lib/userprofile.php:367
msgctxt "role"
msgid "Moderator"
msgstr ""
-#: lib/util.php:1015
+#: lib/util.php:1046
msgid "a few seconds ago"
msgstr "birkaç saniye önce"
-#: lib/util.php:1017
+#: lib/util.php:1048
msgid "about a minute ago"
msgstr "yaklaşık bir dakika önce"
-#: lib/util.php:1019
+#: lib/util.php:1050
#, php-format
msgid "about %d minutes ago"
msgstr "yaklaşık %d dakika önce"
-#: lib/util.php:1021
+#: lib/util.php:1052
msgid "about an hour ago"
msgstr "yaklaşık bir saat önce"
-#: lib/util.php:1023
+#: lib/util.php:1054
#, php-format
msgid "about %d hours ago"
msgstr "yaklaşık %d saat önce"
-#: lib/util.php:1025
+#: lib/util.php:1056
msgid "about a day ago"
msgstr "yaklaşık bir gün önce"
-#: lib/util.php:1027
+#: lib/util.php:1058
#, php-format
msgid "about %d days ago"
msgstr "yaklaşık %d gün önce"
-#: lib/util.php:1029
+#: lib/util.php:1060
msgid "about a month ago"
msgstr "yaklaşık bir ay önce"
-#: lib/util.php:1031
+#: lib/util.php:1062
#, php-format
msgid "about %d months ago"
msgstr "yaklaşık %d ay önce"
-#: lib/util.php:1033
+#: lib/util.php:1064
msgid "about a year ago"
msgstr "yaklaşık bir yıl önce"
@@ -6420,7 +6458,7 @@ msgstr "Başlangıç sayfası adresi geçerli bir URL değil."
msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr ""
-#: lib/xmppmanager.php:402
+#: lib/xmppmanager.php:403
#, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d."
msgstr ""
diff --git a/locale/uk/LC_MESSAGES/statusnet.po b/locale/uk/LC_MESSAGES/statusnet.po
index 78aa5dc23..e1c751f7b 100644
--- a/locale/uk/LC_MESSAGES/statusnet.po
+++ b/locale/uk/LC_MESSAGES/statusnet.po
@@ -10,12 +10,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-06 23:49+0000\n"
-"PO-Revision-Date: 2010-03-06 23:51:07+0000\n"
+"POT-Creation-Date: 2010-04-06 22:53+0000\n"
+"PO-Revision-Date: 2010-04-06 22:55:29+0000\n"
"Language-Team: Ukrainian\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64665); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: uk\n"
"X-Message-Group: out-statusnet\n"
@@ -95,9 +95,9 @@ msgstr "Немає такої сторінки"
#: 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:90
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78
+#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
@@ -106,10 +106,8 @@ msgstr "Немає такої сторінки"
#: actions/remotesubscribe.php:154 actions/replies.php:73
#: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:163 lib/command.php:302
-#: lib/command.php:355 lib/command.php:401 lib/command.php:462
-#: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82
-#: lib/profileaction.php:77
+#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: lib/mailbox.php:82 lib/profileaction.php:77
msgid "No such user."
msgstr "Такого користувача немає."
@@ -202,18 +200,18 @@ msgstr "Оновлення від %1$s та друзів на %2$s!"
#: 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:132
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:136
#: actions/apigrouplistall.php:120 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:135
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
-#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184
-#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148
+#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:174
+#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173
+#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
-#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
+#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
msgid "API method not found."
msgstr "API метод не знайдено."
@@ -226,8 +224,8 @@ msgstr "API метод не знайдено."
#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65
-#: actions/apistatusesupdate.php:118
+#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
msgid "This method requires a POST."
msgstr "Цей метод потребує POST."
@@ -257,7 +255,7 @@ msgid "Could not save profile."
msgstr "Не вдалося зберегти профіль."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:97
+#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
#: actions/designadminpanel.php:122 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
@@ -344,7 +342,7 @@ msgstr "Жодних статусів з таким ID."
msgid "This status is already a favorite."
msgstr "Цей статус вже є обраним."
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
msgid "Could not create favorite."
msgstr "Не можна позначити як обране."
@@ -428,7 +426,7 @@ msgstr "Опис надто довгий (%d знаків максимум)."
#: actions/newgroup.php:148 actions/profilesettings.php:232
#: actions/register.php:227
msgid "Location is too long (max 255 chars)."
-msgstr "Локація надто довга (255 знаків максимум)."
+msgstr "Розташування надто довге (255 знаків максимум)."
#: actions/apigroupcreate.php:245 actions/editgroup.php:219
#: actions/newgroup.php:159
@@ -463,7 +461,7 @@ msgstr "Групу не знайдено!"
msgid "You are already a member of that group."
msgstr "Ви вже є учасником цієї групи."
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:221
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
msgid "You have been blocked from that group by the admin."
msgstr "Адмін цієї групи заблокував Вашу присутність в ній."
@@ -481,11 +479,18 @@ msgstr "Ви не є учасником цієї групи."
msgid "Could not remove user %1$s from group %2$s."
msgstr "Не вдалось видалити користувача %1$s з групи %2$s."
-#: actions/apigrouplist.php:95
+#. TRANS: %s is a user name
+#: actions/apigrouplist.php:97
#, 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
+#, php-format
+msgid "%1$s groups %2$s is a member of."
+msgstr "%1$s групи, в яких %2$s бере участь."
+
#: actions/apigrouplistall.php:90 actions/usergroups.php:62
#, php-format
msgid "%s groups"
@@ -513,7 +518,7 @@ msgstr "Невірний токен."
#: 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:337
+#: actions/profilesettings.php:194 actions/recoverpassword.php:350
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
@@ -578,15 +583,15 @@ msgstr ""
"на доступ до Вашого акаунту %4$s лише тим стороннім додаткам, яким Ви "
"довіряєте."
-#: actions/apioauthauthorize.php:310 lib/action.php:438
+#: actions/apioauthauthorize.php:310 lib/action.php:437
msgid "Account"
msgstr "Акаунт"
#: actions/apioauthauthorize.php:313 actions/login.php:230
#: actions/profilesettings.php:106 actions/register.php:424
-#: actions/showgroup.php:244 actions/tagother.php:94
+#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
-#: lib/userprofile.php:131
+#: lib/userprofile.php:132
msgid "Nickname"
msgstr "Ім’я користувача"
@@ -657,12 +662,12 @@ msgstr ""
msgid "Unsupported format."
msgstr "Формат не підтримується."
-#: actions/apitimelinefavorites.php:108
+#: actions/apitimelinefavorites.php:109
#, php-format
msgid "%1$s / Favorites from %2$s"
msgstr "%1$s / Обрані від %2$s"
-#: actions/apitimelinefavorites.php:117
+#: actions/apitimelinefavorites.php:118
#, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "%1$s оновлення обраних від %2$s / %2$s."
@@ -672,7 +677,7 @@ msgstr "%1$s оновлення обраних від %2$s / %2$s."
msgid "%1$s / Updates mentioning %2$s"
msgstr "%1$s / Оновленні відповіді %2$s"
-#: actions/apitimelinementions.php:127
+#: actions/apitimelinementions.php:130
#, php-format
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "%1$s оновив цю відповідь на допис від %2$s / %3$s."
@@ -682,7 +687,7 @@ msgstr "%1$s оновив цю відповідь на допис від %2$s /
msgid "%s public timeline"
msgstr "%s загальна стрічка"
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "%s оновлення від усіх!"
@@ -697,12 +702,12 @@ msgstr "Повторено для %s"
msgid "Repeats of %s"
msgstr "Повторення %s"
-#: actions/apitimelinetag.php:102 actions/tag.php:67
+#: actions/apitimelinetag.php:104 actions/tag.php:67
#, php-format
msgid "Notices tagged with %s"
msgstr "Дописи позначені з %s"
-#: actions/apitimelinetag.php:104 actions/tagrss.php:65
+#: actions/apitimelinetag.php:106 actions/tagrss.php:65
#, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Оновлення позначені з %1$s на %2$s!"
@@ -730,7 +735,7 @@ msgstr "Немає розміру."
msgid "Invalid size."
msgstr "Недійсний розмір."
-#: actions/avatarsettings.php:67 actions/showgroup.php:229
+#: actions/avatarsettings.php:67 actions/showgroup.php:230
#: lib/accountsettingsaction.php:112
msgid "Avatar"
msgstr "Аватара"
@@ -762,7 +767,7 @@ msgid "Preview"
msgstr "Перегляд"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:655
+#: lib/deleteuserform.php:66 lib/noticelist.php:659
msgid "Delete"
msgstr "Видалити"
@@ -774,23 +779,27 @@ msgstr "Завантажити"
msgid "Crop"
msgstr "Втяти"
-#: actions/avatarsettings.php:328
+#: actions/avatarsettings.php:305
+msgid "No file uploaded."
+msgstr "Жодного файлу не завантажено."
+
+#: actions/avatarsettings.php:332
msgid "Pick a square area of the image to be your avatar"
msgstr "Оберіть квадратну ділянку зображення, яка й буде Вашою автарою."
-#: actions/avatarsettings.php:343 actions/grouplogo.php:380
+#: actions/avatarsettings.php:347 actions/grouplogo.php:380
msgid "Lost our file data."
msgstr "Дані Вашого файлу десь загубились."
-#: actions/avatarsettings.php:366
+#: actions/avatarsettings.php:370
msgid "Avatar updated."
msgstr "Аватару оновлено."
-#: actions/avatarsettings.php:369
+#: actions/avatarsettings.php:373
msgid "Failed updating avatar."
msgstr "Оновлення аватари невдале."
-#: actions/avatarsettings.php:393
+#: actions/avatarsettings.php:397
msgid "Avatar deleted."
msgstr "Аватару видалено."
@@ -828,7 +837,7 @@ msgstr "Не блокувати цього користувача"
msgid "Yes"
msgstr "Так"
-#: actions/block.php:144 actions/groupmembers.php:355 lib/blockform.php:80
+#: actions/block.php:144 actions/groupmembers.php:373 lib/blockform.php:80
msgid "Block this user"
msgstr "Блокувати користувача"
@@ -845,8 +854,8 @@ msgstr "Збереження інформації про блокування з
#: actions/groupunblock.php:86 actions/joingroup.php:82
#: actions/joingroup.php:93 actions/leavegroup.php:82
#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212
-#: lib/command.php:260
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162
+#: lib/command.php:358
msgid "No such group."
msgstr "Такої групи немає."
@@ -928,7 +937,7 @@ msgid "Conversation"
msgstr "Розмова"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:218 lib/searchgroupnav.php:82
+#: lib/profileaction.php:229 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "Дописи"
@@ -947,7 +956,7 @@ msgstr "Ви не є власником цього додатку."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1217
+#: lib/action.php:1219
msgid "There was a problem with your session token."
msgstr "Виникли певні проблеми з токеном поточної сесії."
@@ -1006,7 +1015,7 @@ msgstr "Ви впевненні, що бажаєте видалити цей д
msgid "Do not delete this notice"
msgstr "Не видаляти цей допис"
-#: actions/deletenotice.php:146 lib/noticelist.php:655
+#: actions/deletenotice.php:146 lib/noticelist.php:659
msgid "Delete this notice"
msgstr "Видалити допис"
@@ -1143,7 +1152,7 @@ msgstr "Повернутись до початкових налаштувань"
#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:208
+#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
#: actions/tagother.php:154 actions/useradminpanel.php:294
#: lib/applicationeditform.php:333 lib/applicationeditform.php:334
#: lib/designsettings.php:256 lib/groupeditform.php:202
@@ -1259,7 +1268,7 @@ msgstr "опис надто довгий (%d знаків максимум)."
msgid "Could not update group."
msgstr "Не вдалося оновити групу."
-#: actions/editgroup.php:264 classes/User_group.php:493
+#: actions/editgroup.php:264 classes/User_group.php:496
msgid "Could not create aliases."
msgstr "Неможна призначити додаткові імена."
@@ -1617,7 +1626,7 @@ msgstr "Користувача заблоковано в цій групі."
msgid "User is not a member of group."
msgstr "Користувач не є учасником групи."
-#: actions/groupblock.php:136 actions/groupmembers.php:323
+#: actions/groupblock.php:136 actions/groupmembers.php:341
msgid "Block user from group"
msgstr "Блокувати користувача в групі"
@@ -1719,19 +1728,19 @@ msgstr "Список учасників цієї групи."
msgid "Admin"
msgstr "Адмін"
-#: actions/groupmembers.php:355 lib/blockform.php:69
+#: actions/groupmembers.php:373 lib/blockform.php:69
msgid "Block"
msgstr "Блок"
-#: actions/groupmembers.php:450
+#: actions/groupmembers.php:468
msgid "Make user an admin of the group"
msgstr "Надати користувачеві права адміністратора"
-#: actions/groupmembers.php:482
+#: actions/groupmembers.php:500
msgid "Make Admin"
msgstr "Зробити адміном"
-#: actions/groupmembers.php:482
+#: actions/groupmembers.php:500
msgid "Make this user an admin"
msgstr "Надати цьому користувачеві права адміністратора"
@@ -1746,7 +1755,7 @@ msgstr "%s стрічка"
msgid "Updates from members of %1$s on %2$s!"
msgstr "Оновлення членів %1$s на %2$s!"
-#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232
+#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249
#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr "Групи"
@@ -1781,7 +1790,7 @@ msgid ""
"Search for groups on %%site.name%% by their name, location, or description. "
"Separate the terms by spaces; they must be 3 characters or more."
msgstr ""
-"Пошук груп на %%site.name%% за їхньою назвою, локацією або описом. "
+"Пошук груп на %%site.name%% за їхньою назвою, розташуванням або описом. "
"Відокремлюйте пошукові умови інтервалами; вони повинні складатись з 3 знаків "
"або більше."
@@ -1961,7 +1970,7 @@ msgstr "Запросити нових користувачів"
msgid "You are already subscribed to these users:"
msgstr "Ви вже підписані до цих користувачів:"
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
#, php-format
msgid "%1$s (%2$s)"
msgstr "%1$s (%2$s)"
@@ -2093,7 +2102,7 @@ msgstr "%1$s приєднався до групи %2$s"
msgid "You must be logged in to leave a group."
msgstr "Ви повинні спочатку увійти на сайт, аби залишити групу."
-#: actions/leavegroup.php:100 lib/command.php:265
+#: actions/leavegroup.php:100 lib/command.php:363
msgid "You are not a member of that group."
msgstr "Ви не є учасником цієї групи."
@@ -2209,12 +2218,12 @@ msgstr "Скористайтесь цією формою для створенн
msgid "New message"
msgstr "Нове повідомлення"
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
msgid "You can't send a message to this user."
msgstr "Ви не можете надіслати повідомлення цьому користувачеві."
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342
-#: lib/command.php:475
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
+#: lib/command.php:529
msgid "No content!"
msgstr "Немає змісту!"
@@ -2222,7 +2231,7 @@ msgstr "Немає змісту!"
msgid "No recipient specified."
msgstr "Жодного отримувача не визначено."
-#: actions/newmessage.php:164 lib/command.php:361
+#: actions/newmessage.php:164 lib/command.php:462
msgid ""
"Don't send a message to yourself; just say it to yourself quietly instead."
msgstr ""
@@ -2237,7 +2246,7 @@ msgstr "Повідомлення надіслано"
msgid "Direct message to %s sent."
msgstr "Пряме повідомлення для %s надіслано."
-#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189
msgid "Ajax Error"
msgstr "Помилка в Ajax"
@@ -2245,7 +2254,7 @@ msgstr "Помилка в Ajax"
msgid "New notice"
msgstr "Новий допис"
-#: actions/newnotice.php:211
+#: actions/newnotice.php:217
msgid "Notice posted"
msgstr "Допис надіслано"
@@ -2357,7 +2366,7 @@ msgstr "Розробники можуть змінити налаштуванн
msgid "Notice has no profile"
msgstr "Допис не має профілю"
-#: actions/oembed.php:86 actions/shownotice.php:180
+#: actions/oembed.php:86 actions/shownotice.php:175
#, php-format
msgid "%1$s's status on %2$s"
msgstr "%1$s має статус на %2$s"
@@ -2370,8 +2379,8 @@ msgstr "тип змісту "
msgid "Only "
msgstr "Лише "
-#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042
-#: lib/apiaction.php:1070 lib/apiaction.php:1179
+#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1068
+#: lib/apiaction.php:1096 lib/apiaction.php:1212
msgid "Not a supported data format."
msgstr "Такий формат даних не підтримується."
@@ -2393,11 +2402,11 @@ msgstr "Керування деякими іншими опціями."
#: actions/othersettings.php:108
msgid " (free service)"
-msgstr " (безкоштовно)"
+msgstr " (вільний сервіс)"
#: actions/othersettings.php:116
msgid "Shorten URLs with"
-msgstr "Зручні URL"
+msgstr "Скорочення URL-адрес"
#: actions/othersettings.php:117
msgid "Automatic shortening service to use."
@@ -2504,7 +2513,7 @@ msgstr "Старий пароль є неточним"
msgid "Error saving user; invalid."
msgstr "Помилка при збереженні користувача; недійсний."
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
msgid "Can't save new password."
msgstr "Неможна зберегти новий пароль."
@@ -2671,7 +2680,7 @@ msgid ""
"Search for people on %%site.name%% by their name, location, or interests. "
"Separate the terms by spaces; they must be 3 characters or more."
msgstr ""
-"Пошук людей на %%site.name%% за їх ім’ям, локацією або інтересами. "
+"Пошук людей на %%site.name%% за їх ім’ям, розташуванням або інтересами. "
"Відокремлюйте пошукові умови інтервалами; вони повинні складатись з 3 знаків "
"або більше."
@@ -2679,12 +2688,12 @@ msgstr ""
msgid "People search"
msgstr "Пошук людей"
-#: actions/peopletag.php:70
+#: actions/peopletag.php:68
#, php-format
msgid "Not a valid people tag: %s"
msgstr "Це недійсний особистий теґ: %s"
-#: actions/peopletag.php:144
+#: actions/peopletag.php:142
#, php-format
msgid "Users self-tagged with %1$s - page %2$d"
msgstr "Користувачі з особистим теґом %1$s — сторінка %2$d"
@@ -2718,8 +2727,8 @@ msgstr ""
"1-64 літери нижнього регістру і цифри, ніякої пунктуації або інтервалів"
#: actions/profilesettings.php:111 actions/register.php:448
-#: actions/showgroup.php:255 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:149
+#: actions/showgroup.php:256 actions/tagother.php:104
+#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Повне ім’я"
@@ -2746,23 +2755,23 @@ msgid "Bio"
msgstr "Про себе"
#: actions/profilesettings.php:132 actions/register.php:471
-#: actions/showgroup.php:264 actions/tagother.php:112
+#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
-#: lib/userprofile.php:164
+#: lib/userprofile.php:165
msgid "Location"
msgstr "Розташування"
#: actions/profilesettings.php:134 actions/register.php:473
msgid "Where you are, like \"City, State (or Region), Country\""
-msgstr "Де Ви живете, штибу \"Місто, область (регіон), країна\""
+msgstr "Де Ви живете, на кшталт «Місто, область (регіон), країна»"
#: actions/profilesettings.php:138
msgid "Share my current location when posting notices"
-msgstr "Показувати мою поточну локацію при надсиланні дописів"
+msgstr "Показувати моє місцезнаходження при надсиланні дописів"
#: actions/profilesettings.php:145 actions/tagother.php:149
#: actions/tagother.php:209 lib/subscriptionlist.php:106
-#: lib/subscriptionlist.php:108 lib/userprofile.php:209
+#: lib/subscriptionlist.php:108 lib/userprofile.php:210
msgid "Tags"
msgstr "Теґи"
@@ -2846,7 +2855,7 @@ msgstr "Не вдається відновити загальну стрічку
#: actions/public.php:130
#, php-format
msgid "Public timeline, page %d"
-msgstr "Загальний стрічка, сторінка %d"
+msgstr "Загальна стрічка, сторінка %d"
#: actions/public.php:132 lib/publicgroupnav.php:79
msgid "Public timeline"
@@ -2893,7 +2902,7 @@ msgid ""
"friends, family, and colleagues! ([Read more](%%doc.help%%))"
msgstr ""
"Це %%site.name%% — сервіс [мікроблоґів](http://uk.wikipedia.org/wiki/"
-"Мікроблоґ), який працює на вільному програмному забезпеченні [StatusNet]"
+"Мікроблоггінг), який працює на вільному програмному забезпеченні [StatusNet]"
"(http://status.net/). [Приєднуйтесь](%%action.register%%) зараз і зможете "
"розділити своє життя з друзями, родиною і колегами! ([Дізнатися більше](%%"
"doc.help%%))"
@@ -2906,7 +2915,7 @@ msgid ""
"tool."
msgstr ""
"Це %%site.name%% — сервіс [мікроблоґів](http://uk.wikipedia.org/wiki/"
-"Мікроблоґ), який працює на вільному програмному забезпеченні [StatusNet]"
+"Мікроблоггінг), який працює на вільному програмному забезпеченні [StatusNet]"
"(http://status.net/)."
#: actions/publictagcloud.php:57
@@ -3005,7 +3014,7 @@ msgstr "Скинути пароль"
msgid "Recover password"
msgstr "Відновити пароль"
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
msgid "Password recovery requested"
msgstr "Запит на відновлення паролю відправлено"
@@ -3025,19 +3034,19 @@ msgstr "Скинути"
msgid "Enter a nickname or email address."
msgstr "Введіть ім’я або електронну адресу."
-#: actions/recoverpassword.php:272
+#: actions/recoverpassword.php:282
msgid "No user with that email address or username."
msgstr "Користувача з такою електронною адресою або ім’ям немає."
-#: actions/recoverpassword.php:287
+#: actions/recoverpassword.php:299
msgid "No registered email address for that user."
msgstr "Для цього користувача немає зареєстрованої електронної адреси."
-#: actions/recoverpassword.php:301
+#: actions/recoverpassword.php:313
msgid "Error saving address confirmation."
msgstr "Помилка при збереженні підтвердження адреси."
-#: actions/recoverpassword.php:325
+#: actions/recoverpassword.php:338
msgid ""
"Instructions for recovering your password have been sent to the email "
"address registered to your account."
@@ -3045,23 +3054,23 @@ msgstr ""
"Інструкції з відновлення паролю було надіслано на електронну адресу, яку Ви "
"вказали у налаштуваннях Вашого профілю."
-#: actions/recoverpassword.php:344
+#: actions/recoverpassword.php:357
msgid "Unexpected password reset."
msgstr "Несподіване скидання паролю."
-#: actions/recoverpassword.php:352
+#: actions/recoverpassword.php:365
msgid "Password must be 6 chars or more."
msgstr "Пароль має складатись з 6-ти або більше знаків."
-#: actions/recoverpassword.php:356
+#: actions/recoverpassword.php:369
msgid "Password and confirmation do not match."
msgstr "Пароль та підтвердження не співпадають."
-#: actions/recoverpassword.php:375 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:248
msgid "Error setting user."
msgstr "Помилка в налаштуваннях користувача."
-#: actions/recoverpassword.php:382
+#: actions/recoverpassword.php:395
msgid "New password successfully saved. You are now logged in."
msgstr "Новий пароль успішно збережено. Тепер Ви увійшли."
@@ -3226,7 +3235,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "URL-адреса Вашого профілю на іншому сумісному сервісі"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:394
+#: lib/userprofile.php:406
msgid "Subscribe"
msgstr "Підписатись"
@@ -3263,7 +3272,7 @@ msgstr "Ви не можете повторювати свої власні до
msgid "You already repeated that notice."
msgstr "Ви вже повторили цей допис."
-#: actions/repeat.php:114 lib/noticelist.php:674
+#: actions/repeat.php:114 lib/noticelist.php:678
msgid "Repeated"
msgstr "Повторено"
@@ -3406,8 +3415,8 @@ msgstr "Організація"
msgid "Description"
msgstr "Опис"
-#: actions/showapplication.php:192 actions/showgroup.php:438
-#: lib/profileaction.php:176
+#: actions/showapplication.php:192 actions/showgroup.php:444
+#: lib/profileaction.php:187
msgid "Statistics"
msgstr "Статистика"
@@ -3527,67 +3536,67 @@ msgstr "Група %s"
msgid "%1$s group, page %2$d"
msgstr "Група %1$s, сторінка %2$d"
-#: actions/showgroup.php:226
+#: actions/showgroup.php:227
msgid "Group profile"
msgstr "Профіль групи"
-#: actions/showgroup.php:271 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:177
+#: actions/showgroup.php:272 actions/tagother.php:118
+#: actions/userauthorization.php:175 lib/userprofile.php:178
msgid "URL"
msgstr "URL"
-#: actions/showgroup.php:282 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:194
+#: actions/showgroup.php:283 actions/tagother.php:128
+#: actions/userauthorization.php:187 lib/userprofile.php:195
msgid "Note"
msgstr "Зауваження"
-#: actions/showgroup.php:292 lib/groupeditform.php:184
+#: actions/showgroup.php:293 lib/groupeditform.php:184
msgid "Aliases"
msgstr "Додаткові імена"
-#: actions/showgroup.php:301
+#: actions/showgroup.php:302
msgid "Group actions"
msgstr "Діяльність групи"
-#: actions/showgroup.php:337
+#: actions/showgroup.php:338
#, php-format
msgid "Notice feed for %s group (RSS 1.0)"
msgstr "Стрічка дописів групи %s (RSS 1.0)"
-#: actions/showgroup.php:343
+#: actions/showgroup.php:344
#, php-format
msgid "Notice feed for %s group (RSS 2.0)"
msgstr "Стрічка дописів групи %s (RSS 2.0)"
-#: actions/showgroup.php:349
+#: actions/showgroup.php:350
#, php-format
msgid "Notice feed for %s group (Atom)"
msgstr "Стрічка дописів групи %s (Atom)"
-#: actions/showgroup.php:354
+#: actions/showgroup.php:355
#, php-format
msgid "FOAF for %s group"
msgstr "FOAF для групи %s"
-#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91
+#: actions/showgroup.php:393 actions/showgroup.php:453 lib/groupnav.php:91
msgid "Members"
msgstr "Учасники"
-#: actions/showgroup.php:395 lib/profileaction.php:117
-#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95
-#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71
+#: actions/showgroup.php:398 lib/profileaction.php:117
+#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95
+#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
msgid "(None)"
msgstr "(Пусто)"
-#: actions/showgroup.php:401
+#: actions/showgroup.php:404
msgid "All members"
msgstr "Всі учасники"
-#: actions/showgroup.php:441
+#: actions/showgroup.php:447
msgid "Created"
msgstr "Створено"
-#: actions/showgroup.php:457
+#: actions/showgroup.php:463
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3597,12 +3606,12 @@ msgid ""
"of this group and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
"**%s** це група на %%%%site.name%%%% — сервісі [мікроблоґів](http://uk."
-"wikipedia.org/wiki/Мікроблоґ), який працює на вільному програмному "
+"wikipedia.org/wiki/Мікроблоггінг), який працює на вільному програмному "
"забезпеченні [StatusNet](http://status.net/). Члени цієї групи роблять "
"короткі дописи про своє життя та інтереси. [Приєднуйтесь](%%action.register%"
"%) зараз і долучіться до спілкування! ([Дізнатися більше](%%doc.help%%))"
-#: actions/showgroup.php:463
+#: actions/showgroup.php:469
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3611,11 +3620,11 @@ msgid ""
"their life and interests. "
msgstr ""
"**%s** це група користувачів на %%site.name%% — сервісі [мікроблоґів](http://"
-"uk.wikipedia.org/wiki/Мікроблоґ), який працює на вільному програмному "
+"uk.wikipedia.org/wiki/Мікроблоггінг), який працює на вільному програмному "
"забезпеченні [StatusNet](http://status.net/). Члени цієї групи роблять "
"короткі дописи про своє життя та інтереси. "
-#: actions/showgroup.php:491
+#: actions/showgroup.php:497
msgid "Admins"
msgstr "Адміни"
@@ -3720,7 +3729,7 @@ msgid ""
"[StatusNet](http://status.net/) tool. "
msgstr ""
"**%s** є власником акаунту на сайті %%%%site.name%%%% — сервісі [мікроблоґів]"
-"(http://uk.wikipedia.org/wiki/Мікроблоґ), який працює на вільному "
+"(http://uk.wikipedia.org/wiki/Мікроблоггінг), який працює на вільному "
"програмному забезпеченні [StatusNet](http://status.net/). "
#: actions/showstream.php:305
@@ -3754,8 +3763,8 @@ msgid "Unknown language \"%s\"."
msgstr "Невідома мова «%s»."
#: actions/siteadminpanel.php:165
-msgid "Minimum text limit is 140 characters."
-msgstr "Ліміт текстових повідомлень становить 140 знаків."
+msgid "Minimum text limit is 0 (unlimited)."
+msgstr "Ліміт текстових повідомлень становить 0 (необмежено)."
#: actions/siteadminpanel.php:171
msgid "Dupe limit must 1 or more seconds."
@@ -3773,7 +3782,7 @@ msgstr "Назва сайту"
#: actions/siteadminpanel.php:225
msgid "The name of your site, like \"Yourcompany Microblog\""
-msgstr "Назва Вашого сайту, штибу \"Мікроблоґи компанії ...\""
+msgstr "Назва Вашого сайту, щось на зразок «Мікроблоґи компанії ...»"
#: actions/siteadminpanel.php:229
msgid "Brought by"
@@ -4028,8 +4037,7 @@ msgstr "Зберегти налаштування знімку"
msgid "You are not subscribed to that profile."
msgstr "Ви не підписані до цього профілю."
-#: actions/subedit.php:83 classes/Subscription.php:89
-#: classes/Subscription.php:116
+#: actions/subedit.php:83 classes/Subscription.php:132
msgid "Could not save subscription."
msgstr "Не вдалося зберегти підписку."
@@ -4130,11 +4138,11 @@ msgstr ""
msgid "%s is not listening to anyone."
msgstr "%s не відслідковує нічого"
-#: actions/subscriptions.php:199
+#: actions/subscriptions.php:208
msgid "Jabber"
msgstr "Jabber"
-#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:222 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr "СМС"
@@ -4167,12 +4175,12 @@ msgstr "Немає ID аргументу."
msgid "Tag %s"
msgstr "Позначити %s"
-#: actions/tagother.php:77 lib/userprofile.php:75
+#: actions/tagother.php:77 lib/userprofile.php:76
msgid "User profile"
msgstr "Профіль користувача."
#: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:102
+#: lib/userprofile.php:103
msgid "Photo"
msgstr "Фото"
@@ -4505,7 +4513,7 @@ msgstr ""
msgid "Plugins"
msgstr "Додатки"
-#: actions/version.php:196 lib/action.php:767
+#: actions/version.php:196 lib/action.php:766
msgid "Version"
msgstr "Версія"
@@ -4513,7 +4521,7 @@ msgstr "Версія"
msgid "Author(s)"
msgstr "Автор(и)"
-#: classes/File.php:144
+#: classes/File.php:169
#, php-format
msgid ""
"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
@@ -4522,12 +4530,12 @@ msgstr ""
"Ні, файл не може бути більшим за %d байтів, а те, що Ви хочете надіслати, "
"важить %d байтів. Спробуйте меншу версію."
-#: classes/File.php:154
+#: classes/File.php:179
#, php-format
msgid "A file this large would exceed your user quota of %d bytes."
msgstr "Розміри цього файлу перевищують Вашу квоту на %d байтів."
-#: classes/File.php:161
+#: classes/File.php:186
#, php-format
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr "Розміри цього файлу перевищують Вашу місячну квоту на %d байтів."
@@ -4565,27 +4573,27 @@ msgstr "Не можна долучити повідомлення."
msgid "Could not update message with new URI."
msgstr "Не можна оновити повідомлення з новим URI."
-#: classes/Notice.php:172
+#: classes/Notice.php:175
#, php-format
msgid "DB error inserting hashtag: %s"
msgstr "Помилка бази даних при додаванні теґу: %s"
-#: classes/Notice.php:241
+#: classes/Notice.php:244
msgid "Problem saving notice. Too long."
msgstr "Проблема при збереженні допису. Надто довге."
-#: classes/Notice.php:245
+#: classes/Notice.php:248
msgid "Problem saving notice. Unknown user."
msgstr "Проблема при збереженні допису. Невідомий користувач."
-#: classes/Notice.php:250
+#: classes/Notice.php:253
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
"Дуже багато дописів за короткий термін; ходіть подихайте повітрям і "
"повертайтесь за кілька хвилин."
-#: classes/Notice.php:256
+#: classes/Notice.php:259
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
@@ -4593,69 +4601,69 @@ msgstr ""
"Дуже багато повідомлень за короткий термін; ходіть подихайте повітрям і "
"повертайтесь за кілька хвилин."
-#: classes/Notice.php:262
+#: classes/Notice.php:265
msgid "You are banned from posting notices on this site."
msgstr "Вам заборонено надсилати дописи до цього сайту."
-#: classes/Notice.php:328 classes/Notice.php:354
+#: classes/Notice.php:331 classes/Notice.php:357
msgid "Problem saving notice."
msgstr "Проблема при збереженні допису."
-#: classes/Notice.php:927
+#: classes/Notice.php:943
msgid "Problem saving group inbox."
msgstr "Проблема при збереженні вхідних дописів для групи."
-#: classes/Notice.php:1459
+#: classes/Notice.php:1481
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
-#: classes/Subscription.php:66 lib/oauthstore.php:465
+#: classes/Subscription.php:74 lib/oauthstore.php:465
msgid "You have been banned from subscribing."
msgstr "Вас позбавлено можливості підписатись."
-#: classes/Subscription.php:70
+#: classes/Subscription.php:78
msgid "Already subscribed!"
msgstr "Вже підписаний!"
-#: classes/Subscription.php:74
+#: classes/Subscription.php:82
msgid "User has blocked you."
msgstr "Користувач заблокував Вас."
-#: classes/Subscription.php:157
+#: classes/Subscription.php:167
msgid "Not subscribed!"
msgstr "Не підписано!"
-#: classes/Subscription.php:163
+#: classes/Subscription.php:173
msgid "Couldn't delete self-subscription."
msgstr "Не можу видалити самопідписку."
-#: classes/Subscription.php:190
+#: classes/Subscription.php:200
msgid "Couldn't delete subscription OMB token."
msgstr "Не вдається видалити токен підписки OMB."
-#: classes/Subscription.php:201 lib/subs.php:69
+#: classes/Subscription.php:211
msgid "Couldn't delete subscription."
msgstr "Не вдалося видалити підписку."
-#: classes/User.php:373
+#: classes/User.php:363
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Вітаємо на %1$s, @%2$s!"
-#: classes/User_group.php:477
+#: classes/User_group.php:480
msgid "Could not create group."
msgstr "Не вдалося створити нову групу."
-#: classes/User_group.php:486
+#: classes/User_group.php:489
msgid "Could not set group URI."
msgstr "Не вдалося встановити URI групи."
-#: classes/User_group.php:507
+#: classes/User_group.php:510
msgid "Could not set group membership."
msgstr "Не вдалося встановити членство."
-#: classes/User_group.php:521
+#: classes/User_group.php:524
msgid "Could not save local group info."
msgstr "Не вдалося зберегти інформацію про локальну групу."
@@ -4696,170 +4704,170 @@ msgstr "%1$s — %2$s"
msgid "Untitled page"
msgstr "Сторінка без заголовку"
-#: lib/action.php:424
+#: lib/action.php:423
msgid "Primary site navigation"
msgstr "Відправна навігація по сайту"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:430
+#: lib/action.php:429
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr "Персональний профіль і стрічка друзів"
-#: lib/action.php:433
+#: lib/action.php:432
msgctxt "MENU"
msgid "Personal"
msgstr "Особисте"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:435
+#: lib/action.php:434
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "Змінити електронну адресу, аватару, пароль, профіль"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:440
+#: lib/action.php:439
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "З’єднання з сервісами"
-#: lib/action.php:443
+#: lib/action.php:442
msgid "Connect"
msgstr "З’єднання"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:446
+#: lib/action.php:445
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "Змінити конфігурацію сайту"
-#: lib/action.php:449
+#: lib/action.php:448
msgctxt "MENU"
msgid "Admin"
msgstr "Адмін"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:453
+#: lib/action.php:452
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "Запросіть друзів та колег приєднатись до Вас на %s"
-#: lib/action.php:456
+#: lib/action.php:455
msgctxt "MENU"
msgid "Invite"
msgstr "Запросити"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:462
+#: lib/action.php:461
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "Вийти з сайту"
-#: lib/action.php:465
+#: lib/action.php:464
msgctxt "MENU"
msgid "Logout"
msgstr "Вийти"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:470
+#: lib/action.php:469
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Створити новий акаунт"
-#: lib/action.php:473
+#: lib/action.php:472
msgctxt "MENU"
msgid "Register"
msgstr "Реєстрація"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:476
+#: lib/action.php:475
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Увійти на сайт"
-#: lib/action.php:479
+#: lib/action.php:478
msgctxt "MENU"
msgid "Login"
msgstr "Увійти"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:482
+#: lib/action.php:481
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Допоможіть!"
-#: lib/action.php:485
+#: lib/action.php:484
msgctxt "MENU"
msgid "Help"
msgstr "Довідка"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:488
+#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "Пошук людей або текстів"
-#: lib/action.php:491
+#: lib/action.php:490
msgctxt "MENU"
msgid "Search"
msgstr "Пошук"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:513 lib/adminpanelaction.php:398
+#: lib/action.php:512 lib/adminpanelaction.php:398
msgid "Site notice"
-msgstr "Зауваження сайту"
+msgstr "Об’яви на сайті"
-#: lib/action.php:579
+#: lib/action.php:578
msgid "Local views"
msgstr "Огляд"
-#: lib/action.php:645
+#: lib/action.php:644
msgid "Page notice"
msgstr "Зауваження сторінки"
-#: lib/action.php:747
+#: lib/action.php:746
msgid "Secondary site navigation"
msgstr "Другорядна навігація по сайту"
-#: lib/action.php:752
+#: lib/action.php:751
msgid "Help"
msgstr "Допомога"
-#: lib/action.php:754
+#: lib/action.php:753
msgid "About"
msgstr "Про"
-#: lib/action.php:756
+#: lib/action.php:755
msgid "FAQ"
-msgstr "ЧаПи"
+msgstr "ЧаП"
-#: lib/action.php:760
+#: lib/action.php:759
msgid "TOS"
msgstr "Умови"
-#: lib/action.php:763
+#: lib/action.php:762
msgid "Privacy"
-msgstr "Конфіденційність"
+msgstr "Приватність"
-#: lib/action.php:765
+#: lib/action.php:764
msgid "Source"
msgstr "Джерело"
-#: lib/action.php:769
+#: lib/action.php:768
msgid "Contact"
msgstr "Контакт"
-#: lib/action.php:771
+#: lib/action.php:770
msgid "Badge"
msgstr "Бедж"
-#: lib/action.php:799
+#: lib/action.php:798
msgid "StatusNet software license"
msgstr "Ліцензія програмного забезпечення StatusNet"
-#: lib/action.php:802
+#: lib/action.php:803
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4868,12 +4876,12 @@ msgstr ""
"**%%site.name%%** — це сервіс мікроблоґів наданий вам [%%site.broughtby%%](%%"
"site.broughtbyurl%%). "
-#: lib/action.php:804
+#: lib/action.php:805
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** — це сервіс мікроблоґів. "
-#: lib/action.php:806
+#: lib/action.php:808
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4884,54 +4892,59 @@ msgstr ""
"для мікроблоґів, версія %s, доступному під [GNU Affero General Public "
"License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:821
+#: lib/action.php:823
msgid "Site content license"
msgstr "Ліцензія змісту сайту"
-#: lib/action.php:826
+#: lib/action.php:828
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr "Зміст і дані %1$s є приватними і конфіденційними."
-#: lib/action.php:831
+#: lib/action.php:833
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr "Авторські права на зміст і дані належать %1$s. Всі права захищено."
-#: lib/action.php:834
+#: lib/action.php:836
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
"Авторські права на зміст і дані належать розробникам. Всі права захищено."
-#: lib/action.php:847
+#: lib/action.php:849
msgid "All "
msgstr "Всі "
-#: lib/action.php:853
+#: lib/action.php:855
msgid "license."
msgstr "ліцензія."
-#: lib/action.php:1152
+#: lib/action.php:1154
msgid "Pagination"
msgstr "Нумерація сторінок"
-#: lib/action.php:1161
+#: lib/action.php:1163
msgid "After"
msgstr "Вперед"
-#: lib/action.php:1169
+#: lib/action.php:1171
msgid "Before"
msgstr "Назад"
-#: lib/activity.php:453
+#: lib/activity.php:120
+msgid "Expecting a root feed element but got a whole XML document."
+msgstr ""
+"В очікуванні кореневого елементу веб-стрічки, отримали цілий документ XML."
+
+#: lib/activityutils.php:208
msgid "Can't handle remote content yet."
msgstr "Поки що не можу обробити віддалений контент."
-#: lib/activity.php:481
+#: lib/activityutils.php:236
msgid "Can't handle embedded XML content yet."
msgstr "Поки що не можу обробити вбудований XML контент."
-#: lib/activity.php:485
+#: lib/activityutils.php:240
msgid "Can't handle embedded Base64 content yet."
msgstr "Поки що не можу обробити вбудований контент Base64."
@@ -5023,7 +5036,7 @@ msgstr ""
"API-ресурс вимагає дозвіл типу «читання-запис», але у вас є лише доступ для "
"читання."
-#: lib/apiauth.php:272
+#: lib/apiauth.php:276
#, php-format
msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s"
msgstr ""
@@ -5099,11 +5112,11 @@ msgstr "Відкликати"
msgid "Attachments"
msgstr "Вкладення"
-#: lib/attachmentlist.php:265
+#: lib/attachmentlist.php:263
msgid "Author"
msgstr "Автор"
-#: lib/attachmentlist.php:278
+#: lib/attachmentlist.php:276
msgid "Provider"
msgstr "Провайдер"
@@ -5123,37 +5136,50 @@ msgstr "Не вдалося змінити пароль"
msgid "Password changing is not allowed"
msgstr "Змінювати пароль не дозволено"
-#: lib/channel.php:138 lib/channel.php:158
+#: lib/channel.php:157 lib/channel.php:177
msgid "Command results"
msgstr "Результати команди"
-#: lib/channel.php:210 lib/mailhandler.php:142
+#: lib/channel.php:229 lib/mailhandler.php:142
msgid "Command complete"
msgstr "Команду виконано"
-#: lib/channel.php:221
+#: lib/channel.php:240
msgid "Command failed"
msgstr "Команду не виконано"
-#: lib/command.php:44
-msgid "Sorry, this command is not yet implemented."
-msgstr "Даруйте, але виконання команди ще не завершено."
+#: lib/command.php:83 lib/command.php:105
+msgid "Notice with that id does not exist"
+msgstr "Такого допису не існує"
+
+#: lib/command.php:99 lib/command.php:570
+msgid "User has no last notice"
+msgstr "Користувач не має останнього допису"
-#: lib/command.php:88
+#: lib/command.php:125
#, php-format
msgid "Could not find a user with nickname %s"
msgstr "Не вдалося знайти користувача з іменем %s"
-#: lib/command.php:92
+#: lib/command.php:143
+#, php-format
+msgid "Could not find a local user with nickname %s"
+msgstr "Не вдалося знайти локального користувача з іменем %s"
+
+#: lib/command.php:176
+msgid "Sorry, this command is not yet implemented."
+msgstr "Даруйте, але виконання команди ще не завершено."
+
+#: lib/command.php:221
msgid "It does not make a lot of sense to nudge yourself!"
msgstr "Гадаємо, користі від «розштовхування» самого себе небагато, чи не так?!"
-#: lib/command.php:99
+#: lib/command.php:228
#, php-format
msgid "Nudge sent to %s"
msgstr "Спробу «розштовхати» %s зараховано"
-#: lib/command.php:126
+#: lib/command.php:254
#, php-format
msgid ""
"Subscriptions: %1$s\n"
@@ -5164,199 +5190,199 @@ msgstr ""
"Підписчики: %2$s\n"
"Дописи: %3$s"
-#: lib/command.php:152 lib/command.php:390 lib/command.php:451
-msgid "Notice with that id does not exist"
-msgstr "Такого допису не існує"
-
-#: lib/command.php:168 lib/command.php:406 lib/command.php:467
-#: lib/command.php:523
-msgid "User has no last notice"
-msgstr "Користувач не має останнього допису"
-
-#: lib/command.php:190
+#: lib/command.php:296
msgid "Notice marked as fave."
msgstr "Допис позначено як обраний."
-#: lib/command.php:217
+#: lib/command.php:317
msgid "You are already a member of that group"
msgstr "Ви вже є учасником цієї групи."
-#: lib/command.php:231
+#: lib/command.php:331
#, php-format
msgid "Could not join user %s to group %s"
msgstr "Не вдалось долучити користувача %1$s до групи %2$s."
-#: lib/command.php:236
+#: lib/command.php:336
#, php-format
msgid "%s joined group %s"
msgstr "%1$s приєднався до групи %2$s"
-#: lib/command.php:275
+#: lib/command.php:373
#, php-format
msgid "Could not remove user %s to group %s"
msgstr "Не вдалося видалити користувача %1$s з групи %2$s."
-#: lib/command.php:280
+#: lib/command.php:378
#, php-format
msgid "%s left group %s"
msgstr "%1$s залишив групу %2$s"
-#: lib/command.php:309
+#: lib/command.php:401
#, php-format
msgid "Fullname: %s"
msgstr "Повне ім’я: %s"
-#: lib/command.php:312 lib/mail.php:258
+#: lib/command.php:404 lib/mail.php:258
#, php-format
msgid "Location: %s"
-msgstr "Локація: %s"
+msgstr "Розташування: %s"
-#: lib/command.php:315 lib/mail.php:260
+#: lib/command.php:407 lib/mail.php:260
#, php-format
msgid "Homepage: %s"
msgstr "Веб-сторінка: %s"
-#: lib/command.php:318
+#: lib/command.php:410
#, php-format
msgid "About: %s"
msgstr "Про мене: %s"
-#: lib/command.php:349
+#: lib/command.php:437
+#, php-format
+msgid ""
+"%s is a remote profile; you can only send direct messages to users on the "
+"same server."
+msgstr ""
+"%s — це віддалений профіль; Ви можете надсилати приватні повідомлення лише "
+"користувачам одного з вами сервісу."
+
+#: lib/command.php:450
#, php-format
msgid "Message too long - maximum is %d characters, you sent %d"
msgstr "Повідомлення надто довге — максимум %d знаків, а ви надсилаєте %d"
-#: lib/command.php:367
+#: lib/command.php:468
#, php-format
msgid "Direct message to %s sent"
msgstr "Пряме повідомлення для %s надіслано."
-#: lib/command.php:369
+#: lib/command.php:470
msgid "Error sending direct message."
msgstr "Помилка при відправці прямого повідомлення."
-#: lib/command.php:413
+#: lib/command.php:490
msgid "Cannot repeat your own notice"
msgstr "Не можу повторити Ваш власний допис"
-#: lib/command.php:418
+#: lib/command.php:495
msgid "Already repeated that notice"
msgstr "Цей допис вже повторили"
-#: lib/command.php:426
+#: lib/command.php:503
#, php-format
msgid "Notice from %s repeated"
msgstr "Допис %s повторили"
-#: lib/command.php:428
+#: lib/command.php:505
msgid "Error repeating notice."
msgstr "Помилка при повторенні допису."
-#: lib/command.php:482
+#: lib/command.php:536
#, php-format
msgid "Notice too long - maximum is %d characters, you sent %d"
msgstr "Допис надто довгий — максимум %d знаків, а ви надсилаєте %d"
-#: lib/command.php:491
+#: lib/command.php:545
#, php-format
msgid "Reply to %s sent"
msgstr "Відповідь до %s надіслано"
-#: lib/command.php:493
+#: lib/command.php:547
msgid "Error saving notice."
msgstr "Проблема при збереженні допису."
-#: lib/command.php:547
+#: lib/command.php:594
msgid "Specify the name of the user to subscribe to"
msgstr "Зазначте ім’я користувача, до якого бажаєте підписатись"
-#: lib/command.php:554 lib/command.php:589
-msgid "No such user"
-msgstr "Такого користувача немає."
+#: lib/command.php:602
+msgid "Can't subscribe to OMB profiles by command."
+msgstr "Не можу підписатись до профілю OMB за командою."
-#: lib/command.php:561
+#: lib/command.php:608
#, php-format
msgid "Subscribed to %s"
msgstr "Підписано до %s"
-#: lib/command.php:582 lib/command.php:685
+#: lib/command.php:629 lib/command.php:728
msgid "Specify the name of the user to unsubscribe from"
msgstr "Зазначте ім’я користувача, від якого бажаєте відписатись"
-#: lib/command.php:595
+#: lib/command.php:638
#, php-format
msgid "Unsubscribed from %s"
msgstr "Відписано від %s"
-#: lib/command.php:613 lib/command.php:636
+#: lib/command.php:656 lib/command.php:679
msgid "Command not yet implemented."
msgstr "Виконання команди ще не завершено."
-#: lib/command.php:616
+#: lib/command.php:659
msgid "Notification off."
msgstr "Сповіщення вимкнуто."
-#: lib/command.php:618
+#: lib/command.php:661
msgid "Can't turn off notification."
msgstr "Не можна вимкнути сповіщення."
-#: lib/command.php:639
+#: lib/command.php:682
msgid "Notification on."
msgstr "Сповіщення увімкнуто."
-#: lib/command.php:641
+#: lib/command.php:684
msgid "Can't turn on notification."
msgstr "Не можна увімкнути сповіщення."
-#: lib/command.php:654
+#: lib/command.php:697
msgid "Login command is disabled"
msgstr "Команду входу відключено"
-#: lib/command.php:665
+#: lib/command.php:708
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
"Це посилання можна використати лише раз, воно дійсне протягом 2 хвилин: %s"
-#: lib/command.php:692
+#: lib/command.php:735
#, php-format
msgid "Unsubscribed %s"
msgstr "Відписано %s"
-#: lib/command.php:709
+#: lib/command.php:752
msgid "You are not subscribed to anyone."
msgstr "Ви не маєте жодних підписок."
-#: lib/command.php:711
+#: lib/command.php:754
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Ви підписані до цієї особи:"
msgstr[1] "Ви підписані до цих людей:"
msgstr[2] "Ви підписані до цих людей:"
-#: lib/command.php:731
+#: lib/command.php:774
msgid "No one is subscribed to you."
msgstr "До Вас ніхто не підписаний."
-#: lib/command.php:733
+#: lib/command.php:776
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Ця особа є підписаною до Вас:"
msgstr[1] "Ці люди підписані до Вас:"
msgstr[2] "Ці люди підписані до Вас:"
-#: lib/command.php:753
+#: lib/command.php:796
msgid "You are not a member of any groups."
msgstr "Ви не є учасником жодної групи."
-#: lib/command.php:755
+#: lib/command.php:798
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Ви є учасником групи:"
msgstr[1] "Ви є учасником таких груп:"
msgstr[2] "Ви є учасником таких груп:"
-#: lib/command.php:769
+#: lib/command.php:812
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5433,19 +5459,19 @@ msgstr ""
"tracks — наразі не виконується\n"
"tracking — наразі не виконується\n"
-#: lib/common.php:148
+#: lib/common.php:135
msgid "No configuration file found. "
msgstr "Файлу конфігурації не знайдено. "
-#: lib/common.php:149
+#: lib/common.php:136
msgid "I looked for configuration files in the following places: "
msgstr "Шукав файли конфігурації в цих місцях: "
-#: lib/common.php:151
+#: lib/common.php:138
msgid "You may wish to run the installer to fix this."
msgstr "Запустіть файл інсталяції, аби полагодити це."
-#: lib/common.php:152
+#: lib/common.php:139
msgid "Go to the installer."
msgstr "Іти до файлу інсталяції."
@@ -5565,7 +5591,7 @@ msgstr "Опишіть групу або тему, вкладаючись у %d
#: lib/groupeditform.php:179
msgid ""
"Location for the group, if any, like \"City, State (or Region), Country\""
-msgstr "Локація групи, штибу \"Місто, область (або регіон), країна\""
+msgstr "Розташування групи, на кшталт «Місто, область (або регіон), країна»"
#: lib/groupeditform.php:187
#, php-format
@@ -5622,49 +5648,49 @@ msgstr "Теґи у дописах групи %s"
msgid "This page is not available in a media type you accept"
msgstr "Ця сторінка не доступна для того типу медіа, з яким ви погодились"
-#: lib/imagefile.php:75
+#: lib/imagefile.php:72
+msgid "Unsupported image file format."
+msgstr "Формат зображення не підтримується."
+
+#: lib/imagefile.php:88
#, php-format
msgid "That file is too big. The maximum file size is %s."
msgstr "Цей файл завеликий. Максимальний розмір %s."
-#: lib/imagefile.php:80
+#: lib/imagefile.php:93
msgid "Partial upload."
msgstr "Часткове завантаження."
-#: lib/imagefile.php:88 lib/mediafile.php:170
+#: lib/imagefile.php:101 lib/mediafile.php:170
msgid "System error uploading file."
msgstr "Система відповіла помилкою при завантаженні цього файла."
-#: lib/imagefile.php:96
+#: lib/imagefile.php:109
msgid "Not an image or corrupt file."
msgstr "Це не зображення, або файл зіпсовано."
-#: lib/imagefile.php:109
-msgid "Unsupported image file format."
-msgstr "Формат зображення не підтримується."
-
#: lib/imagefile.php:122
msgid "Lost our file."
msgstr "Файл втрачено."
-#: lib/imagefile.php:166 lib/imagefile.php:231
+#: lib/imagefile.php:163 lib/imagefile.php:224
msgid "Unknown file type"
msgstr "Тип файлу не підтримується"
-#: lib/imagefile.php:251
+#: lib/imagefile.php:244
msgid "MB"
msgstr "Мб"
-#: lib/imagefile.php:253
+#: lib/imagefile.php:246
msgid "kB"
msgstr "кб"
-#: lib/jabber.php:220
+#: lib/jabber.php:387
#, php-format
msgid "[%s]"
msgstr "[%s]"
-#: lib/jabber.php:400
+#: lib/jabber.php:567
#, php-format
msgid "Unknown inbox source %d."
msgstr "Невідоме джерело вхідного повідомлення %d."
@@ -5945,7 +5971,7 @@ msgstr ""
"повідомлення аби долучити користувачів до розмови. Такі повідомлення бачите "
"лише Ви."
-#: lib/mailbox.php:227 lib/noticelist.php:482
+#: lib/mailbox.php:227 lib/noticelist.php:486
msgid "from"
msgstr "від"
@@ -6061,11 +6087,11 @@ msgstr "Вкласти файл"
#: lib/noticeform.php:212
msgid "Share my location"
-msgstr "Показувати локацію."
+msgstr "Показувати місцезнаходження."
#: lib/noticeform.php:215
msgid "Do not share my location"
-msgstr "Приховувати мою локацію"
+msgstr "Приховувати моє місцезнаходження"
#: lib/noticeform.php:216
msgid ""
@@ -6075,48 +6101,48 @@ msgstr ""
"На жаль, отримання інформації щодо Вашого місцезнаходження займе більше "
"часу, ніж очікувалось; будь ласка, спробуйте пізніше"
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "N"
msgstr "Півн."
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "S"
msgstr "Півд."
-#: lib/noticelist.php:431
+#: lib/noticelist.php:432
msgid "E"
msgstr "Сх."
-#: lib/noticelist.php:431
+#: lib/noticelist.php:432
msgid "W"
msgstr "Зах."
-#: lib/noticelist.php:438
+#: lib/noticelist.php:439
msgid "at"
msgstr "в"
-#: lib/noticelist.php:566
+#: lib/noticelist.php:570
msgid "in context"
msgstr "в контексті"
-#: lib/noticelist.php:601
+#: lib/noticelist.php:605
msgid "Repeated by"
msgstr "Повторено"
-#: lib/noticelist.php:628
+#: lib/noticelist.php:632
msgid "Reply to this notice"
msgstr "Відповісти на цей допис"
-#: lib/noticelist.php:629
+#: lib/noticelist.php:633
msgid "Reply"
msgstr "Відповісти"
-#: lib/noticelist.php:673
+#: lib/noticelist.php:677
msgid "Notice repeated"
msgstr "Допис повторили"
@@ -6189,7 +6215,7 @@ msgstr "Теґи у дописах %s"
msgid "Unknown"
msgstr "Невідомо"
-#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr "Підписки"
@@ -6197,23 +6223,28 @@ msgstr "Підписки"
msgid "All subscriptions"
msgstr "Всі підписки"
-#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90
+#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr "Підписчики"
-#: lib/profileaction.php:159
+#: lib/profileaction.php:161
msgid "All subscribers"
msgstr "Всі підписчики"
-#: lib/profileaction.php:180
+#: lib/profileaction.php:191
msgid "User ID"
msgstr "ІД"
-#: lib/profileaction.php:185
+#: lib/profileaction.php:196
msgid "Member since"
msgstr "З нами від"
-#: lib/profileaction.php:247
+#. TRANS: Average count of posts made per day since account registration
+#: lib/profileaction.php:235
+msgid "Daily average"
+msgstr "Середньодобове"
+
+#: lib/profileaction.php:264
msgid "All groups"
msgstr "Всі групи"
@@ -6258,7 +6289,7 @@ msgstr "Повторити цей допис"
msgid "Revoke the \"%s\" role from this user"
msgstr "Відкликати роль \"%s\" для цього користувача"
-#: lib/router.php:671
+#: lib/router.php:704
msgid "No single user defined for single-user mode."
msgstr "Користувача для однокористувацького режиму не визначено."
@@ -6384,89 +6415,98 @@ msgstr "Відписатись від цього користувача"
msgid "Unsubscribe"
msgstr "Відписатись"
-#: lib/userprofile.php:116
+#: lib/usernoprofileexception.php:58
+#, php-format
+msgid "User %s (%d) has no profile record."
+msgstr "Користувач %s (%d) не має запису профілю."
+
+#: lib/userprofile.php:117
msgid "Edit Avatar"
msgstr "Аватара"
-#: lib/userprofile.php:236
+#: lib/userprofile.php:234 lib/userprofile.php:248
msgid "User actions"
msgstr "Діяльність користувача"
-#: lib/userprofile.php:251
+#: lib/userprofile.php:237
+msgid "User deletion in progress..."
+msgstr "Видалення користувача у процесі..."
+
+#: lib/userprofile.php:263
msgid "Edit profile settings"
msgstr "Налаштування профілю"
-#: lib/userprofile.php:252
+#: lib/userprofile.php:264
msgid "Edit"
msgstr "Правка"
-#: lib/userprofile.php:275
+#: lib/userprofile.php:287
msgid "Send a direct message to this user"
msgstr "Надіслати пряме повідомлення цьому користувачеві"
-#: lib/userprofile.php:276
+#: lib/userprofile.php:288
msgid "Message"
msgstr "Повідомлення"
-#: lib/userprofile.php:314
+#: lib/userprofile.php:326
msgid "Moderate"
msgstr "Модерувати"
-#: lib/userprofile.php:352
+#: lib/userprofile.php:364
msgid "User role"
msgstr "Роль користувача"
-#: lib/userprofile.php:354
+#: lib/userprofile.php:366
msgctxt "role"
msgid "Administrator"
msgstr "Адміністратор"
-#: lib/userprofile.php:355
+#: lib/userprofile.php:367
msgctxt "role"
msgid "Moderator"
msgstr "Модератор"
-#: lib/util.php:1015
+#: lib/util.php:1046
msgid "a few seconds ago"
msgstr "мить тому"
-#: lib/util.php:1017
+#: lib/util.php:1048
msgid "about a minute ago"
msgstr "хвилину тому"
-#: lib/util.php:1019
+#: lib/util.php:1050
#, php-format
msgid "about %d minutes ago"
msgstr "близько %d хвилин тому"
-#: lib/util.php:1021
+#: lib/util.php:1052
msgid "about an hour ago"
msgstr "годину тому"
-#: lib/util.php:1023
+#: lib/util.php:1054
#, php-format
msgid "about %d hours ago"
msgstr "близько %d годин тому"
-#: lib/util.php:1025
+#: lib/util.php:1056
msgid "about a day ago"
msgstr "день тому"
-#: lib/util.php:1027
+#: lib/util.php:1058
#, php-format
msgid "about %d days ago"
msgstr "близько %d днів тому"
-#: lib/util.php:1029
+#: lib/util.php:1060
msgid "about a month ago"
msgstr "місяць тому"
-#: lib/util.php:1031
+#: lib/util.php:1062
#, php-format
msgid "about %d months ago"
msgstr "близько %d місяців тому"
-#: lib/util.php:1033
+#: lib/util.php:1064
msgid "about a year ago"
msgstr "рік тому"
@@ -6480,7 +6520,7 @@ msgstr "%s є неприпустимим кольором!"
msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr "%s неприпустимий колір! Використайте 3 або 6 знаків (HEX-формат)"
-#: lib/xmppmanager.php:402
+#: lib/xmppmanager.php:403
#, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d."
msgstr ""
diff --git a/locale/vi/LC_MESSAGES/statusnet.po b/locale/vi/LC_MESSAGES/statusnet.po
index 59751aa5d..2a51f8453 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-03-06 23:49+0000\n"
-"PO-Revision-Date: 2010-03-06 23:51:10+0000\n"
+"POT-Creation-Date: 2010-04-05 18:54+0000\n"
+"PO-Revision-Date: 2010-04-05 18:56:28+0000\n"
"Language-Team: Vietnamese\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64621); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: vi\n"
"X-Message-Group: out-statusnet\n"
@@ -98,9 +98,9 @@ msgstr "Không có tin nhắn nào."
#: 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:90
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78
+#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
@@ -109,10 +109,8 @@ msgstr "Không có tin nhắn nào."
#: actions/remotesubscribe.php:154 actions/replies.php:73
#: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:163 lib/command.php:302
-#: lib/command.php:355 lib/command.php:401 lib/command.php:462
-#: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82
-#: lib/profileaction.php:77
+#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: lib/mailbox.php:82 lib/profileaction.php:77
msgid "No such user."
msgstr "Không có user nào."
@@ -200,18 +198,18 @@ msgstr ""
#: 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:132
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:136
#: actions/apigrouplistall.php:120 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:135
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
-#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184
-#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148
+#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:174
+#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173
+#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
-#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
+#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
#, fuzzy
msgid "API method not found."
msgstr "Phương thức API không tìm thấy!"
@@ -225,8 +223,8 @@ msgstr "Phương thức API không tìm thấy!"
#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65
-#: actions/apistatusesupdate.php:118
+#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
msgid "This method requires a POST."
msgstr "Phương thức này yêu cầu là POST."
@@ -257,7 +255,7 @@ msgid "Could not save profile."
msgstr "Không thể lưu hồ sơ cá nhân."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:97
+#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
#: actions/designadminpanel.php:122 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
@@ -347,7 +345,7 @@ msgstr "Không tìm thấy trạng thái nào tương ứng với ID đó."
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:176
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
msgid "Could not create favorite."
msgstr "Không thể tạo favorite."
@@ -473,7 +471,7 @@ msgstr "Phương thức API không tìm thấy!"
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:221
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
msgid "You have been blocked from that group by the admin."
msgstr ""
@@ -492,11 +490,18 @@ msgstr "Bạn chưa cập nhật thông tin riêng"
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."
-#: actions/apigrouplist.php:95
+#. TRANS: %s is a user name
+#: actions/apigrouplist.php:97
#, 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
+#, 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"
+
#: actions/apigrouplistall.php:90 actions/usergroups.php:62
#, fuzzy, php-format
msgid "%s groups"
@@ -525,7 +530,7 @@ msgstr "Kích thước không hợp lệ."
#: 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:337
+#: actions/profilesettings.php:194 actions/recoverpassword.php:350
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
@@ -586,16 +591,16 @@ msgid ""
"give access to your %4$s account to third parties you trust."
msgstr ""
-#: actions/apioauthauthorize.php:310 lib/action.php:438
+#: actions/apioauthauthorize.php:310 lib/action.php:437
#, fuzzy
msgid "Account"
msgstr "Giới thiệu"
#: actions/apioauthauthorize.php:313 actions/login.php:230
#: actions/profilesettings.php:106 actions/register.php:424
-#: actions/showgroup.php:244 actions/tagother.php:94
+#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
-#: lib/userprofile.php:131
+#: lib/userprofile.php:132
msgid "Nickname"
msgstr "Biệt danh"
@@ -668,12 +673,12 @@ msgstr ""
msgid "Unsupported format."
msgstr "Không hỗ trợ kiểu file ảnh này."
-#: actions/apitimelinefavorites.php:108
+#: actions/apitimelinefavorites.php:109
#, 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:117
+#: actions/apitimelinefavorites.php:118
#, 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"
@@ -683,7 +688,7 @@ msgstr "Tất cả các cập nhật của %s"
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:127
+#: actions/apitimelinementions.php:130
#, php-format
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr ""
@@ -693,7 +698,7 @@ msgstr ""
msgid "%s public timeline"
msgstr "Dòng tin công cộng"
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:112 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!"
@@ -708,12 +713,12 @@ msgstr "Trả lời cho %s"
msgid "Repeats of %s"
msgstr "Trả lời cho %s"
-#: actions/apitimelinetag.php:102 actions/tag.php:67
+#: actions/apitimelinetag.php:104 actions/tag.php:67
#, php-format
msgid "Notices tagged with %s"
msgstr "Thông báo được gắn thẻ %s"
-#: actions/apitimelinetag.php:104 actions/tagrss.php:65
+#: actions/apitimelinetag.php:106 actions/tagrss.php:65
#, fuzzy, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Dòng tin nhắn cho %s"
@@ -743,7 +748,7 @@ msgstr "Không có kích thước."
msgid "Invalid size."
msgstr "Kích thước không hợp lệ."
-#: actions/avatarsettings.php:67 actions/showgroup.php:229
+#: actions/avatarsettings.php:67 actions/showgroup.php:230
#: lib/accountsettingsaction.php:112
msgid "Avatar"
msgstr "Hình đại diện"
@@ -778,7 +783,7 @@ msgid "Preview"
msgstr "Xem trước"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:655
+#: lib/deleteuserform.php:66 lib/noticelist.php:659
#, fuzzy
msgid "Delete"
msgstr "Xóa tin nhắn"
@@ -792,23 +797,28 @@ msgstr "Tải file"
msgid "Crop"
msgstr "Nhóm"
-#: actions/avatarsettings.php:328
+#: actions/avatarsettings.php:305
+#, fuzzy
+msgid "No file uploaded."
+msgstr "Upload từng phần."
+
+#: actions/avatarsettings.php:332
msgid "Pick a square area of the image to be your avatar"
msgstr ""
-#: actions/avatarsettings.php:343 actions/grouplogo.php:380
+#: actions/avatarsettings.php:347 actions/grouplogo.php:380
msgid "Lost our file data."
msgstr ""
-#: actions/avatarsettings.php:366
+#: actions/avatarsettings.php:370
msgid "Avatar updated."
msgstr "Hình đại diện đã được cập nhật."
-#: actions/avatarsettings.php:369
+#: actions/avatarsettings.php:373
msgid "Failed updating avatar."
msgstr "Cập nhật hình đại diện không thành công."
-#: actions/avatarsettings.php:393
+#: actions/avatarsettings.php:397
#, fuzzy
msgid "Avatar deleted."
msgstr "Hình đại diện đã được cập nhật."
@@ -865,8 +875,8 @@ msgstr ""
#: actions/groupunblock.php:86 actions/joingroup.php:82
#: actions/joingroup.php:93 actions/leavegroup.php:82
#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212
-#: lib/command.php:260
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162
+#: lib/command.php:358
#, fuzzy
msgid "No such group."
msgstr "Không có tin nhắn nào."
@@ -952,7 +962,7 @@ msgid "Conversation"
msgstr "Không có mã số xác nhận."
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:218 lib/searchgroupnav.php:82
+#: lib/profileaction.php:224 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "Tin nhắn"
@@ -974,7 +984,7 @@ msgstr "Bạn chưa cập nhật thông tin riêng"
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1217
+#: lib/action.php:1219
#, fuzzy
msgid "There was a problem with your session token."
msgstr "Có lỗi xảy ra khi thao tác. Hãy thử lại lần nữa."
@@ -1036,7 +1046,7 @@ msgstr "Bạn có chắc chắn là muốn xóa tin nhắn này không?"
msgid "Do not delete this notice"
msgstr "Không thể xóa tin nhắn này."
-#: actions/deletenotice.php:146 lib/noticelist.php:655
+#: actions/deletenotice.php:146 lib/noticelist.php:659
#, fuzzy
msgid "Delete this notice"
msgstr "Xóa tin nhắn"
@@ -1188,7 +1198,7 @@ msgstr ""
#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:208
+#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
#: actions/tagother.php:154 actions/useradminpanel.php:294
#: lib/applicationeditform.php:333 lib/applicationeditform.php:334
#: lib/designsettings.php:256 lib/groupeditform.php:202
@@ -1320,7 +1330,7 @@ msgstr "Lý lịch quá dài (không quá 140 ký tự)"
msgid "Could not update group."
msgstr "Không thể cập nhật thành viên."
-#: actions/editgroup.php:264 classes/User_group.php:493
+#: actions/editgroup.php:264 classes/User_group.php:496
#, fuzzy
msgid "Could not create aliases."
msgstr "Không thể tạo favorite."
@@ -1844,7 +1854,7 @@ msgstr "Dòng tin nhắn của %s"
msgid "Updates from members of %1$s on %2$s!"
msgstr "Dòng tin nhắn cho %s"
-#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232
+#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244
#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
#, fuzzy
msgid "Groups"
@@ -2055,7 +2065,7 @@ msgstr "Gửi thư mời đến những người chưa có tài khoản"
msgid "You are already subscribed to these users:"
msgstr "Bạn đã theo những người này:"
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
#, fuzzy, php-format
msgid "%1$s (%2$s)"
msgstr "%s (%s)"
@@ -2192,7 +2202,7 @@ msgstr "%s và nhóm"
msgid "You must be logged in to leave a group."
msgstr "Bạn phải đăng nhập vào mới có thể gửi thư mời những "
-#: actions/leavegroup.php:100 lib/command.php:265
+#: actions/leavegroup.php:100 lib/command.php:363
#, fuzzy
msgid "You are not a member of that group."
msgstr "Bạn chưa cập nhật thông tin riêng"
@@ -2313,13 +2323,13 @@ msgstr ""
msgid "New message"
msgstr "Tin mới nhất"
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
#, fuzzy
msgid "You can't send a message to this user."
msgstr "Bạn đã theo những người này:"
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342
-#: lib/command.php:475
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
+#: lib/command.php:529
msgid "No content!"
msgstr "Không có nội dung!"
@@ -2327,7 +2337,7 @@ msgstr "Không có nội dung!"
msgid "No recipient specified."
msgstr ""
-#: actions/newmessage.php:164 lib/command.php:361
+#: actions/newmessage.php:164 lib/command.php:462
msgid ""
"Don't send a message to yourself; just say it to yourself quietly instead."
msgstr ""
@@ -2342,7 +2352,7 @@ msgstr "Tin mới nhất"
msgid "Direct message to %s sent."
msgstr "Tin nhắn riêng"
-#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189
#, fuzzy
msgid "Ajax Error"
msgstr "Lỗi"
@@ -2351,7 +2361,7 @@ msgstr "Lỗi"
msgid "New notice"
msgstr "Thông báo mới"
-#: actions/newnotice.php:211
+#: actions/newnotice.php:217
#, fuzzy
msgid "Notice posted"
msgstr "Tin đã gửi"
@@ -2461,7 +2471,7 @@ msgstr ""
msgid "Notice has no profile"
msgstr "Tin nhắn không có hồ sơ cá nhân"
-#: actions/oembed.php:86 actions/shownotice.php:180
+#: actions/oembed.php:86 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"
@@ -2475,8 +2485,8 @@ msgstr "Kết nối"
msgid "Only "
msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042
-#: lib/apiaction.php:1070 lib/apiaction.php:1179
+#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1068
+#: lib/apiaction.php:1096 lib/apiaction.php:1212
msgid "Not a supported data format."
msgstr "Không hỗ trợ định dạng dữ liệu này."
@@ -2620,7 +2630,7 @@ msgstr "Mật khẩu cũ sai"
msgid "Error saving user; invalid."
msgstr "Lỗi xảy ra khi lưu thành viên; không hợp lệ."
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
msgid "Can't save new password."
msgstr "Không thể lưu mật khẩu mới"
@@ -2850,8 +2860,8 @@ 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/showgroup.php:255 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:149
+#: actions/showgroup.php:256 actions/tagother.php:104
+#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Tên đầy đủ"
@@ -2879,9 +2889,9 @@ msgid "Bio"
msgstr "Lý lịch"
#: actions/profilesettings.php:132 actions/register.php:471
-#: actions/showgroup.php:264 actions/tagother.php:112
+#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
-#: lib/userprofile.php:164
+#: lib/userprofile.php:165
msgid "Location"
msgstr "Thành phố"
@@ -2895,7 +2905,7 @@ msgstr ""
#: actions/profilesettings.php:145 actions/tagother.php:149
#: actions/tagother.php:209 lib/subscriptionlist.php:106
-#: lib/subscriptionlist.php:108 lib/userprofile.php:209
+#: lib/subscriptionlist.php:108 lib/userprofile.php:210
msgid "Tags"
msgstr "Từ khóa"
@@ -3128,7 +3138,7 @@ msgstr "Khởi tạo lại mật khẩu"
msgid "Recover password"
msgstr "Khôi phục mật khẩu"
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
msgid "Password recovery requested"
msgstr "Yêu cầu khôi phục lại mật khẩu đã được gửi"
@@ -3148,20 +3158,20 @@ msgstr "Khởi tạo"
msgid "Enter a nickname or email address."
msgstr "Nhập biệt hiệu hoặc email."
-#: actions/recoverpassword.php:272
+#: actions/recoverpassword.php:282
msgid "No user with that email address or username."
msgstr ""
"Không tìm thấy người dùng nào tương ứng với địa chỉ email hoặc username đó."
-#: actions/recoverpassword.php:287
+#: actions/recoverpassword.php:299
msgid "No registered email address for that user."
msgstr "Thành viên này đã không đăng ký địa chỉ email."
-#: actions/recoverpassword.php:301
+#: actions/recoverpassword.php:313
msgid "Error saving address confirmation."
msgstr "Lỗi xảy ra khi lưu địa chỉ đã được xác nhận."
-#: actions/recoverpassword.php:325
+#: actions/recoverpassword.php:338
msgid ""
"Instructions for recovering your password have been sent to the email "
"address registered to your account."
@@ -3169,23 +3179,23 @@ msgstr ""
"Hướng dẫn cách khôi phục mật khẩu đã được gửi đến địa chỉ email đăng ký "
"trong tài khoản của bạn."
-#: actions/recoverpassword.php:344
+#: actions/recoverpassword.php:357
msgid "Unexpected password reset."
msgstr "Bất ngờ reset mật khẩu."
-#: actions/recoverpassword.php:352
+#: actions/recoverpassword.php:365
msgid "Password must be 6 chars or more."
msgstr "Mật khẩu phải nhiều hơn 6 ký tự."
-#: actions/recoverpassword.php:356
+#: actions/recoverpassword.php:369
msgid "Password and confirmation do not match."
msgstr "Mật khẩu và mật khẩu xác nhận không khớp nhau."
-#: actions/recoverpassword.php:375 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:248
msgid "Error setting user."
msgstr "Lỗi xảy ra khi tạo thành viên."
-#: actions/recoverpassword.php:382
+#: actions/recoverpassword.php:395
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ờ."
@@ -3348,7 +3358,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "URL trong hồ sơ cá nhân của bạn ở trên các trang microblogging khác"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:394
+#: lib/userprofile.php:406
msgid "Subscribe"
msgstr "Theo bạn này"
@@ -3389,7 +3399,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:674
+#: actions/repeat.php:114 lib/noticelist.php:678
#, fuzzy
msgid "Repeated"
msgstr "Tạo"
@@ -3538,8 +3548,8 @@ msgstr "Thư mời đã gửi"
msgid "Description"
msgstr "Mô tả"
-#: actions/showapplication.php:192 actions/showgroup.php:438
-#: lib/profileaction.php:176
+#: actions/showapplication.php:192 actions/showgroup.php:439
+#: lib/profileaction.php:182
msgid "Statistics"
msgstr "Số liệu thống kê"
@@ -3650,72 +3660,72 @@ msgstr "%s và nhóm"
msgid "%1$s group, page %2$d"
msgstr "Thành viên"
-#: actions/showgroup.php:226
+#: actions/showgroup.php:227
#, fuzzy
msgid "Group profile"
msgstr "Thông tin nhóm"
-#: actions/showgroup.php:271 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:177
+#: actions/showgroup.php:272 actions/tagother.php:118
+#: actions/userauthorization.php:175 lib/userprofile.php:178
msgid "URL"
msgstr ""
-#: actions/showgroup.php:282 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:194
+#: actions/showgroup.php:283 actions/tagother.php:128
+#: actions/userauthorization.php:187 lib/userprofile.php:195
#, fuzzy
msgid "Note"
msgstr "Tin nhắn"
-#: actions/showgroup.php:292 lib/groupeditform.php:184
+#: actions/showgroup.php:293 lib/groupeditform.php:184
msgid "Aliases"
msgstr ""
-#: actions/showgroup.php:301
+#: actions/showgroup.php:302
#, fuzzy
msgid "Group actions"
msgstr "Mã nhóm"
-#: actions/showgroup.php:337
+#: actions/showgroup.php:338
#, fuzzy, php-format
msgid "Notice feed for %s group (RSS 1.0)"
msgstr "Dòng tin nhắn cho %s"
-#: actions/showgroup.php:343
+#: actions/showgroup.php:344
#, fuzzy, php-format
msgid "Notice feed for %s group (RSS 2.0)"
msgstr "Dòng tin nhắn cho %s"
-#: actions/showgroup.php:349
+#: actions/showgroup.php:350
#, fuzzy, php-format
msgid "Notice feed for %s group (Atom)"
msgstr "Dòng tin nhắn cho %s"
-#: actions/showgroup.php:354
+#: actions/showgroup.php:355
#, php-format
msgid "FOAF for %s group"
msgstr "Hộp thư đi của %s"
-#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91
+#: actions/showgroup.php:391 actions/showgroup.php:448 lib/groupnav.php:91
msgid "Members"
msgstr "Thành viên"
-#: actions/showgroup.php:395 lib/profileaction.php:117
-#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95
-#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71
+#: actions/showgroup.php:396 lib/profileaction.php:117
+#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95
+#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
msgid "(None)"
msgstr ""
-#: actions/showgroup.php:401
+#: actions/showgroup.php:402
#, fuzzy
msgid "All members"
msgstr "Thành viên"
-#: actions/showgroup.php:441
+#: actions/showgroup.php:442
#, fuzzy
msgid "Created"
msgstr "Tạo"
-#: actions/showgroup.php:457
+#: actions/showgroup.php:458
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3725,7 +3735,7 @@ msgid ""
"of this group and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
-#: actions/showgroup.php:463
+#: actions/showgroup.php:464
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3734,7 +3744,7 @@ msgid ""
"their life and interests. "
msgstr ""
-#: actions/showgroup.php:491
+#: actions/showgroup.php:492
msgid "Admins"
msgstr ""
@@ -3866,7 +3876,7 @@ msgid "Unknown language \"%s\"."
msgstr ""
#: actions/siteadminpanel.php:165
-msgid "Minimum text limit is 140 characters."
+msgid "Minimum text limit is 0 (unlimited)."
msgstr ""
#: actions/siteadminpanel.php:171
@@ -4157,8 +4167,7 @@ msgstr "Thay đổi hình đại diện"
msgid "You are not subscribed to that profile."
msgstr "Bạn chưa cập nhật thông tin riêng"
-#: actions/subedit.php:83 classes/Subscription.php:89
-#: classes/Subscription.php:116
+#: actions/subedit.php:83 classes/Subscription.php:132
#, fuzzy
msgid "Could not save subscription."
msgstr "Không thể tạo đăng nhận."
@@ -4253,12 +4262,12 @@ msgstr ""
msgid "%s is not listening to anyone."
msgstr "%1$s dang theo doi tin nhan cua ban tren %2$s."
-#: actions/subscriptions.php:199
+#: actions/subscriptions.php:208
#, fuzzy
msgid "Jabber"
msgstr "Không có Jabber ID."
-#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:222 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr "SMS"
@@ -4292,13 +4301,13 @@ msgstr "Không có tài liệu nào."
msgid "Tag %s"
msgstr "Từ khóa"
-#: actions/tagother.php:77 lib/userprofile.php:75
+#: actions/tagother.php:77 lib/userprofile.php:76
#, fuzzy
msgid "User profile"
msgstr "Hồ sơ"
#: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:102
+#: lib/userprofile.php:103
msgid "Photo"
msgstr ""
@@ -4629,7 +4638,7 @@ msgstr ""
msgid "Plugins"
msgstr ""
-#: actions/version.php:196 lib/action.php:767
+#: actions/version.php:196 lib/action.php:766
#, fuzzy
msgid "Version"
msgstr "Cá nhân"
@@ -4638,19 +4647,19 @@ msgstr "Cá nhân"
msgid "Author(s)"
msgstr ""
-#: classes/File.php:144
+#: classes/File.php:169
#, 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:154
+#: classes/File.php:179
#, php-format
msgid "A file this large would exceed your user quota of %d bytes."
msgstr ""
-#: classes/File.php:161
+#: classes/File.php:186
#, php-format
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
@@ -4695,103 +4704,103 @@ msgstr "Không thể chèn thêm vào đăng nhận."
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."
-#: classes/Notice.php:172
+#: classes/Notice.php:175
#, fuzzy, php-format
msgid "DB error inserting hashtag: %s"
msgstr "Lỗi cơ sở dữ liệu khi chèn trả lời: %s"
-#: classes/Notice.php:241
+#: classes/Notice.php:244
#, fuzzy
msgid "Problem saving notice. Too long."
msgstr "Có lỗi xảy ra khi lưu tin nhắn."
-#: classes/Notice.php:245
+#: classes/Notice.php:248
#, fuzzy
msgid "Problem saving notice. Unknown user."
msgstr "Có lỗi xảy ra khi lưu tin nhắn."
-#: classes/Notice.php:250
+#: classes/Notice.php:253
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
-#: classes/Notice.php:256
+#: classes/Notice.php:259
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
msgstr ""
-#: classes/Notice.php:262
+#: classes/Notice.php:265
msgid "You are banned from posting notices on this site."
msgstr ""
-#: classes/Notice.php:328 classes/Notice.php:354
+#: classes/Notice.php:331 classes/Notice.php:357
msgid "Problem saving notice."
msgstr "Có lỗi xảy ra khi lưu tin nhắn."
-#: classes/Notice.php:927
+#: classes/Notice.php:943
#, fuzzy
msgid "Problem saving group inbox."
msgstr "Có lỗi xảy ra khi lưu tin nhắn."
-#: classes/Notice.php:1459
+#: classes/Notice.php:1481
#, fuzzy, php-format
msgid "RT @%1$s %2$s"
msgstr "%s (%s)"
-#: classes/Subscription.php:66 lib/oauthstore.php:465
+#: classes/Subscription.php:74 lib/oauthstore.php:465
msgid "You have been banned from subscribing."
msgstr ""
-#: classes/Subscription.php:70
+#: classes/Subscription.php:78
msgid "Already subscribed!"
msgstr ""
-#: classes/Subscription.php:74
+#: classes/Subscription.php:82
#, fuzzy
msgid "User has blocked you."
msgstr "Người dùng không có thông tin."
-#: classes/Subscription.php:157
+#: classes/Subscription.php:167
#, fuzzy
msgid "Not subscribed!"
msgstr "Chưa đăng nhận!"
-#: classes/Subscription.php:163
+#: classes/Subscription.php:173
#, fuzzy
msgid "Couldn't delete self-subscription."
msgstr "Không thể xóa đăng nhận."
-#: classes/Subscription.php:190
+#: classes/Subscription.php:200
#, fuzzy
msgid "Couldn't delete subscription OMB token."
msgstr "Không thể xóa đăng nhận."
-#: classes/Subscription.php:201 lib/subs.php:69
+#: classes/Subscription.php:211
msgid "Couldn't delete subscription."
msgstr "Không thể xóa đăng nhận."
-#: classes/User.php:373
+#: classes/User.php:363
#, fuzzy, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "%s chào mừng bạn "
-#: classes/User_group.php:477
+#: classes/User_group.php:480
#, fuzzy
msgid "Could not create group."
msgstr "Không thể tạo favorite."
-#: classes/User_group.php:486
+#: classes/User_group.php:489
#, fuzzy
msgid "Could not set group URI."
msgstr "Không thể tạo đăng nhận."
-#: classes/User_group.php:507
+#: classes/User_group.php:510
#, fuzzy
msgid "Could not set group membership."
msgstr "Không thể tạo đăng nhận."
-#: classes/User_group.php:521
+#: classes/User_group.php:524
#, fuzzy
msgid "Could not save local group info."
msgstr "Không thể tạo đăng nhận."
@@ -4836,54 +4845,54 @@ msgstr "%s (%s)"
msgid "Untitled page"
msgstr ""
-#: lib/action.php:424
+#: lib/action.php:423
msgid "Primary site navigation"
msgstr ""
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:430
+#: lib/action.php:429
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr ""
-#: lib/action.php:433
+#: lib/action.php:432
#, fuzzy
msgctxt "MENU"
msgid "Personal"
msgstr "Cá nhân"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:435
+#: lib/action.php:434
#, fuzzy
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "Thay đổi mật khẩu của bạn"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:440
+#: lib/action.php:439
#, fuzzy
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "Không thể chuyển đến máy chủ: %s"
-#: lib/action.php:443
+#: lib/action.php:442
msgid "Connect"
msgstr "Kết nối"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:446
+#: lib/action.php:445
#, fuzzy
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "Tôi theo"
-#: lib/action.php:449
+#: lib/action.php:448
msgctxt "MENU"
msgid "Admin"
msgstr ""
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:453
+#: lib/action.php:452
#, fuzzy, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
@@ -4891,69 +4900,69 @@ msgstr ""
"Điền địa chỉ email và nội dung tin nhắn để gửi thư mời bạn bè và đồng nghiệp "
"của bạn tham gia vào dịch vụ này."
-#: lib/action.php:456
+#: lib/action.php:455
#, fuzzy
msgctxt "MENU"
msgid "Invite"
msgstr "Thư mời"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:462
+#: lib/action.php:461
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr ""
-#: lib/action.php:465
+#: lib/action.php:464
#, fuzzy
msgctxt "MENU"
msgid "Logout"
msgstr "Thoát"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:470
+#: lib/action.php:469
#, fuzzy
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Tạo tài khoản mới"
-#: lib/action.php:473
+#: lib/action.php:472
#, fuzzy
msgctxt "MENU"
msgid "Register"
msgstr "Đăng ký"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:476
+#: lib/action.php:475
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr ""
-#: lib/action.php:479
+#: lib/action.php:478
#, fuzzy
msgctxt "MENU"
msgid "Login"
msgstr "Đăng nhập"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:482
+#: lib/action.php:481
#, fuzzy
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Hướng dẫn"
-#: lib/action.php:485
+#: lib/action.php:484
#, fuzzy
msgctxt "MENU"
msgid "Help"
msgstr "Hướng dẫn"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:488
+#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr ""
-#: lib/action.php:491
+#: lib/action.php:490
#, fuzzy
msgctxt "MENU"
msgid "Search"
@@ -4961,63 +4970,63 @@ msgstr "Tìm kiếm"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:513 lib/adminpanelaction.php:398
+#: lib/action.php:512 lib/adminpanelaction.php:398
#, fuzzy
msgid "Site notice"
msgstr "Thông báo mới"
-#: lib/action.php:579
+#: lib/action.php:578
msgid "Local views"
msgstr ""
-#: lib/action.php:645
+#: lib/action.php:644
#, fuzzy
msgid "Page notice"
msgstr "Thông báo mới"
-#: lib/action.php:747
+#: lib/action.php:746
#, fuzzy
msgid "Secondary site navigation"
msgstr "Tôi theo"
-#: lib/action.php:752
+#: lib/action.php:751
msgid "Help"
msgstr "Hướng dẫn"
-#: lib/action.php:754
+#: lib/action.php:753
msgid "About"
msgstr "Giới thiệu"
-#: lib/action.php:756
+#: lib/action.php:755
msgid "FAQ"
msgstr "FAQ"
-#: lib/action.php:760
+#: lib/action.php:759
msgid "TOS"
msgstr ""
-#: lib/action.php:763
+#: lib/action.php:762
msgid "Privacy"
msgstr "Riêng tư"
-#: lib/action.php:765
+#: lib/action.php:764
msgid "Source"
msgstr "Nguồn"
-#: lib/action.php:769
+#: lib/action.php:768
msgid "Contact"
msgstr "Liên hệ"
-#: lib/action.php:771
+#: lib/action.php:770
#, fuzzy
msgid "Badge"
msgstr "Tin đã gửi"
-#: lib/action.php:799
+#: lib/action.php:798
msgid "StatusNet software license"
msgstr ""
-#: lib/action.php:802
+#: lib/action.php:803
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5026,12 +5035,12 @@ msgstr ""
"**%%site.name%%** là dịch vụ gửi tin nhắn được cung cấp từ [%%site.broughtby%"
"%](%%site.broughtbyurl%%). "
-#: lib/action.php:804
+#: lib/action.php:805
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** là dịch vụ gửi tin nhắn. "
-#: lib/action.php:806
+#: lib/action.php:808
#, fuzzy, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5042,56 +5051,60 @@ msgstr ""
"quyền [GNU Affero General Public License](http://www.fsf.org/licensing/"
"licenses/agpl-3.0.html)."
-#: lib/action.php:821
+#: lib/action.php:823
#, fuzzy
msgid "Site content license"
msgstr "Tìm theo nội dung của tin nhắn"
-#: lib/action.php:826
+#: lib/action.php:828
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
-#: lib/action.php:831
+#: lib/action.php:833
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
-#: lib/action.php:834
+#: lib/action.php:836
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
-#: lib/action.php:847
+#: lib/action.php:849
msgid "All "
msgstr ""
-#: lib/action.php:853
+#: lib/action.php:855
msgid "license."
msgstr ""
-#: lib/action.php:1152
+#: lib/action.php:1154
msgid "Pagination"
msgstr ""
-#: lib/action.php:1161
+#: lib/action.php:1163
#, fuzzy
msgid "After"
msgstr "Sau"
-#: lib/action.php:1169
+#: lib/action.php:1171
#, fuzzy
msgid "Before"
msgstr "Trước"
-#: lib/activity.php:453
+#: lib/activity.php:120
+msgid "Expecting a root feed element but got a whole XML document."
+msgstr ""
+
+#: lib/activityutils.php:208
msgid "Can't handle remote content yet."
msgstr ""
-#: lib/activity.php:481
+#: lib/activityutils.php:236
msgid "Can't handle embedded XML content yet."
msgstr ""
-#: lib/activity.php:485
+#: lib/activityutils.php:240
msgid "Can't handle embedded Base64 content yet."
msgstr ""
@@ -5194,7 +5207,7 @@ msgstr "Xác nhận SMS"
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
-#: lib/apiauth.php:272
+#: lib/apiauth.php:276
#, php-format
msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s"
msgstr ""
@@ -5273,11 +5286,11 @@ msgstr "Xóa"
msgid "Attachments"
msgstr ""
-#: lib/attachmentlist.php:265
+#: lib/attachmentlist.php:263
msgid "Author"
msgstr ""
-#: lib/attachmentlist.php:278
+#: lib/attachmentlist.php:276
#, fuzzy
msgid "Provider"
msgstr "Hồ sơ "
@@ -5300,39 +5313,54 @@ msgstr "Đã lưu mật khẩu."
msgid "Password changing is not allowed"
msgstr "Đã lưu mật khẩu."
-#: lib/channel.php:138 lib/channel.php:158
+#: lib/channel.php:157 lib/channel.php:177
#, fuzzy
msgid "Command results"
msgstr "Không có kết quả nào"
-#: lib/channel.php:210 lib/mailhandler.php:142
+#: lib/channel.php:229 lib/mailhandler.php:142
msgid "Command complete"
msgstr ""
-#: lib/channel.php:221
+#: lib/channel.php:240
#, fuzzy
msgid "Command failed"
msgstr " và bạn bè"
-#: lib/command.php:44
-msgid "Sorry, this command is not yet implemented."
-msgstr ""
+#: lib/command.php:83 lib/command.php:105
+#, fuzzy
+msgid "Notice with that id does not exist"
+msgstr "Không tìm thấy trạng thái nào tương ứng với ID đó."
-#: lib/command.php:88
+#: lib/command.php:99 lib/command.php:570
+#, fuzzy
+msgid "User has no last notice"
+msgstr "Người dùng không có thông tin."
+
+#: lib/command.php:125
#, fuzzy, php-format
msgid "Could not find a user with nickname %s"
msgstr "Không thể cập nhật thông tin user với địa chỉ email đã được xác nhận."
-#: lib/command.php:92
+#: lib/command.php:143
+#, fuzzy, php-format
+msgid "Could not find a local user with nickname %s"
+msgstr "Không thể cập nhật thông tin user với địa chỉ email đã được xác nhận."
+
+#: lib/command.php:176
+msgid "Sorry, this command is not yet implemented."
+msgstr ""
+
+#: lib/command.php:221
msgid "It does not make a lot of sense to nudge yourself!"
msgstr ""
-#: lib/command.php:99
+#: lib/command.php:228
#, fuzzy, php-format
msgid "Nudge sent to %s"
msgstr "Tin đã gửi"
-#: lib/command.php:126
+#: lib/command.php:254
#, php-format
msgid ""
"Subscriptions: %1$s\n"
@@ -5340,207 +5368,203 @@ msgid ""
"Notices: %3$s"
msgstr ""
-#: lib/command.php:152 lib/command.php:390 lib/command.php:451
-#, fuzzy
-msgid "Notice with that id does not exist"
-msgstr "Không tìm thấy trạng thái nào tương ứng với ID đó."
-
-#: lib/command.php:168 lib/command.php:406 lib/command.php:467
-#: lib/command.php:523
-#, fuzzy
-msgid "User has no last notice"
-msgstr "Người dùng không có thông tin."
-
-#: lib/command.php:190
+#: lib/command.php:296
#, fuzzy
msgid "Notice marked as fave."
msgstr "Tin nhắn này đã có trong danh sách tin nhắn ưa thích của bạn rồi!"
-#: lib/command.php:217
+#: lib/command.php:317
#, fuzzy
msgid "You are already a member of that group"
msgstr "Bạn đã theo những người này:"
-#: lib/command.php:231
+#: lib/command.php:331
#, fuzzy, php-format
msgid "Could not join user %s to group %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."
-#: lib/command.php:236
+#: lib/command.php:336
#, fuzzy, php-format
msgid "%s joined group %s"
msgstr "%s và nhóm"
-#: lib/command.php:275
+#: lib/command.php:373
#, fuzzy, php-format
msgid "Could not remove user %s to group %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."
-#: lib/command.php:280
+#: lib/command.php:378
#, fuzzy, php-format
msgid "%s left group %s"
msgstr "%s và nhóm"
-#: lib/command.php:309
+#: lib/command.php:401
#, fuzzy, php-format
msgid "Fullname: %s"
msgstr "Tên đầy đủ"
-#: lib/command.php:312 lib/mail.php:258
+#: lib/command.php:404 lib/mail.php:258
#, fuzzy, php-format
msgid "Location: %s"
msgstr "Thành phố: %s"
-#: lib/command.php:315 lib/mail.php:260
+#: lib/command.php:407 lib/mail.php:260
#, fuzzy, php-format
msgid "Homepage: %s"
msgstr "Trang chủ hoặc Blog: %s"
-#: lib/command.php:318
+#: lib/command.php:410
#, fuzzy, php-format
msgid "About: %s"
msgstr "Giới thiệu"
-#: lib/command.php:349
+#: lib/command.php:437
+#, php-format
+msgid ""
+"%s is a remote profile; you can only send direct messages to users on the "
+"same server."
+msgstr ""
+
+#: lib/command.php:450
#, php-format
msgid "Message too long - maximum is %d characters, you sent %d"
msgstr ""
-#: lib/command.php:367
+#: lib/command.php:468
#, fuzzy, php-format
msgid "Direct message to %s sent"
msgstr "Tin nhắn riêng"
-#: lib/command.php:369
+#: lib/command.php:470
#, fuzzy
msgid "Error sending direct message."
msgstr "Thư bạn đã gửi"
-#: lib/command.php:413
+#: lib/command.php:490
#, fuzzy
msgid "Cannot repeat your own notice"
msgstr "Bạn không thể đăng ký nếu không đồng ý các điều khoản."
-#: lib/command.php:418
+#: lib/command.php:495
#, fuzzy
msgid "Already repeated that notice"
msgstr "Xóa tin nhắn"
-#: lib/command.php:426
+#: lib/command.php:503
#, fuzzy, php-format
msgid "Notice from %s repeated"
msgstr "Tin đã gửi"
-#: lib/command.php:428
+#: lib/command.php:505
#, fuzzy
msgid "Error repeating notice."
msgstr "Có lỗi xảy ra khi lưu tin nhắn."
-#: lib/command.php:482
+#: lib/command.php:536
#, php-format
msgid "Notice too long - maximum is %d characters, you sent %d"
msgstr ""
-#: lib/command.php:491
+#: lib/command.php:545
#, fuzzy, php-format
msgid "Reply to %s sent"
msgstr "Trả lời tin nhắn này"
-#: lib/command.php:493
+#: lib/command.php:547
#, fuzzy
msgid "Error saving notice."
msgstr "Có lỗi xảy ra khi lưu tin nhắn."
-#: lib/command.php:547
+#: lib/command.php:594
msgid "Specify the name of the user to subscribe to"
msgstr ""
-#: lib/command.php:554 lib/command.php:589
+#: lib/command.php:602
#, fuzzy
-msgid "No such user"
-msgstr "Không có user nào."
+msgid "Can't subscribe to OMB profiles by command."
+msgstr "Bạn chưa cập nhật thông tin riêng"
-#: lib/command.php:561
+#: lib/command.php:608
#, fuzzy, php-format
msgid "Subscribed to %s"
msgstr "Theo nhóm này"
-#: lib/command.php:582 lib/command.php:685
+#: lib/command.php:629 lib/command.php:728
msgid "Specify the name of the user to unsubscribe from"
msgstr ""
-#: lib/command.php:595
+#: lib/command.php:638
#, fuzzy, php-format
msgid "Unsubscribed from %s"
msgstr "Hết theo"
-#: lib/command.php:613 lib/command.php:636
+#: lib/command.php:656 lib/command.php:679
msgid "Command not yet implemented."
msgstr ""
-#: lib/command.php:616
+#: lib/command.php:659
#, fuzzy
msgid "Notification off."
msgstr "Không có mã số xác nhận."
-#: lib/command.php:618
+#: lib/command.php:661
msgid "Can't turn off notification."
msgstr ""
-#: lib/command.php:639
+#: lib/command.php:682
#, fuzzy
msgid "Notification on."
msgstr "Không có mã số xác nhận."
-#: lib/command.php:641
+#: lib/command.php:684
msgid "Can't turn on notification."
msgstr ""
-#: lib/command.php:654
+#: lib/command.php:697
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:665
+#: lib/command.php:708
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:692
+#: lib/command.php:735
#, fuzzy, php-format
msgid "Unsubscribed %s"
msgstr "Hết theo"
-#: lib/command.php:709
+#: lib/command.php:752
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "Bạn chưa cập nhật thông tin riêng"
-#: lib/command.php:711
+#: lib/command.php:754
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Bạn đã theo những người này:"
-#: lib/command.php:731
+#: lib/command.php:774
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Không thể tạo favorite."
-#: lib/command.php:733
+#: lib/command.php:776
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Không thể tạo favorite."
-#: lib/command.php:753
+#: lib/command.php:796
#, fuzzy
msgid "You are not a member of any groups."
msgstr "Bạn chưa cập nhật thông tin riêng"
-#: lib/command.php:755
+#: lib/command.php:798
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Bạn chưa cập nhật thông tin riêng"
-#: lib/command.php:769
+#: lib/command.php:812
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5582,20 +5606,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:148
+#: lib/common.php:135
#, fuzzy
msgid "No configuration file found. "
msgstr "Không có mã số xác nhận."
-#: lib/common.php:149
+#: lib/common.php:136
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:151
+#: lib/common.php:138
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:152
+#: lib/common.php:139
msgid "Go to the installer."
msgstr ""
@@ -5785,53 +5809,53 @@ msgstr ""
msgid "This page is not available in a media type you accept"
msgstr "Trang này không phải là phương tiện truyền thông mà bạn chấp nhận."
-#: lib/imagefile.php:75
+#: lib/imagefile.php:72
+msgid "Unsupported image file format."
+msgstr "Không hỗ trợ kiểu file ảnh này."
+
+#: lib/imagefile.php:88
#, fuzzy, php-format
msgid "That file is too big. The maximum file size is %s."
msgstr ""
"Bạn có thể cập nhật hồ sơ cá nhân tại đây để mọi người có thể biết thông tin "
"về bạn."
-#: lib/imagefile.php:80
+#: lib/imagefile.php:93
msgid "Partial upload."
msgstr "Upload từng phần."
-#: lib/imagefile.php:88 lib/mediafile.php:170
+#: lib/imagefile.php:101 lib/mediafile.php:170
msgid "System error uploading file."
msgstr "Hệ thống xảy ra lỗi trong khi tải file."
-#: lib/imagefile.php:96
+#: lib/imagefile.php:109
msgid "Not an image or corrupt file."
msgstr "File hỏng hoặc không phải là file ảnh."
-#: lib/imagefile.php:109
-msgid "Unsupported image file format."
-msgstr "Không hỗ trợ kiểu file ảnh này."
-
#: lib/imagefile.php:122
#, fuzzy
msgid "Lost our file."
msgstr "Không có tin nhắn nào."
-#: lib/imagefile.php:166 lib/imagefile.php:231
+#: lib/imagefile.php:163 lib/imagefile.php:224
#, fuzzy
msgid "Unknown file type"
msgstr "Không hỗ trợ kiểu file ảnh này."
-#: lib/imagefile.php:251
+#: lib/imagefile.php:244
msgid "MB"
msgstr ""
-#: lib/imagefile.php:253
+#: lib/imagefile.php:246
msgid "kB"
msgstr ""
-#: lib/jabber.php:220
+#: lib/jabber.php:387
#, php-format
msgid "[%s]"
msgstr ""
-#: lib/jabber.php:400
+#: lib/jabber.php:567
#, php-format
msgid "Unknown inbox source %d."
msgstr ""
@@ -6086,7 +6110,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:482
+#: lib/mailbox.php:227 lib/noticelist.php:486
#, fuzzy
msgid "from"
msgstr " từ "
@@ -6220,52 +6244,52 @@ msgid ""
"try again later"
msgstr ""
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr ""
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
#, fuzzy
msgid "N"
msgstr "Không"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "S"
msgstr ""
-#: lib/noticelist.php:431
+#: lib/noticelist.php:432
msgid "E"
msgstr ""
-#: lib/noticelist.php:431
+#: lib/noticelist.php:432
msgid "W"
msgstr ""
-#: lib/noticelist.php:438
+#: lib/noticelist.php:439
msgid "at"
msgstr ""
-#: lib/noticelist.php:566
+#: lib/noticelist.php:570
#, fuzzy
msgid "in context"
msgstr "Không có nội dung!"
-#: lib/noticelist.php:601
+#: lib/noticelist.php:605
#, fuzzy
msgid "Repeated by"
msgstr "Tạo"
-#: lib/noticelist.php:628
+#: lib/noticelist.php:632
#, fuzzy
msgid "Reply to this notice"
msgstr "Trả lời tin nhắn này"
-#: lib/noticelist.php:629
+#: lib/noticelist.php:633
msgid "Reply"
msgstr "Trả lời"
-#: lib/noticelist.php:673
+#: lib/noticelist.php:677
#, fuzzy
msgid "Notice repeated"
msgstr "Tin đã gửi"
@@ -6344,7 +6368,7 @@ msgstr "cảnh báo tin nhắn"
msgid "Unknown"
msgstr "Không tìm thấy action"
-#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr "Tôi theo bạn này"
@@ -6352,7 +6376,7 @@ msgstr "Tôi theo bạn này"
msgid "All subscriptions"
msgstr "Tất cả đăng nhận"
-#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90
+#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr "Bạn này theo tôi"
@@ -6361,15 +6385,20 @@ msgstr "Bạn này theo tôi"
msgid "All subscribers"
msgstr "Bạn này theo tôi"
-#: lib/profileaction.php:180
+#: lib/profileaction.php:186
msgid "User ID"
msgstr ""
-#: lib/profileaction.php:185
+#: lib/profileaction.php:191
msgid "Member since"
msgstr "Gia nhập từ"
-#: lib/profileaction.php:247
+#. TRANS: Average count of posts made per day since account registration
+#: lib/profileaction.php:230
+msgid "Daily average"
+msgstr ""
+
+#: lib/profileaction.php:259
#, fuzzy
msgid "All groups"
msgstr "Nhóm"
@@ -6421,7 +6450,7 @@ msgstr "Trả lời tin nhắn này"
msgid "Revoke the \"%s\" role from this user"
msgstr "Ban user"
-#: lib/router.php:671
+#: lib/router.php:704
msgid "No single user defined for single-user mode."
msgstr ""
@@ -6560,95 +6589,104 @@ msgstr "Ngừng đăng ký từ người dùng này"
msgid "Unsubscribe"
msgstr "Hết theo"
-#: lib/userprofile.php:116
+#: lib/usernoprofileexception.php:58
+#, fuzzy, php-format
+msgid "User %s (%d) has no profile record."
+msgstr "Người dùng không có thông tin."
+
+#: lib/userprofile.php:117
#, fuzzy
msgid "Edit Avatar"
msgstr "Hình đại diện"
-#: lib/userprofile.php:236
+#: lib/userprofile.php:234 lib/userprofile.php:248
#, fuzzy
msgid "User actions"
msgstr "Không tìm thấy action"
-#: lib/userprofile.php:251
+#: lib/userprofile.php:237
+msgid "User deletion in progress..."
+msgstr ""
+
+#: lib/userprofile.php:263
#, fuzzy
msgid "Edit profile settings"
msgstr "Các thiết lập cho Hồ sơ cá nhân"
-#: lib/userprofile.php:252
+#: lib/userprofile.php:264
msgid "Edit"
msgstr ""
-#: lib/userprofile.php:275
+#: lib/userprofile.php:287
#, fuzzy
msgid "Send a direct message to this user"
msgstr "Bạn đã theo những người này:"
-#: lib/userprofile.php:276
+#: lib/userprofile.php:288
#, fuzzy
msgid "Message"
msgstr "Tin mới nhất"
-#: lib/userprofile.php:314
+#: lib/userprofile.php:326
msgid "Moderate"
msgstr ""
-#: lib/userprofile.php:352
+#: lib/userprofile.php:364
#, fuzzy
msgid "User role"
msgstr "Hồ sơ"
-#: lib/userprofile.php:354
+#: lib/userprofile.php:366
msgctxt "role"
msgid "Administrator"
msgstr ""
-#: lib/userprofile.php:355
+#: lib/userprofile.php:367
msgctxt "role"
msgid "Moderator"
msgstr ""
-#: lib/util.php:1015
+#: lib/util.php:1046
msgid "a few seconds ago"
msgstr "vài giây trước"
-#: lib/util.php:1017
+#: lib/util.php:1048
msgid "about a minute ago"
msgstr "1 phút trước"
-#: lib/util.php:1019
+#: lib/util.php:1050
#, php-format
msgid "about %d minutes ago"
msgstr "%d phút trước"
-#: lib/util.php:1021
+#: lib/util.php:1052
msgid "about an hour ago"
msgstr "1 giờ trước"
-#: lib/util.php:1023
+#: lib/util.php:1054
#, php-format
msgid "about %d hours ago"
msgstr "%d giờ trước"
-#: lib/util.php:1025
+#: lib/util.php:1056
msgid "about a day ago"
msgstr "1 ngày trước"
-#: lib/util.php:1027
+#: lib/util.php:1058
#, php-format
msgid "about %d days ago"
msgstr "%d ngày trước"
-#: lib/util.php:1029
+#: lib/util.php:1060
msgid "about a month ago"
msgstr "1 tháng trước"
-#: lib/util.php:1031
+#: lib/util.php:1062
#, php-format
msgid "about %d months ago"
msgstr "%d tháng trước"
-#: lib/util.php:1033
+#: lib/util.php:1064
msgid "about a year ago"
msgstr "1 năm trước"
@@ -6662,7 +6700,7 @@ msgstr "Trang chủ không phải là URL"
msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr ""
-#: lib/xmppmanager.php:402
+#: lib/xmppmanager.php:403
#, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d."
msgstr ""
diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po
index cc1761616..b2396c703 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-03-06 23:49+0000\n"
-"PO-Revision-Date: 2010-03-06 23:51:13+0000\n"
+"POT-Creation-Date: 2010-04-05 18:54+0000\n"
+"PO-Revision-Date: 2010-04-05 18:56:31+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 (r63350); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64621); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: zh-hans\n"
"X-Message-Group: out-statusnet\n"
@@ -100,9 +100,9 @@ msgstr "没有该页面"
#: 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:90
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78
+#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
@@ -111,10 +111,8 @@ msgstr "没有该页面"
#: actions/remotesubscribe.php:154 actions/replies.php:73
#: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:163 lib/command.php:302
-#: lib/command.php:355 lib/command.php:401 lib/command.php:462
-#: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82
-#: lib/profileaction.php:77
+#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: lib/mailbox.php:82 lib/profileaction.php:77
msgid "No such user."
msgstr "没有这个用户。"
@@ -202,18 +200,18 @@ msgstr "来自%2$s 上 %1$s 和好友的更新!"
#: 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:132
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:136
#: actions/apigrouplistall.php:120 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:135
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
-#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184
-#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148
+#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:174
+#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173
+#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
-#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
+#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
#, fuzzy
msgid "API method not found."
msgstr "API 方法未实现!"
@@ -227,8 +225,8 @@ msgstr "API 方法未实现!"
#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65
-#: actions/apistatusesupdate.php:118
+#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
msgid "This method requires a POST."
msgstr "此方法接受POST请求。"
@@ -259,7 +257,7 @@ msgid "Could not save profile."
msgstr "无法保存个人信息。"
#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:97
+#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
#: actions/designadminpanel.php:122 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
@@ -347,7 +345,7 @@ msgstr "没有找到此ID的信息。"
msgid "This status is already a favorite."
msgstr "已收藏此通告!"
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
msgid "Could not create favorite."
msgstr "无法创建收藏。"
@@ -471,7 +469,7 @@ msgstr "API 方法未实现!"
msgid "You are already a member of that group."
msgstr "您已经是该组成员"
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:221
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
msgid "You have been blocked from that group by the admin."
msgstr ""
@@ -490,11 +488,18 @@ msgstr "您未告知此个人信息"
msgid "Could not remove user %1$s from group %2$s."
msgstr "无法订阅用户:未找到。"
-#: actions/apigrouplist.php:95
+#. TRANS: %s is a user name
+#: actions/apigrouplist.php:97
#, 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
+#, fuzzy, php-format
+msgid "%1$s groups %2$s is a member of."
+msgstr "%s 组是成员组成了"
+
#: actions/apigrouplistall.php:90 actions/usergroups.php:62
#, php-format
msgid "%s groups"
@@ -523,7 +528,7 @@ msgstr "大小不正确。"
#: 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:337
+#: actions/profilesettings.php:194 actions/recoverpassword.php:350
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
@@ -584,15 +589,15 @@ msgid ""
"give access to your %4$s account to third parties you trust."
msgstr ""
-#: actions/apioauthauthorize.php:310 lib/action.php:438
+#: actions/apioauthauthorize.php:310 lib/action.php:437
msgid "Account"
msgstr "帐号"
#: actions/apioauthauthorize.php:313 actions/login.php:230
#: actions/profilesettings.php:106 actions/register.php:424
-#: actions/showgroup.php:244 actions/tagother.php:94
+#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
-#: lib/userprofile.php:131
+#: lib/userprofile.php:132
msgid "Nickname"
msgstr "昵称"
@@ -666,12 +671,12 @@ msgstr ""
msgid "Unsupported format."
msgstr "不支持这种图像格式。"
-#: actions/apitimelinefavorites.php:108
+#: actions/apitimelinefavorites.php:109
#, fuzzy, php-format
msgid "%1$s / Favorites from %2$s"
msgstr "%s 的收藏 / %s"
-#: actions/apitimelinefavorites.php:117
+#: actions/apitimelinefavorites.php:118
#, fuzzy, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "%s 收藏了 %s 的 %s 通告。"
@@ -681,7 +686,7 @@ msgstr "%s 收藏了 %s 的 %s 通告。"
msgid "%1$s / Updates mentioning %2$s"
msgstr "%1$s / 回复 %2$s 的消息"
-#: actions/apitimelinementions.php:127
+#: actions/apitimelinementions.php:130
#, php-format
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "回复 %2$s / %3$s 的 %1$s 更新。"
@@ -691,7 +696,7 @@ msgstr "回复 %2$s / %3$s 的 %1$s 更新。"
msgid "%s public timeline"
msgstr "%s 公众时间表"
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "来自所有人的 %s 消息!"
@@ -706,12 +711,12 @@ msgstr "%s 的回复"
msgid "Repeats of %s"
msgstr "%s 的回复"
-#: actions/apitimelinetag.php:102 actions/tag.php:67
+#: actions/apitimelinetag.php:104 actions/tag.php:67
#, php-format
msgid "Notices tagged with %s"
msgstr "带 %s 标签的通告"
-#: actions/apitimelinetag.php:104 actions/tagrss.php:65
+#: actions/apitimelinetag.php:106 actions/tagrss.php:65
#, fuzzy, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "%2$s 上 %1$s 的更新!"
@@ -741,7 +746,7 @@ msgstr "没有大小。"
msgid "Invalid size."
msgstr "大小不正确。"
-#: actions/avatarsettings.php:67 actions/showgroup.php:229
+#: actions/avatarsettings.php:67 actions/showgroup.php:230
#: lib/accountsettingsaction.php:112
msgid "Avatar"
msgstr "头像"
@@ -773,7 +778,7 @@ msgid "Preview"
msgstr "预览"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:655
+#: lib/deleteuserform.php:66 lib/noticelist.php:659
#, fuzzy
msgid "Delete"
msgstr "删除"
@@ -786,23 +791,28 @@ msgstr "上传"
msgid "Crop"
msgstr "剪裁"
-#: actions/avatarsettings.php:328
+#: actions/avatarsettings.php:305
+#, fuzzy
+msgid "No file uploaded."
+msgstr "没有收件人。"
+
+#: actions/avatarsettings.php:332
msgid "Pick a square area of the image to be your avatar"
msgstr "请选择一块方形区域作为你的头像"
-#: actions/avatarsettings.php:343 actions/grouplogo.php:380
+#: actions/avatarsettings.php:347 actions/grouplogo.php:380
msgid "Lost our file data."
msgstr "文件数据丢失"
-#: actions/avatarsettings.php:366
+#: actions/avatarsettings.php:370
msgid "Avatar updated."
msgstr "头像已更新。"
-#: actions/avatarsettings.php:369
+#: actions/avatarsettings.php:373
msgid "Failed updating avatar."
msgstr "更新头像失败。"
-#: actions/avatarsettings.php:393
+#: actions/avatarsettings.php:397
#, fuzzy
msgid "Avatar deleted."
msgstr "头像已更新。"
@@ -859,8 +869,8 @@ msgstr "保存阻止信息失败。"
#: actions/groupunblock.php:86 actions/joingroup.php:82
#: actions/joingroup.php:93 actions/leavegroup.php:82
#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212
-#: lib/command.php:260
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162
+#: lib/command.php:358
msgid "No such group."
msgstr "没有这个组。"
@@ -948,7 +958,7 @@ msgid "Conversation"
msgstr "确认码"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:218 lib/searchgroupnav.php:82
+#: lib/profileaction.php:224 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "通告"
@@ -970,7 +980,7 @@ msgstr "您未告知此个人信息"
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1217
+#: lib/action.php:1219
#, fuzzy
msgid "There was a problem with your session token."
msgstr "会话标识有问题,请重试。"
@@ -1032,7 +1042,7 @@ msgstr "确定要删除这条消息吗?"
msgid "Do not delete this notice"
msgstr "无法删除通告。"
-#: actions/deletenotice.php:146 lib/noticelist.php:655
+#: actions/deletenotice.php:146 lib/noticelist.php:659
#, fuzzy
msgid "Delete this notice"
msgstr "删除通告"
@@ -1180,7 +1190,7 @@ msgstr ""
#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:208
+#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
#: actions/tagother.php:154 actions/useradminpanel.php:294
#: lib/applicationeditform.php:333 lib/applicationeditform.php:334
#: lib/designsettings.php:256 lib/groupeditform.php:202
@@ -1308,7 +1318,7 @@ msgstr "描述过长(不能超过140字符)。"
msgid "Could not update group."
msgstr "无法更新组"
-#: actions/editgroup.php:264 classes/User_group.php:493
+#: actions/editgroup.php:264 classes/User_group.php:496
#, fuzzy
msgid "Could not create aliases."
msgstr "无法创建收藏。"
@@ -1821,7 +1831,7 @@ msgstr "%s 时间表"
msgid "Updates from members of %1$s on %2$s!"
msgstr "%2$s 上 %1$s 的更新!"
-#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232
+#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244
#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr "组"
@@ -2026,7 +2036,7 @@ msgstr "邀请新用户"
msgid "You are already subscribed to these users:"
msgstr "您已订阅这些用户:"
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
#, php-format
msgid "%1$s (%2$s)"
msgstr "%1$s (%2$s)"
@@ -2150,7 +2160,7 @@ msgstr "%s 加入 %s 组"
msgid "You must be logged in to leave a group."
msgstr "您必须登录才能邀请其他人使用 %s"
-#: actions/leavegroup.php:100 lib/command.php:265
+#: actions/leavegroup.php:100 lib/command.php:363
#, fuzzy
msgid "You are not a member of that group."
msgstr "您未告知此个人信息"
@@ -2267,12 +2277,12 @@ msgstr "使用此表格创建组。"
msgid "New message"
msgstr "新消息"
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
msgid "You can't send a message to this user."
msgstr "无法向此用户发送消息。"
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342
-#: lib/command.php:475
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
+#: lib/command.php:529
msgid "No content!"
msgstr "没有内容!"
@@ -2280,7 +2290,7 @@ msgstr "没有内容!"
msgid "No recipient specified."
msgstr "没有收件人。"
-#: actions/newmessage.php:164 lib/command.php:361
+#: actions/newmessage.php:164 lib/command.php:462
msgid ""
"Don't send a message to yourself; just say it to yourself quietly instead."
msgstr "不要向自己发送消息;跟自己悄悄说就得了。"
@@ -2295,7 +2305,7 @@ msgstr "新消息"
msgid "Direct message to %s sent."
msgstr "已向 %s 发送消息"
-#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189
msgid "Ajax Error"
msgstr "Ajax错误"
@@ -2303,7 +2313,7 @@ msgstr "Ajax错误"
msgid "New notice"
msgstr "新通告"
-#: actions/newnotice.php:211
+#: actions/newnotice.php:217
msgid "Notice posted"
msgstr "消息已发布。"
@@ -2411,7 +2421,7 @@ msgstr ""
msgid "Notice has no profile"
msgstr "通告没有关联个人信息"
-#: actions/oembed.php:86 actions/shownotice.php:180
+#: actions/oembed.php:86 actions/shownotice.php:175
#, php-format
msgid "%1$s's status on %2$s"
msgstr "%1$s 的 %2$s 状态"
@@ -2425,8 +2435,8 @@ msgstr "连接"
msgid "Only "
msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042
-#: lib/apiaction.php:1070 lib/apiaction.php:1179
+#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1068
+#: lib/apiaction.php:1096 lib/apiaction.php:1212
msgid "Not a supported data format."
msgstr "不支持的数据格式。"
@@ -2567,7 +2577,7 @@ msgstr "旧密码不正确"
msgid "Error saving user; invalid."
msgstr "保存用户时出错;不正确。"
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
msgid "Can't save new password."
msgstr "无法保存新密码。"
@@ -2791,8 +2801,8 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr "1 到 64 个小写字母或数字,不包含标点及空白"
#: actions/profilesettings.php:111 actions/register.php:448
-#: actions/showgroup.php:255 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:149
+#: actions/showgroup.php:256 actions/tagother.php:104
+#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "全名"
@@ -2820,9 +2830,9 @@ msgid "Bio"
msgstr "自述"
#: actions/profilesettings.php:132 actions/register.php:471
-#: actions/showgroup.php:264 actions/tagother.php:112
+#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
-#: lib/userprofile.php:164
+#: lib/userprofile.php:165
msgid "Location"
msgstr "位置"
@@ -2836,7 +2846,7 @@ msgstr ""
#: actions/profilesettings.php:145 actions/tagother.php:149
#: actions/tagother.php:209 lib/subscriptionlist.php:106
-#: lib/subscriptionlist.php:108 lib/userprofile.php:209
+#: lib/subscriptionlist.php:108 lib/userprofile.php:210
msgid "Tags"
msgstr "标签"
@@ -3069,7 +3079,7 @@ msgstr "重置密码"
msgid "Recover password"
msgstr "恢复密码"
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
msgid "Password recovery requested"
msgstr "请求恢复密码"
@@ -3089,41 +3099,41 @@ msgstr "重置"
msgid "Enter a nickname or email address."
msgstr "输入昵称或电子邮件。"
-#: actions/recoverpassword.php:272
+#: actions/recoverpassword.php:282
msgid "No user with that email address or username."
msgstr "没有拥有这个用户名或电子邮件的用户。"
-#: actions/recoverpassword.php:287
+#: actions/recoverpassword.php:299
msgid "No registered email address for that user."
msgstr "用户没有注册电子邮件。"
-#: actions/recoverpassword.php:301
+#: actions/recoverpassword.php:313
msgid "Error saving address confirmation."
msgstr "保存地址确认时出错。"
-#: actions/recoverpassword.php:325
+#: actions/recoverpassword.php:338
msgid ""
"Instructions for recovering your password have been sent to the email "
"address registered to your account."
msgstr "恢复密码的指示已被发送到您的注册邮箱。"
-#: actions/recoverpassword.php:344
+#: actions/recoverpassword.php:357
msgid "Unexpected password reset."
msgstr "未预料的密码重置。"
-#: actions/recoverpassword.php:352
+#: actions/recoverpassword.php:365
msgid "Password must be 6 chars or more."
msgstr "密码必须是 6 个字符或更多。"
-#: actions/recoverpassword.php:356
+#: actions/recoverpassword.php:369
msgid "Password and confirmation do not match."
msgstr "密码和确认不匹配。"
-#: actions/recoverpassword.php:375 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:248
msgid "Error setting user."
msgstr "保存用户设置时出错。"
-#: actions/recoverpassword.php:382
+#: actions/recoverpassword.php:395
msgid "New password successfully saved. You are now logged in."
msgstr "新密码已保存,您现在已登录。"
@@ -3280,7 +3290,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "您在其他兼容的微博客服务的个人信息URL"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:394
+#: lib/userprofile.php:406
msgid "Subscribe"
msgstr "订阅"
@@ -3323,7 +3333,7 @@ msgstr "您必须同意此授权方可注册。"
msgid "You already repeated that notice."
msgstr "您已成功阻止该用户:"
-#: actions/repeat.php:114 lib/noticelist.php:674
+#: actions/repeat.php:114 lib/noticelist.php:678
#, fuzzy
msgid "Repeated"
msgstr "创建"
@@ -3473,8 +3483,8 @@ msgstr "分页"
msgid "Description"
msgstr "描述"
-#: actions/showapplication.php:192 actions/showgroup.php:438
-#: lib/profileaction.php:176
+#: actions/showapplication.php:192 actions/showgroup.php:439
+#: lib/profileaction.php:182
msgid "Statistics"
msgstr "统计"
@@ -3585,71 +3595,71 @@ msgstr "%s 组"
msgid "%1$s group, page %2$d"
msgstr "%s 组成员, 第 %d 页"
-#: actions/showgroup.php:226
+#: actions/showgroup.php:227
#, fuzzy
msgid "Group profile"
msgstr "组资料"
-#: actions/showgroup.php:271 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:177
+#: actions/showgroup.php:272 actions/tagother.php:118
+#: actions/userauthorization.php:175 lib/userprofile.php:178
msgid "URL"
msgstr "URL 互联网地址"
-#: actions/showgroup.php:282 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:194
+#: actions/showgroup.php:283 actions/tagother.php:128
+#: actions/userauthorization.php:187 lib/userprofile.php:195
#, fuzzy
msgid "Note"
msgstr "通告"
-#: actions/showgroup.php:292 lib/groupeditform.php:184
+#: actions/showgroup.php:293 lib/groupeditform.php:184
msgid "Aliases"
msgstr ""
-#: actions/showgroup.php:301
+#: actions/showgroup.php:302
msgid "Group actions"
msgstr "组动作"
-#: actions/showgroup.php:337
+#: actions/showgroup.php:338
#, fuzzy, php-format
msgid "Notice feed for %s group (RSS 1.0)"
msgstr "%s 的通告聚合"
-#: actions/showgroup.php:343
+#: actions/showgroup.php:344
#, fuzzy, php-format
msgid "Notice feed for %s group (RSS 2.0)"
msgstr "%s 的通告聚合"
-#: actions/showgroup.php:349
+#: actions/showgroup.php:350
#, fuzzy, php-format
msgid "Notice feed for %s group (Atom)"
msgstr "%s 的通告聚合"
-#: actions/showgroup.php:354
+#: actions/showgroup.php:355
#, php-format
msgid "FOAF for %s group"
msgstr "%s 的发件箱"
-#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91
+#: actions/showgroup.php:391 actions/showgroup.php:448 lib/groupnav.php:91
#, fuzzy
msgid "Members"
msgstr "注册于"
-#: actions/showgroup.php:395 lib/profileaction.php:117
-#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95
-#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71
+#: actions/showgroup.php:396 lib/profileaction.php:117
+#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95
+#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
msgid "(None)"
msgstr "(没有)"
-#: actions/showgroup.php:401
+#: actions/showgroup.php:402
msgid "All members"
msgstr "所有成员"
-#: actions/showgroup.php:441
+#: actions/showgroup.php:442
#, fuzzy
msgid "Created"
msgstr "创建"
-#: actions/showgroup.php:457
+#: actions/showgroup.php:458
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3659,7 +3669,7 @@ msgid ""
"of this group and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
-#: actions/showgroup.php:463
+#: actions/showgroup.php:464
#, fuzzy, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3670,7 +3680,7 @@ msgstr ""
"**%s** 是一个 %%%%site.name%%%% 的用户组,一个微博客服务 [micro-blogging]"
"(http://en.wikipedia.org/wiki/Micro-blogging)"
-#: actions/showgroup.php:491
+#: actions/showgroup.php:492
#, fuzzy
msgid "Admins"
msgstr "admin管理员"
@@ -3804,7 +3814,7 @@ msgid "Unknown language \"%s\"."
msgstr ""
#: actions/siteadminpanel.php:165
-msgid "Minimum text limit is 140 characters."
+msgid "Minimum text limit is 0 (unlimited)."
msgstr ""
#: actions/siteadminpanel.php:171
@@ -4086,8 +4096,7 @@ msgstr "头像设置"
msgid "You are not subscribed to that profile."
msgstr "您未告知此个人信息"
-#: actions/subedit.php:83 classes/Subscription.php:89
-#: classes/Subscription.php:116
+#: actions/subedit.php:83 classes/Subscription.php:132
#, fuzzy
msgid "Could not save subscription."
msgstr "无法删除订阅。"
@@ -4182,12 +4191,12 @@ msgstr ""
msgid "%s is not listening to anyone."
msgstr "%1$s 开始关注您的 %2$s 信息。"
-#: actions/subscriptions.php:199
+#: actions/subscriptions.php:208
#, fuzzy
msgid "Jabber"
msgstr "没有 Jabber ID。"
-#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:222 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr "SMS短信"
@@ -4221,13 +4230,13 @@ msgstr "没有这份文档。"
msgid "Tag %s"
msgstr "标签"
-#: actions/tagother.php:77 lib/userprofile.php:75
+#: actions/tagother.php:77 lib/userprofile.php:76
#, fuzzy
msgid "User profile"
msgstr "用户没有个人信息。"
#: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:102
+#: lib/userprofile.php:103
msgid "Photo"
msgstr "相片"
@@ -4557,7 +4566,7 @@ msgstr ""
msgid "Plugins"
msgstr ""
-#: actions/version.php:196 lib/action.php:767
+#: actions/version.php:196 lib/action.php:766
#, fuzzy
msgid "Version"
msgstr "个人"
@@ -4566,19 +4575,19 @@ msgstr "个人"
msgid "Author(s)"
msgstr ""
-#: classes/File.php:144
+#: classes/File.php:169
#, 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:154
+#: classes/File.php:179
#, php-format
msgid "A file this large would exceed your user quota of %d bytes."
msgstr ""
-#: classes/File.php:161
+#: classes/File.php:186
#, php-format
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
@@ -4621,104 +4630,104 @@ msgstr "无法添加信息。"
msgid "Could not update message with new URI."
msgstr "无法添加新URI的信息。"
-#: classes/Notice.php:172
+#: classes/Notice.php:175
#, php-format
msgid "DB error inserting hashtag: %s"
msgstr "添加标签时数据库出错:%s"
-#: classes/Notice.php:241
+#: classes/Notice.php:244
#, fuzzy
msgid "Problem saving notice. Too long."
msgstr "保存通告时出错。"
-#: classes/Notice.php:245
+#: classes/Notice.php:248
#, fuzzy
msgid "Problem saving notice. Unknown user."
msgstr "保存通告时出错。"
-#: classes/Notice.php:250
+#: classes/Notice.php:253
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr "你在短时间里发布了过多的消息,请深呼吸,过几分钟再发消息。"
-#: classes/Notice.php:256
+#: classes/Notice.php:259
#, fuzzy
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
msgstr "你在短时间里发布了过多的消息,请深呼吸,过几分钟再发消息。"
-#: classes/Notice.php:262
+#: classes/Notice.php:265
msgid "You are banned from posting notices on this site."
msgstr "在这个网站你被禁止发布消息。"
-#: classes/Notice.php:328 classes/Notice.php:354
+#: classes/Notice.php:331 classes/Notice.php:357
msgid "Problem saving notice."
msgstr "保存通告时出错。"
-#: classes/Notice.php:927
+#: classes/Notice.php:943
#, fuzzy
msgid "Problem saving group inbox."
msgstr "保存通告时出错。"
-#: classes/Notice.php:1459
+#: classes/Notice.php:1481
#, fuzzy, php-format
msgid "RT @%1$s %2$s"
msgstr "%1$s (%2$s)"
-#: classes/Subscription.php:66 lib/oauthstore.php:465
+#: classes/Subscription.php:74 lib/oauthstore.php:465
#, fuzzy
msgid "You have been banned from subscribing."
msgstr "那个用户阻止了你的订阅。"
-#: classes/Subscription.php:70
+#: classes/Subscription.php:78
msgid "Already subscribed!"
msgstr ""
-#: classes/Subscription.php:74
+#: classes/Subscription.php:82
#, fuzzy
msgid "User has blocked you."
msgstr "用户没有个人信息。"
-#: classes/Subscription.php:157
+#: classes/Subscription.php:167
#, fuzzy
msgid "Not subscribed!"
msgstr "未订阅!"
-#: classes/Subscription.php:163
+#: classes/Subscription.php:173
#, fuzzy
msgid "Couldn't delete self-subscription."
msgstr "无法删除订阅。"
-#: classes/Subscription.php:190
+#: classes/Subscription.php:200
#, fuzzy
msgid "Couldn't delete subscription OMB token."
msgstr "无法删除订阅。"
-#: classes/Subscription.php:201 lib/subs.php:69
+#: classes/Subscription.php:211
msgid "Couldn't delete subscription."
msgstr "无法删除订阅。"
-#: classes/User.php:373
+#: classes/User.php:363
#, fuzzy, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "发送给 %1$s 的 %2$s 消息"
-#: classes/User_group.php:477
+#: classes/User_group.php:480
msgid "Could not create group."
msgstr "无法创建组。"
-#: classes/User_group.php:486
+#: classes/User_group.php:489
#, fuzzy
msgid "Could not set group URI."
msgstr "无法删除订阅。"
-#: classes/User_group.php:507
+#: classes/User_group.php:510
#, fuzzy
msgid "Could not set group membership."
msgstr "无法删除订阅。"
-#: classes/User_group.php:521
+#: classes/User_group.php:524
#, fuzzy
msgid "Could not save local group info."
msgstr "无法删除订阅。"
@@ -4761,127 +4770,127 @@ msgstr "%1$s (%2$s)"
msgid "Untitled page"
msgstr "无标题页"
-#: lib/action.php:424
+#: lib/action.php:423
msgid "Primary site navigation"
msgstr "主站导航"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:430
+#: lib/action.php:429
#, fuzzy
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr "个人资料及朋友年表"
-#: lib/action.php:433
+#: lib/action.php:432
#, fuzzy
msgctxt "MENU"
msgid "Personal"
msgstr "个人"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:435
+#: lib/action.php:434
#, fuzzy
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "修改资料"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:440
+#: lib/action.php:439
#, fuzzy
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "无法重定向到服务器:%s"
-#: lib/action.php:443
+#: lib/action.php:442
msgid "Connect"
msgstr "连接"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:446
+#: lib/action.php:445
#, fuzzy
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "主站导航"
-#: lib/action.php:449
+#: lib/action.php:448
#, fuzzy
msgctxt "MENU"
msgid "Admin"
msgstr "admin管理员"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:453
+#: lib/action.php:452
#, fuzzy, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "使用这个表单来邀请好友和同事加入。"
-#: lib/action.php:456
+#: lib/action.php:455
#, fuzzy
msgctxt "MENU"
msgid "Invite"
msgstr "邀请"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:462
+#: lib/action.php:461
#, fuzzy
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "登出本站"
-#: lib/action.php:465
+#: lib/action.php:464
#, fuzzy
msgctxt "MENU"
msgid "Logout"
msgstr "登出"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:470
+#: lib/action.php:469
#, fuzzy
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "创建新帐号"
-#: lib/action.php:473
+#: lib/action.php:472
#, fuzzy
msgctxt "MENU"
msgid "Register"
msgstr "注册"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:476
+#: lib/action.php:475
#, fuzzy
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "登入本站"
-#: lib/action.php:479
+#: lib/action.php:478
#, fuzzy
msgctxt "MENU"
msgid "Login"
msgstr "登录"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:482
+#: lib/action.php:481
#, fuzzy
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "帮助"
-#: lib/action.php:485
+#: lib/action.php:484
#, fuzzy
msgctxt "MENU"
msgid "Help"
msgstr "帮助"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:488
+#: lib/action.php:487
#, fuzzy
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "检索人或文字"
-#: lib/action.php:491
+#: lib/action.php:490
#, fuzzy
msgctxt "MENU"
msgid "Search"
@@ -4889,63 +4898,63 @@ msgstr "搜索"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:513 lib/adminpanelaction.php:398
+#: lib/action.php:512 lib/adminpanelaction.php:398
#, fuzzy
msgid "Site notice"
msgstr "新通告"
-#: lib/action.php:579
+#: lib/action.php:578
msgid "Local views"
msgstr "本地显示"
-#: lib/action.php:645
+#: lib/action.php:644
#, fuzzy
msgid "Page notice"
msgstr "新通告"
-#: lib/action.php:747
+#: lib/action.php:746
#, fuzzy
msgid "Secondary site navigation"
msgstr "次项站导航"
-#: lib/action.php:752
+#: lib/action.php:751
msgid "Help"
msgstr "帮助"
-#: lib/action.php:754
+#: lib/action.php:753
msgid "About"
msgstr "关于"
-#: lib/action.php:756
+#: lib/action.php:755
msgid "FAQ"
msgstr "常见问题FAQ"
-#: lib/action.php:760
+#: lib/action.php:759
msgid "TOS"
msgstr ""
-#: lib/action.php:763
+#: lib/action.php:762
msgid "Privacy"
msgstr "隐私"
-#: lib/action.php:765
+#: lib/action.php:764
msgid "Source"
msgstr "来源"
-#: lib/action.php:769
+#: lib/action.php:768
msgid "Contact"
msgstr "联系人"
-#: lib/action.php:771
+#: lib/action.php:770
#, fuzzy
msgid "Badge"
msgstr "呼叫"
-#: lib/action.php:799
+#: lib/action.php:798
msgid "StatusNet software license"
msgstr "StatusNet软件注册证"
-#: lib/action.php:802
+#: lib/action.php:803
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4954,12 +4963,12 @@ msgstr ""
"**%%site.name%%** 是一个微博客服务,提供者为 [%%site.broughtby%%](%%site."
"broughtbyurl%%)。"
-#: lib/action.php:804
+#: lib/action.php:805
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** 是一个微博客服务。"
-#: lib/action.php:806
+#: lib/action.php:808
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4970,56 +4979,60 @@ msgstr ""
"General Public License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)"
"授权。"
-#: lib/action.php:821
+#: lib/action.php:823
#, fuzzy
msgid "Site content license"
msgstr "StatusNet软件注册证"
-#: lib/action.php:826
+#: lib/action.php:828
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
-#: lib/action.php:831
+#: lib/action.php:833
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
-#: lib/action.php:834
+#: lib/action.php:836
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
-#: lib/action.php:847
+#: lib/action.php:849
msgid "All "
msgstr "全部"
-#: lib/action.php:853
+#: lib/action.php:855
msgid "license."
msgstr "注册证"
-#: lib/action.php:1152
+#: lib/action.php:1154
msgid "Pagination"
msgstr "分页"
-#: lib/action.php:1161
+#: lib/action.php:1163
#, fuzzy
msgid "After"
msgstr "« 之后"
-#: lib/action.php:1169
+#: lib/action.php:1171
#, fuzzy
msgid "Before"
msgstr "之前 »"
-#: lib/activity.php:453
+#: lib/activity.php:120
+msgid "Expecting a root feed element but got a whole XML document."
+msgstr ""
+
+#: lib/activityutils.php:208
msgid "Can't handle remote content yet."
msgstr ""
-#: lib/activity.php:481
+#: lib/activityutils.php:236
msgid "Can't handle embedded XML content yet."
msgstr ""
-#: lib/activity.php:485
+#: lib/activityutils.php:240
msgid "Can't handle embedded Base64 content yet."
msgstr ""
@@ -5124,7 +5137,7 @@ msgstr "SMS短信确认"
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
-#: lib/apiauth.php:272
+#: lib/apiauth.php:276
#, php-format
msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s"
msgstr ""
@@ -5203,11 +5216,11 @@ msgstr "移除"
msgid "Attachments"
msgstr ""
-#: lib/attachmentlist.php:265
+#: lib/attachmentlist.php:263
msgid "Author"
msgstr ""
-#: lib/attachmentlist.php:278
+#: lib/attachmentlist.php:276
#, fuzzy
msgid "Provider"
msgstr "个人信息"
@@ -5230,37 +5243,51 @@ msgstr "密码已保存。"
msgid "Password changing is not allowed"
msgstr "密码已保存。"
-#: lib/channel.php:138 lib/channel.php:158
+#: lib/channel.php:157 lib/channel.php:177
msgid "Command results"
msgstr "执行结果"
-#: lib/channel.php:210 lib/mailhandler.php:142
+#: lib/channel.php:229 lib/mailhandler.php:142
msgid "Command complete"
msgstr "执行完毕"
-#: lib/channel.php:221
+#: lib/channel.php:240
msgid "Command failed"
msgstr "执行失败"
-#: lib/command.php:44
-msgid "Sorry, this command is not yet implemented."
-msgstr "对不起,这个命令还没有实现。"
+#: lib/command.php:83 lib/command.php:105
+#, fuzzy
+msgid "Notice with that id does not exist"
+msgstr "没有找到此ID的信息。"
+
+#: lib/command.php:99 lib/command.php:570
+msgid "User has no last notice"
+msgstr "用户没有通告。"
-#: lib/command.php:88
+#: lib/command.php:125
#, fuzzy, php-format
msgid "Could not find a user with nickname %s"
msgstr "无法更新已确认的电子邮件。"
-#: lib/command.php:92
+#: lib/command.php:143
+#, fuzzy, php-format
+msgid "Could not find a local user with nickname %s"
+msgstr "无法更新已确认的电子邮件。"
+
+#: lib/command.php:176
+msgid "Sorry, this command is not yet implemented."
+msgstr "对不起,这个命令还没有实现。"
+
+#: lib/command.php:221
msgid "It does not make a lot of sense to nudge yourself!"
msgstr ""
-#: lib/command.php:99
+#: lib/command.php:228
#, fuzzy, php-format
msgid "Nudge sent to %s"
msgstr "振铃呼叫发出。"
-#: lib/command.php:126
+#: lib/command.php:254
#, php-format
msgid ""
"Subscriptions: %1$s\n"
@@ -5268,200 +5295,198 @@ msgid ""
"Notices: %3$s"
msgstr ""
-#: lib/command.php:152 lib/command.php:390 lib/command.php:451
-#, fuzzy
-msgid "Notice with that id does not exist"
-msgstr "没有找到此ID的信息。"
-
-#: lib/command.php:168 lib/command.php:406 lib/command.php:467
-#: lib/command.php:523
-msgid "User has no last notice"
-msgstr "用户没有通告。"
-
-#: lib/command.php:190
+#: lib/command.php:296
msgid "Notice marked as fave."
msgstr "通告被标记为收藏。"
-#: lib/command.php:217
+#: lib/command.php:317
msgid "You are already a member of that group"
msgstr "您已经是该组成员"
-#: lib/command.php:231
+#: lib/command.php:331
#, fuzzy, php-format
msgid "Could not join user %s to group %s"
msgstr "无法把 %s 用户添加到 %s 组"
-#: lib/command.php:236
+#: lib/command.php:336
#, fuzzy, php-format
msgid "%s joined group %s"
msgstr "%s 加入 %s 组"
-#: lib/command.php:275
+#: lib/command.php:373
#, fuzzy, php-format
msgid "Could not remove user %s to group %s"
msgstr "无法订阅用户:未找到。"
-#: lib/command.php:280
+#: lib/command.php:378
#, php-format
msgid "%s left group %s"
msgstr "%s 离开群 %s"
-#: lib/command.php:309
+#: lib/command.php:401
#, php-format
msgid "Fullname: %s"
msgstr "全名:%s"
-#: lib/command.php:312 lib/mail.php:258
+#: lib/command.php:404 lib/mail.php:258
#, php-format
msgid "Location: %s"
msgstr "位置:%s"
-#: lib/command.php:315 lib/mail.php:260
+#: lib/command.php:407 lib/mail.php:260
#, php-format
msgid "Homepage: %s"
msgstr "主页:%s"
-#: lib/command.php:318
+#: lib/command.php:410
#, php-format
msgid "About: %s"
msgstr "关于:%s"
-#: lib/command.php:349
+#: lib/command.php:437
+#, php-format
+msgid ""
+"%s is a remote profile; you can only send direct messages to users on the "
+"same server."
+msgstr ""
+
+#: lib/command.php:450
#, fuzzy, php-format
msgid "Message too long - maximum is %d characters, you sent %d"
msgstr "您的消息包含 %d 个字符,超出长度限制 - 不能超过 140 个字符。"
-#: lib/command.php:367
+#: lib/command.php:468
#, php-format
msgid "Direct message to %s sent"
msgstr "已向 %s 发送消息"
-#: lib/command.php:369
+#: lib/command.php:470
msgid "Error sending direct message."
msgstr "发送消息出错。"
-#: lib/command.php:413
+#: lib/command.php:490
#, fuzzy
msgid "Cannot repeat your own notice"
msgstr "无法开启通告。"
-#: lib/command.php:418
+#: lib/command.php:495
#, fuzzy
msgid "Already repeated that notice"
msgstr "删除通告"
-#: lib/command.php:426
+#: lib/command.php:503
#, fuzzy, php-format
msgid "Notice from %s repeated"
msgstr "消息已发布。"
-#: lib/command.php:428
+#: lib/command.php:505
#, fuzzy
msgid "Error repeating notice."
msgstr "保存通告时出错。"
-#: lib/command.php:482
+#: lib/command.php:536
#, fuzzy, php-format
msgid "Notice too long - maximum is %d characters, you sent %d"
msgstr "您的消息包含 %d 个字符,超出长度限制 - 不能超过 140 个字符。"
-#: lib/command.php:491
+#: lib/command.php:545
#, fuzzy, php-format
msgid "Reply to %s sent"
msgstr "无法删除通告。"
-#: lib/command.php:493
+#: lib/command.php:547
#, fuzzy
msgid "Error saving notice."
msgstr "保存通告时出错。"
-#: lib/command.php:547
+#: lib/command.php:594
msgid "Specify the name of the user to subscribe to"
msgstr "指定要订阅的用户名"
-#: lib/command.php:554 lib/command.php:589
-msgid "No such user"
-msgstr "没有这个用户。"
+#: lib/command.php:602
+#, fuzzy
+msgid "Can't subscribe to OMB profiles by command."
+msgstr "您未告知此个人信息"
-#: lib/command.php:561
+#: lib/command.php:608
#, php-format
msgid "Subscribed to %s"
msgstr "订阅 %s"
-#: lib/command.php:582 lib/command.php:685
+#: lib/command.php:629 lib/command.php:728
msgid "Specify the name of the user to unsubscribe from"
msgstr "指定要取消订阅的用户名"
-#: lib/command.php:595
+#: lib/command.php:638
#, php-format
msgid "Unsubscribed from %s"
msgstr "取消订阅 %s"
-#: lib/command.php:613 lib/command.php:636
+#: lib/command.php:656 lib/command.php:679
msgid "Command not yet implemented."
msgstr "命令尚未实现。"
-#: lib/command.php:616
+#: lib/command.php:659
msgid "Notification off."
msgstr "通告关闭。"
-#: lib/command.php:618
+#: lib/command.php:661
msgid "Can't turn off notification."
msgstr "无法关闭通告。"
-#: lib/command.php:639
+#: lib/command.php:682
msgid "Notification on."
msgstr "通告开启。"
-#: lib/command.php:641
+#: lib/command.php:684
msgid "Can't turn on notification."
msgstr "无法开启通告。"
-#: lib/command.php:654
+#: lib/command.php:697
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:665
+#: lib/command.php:708
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:692
+#: lib/command.php:735
#, fuzzy, php-format
msgid "Unsubscribed %s"
msgstr "取消订阅 %s"
-#: lib/command.php:709
+#: lib/command.php:752
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "您未告知此个人信息"
-#: lib/command.php:711
+#: lib/command.php:754
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "您已订阅这些用户:"
-#: lib/command.php:731
+#: lib/command.php:774
#, fuzzy
msgid "No one is subscribed to you."
msgstr "无法订阅他人更新。"
-#: lib/command.php:733
+#: lib/command.php:776
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "无法订阅他人更新。"
-#: lib/command.php:753
+#: lib/command.php:796
#, fuzzy
msgid "You are not a member of any groups."
msgstr "您未告知此个人信息"
-#: lib/command.php:755
+#: lib/command.php:798
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "您未告知此个人信息"
-#: lib/command.php:769
+#: lib/command.php:812
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5503,20 +5528,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:148
+#: lib/common.php:135
#, fuzzy
msgid "No configuration file found. "
msgstr "没有验证码"
-#: lib/common.php:149
+#: lib/common.php:136
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:151
+#: lib/common.php:138
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:152
+#: lib/common.php:139
#, fuzzy
msgid "Go to the installer."
msgstr "登入本站"
@@ -5704,50 +5729,50 @@ msgstr "这个组所发布的消息的标签"
msgid "This page is not available in a media type you accept"
msgstr "这个页面不提供您想要的媒体类型"
-#: lib/imagefile.php:75
+#: lib/imagefile.php:72
+msgid "Unsupported image file format."
+msgstr "不支持这种图像格式。"
+
+#: lib/imagefile.php:88
#, fuzzy, php-format
msgid "That file is too big. The maximum file size is %s."
msgstr "你可以给你的组上载一个logo图。"
-#: lib/imagefile.php:80
+#: lib/imagefile.php:93
msgid "Partial upload."
msgstr "部分上传。"
-#: lib/imagefile.php:88 lib/mediafile.php:170
+#: lib/imagefile.php:101 lib/mediafile.php:170
msgid "System error uploading file."
msgstr "上传文件时出错。"
-#: lib/imagefile.php:96
+#: lib/imagefile.php:109
msgid "Not an image or corrupt file."
msgstr "不是图片文件或文件已损坏。"
-#: lib/imagefile.php:109
-msgid "Unsupported image file format."
-msgstr "不支持这种图像格式。"
-
#: lib/imagefile.php:122
#, fuzzy
msgid "Lost our file."
msgstr "没有这份通告。"
-#: lib/imagefile.php:166 lib/imagefile.php:231
+#: lib/imagefile.php:163 lib/imagefile.php:224
msgid "Unknown file type"
msgstr "未知文件类型"
-#: lib/imagefile.php:251
+#: lib/imagefile.php:244
msgid "MB"
msgstr ""
-#: lib/imagefile.php:253
+#: lib/imagefile.php:246
msgid "kB"
msgstr ""
-#: lib/jabber.php:220
+#: lib/jabber.php:387
#, php-format
msgid "[%s]"
msgstr ""
-#: lib/jabber.php:400
+#: lib/jabber.php:567
#, php-format
msgid "Unknown inbox source %d."
msgstr ""
@@ -5960,7 +5985,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:482
+#: lib/mailbox.php:227 lib/noticelist.php:486
#, fuzzy
msgid "from"
msgstr " 从 "
@@ -6093,53 +6118,53 @@ msgid ""
"try again later"
msgstr ""
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr ""
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
#, fuzzy
msgid "N"
msgstr "否"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "S"
msgstr ""
-#: lib/noticelist.php:431
+#: lib/noticelist.php:432
msgid "E"
msgstr ""
-#: lib/noticelist.php:431
+#: lib/noticelist.php:432
msgid "W"
msgstr ""
-#: lib/noticelist.php:438
+#: lib/noticelist.php:439
msgid "at"
msgstr ""
-#: lib/noticelist.php:566
+#: lib/noticelist.php:570
#, fuzzy
msgid "in context"
msgstr "没有内容!"
-#: lib/noticelist.php:601
+#: lib/noticelist.php:605
#, fuzzy
msgid "Repeated by"
msgstr "创建"
-#: lib/noticelist.php:628
+#: lib/noticelist.php:632
#, fuzzy
msgid "Reply to this notice"
msgstr "无法删除通告。"
-#: lib/noticelist.php:629
+#: lib/noticelist.php:633
#, fuzzy
msgid "Reply"
msgstr "回复"
-#: lib/noticelist.php:673
+#: lib/noticelist.php:677
#, fuzzy
msgid "Notice repeated"
msgstr "消息已发布。"
@@ -6216,7 +6241,7 @@ msgstr "%s's 的消息的标签"
msgid "Unknown"
msgstr "未知动作"
-#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr "订阅"
@@ -6224,7 +6249,7 @@ msgstr "订阅"
msgid "All subscriptions"
msgstr "所有订阅"
-#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90
+#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr "订阅者"
@@ -6233,16 +6258,21 @@ msgstr "订阅者"
msgid "All subscribers"
msgstr "订阅者"
-#: lib/profileaction.php:180
+#: lib/profileaction.php:186
#, fuzzy
msgid "User ID"
msgstr "用户"
-#: lib/profileaction.php:185
+#: lib/profileaction.php:191
msgid "Member since"
msgstr "用户始于"
-#: lib/profileaction.php:247
+#. TRANS: Average count of posts made per day since account registration
+#: lib/profileaction.php:230
+msgid "Daily average"
+msgstr ""
+
+#: lib/profileaction.php:259
msgid "All groups"
msgstr "所有组"
@@ -6292,7 +6322,7 @@ msgstr "无法删除通告。"
msgid "Revoke the \"%s\" role from this user"
msgstr "该组成员列表。"
-#: lib/router.php:671
+#: lib/router.php:704
msgid "No single user defined for single-user mode."
msgstr ""
@@ -6430,96 +6460,105 @@ msgstr "取消订阅 %s"
msgid "Unsubscribe"
msgstr "退订"
-#: lib/userprofile.php:116
+#: lib/usernoprofileexception.php:58
+#, fuzzy, php-format
+msgid "User %s (%d) has no profile record."
+msgstr "用户没有个人信息。"
+
+#: lib/userprofile.php:117
#, fuzzy
msgid "Edit Avatar"
msgstr "头像"
-#: lib/userprofile.php:236
+#: lib/userprofile.php:234 lib/userprofile.php:248
#, fuzzy
msgid "User actions"
msgstr "未知动作"
-#: lib/userprofile.php:251
+#: lib/userprofile.php:237
+msgid "User deletion in progress..."
+msgstr ""
+
+#: lib/userprofile.php:263
#, fuzzy
msgid "Edit profile settings"
msgstr "个人设置"
-#: lib/userprofile.php:252
+#: lib/userprofile.php:264
msgid "Edit"
msgstr ""
-#: lib/userprofile.php:275
+#: lib/userprofile.php:287
#, fuzzy
msgid "Send a direct message to this user"
msgstr "无法向此用户发送消息。"
-#: lib/userprofile.php:276
+#: lib/userprofile.php:288
#, fuzzy
msgid "Message"
msgstr "新消息"
-#: lib/userprofile.php:314
+#: lib/userprofile.php:326
msgid "Moderate"
msgstr ""
-#: lib/userprofile.php:352
+#: lib/userprofile.php:364
#, fuzzy
msgid "User role"
msgstr "用户没有个人信息。"
-#: lib/userprofile.php:354
+#: lib/userprofile.php:366
#, fuzzy
msgctxt "role"
msgid "Administrator"
msgstr "admin管理员"
-#: lib/userprofile.php:355
+#: lib/userprofile.php:367
msgctxt "role"
msgid "Moderator"
msgstr ""
-#: lib/util.php:1015
+#: lib/util.php:1046
msgid "a few seconds ago"
msgstr "几秒前"
-#: lib/util.php:1017
+#: lib/util.php:1048
msgid "about a minute ago"
msgstr "一分钟前"
-#: lib/util.php:1019
+#: lib/util.php:1050
#, php-format
msgid "about %d minutes ago"
msgstr "%d 分钟前"
-#: lib/util.php:1021
+#: lib/util.php:1052
msgid "about an hour ago"
msgstr "一小时前"
-#: lib/util.php:1023
+#: lib/util.php:1054
#, php-format
msgid "about %d hours ago"
msgstr "%d 小时前"
-#: lib/util.php:1025
+#: lib/util.php:1056
msgid "about a day ago"
msgstr "一天前"
-#: lib/util.php:1027
+#: lib/util.php:1058
#, php-format
msgid "about %d days ago"
msgstr "%d 天前"
-#: lib/util.php:1029
+#: lib/util.php:1060
msgid "about a month ago"
msgstr "一个月前"
-#: lib/util.php:1031
+#: lib/util.php:1062
#, php-format
msgid "about %d months ago"
msgstr "%d 个月前"
-#: lib/util.php:1033
+#: lib/util.php:1064
msgid "about a year ago"
msgstr "一年前"
@@ -6533,7 +6572,7 @@ msgstr "主页的URL不正确。"
msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr ""
-#: lib/xmppmanager.php:402
+#: lib/xmppmanager.php:403
#, fuzzy, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d."
msgstr "您的消息包含 %d 个字符,超出长度限制 - 不能超过 140 个字符。"
diff --git a/locale/zh_TW/LC_MESSAGES/statusnet.po b/locale/zh_TW/LC_MESSAGES/statusnet.po
index 3ea887beb..60255e031 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-03-06 23:49+0000\n"
-"PO-Revision-Date: 2010-03-06 23:51:15+0000\n"
+"POT-Creation-Date: 2010-04-05 18:54+0000\n"
+"PO-Revision-Date: 2010-04-05 18:56:34+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 (r63350); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64621); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: zh-hant\n"
"X-Message-Group: out-statusnet\n"
@@ -95,9 +95,9 @@ msgstr "無此通知"
#: 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:90
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78
+#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
@@ -106,10 +106,8 @@ msgstr "無此通知"
#: actions/remotesubscribe.php:154 actions/replies.php:73
#: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:163 lib/command.php:302
-#: lib/command.php:355 lib/command.php:401 lib/command.php:462
-#: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82
-#: lib/profileaction.php:77
+#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: lib/mailbox.php:82 lib/profileaction.php:77
msgid "No such user."
msgstr "無此使用者"
@@ -197,18 +195,18 @@ msgstr ""
#: 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:132
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:136
#: actions/apigrouplistall.php:120 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:135
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
-#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184
-#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148
+#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:174
+#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173
+#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
-#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
+#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
#, fuzzy
msgid "API method not found."
msgstr "確認碼遺失"
@@ -222,8 +220,8 @@ msgstr "確認碼遺失"
#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65
-#: actions/apistatusesupdate.php:118
+#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
msgid "This method requires a POST."
msgstr ""
@@ -254,7 +252,7 @@ msgid "Could not save profile."
msgstr "無法儲存個人資料"
#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:97
+#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
#: actions/designadminpanel.php:122 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
@@ -340,7 +338,7 @@ msgstr ""
msgid "This status is already a favorite."
msgstr ""
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
msgid "Could not create favorite."
msgstr ""
@@ -462,7 +460,7 @@ msgstr "目前無請求"
msgid "You are already a member of that group."
msgstr ""
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:221
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
msgid "You have been blocked from that group by the admin."
msgstr ""
@@ -481,11 +479,18 @@ msgstr "無法連結到伺服器:%s"
msgid "Could not remove user %1$s from group %2$s."
msgstr "無法從 %s 建立OpenID"
-#: actions/apigrouplist.php:95
+#. TRANS: %s is a user name
+#: actions/apigrouplist.php:97
#, 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
+#, fuzzy, php-format
+msgid "%1$s groups %2$s is a member of."
+msgstr "無法連結到伺服器:%s"
+
#: actions/apigrouplistall.php:90 actions/usergroups.php:62
#, php-format
msgid "%s groups"
@@ -514,7 +519,7 @@ msgstr "尺寸錯誤"
#: 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:337
+#: actions/profilesettings.php:194 actions/recoverpassword.php:350
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
@@ -575,16 +580,16 @@ msgid ""
"give access to your %4$s account to third parties you trust."
msgstr ""
-#: actions/apioauthauthorize.php:310 lib/action.php:438
+#: actions/apioauthauthorize.php:310 lib/action.php:437
#, fuzzy
msgid "Account"
msgstr "關於"
#: actions/apioauthauthorize.php:313 actions/login.php:230
#: actions/profilesettings.php:106 actions/register.php:424
-#: actions/showgroup.php:244 actions/tagother.php:94
+#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
-#: lib/userprofile.php:131
+#: lib/userprofile.php:132
msgid "Nickname"
msgstr "暱稱"
@@ -656,12 +661,12 @@ msgstr ""
msgid "Unsupported format."
msgstr ""
-#: actions/apitimelinefavorites.php:108
+#: actions/apitimelinefavorites.php:109
#, fuzzy, php-format
msgid "%1$s / Favorites from %2$s"
msgstr "%1$s的狀態是%2$s"
-#: actions/apitimelinefavorites.php:117
+#: actions/apitimelinefavorites.php:118
#, fuzzy, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "&s的微型部落格"
@@ -671,7 +676,7 @@ msgstr "&s的微型部落格"
msgid "%1$s / Updates mentioning %2$s"
msgstr "%1$s的狀態是%2$s"
-#: actions/apitimelinementions.php:127
+#: actions/apitimelinementions.php:130
#, php-format
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr ""
@@ -681,7 +686,7 @@ msgstr ""
msgid "%s public timeline"
msgstr ""
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr ""
@@ -696,12 +701,12 @@ msgstr ""
msgid "Repeats of %s"
msgstr ""
-#: actions/apitimelinetag.php:102 actions/tag.php:67
+#: actions/apitimelinetag.php:104 actions/tag.php:67
#, php-format
msgid "Notices tagged with %s"
msgstr ""
-#: actions/apitimelinetag.php:104 actions/tagrss.php:65
+#: actions/apitimelinetag.php:106 actions/tagrss.php:65
#, fuzzy, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "&s的微型部落格"
@@ -731,7 +736,7 @@ msgstr "無尺寸"
msgid "Invalid size."
msgstr "尺寸錯誤"
-#: actions/avatarsettings.php:67 actions/showgroup.php:229
+#: actions/avatarsettings.php:67 actions/showgroup.php:230
#: lib/accountsettingsaction.php:112
msgid "Avatar"
msgstr "個人圖像"
@@ -764,7 +769,7 @@ msgid "Preview"
msgstr ""
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:655
+#: lib/deleteuserform.php:66 lib/noticelist.php:659
msgid "Delete"
msgstr ""
@@ -776,23 +781,27 @@ msgstr ""
msgid "Crop"
msgstr ""
-#: actions/avatarsettings.php:328
+#: actions/avatarsettings.php:305
+msgid "No file uploaded."
+msgstr ""
+
+#: actions/avatarsettings.php:332
msgid "Pick a square area of the image to be your avatar"
msgstr ""
-#: actions/avatarsettings.php:343 actions/grouplogo.php:380
+#: actions/avatarsettings.php:347 actions/grouplogo.php:380
msgid "Lost our file data."
msgstr ""
-#: actions/avatarsettings.php:366
+#: actions/avatarsettings.php:370
msgid "Avatar updated."
msgstr "更新個人圖像"
-#: actions/avatarsettings.php:369
+#: actions/avatarsettings.php:373
msgid "Failed updating avatar."
msgstr "無法上傳個人圖像"
-#: actions/avatarsettings.php:393
+#: actions/avatarsettings.php:397
#, fuzzy
msgid "Avatar deleted."
msgstr "更新個人圖像"
@@ -849,8 +858,8 @@ msgstr ""
#: actions/groupunblock.php:86 actions/joingroup.php:82
#: actions/joingroup.php:93 actions/leavegroup.php:82
#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212
-#: lib/command.php:260
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162
+#: lib/command.php:358
#, fuzzy
msgid "No such group."
msgstr "無此通知"
@@ -937,7 +946,7 @@ msgid "Conversation"
msgstr "地點"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:218 lib/searchgroupnav.php:82
+#: lib/profileaction.php:224 lib/searchgroupnav.php:82
msgid "Notices"
msgstr ""
@@ -959,7 +968,7 @@ msgstr "無法連結到伺服器:%s"
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1217
+#: lib/action.php:1219
msgid "There was a problem with your session token."
msgstr ""
@@ -1019,7 +1028,7 @@ msgstr ""
msgid "Do not delete this notice"
msgstr "無此通知"
-#: actions/deletenotice.php:146 lib/noticelist.php:655
+#: actions/deletenotice.php:146 lib/noticelist.php:659
msgid "Delete this notice"
msgstr ""
@@ -1163,7 +1172,7 @@ msgstr ""
#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:208
+#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
#: actions/tagother.php:154 actions/useradminpanel.php:294
#: lib/applicationeditform.php:333 lib/applicationeditform.php:334
#: lib/designsettings.php:256 lib/groupeditform.php:202
@@ -1288,7 +1297,7 @@ msgstr "自我介紹過長(共140個字元)"
msgid "Could not update group."
msgstr "無法更新使用者"
-#: actions/editgroup.php:264 classes/User_group.php:493
+#: actions/editgroup.php:264 classes/User_group.php:496
#, fuzzy
msgid "Could not create aliases."
msgstr "無法存取個人圖像資料"
@@ -1779,7 +1788,7 @@ msgstr ""
msgid "Updates from members of %1$s on %2$s!"
msgstr "&s的微型部落格"
-#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232
+#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244
#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr ""
@@ -1977,7 +1986,7 @@ msgstr ""
msgid "You are already subscribed to these users:"
msgstr ""
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
#, php-format
msgid "%1$s (%2$s)"
msgstr ""
@@ -2078,7 +2087,7 @@ msgstr ""
msgid "You must be logged in to leave a group."
msgstr ""
-#: actions/leavegroup.php:100 lib/command.php:265
+#: actions/leavegroup.php:100 lib/command.php:363
msgid "You are not a member of that group."
msgstr ""
@@ -2189,12 +2198,12 @@ msgstr ""
msgid "New message"
msgstr ""
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
msgid "You can't send a message to this user."
msgstr ""
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342
-#: lib/command.php:475
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
+#: lib/command.php:529
msgid "No content!"
msgstr "無內容"
@@ -2202,7 +2211,7 @@ msgstr "無內容"
msgid "No recipient specified."
msgstr ""
-#: actions/newmessage.php:164 lib/command.php:361
+#: actions/newmessage.php:164 lib/command.php:462
msgid ""
"Don't send a message to yourself; just say it to yourself quietly instead."
msgstr ""
@@ -2216,7 +2225,7 @@ msgstr ""
msgid "Direct message to %s sent."
msgstr ""
-#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189
msgid "Ajax Error"
msgstr ""
@@ -2224,7 +2233,7 @@ msgstr ""
msgid "New notice"
msgstr "新訊息"
-#: actions/newnotice.php:211
+#: actions/newnotice.php:217
msgid "Notice posted"
msgstr ""
@@ -2328,7 +2337,7 @@ msgstr ""
msgid "Notice has no profile"
msgstr ""
-#: actions/oembed.php:86 actions/shownotice.php:180
+#: actions/oembed.php:86 actions/shownotice.php:175
#, php-format
msgid "%1$s's status on %2$s"
msgstr "%1$s的狀態是%2$s"
@@ -2342,8 +2351,8 @@ msgstr "連結"
msgid "Only "
msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042
-#: lib/apiaction.php:1070 lib/apiaction.php:1179
+#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1068
+#: lib/apiaction.php:1096 lib/apiaction.php:1212
msgid "Not a supported data format."
msgstr ""
@@ -2481,7 +2490,7 @@ msgstr "舊密碼錯誤"
msgid "Error saving user; invalid."
msgstr "儲存使用者發生錯誤;使用者名稱無效"
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
msgid "Can't save new password."
msgstr "無法存取新密碼"
@@ -2697,8 +2706,8 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr "1-64個小寫英文字母或數字,勿加標點符號或空格"
#: actions/profilesettings.php:111 actions/register.php:448
-#: actions/showgroup.php:255 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:149
+#: actions/showgroup.php:256 actions/tagother.php:104
+#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "全名"
@@ -2726,9 +2735,9 @@ msgid "Bio"
msgstr "自我介紹"
#: actions/profilesettings.php:132 actions/register.php:471
-#: actions/showgroup.php:264 actions/tagother.php:112
+#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
-#: lib/userprofile.php:164
+#: lib/userprofile.php:165
msgid "Location"
msgstr "地點"
@@ -2742,7 +2751,7 @@ msgstr ""
#: actions/profilesettings.php:145 actions/tagother.php:149
#: actions/tagother.php:209 lib/subscriptionlist.php:106
-#: lib/subscriptionlist.php:108 lib/userprofile.php:209
+#: lib/subscriptionlist.php:108 lib/userprofile.php:210
msgid "Tags"
msgstr ""
@@ -2969,7 +2978,7 @@ msgstr ""
msgid "Recover password"
msgstr ""
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
msgid "Password recovery requested"
msgstr ""
@@ -2989,41 +2998,41 @@ msgstr ""
msgid "Enter a nickname or email address."
msgstr "請輸入暱稱或電子信箱"
-#: actions/recoverpassword.php:272
+#: actions/recoverpassword.php:282
msgid "No user with that email address or username."
msgstr ""
-#: actions/recoverpassword.php:287
+#: actions/recoverpassword.php:299
msgid "No registered email address for that user."
msgstr "查無此使用者所註冊的信箱"
-#: actions/recoverpassword.php:301
+#: actions/recoverpassword.php:313
msgid "Error saving address confirmation."
msgstr "儲存信箱確認發生錯誤"
-#: actions/recoverpassword.php:325
+#: actions/recoverpassword.php:338
msgid ""
"Instructions for recovering your password have been sent to the email "
"address registered to your account."
msgstr "我們已寄出一封信到你帳號中的信箱,告訴你如何取回你的密碼。"
-#: actions/recoverpassword.php:344
+#: actions/recoverpassword.php:357
msgid "Unexpected password reset."
msgstr ""
-#: actions/recoverpassword.php:352
+#: actions/recoverpassword.php:365
msgid "Password must be 6 chars or more."
msgstr ""
-#: actions/recoverpassword.php:356
+#: actions/recoverpassword.php:369
msgid "Password and confirmation do not match."
msgstr ""
-#: actions/recoverpassword.php:375 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:248
msgid "Error setting user."
msgstr "使用者設定發生錯誤"
-#: actions/recoverpassword.php:382
+#: actions/recoverpassword.php:395
msgid "New password successfully saved. You are now logged in."
msgstr "新密碼已儲存成功。你已登入。"
@@ -3164,7 +3173,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr ""
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:394
+#: lib/userprofile.php:406
msgid "Subscribe"
msgstr ""
@@ -3203,7 +3212,7 @@ msgstr ""
msgid "You already repeated that notice."
msgstr "無此使用者"
-#: actions/repeat.php:114 lib/noticelist.php:674
+#: actions/repeat.php:114 lib/noticelist.php:678
#, fuzzy
msgid "Repeated"
msgstr "新增"
@@ -3349,8 +3358,8 @@ msgstr "地點"
msgid "Description"
msgstr "所有訂閱"
-#: actions/showapplication.php:192 actions/showgroup.php:438
-#: lib/profileaction.php:176
+#: actions/showapplication.php:192 actions/showgroup.php:439
+#: lib/profileaction.php:182
msgid "Statistics"
msgstr ""
@@ -3460,70 +3469,70 @@ msgstr ""
msgid "%1$s group, page %2$d"
msgstr "所有訂閱"
-#: actions/showgroup.php:226
+#: actions/showgroup.php:227
#, fuzzy
msgid "Group profile"
msgstr "無此通知"
-#: actions/showgroup.php:271 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:177
+#: actions/showgroup.php:272 actions/tagother.php:118
+#: actions/userauthorization.php:175 lib/userprofile.php:178
msgid "URL"
msgstr ""
-#: actions/showgroup.php:282 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:194
+#: actions/showgroup.php:283 actions/tagother.php:128
+#: actions/userauthorization.php:187 lib/userprofile.php:195
msgid "Note"
msgstr ""
-#: actions/showgroup.php:292 lib/groupeditform.php:184
+#: actions/showgroup.php:293 lib/groupeditform.php:184
msgid "Aliases"
msgstr ""
-#: actions/showgroup.php:301
+#: actions/showgroup.php:302
msgid "Group actions"
msgstr ""
-#: actions/showgroup.php:337
+#: actions/showgroup.php:338
#, php-format
msgid "Notice feed for %s group (RSS 1.0)"
msgstr ""
-#: actions/showgroup.php:343
+#: actions/showgroup.php:344
#, php-format
msgid "Notice feed for %s group (RSS 2.0)"
msgstr ""
-#: actions/showgroup.php:349
+#: actions/showgroup.php:350
#, php-format
msgid "Notice feed for %s group (Atom)"
msgstr ""
-#: actions/showgroup.php:354
+#: actions/showgroup.php:355
#, fuzzy, php-format
msgid "FOAF for %s group"
msgstr "無此通知"
-#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91
+#: actions/showgroup.php:391 actions/showgroup.php:448 lib/groupnav.php:91
#, fuzzy
msgid "Members"
msgstr "何時加入會員的呢?"
-#: actions/showgroup.php:395 lib/profileaction.php:117
-#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95
-#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71
+#: actions/showgroup.php:396 lib/profileaction.php:117
+#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95
+#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
msgid "(None)"
msgstr ""
-#: actions/showgroup.php:401
+#: actions/showgroup.php:402
msgid "All members"
msgstr ""
-#: actions/showgroup.php:441
+#: actions/showgroup.php:442
#, fuzzy
msgid "Created"
msgstr "新增"
-#: actions/showgroup.php:457
+#: actions/showgroup.php:458
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3533,7 +3542,7 @@ msgid ""
"of this group and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
-#: actions/showgroup.php:463
+#: actions/showgroup.php:464
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3542,7 +3551,7 @@ msgid ""
"their life and interests. "
msgstr ""
-#: actions/showgroup.php:491
+#: actions/showgroup.php:492
msgid "Admins"
msgstr ""
@@ -3671,7 +3680,7 @@ msgid "Unknown language \"%s\"."
msgstr ""
#: actions/siteadminpanel.php:165
-msgid "Minimum text limit is 140 characters."
+msgid "Minimum text limit is 0 (unlimited)."
msgstr ""
#: actions/siteadminpanel.php:171
@@ -3944,8 +3953,7 @@ msgstr "線上即時通設定"
msgid "You are not subscribed to that profile."
msgstr ""
-#: actions/subedit.php:83 classes/Subscription.php:89
-#: classes/Subscription.php:116
+#: actions/subedit.php:83 classes/Subscription.php:132
#, fuzzy
msgid "Could not save subscription."
msgstr "註冊失敗"
@@ -4039,12 +4047,12 @@ msgstr ""
msgid "%s is not listening to anyone."
msgstr "現在%1$s在%2$s成為你的粉絲囉"
-#: actions/subscriptions.php:199
+#: actions/subscriptions.php:208
#, fuzzy
msgid "Jabber"
msgstr "查無此Jabber ID"
-#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:222 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr ""
@@ -4078,13 +4086,13 @@ msgstr "無此文件"
msgid "Tag %s"
msgstr ""
-#: actions/tagother.php:77 lib/userprofile.php:75
+#: actions/tagother.php:77 lib/userprofile.php:76
#, fuzzy
msgid "User profile"
msgstr "無此通知"
#: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:102
+#: lib/userprofile.php:103
msgid "Photo"
msgstr ""
@@ -4396,7 +4404,7 @@ msgstr ""
msgid "Plugins"
msgstr ""
-#: actions/version.php:196 lib/action.php:767
+#: actions/version.php:196 lib/action.php:766
#, fuzzy
msgid "Version"
msgstr "地點"
@@ -4405,19 +4413,19 @@ msgstr "地點"
msgid "Author(s)"
msgstr ""
-#: classes/File.php:144
+#: classes/File.php:169
#, 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:154
+#: classes/File.php:179
#, php-format
msgid "A file this large would exceed your user quota of %d bytes."
msgstr ""
-#: classes/File.php:161
+#: classes/File.php:186
#, php-format
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
@@ -4459,102 +4467,102 @@ msgstr ""
msgid "Could not update message with new URI."
msgstr ""
-#: classes/Notice.php:172
+#: classes/Notice.php:175
#, php-format
msgid "DB error inserting hashtag: %s"
msgstr ""
-#: classes/Notice.php:241
+#: classes/Notice.php:244
#, fuzzy
msgid "Problem saving notice. Too long."
msgstr "儲存使用者發生錯誤"
-#: classes/Notice.php:245
+#: classes/Notice.php:248
#, fuzzy
msgid "Problem saving notice. Unknown user."
msgstr "儲存使用者發生錯誤"
-#: classes/Notice.php:250
+#: classes/Notice.php:253
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
-#: classes/Notice.php:256
+#: classes/Notice.php:259
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
msgstr ""
-#: classes/Notice.php:262
+#: classes/Notice.php:265
msgid "You are banned from posting notices on this site."
msgstr ""
-#: classes/Notice.php:328 classes/Notice.php:354
+#: classes/Notice.php:331 classes/Notice.php:357
msgid "Problem saving notice."
msgstr ""
-#: classes/Notice.php:927
+#: classes/Notice.php:943
#, fuzzy
msgid "Problem saving group inbox."
msgstr "儲存使用者發生錯誤"
-#: classes/Notice.php:1459
+#: classes/Notice.php:1481
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
-#: classes/Subscription.php:66 lib/oauthstore.php:465
+#: classes/Subscription.php:74 lib/oauthstore.php:465
msgid "You have been banned from subscribing."
msgstr ""
-#: classes/Subscription.php:70
+#: classes/Subscription.php:78
msgid "Already subscribed!"
msgstr ""
-#: classes/Subscription.php:74
+#: classes/Subscription.php:82
msgid "User has blocked you."
msgstr ""
-#: classes/Subscription.php:157
+#: classes/Subscription.php:167
#, fuzzy
msgid "Not subscribed!"
msgstr "此帳號已註冊"
-#: classes/Subscription.php:163
+#: classes/Subscription.php:173
#, fuzzy
msgid "Couldn't delete self-subscription."
msgstr "無法刪除帳號"
-#: classes/Subscription.php:190
+#: classes/Subscription.php:200
#, fuzzy
msgid "Couldn't delete subscription OMB token."
msgstr "無法刪除帳號"
-#: classes/Subscription.php:201 lib/subs.php:69
+#: classes/Subscription.php:211
msgid "Couldn't delete subscription."
msgstr "無法刪除帳號"
-#: classes/User.php:373
+#: classes/User.php:363
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr ""
-#: classes/User_group.php:477
+#: classes/User_group.php:480
#, fuzzy
msgid "Could not create group."
msgstr "無法存取個人圖像資料"
-#: classes/User_group.php:486
+#: classes/User_group.php:489
#, fuzzy
msgid "Could not set group URI."
msgstr "註冊失敗"
-#: classes/User_group.php:507
+#: classes/User_group.php:510
#, fuzzy
msgid "Could not set group membership."
msgstr "註冊失敗"
-#: classes/User_group.php:521
+#: classes/User_group.php:524
#, fuzzy
msgid "Could not save local group info."
msgstr "註冊失敗"
@@ -4598,183 +4606,183 @@ msgstr "%1$s的狀態是%2$s"
msgid "Untitled page"
msgstr ""
-#: lib/action.php:424
+#: lib/action.php:423
msgid "Primary site navigation"
msgstr ""
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:430
+#: lib/action.php:429
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr ""
-#: lib/action.php:433
+#: lib/action.php:432
#, fuzzy
msgctxt "MENU"
msgid "Personal"
msgstr "地點"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:435
+#: lib/action.php:434
#, fuzzy
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "更改密碼"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:440
+#: lib/action.php:439
#, fuzzy
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "無法連結到伺服器:%s"
-#: lib/action.php:443
+#: lib/action.php:442
msgid "Connect"
msgstr "連結"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:446
+#: lib/action.php:445
#, fuzzy
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "確認信箱"
-#: lib/action.php:449
+#: lib/action.php:448
msgctxt "MENU"
msgid "Admin"
msgstr ""
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:453
+#: lib/action.php:452
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr ""
-#: lib/action.php:456
+#: lib/action.php:455
#, fuzzy
msgctxt "MENU"
msgid "Invite"
msgstr "尺寸錯誤"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:462
+#: lib/action.php:461
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr ""
-#: lib/action.php:465
+#: lib/action.php:464
#, fuzzy
msgctxt "MENU"
msgid "Logout"
msgstr "登出"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:470
+#: lib/action.php:469
#, fuzzy
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "新增帳號"
-#: lib/action.php:473
+#: lib/action.php:472
#, fuzzy
msgctxt "MENU"
msgid "Register"
msgstr "所有訂閱"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:476
+#: lib/action.php:475
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr ""
-#: lib/action.php:479
+#: lib/action.php:478
#, fuzzy
msgctxt "MENU"
msgid "Login"
msgstr "登入"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:482
+#: lib/action.php:481
#, fuzzy
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "求救"
-#: lib/action.php:485
+#: lib/action.php:484
#, fuzzy
msgctxt "MENU"
msgid "Help"
msgstr "求救"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:488
+#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr ""
-#: lib/action.php:491
+#: lib/action.php:490
msgctxt "MENU"
msgid "Search"
msgstr ""
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:513 lib/adminpanelaction.php:398
+#: lib/action.php:512 lib/adminpanelaction.php:398
#, fuzzy
msgid "Site notice"
msgstr "新訊息"
-#: lib/action.php:579
+#: lib/action.php:578
msgid "Local views"
msgstr ""
-#: lib/action.php:645
+#: lib/action.php:644
#, fuzzy
msgid "Page notice"
msgstr "新訊息"
-#: lib/action.php:747
+#: lib/action.php:746
msgid "Secondary site navigation"
msgstr ""
-#: lib/action.php:752
+#: lib/action.php:751
msgid "Help"
msgstr "求救"
-#: lib/action.php:754
+#: lib/action.php:753
msgid "About"
msgstr "關於"
-#: lib/action.php:756
+#: lib/action.php:755
msgid "FAQ"
msgstr "常見問題"
-#: lib/action.php:760
+#: lib/action.php:759
msgid "TOS"
msgstr ""
-#: lib/action.php:763
+#: lib/action.php:762
msgid "Privacy"
msgstr ""
-#: lib/action.php:765
+#: lib/action.php:764
msgid "Source"
msgstr ""
-#: lib/action.php:769
+#: lib/action.php:768
msgid "Contact"
msgstr "好友名單"
-#: lib/action.php:771
+#: lib/action.php:770
msgid "Badge"
msgstr ""
-#: lib/action.php:799
+#: lib/action.php:798
msgid "StatusNet software license"
msgstr ""
-#: lib/action.php:802
+#: lib/action.php:803
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4783,12 +4791,12 @@ msgstr ""
"**%%site.name%%**是由[%%site.broughtby%%](%%site.broughtbyurl%%)所提供的微型"
"部落格服務"
-#: lib/action.php:804
+#: lib/action.php:805
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%**是個微型部落格"
-#: lib/action.php:806
+#: lib/action.php:808
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4796,55 +4804,59 @@ msgid ""
"org/licensing/licenses/agpl-3.0.html)."
msgstr ""
-#: lib/action.php:821
+#: lib/action.php:823
#, fuzzy
msgid "Site content license"
msgstr "新訊息"
-#: lib/action.php:826
+#: lib/action.php:828
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
-#: lib/action.php:831
+#: lib/action.php:833
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
-#: lib/action.php:834
+#: lib/action.php:836
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
-#: lib/action.php:847
+#: lib/action.php:849
msgid "All "
msgstr ""
-#: lib/action.php:853
+#: lib/action.php:855
msgid "license."
msgstr ""
-#: lib/action.php:1152
+#: lib/action.php:1154
msgid "Pagination"
msgstr ""
-#: lib/action.php:1161
+#: lib/action.php:1163
msgid "After"
msgstr ""
-#: lib/action.php:1169
+#: lib/action.php:1171
#, fuzzy
msgid "Before"
msgstr "之前的內容»"
-#: lib/activity.php:453
+#: lib/activity.php:120
+msgid "Expecting a root feed element but got a whole XML document."
+msgstr ""
+
+#: lib/activityutils.php:208
msgid "Can't handle remote content yet."
msgstr ""
-#: lib/activity.php:481
+#: lib/activityutils.php:236
msgid "Can't handle embedded XML content yet."
msgstr ""
-#: lib/activity.php:485
+#: lib/activityutils.php:240
msgid "Can't handle embedded Base64 content yet."
msgstr ""
@@ -4944,7 +4956,7 @@ msgstr "確認信箱"
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
-#: lib/apiauth.php:272
+#: lib/apiauth.php:276
#, php-format
msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s"
msgstr ""
@@ -5019,11 +5031,11 @@ msgstr ""
msgid "Attachments"
msgstr ""
-#: lib/attachmentlist.php:265
+#: lib/attachmentlist.php:263
msgid "Author"
msgstr ""
-#: lib/attachmentlist.php:278
+#: lib/attachmentlist.php:276
msgid "Provider"
msgstr ""
@@ -5043,37 +5055,51 @@ msgstr ""
msgid "Password changing is not allowed"
msgstr ""
-#: lib/channel.php:138 lib/channel.php:158
+#: lib/channel.php:157 lib/channel.php:177
msgid "Command results"
msgstr ""
-#: lib/channel.php:210 lib/mailhandler.php:142
+#: lib/channel.php:229 lib/mailhandler.php:142
msgid "Command complete"
msgstr ""
-#: lib/channel.php:221
+#: lib/channel.php:240
msgid "Command failed"
msgstr ""
-#: lib/command.php:44
-msgid "Sorry, this command is not yet implemented."
+#: lib/command.php:83 lib/command.php:105
+msgid "Notice with that id does not exist"
msgstr ""
-#: lib/command.php:88
+#: lib/command.php:99 lib/command.php:570
+#, fuzzy
+msgid "User has no last notice"
+msgstr "新訊息"
+
+#: lib/command.php:125
#, php-format
msgid "Could not find a user with nickname %s"
msgstr "無法更新使用者"
-#: lib/command.php:92
+#: lib/command.php:143
+#, fuzzy, php-format
+msgid "Could not find a local user with nickname %s"
+msgstr "無法更新使用者"
+
+#: lib/command.php:176
+msgid "Sorry, this command is not yet implemented."
+msgstr ""
+
+#: lib/command.php:221
msgid "It does not make a lot of sense to nudge yourself!"
msgstr ""
-#: lib/command.php:99
+#: lib/command.php:228
#, php-format
msgid "Nudge sent to %s"
msgstr ""
-#: lib/command.php:126
+#: lib/command.php:254
#, php-format
msgid ""
"Subscriptions: %1$s\n"
@@ -5081,201 +5107,197 @@ msgid ""
"Notices: %3$s"
msgstr ""
-#: lib/command.php:152 lib/command.php:390 lib/command.php:451
-msgid "Notice with that id does not exist"
-msgstr ""
-
-#: lib/command.php:168 lib/command.php:406 lib/command.php:467
-#: lib/command.php:523
-#, fuzzy
-msgid "User has no last notice"
-msgstr "新訊息"
-
-#: lib/command.php:190
+#: lib/command.php:296
msgid "Notice marked as fave."
msgstr ""
-#: lib/command.php:217
+#: lib/command.php:317
#, fuzzy
msgid "You are already a member of that group"
msgstr "無法連結到伺服器:%s"
-#: lib/command.php:231
+#: lib/command.php:331
#, fuzzy, php-format
msgid "Could not join user %s to group %s"
msgstr "無法連結到伺服器:%s"
-#: lib/command.php:236
+#: lib/command.php:336
#, fuzzy, php-format
msgid "%s joined group %s"
msgstr "%1$s的狀態是%2$s"
-#: lib/command.php:275
+#: lib/command.php:373
#, fuzzy, php-format
msgid "Could not remove user %s to group %s"
msgstr "無法從 %s 建立OpenID"
-#: lib/command.php:280
+#: lib/command.php:378
#, fuzzy, php-format
msgid "%s left group %s"
msgstr "%1$s的狀態是%2$s"
-#: lib/command.php:309
+#: lib/command.php:401
#, fuzzy, php-format
msgid "Fullname: %s"
msgstr "全名"
-#: lib/command.php:312 lib/mail.php:258
+#: lib/command.php:404 lib/mail.php:258
#, php-format
msgid "Location: %s"
msgstr ""
-#: lib/command.php:315 lib/mail.php:260
+#: lib/command.php:407 lib/mail.php:260
#, php-format
msgid "Homepage: %s"
msgstr ""
-#: lib/command.php:318
+#: lib/command.php:410
#, php-format
msgid "About: %s"
msgstr ""
-#: lib/command.php:349
+#: lib/command.php:437
+#, php-format
+msgid ""
+"%s is a remote profile; you can only send direct messages to users on the "
+"same server."
+msgstr ""
+
+#: lib/command.php:450
#, php-format
msgid "Message too long - maximum is %d characters, you sent %d"
msgstr ""
-#: lib/command.php:367
+#: lib/command.php:468
#, php-format
msgid "Direct message to %s sent"
msgstr ""
-#: lib/command.php:369
+#: lib/command.php:470
msgid "Error sending direct message."
msgstr ""
-#: lib/command.php:413
+#: lib/command.php:490
#, fuzzy
msgid "Cannot repeat your own notice"
msgstr "儲存使用者發生錯誤"
-#: lib/command.php:418
+#: lib/command.php:495
#, fuzzy
msgid "Already repeated that notice"
msgstr "無此使用者"
-#: lib/command.php:426
+#: lib/command.php:503
#, fuzzy, php-format
msgid "Notice from %s repeated"
msgstr "更新個人圖像"
-#: lib/command.php:428
+#: lib/command.php:505
#, fuzzy
msgid "Error repeating notice."
msgstr "儲存使用者發生錯誤"
-#: lib/command.php:482
+#: lib/command.php:536
#, php-format
msgid "Notice too long - maximum is %d characters, you sent %d"
msgstr ""
-#: lib/command.php:491
+#: lib/command.php:545
#, fuzzy, php-format
msgid "Reply to %s sent"
msgstr "&s的微型部落格"
-#: lib/command.php:493
+#: lib/command.php:547
msgid "Error saving notice."
msgstr "儲存使用者發生錯誤"
-#: lib/command.php:547
+#: lib/command.php:594
msgid "Specify the name of the user to subscribe to"
msgstr ""
-#: lib/command.php:554 lib/command.php:589
-#, fuzzy
-msgid "No such user"
-msgstr "無此使用者"
+#: lib/command.php:602
+msgid "Can't subscribe to OMB profiles by command."
+msgstr ""
-#: lib/command.php:561
+#: lib/command.php:608
#, php-format
msgid "Subscribed to %s"
msgstr ""
-#: lib/command.php:582 lib/command.php:685
+#: lib/command.php:629 lib/command.php:728
msgid "Specify the name of the user to unsubscribe from"
msgstr ""
-#: lib/command.php:595
+#: lib/command.php:638
#, php-format
msgid "Unsubscribed from %s"
msgstr ""
-#: lib/command.php:613 lib/command.php:636
+#: lib/command.php:656 lib/command.php:679
msgid "Command not yet implemented."
msgstr ""
-#: lib/command.php:616
+#: lib/command.php:659
msgid "Notification off."
msgstr ""
-#: lib/command.php:618
+#: lib/command.php:661
msgid "Can't turn off notification."
msgstr ""
-#: lib/command.php:639
+#: lib/command.php:682
msgid "Notification on."
msgstr ""
-#: lib/command.php:641
+#: lib/command.php:684
msgid "Can't turn on notification."
msgstr ""
-#: lib/command.php:654
+#: lib/command.php:697
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:665
+#: lib/command.php:708
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:692
+#: lib/command.php:735
#, fuzzy, php-format
msgid "Unsubscribed %s"
msgstr "此帳號已註冊"
-#: lib/command.php:709
+#: lib/command.php:752
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "此帳號已註冊"
-#: lib/command.php:711
+#: lib/command.php:754
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "此帳號已註冊"
-#: lib/command.php:731
+#: lib/command.php:774
#, fuzzy
msgid "No one is subscribed to you."
msgstr "無此訂閱"
-#: lib/command.php:733
+#: lib/command.php:776
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "無此訂閱"
-#: lib/command.php:753
+#: lib/command.php:796
#, fuzzy
msgid "You are not a member of any groups."
msgstr "無法連結到伺服器:%s"
-#: lib/command.php:755
+#: lib/command.php:798
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "無法連結到伺服器:%s"
-#: lib/command.php:769
+#: lib/command.php:812
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5317,20 +5339,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:148
+#: lib/common.php:135
#, fuzzy
msgid "No configuration file found. "
msgstr "無確認碼"
-#: lib/common.php:149
+#: lib/common.php:136
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:151
+#: lib/common.php:138
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:152
+#: lib/common.php:139
msgid "Go to the installer."
msgstr ""
@@ -5510,25 +5532,25 @@ msgstr ""
msgid "This page is not available in a media type you accept"
msgstr ""
-#: lib/imagefile.php:75
+#: lib/imagefile.php:72
+msgid "Unsupported image file format."
+msgstr ""
+
+#: lib/imagefile.php:88
#, php-format
msgid "That file is too big. The maximum file size is %s."
msgstr ""
-#: lib/imagefile.php:80
+#: lib/imagefile.php:93
msgid "Partial upload."
msgstr ""
-#: lib/imagefile.php:88 lib/mediafile.php:170
+#: lib/imagefile.php:101 lib/mediafile.php:170
msgid "System error uploading file."
msgstr ""
-#: lib/imagefile.php:96
-msgid "Not an image or corrupt file."
-msgstr ""
-
#: lib/imagefile.php:109
-msgid "Unsupported image file format."
+msgid "Not an image or corrupt file."
msgstr ""
#: lib/imagefile.php:122
@@ -5536,24 +5558,24 @@ msgstr ""
msgid "Lost our file."
msgstr "無此通知"
-#: lib/imagefile.php:166 lib/imagefile.php:231
+#: lib/imagefile.php:163 lib/imagefile.php:224
msgid "Unknown file type"
msgstr ""
-#: lib/imagefile.php:251
+#: lib/imagefile.php:244
msgid "MB"
msgstr ""
-#: lib/imagefile.php:253
+#: lib/imagefile.php:246
msgid "kB"
msgstr ""
-#: lib/jabber.php:220
+#: lib/jabber.php:387
#, php-format
msgid "[%s]"
msgstr ""
-#: lib/jabber.php:400
+#: lib/jabber.php:567
#, php-format
msgid "Unknown inbox source %d."
msgstr ""
@@ -5758,7 +5780,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:482
+#: lib/mailbox.php:227 lib/noticelist.php:486
msgid "from"
msgstr ""
@@ -5888,50 +5910,50 @@ msgid ""
"try again later"
msgstr ""
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr ""
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "N"
msgstr ""
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "S"
msgstr ""
-#: lib/noticelist.php:431
+#: lib/noticelist.php:432
msgid "E"
msgstr ""
-#: lib/noticelist.php:431
+#: lib/noticelist.php:432
msgid "W"
msgstr ""
-#: lib/noticelist.php:438
+#: lib/noticelist.php:439
msgid "at"
msgstr ""
-#: lib/noticelist.php:566
+#: lib/noticelist.php:570
#, fuzzy
msgid "in context"
msgstr "無內容"
-#: lib/noticelist.php:601
+#: lib/noticelist.php:605
#, fuzzy
msgid "Repeated by"
msgstr "新增"
-#: lib/noticelist.php:628
+#: lib/noticelist.php:632
msgid "Reply to this notice"
msgstr ""
-#: lib/noticelist.php:629
+#: lib/noticelist.php:633
msgid "Reply"
msgstr ""
-#: lib/noticelist.php:673
+#: lib/noticelist.php:677
#, fuzzy
msgid "Notice repeated"
msgstr "更新個人圖像"
@@ -6006,7 +6028,7 @@ msgstr ""
msgid "Unknown"
msgstr ""
-#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr ""
@@ -6014,7 +6036,7 @@ msgstr ""
msgid "All subscriptions"
msgstr "所有訂閱"
-#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90
+#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr ""
@@ -6023,15 +6045,20 @@ msgstr ""
msgid "All subscribers"
msgstr "所有訂閱"
-#: lib/profileaction.php:180
+#: lib/profileaction.php:186
msgid "User ID"
msgstr ""
-#: lib/profileaction.php:185
+#: lib/profileaction.php:191
msgid "Member since"
msgstr "何時加入會員的呢?"
-#: lib/profileaction.php:247
+#. TRANS: Average count of posts made per day since account registration
+#: lib/profileaction.php:230
+msgid "Daily average"
+msgstr ""
+
+#: lib/profileaction.php:259
msgid "All groups"
msgstr ""
@@ -6079,7 +6106,7 @@ msgstr "無此通知"
msgid "Revoke the \"%s\" role from this user"
msgstr "無此使用者"
-#: lib/router.php:671
+#: lib/router.php:704
msgid "No single user defined for single-user mode."
msgstr ""
@@ -6210,92 +6237,101 @@ msgstr ""
msgid "Unsubscribe"
msgstr ""
-#: lib/userprofile.php:116
+#: lib/usernoprofileexception.php:58
+#, php-format
+msgid "User %s (%d) has no profile record."
+msgstr ""
+
+#: lib/userprofile.php:117
#, fuzzy
msgid "Edit Avatar"
msgstr "個人圖像"
-#: lib/userprofile.php:236
+#: lib/userprofile.php:234 lib/userprofile.php:248
msgid "User actions"
msgstr ""
-#: lib/userprofile.php:251
+#: lib/userprofile.php:237
+msgid "User deletion in progress..."
+msgstr ""
+
+#: lib/userprofile.php:263
#, fuzzy
msgid "Edit profile settings"
msgstr "線上即時通設定"
-#: lib/userprofile.php:252
+#: lib/userprofile.php:264
msgid "Edit"
msgstr ""
-#: lib/userprofile.php:275
+#: lib/userprofile.php:287
msgid "Send a direct message to this user"
msgstr ""
-#: lib/userprofile.php:276
+#: lib/userprofile.php:288
msgid "Message"
msgstr ""
-#: lib/userprofile.php:314
+#: lib/userprofile.php:326
msgid "Moderate"
msgstr ""
-#: lib/userprofile.php:352
+#: lib/userprofile.php:364
#, fuzzy
msgid "User role"
msgstr "無此通知"
-#: lib/userprofile.php:354
+#: lib/userprofile.php:366
msgctxt "role"
msgid "Administrator"
msgstr ""
-#: lib/userprofile.php:355
+#: lib/userprofile.php:367
msgctxt "role"
msgid "Moderator"
msgstr ""
-#: lib/util.php:1015
+#: lib/util.php:1046
msgid "a few seconds ago"
msgstr ""
-#: lib/util.php:1017
+#: lib/util.php:1048
msgid "about a minute ago"
msgstr ""
-#: lib/util.php:1019
+#: lib/util.php:1050
#, php-format
msgid "about %d minutes ago"
msgstr ""
-#: lib/util.php:1021
+#: lib/util.php:1052
msgid "about an hour ago"
msgstr ""
-#: lib/util.php:1023
+#: lib/util.php:1054
#, php-format
msgid "about %d hours ago"
msgstr ""
-#: lib/util.php:1025
+#: lib/util.php:1056
msgid "about a day ago"
msgstr ""
-#: lib/util.php:1027
+#: lib/util.php:1058
#, php-format
msgid "about %d days ago"
msgstr ""
-#: lib/util.php:1029
+#: lib/util.php:1060
msgid "about a month ago"
msgstr ""
-#: lib/util.php:1031
+#: lib/util.php:1062
#, php-format
msgid "about %d months ago"
msgstr ""
-#: lib/util.php:1033
+#: lib/util.php:1064
msgid "about a year ago"
msgstr ""
@@ -6309,7 +6345,7 @@ msgstr "個人首頁位址錯誤"
msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr ""
-#: lib/xmppmanager.php:402
+#: lib/xmppmanager.php:403
#, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d."
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/FirePHP/FirePHPPlugin.php b/plugins/FirePHP/FirePHPPlugin.php
index 452f79024..9143ff69c 100644
--- a/plugins/FirePHP/FirePHPPlugin.php
+++ b/plugins/FirePHP/FirePHPPlugin.php
@@ -52,8 +52,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/LdapAuthentication/LdapAuthenticationPlugin.php b/plugins/LdapAuthentication/LdapAuthenticationPlugin.php
index 483209676..2e01738ec 100644
--- a/plugins/LdapAuthentication/LdapAuthenticationPlugin.php
+++ b/plugins/LdapAuthentication/LdapAuthenticationPlugin.php
@@ -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,7 +92,7 @@ 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){
@@ -148,45 +113,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 +130,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..97103d158 100644
--- a/plugins/LdapAuthorization/LdapAuthorizationPlugin.php
+++ b/plugins/LdapAuthorization/LdapAuthorizationPlugin.php
@@ -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..ee436d824
--- /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 Craig Andrews http://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/
+ */
+
+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..6b91d17d6 100644
--- a/plugins/LdapAuthentication/MemcacheSchemaCache.php
+++ b/plugins/LdapCommon/MemcacheSchemaCache.php
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/OStatus/locale/fr/LC_MESSAGES/OStatus.po b/plugins/OStatus/locale/fr/LC_MESSAGES/OStatus.po
index f17dfa50a..0956d2f9b 100644
--- a/plugins/OStatus/locale/fr/LC_MESSAGES/OStatus.po
+++ b/plugins/OStatus/locale/fr/LC_MESSAGES/OStatus.po
@@ -104,3 +104,6 @@ msgstr ""
#: actions/feedsubsettings.php:231
msgid "Previewing feed:"
msgstr ""
+
+msgid "Confirm"
+msgstr "Confirmer"
diff --git a/plugins/RSSCloud/RSSCloudPlugin.php b/plugins/RSSCloud/RSSCloudPlugin.php
index 9f444c8bb..001106ace 100644
--- a/plugins/RSSCloud/RSSCloudPlugin.php
+++ b/plugins/RSSCloud/RSSCloudPlugin.php
@@ -105,7 +105,7 @@ class RSSCloudPlugin extends Plugin
* @return boolean hook return
*/
- function onRouterInitialized(&$m)
+ function onRouterInitialized($m)
{
$m->connect('/main/rsscloud/request_notify',
array('action' => 'RSSCloudRequestNotify'));
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/scripts/docgen.php b/scripts/docgen.php
new file mode 100755
index 000000000..78bbe37d8
--- /dev/null
+++ b/scripts/docgen.php
@@ -0,0 +1,84 @@
+#!/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__) . '/..'));
+require_once INSTALLDIR.'/scripts/commandline.inc';
+
+$pattern = "*.php *.inc";
+$exclude = 'config.php */extlib/* */local/* */plugins/* */scripts/*';
+
+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 (have_option('p', 'plugin')) {
+ $plugin = get_option_value('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;
+}
+
+$replacements = array(
+ '%%version%%' => STATUSNET_VERSION,
+ '%%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;
}
diff --git a/tests/JidValidateTest.php b/tests/JidValidateTest.php
new file mode 100644
index 000000000..9f5901139
--- /dev/null
+++ b/tests/JidValidateTest.php
@@ -0,0 +1,146 @@
+<?php
+
+if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
+ print "This script must be run from the command line\n";
+ exit();
+}
+
+define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+define('STATUSNET', true);
+define('LACONICA', true);
+
+mb_internal_encoding('UTF-8'); // @fixme this probably belongs in common.php?
+
+require_once INSTALLDIR . '/lib/common.php';
+require_once INSTALLDIR . '/lib/jabber.php';
+
+class JidValidateTest extends PHPUnit_Framework_TestCase
+{
+ /**
+ * @dataProvider validationCases
+ *
+ */
+ public function testValidate($jid, $validFull, $validBase)
+ {
+ $this->assertEquals($validFull, jabber_valid_full_jid($jid), "validating as full or base JID");
+
+ $this->assertEquals($validBase, jabber_valid_base_jid($jid), "validating as base JID only");
+ }
+
+ /**
+ * @dataProvider normalizationCases
+ *
+ */
+ public function testNormalize($jid, $expected)
+ {
+ $this->assertEquals($expected, jabber_normalize_jid($jid));
+ }
+
+ /**
+ * @dataProvider domainCheckCases()
+ */
+ public function testDomainCheck($domain, $expected, $note)
+ {
+ $this->assertEquals($expected, jabber_check_domain($domain), $note);
+ }
+
+ static public function validationCases()
+ {
+ $long1023 = "long1023" . str_repeat('x', 1023 - 8);
+ $long1024 = "long1024" . str_repeat('x', 1024 - 8);
+ return array(
+ // Our own test cases for standard things & those mentioned in bug reports
+ // (jid, valid_full, valid_base)
+ array('user@example.com', true, true),
+ array('user@example.com/resource', true, false),
+ array('user with spaces@example.com', false, false), // not kosher
+
+ array('user.@example.com', true, true), // "common in intranets"
+ array('example.com', true, true),
+ array('example.com/resource', true, false),
+ array('jabchat', true, true),
+
+ array("$long1023@$long1023/$long1023", true, false), // max 1023 "bytes" per portion per spec. Do they really mean bytes though?
+ array("$long1024@$long1023/$long1023", false, false),
+ array("$long1023@$long1024/$long1023", false, false),
+ array("$long1023@$long1023/$long1024", false, false),
+
+ // Borrowed from test_jabber_jutil.c in libpurple
+ array("gmail.com", true, true),
+ array("gmail.com/Test", true, false),
+ array("gmail.com/Test@", true, false),
+ array("gmail.com/@", true, false),
+ array("gmail.com/Test@alkjaweflkj", true, false),
+ array("mark.doliner@gmail.com", true, true),
+ array("mark.doliner@gmail.com/Test12345", true, false),
+ array("mark.doliner@gmail.com/Test@12345", true, false),
+ array("mark.doliner@gmail.com/Te/st@12@//345", true, false),
+ array("わいど@conference.jabber.org", true, true),
+ array("まりるーむ@conference.jabber.org", true, true),
+ array("mark.doliner@gmail.com/まりるーむ", true, false),
+ array("mark.doliner@gmail/stuff.org", true, false),
+ array("stuart@nödåtXäYZ.se", true, true),
+ array("stuart@nödåtXäYZ.se/まりるーむ", true, false),
+ array("mark.doliner@わいど.org", true, true),
+ array("nick@まつ.おおかみ.net", true, true),
+ array("paul@10.0.42.230/s", true, false),
+ array("paul@[::1]", true, true), /* IPv6 */
+ array("paul@[2001:470:1f05:d58::2]", true, true),
+ array("paul@[2001:470:1f05:d58::2]/foo", true, false),
+ array("pa=ul@10.0.42.230", true, true),
+ array("pa,ul@10.0.42.230", true, true),
+
+ array("@gmail.com", false, false),
+ array("@@gmail.com", false, false),
+ array("mark.doliner@@gmail.com/Test12345", false, false),
+ array("mark@doliner@gmail.com/Test12345", false, false),
+ array("@gmail.com/Test@12345", false, false),
+ array("/Test@12345", false, false),
+ array("mark.doliner@", false, false),
+ array("mark.doliner/", false, false),
+ array("mark.doliner@gmail_stuff.org", false, false),
+ array("mark.doliner@gmail[stuff.org", false, false),
+ array("mark.doliner@gmail\\stuff.org", false, false),
+ array("paul@[::1]124", false, false),
+ array("paul@2[::1]124/as", false, false),
+ array("paul@まつ.おおかみ/\x01", false, false),
+
+ /*
+ * RFC 3454 Section 6 reads, in part,
+ * "If a string contains any RandALCat character, the
+ * string MUST NOT contain any LCat character."
+ * The character is U+066D (ARABIC FIVE POINTED STAR).
+ */
+ // Leaving this one commented out for the moment
+ // as it shouldn't hurt anything for our purposes.
+ //array("foo@example.com/٭simplexe٭", false, false)
+ );
+ }
+
+ static public function normalizationCases()
+ {
+ return array(
+ // Borrowed from test_jabber_jutil.c in libpurple
+ array('PaUL@DaRkRain42.org', 'paul@darkrain42.org'),
+ array('PaUL@DaRkRain42.org/', 'paul@darkrain42.org'),
+ array('PaUL@DaRkRain42.org/resource', 'paul@darkrain42.org'),
+
+ // Also adapted from libpurple tests...
+ array('Ф@darkrain42.org', 'ф@darkrain42.org'),
+ array('paul@Өarkrain.org', 'paul@өarkrain.org'),
+ );
+ }
+
+ static public function domainCheckCases()
+ {
+ return array(
+ array('gmail.com', true, 'known SRV record'),
+ array('jabber.org', true, 'known SRV record'),
+ array('status.net', true, 'known SRV record'),
+ array('status.leuksman.com', true, 'known no SRV record but valid domain'),
+ );
+ }
+
+
+}
+