summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--EVENTS.txt12
-rw-r--r--README14
-rw-r--r--classes/Notice.php28
-rw-r--r--classes/Profile.php21
-rw-r--r--classes/Status_network.php11
-rw-r--r--classes/Status_network_tag.php66
-rw-r--r--doc-src/about4
-rw-r--r--doc-src/badge4
-rw-r--r--doc-src/bookmarklet4
-rw-r--r--doc-src/contact4
-rw-r--r--doc-src/faq4
-rw-r--r--doc-src/groups4
-rw-r--r--doc-src/help4
-rw-r--r--doc-src/im4
-rw-r--r--doc-src/openmublog4
-rw-r--r--doc-src/privacy4
-rw-r--r--doc-src/sms4
-rw-r--r--doc-src/source4
-rw-r--r--doc-src/tags4
-rw-r--r--doc-src/tos4
-rw-r--r--index.php10
-rw-r--r--js/geometa.js217
-rw-r--r--js/util.js266
-rw-r--r--js/xbImportNode.js47
-rw-r--r--lib/action.php84
-rw-r--r--lib/apiaction.php12
-rw-r--r--lib/language.php1
-rw-r--r--lib/theme.php62
-rw-r--r--lib/themeuploader.php53
-rw-r--r--lib/util.php3
-rw-r--r--locale/af/LC_MESSAGES/statusnet.po124
-rw-r--r--locale/ar/LC_MESSAGES/statusnet.po124
-rw-r--r--locale/arz/LC_MESSAGES/statusnet.po107
-rw-r--r--locale/bg/LC_MESSAGES/statusnet.po139
-rw-r--r--locale/br/LC_MESSAGES/statusnet.po149
-rw-r--r--locale/ca/LC_MESSAGES/statusnet.po222
-rw-r--r--locale/cs/LC_MESSAGES/statusnet.po126
-rw-r--r--locale/da/LC_MESSAGES/statusnet.po564
-rw-r--r--locale/de/LC_MESSAGES/statusnet.po258
-rw-r--r--locale/el/LC_MESSAGES/statusnet.po114
-rw-r--r--locale/en_GB/LC_MESSAGES/statusnet.po147
-rw-r--r--locale/eo/LC_MESSAGES/statusnet.po155
-rw-r--r--locale/es/LC_MESSAGES/statusnet.po168
-rw-r--r--locale/fa/LC_MESSAGES/statusnet.po159
-rw-r--r--locale/fi/LC_MESSAGES/statusnet.po125
-rw-r--r--locale/fr/LC_MESSAGES/statusnet.po260
-rw-r--r--locale/ga/LC_MESSAGES/statusnet.po124
-rw-r--r--locale/gl/LC_MESSAGES/statusnet.po257
-rw-r--r--locale/he/LC_MESSAGES/statusnet.po122
-rw-r--r--locale/hsb/LC_MESSAGES/statusnet.po180
-rw-r--r--locale/ia/LC_MESSAGES/statusnet.po259
-rw-r--r--locale/is/LC_MESSAGES/statusnet.po123
-rw-r--r--locale/it/LC_MESSAGES/statusnet.po211
-rw-r--r--locale/ja/LC_MESSAGES/statusnet.po143
-rw-r--r--locale/ka/LC_MESSAGES/statusnet.po5223
-rw-r--r--locale/ko/LC_MESSAGES/statusnet.po205
-rw-r--r--locale/mk/LC_MESSAGES/statusnet.po280
-rw-r--r--locale/nb/LC_MESSAGES/statusnet.po174
-rw-r--r--locale/nl/LC_MESSAGES/statusnet.po260
-rw-r--r--locale/nn/LC_MESSAGES/statusnet.po125
-rw-r--r--locale/pl/LC_MESSAGES/statusnet.po256
-rw-r--r--locale/pt/LC_MESSAGES/statusnet.po213
-rw-r--r--locale/pt_BR/LC_MESSAGES/statusnet.po261
-rw-r--r--locale/ru/LC_MESSAGES/statusnet.po257
-rw-r--r--locale/statusnet.pot140
-rw-r--r--locale/sv/LC_MESSAGES/statusnet.po165
-rw-r--r--locale/te/LC_MESSAGES/statusnet.po163
-rw-r--r--locale/tr/LC_MESSAGES/statusnet.po122
-rw-r--r--locale/uk/LC_MESSAGES/statusnet.po256
-rw-r--r--locale/vi/LC_MESSAGES/statusnet.po102
-rw-r--r--locale/zh_CN/LC_MESSAGES/statusnet.po287
-rw-r--r--locale/zh_TW/LC_MESSAGES/statusnet.po120
-rw-r--r--plugins/DisqusPlugin.php2
-rw-r--r--plugins/MobileProfile/MobileProfilePlugin.php2
-rw-r--r--plugins/NoticeTitle/NoticeTitlePlugin.php49
-rw-r--r--plugins/OStatus/OStatusPlugin.php59
-rw-r--r--plugins/OStatus/actions/ostatusgroup.php2
-rw-r--r--plugins/OStatus/actions/ostatusinit.php14
-rw-r--r--plugins/OStatus/actions/ostatussub.php14
-rw-r--r--plugins/OStatus/actions/ownerxrd.php4
-rw-r--r--plugins/OStatus/actions/pushcallback.php15
-rw-r--r--plugins/OStatus/actions/pushhub.php11
-rw-r--r--plugins/OStatus/actions/usersalmon.php6
-rw-r--r--plugins/OStatus/actions/userxrd.php2
-rw-r--r--plugins/OStatus/classes/FeedSub.php5
-rw-r--r--plugins/OStatus/classes/HubSub.php6
-rw-r--r--plugins/OStatus/classes/Magicsig.php26
-rw-r--r--plugins/OStatus/classes/Ostatus_profile.php83
-rw-r--r--plugins/OStatus/lib/discovery.php5
-rw-r--r--plugins/OStatus/lib/hubconfqueuehandler.php1
-rw-r--r--plugins/OStatus/lib/magicenvelope.php23
-rw-r--r--plugins/OStatus/lib/ostatusqueuehandler.php14
-rw-r--r--plugins/OStatus/lib/salmon.php11
-rw-r--r--plugins/OStatus/lib/salmonaction.php2
-rw-r--r--plugins/OStatus/lib/salmonqueuehandler.php2
-rw-r--r--plugins/OStatus/lib/xrd.php23
-rw-r--r--plugins/OStatus/lib/xrdaction.php5
-rw-r--r--plugins/OStatus/scripts/fixup-shadow.php3
-rw-r--r--plugins/OStatus/scripts/testfeed.php1
-rw-r--r--plugins/OStatus/scripts/updateostatus.php6
-rw-r--r--plugins/OStatus/tests/FeedDiscoveryTest.php2
-rw-r--r--plugins/OStatus/tests/remote-tests.php3
-rw-r--r--plugins/TwitterBridge/Notice_to_status.php180
-rw-r--r--plugins/TwitterBridge/TwitterBridgePlugin.php217
-rw-r--r--plugins/TwitterBridge/Twitter_synch_status.php202
-rwxr-xr-xplugins/TwitterBridge/daemons/synctwitterfriends.php5
-rwxr-xr-xplugins/TwitterBridge/daemons/twitterstatusfetcher.php240
-rw-r--r--plugins/TwitterBridge/twitter.php112
-rw-r--r--plugins/TwitterBridge/twitterbasicauthclient.php229
-rw-r--r--plugins/TwitterBridge/twitteroauthclient.php141
-rw-r--r--theme/README8
-rw-r--r--theme/base/css/display.css2
-rw-r--r--theme/base/css/ie.css7
-rw-r--r--theme/base/css/ie6.css7
-rw-r--r--theme/base/css/jquery.Jcrop.css7
-rw-r--r--theme/base/css/uap.css2
-rw-r--r--theme/biz/css/base.css2
-rw-r--r--theme/biz/css/display.css2
-rw-r--r--theme/biz/css/ie.css7
-rw-r--r--theme/cloudy/css/display.css2
-rw-r--r--theme/cloudy/css/ie.css7
-rw-r--r--theme/default/css/display.css2
-rw-r--r--theme/default/css/ie.css7
-rw-r--r--theme/h4ck3r/css/base.css2
-rw-r--r--theme/h4ck3r/css/display.css2
-rw-r--r--theme/h4ck3r/css/ie.css7
-rw-r--r--theme/identica/css/display.css2
-rw-r--r--theme/identica/css/ie.css7
-rw-r--r--theme/pigeonthoughts/css/base.css2
-rw-r--r--theme/pigeonthoughts/css/display.css2
-rw-r--r--theme/pigeonthoughts/css/ie.css7
131 files changed, 12099 insertions, 3653 deletions
diff --git a/EVENTS.txt b/EVENTS.txt
index 1a3b2594a..65e2c3ce0 100644
--- a/EVENTS.txt
+++ b/EVENTS.txt
@@ -1066,3 +1066,15 @@ EndRssEntryArray: at the end of copying a notice to an array
NoticeDeleteRelated: at the beginning of deleting related fields to a notice
- $notice: notice being deleted
+
+StartShowHeadTitle: when beginning to show the <title> element
+- $action: action being shown
+
+EndShowHeadTitle: when done showing the <title>
+- $action: action being shown
+
+StartShowPageTitle: when beginning to show the page title <h1>
+- $action: action being shown
+
+EndShowPageTitle: when done showing the page title <h1>
+- $action: action being shown \ No newline at end of file
diff --git a/README b/README
index e5cb2c933..593a5c0b3 100644
--- a/README
+++ b/README
@@ -72,6 +72,20 @@ License along with this program, in the file "COPYING". If not, see
of using the software, and if you do not wish to share your
modifications, *YOU MAY NOT INSTALL STATUSNET*.
+Documentation in the /doc-src/ directory is available under the
+Creative Commons Attribution 3.0 Unported license, with attribution to
+"StatusNet". See http://creativecommons.org/licenses/by/3.0/ for details.
+
+CSS and images in the /theme/ directory are available under the
+Creative Commons Attribution 3.0 Unported license, with attribution to
+"StatusNet". See http://creativecommons.org/licenses/by/3.0/ for details.
+
+Our understanding and intention is that if you add your own theme that
+uses only CSS and images, those files are not subject to the copyleft
+requirements of the Affero General Public License 3.0. See
+http://wordpress.org/news/2009/07/themes-are-gpl-too/ . This is not
+legal advice; consult your lawyer.
+
Additional library software has been made available in the 'extlib'
directory. All of it is Free Software and can be distributed under
liberal terms, but those terms may differ in detail from the AGPL's
diff --git a/classes/Notice.php b/classes/Notice.php
index 5a70f70b6..14477b1b5 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -1019,25 +1019,31 @@ class Notice extends Memcached_DataObject
if (empty($uris)) {
return;
}
+
$sender = Profile::staticGet($this->profile_id);
foreach (array_unique($uris) as $uri) {
- $user = User::staticGet('uri', $uri);
+ $profile = Profile::fromURI($uri);
- if (!empty($user)) {
- if ($user->hasBlocked($sender)) {
- continue;
- }
+ if (empty($profile)) {
+ common_log(LOG_WARNING, "Unable to determine profile for URI '$uri'");
+ continue;
+ }
- $reply = new Reply();
+ if ($profile->hasBlocked($sender)) {
+ common_log(LOG_INFO, "Not saving reply to profile {$profile->id} ($uri) from sender {$sender->id} because of a block.");
+ continue;
+ }
- $reply->notice_id = $this->id;
- $reply->profile_id = $user->id;
- common_log(LOG_INFO, __METHOD__ . ": saving reply: notice $this->id to profile $user->id");
+ $reply = new Reply();
- $id = $reply->insert();
- }
+ $reply->notice_id = $this->id;
+ $reply->profile_id = $profile->id;
+
+ common_log(LOG_INFO, __METHOD__ . ": saving reply: notice $this->id to profile $profile->id");
+
+ $id = $reply->insert();
}
return;
diff --git a/classes/Profile.php b/classes/Profile.php
index d7617f0b7..8f8679550 100644
--- a/classes/Profile.php
+++ b/classes/Profile.php
@@ -960,4 +960,25 @@ class Profile extends Memcached_DataObject
return $feed;
}
+
+ static function fromURI($uri)
+ {
+ $profile = null;
+
+ if (Event::handle('StartGetProfileFromURI', array($uri, &$profile))) {
+ // Get a local user or remote (OMB 0.1) profile
+ $user = User::staticGet('uri', $uri);
+ if (!empty($user)) {
+ $profile = $user->getProfile();
+ } else {
+ $remote_profile = Remote_profile::staticGet('uri', $uri);
+ if (!empty($remote_profile)) {
+ $profile = Profile::staticGet('id', $remote_profile->profile_id);
+ }
+ }
+ Event::handle('EndGetProfileFromURI', array($uri, $profile));
+ }
+
+ return $profile;
+ }
}
diff --git a/classes/Status_network.php b/classes/Status_network.php
index 5680c1458..c4f37ce1c 100644
--- a/classes/Status_network.php
+++ b/classes/Status_network.php
@@ -308,15 +308,7 @@ class Status_network extends Safe_DataObject
*/
function getTags()
{
- $result = array();
-
- $tags = new Status_network_tag();
- $tags->site_id = $this->site_id;
- if ($tags->find()) {
- while ($tags->fetch()) {
- $result[] = $tags->tag;
- }
- }
+ $result = Status_network_tag::getTags($this->site_id);
// XXX : for backwards compatibility
if (empty($result)) {
@@ -329,6 +321,7 @@ class Status_network extends Safe_DataObject
/**
* Save a given set of tags
* @param array tags
+ * @fixme only add/remove differentials
*/
function setTags($tags)
{
diff --git a/classes/Status_network_tag.php b/classes/Status_network_tag.php
index 18c508bc8..7dab23289 100644
--- a/classes/Status_network_tag.php
+++ b/classes/Status_network_tag.php
@@ -61,9 +61,73 @@ class Status_network_tag extends Safe_DataObject
###END_AUTOCODE
-
function pkeyGet($kv)
{
return Memcached_DataObject::pkeyGet('Status_network_tag', $kv);
}
+
+ /**
+ * Fetch the (possibly cached) tag entries for the given site id.
+ * Uses status_network's cache settings.
+ *
+ * @param string $site_id
+ * @return array of strings
+ */
+ static function getTags($site_id)
+ {
+ $key = 'status_network_tags:' . $site_id;
+ if (Status_network::$cache) {
+ $packed = Status_network::$cache->get($key);
+ if (is_string($packed)) {
+ if ($packed == '') {
+ return array();
+ } else {
+ return explode('|', $packed);
+ }
+ }
+ }
+
+ $result = array();
+
+ $tags = new Status_network_tag();
+ $tags->site_id = $site_id;
+ if ($tags->find()) {
+ while ($tags->fetch()) {
+ $result[] = $tags->tag;
+ }
+ }
+
+ if (Status_network::$cache) {
+ $packed = implode('|', $result);
+ Status_network::$cache->set($key, $packed, 3600);
+ }
+
+ return $result;
+ }
+
+ /**
+ * Drop the cached tag entries for this site.
+ * Needed after inserting/deleting a tag entry.
+ */
+ function decache()
+ {
+ $key = 'status_network_tags:' . $this->site_id;
+ if (Status_network::$cache) {
+ Status_network::$cache->delete($key);
+ }
+ }
+
+ function insert()
+ {
+ $ret = parent::insert();
+ $this->decache();
+ return $ret;
+ }
+
+ function delete()
+ {
+ $ret = parent::delete();
+ $this->decache();
+ return $ret;
+ }
}
diff --git a/doc-src/about b/doc-src/about
index 6a68e41cf..5645c2ceb 100644
--- a/doc-src/about
+++ b/doc-src/about
@@ -1,3 +1,7 @@
+<!-- Copyright 2008-2010 StatusNet Inc. and contributors. -->
+<!-- Document licensed under Creative Commons Attribution 3.0 Unported. See -->
+<!-- http://creativecommons.org/licenses/by/3.0/ for details. -->
+
%%site.name%% is a
[micro-blogging](http://en.wikipedia.org/wiki/Micro-blogging) service
based on the Free Software [StatusNet](http://status.net/) tool.
diff --git a/doc-src/badge b/doc-src/badge
index 5499e334c..98cdcfce2 100644
--- a/doc-src/badge
+++ b/doc-src/badge
@@ -1,3 +1,7 @@
+<!-- Copyright 2008-2010 StatusNet Inc. and contributors. -->
+<!-- Document licensed under Creative Commons Attribution 3.0 Unported. See -->
+<!-- http://creativecommons.org/licenses/by/3.0/ for details. -->
+
Install the %%site.name%% badge on your blog or web site to show the latest updates
from you and your friends!
diff --git a/doc-src/bookmarklet b/doc-src/bookmarklet
index ae359d2db..0b77bf45a 100644
--- a/doc-src/bookmarklet
+++ b/doc-src/bookmarklet
@@ -1,3 +1,7 @@
+<!-- Copyright 2008-2010 StatusNet Inc. and contributors. -->
+<!-- Document licensed under Creative Commons Attribution 3.0 Unported. See -->
+<!-- http://creativecommons.org/licenses/by/3.0/ for details. -->
+
A bookmarklet is a small piece of javascript code used as a bookmark. This one will let you post to %%site.name%% simply by selecting some text on a page and pressing the bookmarklet.
Drag-and-drop the following link to your bookmarks bar or right-click it and add it to your browser favorites to keep it handy.
diff --git a/doc-src/contact b/doc-src/contact
index c63fcd01a..75c3aa836 100644
--- a/doc-src/contact
+++ b/doc-src/contact
@@ -1,3 +1,7 @@
+<!-- Copyright 2008-2010 StatusNet Inc. and contributors. -->
+<!-- Document licensed under Creative Commons Attribution 3.0 Unported. See -->
+<!-- http://creativecommons.org/licenses/by/3.0/ for details. -->
+
There are a number of options for getting in contact with responsible
people for %%site.name%%.
diff --git a/doc-src/faq b/doc-src/faq
index 8e394806f..589b18b8d 100644
--- a/doc-src/faq
+++ b/doc-src/faq
@@ -1,3 +1,7 @@
+<!-- Copyright 2008-2010 StatusNet Inc. and contributors. -->
+<!-- Document licensed under Creative Commons Attribution 3.0 Unported. See -->
+<!-- http://creativecommons.org/licenses/by/3.0/ for details. -->
+
These are some *Frequently Asked Questions* about this service, with
some answers.
diff --git a/doc-src/groups b/doc-src/groups
index 772ca9833..5ff09600e 100644
--- a/doc-src/groups
+++ b/doc-src/groups
@@ -1,3 +1,7 @@
+<!-- Copyright 2008-2010 StatusNet Inc. and contributors. -->
+<!-- Document licensed under Creative Commons Attribution 3.0 Unported. See -->
+<!-- http://creativecommons.org/licenses/by/3.0/ for details. -->
+
Users on %%site.name%% can create *groups* that other users can join.
Groups can be a great way to share information and entertainment with
a group of people who have a common interest or background.
diff --git a/doc-src/help b/doc-src/help
index 37a8d11f7..024d47378 100644
--- a/doc-src/help
+++ b/doc-src/help
@@ -1,3 +1,7 @@
+<!-- Copyright 2008-2010 StatusNet Inc. and contributors. -->
+<!-- Document licensed under Creative Commons Attribution 3.0 Unported. See -->
+<!-- http://creativecommons.org/licenses/by/3.0/ for details. -->
+
%%site.name%% is a **microblogging service**. Users post short (%%site.textlimit%%
character) notices which are broadcast to their friends and fans using
the Web, RSS, or instant messages.
diff --git a/doc-src/im b/doc-src/im
index eda4f6fc5..896c12187 100644
--- a/doc-src/im
+++ b/doc-src/im
@@ -1,3 +1,7 @@
+<!-- Copyright 2008-2010 StatusNet Inc. and contributors. -->
+<!-- Document licensed under Creative Commons Attribution 3.0 Unported. See -->
+<!-- http://creativecommons.org/licenses/by/3.0/ for details. -->
+
You can post messages to %%site.name%% using a [Jabber](http://jabber.org/) client
on your computer, mobile phone, or other platform. ([GTalk](http://talk.google.com/),
Google's Jabber program, will also work.) This can be a convenient way to keep
diff --git a/doc-src/openmublog b/doc-src/openmublog
index aec532b79..267ad6e7c 100644
--- a/doc-src/openmublog
+++ b/doc-src/openmublog
@@ -1,3 +1,7 @@
+<!-- Copyright 2008-2010 StatusNet Inc. and contributors. -->
+<!-- Document licensed under Creative Commons Attribution 3.0 Unported. See -->
+<!-- http://creativecommons.org/licenses/by/3.0/ for details. -->
+
[OpenMicroBlogging](http://openmicroblogging.org/) is a protocol that
lets users of one [microblogging](http://en.wikipedia.org/wiki/microblogging) service
subscribe to notices by users of another service. The protocol, based on
diff --git a/doc-src/privacy b/doc-src/privacy
index 90c7b3c7f..d6e71c92d 100644
--- a/doc-src/privacy
+++ b/doc-src/privacy
@@ -1,3 +1,7 @@
+<!-- Copyright 2008-2010 StatusNet Inc. and contributors. -->
+<!-- Document licensed under Creative Commons Attribution 3.0 Unported. See -->
+<!-- http://creativecommons.org/licenses/by/3.0/ for details. -->
+
This document outlines this service's respect for your personal
privacy as a user of the service.
diff --git a/doc-src/sms b/doc-src/sms
index 6cdccc6e9..0e63da9e6 100644
--- a/doc-src/sms
+++ b/doc-src/sms
@@ -1,3 +1,7 @@
+<!-- Copyright 2008-2010 StatusNet Inc. and contributors. -->
+<!-- Document licensed under Creative Commons Attribution 3.0 Unported. See -->
+<!-- http://creativecommons.org/licenses/by/3.0/ for details. -->
+
You can post messages to %%site.name%% using many kinds of cell
phones that support SMS messaging. This site does not support SMS
directly; rather, it uses your carrier's email gateway to send and
diff --git a/doc-src/source b/doc-src/source
index 3ddd6203e..670071b22 100644
--- a/doc-src/source
+++ b/doc-src/source
@@ -1,3 +1,7 @@
+<!-- Copyright 2008-2010 StatusNet Inc. and contributors. -->
+<!-- Document licensed under Creative Commons Attribution 3.0 Unported. See -->
+<!-- http://creativecommons.org/licenses/by/3.0/ for details. -->
+
This service uses a Free microblogging tool called **StatusNet**.
StatusNet is available under the [GNU Affero General Public License
Version 3.0](http://www.fsf.org/licensing/licenses/agpl-3.0.html), a
diff --git a/doc-src/tags b/doc-src/tags
index 2ed352e70..091b147ad 100644
--- a/doc-src/tags
+++ b/doc-src/tags
@@ -1,3 +1,7 @@
+<!-- Copyright 2008-2010 StatusNet Inc. and contributors. -->
+<!-- Document licensed under Creative Commons Attribution 3.0 Unported. See -->
+<!-- http://creativecommons.org/licenses/by/3.0/ for details. -->
+
%%site.name%% supports
[tags](http://en.wikipedia.org/wiki/Tag_(metadata)) to help you
organize your activities here. You can use tags for people and for
diff --git a/doc-src/tos b/doc-src/tos
index bcfc31981..8d5bac57f 100644
--- a/doc-src/tos
+++ b/doc-src/tos
@@ -1,3 +1,7 @@
+<!-- Copyright 2008-2010 StatusNet Inc. and contributors. -->
+<!-- Document licensed under Creative Commons Attribution 3.0 Unported. See -->
+<!-- http://creativecommons.org/licenses/by/3.0/ for details. -->
+
The gist
--------
diff --git a/index.php b/index.php
index bf6cf7c00..9501e2275 100644
--- a/index.php
+++ b/index.php
@@ -210,12 +210,12 @@ function main()
if ($_lighty_url['path'] != '/index.php' && $_lighty_url['path'] != '/') {
$_lighty_path = preg_replace('/^'.preg_quote(common_config('site', 'path')).'\//', '', substr($_lighty_url['path'], 1));
$_SERVER['QUERY_STRING'] = 'p='.$_lighty_path;
- if ($_lighty_url['query']) {
+ if (isset($_lighty_url['query']) && $_lighty_url['query'] != '') {
$_SERVER['QUERY_STRING'] .= '&'.$_lighty_url['query'];
- }
- parse_str($_lighty_url['query'], $_lighty_query);
- foreach ($_lighty_query as $key => $val) {
- $_GET[$key] = $_REQUEST[$key] = $val;
+ parse_str($_lighty_url['query'], $_lighty_query);
+ foreach ($_lighty_query as $key => $val) {
+ $_GET[$key] = $_REQUEST[$key] = $val;
+ }
}
$_GET['p'] = $_REQUEST['p'] = $_lighty_path;
}
diff --git a/js/geometa.js b/js/geometa.js
deleted file mode 100644
index bba59b448..000000000
--- a/js/geometa.js
+++ /dev/null
@@ -1,217 +0,0 @@
-// A shim to implement the W3C Geolocation API Specification using Gears or the Ajax API
-if (typeof navigator.geolocation == "undefined" || navigator.geolocation.shim ) { (function(){
-
-// -- BEGIN GEARS_INIT
-(function() {
- // We are already defined. Hooray!
- if (window.google && google.gears) {
- return;
- }
-
- var factory = null;
-
- // Firefox
- if (typeof GearsFactory != 'undefined') {
- factory = new GearsFactory();
- } else {
- // IE
- try {
- factory = new ActiveXObject('Gears.Factory');
- // privateSetGlobalObject is only required and supported on WinCE.
- if (factory.getBuildInfo().indexOf('ie_mobile') != -1) {
- factory.privateSetGlobalObject(this);
- }
- } catch (e) {
- // Safari
- if ((typeof navigator.mimeTypes != 'undefined') && navigator.mimeTypes["application/x-googlegears"]) {
- factory = document.createElement("object");
- factory.style.display = "none";
- factory.width = 0;
- factory.height = 0;
- factory.type = "application/x-googlegears";
- document.documentElement.appendChild(factory);
- }
- }
- }
-
- // *Do not* define any objects if Gears is not installed. This mimics the
- // behavior of Gears defining the objects in the future.
- if (!factory) {
- return;
- }
-
- // Now set up the objects, being careful not to overwrite anything.
- //
- // Note: In Internet Explorer for Windows Mobile, you can't add properties to
- // the window object. However, global objects are automatically added as
- // properties of the window object in all browsers.
- if (!window.google) {
- google = {};
- }
-
- if (!google.gears) {
- google.gears = {factory: factory};
- }
-})();
-// -- END GEARS_INIT
-
-var GearsGeoLocation = (function() {
- // -- PRIVATE
- var geo = google.gears.factory.create('beta.geolocation');
-
- var wrapSuccess = function(callback, self) { // wrap it for lastPosition love
- return function(position) {
- callback(position);
- self.lastPosition = position;
- };
- };
-
- // -- PUBLIC
- return {
- shim: true,
-
- type: "Gears",
-
- lastPosition: null,
-
- getCurrentPosition: function(successCallback, errorCallback, options) {
- var self = this;
- var sc = wrapSuccess(successCallback, self);
- geo.getCurrentPosition(sc, errorCallback, options);
- },
-
- watchPosition: function(successCallback, errorCallback, options) {
- geo.watchPosition(successCallback, errorCallback, options);
- },
-
- clearWatch: function(watchId) {
- geo.clearWatch(watchId);
- },
-
- getPermission: function(siteName, imageUrl, extraMessage) {
- geo.getPermission(siteName, imageUrl, extraMessage);
- }
-
- };
-});
-
-var AjaxGeoLocation = (function() {
- // -- PRIVATE
- var loading = false;
- var loadGoogleLoader = function() {
- if (!hasGoogleLoader() && !loading) {
- loading = true;
- var s = document.createElement('script');
- s.src = (document.location.protocol == "https:"?"https://":"http://") + 'www.google.com/jsapi?callback=_google_loader_apiLoaded';
- s.type = "text/javascript";
- document.getElementsByTagName('body')[0].appendChild(s);
- }
- };
-
- var queue = [];
- var addLocationQueue = function(callback) {
- queue.push(callback);
- };
-
- var runLocationQueue = function() {
- if (hasGoogleLoader()) {
- while (queue.length > 0) {
- var call = queue.pop();
- call();
- }
- }
- };
-
- window['_google_loader_apiLoaded'] = function() {
- runLocationQueue();
- };
-
- var hasGoogleLoader = function() {
- return (window['google'] && google['loader']);
- };
-
- var checkGoogleLoader = function(callback) {
- if (hasGoogleLoader()) { return true; }
-
- addLocationQueue(callback);
-
- loadGoogleLoader();
-
- return false;
- };
-
- loadGoogleLoader(); // start to load as soon as possible just in case
-
- // -- PUBLIC
- return {
- shim: true,
-
- type: "ClientLocation",
-
- lastPosition: null,
-
- getCurrentPosition: function(successCallback, errorCallback, options) {
- var self = this;
- if (!checkGoogleLoader(function() {
- self.getCurrentPosition(successCallback, errorCallback, options);
- })) { return; }
-
- if (google.loader.ClientLocation) {
- var cl = google.loader.ClientLocation;
-
- var position = {
- coords: {
- latitude: cl.latitude,
- longitude: cl.longitude,
- altitude: null,
- accuracy: 43000, // same as Gears accuracy over wifi?
- altitudeAccuracy: null,
- heading: null,
- speed: null
- },
- // extra info that is outside of the bounds of the core API
- address: {
- city: cl.address.city,
- country: cl.address.country,
- country_code: cl.address.country_code,
- region: cl.address.region
- },
- timestamp: new Date()
- };
-
- successCallback(position);
-
- this.lastPosition = position;
- } else if (errorCallback === "function") {
- errorCallback({ code: 3, message: "Using the Google ClientLocation API and it is not able to calculate a location."});
- }
- },
-
- watchPosition: function(successCallback, errorCallback, options) {
- this.getCurrentPosition(successCallback, errorCallback, options);
-
- var self = this;
- var watchId = setInterval(function() {
- self.getCurrentPosition(successCallback, errorCallback, options);
- }, 10000);
-
- return watchId;
- },
-
- clearWatch: function(watchId) {
- clearInterval(watchId);
- },
-
- getPermission: function(siteName, imageUrl, extraMessage) {
- // for now just say yes :)
- return true;
- }
-
- };
-});
-
-// If you have Gears installed use that, else use Ajax ClientLocation
-navigator.geolocation = (window.google && google.gears) ? GearsGeoLocation() : AjaxGeoLocation();
-
-})();
-}
diff --git a/js/util.js b/js/util.js
index ad8a44c82..1989e92c0 100644
--- a/js/util.js
+++ b/js/util.js
@@ -816,3 +816,269 @@ $(document).ready(function(){
}
});
+// Formerly in xbImportNode.js
+
+/* is this stuff defined? */
+if (!document.ELEMENT_NODE) {
+ document.ELEMENT_NODE = 1;
+ document.ATTRIBUTE_NODE = 2;
+ document.TEXT_NODE = 3;
+ document.CDATA_SECTION_NODE = 4;
+ document.ENTITY_REFERENCE_NODE = 5;
+ document.ENTITY_NODE = 6;
+ document.PROCESSING_INSTRUCTION_NODE = 7;
+ document.COMMENT_NODE = 8;
+ document.DOCUMENT_NODE = 9;
+ document.DOCUMENT_TYPE_NODE = 10;
+ document.DOCUMENT_FRAGMENT_NODE = 11;
+ document.NOTATION_NODE = 12;
+}
+
+document._importNode = function(node, allChildren) {
+ /* find the node type to import */
+ switch (node.nodeType) {
+ case document.ELEMENT_NODE:
+ /* create a new element */
+ var newNode = document.createElement(node.nodeName);
+ /* does the node have any attributes to add? */
+ if (node.attributes && node.attributes.length > 0)
+ /* add all of the attributes */
+ for (var i = 0, il = node.attributes.length; i < il;) {
+ if (node.attributes[i].nodeName == 'class') {
+ newNode.className = node.getAttribute(node.attributes[i++].nodeName);
+ } else {
+ newNode.setAttribute(node.attributes[i].nodeName, node.getAttribute(node.attributes[i++].nodeName));
+ }
+ }
+ /* are we going after children too, and does the node have any? */
+ if (allChildren && node.childNodes && node.childNodes.length > 0)
+ /* recursively get all of the child nodes */
+ for (var i = 0, il = node.childNodes.length; i < il;)
+ newNode.appendChild(document._importNode(node.childNodes[i++], allChildren));
+ return newNode;
+ break;
+ case document.TEXT_NODE:
+ case document.CDATA_SECTION_NODE:
+ case document.COMMENT_NODE:
+ return document.createTextNode(node.nodeValue);
+ break;
+ }
+};
+
+// A shim to implement the W3C Geolocation API Specification using Gears or the Ajax API
+if (typeof navigator.geolocation == "undefined" || navigator.geolocation.shim ) { (function(){
+
+// -- BEGIN GEARS_INIT
+(function() {
+ // We are already defined. Hooray!
+ if (window.google && google.gears) {
+ return;
+ }
+
+ var factory = null;
+
+ // Firefox
+ if (typeof GearsFactory != 'undefined') {
+ factory = new GearsFactory();
+ } else {
+ // IE
+ try {
+ factory = new ActiveXObject('Gears.Factory');
+ // privateSetGlobalObject is only required and supported on WinCE.
+ if (factory.getBuildInfo().indexOf('ie_mobile') != -1) {
+ factory.privateSetGlobalObject(this);
+ }
+ } catch (e) {
+ // Safari
+ if ((typeof navigator.mimeTypes != 'undefined') && navigator.mimeTypes["application/x-googlegears"]) {
+ factory = document.createElement("object");
+ factory.style.display = "none";
+ factory.width = 0;
+ factory.height = 0;
+ factory.type = "application/x-googlegears";
+ document.documentElement.appendChild(factory);
+ }
+ }
+ }
+
+ // *Do not* define any objects if Gears is not installed. This mimics the
+ // behavior of Gears defining the objects in the future.
+ if (!factory) {
+ return;
+ }
+
+ // Now set up the objects, being careful not to overwrite anything.
+ //
+ // Note: In Internet Explorer for Windows Mobile, you can't add properties to
+ // the window object. However, global objects are automatically added as
+ // properties of the window object in all browsers.
+ if (!window.google) {
+ google = {};
+ }
+
+ if (!google.gears) {
+ google.gears = {factory: factory};
+ }
+})();
+// -- END GEARS_INIT
+
+var GearsGeoLocation = (function() {
+ // -- PRIVATE
+ var geo = google.gears.factory.create('beta.geolocation');
+
+ var wrapSuccess = function(callback, self) { // wrap it for lastPosition love
+ return function(position) {
+ callback(position);
+ self.lastPosition = position;
+ };
+ };
+
+ // -- PUBLIC
+ return {
+ shim: true,
+
+ type: "Gears",
+
+ lastPosition: null,
+
+ getCurrentPosition: function(successCallback, errorCallback, options) {
+ var self = this;
+ var sc = wrapSuccess(successCallback, self);
+ geo.getCurrentPosition(sc, errorCallback, options);
+ },
+
+ watchPosition: function(successCallback, errorCallback, options) {
+ geo.watchPosition(successCallback, errorCallback, options);
+ },
+
+ clearWatch: function(watchId) {
+ geo.clearWatch(watchId);
+ },
+
+ getPermission: function(siteName, imageUrl, extraMessage) {
+ geo.getPermission(siteName, imageUrl, extraMessage);
+ }
+
+ };
+});
+
+var AjaxGeoLocation = (function() {
+ // -- PRIVATE
+ var loading = false;
+ var loadGoogleLoader = function() {
+ if (!hasGoogleLoader() && !loading) {
+ loading = true;
+ var s = document.createElement('script');
+ s.src = (document.location.protocol == "https:"?"https://":"http://") + 'www.google.com/jsapi?callback=_google_loader_apiLoaded';
+ s.type = "text/javascript";
+ document.getElementsByTagName('body')[0].appendChild(s);
+ }
+ };
+
+ var queue = [];
+ var addLocationQueue = function(callback) {
+ queue.push(callback);
+ };
+
+ var runLocationQueue = function() {
+ if (hasGoogleLoader()) {
+ while (queue.length > 0) {
+ var call = queue.pop();
+ call();
+ }
+ }
+ };
+
+ window['_google_loader_apiLoaded'] = function() {
+ runLocationQueue();
+ };
+
+ var hasGoogleLoader = function() {
+ return (window['google'] && google['loader']);
+ };
+
+ var checkGoogleLoader = function(callback) {
+ if (hasGoogleLoader()) { return true; }
+
+ addLocationQueue(callback);
+
+ loadGoogleLoader();
+
+ return false;
+ };
+
+ loadGoogleLoader(); // start to load as soon as possible just in case
+
+ // -- PUBLIC
+ return {
+ shim: true,
+
+ type: "ClientLocation",
+
+ lastPosition: null,
+
+ getCurrentPosition: function(successCallback, errorCallback, options) {
+ var self = this;
+ if (!checkGoogleLoader(function() {
+ self.getCurrentPosition(successCallback, errorCallback, options);
+ })) { return; }
+
+ if (google.loader.ClientLocation) {
+ var cl = google.loader.ClientLocation;
+
+ var position = {
+ coords: {
+ latitude: cl.latitude,
+ longitude: cl.longitude,
+ altitude: null,
+ accuracy: 43000, // same as Gears accuracy over wifi?
+ altitudeAccuracy: null,
+ heading: null,
+ speed: null
+ },
+ // extra info that is outside of the bounds of the core API
+ address: {
+ city: cl.address.city,
+ country: cl.address.country,
+ country_code: cl.address.country_code,
+ region: cl.address.region
+ },
+ timestamp: new Date()
+ };
+
+ successCallback(position);
+
+ this.lastPosition = position;
+ } else if (errorCallback === "function") {
+ errorCallback({ code: 3, message: "Using the Google ClientLocation API and it is not able to calculate a location."});
+ }
+ },
+
+ watchPosition: function(successCallback, errorCallback, options) {
+ this.getCurrentPosition(successCallback, errorCallback, options);
+
+ var self = this;
+ var watchId = setInterval(function() {
+ self.getCurrentPosition(successCallback, errorCallback, options);
+ }, 10000);
+
+ return watchId;
+ },
+
+ clearWatch: function(watchId) {
+ clearInterval(watchId);
+ },
+
+ getPermission: function(siteName, imageUrl, extraMessage) {
+ // for now just say yes :)
+ return true;
+ }
+
+ };
+});
+
+// If you have Gears installed use that, else use Ajax ClientLocation
+navigator.geolocation = (window.google && google.gears) ? GearsGeoLocation() : AjaxGeoLocation();
+
+})();
+}
diff --git a/js/xbImportNode.js b/js/xbImportNode.js
deleted file mode 100644
index f600a4789..000000000
--- a/js/xbImportNode.js
+++ /dev/null
@@ -1,47 +0,0 @@
-/* is this stuff defined? */
-if (!document.ELEMENT_NODE) {
- document.ELEMENT_NODE = 1;
- document.ATTRIBUTE_NODE = 2;
- document.TEXT_NODE = 3;
- document.CDATA_SECTION_NODE = 4;
- document.ENTITY_REFERENCE_NODE = 5;
- document.ENTITY_NODE = 6;
- document.PROCESSING_INSTRUCTION_NODE = 7;
- document.COMMENT_NODE = 8;
- document.DOCUMENT_NODE = 9;
- document.DOCUMENT_TYPE_NODE = 10;
- document.DOCUMENT_FRAGMENT_NODE = 11;
- document.NOTATION_NODE = 12;
-}
-
-document._importNode = function(node, allChildren) {
- /* find the node type to import */
- switch (node.nodeType) {
- case document.ELEMENT_NODE:
- /* create a new element */
- var newNode = document.createElement(node.nodeName);
- /* does the node have any attributes to add? */
- if (node.attributes && node.attributes.length > 0)
- /* add all of the attributes */
- for (var i = 0, il = node.attributes.length; i < il;) {
- if (node.attributes[i].nodeName == 'class') {
- newNode.className = node.getAttribute(node.attributes[i++].nodeName);
- } else {
- newNode.setAttribute(node.attributes[i].nodeName, node.getAttribute(node.attributes[i++].nodeName));
- }
- }
- /* are we going after children too, and does the node have any? */
- if (allChildren && node.childNodes && node.childNodes.length > 0)
- /* recursively get all of the child nodes */
- for (var i = 0, il = node.childNodes.length; i < il;)
- newNode.appendChild(document._importNode(node.childNodes[i++], allChildren));
- return newNode;
- break;
- case document.TEXT_NODE:
- case document.CDATA_SECTION_NODE:
- case document.COMMENT_NODE:
- return document.createTextNode(node.nodeValue);
- break;
- }
-};
-
diff --git a/lib/action.php b/lib/action.php
index 2b3b707c5..a2638993f 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -121,7 +121,10 @@ class Action extends HTMLOutputter // lawsuit
// XXX: attributes (profile?)
$this->elementStart('head');
if (Event::handle('StartShowHeadElements', array($this))) {
- $this->showTitle();
+ if (Event::handle('StartShowHeadTitle', array($this))) {
+ $this->showTitle();
+ Event::handle('EndShowHeadTitle', array($this));
+ }
$this->showShortcutIcon();
$this->showStylesheets();
$this->showOpenSearch();
@@ -200,7 +203,7 @@ class Action extends HTMLOutputter // lawsuit
if (Event::handle('StartShowStatusNetStyles', array($this)) &&
Event::handle('StartShowLaconicaStyles', array($this))) {
- $this->cssLink('css/display.css',null, 'screen, projection, tv, print');
+ $this->primaryCssLink(null, 'screen, projection, tv, print');
Event::handle('EndShowStatusNetStyles', array($this));
Event::handle('EndShowLaconicaStyles', array($this));
}
@@ -235,7 +238,7 @@ class Action extends HTMLOutputter // lawsuit
Event::handle('EndShowDesign', array($this));
}
Event::handle('EndShowStyles', array($this));
-
+
if (common_config('custom_css', 'enabled')) {
$css = common_config('custom_css', 'css');
if (Event::handle('StartShowCustomCss', array($this, &$css))) {
@@ -248,6 +251,18 @@ class Action extends HTMLOutputter // lawsuit
}
}
+ function primaryCssLink($mainTheme=null, $media=null)
+ {
+ // If the currently-selected theme has dependencies on other themes,
+ // we'll need to load their display.css files as well in order.
+ $theme = new Theme($mainTheme);
+ $baseThemes = $theme->getDeps();
+ foreach ($baseThemes as $baseTheme) {
+ $this->cssLink('css/display.css', $baseTheme, $media);
+ }
+ $this->cssLink('css/display.css', $mainTheme, $media);
+ }
+
/**
* Show javascript headers
*
@@ -266,9 +281,7 @@ class Action extends HTMLOutputter // lawsuit
}
if (Event::handle('StartShowStatusNetScripts', array($this)) &&
Event::handle('StartShowLaconicaScripts', array($this))) {
- $this->script('xbImportNode.js');
$this->script('util.js');
- $this->script('geometa.js');
// Frame-busting code to avoid clickjacking attacks.
$this->inlineScript('if (window.top !== window.self) { window.top.location.href = window.self.location.href; }');
Event::handle('EndShowStatusNetScripts', array($this));
@@ -616,7 +629,10 @@ class Action extends HTMLOutputter // lawsuit
function showContentBlock()
{
$this->elementStart('div', array('id' => 'content'));
- $this->showPageTitle();
+ if (Event::handle('StartShowPageTitle', array($this))) {
+ $this->showPageTitle();
+ Event::handle('EndShowPageTitle', array($this));
+ }
$this->showPageNoticeBlock();
$this->elementStart('div', array('id' => 'content_inner'));
// show the actual content (forms, lists, whatever)
@@ -978,29 +994,57 @@ class Action extends HTMLOutputter // lawsuit
function handle($argarray=null)
{
header('Vary: Accept-Encoding,Cookie');
+
$lm = $this->lastModified();
$etag = $this->etag();
+
if ($etag) {
header('ETag: ' . $etag);
}
+
if ($lm) {
header('Last-Modified: ' . date(DATE_RFC1123, $lm));
- if (array_key_exists('HTTP_IF_MODIFIED_SINCE', $_SERVER)) {
- $if_modified_since = $_SERVER['HTTP_IF_MODIFIED_SINCE'];
- $ims = strtotime($if_modified_since);
- if ($lm <= $ims) {
- $if_none_match = (array_key_exists('HTTP_IF_NONE_MATCH', $_SERVER)) ?
- $_SERVER['HTTP_IF_NONE_MATCH'] : null;
- if (!$if_none_match ||
- !$etag ||
- $this->_hasEtag($etag, $if_none_match)) {
- header('HTTP/1.1 304 Not Modified');
- // Better way to do this?
- exit(0);
- }
- }
+ if ($this->isCacheable()) {
+ header( 'Expires: ' . gmdate( 'D, d M Y H:i:s', 0 ) . ' GMT' );
+ header( "Cache-Control: private, must-revalidate, max-age=0" );
+ header( "Pragma: underwear-catapult");
+ }
+ }
+
+ if ($etag) {
+ $if_none_match = (array_key_exists('HTTP_IF_NONE_MATCH', $_SERVER)) ?
+ $_SERVER['HTTP_IF_NONE_MATCH'] : null;
+ if ($if_none_match && $this->_hasEtag($etag, $if_none_match)) {
+ header('HTTP/1.1 304 Not Modified');
+ // Better way to do this?
+ exit(0);
}
}
+
+ if ($lm && array_key_exists('HTTP_IF_MODIFIED_SINCE', $_SERVER)) {
+ $if_modified_since = $_SERVER['HTTP_IF_MODIFIED_SINCE'];
+ $ims = strtotime($if_modified_since);
+ if ($lm <= $ims) {
+ header('HTTP/1.1 304 Not Modified');
+ // Better way to do this?
+ exit(0);
+ }
+ }
+ }
+
+ /**
+ * Is this action cacheable?
+ *
+ * If the action returns a last-modified
+ *
+ * @param array $argarray is ignored since it's now passed in in prepare()
+ *
+ * @return boolean is read only action?
+ */
+
+ function isCacheable()
+ {
+ return true;
}
/**
diff --git a/lib/apiaction.php b/lib/apiaction.php
index cc98b9b6e..5e0cd5518 100644
--- a/lib/apiaction.php
+++ b/lib/apiaction.php
@@ -301,7 +301,7 @@ class ApiAction extends Action
// StatusNet-specific
- $twitter_user['statusnet:profile_url'] = $profile->profileurl;
+ $twitter_user['statusnet_profile_url'] = $profile->profileurl;
return $twitter_user;
}
@@ -406,7 +406,7 @@ class ApiAction extends Action
// StatusNet-specific
- $twitter_status['statusnet:html'] = $notice->rendered;
+ $twitter_status['statusnet_html'] = $notice->rendered;
return $twitter_status;
}
@@ -618,7 +618,11 @@ class ApiAction extends Action
$this->showTwitterXmlStatus($value, 'retweeted_status');
break;
default:
- $this->element($element, null, $value);
+ if (strncmp($element, 'statusnet_', 10) == 0) {
+ $this->element('statusnet:'.substr($element, 10), null, $value);
+ } else {
+ $this->element($element, null, $value);
+ }
}
}
$this->elementEnd($tag);
@@ -643,6 +647,8 @@ class ApiAction extends Action
foreach($twitter_user as $element => $value) {
if ($element == 'status') {
$this->showTwitterXmlStatus($twitter_user['status']);
+ } else if (strncmp($element, 'statusnet_', 10) == 0) {
+ $this->element('statusnet:'.substr($element, 10), null, $value);
} else {
$this->element($element, null, $value);
}
diff --git a/lib/language.php b/lib/language.php
index 80d256807..12b56be9a 100644
--- a/lib/language.php
+++ b/lib/language.php
@@ -326,6 +326,7 @@ function get_all_languages() {
'is' => array('q' => 0.1, 'lang' => 'is', 'name' => 'Icelandic', 'direction' => 'ltr'),
'it' => array('q' => 1, 'lang' => 'it', 'name' => 'Italian', 'direction' => 'ltr'),
'jp' => array('q' => 0.5, 'lang' => 'ja', 'name' => 'Japanese', 'direction' => 'ltr'),
+ 'ka' => array('q' => 0.8, 'lang' => 'ka', 'name' => 'Georgian', 'direction' => 'ltr'),
'ko' => array('q' => 0.9, 'lang' => 'ko', 'name' => 'Korean', 'direction' => 'ltr'),
'mk' => array('q' => 0.5, 'lang' => 'mk', 'name' => 'Macedonian', 'direction' => 'ltr'),
'nb' => array('q' => 0.1, 'lang' => 'nb', 'name' => 'Norwegian (Bokmål)', 'direction' => 'ltr'),
diff --git a/lib/theme.php b/lib/theme.php
index a9d0cbc84..992fce870 100644
--- a/lib/theme.php
+++ b/lib/theme.php
@@ -54,6 +54,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
class Theme
{
+ var $name = null;
var $dir = null;
var $path = null;
@@ -70,6 +71,10 @@ class Theme
if (empty($name)) {
$name = common_config('site', 'theme');
}
+ if (!self::validName($name)) {
+ throw new ServerException("Invalid theme name.");
+ }
+ $this->name = $name;
// Check to see if it's in the local dir
@@ -178,6 +183,58 @@ class Theme
}
/**
+ * Fetch a list of other themes whose CSS needs to be pulled in before
+ * this theme's, based on following the theme.ini 'include' settings.
+ * (May be empty if this theme has no include dependencies.)
+ *
+ * @return array of strings with theme names
+ */
+ function getDeps()
+ {
+ $chain = $this->doGetDeps(array($this->name));
+ array_pop($chain); // Drop us back off
+ return $chain;
+ }
+
+ protected function doGetDeps($chain)
+ {
+ $data = $this->getMetadata();
+ if (!empty($data['include'])) {
+ $include = $data['include'];
+
+ // Protect against cycles!
+ if (!in_array($include, $chain)) {
+ try {
+ $theme = new Theme($include);
+ array_unshift($chain, $include);
+ return $theme->doGetDeps($chain);
+ } catch (Exception $e) {
+ common_log(LOG_ERR,
+ "Exception while fetching theme dependencies " .
+ "for $this->name: " . $e->getMessage());
+ }
+ }
+ }
+ return $chain;
+ }
+
+ /**
+ * Pull data from the theme's theme.ini file.
+ * @fixme calling getFile will fall back to default theme, this may be unsafe.
+ *
+ * @return associative array of strings
+ */
+ function getMetadata()
+ {
+ $iniFile = $this->getFile('theme.ini');
+ if (file_exists($iniFile)) {
+ return parse_ini_file($iniFile);
+ } else {
+ return array();
+ }
+ }
+
+ /**
* Gets the full path of a file in a theme dir based on its relative name
*
* @param string $relative relative path within the theme directory
@@ -285,4 +342,9 @@ class Theme
return $instroot;
}
+
+ static function validName($name)
+ {
+ return preg_match('/^[a-z0-9][a-z0-9_-]*$/i', $name);
+ }
}
diff --git a/lib/themeuploader.php b/lib/themeuploader.php
index 370965db0..5a48e884e 100644
--- a/lib/themeuploader.php
+++ b/lib/themeuploader.php
@@ -128,8 +128,16 @@ class ThemeUploader
continue;
}
- // Check the directory structure...
+ // Is this a safe or skippable file?
$path = pathinfo($name);
+ if ($this->skippable($path['filename'], $path['extension'])) {
+ // Documentation and such... booooring
+ continue;
+ } else {
+ $this->validateFile($path['filename'], $path['extension']);
+ }
+
+ // Check the directory structure...
$dirs = explode('/', $path['dirname']);
$baseDir = array_shift($dirs);
if ($commonBaseDir === false) {
@@ -144,14 +152,6 @@ class ThemeUploader
$this->validateFileOrFolder($dir);
}
- // Is this a safe or skippable file?
- if ($this->skippable($path['filename'], $path['extension'])) {
- // Documentation and such... booooring
- continue;
- } else {
- $this->validateFile($path['filename'], $path['extension']);
- }
-
$fullPath = $dirs;
$fullPath[] = $path['basename'];
$localFile = implode('/', $fullPath);
@@ -180,39 +180,64 @@ class ThemeUploader
}
}
+ /**
+ * @fixme Probably most unrecognized files should just be skipped...
+ */
protected function skippable($filename, $ext)
{
- $skip = array('txt', 'rtf', 'doc', 'docx', 'odt');
+ $skip = array('txt', 'html', 'rtf', 'doc', 'docx', 'odt', 'xcf');
if (strtolower($filename) == 'readme') {
return true;
}
if (in_array(strtolower($ext), $skip)) {
return true;
}
+ if ($filename == '' || substr($filename, 0, 1) == '.') {
+ // Skip Unix-style hidden files
+ return true;
+ }
+ if ($filename == '__MACOSX') {
+ // Skip awful metadata files Mac OS X slips in for you.
+ // Thanks Apple!
+ return true;
+ }
return false;
}
protected function validateFile($filename, $ext)
{
$this->validateFileOrFolder($filename);
- $this->validateExtension($ext);
+ $this->validateExtension($filename, $ext);
// @fixme validate content
}
protected function validateFileOrFolder($name)
{
- if (!preg_match('/^[a-z0-9_-]+$/i', $name)) {
+ if (!preg_match('/^[a-z0-9_\.-]+$/i', $name)) {
+ common_log(LOG_ERR, "Bad theme filename: $name");
$msg = _("Theme contains invalid file or folder name. " .
"Stick with ASCII letters, digits, underscore, and minus sign.");
throw new ClientException($msg);
}
+ if (preg_match('/\.(php|cgi|asp|aspx|js|vb)\w/i', $name)) {
+ common_log(LOG_ERR, "Unsafe theme filename: $name");
+ $msg = _("Theme contains unsafe file extension names; may be unsafe.");
+ throw new ClientException($msg);
+ }
return true;
}
- protected function validateExtension($ext)
+ protected function validateExtension($base, $ext)
{
- $allowed = array('css', 'png', 'gif', 'jpg', 'jpeg');
+ $allowed = array('css', // CSS may need validation
+ 'png', 'gif', 'jpg', 'jpeg',
+ 'svg', // SVG images/fonts may need validation
+ 'ttf', 'eot', 'woff');
if (!in_array(strtolower($ext), $allowed)) {
+ if ($ext == 'ini' && $base == 'theme') {
+ // theme.ini exception
+ return true;
+ }
$msg = sprintf(_("Theme contains file of type '.%s', " .
"which is not allowed."),
$ext);
diff --git a/lib/util.php b/lib/util.php
index 66600c766..f63e152e3 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -1018,8 +1018,7 @@ function common_local_url($action, $args=null, $params=null, $fragment=null, $ad
function common_is_sensitive($action)
{
- static $sensitive = array('login', 'register', 'passwordsettings',
- 'twittersettings', 'api');
+ static $sensitive = array('login', 'register', 'passwordsettings', 'api');
$ssl = null;
if (Event::handle('SensitiveAction', array($action, &$ssl))) {
diff --git a/locale/af/LC_MESSAGES/statusnet.po b/locale/af/LC_MESSAGES/statusnet.po
index 96b0d87fb..e7b29b724 100644
--- a/locale/af/LC_MESSAGES/statusnet.po
+++ b/locale/af/LC_MESSAGES/statusnet.po
@@ -8,12 +8,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-28 15:28+0000\n"
-"PO-Revision-Date: 2010-08-28 15:28:42+0000\n"
+"POT-Creation-Date: 2010-09-05 09:45+0000\n"
+"PO-Revision-Date: 2010-09-05 09:45:08+0000\n"
"Language-Team: Afrikaans\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r71856); Translate extension (2010-08-20)\n"
+"X-Generator: MediaWiki 1.17alpha (r72319); Translate extension (2010-08-20)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: af\n"
"X-Message-Group: out-statusnet\n"
@@ -559,7 +559,7 @@ msgid ""
msgstr ""
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:450
+#: actions/apioauthauthorize.php:310 lib/action.php:463
msgid "Account"
msgstr "Gebruiker"
@@ -902,7 +902,7 @@ msgstr "U is nie die eienaar van hierdie applikasie nie."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1263
+#: lib/action.php:1307
msgid "There was a problem with your session token."
msgstr ""
@@ -3600,7 +3600,7 @@ msgid "Plugins"
msgstr ""
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:789
+#: actions/version.php:198 lib/action.php:805
msgid "Version"
msgstr "Weergawe"
@@ -3706,7 +3706,7 @@ msgstr ""
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1751
+#: classes/Notice.php:1757
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -3783,167 +3783,167 @@ msgid "Other"
msgstr "Ander"
#. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:145
+#: lib/action.php:148
#, php-format
msgid "%1$s - %2$s"
msgstr "%1$s - %2$s"
#. TRANS: Page title for a page without a title set.
-#: lib/action.php:161
+#: lib/action.php:164
msgid "Untitled page"
msgstr ""
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:436
+#: lib/action.php:449
msgid "Primary site navigation"
msgstr ""
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:442
+#: lib/action.php:455
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr ""
#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:445
+#: lib/action.php:458
msgctxt "MENU"
msgid "Personal"
msgstr "Persoonlik"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:452
+#: lib/action.php:465
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr ""
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:455
+#: lib/action.php:468
msgid "Connect"
msgstr "Konnekteer"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:458
+#: lib/action.php:471
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr ""
#. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:461
+#: lib/action.php:474
msgctxt "MENU"
msgid "Admin"
msgstr "Beheer"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:465
+#: lib/action.php:478
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr ""
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:468
+#: lib/action.php:481
msgctxt "MENU"
msgid "Invite"
msgstr "Uitnodig"
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:477
+#: lib/action.php:490
msgctxt "MENU"
msgid "Logout"
msgstr "Teken uit"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:482
+#: lib/action.php:495
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Skep 'n gebruiker"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:485
+#: lib/action.php:498
msgctxt "MENU"
msgid "Register"
msgstr "Registreer"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:488
+#: lib/action.php:501
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Meld by die webwerf aan"
-#: lib/action.php:491
+#: lib/action.php:504
msgctxt "MENU"
msgid "Login"
msgstr "Teken in"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:494
+#: lib/action.php:507
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Help my!"
-#: lib/action.php:497
+#: lib/action.php:510
msgctxt "MENU"
msgid "Help"
msgstr "Help"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:500
+#: lib/action.php:513
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "Soek na mense of teks"
-#: lib/action.php:503
+#: lib/action.php:516
msgctxt "MENU"
msgid "Search"
msgstr "Soek"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:762
+#: lib/action.php:778
msgid "Secondary site navigation"
msgstr ""
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:768
+#: lib/action.php:784
msgid "Help"
msgstr "Help"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:771
+#: lib/action.php:787
msgid "About"
msgstr "Aangaande"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:774
+#: lib/action.php:790
msgid "FAQ"
msgstr "Gewilde vrae"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:779
+#: lib/action.php:795
msgid "TOS"
msgstr "Gebruiksvoorwaardes"
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:783
+#: lib/action.php:799
msgid "Privacy"
msgstr "Privaatheid"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:786
+#: lib/action.php:802
msgid "Source"
msgstr "Bron"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:792
+#: lib/action.php:808
msgid "Contact"
msgstr "Kontak"
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:823
+#: lib/action.php:839
msgid "StatusNet software license"
msgstr ""
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:827
+#: lib/action.php:843
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -3951,13 +3951,13 @@ msgid ""
msgstr ""
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:830
+#: lib/action.php:846
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr ""
#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:834
+#: lib/action.php:850
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -3966,44 +3966,44 @@ msgid ""
msgstr ""
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:850
+#: lib/action.php:866
msgid "Site content license"
msgstr ""
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:857
+#: lib/action.php:873
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:864
+#: lib/action.php:880
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:868
+#: lib/action.php:884
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:881
+#: lib/action.php:897
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr ""
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: present than the currently displayed information.
-#: lib/action.php:1203
+#: lib/action.php:1247
msgid "After"
msgstr "Na"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: past than the currently displayed information.
-#: lib/action.php:1213
+#: lib/action.php:1257
msgid "Before"
msgstr "Voor"
@@ -5098,7 +5098,7 @@ msgstr ""
msgid "The theme file is missing or the upload failed."
msgstr ""
-#: lib/themeuploader.php:139
+#: lib/themeuploader.php:147
msgid "Invalid theme: bad directory structure."
msgstr ""
@@ -5111,18 +5111,22 @@ msgstr ""
msgid "Invalid theme archive: missing file css/display.css"
msgstr ""
-#: lib/themeuploader.php:205
+#: lib/themeuploader.php:218
msgid ""
"Theme contains invalid file or folder name. Stick with ASCII letters, "
"digits, underscore, and minus sign."
msgstr ""
-#: lib/themeuploader.php:216
+#: lib/themeuploader.php:224
+msgid "Theme contains unsafe file extension names; may be unsafe."
+msgstr ""
+
+#: lib/themeuploader.php:241
#, php-format
msgid "Theme contains file of type '.%s', which is not allowed."
msgstr ""
-#: lib/themeuploader.php:234
+#: lib/themeuploader.php:259
msgid "Error opening theme archive."
msgstr ""
@@ -5185,56 +5189,56 @@ msgid "Moderator"
msgstr "Moderator"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1102
msgid "a few seconds ago"
msgstr "'n paar sekondes gelede"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1106
+#: lib/util.php:1105
msgid "about a minute ago"
msgstr "ongeveer 'n minuut gelede"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1110
+#: lib/util.php:1109
#, php-format
msgid "about %d minutes ago"
msgstr "ongeveer %d minute gelede"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1113
+#: lib/util.php:1112
msgid "about an hour ago"
msgstr "ongeveer 'n uur gelede"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1117
+#: lib/util.php:1116
#, php-format
msgid "about %d hours ago"
msgstr "ongeveer %d uur gelede"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1120
+#: lib/util.php:1119
msgid "about a day ago"
msgstr "ongeveer een dag gelede"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1124
+#: lib/util.php:1123
#, php-format
msgid "about %d days ago"
msgstr "ongeveer %d dae gelede"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1127
+#: lib/util.php:1126
msgid "about a month ago"
msgstr "ongeveer een maand gelede"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1131
+#: lib/util.php:1130
#, php-format
msgid "about %d months ago"
msgstr "ongeveer %d maande gelede"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1134
+#: lib/util.php:1133
msgid "about a year ago"
msgstr "ongeveer een jaar gelede"
diff --git a/locale/ar/LC_MESSAGES/statusnet.po b/locale/ar/LC_MESSAGES/statusnet.po
index 940252cd5..5d7fe7718 100644
--- a/locale/ar/LC_MESSAGES/statusnet.po
+++ b/locale/ar/LC_MESSAGES/statusnet.po
@@ -10,12 +10,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-28 15:28+0000\n"
-"PO-Revision-Date: 2010-08-28 15:28:49+0000\n"
+"POT-Creation-Date: 2010-09-05 09:45+0000\n"
+"PO-Revision-Date: 2010-09-05 09:45:12+0000\n"
"Language-Team: Arabic\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r71856); Translate extension (2010-08-20)\n"
+"X-Generator: MediaWiki 1.17alpha (r72319); Translate extension (2010-08-20)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ar\n"
"X-Message-Group: out-statusnet\n"
@@ -506,7 +506,7 @@ msgid ""
msgstr ""
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:450
+#: actions/apioauthauthorize.php:310 lib/action.php:463
msgid "Account"
msgstr "الحساب"
@@ -861,7 +861,7 @@ msgstr "أنت لست مالك هذا التطبيق."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1263
+#: lib/action.php:1307
msgid "There was a problem with your session token."
msgstr ""
@@ -4072,7 +4072,7 @@ msgid "Plugins"
msgstr "الملحقات"
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:789
+#: actions/version.php:198 lib/action.php:805
msgid "Version"
msgstr "النسخة"
@@ -4205,7 +4205,7 @@ msgstr ""
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1751
+#: classes/Notice.php:1757
#, php-format
msgid "RT @%1$s %2$s"
msgstr "آر تي @%1$s %2$s"
@@ -4322,189 +4322,189 @@ msgid "Other"
msgstr "أخرى"
#. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:145
+#: lib/action.php:148
#, php-format
msgid "%1$s - %2$s"
msgstr "%1$s - %2$s"
#. TRANS: Page title for a page without a title set.
-#: lib/action.php:161
+#: lib/action.php:164
msgid "Untitled page"
msgstr "ØµÙØ­Ø© غير Ù…ÙØ¹Ù†ÙˆÙ†Ø©"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:442
+#: lib/action.php:455
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr "المل٠الشخصي ومسار الأصدقاء الزمني"
#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:445
+#: lib/action.php:458
msgctxt "MENU"
msgid "Personal"
msgstr "Ø§Ù„ØµÙØ­Ø© الشخصية"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:447
+#: lib/action.php:460
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "غير بريدك الإلكتروني وكلمة سرّك ÙˆØ£ÙØªØ§Ø±Ùƒ وملÙÙƒ الشخصي"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:452
+#: lib/action.php:465
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "اتصل بالخدمات"
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:455
+#: lib/action.php:468
msgid "Connect"
msgstr "اتصل"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:458
+#: lib/action.php:471
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "غيّر ضبط الموقع"
#. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:461
+#: lib/action.php:474
msgctxt "MENU"
msgid "Admin"
msgstr "إداري"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:465
+#: lib/action.php:478
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "ادع٠أصدقائك وزملائك للانضمام إليك ÙÙŠ %s"
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:468
+#: lib/action.php:481
msgctxt "MENU"
msgid "Invite"
msgstr "ادعÙ"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:474
+#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "اخرج من الموقع"
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:477
+#: lib/action.php:490
msgctxt "MENU"
msgid "Logout"
msgstr "اخرج"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:482
+#: lib/action.php:495
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "أنشئ حسابًا"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:485
+#: lib/action.php:498
msgctxt "MENU"
msgid "Register"
msgstr "سجّل"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:488
+#: lib/action.php:501
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Ù„ÙØ¬ إلى الموقع"
-#: lib/action.php:491
+#: lib/action.php:504
msgctxt "MENU"
msgid "Login"
msgstr "Ù„ÙØ¬"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:494
+#: lib/action.php:507
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "ساعدني!"
-#: lib/action.php:497
+#: lib/action.php:510
msgctxt "MENU"
msgid "Help"
msgstr "مساعدة"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:500
+#: lib/action.php:513
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "ابحث عن أشخاص أو نصوص"
-#: lib/action.php:503
+#: lib/action.php:516
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:525 lib/adminpanelaction.php:400
+#: lib/action.php:538 lib/adminpanelaction.php:400
msgid "Site notice"
msgstr "إشعار الموقع"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:592
+#: lib/action.php:605
msgid "Local views"
msgstr "المشاهدات المحلية"
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:659
+#: lib/action.php:675
msgid "Page notice"
msgstr "إشعار Ø§Ù„ØµÙØ­Ø©"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:768
+#: lib/action.php:784
msgid "Help"
msgstr "مساعدة"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:771
+#: lib/action.php:787
msgid "About"
msgstr "عن"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:774
+#: lib/action.php:790
msgid "FAQ"
msgstr "الأسئلة المكررة"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:779
+#: lib/action.php:795
msgid "TOS"
msgstr "الشروط"
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:783
+#: lib/action.php:799
msgid "Privacy"
msgstr "خصوصية"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:786
+#: lib/action.php:802
msgid "Source"
msgstr "المصدر"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:792
+#: lib/action.php:808
msgid "Contact"
msgstr "اتصل"
-#: lib/action.php:794
+#: lib/action.php:810
msgid "Badge"
msgstr "الجسر"
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:823
+#: lib/action.php:839
msgid "StatusNet software license"
msgstr "رخصة برنامج StatusNet"
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:827
+#: lib/action.php:843
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4512,13 +4512,13 @@ msgid ""
msgstr ""
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:830
+#: lib/action.php:846
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr ""
#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:834
+#: lib/action.php:850
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4530,44 +4530,44 @@ msgstr ""
"agpl-3.0.html)."
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:850
+#: lib/action.php:866
msgid "Site content license"
msgstr "رخصة محتوى الموقع"
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:857
+#: lib/action.php:873
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:864
+#: lib/action.php:880
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:868
+#: lib/action.php:884
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:881
+#: lib/action.php:897
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr ""
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: present than the currently displayed information.
-#: lib/action.php:1203
+#: lib/action.php:1247
msgid "After"
msgstr "بعد"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: past than the currently displayed information.
-#: lib/action.php:1213
+#: lib/action.php:1257
msgid "Before"
msgstr "قبل"
@@ -5921,7 +5921,7 @@ msgstr ""
msgid "The theme file is missing or the upload failed."
msgstr ""
-#: lib/themeuploader.php:139
+#: lib/themeuploader.php:147
msgid "Invalid theme: bad directory structure."
msgstr ""
@@ -5934,18 +5934,22 @@ msgstr ""
msgid "Invalid theme archive: missing file css/display.css"
msgstr ""
-#: lib/themeuploader.php:205
+#: lib/themeuploader.php:218
msgid ""
"Theme contains invalid file or folder name. Stick with ASCII letters, "
"digits, underscore, and minus sign."
msgstr ""
-#: lib/themeuploader.php:216
+#: lib/themeuploader.php:224
+msgid "Theme contains unsafe file extension names; may be unsafe."
+msgstr ""
+
+#: lib/themeuploader.php:241
#, php-format
msgid "Theme contains file of type '.%s', which is not allowed."
msgstr ""
-#: lib/themeuploader.php:234
+#: lib/themeuploader.php:259
msgid "Error opening theme archive."
msgstr "خطأ أثناء تحديث المل٠الشخصي البعيد."
@@ -6020,32 +6024,32 @@ msgid "Moderator"
msgstr "مراقب"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1102
msgid "a few seconds ago"
msgstr "قبل لحظات قليلة"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1106
+#: lib/util.php:1105
msgid "about a minute ago"
msgstr "قبل دقيقة تقريبًا"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1113
+#: lib/util.php:1112
msgid "about an hour ago"
msgstr "قبل ساعة تقريبًا"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1120
+#: lib/util.php:1119
msgid "about a day ago"
msgstr "قبل يوم تقريبا"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1127
+#: lib/util.php:1126
msgid "about a month ago"
msgstr "قبل شهر تقريبًا"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1134
+#: lib/util.php:1133
msgid "about a year ago"
msgstr "قبل سنة تقريبًا"
diff --git a/locale/arz/LC_MESSAGES/statusnet.po b/locale/arz/LC_MESSAGES/statusnet.po
index c52bcf19e..425dcbe48 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-08-28 15:28+0000\n"
-"PO-Revision-Date: 2010-08-28 15:28:55+0000\n"
+"POT-Creation-Date: 2010-09-05 09:45+0000\n"
+"PO-Revision-Date: 2010-09-05 09:45:18+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 (r71856); Translate extension (2010-08-20)\n"
+"X-Generator: MediaWiki 1.17alpha (r72319); Translate extension (2010-08-20)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: arz\n"
"X-Message-Group: out-statusnet\n"
@@ -455,7 +455,7 @@ msgid ""
msgstr ""
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:450
+#: actions/apioauthauthorize.php:310 lib/action.php:463
msgid "Account"
msgstr "الحساب"
@@ -779,7 +779,7 @@ msgstr "انت مش بتملك الapplication دى."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1263
+#: lib/action.php:1307
msgid "There was a problem with your session token."
msgstr ""
@@ -3699,7 +3699,7 @@ msgid "Plugins"
msgstr ""
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:789
+#: actions/version.php:198 lib/action.php:805
msgid "Version"
msgstr "النسخه"
@@ -3827,7 +3827,7 @@ msgstr ""
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1751
+#: classes/Notice.php:1757
#, php-format
msgid "RT @%1$s %2$s"
msgstr "آر تى @%1$s %2$s"
@@ -3847,7 +3847,7 @@ msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
msgstr ""
#. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:346
+#: classes/Status_network.php:339
msgid "Unable to save tag."
msgstr "تعذّر Ø­ÙØ¸ الوسوم."
@@ -3944,123 +3944,123 @@ msgid "Other"
msgstr "أخرى"
#. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:145
+#: lib/action.php:148
#, php-format
msgid "%1$s - %2$s"
msgstr "%1$s - %2$s"
#. TRANS: Page title for a page without a title set.
-#: lib/action.php:161
+#: lib/action.php:164
msgid "Untitled page"
msgstr "ØµÙØ­Ù‡ غير Ù…ÙØ¹Ù†ÙˆÙ†Ø©"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:442
+#: lib/action.php:455
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr ""
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:455
+#: lib/action.php:468
msgid "Connect"
msgstr "اتصل"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:458
+#: lib/action.php:471
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "ضبط الموقع الأساسي"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:465
+#: lib/action.php:478
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr ""
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:474
+#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "سمه الموقع."
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:477
+#: lib/action.php:490
msgctxt "MENU"
msgid "Logout"
msgstr "الشعار"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:482
+#: lib/action.php:495
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "أنشئ مجموعه جديدة"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:494
+#: lib/action.php:507
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "مساعدة"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:500
+#: lib/action.php:513
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr ""
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:525 lib/adminpanelaction.php:400
+#: lib/action.php:538 lib/adminpanelaction.php:400
msgid "Site notice"
msgstr "إشعار الموقع"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:592
+#: lib/action.php:605
msgid "Local views"
msgstr "المشاهدات المحلية"
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:659
+#: lib/action.php:675
msgid "Page notice"
msgstr "إشعار Ø§Ù„ØµÙØ­Ø©"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:768
+#: lib/action.php:784
msgid "Help"
msgstr "مساعدة"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:771
+#: lib/action.php:787
msgid "About"
msgstr "عن"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:774
+#: lib/action.php:790
msgid "FAQ"
msgstr "الأسئله المكررة"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:779
+#: lib/action.php:795
msgid "TOS"
msgstr "الشروط"
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:783
+#: lib/action.php:799
msgid "Privacy"
msgstr "خصوصية"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:786
+#: lib/action.php:802
msgid "Source"
msgstr "المصدر"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:792
+#: lib/action.php:808
msgid "Contact"
msgstr "اتصل"
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:827
+#: lib/action.php:843
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4068,13 +4068,13 @@ msgid ""
msgstr ""
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:830
+#: lib/action.php:846
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr ""
#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:834
+#: lib/action.php:850
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4086,44 +4086,44 @@ msgstr ""
"agpl-3.0.html)."
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:850
+#: lib/action.php:866
msgid "Site content license"
msgstr "رخصه محتوى الموقع"
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:857
+#: lib/action.php:873
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:864
+#: lib/action.php:880
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:868
+#: lib/action.php:884
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:881
+#: lib/action.php:897
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr ""
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: present than the currently displayed information.
-#: lib/action.php:1203
+#: lib/action.php:1247
msgid "After"
msgstr "بعد"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: past than the currently displayed information.
-#: lib/action.php:1213
+#: lib/action.php:1257
msgid "Before"
msgstr "قبل"
@@ -5153,6 +5153,11 @@ msgstr "صندوق الصادر"
msgid "Your sent messages"
msgstr "رسائلك Ø§Ù„Ù…ÙØ±Ø³Ù„Ø©"
+#: lib/personaltagcloudsection.php:56
+#, php-format
+msgid "Tags in %s's notices"
+msgstr ""
+
#: lib/plugin.php:115
msgid "Unknown"
msgstr "مش معروÙ"
@@ -5332,7 +5337,7 @@ msgstr ""
msgid "The theme file is missing or the upload failed."
msgstr ""
-#: lib/themeuploader.php:139
+#: lib/themeuploader.php:147
msgid "Invalid theme: bad directory structure."
msgstr ""
@@ -5345,18 +5350,22 @@ msgstr ""
msgid "Invalid theme archive: missing file css/display.css"
msgstr ""
-#: lib/themeuploader.php:205
+#: lib/themeuploader.php:218
msgid ""
"Theme contains invalid file or folder name. Stick with ASCII letters, "
"digits, underscore, and minus sign."
msgstr ""
-#: lib/themeuploader.php:216
+#: lib/themeuploader.php:224
+msgid "Theme contains unsafe file extension names; may be unsafe."
+msgstr ""
+
+#: lib/themeuploader.php:241
#, php-format
msgid "Theme contains file of type '.%s', which is not allowed."
msgstr ""
-#: lib/themeuploader.php:234
+#: lib/themeuploader.php:259
msgid "Error opening theme archive."
msgstr "خطأ أثناء منع الحجب."
@@ -5422,32 +5431,32 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1102
msgid "a few seconds ago"
msgstr "قبل لحظات قليلة"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1106
+#: lib/util.php:1105
msgid "about a minute ago"
msgstr "قبل دقيقه تقريبًا"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1113
+#: lib/util.php:1112
msgid "about an hour ago"
msgstr "قبل ساعه تقريبًا"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1120
+#: lib/util.php:1119
msgid "about a day ago"
msgstr "قبل يوم تقريبا"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1127
+#: lib/util.php:1126
msgid "about a month ago"
msgstr "قبل شهر تقريبًا"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1134
+#: lib/util.php:1133
msgid "about a year ago"
msgstr "قبل سنه تقريبًا"
diff --git a/locale/bg/LC_MESSAGES/statusnet.po b/locale/bg/LC_MESSAGES/statusnet.po
index 716c19a9a..5860ef4cf 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-08-28 15:28+0000\n"
-"PO-Revision-Date: 2010-08-28 15:29:01+0000\n"
+"POT-Creation-Date: 2010-09-05 09:45+0000\n"
+"PO-Revision-Date: 2010-09-05 09:45:23+0000\n"
"Language-Team: Bulgarian\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r71856); Translate extension (2010-08-20)\n"
+"X-Generator: MediaWiki 1.17alpha (r72319); Translate extension (2010-08-20)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: bg\n"
"X-Message-Group: out-statusnet\n"
@@ -553,7 +553,7 @@ msgid ""
msgstr ""
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:450
+#: actions/apioauthauthorize.php:310 lib/action.php:463
msgid "Account"
msgstr "Сметка"
@@ -946,7 +946,7 @@ msgstr "Ðе Ñте ÑобÑтвеник на това приложение."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1263
+#: lib/action.php:1307
msgid "There was a problem with your session token."
msgstr "Имаше проблем ÑÑŠÑ ÑеÑиÑта ви в Ñайта."
@@ -4186,7 +4186,7 @@ msgid "Plugins"
msgstr "ПриÑтавки"
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:789
+#: actions/version.php:198 lib/action.php:805
msgid "Version"
msgstr "ВерÑиÑ"
@@ -4287,7 +4287,7 @@ msgstr ""
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1751
+#: classes/Notice.php:1757
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -4307,7 +4307,7 @@ msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
msgstr ""
#. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:346
+#: classes/Status_network.php:339
msgid "Unable to save tag."
msgstr "Грешка при запазване на етикетите."
@@ -4389,165 +4389,165 @@ msgid "Other"
msgstr "Друго"
#. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:145
+#: lib/action.php:148
#, php-format
msgid "%1$s - %2$s"
msgstr "%1$s - %2$s"
#. TRANS: Page title for a page without a title set.
-#: lib/action.php:161
+#: lib/action.php:164
msgid "Untitled page"
msgstr "Ðеозаглавена Ñтраница"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:442
+#: lib/action.php:455
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr ""
#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:445
+#: lib/action.php:458
msgctxt "MENU"
msgid "Personal"
msgstr "Лично"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:447
+#: lib/action.php:460
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "ПромÑна на поща, аватар, парола, профил"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:452
+#: lib/action.php:465
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "Свързване към уÑлуги"
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:455
+#: lib/action.php:468
msgid "Connect"
msgstr "Свързване"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:458
+#: lib/action.php:471
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "ПромÑна наÑтройките на Ñайта"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:465
+#: lib/action.php:478
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "Поканете приÑтели и колеги да Ñе приÑъединÑÑ‚ към Ð²Ð°Ñ Ð² %s"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:474
+#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "Излизане от Ñайта"
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:477
+#: lib/action.php:490
msgctxt "MENU"
msgid "Logout"
msgstr "Изход"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:482
+#: lib/action.php:495
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Създаване на нова Ñметка"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:485
+#: lib/action.php:498
msgctxt "MENU"
msgid "Register"
msgstr "РегиÑтриране"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:488
+#: lib/action.php:501
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Влизане в Ñайта"
-#: lib/action.php:491
+#: lib/action.php:504
msgctxt "MENU"
msgid "Login"
msgstr "Вход"
-#: lib/action.php:497
+#: lib/action.php:510
msgctxt "MENU"
msgid "Help"
msgstr "Помощ"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:500
+#: lib/action.php:513
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "ТърÑене за хора или бележки"
-#: lib/action.php:503
+#: lib/action.php:516
msgctxt "MENU"
msgid "Search"
msgstr "ТърÑене"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:592
+#: lib/action.php:605
msgid "Local views"
msgstr ""
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:762
+#: lib/action.php:778
msgid "Secondary site navigation"
msgstr "ОÑновна наÑтройка на Ñайта"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:768
+#: lib/action.php:784
msgid "Help"
msgstr "Помощ"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:771
+#: lib/action.php:787
msgid "About"
msgstr "ОтноÑно"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:774
+#: lib/action.php:790
msgid "FAQ"
msgstr "ВъпроÑи"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:779
+#: lib/action.php:795
msgid "TOS"
msgstr "УÑловиÑ"
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:783
+#: lib/action.php:799
msgid "Privacy"
msgstr "ПоверителноÑÑ‚"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:786
+#: lib/action.php:802
msgid "Source"
msgstr "Изходен код"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:792
+#: lib/action.php:808
msgid "Contact"
msgstr "Контакт"
-#: lib/action.php:794
+#: lib/action.php:810
msgid "Badge"
msgstr "Табелка"
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:823
+#: lib/action.php:839
msgid "StatusNet software license"
msgstr "Лиценз на програмата StatusNet"
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:827
+#: lib/action.php:843
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4555,13 +4555,13 @@ msgid ""
msgstr ""
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:830
+#: lib/action.php:846
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr "**%%site.name%%** е уÑлуга за микроблогване."
#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:834
+#: lib/action.php:850
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4573,49 +4573,49 @@ msgstr ""
"licensing/licenses/agpl-3.0.html)."
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:850
+#: lib/action.php:866
msgid "Site content license"
msgstr "Лиценз на Ñъдържанието"
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:857
+#: lib/action.php:873
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:864
+#: lib/action.php:880
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:868
+#: lib/action.php:884
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:881
+#: lib/action.php:897
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr ""
#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1192
+#: lib/action.php:1236
msgid "Pagination"
msgstr "Страниране"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: present than the currently displayed information.
-#: lib/action.php:1203
+#: lib/action.php:1247
msgid "After"
msgstr "След"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: past than the currently displayed information.
-#: lib/action.php:1213
+#: lib/action.php:1257
msgid "Before"
msgstr "Преди"
@@ -4861,6 +4861,17 @@ msgstr "Грешка при повтарÑне на бележката."
msgid "Error saving notice."
msgstr "Грешка при запиÑване на бележката."
+#. TRANS: Error text shown when no username was provided when issuing a subscribe command.
+#: lib/command.php:655
+msgid "Specify the name of the user to subscribe to."
+msgstr ""
+
+#. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
+#. TRANS: Error text shown when no username was provided when issuing the command.
+#: lib/command.php:694 lib/command.php:804
+msgid "Specify the name of the user to unsubscribe from."
+msgstr ""
+
#. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
#. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
#: lib/command.php:724 lib/command.php:750
@@ -5840,7 +5851,7 @@ msgstr ""
msgid "The theme file is missing or the upload failed."
msgstr ""
-#: lib/themeuploader.php:139
+#: lib/themeuploader.php:147
msgid "Invalid theme: bad directory structure."
msgstr ""
@@ -5853,18 +5864,22 @@ msgstr ""
msgid "Invalid theme archive: missing file css/display.css"
msgstr ""
-#: lib/themeuploader.php:205
+#: lib/themeuploader.php:218
msgid ""
"Theme contains invalid file or folder name. Stick with ASCII letters, "
"digits, underscore, and minus sign."
msgstr ""
-#: lib/themeuploader.php:216
+#: lib/themeuploader.php:224
+msgid "Theme contains unsafe file extension names; may be unsafe."
+msgstr ""
+
+#: lib/themeuploader.php:241
#, php-format
msgid "Theme contains file of type '.%s', which is not allowed."
msgstr ""
-#: lib/themeuploader.php:234
+#: lib/themeuploader.php:259
msgid "Error opening theme archive."
msgstr "Грешка при изпращане на прÑкото Ñъобщение"
@@ -5931,56 +5946,56 @@ msgid "Moderator"
msgstr "Модератор"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1102
msgid "a few seconds ago"
msgstr "преди нÑколко Ñекунди"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1106
+#: lib/util.php:1105
msgid "about a minute ago"
msgstr "преди около минута"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1110
+#: lib/util.php:1109
#, php-format
msgid "about %d minutes ago"
msgstr "преди около %d минути"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1113
+#: lib/util.php:1112
msgid "about an hour ago"
msgstr "преди около чаÑ"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1117
+#: lib/util.php:1116
#, php-format
msgid "about %d hours ago"
msgstr "преди около %d чаÑа"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1120
+#: lib/util.php:1119
msgid "about a day ago"
msgstr "преди около ден"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1124
+#: lib/util.php:1123
#, php-format
msgid "about %d days ago"
msgstr "преди около %d дни"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1127
+#: lib/util.php:1126
msgid "about a month ago"
msgstr "преди около меÑец"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1131
+#: lib/util.php:1130
#, php-format
msgid "about %d months ago"
msgstr "преди около %d меÑеца"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1134
+#: lib/util.php:1133
msgid "about a year ago"
msgstr "преди около година"
diff --git a/locale/br/LC_MESSAGES/statusnet.po b/locale/br/LC_MESSAGES/statusnet.po
index 9b52a7df1..a2f4ce684 100644
--- a/locale/br/LC_MESSAGES/statusnet.po
+++ b/locale/br/LC_MESSAGES/statusnet.po
@@ -10,12 +10,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-28 15:28+0000\n"
-"PO-Revision-Date: 2010-08-28 15:29:08+0000\n"
+"POT-Creation-Date: 2010-09-05 09:45+0000\n"
+"PO-Revision-Date: 2010-09-05 09:45:30+0000\n"
"Language-Team: Dutch\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r71856); Translate extension (2010-08-20)\n"
+"X-Generator: MediaWiki 1.17alpha (r72319); Translate extension (2010-08-20)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: br\n"
"X-Message-Group: out-statusnet\n"
@@ -576,7 +576,7 @@ msgid ""
msgstr ""
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:450
+#: actions/apioauthauthorize.php:310 lib/action.php:463
msgid "Account"
msgstr "Kont"
@@ -977,7 +977,7 @@ msgstr "N'oc'h ket perc'henn ar poellad-se."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1263
+#: lib/action.php:1307
msgid "There was a problem with your session token."
msgstr "Ur gudenn 'zo bet gant ho jedaouer dalc'h."
@@ -4217,7 +4217,7 @@ msgid "Plugins"
msgstr "Pluginoù"
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:789
+#: actions/version.php:198 lib/action.php:805
msgid "Version"
msgstr "Stumm"
@@ -4337,7 +4337,7 @@ msgstr "Ur gudenn 'zo bet pa veze enrollet boest degemer ar strollad."
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1751
+#: classes/Notice.php:1757
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -4362,7 +4362,7 @@ msgid "Missing profile."
msgstr "Mankout a ra ar profil."
#. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:346
+#: classes/Status_network.php:339
msgid "Unable to save tag."
msgstr "Dibosupl eo enrollañ an tikedenn."
@@ -4464,189 +4464,189 @@ msgid "Other"
msgstr "All"
#. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:145
+#: lib/action.php:148
#, php-format
msgid "%1$s - %2$s"
msgstr "%1$s - %2$s"
#. TRANS: Page title for a page without a title set.
-#: lib/action.php:161
+#: lib/action.php:164
msgid "Untitled page"
msgstr "Pajenn hep anv"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:442
+#: lib/action.php:455
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr ""
#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:445
+#: lib/action.php:458
msgctxt "MENU"
msgid "Personal"
msgstr "Personel"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:447
+#: lib/action.php:460
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "Kemmañ ho chomlec'h postel, hoc'h avatar, ho ger-tremen, ho profil"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:452
+#: lib/action.php:465
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "Liammañ d'ar servijoù"
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:455
+#: lib/action.php:468
msgid "Connect"
msgstr "Kevreañ"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:458
+#: lib/action.php:471
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "Kemmañ arventennoù al lec'hienn"
#. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:461
+#: lib/action.php:474
msgctxt "MENU"
msgid "Admin"
msgstr "Merañ"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:465
+#: lib/action.php:478
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "Pediñ mignoned hag kenseurted da zont ganeoc'h war %s"
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:468
+#: lib/action.php:481
msgctxt "MENU"
msgid "Invite"
msgstr "Pediñ"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:474
+#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "Digevreañ diouzh al lec'hienn"
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:477
+#: lib/action.php:490
msgctxt "MENU"
msgid "Logout"
msgstr "Digevreañ"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:482
+#: lib/action.php:495
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Krouiñ ur gont"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:485
+#: lib/action.php:498
msgctxt "MENU"
msgid "Register"
msgstr "En em enskrivañ"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:488
+#: lib/action.php:501
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Kevreañ d'al lec'hienn"
-#: lib/action.php:491
+#: lib/action.php:504
msgctxt "MENU"
msgid "Login"
msgstr "Kevreañ"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:494
+#: lib/action.php:507
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Sikour din !"
-#: lib/action.php:497
+#: lib/action.php:510
msgctxt "MENU"
msgid "Help"
msgstr "Skoazell"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:500
+#: lib/action.php:513
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "Klask tud pe un tamm testenn"
-#: lib/action.php:503
+#: lib/action.php:516
msgctxt "MENU"
msgid "Search"
msgstr "Klask"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:525 lib/adminpanelaction.php:400
+#: lib/action.php:538 lib/adminpanelaction.php:400
msgid "Site notice"
msgstr "Ali al lec'hienn"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:592
+#: lib/action.php:605
msgid "Local views"
msgstr "Selloù lec'hel"
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:659
+#: lib/action.php:675
msgid "Page notice"
msgstr "Ali ar bajenn"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:768
+#: lib/action.php:784
msgid "Help"
msgstr "Skoazell"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:771
+#: lib/action.php:787
msgid "About"
msgstr "Diwar-benn"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:774
+#: lib/action.php:790
msgid "FAQ"
msgstr "FAG"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:779
+#: lib/action.php:795
msgid "TOS"
msgstr "AIH"
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:783
+#: lib/action.php:799
msgid "Privacy"
msgstr "Prevezded"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:786
+#: lib/action.php:802
msgid "Source"
msgstr "Mammenn"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:792
+#: lib/action.php:808
msgid "Contact"
msgstr "Darempred"
-#: lib/action.php:794
+#: lib/action.php:810
msgid "Badge"
msgstr "Badj"
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:823
+#: lib/action.php:839
msgid "StatusNet software license"
msgstr "Aotre-implijout ar meziant StatusNet"
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:827
+#: lib/action.php:843
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4654,13 +4654,13 @@ msgid ""
msgstr ""
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:830
+#: lib/action.php:846
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr "**%%site.name%%** a zo ur servij microblogging."
#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:834
+#: lib/action.php:850
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4669,42 +4669,42 @@ msgid ""
msgstr ""
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:850
+#: lib/action.php:866
msgid "Site content license"
msgstr "Aotre-implijout diwar-benn danvez al lec'hienn"
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:864
+#: lib/action.php:880
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:868
+#: lib/action.php:884
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:881
+#: lib/action.php:897
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr ""
#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1192
+#: lib/action.php:1236
msgid "Pagination"
msgstr "Pajennadur"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: present than the currently displayed information.
-#: lib/action.php:1203
+#: lib/action.php:1247
msgid "After"
msgstr "War-lerc'h"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: past than the currently displayed information.
-#: lib/action.php:1213
+#: lib/action.php:1257
msgid "Before"
msgstr "Kent"
@@ -5059,6 +5059,18 @@ msgstr "Kemennoù gweredekaet"
msgid "Can't turn on notification."
msgstr "Dibosupl eo gweredekaat ar c'hemennoù."
+#. TRANS: Error text shown when issuing the login command while login is disabled.
+#: lib/command.php:771
+msgid "Login command is disabled."
+msgstr ""
+
+#. TRANS: Text shown after issuing the login command successfully.
+#. TRANS: %s is a logon link..
+#: lib/command.php:784
+#, php-format
+msgid "This link is useable only once and is valid for only 2 minutes: %s."
+msgstr ""
+
#. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
#: lib/command.php:831
msgid "You are not subscribed to anyone."
@@ -5706,6 +5718,11 @@ msgstr "Boest kas"
msgid "Your sent messages"
msgstr "Ar c'hemenadennoù kaset ganeoc'h"
+#: lib/personaltagcloudsection.php:56
+#, php-format
+msgid "Tags in %s's notices"
+msgstr ""
+
#: lib/plugin.php:115
msgid "Unknown"
msgstr "Dianav"
@@ -5858,7 +5875,7 @@ msgstr ""
msgid "The theme file is missing or the upload failed."
msgstr ""
-#: lib/themeuploader.php:139
+#: lib/themeuploader.php:147
msgid "Invalid theme: bad directory structure."
msgstr ""
@@ -5871,13 +5888,17 @@ msgstr ""
msgid "Invalid theme archive: missing file css/display.css"
msgstr ""
-#: lib/themeuploader.php:205
+#: lib/themeuploader.php:218
msgid ""
"Theme contains invalid file or folder name. Stick with ASCII letters, "
"digits, underscore, and minus sign."
msgstr ""
-#: lib/themeuploader.php:216
+#: lib/themeuploader.php:224
+msgid "Theme contains unsafe file extension names; may be unsafe."
+msgstr ""
+
+#: lib/themeuploader.php:241
#, php-format
msgid "Theme contains file of type '.%s', which is not allowed."
msgstr ""
@@ -5941,56 +5962,56 @@ msgid "Moderator"
msgstr "Habasker"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1102
msgid "a few seconds ago"
msgstr "un nebeud eilennoù zo"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1106
+#: lib/util.php:1105
msgid "about a minute ago"
msgstr "1 vunutenn zo well-wazh"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1110
+#: lib/util.php:1109
#, php-format
msgid "about %d minutes ago"
msgstr "%d munutenn zo well-wazh"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1113
+#: lib/util.php:1112
msgid "about an hour ago"
msgstr "1 eurvezh zo well-wazh"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1117
+#: lib/util.php:1116
#, php-format
msgid "about %d hours ago"
msgstr "%d eurvezh zo well-wazh"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1120
+#: lib/util.php:1119
msgid "about a day ago"
msgstr "1 devezh zo well-wazh"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1124
+#: lib/util.php:1123
#, php-format
msgid "about %d days ago"
msgstr "%d devezh zo well-wazh"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1127
+#: lib/util.php:1126
msgid "about a month ago"
msgstr "miz zo well-wazh"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1131
+#: lib/util.php:1130
#, php-format
msgid "about %d months ago"
msgstr "%d miz zo well-wazh"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1134
+#: lib/util.php:1133
msgid "about a year ago"
msgstr "bloaz zo well-wazh"
diff --git a/locale/ca/LC_MESSAGES/statusnet.po b/locale/ca/LC_MESSAGES/statusnet.po
index abf54ddc6..81506cf01 100644
--- a/locale/ca/LC_MESSAGES/statusnet.po
+++ b/locale/ca/LC_MESSAGES/statusnet.po
@@ -11,12 +11,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-28 15:28+0000\n"
-"PO-Revision-Date: 2010-08-28 15:29:14+0000\n"
+"POT-Creation-Date: 2010-09-05 09:45+0000\n"
+"PO-Revision-Date: 2010-09-05 09:45:36+0000\n"
"Language-Team: Catalan\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r71856); Translate extension (2010-08-20)\n"
+"X-Generator: MediaWiki 1.17alpha (r72319); Translate extension (2010-08-20)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ca\n"
"X-Message-Group: out-statusnet\n"
@@ -614,7 +614,7 @@ msgstr ""
"hauríeu de donar accés al compte %4$s a terceres parts en què confieu."
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:450
+#: actions/apioauthauthorize.php:310 lib/action.php:463
msgid "Account"
msgstr "Compte"
@@ -1025,7 +1025,7 @@ msgstr "No sou el propietari d'aquesta aplicació."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1263
+#: lib/action.php:1307
msgid "There was a problem with your session token."
msgstr "S'ha produït un problema amb el testimoni de la vostra sessió."
@@ -4827,7 +4827,7 @@ msgid "Plugins"
msgstr "Connectors"
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:789
+#: actions/version.php:198 lib/action.php:805
msgid "Version"
msgstr "Versió"
@@ -4989,7 +4989,7 @@ msgstr "S'ha produït un problema en desar la safata d'entrada del grup."
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1751
+#: classes/Notice.php:1757
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -5016,7 +5016,7 @@ msgid "Missing profile."
msgstr "Manca el perfil."
#. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:346
+#: classes/Status_network.php:339
msgid "Unable to save tag."
msgstr "No s'ha pogut desar l'etiqueta."
@@ -5118,199 +5118,199 @@ msgid "Other"
msgstr "Altres"
#. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:145
+#: lib/action.php:148
#, php-format
msgid "%1$s - %2$s"
msgstr "%1$s - %2$s"
#. TRANS: Page title for a page without a title set.
-#: lib/action.php:161
+#: lib/action.php:164
msgid "Untitled page"
msgstr "Pàgina sense titol"
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:436
+#: lib/action.php:449
msgid "Primary site navigation"
msgstr "Navegació primària del lloc"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:442
+#: lib/action.php:455
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr "Perfil personal i línia temporal dels amics"
#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:445
+#: lib/action.php:458
msgctxt "MENU"
msgid "Personal"
msgstr "Personal"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:447
+#: lib/action.php:460
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "Canvia l'adreça electrònica, l'avatar, la contrasenya o el perfil"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:452
+#: lib/action.php:465
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "Connecta als serveis"
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:455
+#: lib/action.php:468
msgid "Connect"
msgstr "Connexió"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:458
+#: lib/action.php:471
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "Canvia la configuració del lloc"
#. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:461
+#: lib/action.php:474
msgctxt "MENU"
msgid "Admin"
msgstr "Administrador"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:465
+#: lib/action.php:478
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "Convida amics i coneguts perquè participin a %s"
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:468
+#: lib/action.php:481
msgctxt "MENU"
msgid "Invite"
msgstr "Convida"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:474
+#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "Finalitza la sessió del lloc"
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:477
+#: lib/action.php:490
msgctxt "MENU"
msgid "Logout"
msgstr "Finalitza la sessió"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:482
+#: lib/action.php:495
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Crea un compte"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:485
+#: lib/action.php:498
msgctxt "MENU"
msgid "Register"
msgstr "Registre"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:488
+#: lib/action.php:501
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Inicia una sessió al lloc"
-#: lib/action.php:491
+#: lib/action.php:504
msgctxt "MENU"
msgid "Login"
msgstr "Inici de sessió"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:494
+#: lib/action.php:507
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Ajuda'm!"
-#: lib/action.php:497
+#: lib/action.php:510
msgctxt "MENU"
msgid "Help"
msgstr "Ajuda"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:500
+#: lib/action.php:513
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "Cerca gent o text"
-#: lib/action.php:503
+#: lib/action.php:516
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:525 lib/adminpanelaction.php:400
+#: lib/action.php:538 lib/adminpanelaction.php:400
msgid "Site notice"
msgstr "Avís del lloc"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:592
+#: lib/action.php:605
msgid "Local views"
msgstr "Vistes locals"
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:659
+#: lib/action.php:675
msgid "Page notice"
msgstr "Avís de pàgina"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:762
+#: lib/action.php:778
msgid "Secondary site navigation"
msgstr "Navegació del lloc secundària"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:768
+#: lib/action.php:784
msgid "Help"
msgstr "Ajuda"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:771
+#: lib/action.php:787
msgid "About"
msgstr "Quant a"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:774
+#: lib/action.php:790
msgid "FAQ"
msgstr "Preguntes més freqüents"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:779
+#: lib/action.php:795
msgid "TOS"
msgstr "Termes del servei"
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:783
+#: lib/action.php:799
msgid "Privacy"
msgstr "Privadesa"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:786
+#: lib/action.php:802
msgid "Source"
msgstr "Font"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:792
+#: lib/action.php:808
msgid "Contact"
msgstr "Contacte"
-#: lib/action.php:794
+#: lib/action.php:810
msgid "Badge"
msgstr "Insígnia"
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:823
+#: lib/action.php:839
msgid "StatusNet software license"
msgstr "Llicència del programari StatusNet"
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:827
+#: lib/action.php:843
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5320,13 +5320,13 @@ msgstr ""
"site.broughtbyurl%%)."
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:830
+#: lib/action.php:846
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr "**%%site.name%%** és un servei de microblogging."
#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:834
+#: lib/action.php:850
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5338,34 +5338,34 @@ msgstr ""
"org/licensing/licenses/agpl-3.0.html)."
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:850
+#: lib/action.php:866
msgid "Site content license"
msgstr "Llicència de contingut del lloc"
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:857
+#: lib/action.php:873
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr "El contingut i les dades de %1$s són privades i confidencials."
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:864
+#: lib/action.php:880
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
"El contingut i les dades són copyright de %1$s. Tots els drets reservats."
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:868
+#: lib/action.php:884
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
"El contingut i les dades són copyright dels col·laboradors. Tots els drets "
"reservats."
#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:881
+#: lib/action.php:897
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr ""
@@ -5373,19 +5373,19 @@ msgstr ""
"llicència %2$s."
#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1192
+#: lib/action.php:1236
msgid "Pagination"
msgstr "Paginació"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: present than the currently displayed information.
-#: lib/action.php:1203
+#: lib/action.php:1247
msgid "After"
msgstr "Posteriors"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: past than the currently displayed information.
-#: lib/action.php:1213
+#: lib/action.php:1257
msgid "Before"
msgstr "Anteriors"
@@ -5645,6 +5645,13 @@ msgstr "Comanda completada"
msgid "Command failed"
msgstr "Comanda fallida"
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:150
+#, php-format
+msgid "Could not find a local user with nickname %s."
+msgstr "No s'ha pogut trobar un usuari local amb el sobrenom %s."
+
#. TRANS: Error text shown when an unimplemented command is given.
#: lib/command.php:185
msgid "Sorry, this command is not yet implemented."
@@ -5675,6 +5682,20 @@ msgstr ""
msgid "Notice marked as fave."
msgstr "L'avís està marcat com a preferit."
+#. TRANS: Message given having added a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:360
+#, php-format
+msgid "%1$s joined group %2$s."
+msgstr "%1$s s'ha unit al grup %2$s."
+
+#. TRANS: Message given having removed a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:408
+#, php-format
+msgid "%1$s left group %2$s."
+msgstr "%1$s ha deixat el grup %2$s."
+
#. TRANS: Whois output. %s is the full name of the queried user.
#: lib/command.php:434
#, php-format
@@ -5729,6 +5750,20 @@ msgstr "S'ha produït un error en enviar el missatge directe."
msgid "Error repeating notice."
msgstr "S'ha produït un error en repetir l'avís."
+#. TRANS: Message given if content of a notice for a reply is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:592
+#, php-format
+msgid "Notice too long - maximum is %1$d characters, you sent %2$d."
+msgstr "L'avís és massa llarg - el màxim és %1$d caràcters, n'heu enviat %2$d."
+
+#. TRANS: Text shown having sent a reply to a notice successfully.
+#. TRANS: %s is the nickname of the user of the notice the reply was sent to.
+#: lib/command.php:603
+#, php-format
+msgid "Reply to %s sent."
+msgstr "S'ha enviat la resposta a %s."
+
#. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
#: lib/command.php:606
msgid "Error saving notice."
@@ -5739,6 +5774,26 @@ msgstr "S'ha produït un error en desar l'avís."
msgid "Can't subscribe to OMB profiles by command."
msgstr "No es pot subscriure a perfils de OMB amb ordres."
+#. TRANS: Text shown after having subscribed to another user successfully.
+#. TRANS: %s is the name of the user the subscription was requested for.
+#: lib/command.php:672
+#, php-format
+msgid "Subscribed to %s."
+msgstr "Subscrit a %s."
+
+#. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
+#. TRANS: Error text shown when no username was provided when issuing the command.
+#: lib/command.php:694 lib/command.php:804
+msgid "Specify the name of the user to unsubscribe from."
+msgstr "Especifiqueu el nom de l'usuari del qui voleu deixar la subscripció."
+
+#. TRANS: Text shown after having unsubscribed from another user successfully.
+#. TRANS: %s is the name of the user the unsubscription was requested for.
+#: lib/command.php:705
+#, php-format
+msgid "Unsubscribed from %s."
+msgstr "S'ha deixat d'estar subscrit a %s."
+
#. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
#. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
#: lib/command.php:724 lib/command.php:750
@@ -5765,6 +5820,27 @@ msgstr "Avisos activitats."
msgid "Can't turn on notification."
msgstr "No es poden activar els avisos."
+#. TRANS: Error text shown when issuing the login command while login is disabled.
+#: lib/command.php:771
+msgid "Login command is disabled."
+msgstr "L'ordre d'inici de sessió no està habilitada."
+
+#. TRANS: Text shown after issuing the login command successfully.
+#. TRANS: %s is a logon link..
+#: lib/command.php:784
+#, php-format
+msgid "This link is useable only once and is valid for only 2 minutes: %s."
+msgstr ""
+"Aquest enllaç només es pot fer servir una vegada i només és vàlid durant 2 "
+"minuts: %s."
+
+#. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
+#. TRANS: %s is the name of the user the unsubscription was requested for.
+#: lib/command.php:813
+#, php-format
+msgid "Unsubscribed %s."
+msgstr "S'ha cancel·lat la subscripció de %s."
+
#. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
#: lib/command.php:831
msgid "You are not subscribed to anyone."
@@ -6633,7 +6709,7 @@ msgstr "a"
#: lib/noticelist.php:502
msgid "web"
-msgstr ""
+msgstr "web"
#: lib/noticelist.php:568
msgid "in context"
@@ -6913,12 +6989,12 @@ msgid "The theme file is missing or the upload failed."
msgstr "Manca el fitxer del tema o la pujada ha fallat."
#: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:253 lib/themeuploader.php:257
-#: lib/themeuploader.php:265 lib/themeuploader.php:272
+#: lib/themeuploader.php:278 lib/themeuploader.php:282
+#: lib/themeuploader.php:290 lib/themeuploader.php:297
msgid "Failed saving theme."
msgstr "Ha fallat el desament del tema."
-#: lib/themeuploader.php:139
+#: lib/themeuploader.php:147
msgid "Invalid theme: bad directory structure."
msgstr "El tema no és vàlid: l'estructura del directori no és correcta"
@@ -6932,7 +7008,7 @@ msgstr ""
msgid "Invalid theme archive: missing file css/display.css"
msgstr "L'arxiu del tema no és vàlid: manca el fitxer css/display.css"
-#: lib/themeuploader.php:205
+#: lib/themeuploader.php:218
msgid ""
"Theme contains invalid file or folder name. Stick with ASCII letters, "
"digits, underscore, and minus sign."
@@ -6940,12 +7016,16 @@ msgstr ""
"El tema conté un fitxer o un nom de carpeta que no és vàlida. Feu servir "
"només lletres ASCII, dígits, caràcters de subratllat i el símbol de menys."
-#: lib/themeuploader.php:216
+#: lib/themeuploader.php:224
+msgid "Theme contains unsafe file extension names; may be unsafe."
+msgstr ""
+
+#: lib/themeuploader.php:241
#, php-format
msgid "Theme contains file of type '.%s', which is not allowed."
msgstr "El tema conté un tipus de fitxer «.%s», que no està permès."
-#: lib/themeuploader.php:234
+#: lib/themeuploader.php:259
msgid "Error opening theme archive."
msgstr "S'ha produït un error en obrir l'arxiu del tema."
@@ -7024,56 +7104,56 @@ msgid "Moderator"
msgstr "Moderador"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1102
msgid "a few seconds ago"
msgstr "fa pocs segons"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1106
+#: lib/util.php:1105
msgid "about a minute ago"
msgstr "fa un minut"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1110
+#: lib/util.php:1109
#, php-format
msgid "about %d minutes ago"
msgstr "fa %d minuts"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1113
+#: lib/util.php:1112
msgid "about an hour ago"
msgstr "fa una hora"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1117
+#: lib/util.php:1116
#, php-format
msgid "about %d hours ago"
msgstr "fa %d hores"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1120
+#: lib/util.php:1119
msgid "about a day ago"
msgstr "fa un dia"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1124
+#: lib/util.php:1123
#, php-format
msgid "about %d days ago"
msgstr "fa %d dies"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1127
+#: lib/util.php:1126
msgid "about a month ago"
msgstr "fa un mes"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1131
+#: lib/util.php:1130
#, php-format
msgid "about %d months ago"
msgstr "fa %d mesos"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1134
+#: lib/util.php:1133
msgid "about a year ago"
msgstr "fa un any"
diff --git a/locale/cs/LC_MESSAGES/statusnet.po b/locale/cs/LC_MESSAGES/statusnet.po
index 77cd2ee92..86cf82012 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-08-28 15:28+0000\n"
-"PO-Revision-Date: 2010-08-28 15:29:16+0000\n"
+"POT-Creation-Date: 2010-09-05 09:45+0000\n"
+"PO-Revision-Date: 2010-09-05 09:45:38+0000\n"
"Language-Team: Czech\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r71856); Translate extension (2010-08-20)\n"
+"X-Generator: MediaWiki 1.17alpha (r72319); Translate extension (2010-08-20)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: cs\n"
"X-Message-Group: out-statusnet\n"
@@ -690,7 +690,7 @@ msgstr "Potvrzující kód nebyl nalezen"
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1263
+#: lib/action.php:1307
msgid "There was a problem with your session token."
msgstr ""
@@ -3395,7 +3395,7 @@ msgstr ""
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1751
+#: classes/Notice.php:1757
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
@@ -3472,149 +3472,149 @@ msgid "Other"
msgstr ""
#. TRANS: Page title for a page without a title set.
-#: lib/action.php:161
+#: lib/action.php:164
msgid "Untitled page"
msgstr ""
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:436
+#: lib/action.php:449
msgid "Primary site navigation"
msgstr ""
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:442
+#: lib/action.php:455
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr ""
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:447
+#: lib/action.php:460
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr ""
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:452
+#: lib/action.php:465
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr ""
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:455
+#: lib/action.php:468
msgid "Connect"
msgstr "Připojit"
#. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:461
+#: lib/action.php:474
msgctxt "MENU"
msgid "Admin"
msgstr ""
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:465
+#: lib/action.php:478
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr ""
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:468
+#: lib/action.php:481
msgctxt "MENU"
msgid "Invite"
msgstr ""
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:474
+#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr ""
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:477
+#: lib/action.php:490
msgctxt "MENU"
msgid "Logout"
msgstr "Logo"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:482
+#: lib/action.php:495
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr ""
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:488
+#: lib/action.php:501
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr ""
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:494
+#: lib/action.php:507
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Nápověda"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:500
+#: lib/action.php:513
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr ""
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:592
+#: lib/action.php:605
msgid "Local views"
msgstr ""
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:762
+#: lib/action.php:778
msgid "Secondary site navigation"
msgstr ""
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:768
+#: lib/action.php:784
msgid "Help"
msgstr "Nápověda"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:771
+#: lib/action.php:787
msgid "About"
msgstr "O nás"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:774
+#: lib/action.php:790
msgid "FAQ"
msgstr "FAQ"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:779
+#: lib/action.php:795
msgid "TOS"
msgstr ""
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:783
+#: lib/action.php:799
msgid "Privacy"
msgstr "Soukromí"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:786
+#: lib/action.php:802
msgid "Source"
msgstr "Zdroj"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:792
+#: lib/action.php:808
msgid "Contact"
msgstr "Kontakt"
-#: lib/action.php:794
+#: lib/action.php:810
msgid "Badge"
msgstr ""
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:823
+#: lib/action.php:839
msgid "StatusNet software license"
msgstr ""
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:827
+#: lib/action.php:843
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -3622,13 +3622,13 @@ msgid ""
msgstr ""
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:830
+#: lib/action.php:846
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr "**%%site.name%%** je služba mikroblogů."
#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:834
+#: lib/action.php:850
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -3641,43 +3641,43 @@ msgstr ""
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:857
+#: lib/action.php:873
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:864
+#: lib/action.php:880
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:868
+#: lib/action.php:884
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:881
+#: lib/action.php:897
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr ""
#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1192
+#: lib/action.php:1236
msgid "Pagination"
msgstr ""
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: present than the currently displayed information.
-#: lib/action.php:1203
+#: lib/action.php:1247
msgid "After"
msgstr ""
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: past than the currently displayed information.
-#: lib/action.php:1213
+#: lib/action.php:1257
msgid "Before"
msgstr ""
@@ -3848,6 +3848,20 @@ msgstr ""
msgid "Notice with that id does not exist."
msgstr ""
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:130
+#, php-format
+msgid "Could not find a user with nickname %s."
+msgstr ""
+
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:150
+#, php-format
+msgid "Could not find a local user with nickname %s."
+msgstr ""
+
#. TRANS: Error text shown when an unimplemented command is given.
#: lib/command.php:185
msgid "Sorry, this command is not yet implemented."
@@ -4726,7 +4740,7 @@ msgstr ""
msgid "The theme file is missing or the upload failed."
msgstr ""
-#: lib/themeuploader.php:139
+#: lib/themeuploader.php:147
msgid "Invalid theme: bad directory structure."
msgstr ""
@@ -4739,13 +4753,17 @@ msgstr ""
msgid "Invalid theme archive: missing file css/display.css"
msgstr ""
-#: lib/themeuploader.php:205
+#: lib/themeuploader.php:218
msgid ""
"Theme contains invalid file or folder name. Stick with ASCII letters, "
"digits, underscore, and minus sign."
msgstr ""
-#: lib/themeuploader.php:216
+#: lib/themeuploader.php:224
+msgid "Theme contains unsafe file extension names; may be unsafe."
+msgstr ""
+
+#: lib/themeuploader.php:241
#, php-format
msgid "Theme contains file of type '.%s', which is not allowed."
msgstr ""
@@ -4805,56 +4823,56 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1102
msgid "a few seconds ago"
msgstr "před pár sekundami"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1106
+#: lib/util.php:1105
msgid "about a minute ago"
msgstr "asi před minutou"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1110
+#: lib/util.php:1109
#, php-format
msgid "about %d minutes ago"
msgstr "asi před %d minutami"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1113
+#: lib/util.php:1112
msgid "about an hour ago"
msgstr "asi před hodinou"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1117
+#: lib/util.php:1116
#, php-format
msgid "about %d hours ago"
msgstr "asi před %d hodinami"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1120
+#: lib/util.php:1119
msgid "about a day ago"
msgstr "asi přede dnem"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1124
+#: lib/util.php:1123
#, php-format
msgid "about %d days ago"
msgstr "před %d dny"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1127
+#: lib/util.php:1126
msgid "about a month ago"
msgstr "asi před měsícem"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1131
+#: lib/util.php:1130
#, php-format
msgid "about %d months ago"
msgstr "asi před %d mesíci"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1134
+#: lib/util.php:1133
msgid "about a year ago"
msgstr "asi před rokem"
diff --git a/locale/da/LC_MESSAGES/statusnet.po b/locale/da/LC_MESSAGES/statusnet.po
index 1178cb701..43abd798f 100644
--- a/locale/da/LC_MESSAGES/statusnet.po
+++ b/locale/da/LC_MESSAGES/statusnet.po
@@ -8,12 +8,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-28 15:28+0000\n"
-"PO-Revision-Date: 2010-08-28 15:29:21+0000\n"
+"POT-Creation-Date: 2010-09-05 09:45+0000\n"
+"PO-Revision-Date: 2010-09-05 09:45:42+0000\n"
"Language-Team: Danish\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r71856); Translate extension (2010-08-20)\n"
+"X-Generator: MediaWiki 1.17alpha (r72319); Translate extension (2010-08-20)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: da\n"
"X-Message-Group: out-statusnet\n"
@@ -171,6 +171,18 @@ msgid ""
"You can try to [nudge %1$s](../%2$s) from their profile or [post something "
"to them](%%%%action.newnotice%%%%?status_textarea=%3$s)."
msgstr ""
+"Du kan forsøge at [puffe %1$s](../%2$s) fra hans eller hendes profil eller "
+"[skriv noget som fanger hans eller hendes opmærksomhed](%%%%action.newnotice%"
+"%%%?status_textarea=%3$s)."
+
+#: actions/all.php:149 actions/replies.php:210 actions/showstream.php:211
+#, php-format
+msgid ""
+"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
+"post a notice to them."
+msgstr ""
+"Hvorfor ikke [registrere en konto ](%%%%action.register%%%%) og derefter "
+"puffe %s eller sende en meddelelse til hans eller hendes opmærksomhed."
#. TRANS: H1 text
#: actions/all.php:182
@@ -350,6 +362,10 @@ msgstr "Denne status er ikke en favorit."
msgid "Could not delete favorite."
msgstr "Kunne ikke slette favorit."
+#: actions/apifriendshipscreate.php:109
+msgid "Could not follow user: profile not found."
+msgstr "Kunne ikke følge bruger: bruger profil ikke fundet."
+
#: actions/apifriendshipscreate.php:118
#, php-format
msgid "Could not follow user: %s is already on your list."
@@ -365,7 +381,7 @@ msgstr "Du kan ikke ophæve følgeskab til dig selv."
#: actions/apifriendshipsexists.php:91
msgid "Two valid IDs or screen_names must be supplied."
-msgstr ""
+msgstr "To gyldige bruger ID'er eller skærm-navne skal angives."
#: actions/apifriendshipsshow.php:134
msgid "Could not determine source user."
@@ -499,6 +515,10 @@ msgstr "%s's grupper"
msgid "groups on %s"
msgstr "grupper på %s"
+#: actions/apimediaupload.php:99
+msgid "Upload failed."
+msgstr "Upload mislykkedes."
+
#: actions/apioauthauthorize.php:101
msgid "No oauth_token parameter provided."
msgstr "Ingen oauth_token parameter angivet."
@@ -583,7 +603,7 @@ msgstr ""
"til tredjemand du stoler på."
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:450
+#: actions/apioauthauthorize.php:310 lib/action.php:463
msgid "Account"
msgstr "Konto"
@@ -646,7 +666,7 @@ msgstr "Ingen status med dette ID fundet."
#: actions/apistatusesupdate.php:221
msgid "Client must provide a 'status' parameter with a value."
-msgstr ""
+msgstr "Klienten programmet skal give en \"status\" parameter med en værdi."
#: actions/apistatusesupdate.php:242 actions/newnotice.php:157
#: lib/mailhandler.php:60
@@ -717,6 +737,10 @@ msgstr "Bekendtgørelser tagged med %s"
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Opdateringer tagged med %1$s på %2$s!"
+#: actions/apitrends.php:87
+msgid "API method under construction."
+msgstr "API metode under udvikling."
+
#: actions/attachment.php:73
msgid "No such attachment."
msgstr "Ingen sådan fil."
@@ -988,7 +1012,7 @@ msgstr "Du er ikke ejer af dette program."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1263
+#: lib/action.php:1307
msgid "There was a problem with your session token."
msgstr "Der var et problem med din session token."
@@ -1830,17 +1854,59 @@ msgstr "Mislykket ajourføring af logo."
msgid "%s group members"
msgstr "%s gruppe medlemmer"
+#: actions/groupmembers.php:103
+#, php-format
+msgid "%1$s group members, page %2$d"
+msgstr "%1$s gruppe medlemmer, side %2$d"
+
+#: actions/groupmembers.php:118
+msgid "A list of the users in this group."
+msgstr "En liste over brugerne i denne gruppe."
+
#: actions/groupmembers.php:182 lib/groupnav.php:107
msgid "Admin"
-msgstr ""
+msgstr "Administrator"
+
+#: actions/groupmembers.php:392 lib/blockform.php:69
+msgid "Block"
+msgstr "Bloker"
+
+#: actions/groupmembers.php:487
+msgid "Make user an admin of the group"
+msgstr "Gør bruger til administrator af gruppen"
#: actions/groupmembers.php:519
msgid "Make Admin"
-msgstr ""
+msgstr "Gør til administrator"
#: actions/groupmembers.php:519
msgid "Make this user an admin"
-msgstr ""
+msgstr "Gør denne bruger til administrator"
+
+#. TRANS: Message is used as link title. %s is a user nickname.
+#. TRANS: Title in atom group notice feed. %s is a group name.
+#. TRANS: Title in atom user notice feed. %s is a user name.
+#: actions/grouprss.php:139 actions/userrss.php:94
+#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:69
+#, php-format
+msgid "%s timeline"
+msgstr "%s tidslinie"
+
+#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
+#: actions/grouprss.php:142
+#, php-format
+msgid "Updates from members of %1$s on %2$s!"
+msgstr "Opdateringer fra medlemmer af %1$s på %2$s!"
+
+#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+msgid "Groups"
+msgstr "Grupper"
+
+#: actions/groups.php:64
+#, php-format
+msgid "Groups, page %d"
+msgstr "Grupper, side %d"
#: actions/groups.php:90
#, php-format
@@ -1851,10 +1917,15 @@ msgid ""
"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
"%%%%)"
msgstr ""
+"%%%%Site.name%%%% grupperne hjælper dig med at finde og snakke med folk med "
+"samme interesser. NÃ¥r du har tilmeldt sig en gruppe, kan du sende besked til "
+"alle andre medlemmer ved hjælp af syntaksen \"! Gruppenavn\". Kan du ikke se "
+"en gruppe, du kan lide? Prøv at [søger efter en] (%%%%action.groupsearch%%%"
+"%) eller [start din egen gruppe!] (%%%%action.newgroup%%%%)"
#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
msgid "Create a new group"
-msgstr ""
+msgstr "Opret en ny gruppe"
#: actions/groupsearch.php:52
#, php-format
@@ -1862,15 +1933,18 @@ 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øg efter grupper på %%site.name%% efter navn, beliggenhed eller "
+"beskrivelse. Adskil søge vilkår med mellemrum, de skal mindst være 3 "
+"karakterer eller derover."
#: actions/groupsearch.php:58
msgid "Group search"
-msgstr ""
+msgstr "Gruppe søgning"
#: actions/groupsearch.php:79 actions/noticesearch.php:117
#: actions/peoplesearch.php:83
msgid "No results."
-msgstr ""
+msgstr "Ingen resultater."
#: actions/groupsearch.php:82
#, php-format
@@ -1878,10 +1952,34 @@ msgid ""
"If you can't find the group you're looking for, you can [create it](%%action."
"newgroup%%) yourself."
msgstr ""
+"Hvis du ikke kan finde den gruppe du leder efter, kan du [oprette den] (%%"
+"action.newgroup%%) selv."
+
+#: actions/groupsearch.php:85
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and [create the group](%%"
+"action.newgroup%%) yourself!"
+msgstr ""
+"Hvorfor ikke [registrere en konto] (%%action.register%%) og [oprette "
+"gruppen] (%%action.newgroup%%) selv!"
+
+#: actions/groupunblock.php:91
+msgid "Only an admin can unblock group members."
+msgstr "Kun en administrator kan fjerne en blokering af gruppens medlemmer."
+
+#: actions/groupunblock.php:95
+msgid "User is not blocked from group."
+msgstr "Brugeren er ikke blokeret fra gruppen."
#: actions/groupunblock.php:128 actions/unblock.php:86
msgid "Error removing the block."
-msgstr ""
+msgstr "Fejl ved fjernelse af blokkering."
+
+#. TRANS: Title for instance messaging settings.
+#: actions/imsettings.php:60
+msgid "IM settings"
+msgstr "Chatindstillinger"
#. TRANS: Instant messaging settings page instructions.
#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
@@ -1892,6 +1990,34 @@ msgid ""
"You can send and receive notices through Jabber/GTalk [instant messages](%%"
"doc.im%%). Configure your address and settings below."
msgstr ""
+"Du kan sende og modtage meddelelser via Jabber/GTalk [instant messages] (%%"
+"doc.im%%). Konfigurer din adresse og indstillinger nedenfor."
+
+#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#: actions/imsettings.php:94
+msgid "IM is not available."
+msgstr "Chatbeskeder ikke tilgængelig."
+
+#. TRANS: Form legend for IM settings form.
+#. TRANS: Field label for IM address input in IM settings form.
+#: actions/imsettings.php:106 actions/imsettings.php:136
+msgid "IM address"
+msgstr "Chatbesked adresse"
+
+#: actions/imsettings.php:113
+msgid "Current confirmed Jabber/GTalk address."
+msgstr "Nuværende bekræftet Jabber / GTalk adresse."
+
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:124
+#, 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 ""
+"Afventer bekræftelse på denne adresse. Tjek din Jabber/GTalk konto for en "
+"besked med yderligere instruktioner. (Har du tilføje %s til din venneliste?)"
#. TRANS: IM address input field instructions in IM settings form.
#. TRANS: %s is the IM address set for the site.
@@ -1901,93 +2027,200 @@ msgid ""
"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
"add %s to your buddy list in your IM client or on GTalk."
msgstr ""
+"Jabber eller GTalk-adresse, som \"UserName@example.org\". Først skal du "
+"sørge for at tilføje %s til din venneliste i din IM klient eller på GTalk."
+
+#. TRANS: Form legend for IM preferences form.
+#: actions/imsettings.php:155
+msgid "IM preferences"
+msgstr "Chat indstillinger"
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:160
+msgid "Send me notices through Jabber/GTalk."
+msgstr "Send mig meddelelser via Jabber / GTalk."
#. TRANS: Checkbox label in IM preferences form.
#: actions/imsettings.php:166
msgid "Post a notice when my Jabber/GTalk status changes."
-msgstr ""
+msgstr "Send en note, når min Jabber / GTalk status ændringer."
#. TRANS: Checkbox label in IM preferences form.
#: actions/imsettings.php:172
msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+msgstr "Send mig svar gennem Jabber / GTalk fra folk, jeg ikke abonnerer på."
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:179
+msgid "Publish a MicroID for my Jabber/GTalk address."
+msgstr "Udgiv et MicroID for min Jabber / GTalk adresse."
+
+#. TRANS: Confirmation message for successful IM preferences save.
+#: actions/imsettings.php:287 actions/othersettings.php:180
+msgid "Preferences saved."
+msgstr "Indstillinger gemt."
+
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:309
+msgid "No Jabber ID."
+msgstr "Ingen Jabber ID."
+
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:317
+msgid "Cannot normalize that Jabber ID"
+msgstr "Kan ikke normalisere denne Jabber ID"
+
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:322
+msgid "Not a valid Jabber ID"
+msgstr "Ikke et gyldigt Jabber ID"
+
+#. TRANS: Message given saving IM address that is already set.
+#: actions/imsettings.php:326
+msgid "That is already your Jabber ID."
+msgstr "Det er allerede din Jabber ID."
+
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:330
+msgid "Jabber ID already belongs to another user."
+msgstr "Jabber ID tilhører allerede en anden bruger."
+
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:358
+#, php-format
+msgid ""
+"A confirmation code was sent to the IM address you added. You must approve %"
+"s for sending messages to you."
msgstr ""
+"En bekræftelse kode blev sendt til den IM-adresse, du har tilføjet. Du skal "
+"godkende %s for at sende beskeder til dig."
+
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:388
+msgid "That is the wrong IM address."
+msgstr "Det er den forkerte IM-adresse."
+
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:397
+msgid "Couldn't delete IM confirmation."
+msgstr "Kunne ikke slette IM bekræftelse."
+
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:402
+msgid "IM confirmation cancelled."
+msgstr "IM bekræftelse afbrudt."
+
+#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: registered for the active user.
+#: actions/imsettings.php:424
+msgid "That is not your Jabber ID."
+msgstr "Det er ikke din Jabber ID."
+
+#. TRANS: Message given after successfully removing a registered IM address.
+#: actions/imsettings.php:447
+msgid "The IM address was removed."
+msgstr "IM-adresse blev fjernet."
#: actions/inbox.php:59
#, php-format
msgid "Inbox for %1$s - page %2$d"
-msgstr ""
+msgstr "Indbakke for %1$s - side %2$d"
#: actions/inbox.php:62
#, php-format
msgid "Inbox for %s"
-msgstr ""
+msgstr "Indbakke for %s"
#: actions/inbox.php:115
msgid "This is your inbox, which lists your incoming private messages."
-msgstr ""
+msgstr "Dette er din indbakke, der viser dine indgående private beskeder."
#: actions/invite.php:39
msgid "Invites have been disabled."
-msgstr ""
+msgstr "Invitationer er blevet deaktiveret."
+
+#: actions/invite.php:41
+#, php-format
+msgid "You must be logged in to invite other users to use %s."
+msgstr "Du skal være logget ind for at invitere andre brugere til at bruge %s."
+
+#: actions/invite.php:72
+#, php-format
+msgid "Invalid email address: %s"
+msgstr "Ugyldig e-mail-adresse: %s"
#: actions/invite.php:110
msgid "Invitation(s) sent"
-msgstr ""
+msgstr "Invitation(er), sendt"
#: actions/invite.php:112
msgid "Invite new users"
-msgstr ""
+msgstr "Inviter nye brugere"
+
+#: actions/invite.php:128
+msgid "You are already subscribed to these users:"
+msgstr "Du er allerede tilmeldt disse brugere:"
#. TRANS: Whois output.
#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
#: actions/invite.php:131 actions/invite.php:139 lib/command.php:430
#, php-format
msgid "%1$s (%2$s)"
-msgstr ""
+msgstr "%1$s (%2$s)"
#: actions/invite.php:136
msgid ""
"These people are already users and you were automatically subscribed to them:"
msgstr ""
+"Disse mennesker er allerede brugere, og du blev automatisk tilmeldt til dem:"
#: actions/invite.php:144
msgid "Invitation(s) sent to the following people:"
-msgstr ""
+msgstr "Invitation(er) sendt til følgende personer:"
#: 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 ""
+"Du vil få besked, når din inviterede acceptere invitationen og tilmelder sig "
+"på netstedet. Tak for at du hjælper os med at vokse!"
#: actions/invite.php:162
msgid ""
"Use this form to invite your friends and colleagues to use this service."
msgstr ""
+"Brug denne formular til at invitere dine venner og kolleger til at bruge "
+"denne service."
+
+#: actions/invite.php:187
+msgid "Email addresses"
+msgstr "Email-adresser"
#: actions/invite.php:189
msgid "Addresses of friends to invite (one per line)"
-msgstr ""
+msgstr "Adresser på venner som skal inviteres (en pr linje)"
#: actions/invite.php:192
msgid "Personal message"
-msgstr ""
+msgstr "Personlig besked"
#: actions/invite.php:194
msgid "Optionally add a personal message to the invitation."
-msgstr ""
+msgstr "Hvis du vil, kan du tilføje en personlig besked til invitationen."
#. TRANS: Send button for inviting friends
#: actions/invite.php:198
msgctxt "BUTTON"
msgid "Send"
-msgstr ""
+msgstr "Send"
#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
#: actions/invite.php:228
#, php-format
msgid "%1$s has invited you to join them on %2$s"
-msgstr ""
+msgstr "%1$s har inviteret dig til at slutte sig til dem på %2$s"
#. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
#: actions/invite.php:231
@@ -2020,6 +2253,34 @@ msgid ""
"\n"
"Sincerely, %2$s\n"
msgstr ""
+"%1$s har inviteret dig til at slutte sig til sig på %2$s (%3$s). \n"
+"\n"
+"%2$s er en mikro-blogging-tjeneste, hvor du kan holde dig opdateret med folk "
+"du kender og folk, der interesserer dig. \n"
+"\n"
+"Du kan også dele nyheder om dig selv, dine tanker, eller dit liv online med "
+"folk, der kender dig. Det er også godt til at møde nye mennesker, der deler "
+"dine interesser. \n"
+"\n"
+"%1$s skrev: \n"
+"\n"
+"%4$s \n"
+"\n"
+"Du kan se %1$s's profil side på %2$s her: \n"
+"\n"
+" %5$s \n"
+"\n"
+"Hvis du gerne vil prøve tjenesten, skal du klikke på linket nedenfor for at "
+"acceptere invitationen. \n"
+"\n"
+" %6$s \n"
+"\n"
+"Hvis ikke, kan du ignorere denne besked. Tak for din tålmodighed og din "
+"tid. \n"
+"\n"
+"Med venlig hilsen,\n"
+"%2$s \n"
+" "
#: actions/login.php:148
msgid "Incorrect username or password."
@@ -2062,10 +2323,6 @@ msgstr ""
msgid "Can't get membership record for %1$s in group %2$s."
msgstr ""
-#: actions/microsummary.php:69
-msgid "No current status."
-msgstr ""
-
#. TRANS: Error text shown when trying to send a direct message to self.
#: actions/newmessage.php:164 lib/command.php:506
msgid ""
@@ -2076,24 +2333,6 @@ msgstr ""
msgid "Ajax Error"
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 ""
-
-#: actions/noticesearch.php:121
-#, php-format
-msgid ""
-"Be the first to [post on this topic](%%%%action.newnotice%%%%?"
-"status_textarea=%s)!"
-msgstr ""
-
#: actions/nudge.php:85
msgid ""
"This user doesn't allow nudges or hasn't confirmed or set their email yet."
@@ -2140,10 +2379,6 @@ msgstr ""
msgid "Only %s URLs over plain HTTP please."
msgstr ""
-#: actions/opensearch.php:64
-msgid "People Search"
-msgstr ""
-
#: actions/othersettings.php:71
msgid "Manage various other options."
msgstr ""
@@ -2176,20 +2411,6 @@ msgstr ""
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:109
msgid "6 or more characters"
msgstr ""
@@ -2314,17 +2535,6 @@ msgstr ""
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/postnotice.php:101
#, php-format
msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -2679,11 +2889,6 @@ msgstr ""
msgid "Only logged-in users can repeat notices."
msgstr ""
-#: actions/replies.php:128
-#, php-format
-msgid "Replies to %1$s, page %2$d"
-msgstr ""
-
#: actions/replies.php:204
#, php-format
msgid ""
@@ -2691,13 +2896,6 @@ msgid ""
"[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 them](%%%%action."
-"newnotice%%%%?status_textarea=%3$s)."
-msgstr ""
-
#. TRANS: Menu item for site administration
#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
#: lib/adminpanelaction.php:392
@@ -2828,32 +3026,16 @@ msgid ""
"their life and interests. "
msgstr ""
-#: actions/showgroup.php:489
-msgid "Admins"
-msgstr ""
-
#: actions/showmessage.php:98
msgid "Only the sender and recipient may read this message."
msgstr ""
-#: actions/showstream.php:148
-#, php-format
-msgid "FOAF for %s"
-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 them](%%%%action.newnotice%%%"
-"%?status_textarea=%2$s)."
-msgstr ""
-
#: actions/showstream.php:243
#, php-format
msgid ""
@@ -3127,10 +3309,6 @@ msgstr ""
msgid "%s is not listening to anyone."
msgstr ""
-#: actions/subscriptions.php:208
-msgid "Jabber"
-msgstr ""
-
#: actions/subscriptions.php:222 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr ""
@@ -3211,14 +3389,6 @@ msgstr ""
msgid "Default subscription"
msgstr ""
-#: actions/useradminpanel.php:242
-msgid "Automatically subscribe new users to this user."
-msgstr ""
-
-#: actions/useradminpanel.php:256
-msgid "Invitations enabled"
-msgstr ""
-
#: actions/useradminpanel.php:258
msgid "Whether to allow users to invite new users."
msgstr ""
@@ -3380,11 +3550,6 @@ msgstr ""
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
-#. TRANS: Exception thrown when trying to leave a group fails.
-#: classes/Group_member.php:63
-msgid "Group leave failed."
-msgstr ""
-
#. TRANS: Exception thrown when database name or Data Source Name could not be found.
#: classes/Memcached_DataObject.php:533
msgid "No database name or DSN found anywhere."
@@ -3441,13 +3606,6 @@ msgstr ""
msgid "Problem saving group inbox."
msgstr ""
-#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
-#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1751
-#, php-format
-msgid "RT @%1$s %2$s"
-msgstr ""
-
#. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
#. TRANS: %1$s is the role name, %2$s is the user ID (number).
#: classes/Profile.php:737
@@ -3499,129 +3657,98 @@ msgstr ""
msgid "Other"
msgstr ""
-#. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:145
-#, php-format
-msgid "%1$s - %2$s"
-msgstr ""
-
#. TRANS: Page title for a page without a title set.
-#: lib/action.php:161
+#: lib/action.php:164
msgid "Untitled page"
msgstr ""
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:436
+#: lib/action.php:449
msgid "Primary site navigation"
msgstr ""
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:442
+#: lib/action.php:455
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr ""
-#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:445
-msgctxt "MENU"
-msgid "Personal"
-msgstr ""
-
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:447
+#: lib/action.php:460
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr ""
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:452
+#: lib/action.php:465
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr ""
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:458
+#: lib/action.php:471
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr ""
-#. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:461
-msgctxt "MENU"
-msgid "Admin"
-msgstr ""
-
-#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:465
-#, php-format
-msgctxt "TOOLTIP"
-msgid "Invite friends and colleagues to join you on %s"
-msgstr ""
-
-#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:482
-msgctxt "TOOLTIP"
-msgid "Create an account"
-msgstr ""
-
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:494
+#: lib/action.php:507
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr ""
-#: lib/action.php:497
+#: lib/action.php:510
msgctxt "MENU"
msgid "Help"
msgstr ""
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:500
+#: lib/action.php:513
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr ""
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:592
+#: lib/action.php:605
msgid "Local views"
msgstr ""
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:762
+#: lib/action.php:778
msgid "Secondary site navigation"
msgstr ""
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:768
+#: lib/action.php:784
msgid "Help"
msgstr ""
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:774
+#: lib/action.php:790
msgid "FAQ"
msgstr ""
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:779
+#: lib/action.php:795
msgid "TOS"
msgstr ""
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:786
+#: lib/action.php:802
msgid "Source"
msgstr ""
-#: lib/action.php:794
+#: lib/action.php:810
msgid "Badge"
msgstr ""
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:823
+#: lib/action.php:839
msgid "StatusNet software license"
msgstr ""
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:827
+#: lib/action.php:843
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -3629,13 +3756,13 @@ msgid ""
msgstr ""
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:830
+#: lib/action.php:846
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr ""
#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:834
+#: lib/action.php:850
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -3644,44 +3771,44 @@ msgid ""
msgstr ""
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:850
+#: lib/action.php:866
msgid "Site content license"
msgstr ""
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:857
+#: lib/action.php:873
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:864
+#: lib/action.php:880
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:868
+#: lib/action.php:884
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:881
+#: lib/action.php:897
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr ""
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: present than the currently displayed information.
-#: lib/action.php:1203
+#: lib/action.php:1247
msgid "After"
msgstr ""
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: past than the currently displayed information.
-#: lib/action.php:1213
+#: lib/action.php:1257
msgid "Before"
msgstr ""
@@ -3979,15 +4106,6 @@ msgstr ""
msgid "Unsubscribed %s."
msgstr ""
-#. TRANS: Text shown after requesting other users a user is subscribed to.
-#. TRANS: This message support plural forms. This message is followed by a
-#. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:836
-msgid "You are subscribed to this person:"
-msgid_plural "You are subscribed to these people:"
-msgstr[0] ""
-msgstr[1] ""
-
#. TRANS: Text shown after requesting other users that are subscribed to a user
#. TRANS: (followers) without having any subscribers.
#: lib/command.php:858
@@ -4233,12 +4351,6 @@ msgid ""
"%s\n"
msgstr ""
-#. TRANS: Subject of new-subscriber notification e-mail
-#: lib/mail.php:243
-#, php-format
-msgid "%1$s is now listening to your notices on %2$s."
-msgstr ""
-
#: lib/mail.php:248
#, php-format
msgid ""
@@ -4475,11 +4587,6 @@ msgstr ""
msgid "Available characters"
msgstr ""
-#: lib/messageform.php:178 lib/noticeform.php:237
-msgctxt "Send button for sending notice"
-msgid "Send"
-msgstr ""
-
#: lib/noticeform.php:174
#, php-format
msgid "What's up, %s?"
@@ -4551,10 +4658,6 @@ msgstr ""
msgid "Error inserting avatar"
msgstr ""
-#: lib/personalgroupnav.php:99
-msgid "Personal"
-msgstr ""
-
#: lib/personalgroupnav.php:104
msgid "Replies"
msgstr ""
@@ -4671,11 +4774,6 @@ msgstr ""
msgid "People subscribed to %s"
msgstr ""
-#: 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"
@@ -4694,7 +4792,7 @@ msgstr ""
msgid "The theme file is missing or the upload failed."
msgstr ""
-#: lib/themeuploader.php:139
+#: lib/themeuploader.php:147
msgid "Invalid theme: bad directory structure."
msgstr ""
@@ -4707,13 +4805,17 @@ msgstr ""
msgid "Invalid theme archive: missing file css/display.css"
msgstr ""
-#: lib/themeuploader.php:205
+#: lib/themeuploader.php:218
msgid ""
"Theme contains invalid file or folder name. Stick with ASCII letters, "
"digits, underscore, and minus sign."
msgstr ""
-#: lib/themeuploader.php:216
+#: lib/themeuploader.php:224
+msgid "Theme contains unsafe file extension names; may be unsafe."
+msgstr ""
+
+#: lib/themeuploader.php:241
#, php-format
msgid "Theme contains file of type '.%s', which is not allowed."
msgstr ""
@@ -4765,56 +4867,56 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1102
msgid "a few seconds ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1106
+#: lib/util.php:1105
msgid "about a minute ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1110
+#: lib/util.php:1109
#, php-format
msgid "about %d minutes ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1113
+#: lib/util.php:1112
msgid "about an hour ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1117
+#: lib/util.php:1116
#, php-format
msgid "about %d hours ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1120
+#: lib/util.php:1119
msgid "about a day ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1124
+#: lib/util.php:1123
#, php-format
msgid "about %d days ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1127
+#: lib/util.php:1126
msgid "about a month ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1131
+#: lib/util.php:1130
#, php-format
msgid "about %d months ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1134
+#: lib/util.php:1133
msgid "about a year ago"
msgstr ""
diff --git a/locale/de/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po
index bf1e08955..5f4bef991 100644
--- a/locale/de/LC_MESSAGES/statusnet.po
+++ b/locale/de/LC_MESSAGES/statusnet.po
@@ -1,7 +1,9 @@
# Translation of StatusNet to German
#
+# Author@translatewiki.net: Apmon
# Author@translatewiki.net: Bavatar
# Author@translatewiki.net: Brion
+# Author@translatewiki.net: Kghbln
# Author@translatewiki.net: Lutzgh
# Author@translatewiki.net: March
# Author@translatewiki.net: McDutchie
@@ -16,12 +18,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-28 15:28+0000\n"
-"PO-Revision-Date: 2010-08-28 15:29:25+0000\n"
+"POT-Creation-Date: 2010-09-05 09:45+0000\n"
+"PO-Revision-Date: 2010-09-05 09:45:46+0000\n"
"Language-Team: German\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r71856); Translate extension (2010-08-20)\n"
+"X-Generator: MediaWiki 1.17alpha (r72319); Translate extension (2010-08-20)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: de\n"
"X-Message-Group: out-statusnet\n"
@@ -618,7 +620,7 @@ msgstr ""
"vertrauenswürdigen Quellen Erlaubnis zu deinem %4$s Zugang geben."
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:450
+#: actions/apioauthauthorize.php:310 lib/action.php:463
msgid "Account"
msgstr "Profil"
@@ -1033,7 +1035,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:1263
+#: lib/action.php:1307
msgid "There was a problem with your session token."
msgstr "Es gab ein Problem mit deinem Sessiontoken."
@@ -4855,7 +4857,7 @@ msgid "Plugins"
msgstr "Erweiterungen"
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:789
+#: actions/version.php:198 lib/action.php:805
msgid "Version"
msgstr "Version"
@@ -5018,7 +5020,7 @@ msgstr "Problem bei Speichern der Nachricht."
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1751
+#: classes/Notice.php:1757
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -5047,7 +5049,7 @@ msgid "Missing profile."
msgstr "Benutzer hat kein Profil."
#. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:346
+#: classes/Status_network.php:339
msgid "Unable to save tag."
msgstr "Konnte Seitenbenachrichtigung nicht speichern."
@@ -5144,199 +5146,199 @@ msgid "Other"
msgstr "Sonstige"
#. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:145
+#: lib/action.php:148
#, php-format
msgid "%1$s - %2$s"
msgstr "%1$s - %2$s"
#. TRANS: Page title for a page without a title set.
-#: lib/action.php:161
+#: lib/action.php:164
msgid "Untitled page"
msgstr "Seite ohne Titel"
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:436
+#: lib/action.php:449
msgid "Primary site navigation"
msgstr "Hauptnavigation"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:442
+#: lib/action.php:455
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr "Persönliches Profil und Freundes-Zeitleiste"
#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:445
+#: lib/action.php:458
msgctxt "MENU"
msgid "Personal"
msgstr "Eigene"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:447
+#: lib/action.php:460
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:452
+#: lib/action.php:465
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "Zum Dienst verbinden"
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:455
+#: lib/action.php:468
msgid "Connect"
msgstr "Verbinden"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:458
+#: lib/action.php:471
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "Seiteneinstellung ändern"
#. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:461
+#: lib/action.php:474
msgctxt "MENU"
msgid "Admin"
msgstr "Administrator"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:465
+#: lib/action.php:478
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "Lade Freunde und Kollegen ein dir auf %s zu folgen"
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:468
+#: lib/action.php:481
msgctxt "MENU"
msgid "Invite"
msgstr "Einladen"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:474
+#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "Von der Seite abmelden"
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:477
+#: lib/action.php:490
msgctxt "MENU"
msgid "Logout"
msgstr "Abmelden"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:482
+#: lib/action.php:495
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Neues Konto erstellen"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:485
+#: lib/action.php:498
msgctxt "MENU"
msgid "Register"
msgstr "Registrieren"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:488
+#: lib/action.php:501
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Auf der Seite anmelden"
-#: lib/action.php:491
+#: lib/action.php:504
msgctxt "MENU"
msgid "Login"
msgstr "Anmelden"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:494
+#: lib/action.php:507
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Hilf mir!"
-#: lib/action.php:497
+#: lib/action.php:510
msgctxt "MENU"
msgid "Help"
msgstr "Hilfe"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:500
+#: lib/action.php:513
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "Suche nach Leuten oder Text"
-#: lib/action.php:503
+#: lib/action.php:516
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:525 lib/adminpanelaction.php:400
+#: lib/action.php:538 lib/adminpanelaction.php:400
msgid "Site notice"
msgstr "Seitennachricht"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:592
+#: lib/action.php:605
msgid "Local views"
msgstr "Lokale Ansichten"
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:659
+#: lib/action.php:675
msgid "Page notice"
msgstr "Neue Nachricht"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:762
+#: lib/action.php:778
msgid "Secondary site navigation"
msgstr "Unternavigation"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:768
+#: lib/action.php:784
msgid "Help"
msgstr "Hilfe"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:771
+#: lib/action.php:787
msgid "About"
msgstr "Über"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:774
+#: lib/action.php:790
msgid "FAQ"
msgstr "FAQ"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:779
+#: lib/action.php:795
msgid "TOS"
msgstr "AGB"
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:783
+#: lib/action.php:799
msgid "Privacy"
msgstr "Privatsphäre"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:786
+#: lib/action.php:802
msgid "Source"
msgstr "Quellcode"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:792
+#: lib/action.php:808
msgid "Contact"
msgstr "Kontakt"
-#: lib/action.php:794
+#: lib/action.php:810
msgid "Badge"
msgstr "Plakette"
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:823
+#: lib/action.php:839
msgid "StatusNet software license"
msgstr "StatusNet-Software-Lizenz"
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:827
+#: lib/action.php:843
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5346,13 +5348,13 @@ msgstr ""
"site.broughtbyurl%%)."
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:830
+#: lib/action.php:846
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr "**%%site.name%%** ist ein Microbloggingdienst."
#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:834
+#: lib/action.php:850
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5364,20 +5366,20 @@ msgstr ""
"(http://www.fsf.org/licensing/licenses/agpl-3.0.html) erhältlich ist."
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:850
+#: lib/action.php:866
msgid "Site content license"
msgstr "StatusNet-Software-Lizenz"
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:857
+#: lib/action.php:873
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr "Inhalte und Daten von %1$s sind privat und vertraulich."
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:864
+#: lib/action.php:880
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
@@ -5385,32 +5387,32 @@ msgstr ""
"vorbehalten."
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:868
+#: lib/action.php:884
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
"Urheberrecht von Inhalt und Daten liegt bei den Beteiligten. Alle Rechte "
"vorbehalten."
#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:881
+#: lib/action.php:897
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr "Alle Inhalte und Daten von %1$s sind unter der %2$s Lizenz verfügbar."
#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1192
+#: lib/action.php:1236
msgid "Pagination"
msgstr "Seitenerstellung"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: present than the currently displayed information.
-#: lib/action.php:1203
+#: lib/action.php:1247
msgid "After"
msgstr "Später"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: past than the currently displayed information.
-#: lib/action.php:1213
+#: lib/action.php:1257
msgid "Before"
msgstr "Vorher"
@@ -5667,6 +5669,31 @@ msgstr "Befehl ausgeführt"
msgid "Command failed"
msgstr "Befehl fehlgeschlagen"
+#. TRANS: Command exception text shown when a notice ID is requested that does not exist.
+#: lib/command.php:84 lib/command.php:108
+msgid "Notice with that id does not exist."
+msgstr "Nachricht mit dieser ID existiert nicht"
+
+#. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
+#. TRANS: Error text shown when a last user notice is requested and it does not exist.
+#: lib/command.php:101 lib/command.php:630
+msgid "User has no last notice."
+msgstr "Benutzer hat keine letzte Nachricht"
+
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:130
+#, php-format
+msgid "Could not find a user with nickname %s."
+msgstr "Konnte keinen Nutzer mit dem Namen %s finden"
+
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:150
+#, php-format
+msgid "Could not find a local user with nickname %s."
+msgstr "Konnte keinen lokalen Nutzer mit dem Nick %s finden"
+
#. TRANS: Error text shown when an unimplemented command is given.
#: lib/command.php:185
msgid "Sorry, this command is not yet implemented."
@@ -5677,6 +5704,13 @@ msgstr "Leider ist dieser Befehl noch nicht implementiert."
msgid "It does not make a lot of sense to nudge yourself!"
msgstr "Es macht keinen Sinn dich selbst anzustupsen!"
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:240
+#, php-format
+msgid "Nudge sent to %s."
+msgstr "Stups an %s abgeschickt"
+
#. TRANS: User statistics text.
#. TRANS: %1$s is the number of other user the user is subscribed to.
#. TRANS: %2$s is the number of users that are subscribed to the user.
@@ -5697,6 +5731,20 @@ msgstr ""
msgid "Notice marked as fave."
msgstr "Nachricht als Favorit markiert."
+#. TRANS: Message given having added a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:360
+#, php-format
+msgid "%1$s joined group %2$s."
+msgstr "%1$s ist der Gruppe %2$s beigetreten."
+
+#. TRANS: Message given having removed a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:408
+#, php-format
+msgid "%1$s left group %2$s."
+msgstr "%1$s hat die Gruppe %2$s verlassen."
+
#. TRANS: Whois output. %s is the full name of the queried user.
#: lib/command.php:434
#, php-format
@@ -5746,21 +5794,68 @@ msgstr ""
msgid "Error sending direct message."
msgstr "Fehler beim Senden der Nachricht"
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:554
+#, php-format
+msgid "Notice from %s repeated."
+msgstr "Nachricht von %s wiederholt."
+
#. TRANS: Error text shown when repeating a notice fails with an unknown reason.
#: lib/command.php:557
msgid "Error repeating notice."
msgstr "Fehler beim Wiederholen der Nachricht"
+#. TRANS: Message given if content of a notice for a reply is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:592
+#, php-format
+msgid "Notice too long - maximum is %1$d characters, you sent %2$d."
+msgstr ""
+"Nachricht zu lange - maximal %1$d Zeichen erlaubt, du hast %2$ gesendet"
+
+#. TRANS: Text shown having sent a reply to a notice successfully.
+#. TRANS: %s is the nickname of the user of the notice the reply was sent to.
+#: lib/command.php:603
+#, php-format
+msgid "Reply to %s sent."
+msgstr "Antwort an %s gesendet"
+
#. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
#: lib/command.php:606
msgid "Error saving notice."
msgstr "Problem beim Speichern der Nachricht."
+#. TRANS: Error text shown when no username was provided when issuing a subscribe command.
+#: lib/command.php:655
+msgid "Specify the name of the user to subscribe to."
+msgstr "Gib den Namen des Benutzers an, den du abonnieren möchtest"
+
#. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
#: lib/command.php:664
msgid "Can't subscribe to OMB profiles by command."
msgstr "OMB-Profile können nicht mit einem Kommando abonniert werden."
+#. TRANS: Text shown after having subscribed to another user successfully.
+#. TRANS: %s is the name of the user the subscription was requested for.
+#: lib/command.php:672
+#, php-format
+msgid "Subscribed to %s."
+msgstr "%s abboniert"
+
+#. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
+#. TRANS: Error text shown when no username was provided when issuing the command.
+#: lib/command.php:694 lib/command.php:804
+msgid "Specify the name of the user to unsubscribe from."
+msgstr "Gib den Namen des Benutzers ein, den du nicht mehr abonnieren möchtest"
+
+#. TRANS: Text shown after having unsubscribed from another user successfully.
+#. TRANS: %s is the name of the user the unsubscription was requested for.
+#: lib/command.php:705
+#, php-format
+msgid "Unsubscribed from %s."
+msgstr "Abgemeldet von %s."
+
#. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
#. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
#: lib/command.php:724 lib/command.php:750
@@ -5787,6 +5882,25 @@ msgstr "Benachrichtigung aktiviert."
msgid "Can't turn on notification."
msgstr "Konnte Benachrichtigung nicht aktivieren."
+#. TRANS: Error text shown when issuing the login command while login is disabled.
+#: lib/command.php:771
+msgid "Login command is disabled."
+msgstr "Die Anmeldung ist deaktiviert"
+
+#. TRANS: Text shown after issuing the login command successfully.
+#. TRANS: %s is a logon link..
+#: lib/command.php:784
+#, php-format
+msgid "This link is useable only once and is valid for only 2 minutes: %s."
+msgstr "Der Link ist nur einmal und für eine Dauer von 2 Minuten gültig: %s"
+
+#. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
+#. TRANS: %s is the name of the user the unsubscription was requested for.
+#: lib/command.php:813
+#, php-format
+msgid "Unsubscribed %s."
+msgstr "%s nicht mehr abonniert"
+
#. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
#: lib/command.php:831
msgid "You are not subscribed to anyone."
@@ -6935,12 +7049,12 @@ msgid "The theme file is missing or the upload failed."
msgstr "Die Theme-Datei fehlt oder das Hochladen ist fehlgeschlagen."
#: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:253 lib/themeuploader.php:257
-#: lib/themeuploader.php:265 lib/themeuploader.php:272
+#: lib/themeuploader.php:278 lib/themeuploader.php:282
+#: lib/themeuploader.php:290 lib/themeuploader.php:297
msgid "Failed saving theme."
msgstr "Speicherung des Themes fehlgeschlagen."
-#: lib/themeuploader.php:139
+#: lib/themeuploader.php:147
msgid "Invalid theme: bad directory structure."
msgstr "Ungültiger Theme: schlechte Ordner-Struktur."
@@ -6953,7 +7067,7 @@ msgstr "Der hochgeladene Theme ist zu groß; er muss unter %d Bytes sein."
msgid "Invalid theme archive: missing file css/display.css"
msgstr "Ungültigges Theme-Archiv: fehlende Datei css/display.css"
-#: lib/themeuploader.php:205
+#: lib/themeuploader.php:218
msgid ""
"Theme contains invalid file or folder name. Stick with ASCII letters, "
"digits, underscore, and minus sign."
@@ -6961,12 +7075,16 @@ msgstr ""
"Der Theme enthält einen ungültigen Datei- oder Ordnernamen. Bleib bei ASCII-"
"Buchstaben, Zahlen, Unterstrichen und Minuszeichen."
-#: lib/themeuploader.php:216
+#: lib/themeuploader.php:224
+msgid "Theme contains unsafe file extension names; may be unsafe."
+msgstr ""
+
+#: lib/themeuploader.php:241
#, php-format
msgid "Theme contains file of type '.%s', which is not allowed."
msgstr "Das Theme enthält Dateien des Types „.%s“, die nicht erlaubt sind."
-#: lib/themeuploader.php:234
+#: lib/themeuploader.php:259
msgid "Error opening theme archive."
msgstr "Fehler beim Öffnen des Theme-Archives."
@@ -7045,56 +7163,56 @@ msgid "Moderator"
msgstr "Moderator"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1102
msgid "a few seconds ago"
msgstr "vor wenigen Sekunden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1106
+#: lib/util.php:1105
msgid "about a minute ago"
msgstr "vor einer Minute"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1110
+#: lib/util.php:1109
#, php-format
msgid "about %d minutes ago"
msgstr "vor %d Minuten"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1113
+#: lib/util.php:1112
msgid "about an hour ago"
msgstr "vor einer Stunde"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1117
+#: lib/util.php:1116
#, php-format
msgid "about %d hours ago"
msgstr "vor %d Stunden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1120
+#: lib/util.php:1119
msgid "about a day ago"
msgstr "vor einem Tag"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1124
+#: lib/util.php:1123
#, php-format
msgid "about %d days ago"
msgstr "vor %d Tagen"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1127
+#: lib/util.php:1126
msgid "about a month ago"
msgstr "vor einem Monat"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1131
+#: lib/util.php:1130
#, php-format
msgid "about %d months ago"
msgstr "vor %d Monaten"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1134
+#: lib/util.php:1133
msgid "about a year ago"
msgstr "vor einem Jahr"
diff --git a/locale/el/LC_MESSAGES/statusnet.po b/locale/el/LC_MESSAGES/statusnet.po
index 51bd9d763..028990435 100644
--- a/locale/el/LC_MESSAGES/statusnet.po
+++ b/locale/el/LC_MESSAGES/statusnet.po
@@ -10,12 +10,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-28 15:28+0000\n"
-"PO-Revision-Date: 2010-08-28 15:29:27+0000\n"
+"POT-Creation-Date: 2010-09-05 09:45+0000\n"
+"PO-Revision-Date: 2010-09-05 09:45:50+0000\n"
"Language-Team: Greek\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r71856); Translate extension (2010-08-20)\n"
+"X-Generator: MediaWiki 1.17alpha (r72319); Translate extension (2010-08-20)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: el\n"
"X-Message-Group: out-statusnet\n"
@@ -482,7 +482,7 @@ msgid ""
msgstr ""
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:450
+#: actions/apioauthauthorize.php:310 lib/action.php:463
msgid "Account"
msgstr "ΛογαÏιασμός"
@@ -744,7 +744,7 @@ msgstr "Συζήτηση"
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1263
+#: lib/action.php:1307
msgid "There was a problem with your session token."
msgstr ""
@@ -3548,7 +3548,7 @@ msgstr ""
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1751
+#: classes/Notice.php:1757
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
@@ -3650,132 +3650,132 @@ msgid "Other"
msgstr ""
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:436
+#: lib/action.php:449
msgid "Primary site navigation"
msgstr ""
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:442
+#: lib/action.php:455
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr ""
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:452
+#: lib/action.php:465
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr ""
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:455
+#: lib/action.php:468
msgid "Connect"
msgstr "ΣÏνδεση"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:458
+#: lib/action.php:471
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr ""
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:468
+#: lib/action.php:481
msgctxt "MENU"
msgid "Invite"
msgstr "Μόνο με Ï€Ïόσκληση"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:474
+#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr ""
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:477
+#: lib/action.php:490
msgctxt "MENU"
msgid "Logout"
msgstr "Λογότυπο"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:482
+#: lib/action.php:495
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr ""
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:485
+#: lib/action.php:498
msgctxt "MENU"
msgid "Register"
msgstr "ΕγγÏαφή"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:488
+#: lib/action.php:501
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr ""
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:494
+#: lib/action.php:507
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Βοήθεια"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:500
+#: lib/action.php:513
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr ""
-#: lib/action.php:503
+#: lib/action.php:516
msgctxt "MENU"
msgid "Search"
msgstr ""
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:762
+#: lib/action.php:778
msgid "Secondary site navigation"
msgstr ""
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:768
+#: lib/action.php:784
msgid "Help"
msgstr "Βοήθεια"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:771
+#: lib/action.php:787
msgid "About"
msgstr "ΠεÏί"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:774
+#: lib/action.php:790
msgid "FAQ"
msgstr "Συχνές εÏωτήσεις"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:779
+#: lib/action.php:795
msgid "TOS"
msgstr ""
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:786
+#: lib/action.php:802
msgid "Source"
msgstr ""
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:792
+#: lib/action.php:808
msgid "Contact"
msgstr "Επικοινωνία"
-#: lib/action.php:794
+#: lib/action.php:810
msgid "Badge"
msgstr ""
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:823
+#: lib/action.php:839
msgid "StatusNet software license"
msgstr ""
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:827
+#: lib/action.php:843
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -3783,14 +3783,14 @@ msgid ""
msgstr ""
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:830
+#: lib/action.php:846
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr ""
"Το **%%site.name%%** είναι μία υπηÏεσία microblogging (μικÏο-ιστολογίου)."
#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:834
+#: lib/action.php:850
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -3799,44 +3799,44 @@ msgid ""
msgstr ""
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:850
+#: lib/action.php:866
msgid "Site content license"
msgstr ""
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:857
+#: lib/action.php:873
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:864
+#: lib/action.php:880
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:868
+#: lib/action.php:884
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:881
+#: lib/action.php:897
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr ""
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: present than the currently displayed information.
-#: lib/action.php:1203
+#: lib/action.php:1247
msgid "After"
msgstr ""
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: past than the currently displayed information.
-#: lib/action.php:1213
+#: lib/action.php:1257
msgid "Before"
msgstr ""
@@ -5005,12 +5005,12 @@ msgid "The theme file is missing or the upload failed."
msgstr ""
#: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:253 lib/themeuploader.php:257
-#: lib/themeuploader.php:265 lib/themeuploader.php:272
+#: lib/themeuploader.php:278 lib/themeuploader.php:282
+#: lib/themeuploader.php:290 lib/themeuploader.php:297
msgid "Failed saving theme."
msgstr ""
-#: lib/themeuploader.php:139
+#: lib/themeuploader.php:147
msgid "Invalid theme: bad directory structure."
msgstr ""
@@ -5023,18 +5023,22 @@ msgstr ""
msgid "Invalid theme archive: missing file css/display.css"
msgstr ""
-#: lib/themeuploader.php:205
+#: lib/themeuploader.php:218
msgid ""
"Theme contains invalid file or folder name. Stick with ASCII letters, "
"digits, underscore, and minus sign."
msgstr ""
-#: lib/themeuploader.php:216
+#: lib/themeuploader.php:224
+msgid "Theme contains unsafe file extension names; may be unsafe."
+msgstr ""
+
+#: lib/themeuploader.php:241
#, php-format
msgid "Theme contains file of type '.%s', which is not allowed."
msgstr ""
-#: lib/themeuploader.php:234
+#: lib/themeuploader.php:259
msgid "Error opening theme archive."
msgstr ""
@@ -5081,56 +5085,56 @@ msgid "Moderator"
msgstr "Συντονιστής"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1102
msgid "a few seconds ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1106
+#: lib/util.php:1105
msgid "about a minute ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1110
+#: lib/util.php:1109
#, php-format
msgid "about %d minutes ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1113
+#: lib/util.php:1112
msgid "about an hour ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1117
+#: lib/util.php:1116
#, php-format
msgid "about %d hours ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1120
+#: lib/util.php:1119
msgid "about a day ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1124
+#: lib/util.php:1123
#, php-format
msgid "about %d days ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1127
+#: lib/util.php:1126
msgid "about a month ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1131
+#: lib/util.php:1130
#, php-format
msgid "about %d months ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1134
+#: lib/util.php:1133
msgid "about a year ago"
msgstr ""
diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po
index 380bb28e9..d3ffb4ded 100644
--- a/locale/en_GB/LC_MESSAGES/statusnet.po
+++ b/locale/en_GB/LC_MESSAGES/statusnet.po
@@ -11,12 +11,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-28 15:28+0000\n"
-"PO-Revision-Date: 2010-08-28 15:29:41+0000\n"
+"POT-Creation-Date: 2010-09-05 09:45+0000\n"
+"PO-Revision-Date: 2010-09-05 09:45:59+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 (r71856); Translate extension (2010-08-20)\n"
+"X-Generator: MediaWiki 1.17alpha (r72319); Translate extension (2010-08-20)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: en-gb\n"
"X-Message-Group: out-statusnet\n"
@@ -593,7 +593,7 @@ msgstr ""
"give access to your %4$s account to third parties you trust."
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:450
+#: actions/apioauthauthorize.php:310 lib/action.php:463
msgid "Account"
msgstr "Account"
@@ -1001,7 +1001,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:1263
+#: lib/action.php:1307
msgid "There was a problem with your session token."
msgstr "There was a problem with your session token."
@@ -4592,7 +4592,7 @@ msgid "Plugins"
msgstr ""
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:789
+#: actions/version.php:198 lib/action.php:805
msgid "Version"
msgstr "Version"
@@ -4743,7 +4743,7 @@ msgstr "Problem saving group inbox."
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1751
+#: classes/Notice.php:1757
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -4850,199 +4850,199 @@ msgid "Other"
msgstr "Other"
#. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:145
+#: lib/action.php:148
#, php-format
msgid "%1$s - %2$s"
msgstr "%1$s - %2$s"
#. TRANS: Page title for a page without a title set.
-#: lib/action.php:161
+#: lib/action.php:164
msgid "Untitled page"
msgstr "Untitled page"
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:436
+#: lib/action.php:449
msgid "Primary site navigation"
msgstr "Primary site navigation"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:442
+#: lib/action.php:455
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr "Personal profile and friends timeline"
#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:445
+#: lib/action.php:458
msgctxt "MENU"
msgid "Personal"
msgstr "Personal"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:447
+#: lib/action.php:460
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "Change your email, avatar, password, profile"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:452
+#: lib/action.php:465
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "Connect to services"
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:455
+#: lib/action.php:468
msgid "Connect"
msgstr "Connect"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:458
+#: lib/action.php:471
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "Change site configuration"
#. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:461
+#: lib/action.php:474
msgctxt "MENU"
msgid "Admin"
msgstr "Admin"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:465
+#: lib/action.php:478
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "Invite friends and colleagues to join you on %s"
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:468
+#: lib/action.php:481
msgctxt "MENU"
msgid "Invite"
msgstr "Invite"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:474
+#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "Logout from the site"
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:477
+#: lib/action.php:490
msgctxt "MENU"
msgid "Logout"
msgstr "Logout"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:482
+#: lib/action.php:495
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Create an account"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:485
+#: lib/action.php:498
msgctxt "MENU"
msgid "Register"
msgstr "Register"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:488
+#: lib/action.php:501
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Login to the site"
-#: lib/action.php:491
+#: lib/action.php:504
msgctxt "MENU"
msgid "Login"
msgstr "Login"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:494
+#: lib/action.php:507
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Help me!"
-#: lib/action.php:497
+#: lib/action.php:510
msgctxt "MENU"
msgid "Help"
msgstr "Help"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:500
+#: lib/action.php:513
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "Search for people or text"
-#: lib/action.php:503
+#: lib/action.php:516
msgctxt "MENU"
msgid "Search"
msgstr "Search"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:525 lib/adminpanelaction.php:400
+#: lib/action.php:538 lib/adminpanelaction.php:400
msgid "Site notice"
msgstr "Site notice"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:592
+#: lib/action.php:605
msgid "Local views"
msgstr "Local views"
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:659
+#: lib/action.php:675
msgid "Page notice"
msgstr "Page notice"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:762
+#: lib/action.php:778
msgid "Secondary site navigation"
msgstr "Secondary site navigation"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:768
+#: lib/action.php:784
msgid "Help"
msgstr "Help"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:771
+#: lib/action.php:787
msgid "About"
msgstr "About"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:774
+#: lib/action.php:790
msgid "FAQ"
msgstr "F.A.Q."
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:779
+#: lib/action.php:795
msgid "TOS"
msgstr ""
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:783
+#: lib/action.php:799
msgid "Privacy"
msgstr "Privacy"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:786
+#: lib/action.php:802
msgid "Source"
msgstr "Source"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:792
+#: lib/action.php:808
msgid "Contact"
msgstr "Contact"
-#: lib/action.php:794
+#: lib/action.php:810
msgid "Badge"
msgstr "Badge"
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:823
+#: lib/action.php:839
msgid "StatusNet software license"
msgstr "StatusNet software licence"
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:827
+#: lib/action.php:843
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5052,13 +5052,13 @@ msgstr ""
"broughtby%%](%%site.broughtbyurl%%)."
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:830
+#: lib/action.php:846
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr "**%%site.name%%** is a microblogging service."
#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:834
+#: lib/action.php:850
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5070,49 +5070,49 @@ msgstr ""
"org/licensing/licenses/agpl-3.0.html)."
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:850
+#: lib/action.php:866
msgid "Site content license"
msgstr "Site content license"
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:857
+#: lib/action.php:873
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:864
+#: lib/action.php:880
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:868
+#: lib/action.php:884
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:881
+#: lib/action.php:897
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr "All %1$s content and data are available under the %2$s licence."
#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1192
+#: lib/action.php:1236
msgid "Pagination"
msgstr "Pagination"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: present than the currently displayed information.
-#: lib/action.php:1203
+#: lib/action.php:1247
msgid "After"
msgstr "After"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: past than the currently displayed information.
-#: lib/action.php:1213
+#: lib/action.php:1257
msgid "Before"
msgstr "Before"
@@ -5426,11 +5426,22 @@ msgstr "Error repeating notice."
msgid "Error saving notice."
msgstr "Error saving notice."
+#. TRANS: Error text shown when no username was provided when issuing a subscribe command.
+#: lib/command.php:655
+msgid "Specify the name of the user to subscribe to."
+msgstr ""
+
#. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
#: lib/command.php:664
msgid "Can't subscribe to OMB profiles by command."
msgstr "Can't subscribe to OMB profiles by command."
+#. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
+#. TRANS: Error text shown when no username was provided when issuing the command.
+#: lib/command.php:694 lib/command.php:804
+msgid "Specify the name of the user to unsubscribe from."
+msgstr ""
+
#. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
#. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
#: lib/command.php:724 lib/command.php:750
@@ -6513,7 +6524,7 @@ msgstr ""
msgid "The theme file is missing or the upload failed."
msgstr ""
-#: lib/themeuploader.php:139
+#: lib/themeuploader.php:147
msgid "Invalid theme: bad directory structure."
msgstr ""
@@ -6526,13 +6537,17 @@ msgstr ""
msgid "Invalid theme archive: missing file css/display.css"
msgstr ""
-#: lib/themeuploader.php:205
+#: lib/themeuploader.php:218
msgid ""
"Theme contains invalid file or folder name. Stick with ASCII letters, "
"digits, underscore, and minus sign."
msgstr ""
-#: lib/themeuploader.php:216
+#: lib/themeuploader.php:224
+msgid "Theme contains unsafe file extension names; may be unsafe."
+msgstr ""
+
+#: lib/themeuploader.php:241
#, php-format
msgid "Theme contains file of type '.%s', which is not allowed."
msgstr ""
@@ -6604,56 +6619,56 @@ msgid "Moderator"
msgstr "Moderator"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1102
msgid "a few seconds ago"
msgstr "a few seconds ago"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1106
+#: lib/util.php:1105
msgid "about a minute ago"
msgstr "about a minute ago"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1110
+#: lib/util.php:1109
#, php-format
msgid "about %d minutes ago"
msgstr "about %d minutes ago"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1113
+#: lib/util.php:1112
msgid "about an hour ago"
msgstr "about an hour ago"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1117
+#: lib/util.php:1116
#, php-format
msgid "about %d hours ago"
msgstr "about %d hours ago"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1120
+#: lib/util.php:1119
msgid "about a day ago"
msgstr "about a day ago"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1124
+#: lib/util.php:1123
#, php-format
msgid "about %d days ago"
msgstr "about %d days ago"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1127
+#: lib/util.php:1126
msgid "about a month ago"
msgstr "about a month ago"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1131
+#: lib/util.php:1130
#, php-format
msgid "about %d months ago"
msgstr "about %d months ago"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1134
+#: lib/util.php:1133
msgid "about a year ago"
msgstr "about a year ago"
diff --git a/locale/eo/LC_MESSAGES/statusnet.po b/locale/eo/LC_MESSAGES/statusnet.po
index 1207bc8ed..2b9af1847 100644
--- a/locale/eo/LC_MESSAGES/statusnet.po
+++ b/locale/eo/LC_MESSAGES/statusnet.po
@@ -12,12 +12,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-28 15:28+0000\n"
-"PO-Revision-Date: 2010-08-28 15:29:34+0000\n"
+"POT-Creation-Date: 2010-09-05 09:45+0000\n"
+"PO-Revision-Date: 2010-09-05 09:45:53+0000\n"
"Language-Team: Esperanto\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r71856); Translate extension (2010-08-20)\n"
+"X-Generator: MediaWiki 1.17alpha (r72319); Translate extension (2010-08-20)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: eo\n"
"X-Message-Group: out-statusnet\n"
@@ -607,7 +607,7 @@ msgstr ""
"via %4$s konto al triaj partioj, kiujn vi fidas."
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:450
+#: actions/apioauthauthorize.php:310 lib/action.php:463
msgid "Account"
msgstr "Konto"
@@ -1014,7 +1014,7 @@ msgstr "Vi ne estas la posedanto de ĉi tiu aplikaĵo."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1263
+#: lib/action.php:1307
msgid "There was a problem with your session token."
msgstr "Problemo okazas pri via seancĵetono."
@@ -2521,7 +2521,7 @@ msgstr "Aplikoj kiujn vi enskribis"
#: actions/oauthappssettings.php:135
#, php-format
msgid "You have not registered any applications yet."
-msgstr "Vi ne jam registri iun ajn aplikaĵon."
+msgstr "Vi ankoraŭ neniun aplikaĵon registris."
#: actions/oauthconnectionssettings.php:72
msgid "Connected applications"
@@ -4041,11 +4041,6 @@ msgctxt "BUTTON"
msgid "Confirm"
msgstr "Konfirmi"
-#. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:153
-msgid "SMS phone number"
-msgstr ""
-
#. TRANS: Checkbox label in SMS preferences form.
#: actions/smssettings.php:201
msgid ""
@@ -4053,6 +4048,11 @@ msgid ""
"from my carrier."
msgstr ""
+#. TRANS: Message given saving SMS phone number without having provided one.
+#: actions/smssettings.php:338
+msgid "No phone number."
+msgstr "Mankas la telefononumero."
+
#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
#: actions/smssettings.php:511
msgid "Mobile carrier"
@@ -4072,6 +4072,12 @@ msgid ""
"email but isn't listed here, send email to let us know at %s."
msgstr ""
+#. TRANS: Menu item for site administration
+#: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
+#: lib/adminpanelaction.php:408
+msgid "Snapshots"
+msgstr ""
+
#: actions/snapshotadminpanel.php:133
msgid "Snapshot frequency must be a number."
msgstr ""
@@ -4441,7 +4447,7 @@ msgid "Plugins"
msgstr "Kromprogramo"
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:789
+#: actions/version.php:198 lib/action.php:805
msgid "Version"
msgstr "Versio"
@@ -4490,6 +4496,11 @@ msgstr "Dosiero tiel granda superos vian monatan kvoton kun %d bajtoj."
msgid "No database name or DSN found anywhere."
msgstr ""
+#. TRANS: Client exception thrown when a user tries to send a direct message while being banned from sending them.
+#: classes/Message.php:46
+msgid "You are banned from sending direct messages."
+msgstr ""
+
#. TRANS: Server exception thrown when a user profile for a notice cannot be found.
#. TRANS: %1$d is a profile ID (number), %2$d is a notice ID (number).
#: classes/Notice.php:98
@@ -4520,6 +4531,12 @@ msgid ""
"few minutes."
msgstr ""
+#. TRANS: Server exception thrown when a notice cannot be saved.
+#. TRANS: Server exception thrown when a notice cannot be updated.
+#: classes/Notice.php:358 classes/Notice.php:385
+msgid "Problem saving notice."
+msgstr ""
+
#. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
#: classes/Notice.php:897
msgid "Bad type provided to saveKnownGroups"
@@ -4532,7 +4549,7 @@ msgstr ""
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1751
+#: classes/Notice.php:1757
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -4569,144 +4586,144 @@ msgid "Other"
msgstr "Alia"
#. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:145
+#: lib/action.php:148
#, php-format
msgid "%1$s - %2$s"
msgstr "%1$s - %2$s"
#. TRANS: Page title for a page without a title set.
-#: lib/action.php:161
+#: lib/action.php:164
msgid "Untitled page"
msgstr ""
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:442
+#: lib/action.php:455
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr ""
#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:445
+#: lib/action.php:458
msgctxt "MENU"
msgid "Personal"
msgstr "Persona"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:452
+#: lib/action.php:465
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "Konekti al servoj"
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:455
+#: lib/action.php:468
msgid "Connect"
msgstr "Konekti"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:458
+#: lib/action.php:471
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "ÅœanÄi agordojn de la retejo"
#. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:461
+#: lib/action.php:474
msgctxt "MENU"
msgid "Admin"
msgstr "Administri"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:465
+#: lib/action.php:478
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "Inviti amikojn kaj kolegojn aliÄi vin sur %s"
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:468
+#: lib/action.php:481
msgctxt "MENU"
msgid "Invite"
msgstr "Inviti"
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:477
+#: lib/action.php:490
msgctxt "MENU"
msgid "Logout"
msgstr " Elsaluti"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:482
+#: lib/action.php:495
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Krei konton"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:485
+#: lib/action.php:498
msgctxt "MENU"
msgid "Register"
msgstr "RegistriÄi"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:494
+#: lib/action.php:507
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Helpu min!"
-#: lib/action.php:497
+#: lib/action.php:510
msgctxt "MENU"
msgid "Help"
msgstr "Helpo"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:762
+#: lib/action.php:778
msgid "Secondary site navigation"
msgstr ""
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:768
+#: lib/action.php:784
msgid "Help"
msgstr "Helpo"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:771
+#: lib/action.php:787
msgid "About"
msgstr "Enkonduko"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:774
+#: lib/action.php:790
msgid "FAQ"
msgstr "Oftaj demandoj"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:779
+#: lib/action.php:795
msgid "TOS"
msgstr ""
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:783
+#: lib/action.php:799
msgid "Privacy"
msgstr "Privateco"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:786
+#: lib/action.php:802
msgid "Source"
msgstr "Fontkodo"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:792
+#: lib/action.php:808
msgid "Contact"
msgstr "Kontakto"
-#: lib/action.php:794
+#: lib/action.php:810
msgid "Badge"
msgstr "Insigno"
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:823
+#: lib/action.php:839
msgid "StatusNet software license"
msgstr "Licenco de la programaro StatusNet"
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:827
+#: lib/action.php:843
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4714,13 +4731,13 @@ msgid ""
msgstr ""
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:830
+#: lib/action.php:846
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr ""
#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:834
+#: lib/action.php:850
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4730,31 +4747,31 @@ msgstr ""
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:864
+#: lib/action.php:880
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:868
+#: lib/action.php:884
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:881
+#: lib/action.php:897
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr ""
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: present than the currently displayed information.
-#: lib/action.php:1203
+#: lib/action.php:1247
msgid "After"
msgstr "Poste"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: past than the currently displayed information.
-#: lib/action.php:1213
+#: lib/action.php:1257
msgid "Before"
msgstr "AntaÅ­e"
@@ -4780,6 +4797,11 @@ msgstr ""
msgid "showForm() not implemented."
msgstr ""
+#. TRANS: Client error message
+#: lib/adminpanelaction.php:259
+msgid "saveSettings() not implemented."
+msgstr ""
+
#. TRANS: Menu item for site administration
#: lib/adminpanelaction.php:352
msgctxt "MENU"
@@ -4948,6 +4970,21 @@ msgstr ""
msgid "This link is useable only once and is valid for only 2 minutes: %s."
msgstr ""
+#. TRANS: Text shown after requesting other users that are subscribed to a user
+#. TRANS: (followers) without having any subscribers.
+#: lib/command.php:858
+msgid "No one is subscribed to you."
+msgstr ""
+
+#. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribing users.
+#: lib/command.php:863
+msgid "This person is subscribed to you:"
+msgid_plural "These people are subscribed to you:"
+msgstr[0] ""
+msgstr[1] ""
+
#: lib/command.php:905
msgid ""
"Commands:\n"
@@ -5419,6 +5456,10 @@ msgstr "al"
msgid "web"
msgstr ""
+#: lib/noticelist.php:631
+msgid "Reply"
+msgstr ""
+
#: lib/personalgroupnav.php:125
msgid "Inbox"
msgstr ""
@@ -5511,7 +5552,7 @@ msgstr ""
msgid "The theme file is missing or the upload failed."
msgstr ""
-#: lib/themeuploader.php:139
+#: lib/themeuploader.php:147
msgid "Invalid theme: bad directory structure."
msgstr ""
@@ -5524,13 +5565,17 @@ msgstr ""
msgid "Invalid theme archive: missing file css/display.css"
msgstr ""
-#: lib/themeuploader.php:205
+#: lib/themeuploader.php:218
msgid ""
"Theme contains invalid file or folder name. Stick with ASCII letters, "
"digits, underscore, and minus sign."
msgstr ""
-#: lib/themeuploader.php:216
+#: lib/themeuploader.php:224
+msgid "Theme contains unsafe file extension names; may be unsafe."
+msgstr ""
+
+#: lib/themeuploader.php:241
#, php-format
msgid "Theme contains file of type '.%s', which is not allowed."
msgstr ""
@@ -5578,34 +5623,34 @@ msgid "Moderator"
msgstr "Moderanto"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1102
msgid "a few seconds ago"
msgstr "antaÅ­ kelkaj sekundoj"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1106
+#: lib/util.php:1105
msgid "about a minute ago"
msgstr "antaŭ ĉirkaŭ unu minuto"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1110
+#: lib/util.php:1109
#, php-format
msgid "about %d minutes ago"
msgstr "antaŭ ĉirkaŭ %d minutoj"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1113
+#: lib/util.php:1112
msgid "about an hour ago"
msgstr "antaŭ ĉirkaŭ unu horo"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1117
+#: lib/util.php:1116
#, php-format
msgid "about %d hours ago"
msgstr "antaŭ ĉirkaŭ %d horoj"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1120
+#: lib/util.php:1119
msgid "about a day ago"
msgstr "antaŭ ĉirkaŭ unu tago"
diff --git a/locale/es/LC_MESSAGES/statusnet.po b/locale/es/LC_MESSAGES/statusnet.po
index feba0c19c..c7523164d 100644
--- a/locale/es/LC_MESSAGES/statusnet.po
+++ b/locale/es/LC_MESSAGES/statusnet.po
@@ -5,7 +5,6 @@
# Author@translatewiki.net: Locos epraix
# Author@translatewiki.net: McDutchie
# Author@translatewiki.net: PerroVerd
-# Author@translatewiki.net: Pertile
# Author@translatewiki.net: Peter17
# Author@translatewiki.net: Translationista
# --
@@ -15,12 +14,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-28 15:28+0000\n"
-"PO-Revision-Date: 2010-08-28 15:29:49+0000\n"
+"POT-Creation-Date: 2010-09-05 09:45+0000\n"
+"PO-Revision-Date: 2010-09-05 09:46:04+0000\n"
"Language-Team: Spanish\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r71856); Translate extension (2010-08-20)\n"
+"X-Generator: MediaWiki 1.17alpha (r72319); Translate extension (2010-08-20)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: es\n"
"X-Message-Group: out-statusnet\n"
@@ -615,7 +614,7 @@ msgstr ""
"debes dar acceso a tu cuenta %4$s a terceras partes en las que confíes."
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:450
+#: actions/apioauthauthorize.php:310 lib/action.php:463
msgid "Account"
msgstr "Cuenta"
@@ -1026,7 +1025,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:1263
+#: lib/action.php:1307
msgid "There was a problem with your session token."
msgstr "Hubo problemas con tu clave de sesión."
@@ -4846,7 +4845,7 @@ msgid "Plugins"
msgstr "Complementos"
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:789
+#: actions/version.php:198 lib/action.php:805
msgid "Version"
msgstr "Versión"
@@ -5006,7 +5005,7 @@ msgstr "Hubo un problema al guarda la bandeja de entrada del grupo."
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1751
+#: classes/Notice.php:1757
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -5032,7 +5031,7 @@ msgid "Missing profile."
msgstr "Perfil ausente."
#. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:346
+#: classes/Status_network.php:339
msgid "Unable to save tag."
msgstr "Incapaz de grabar etiqueta."
@@ -5129,199 +5128,199 @@ msgid "Other"
msgstr "Otro"
#. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:145
+#: lib/action.php:148
#, php-format
msgid "%1$s - %2$s"
msgstr "%1$s - %2$s"
#. TRANS: Page title for a page without a title set.
-#: lib/action.php:161
+#: lib/action.php:164
msgid "Untitled page"
msgstr "Página sin título"
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:436
+#: lib/action.php:449
msgid "Primary site navigation"
msgstr "Navegación de sitio primario"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:442
+#: lib/action.php:455
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr "Perfil personal y línea temporal de amistades"
#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:445
+#: lib/action.php:458
msgctxt "MENU"
msgid "Personal"
msgstr "Personal"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:447
+#: lib/action.php:460
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "Cambia tu correo electrónico, imagen, contraseña, perfil"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:452
+#: lib/action.php:465
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "Conectar a los servicios"
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:455
+#: lib/action.php:468
msgid "Connect"
msgstr "Conectarse"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:458
+#: lib/action.php:471
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "Cambiar la configuración del sitio"
#. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:461
+#: lib/action.php:474
msgctxt "MENU"
msgid "Admin"
msgstr "Admin"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:465
+#: lib/action.php:478
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "Invita a amistades y compañeros a unirse a tí en %s"
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:468
+#: lib/action.php:481
msgctxt "MENU"
msgid "Invite"
msgstr "Invitar"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:474
+#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "Cerrar sesión en el sitio"
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:477
+#: lib/action.php:490
msgctxt "MENU"
msgid "Logout"
msgstr "Cerrar sesión"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:482
+#: lib/action.php:495
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Crear una cuenta"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:485
+#: lib/action.php:498
msgctxt "MENU"
msgid "Register"
msgstr "Registrarse"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:488
+#: lib/action.php:501
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Iniciar sesión en el sitio"
-#: lib/action.php:491
+#: lib/action.php:504
msgctxt "MENU"
msgid "Login"
msgstr "Inicio de sesión"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:494
+#: lib/action.php:507
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "¡Ayúdame!"
-#: lib/action.php:497
+#: lib/action.php:510
msgctxt "MENU"
msgid "Help"
msgstr "Ayuda"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:500
+#: lib/action.php:513
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "Buscar personas o texto"
-#: lib/action.php:503
+#: lib/action.php:516
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:525 lib/adminpanelaction.php:400
+#: lib/action.php:538 lib/adminpanelaction.php:400
msgid "Site notice"
msgstr "Aviso de sitio"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:592
+#: lib/action.php:605
msgid "Local views"
msgstr "Vistas locales"
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:659
+#: lib/action.php:675
msgid "Page notice"
msgstr "Aviso de página"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:762
+#: lib/action.php:778
msgid "Secondary site navigation"
msgstr "Navegación de sitio secundario"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:768
+#: lib/action.php:784
msgid "Help"
msgstr "Ayuda"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:771
+#: lib/action.php:787
msgid "About"
msgstr "Acerca de"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:774
+#: lib/action.php:790
msgid "FAQ"
msgstr "Preguntas Frecuentes"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:779
+#: lib/action.php:795
msgid "TOS"
msgstr "TOS"
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:783
+#: lib/action.php:799
msgid "Privacy"
msgstr "Privacidad"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:786
+#: lib/action.php:802
msgid "Source"
msgstr "Fuente"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:792
+#: lib/action.php:808
msgid "Contact"
msgstr "Ponerse en contacto"
-#: lib/action.php:794
+#: lib/action.php:810
msgid "Badge"
msgstr "Insignia"
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:823
+#: lib/action.php:839
msgid "StatusNet software license"
msgstr "Licencia de software de StatusNet"
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:827
+#: lib/action.php:843
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5331,13 +5330,13 @@ msgstr ""
"[%%site.broughtby%%**](%%site.broughtbyurl%%)."
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:830
+#: lib/action.php:846
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr "**%%site.name%%** es un servicio de microblogueo."
#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:834
+#: lib/action.php:850
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5349,34 +5348,34 @@ msgstr ""
"licensing/licenses/agpl-3.0.html)."
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:850
+#: lib/action.php:866
msgid "Site content license"
msgstr "Licencia de contenido del sitio"
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:857
+#: lib/action.php:873
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr "El contenido y datos de %1$s son privados y confidenciales."
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:864
+#: lib/action.php:880
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
"Copyright del contenido y los datos de%1$s. Todos los derechos reservados."
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:868
+#: lib/action.php:884
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
"Derechos de autor de contenido y datos por los colaboradores. Todos los "
"derechos reservados."
#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:881
+#: lib/action.php:897
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr ""
@@ -5384,19 +5383,19 @@ msgstr ""
"$s."
#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1192
+#: lib/action.php:1236
msgid "Pagination"
msgstr "Paginación"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: present than the currently displayed information.
-#: lib/action.php:1203
+#: lib/action.php:1247
msgid "After"
msgstr "Después"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: past than the currently displayed information.
-#: lib/action.php:1213
+#: lib/action.php:1257
msgid "Before"
msgstr "Antes"
@@ -5744,11 +5743,22 @@ msgstr "Ha habido un error al repetir el aviso."
msgid "Error saving notice."
msgstr "Error al guardar el aviso."
+#. TRANS: Error text shown when no username was provided when issuing a subscribe command.
+#: lib/command.php:655
+msgid "Specify the name of the user to subscribe to."
+msgstr ""
+
#. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
#: lib/command.php:664
msgid "Can't subscribe to OMB profiles by command."
msgstr "No te puedes suscribir a perfiles de OMB por orden."
+#. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
+#. TRANS: Error text shown when no username was provided when issuing the command.
+#: lib/command.php:694 lib/command.php:804
+msgid "Specify the name of the user to unsubscribe from."
+msgstr ""
+
#. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
#. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
#: lib/command.php:724 lib/command.php:750
@@ -5775,6 +5785,18 @@ msgstr "Notificación activada."
msgid "Can't turn on notification."
msgstr "No se puede activar notificación."
+#. TRANS: Error text shown when issuing the login command while login is disabled.
+#: lib/command.php:771
+msgid "Login command is disabled."
+msgstr ""
+
+#. TRANS: Text shown after issuing the login command successfully.
+#. TRANS: %s is a logon link..
+#: lib/command.php:784
+#, php-format
+msgid "This link is useable only once and is valid for only 2 minutes: %s."
+msgstr ""
+
#. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
#: lib/command.php:831
msgid "You are not subscribed to anyone."
@@ -6927,12 +6949,12 @@ msgid "The theme file is missing or the upload failed."
msgstr "El archivo de tema está perdido o la carga falló."
#: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:253 lib/themeuploader.php:257
-#: lib/themeuploader.php:265 lib/themeuploader.php:272
+#: lib/themeuploader.php:278 lib/themeuploader.php:282
+#: lib/themeuploader.php:290 lib/themeuploader.php:297
msgid "Failed saving theme."
msgstr "Grabado de tema errado."
-#: lib/themeuploader.php:139
+#: lib/themeuploader.php:147
msgid "Invalid theme: bad directory structure."
msgstr "Tema inválido: mala estructura de directorio."
@@ -6946,7 +6968,7 @@ msgstr ""
msgid "Invalid theme archive: missing file css/display.css"
msgstr "Archivo de tema inválido: archivo perdido css/display.css"
-#: lib/themeuploader.php:205
+#: lib/themeuploader.php:218
msgid ""
"Theme contains invalid file or folder name. Stick with ASCII letters, "
"digits, underscore, and minus sign."
@@ -6954,12 +6976,16 @@ msgstr ""
"El tema contiene archivo o nombre de carpeta inválido. Restrínjase a letras "
"ASCII, dígitos, carácter de subrayado, y signo menos."
-#: lib/themeuploader.php:216
+#: lib/themeuploader.php:224
+msgid "Theme contains unsafe file extension names; may be unsafe."
+msgstr ""
+
+#: lib/themeuploader.php:241
#, php-format
msgid "Theme contains file of type '.%s', which is not allowed."
msgstr "El tema contiene archivo de tipo '.%s', que no está permitido."
-#: lib/themeuploader.php:234
+#: lib/themeuploader.php:259
msgid "Error opening theme archive."
msgstr "Error al abrir archivo de tema."
@@ -7038,56 +7064,56 @@ msgid "Moderator"
msgstr "Moderador"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1102
msgid "a few seconds ago"
msgstr "hace unos segundos"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1106
+#: lib/util.php:1105
msgid "about a minute ago"
msgstr "hace un minuto"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1110
+#: lib/util.php:1109
#, php-format
msgid "about %d minutes ago"
msgstr "hace %d minutos"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1113
+#: lib/util.php:1112
msgid "about an hour ago"
msgstr "hace una hora"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1117
+#: lib/util.php:1116
#, php-format
msgid "about %d hours ago"
msgstr "hace %d horas"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1120
+#: lib/util.php:1119
msgid "about a day ago"
msgstr "hace un día"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1124
+#: lib/util.php:1123
#, php-format
msgid "about %d days ago"
msgstr "hace %d días"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1127
+#: lib/util.php:1126
msgid "about a month ago"
msgstr "hace un mes"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1131
+#: lib/util.php:1130
#, php-format
msgid "about %d months ago"
msgstr "hace %d meses"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1134
+#: lib/util.php:1133
msgid "about a year ago"
msgstr "hace un año"
diff --git a/locale/fa/LC_MESSAGES/statusnet.po b/locale/fa/LC_MESSAGES/statusnet.po
index 1eb68f7ef..c47908195 100644
--- a/locale/fa/LC_MESSAGES/statusnet.po
+++ b/locale/fa/LC_MESSAGES/statusnet.po
@@ -12,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-28 15:28+0000\n"
-"PO-Revision-Date: 2010-08-28 15:29:59+0000\n"
+"POT-Creation-Date: 2010-09-05 09:45+0000\n"
+"PO-Revision-Date: 2010-09-05 09:46:12+0000\n"
"Last-Translator: Ahmad Sufi Mahmudi\n"
"Language-Team: Persian\n"
"MIME-Version: 1.0\n"
@@ -22,7 +22,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 (r71856); Translate extension (2010-08-20)\n"
+"X-Generator: MediaWiki 1.17alpha (r72319); Translate extension (2010-08-20)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
#. TRANS: Page title
@@ -590,7 +590,7 @@ msgstr ""
"بدهید."
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:450
+#: actions/apioauthauthorize.php:310 lib/action.php:463
msgid "Account"
msgstr "حساب کاربری"
@@ -1000,7 +1000,7 @@ msgstr "شما مالک این برنامه نیستید."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1263
+#: lib/action.php:1307
msgid "There was a problem with your session token."
msgstr "یک مشکل با رمز نشست شما وجود داشت."
@@ -4665,7 +4665,7 @@ msgid "Plugins"
msgstr "Ø§ÙØ²ÙˆÙ†Ù‡â€ŒÙ‡Ø§"
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:789
+#: actions/version.php:198 lib/action.php:805
msgid "Version"
msgstr "نسخه"
@@ -4815,7 +4815,7 @@ msgstr "هنگام ذخیرهٔ صندوق ورودی گروه مشکلی رخ Ø
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1751
+#: classes/Notice.php:1757
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -4927,199 +4927,199 @@ msgid "Other"
msgstr "دیگر"
#. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:145
+#: lib/action.php:148
#, php-format
msgid "%1$s - %2$s"
msgstr "%1$s (%2$s)"
#. TRANS: Page title for a page without a title set.
-#: lib/action.php:161
+#: lib/action.php:164
msgid "Untitled page"
msgstr "ØµÙØ­Ù‡Ù” بدون عنوان"
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:436
+#: lib/action.php:449
msgid "Primary site navigation"
msgstr "مسیریابی اصلی وب‌گاه"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:442
+#: lib/action.php:455
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr "نمایهٔ شخصی و خط‌زمانی دوستان"
#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:445
+#: lib/action.php:458
msgctxt "MENU"
msgid "Personal"
msgstr "شخصی"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:447
+#: lib/action.php:460
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "پست الکترونیکی، تصویر، گذرواژه یا نمایهٔ خودتان را تغییر دهید"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:452
+#: lib/action.php:465
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "اتصال به سرویس‌ها"
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:455
+#: lib/action.php:468
msgid "Connect"
msgstr "وصل‌شدن"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:458
+#: lib/action.php:471
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "تغییر پیکربندی وب‌گاه"
#. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:461
+#: lib/action.php:474
msgctxt "MENU"
msgid "Admin"
msgstr "مدیر"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:465
+#: lib/action.php:478
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "دوستان و همکاران‌تان را دعوت کنید تا به شما در %s بپیوندند"
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:468
+#: lib/action.php:481
msgctxt "MENU"
msgid "Invite"
msgstr "دعوت‌کردن"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:474
+#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "خارج‌شدن از وب‌گاه"
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:477
+#: lib/action.php:490
msgctxt "MENU"
msgid "Logout"
msgstr "خروج"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:482
+#: lib/action.php:495
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "ساختن یک جساب‌کاربری"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:485
+#: lib/action.php:498
msgctxt "MENU"
msgid "Register"
msgstr "ثبت‌نام"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:488
+#: lib/action.php:501
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "ورود به وب‌گاه"
-#: lib/action.php:491
+#: lib/action.php:504
msgctxt "MENU"
msgid "Login"
msgstr "ورود"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:494
+#: lib/action.php:507
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "به من کمک کنید!"
-#: lib/action.php:497
+#: lib/action.php:510
msgctxt "MENU"
msgid "Help"
msgstr "Ú©Ù…Ú©"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:500
+#: lib/action.php:513
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "جست‌وجو برای Ø§ÙØ±Ø§Ø¯ یا متن"
-#: lib/action.php:503
+#: lib/action.php:516
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:525 lib/adminpanelaction.php:400
+#: lib/action.php:538 lib/adminpanelaction.php:400
msgid "Site notice"
msgstr "پیام وب‌گاه"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:592
+#: lib/action.php:605
msgid "Local views"
msgstr "دید محلی"
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:659
+#: lib/action.php:675
msgid "Page notice"
msgstr "پیام ØµÙØ­Ù‡"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:762
+#: lib/action.php:778
msgid "Secondary site navigation"
msgstr "مسیریابی ÙØ±Ø¹ÛŒ وب‌گاه"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:768
+#: lib/action.php:784
msgid "Help"
msgstr "Ú©Ù…Ú©"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:771
+#: lib/action.php:787
msgid "About"
msgstr "دربارهٔ"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:774
+#: lib/action.php:790
msgid "FAQ"
msgstr "سوال‌های رایج"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:779
+#: lib/action.php:795
msgid "TOS"
msgstr "شرایط سرویس"
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:783
+#: lib/action.php:799
msgid "Privacy"
msgstr "خصوصی"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:786
+#: lib/action.php:802
msgid "Source"
msgstr "منبع"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:792
+#: lib/action.php:808
msgid "Contact"
msgstr "تماس"
-#: lib/action.php:794
+#: lib/action.php:810
msgid "Badge"
msgstr "نشان"
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:823
+#: lib/action.php:839
msgid "StatusNet software license"
msgstr "StatusNet مجوز نرم Ø§ÙØ²Ø§Ø±"
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:827
+#: lib/action.php:843
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5129,13 +5129,13 @@ msgstr ""
"broughtbyurl%%) برای شما راه‌اندازی شده است."
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:830
+#: lib/action.php:846
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr "**%%site.name%%** یک سرویس میکروبلاگینگ است."
#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:834
+#: lib/action.php:850
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5147,49 +5147,49 @@ msgstr ""
"org/licensing/licenses/agpl-3.0.html) در دسترس است."
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:850
+#: lib/action.php:866
msgid "Site content license"
msgstr "مجوز محتویات وب‌گاه"
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:857
+#: lib/action.php:873
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr "محتویات و داده‌های %1$s خصوصی و محرمانه هستند."
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:864
+#: lib/action.php:880
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr "حق تکثیر محتوا Ùˆ داده‌ها با %1$s است. تمام حقوق محÙوظ است."
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:868
+#: lib/action.php:884
msgid "Content and data copyright by contributors. All rights reserved."
msgstr "حق تکثیر محتوا Ùˆ داده‌ها با مشارکت‌کنندگان است. تمام حقوق محÙوظ است."
#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:881
+#: lib/action.php:897
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr "تمام محتویات و داده‌های %1$s زیر مجوز %2$s در دسترس هستند."
#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1192
+#: lib/action.php:1236
msgid "Pagination"
msgstr "ØµÙØ­Ù‡ بندى"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: present than the currently displayed information.
-#: lib/action.php:1203
+#: lib/action.php:1247
msgid "After"
msgstr "پس از"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: past than the currently displayed information.
-#: lib/action.php:1213
+#: lib/action.php:1257
msgid "Before"
msgstr "قبل از"
@@ -5537,11 +5537,22 @@ msgstr "هنگام تکرار پیام خطایی رخ داد."
msgid "Error saving notice."
msgstr "هنگام ذخیرهٔ پیام خطا رخ داد."
+#. TRANS: Error text shown when no username was provided when issuing a subscribe command.
+#: lib/command.php:655
+msgid "Specify the name of the user to subscribe to."
+msgstr ""
+
#. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
#: lib/command.php:664
msgid "Can't subscribe to OMB profiles by command."
msgstr "نمی‌توان با دستور مشترک نمایه‌های OMB شد."
+#. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
+#. TRANS: Error text shown when no username was provided when issuing the command.
+#: lib/command.php:694 lib/command.php:804
+msgid "Specify the name of the user to unsubscribe from."
+msgstr ""
+
#. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
#. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
#: lib/command.php:724 lib/command.php:750
@@ -5568,6 +5579,18 @@ msgstr "آگاه سازی ÙØ¹Ø§Ù„ است."
msgid "Can't turn on notification."
msgstr "ناتوان در روشن کردن آگاه سازی."
+#. TRANS: Error text shown when issuing the login command while login is disabled.
+#: lib/command.php:771
+msgid "Login command is disabled."
+msgstr ""
+
+#. TRANS: Text shown after issuing the login command successfully.
+#. TRANS: %s is a logon link..
+#: lib/command.php:784
+#, php-format
+msgid "This link is useable only once and is valid for only 2 minutes: %s."
+msgstr ""
+
#. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
#: lib/command.php:831
msgid "You are not subscribed to anyone."
@@ -6670,7 +6693,7 @@ msgstr ""
msgid "The theme file is missing or the upload failed."
msgstr ""
-#: lib/themeuploader.php:139
+#: lib/themeuploader.php:147
msgid "Invalid theme: bad directory structure."
msgstr ""
@@ -6683,13 +6706,17 @@ msgstr ""
msgid "Invalid theme archive: missing file css/display.css"
msgstr ""
-#: lib/themeuploader.php:205
+#: lib/themeuploader.php:218
msgid ""
"Theme contains invalid file or folder name. Stick with ASCII letters, "
"digits, underscore, and minus sign."
msgstr ""
-#: lib/themeuploader.php:216
+#: lib/themeuploader.php:224
+msgid "Theme contains unsafe file extension names; may be unsafe."
+msgstr ""
+
+#: lib/themeuploader.php:241
#, php-format
msgid "Theme contains file of type '.%s', which is not allowed."
msgstr ""
@@ -6765,56 +6792,56 @@ msgid "Moderator"
msgstr "مدیر"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1102
msgid "a few seconds ago"
msgstr "چند ثانیه پیش"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1106
+#: lib/util.php:1105
msgid "about a minute ago"
msgstr "حدود یک دقیقه پیش"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1110
+#: lib/util.php:1109
#, php-format
msgid "about %d minutes ago"
msgstr "حدود %d دقیقه پیش"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1113
+#: lib/util.php:1112
msgid "about an hour ago"
msgstr "حدود یک ساعت پیش"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1117
+#: lib/util.php:1116
#, php-format
msgid "about %d hours ago"
msgstr "حدود %d ساعت پیش"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1120
+#: lib/util.php:1119
msgid "about a day ago"
msgstr "حدود یک روز پیش"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1124
+#: lib/util.php:1123
#, php-format
msgid "about %d days ago"
msgstr "حدود %d روز پیش"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1127
+#: lib/util.php:1126
msgid "about a month ago"
msgstr "حدود یک ماه پیش"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1131
+#: lib/util.php:1130
#, php-format
msgid "about %d months ago"
msgstr "حدود %d ماه پیش"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1134
+#: lib/util.php:1133
msgid "about a year ago"
msgstr "حدود یک سال پیش"
diff --git a/locale/fi/LC_MESSAGES/statusnet.po b/locale/fi/LC_MESSAGES/statusnet.po
index 91958c8c6..804c96d2d 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-08-28 15:28+0000\n"
-"PO-Revision-Date: 2010-08-28 15:29:51+0000\n"
+"POT-Creation-Date: 2010-09-05 09:45+0000\n"
+"PO-Revision-Date: 2010-09-05 09:46:06+0000\n"
"Language-Team: Finnish\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r71856); Translate extension (2010-08-20)\n"
+"X-Generator: MediaWiki 1.17alpha (r72319); Translate extension (2010-08-20)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: fi\n"
"X-Message-Group: out-statusnet\n"
@@ -451,7 +451,7 @@ msgid ""
msgstr ""
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:450
+#: actions/apioauthauthorize.php:310 lib/action.php:463
msgid "Account"
msgstr "Käyttäjätili"
@@ -803,7 +803,7 @@ msgstr "Vahvistuskoodia ei löytynyt."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1263
+#: lib/action.php:1307
msgid "There was a problem with your session token."
msgstr "Istuntoavaimesi kanssa oli ongelma."
@@ -3965,7 +3965,7 @@ msgstr ""
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1751
+#: classes/Notice.php:1757
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -3985,7 +3985,7 @@ msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
msgstr ""
#. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:346
+#: classes/Status_network.php:339
msgid "Unable to save tag."
msgstr "Tagien tallennus epäonnistui."
@@ -4055,137 +4055,137 @@ msgid "Other"
msgstr "Muut"
#. TRANS: Page title for a page without a title set.
-#: lib/action.php:161
+#: lib/action.php:164
msgid "Untitled page"
msgstr "Nimetön sivu"
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:436
+#: lib/action.php:449
msgid "Primary site navigation"
msgstr "Ensisijainen sivunavigointi"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:442
+#: lib/action.php:455
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr ""
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:447
+#: lib/action.php:460
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "Vaihda salasanasi"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:452
+#: lib/action.php:465
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr ""
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:455
+#: lib/action.php:468
msgid "Connect"
msgstr "Yhdistä"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:474
+#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "Kirjaudu sisään"
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:477
+#: lib/action.php:490
msgctxt "MENU"
msgid "Logout"
msgstr "Logo"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:482
+#: lib/action.php:495
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Luo uusi ryhmä"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:488
+#: lib/action.php:501
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Kirjaudu sisään"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:494
+#: lib/action.php:507
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Ohjeet"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:500
+#: lib/action.php:513
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "Hae lisää ryhmiä"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:525 lib/adminpanelaction.php:400
+#: lib/action.php:538 lib/adminpanelaction.php:400
msgid "Site notice"
msgstr "Palvelun ilmoitus"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:592
+#: lib/action.php:605
msgid "Local views"
msgstr "Paikalliset näkymät"
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:659
+#: lib/action.php:675
msgid "Page notice"
msgstr "Sivuilmoitus"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:762
+#: lib/action.php:778
msgid "Secondary site navigation"
msgstr "Toissijainen sivunavigointi"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:768
+#: lib/action.php:784
msgid "Help"
msgstr "Ohjeet"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:771
+#: lib/action.php:787
msgid "About"
msgstr "Tietoa"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:774
+#: lib/action.php:790
msgid "FAQ"
msgstr "UKK"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:779
+#: lib/action.php:795
msgid "TOS"
msgstr ""
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:783
+#: lib/action.php:799
msgid "Privacy"
msgstr "Yksityisyys"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:786
+#: lib/action.php:802
msgid "Source"
msgstr "Lähdekoodi"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:792
+#: lib/action.php:808
msgid "Contact"
msgstr "Ota yhteyttä"
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:823
+#: lib/action.php:839
msgid "StatusNet software license"
msgstr "StatusNet-ohjelmiston lisenssi"
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:827
+#: lib/action.php:843
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4193,13 +4193,13 @@ msgid ""
msgstr ""
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:830
+#: lib/action.php:846
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr "**%%site.name%%** on mikroblogipalvelu."
#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:834
+#: lib/action.php:850
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4212,43 +4212,43 @@ msgstr ""
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:857
+#: lib/action.php:873
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:864
+#: lib/action.php:880
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:868
+#: lib/action.php:884
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:881
+#: lib/action.php:897
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr ""
#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1192
+#: lib/action.php:1236
msgid "Pagination"
msgstr "Sivutus"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: present than the currently displayed information.
-#: lib/action.php:1203
+#: lib/action.php:1247
msgid "After"
msgstr "Myöhemmin"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: past than the currently displayed information.
-#: lib/action.php:1213
+#: lib/action.php:1257
msgid "Before"
msgstr "Aiemmin"
@@ -4457,6 +4457,17 @@ msgstr "Virhe tapahtui käyttäjän asettamisessa."
msgid "Notice too long - maximum is %1$d characters, you sent %2$d."
msgstr ""
+#. TRANS: Error text shown when no username was provided when issuing a subscribe command.
+#: lib/command.php:655
+msgid "Specify the name of the user to subscribe to."
+msgstr ""
+
+#. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
+#. TRANS: Error text shown when no username was provided when issuing the command.
+#: lib/command.php:694 lib/command.php:804
+msgid "Specify the name of the user to unsubscribe from."
+msgstr ""
+
#. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
#. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
#: lib/command.php:724 lib/command.php:750
@@ -5359,7 +5370,7 @@ msgstr ""
msgid "The theme file is missing or the upload failed."
msgstr ""
-#: lib/themeuploader.php:139
+#: lib/themeuploader.php:147
msgid "Invalid theme: bad directory structure."
msgstr ""
@@ -5372,18 +5383,22 @@ msgstr ""
msgid "Invalid theme archive: missing file css/display.css"
msgstr ""
-#: lib/themeuploader.php:205
+#: lib/themeuploader.php:218
msgid ""
"Theme contains invalid file or folder name. Stick with ASCII letters, "
"digits, underscore, and minus sign."
msgstr ""
-#: lib/themeuploader.php:216
+#: lib/themeuploader.php:224
+msgid "Theme contains unsafe file extension names; may be unsafe."
+msgstr ""
+
+#: lib/themeuploader.php:241
#, php-format
msgid "Theme contains file of type '.%s', which is not allowed."
msgstr ""
-#: lib/themeuploader.php:234
+#: lib/themeuploader.php:259
msgid "Error opening theme archive."
msgstr "Tapahtui virhe, kun estoa poistettiin."
@@ -5437,56 +5452,56 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1102
msgid "a few seconds ago"
msgstr "muutama sekunti sitten"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1106
+#: lib/util.php:1105
msgid "about a minute ago"
msgstr "noin minuutti sitten"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1110
+#: lib/util.php:1109
#, php-format
msgid "about %d minutes ago"
msgstr "noin %d minuuttia sitten"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1113
+#: lib/util.php:1112
msgid "about an hour ago"
msgstr "noin tunti sitten"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1117
+#: lib/util.php:1116
#, php-format
msgid "about %d hours ago"
msgstr "noin %d tuntia sitten"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1120
+#: lib/util.php:1119
msgid "about a day ago"
msgstr "noin päivä sitten"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1124
+#: lib/util.php:1123
#, php-format
msgid "about %d days ago"
msgstr "noin %d päivää sitten"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1127
+#: lib/util.php:1126
msgid "about a month ago"
msgstr "noin kuukausi sitten"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1131
+#: lib/util.php:1130
#, php-format
msgid "about %d months ago"
msgstr "noin %d kuukautta sitten"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1134
+#: lib/util.php:1133
msgid "about a year ago"
msgstr "noin vuosi sitten"
diff --git a/locale/fr/LC_MESSAGES/statusnet.po b/locale/fr/LC_MESSAGES/statusnet.po
index 0e8427205..3e588a54a 100644
--- a/locale/fr/LC_MESSAGES/statusnet.po
+++ b/locale/fr/LC_MESSAGES/statusnet.po
@@ -17,12 +17,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-28 15:28+0000\n"
-"PO-Revision-Date: 2010-08-28 15:30:03+0000\n"
+"POT-Creation-Date: 2010-09-05 09:45+0000\n"
+"PO-Revision-Date: 2010-09-05 09:46:15+0000\n"
"Language-Team: French\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r71856); Translate extension (2010-08-20)\n"
+"X-Generator: MediaWiki 1.17alpha (r72319); Translate extension (2010-08-20)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: fr\n"
"X-Message-Group: out-statusnet\n"
@@ -624,7 +624,7 @@ msgstr ""
"confiance."
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:450
+#: actions/apioauthauthorize.php:310 lib/action.php:463
msgid "Account"
msgstr "Compte"
@@ -1036,7 +1036,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:1263
+#: lib/action.php:1307
msgid "There was a problem with your session token."
msgstr "Un problème est survenu avec votre jeton de session."
@@ -4879,7 +4879,7 @@ msgid "Plugins"
msgstr "Extensions"
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:789
+#: actions/version.php:198 lib/action.php:805
msgid "Version"
msgstr "Version"
@@ -5038,7 +5038,7 @@ msgstr "Problème lors de l’enregistrement de la boîte de réception du group
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1751
+#: classes/Notice.php:1757
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -5067,7 +5067,7 @@ msgid "Missing profile."
msgstr "Profil manquant."
#. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:346
+#: classes/Status_network.php:339
msgid "Unable to save tag."
msgstr "Impossible d’enregistrer l’étiquette."
@@ -5169,199 +5169,199 @@ msgid "Other"
msgstr "Autres "
#. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:145
+#: lib/action.php:148
#, php-format
msgid "%1$s - %2$s"
msgstr "%1$s - %2$s"
#. TRANS: Page title for a page without a title set.
-#: lib/action.php:161
+#: lib/action.php:164
msgid "Untitled page"
msgstr "Page sans nom"
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:436
+#: lib/action.php:449
msgid "Primary site navigation"
msgstr "Navigation primaire du site"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:442
+#: lib/action.php:455
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr "Profil personnel et flux des amis"
#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:445
+#: lib/action.php:458
msgctxt "MENU"
msgid "Personal"
msgstr "Personnel"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:447
+#: lib/action.php:460
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:452
+#: lib/action.php:465
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "Se connecter aux services"
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:455
+#: lib/action.php:468
msgid "Connect"
msgstr "Connecter"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:458
+#: lib/action.php:471
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "Modifier la configuration du site"
#. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:461
+#: lib/action.php:474
msgctxt "MENU"
msgid "Admin"
msgstr "Administrer"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:465
+#: lib/action.php:478
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "Inviter des amis et collègues à vous rejoindre sur %s"
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:468
+#: lib/action.php:481
msgctxt "MENU"
msgid "Invite"
msgstr "Inviter"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:474
+#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "Fermer la session"
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:477
+#: lib/action.php:490
msgctxt "MENU"
msgid "Logout"
msgstr "Déconnexion"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:482
+#: lib/action.php:495
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Créer un compte"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:485
+#: lib/action.php:498
msgctxt "MENU"
msgid "Register"
msgstr "S'inscrire"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:488
+#: lib/action.php:501
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Ouvrir une session"
-#: lib/action.php:491
+#: lib/action.php:504
msgctxt "MENU"
msgid "Login"
msgstr "Connexion"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:494
+#: lib/action.php:507
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "À l’aide !"
-#: lib/action.php:497
+#: lib/action.php:510
msgctxt "MENU"
msgid "Help"
msgstr "Aide"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:500
+#: lib/action.php:513
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "Rechercher des personnes ou du texte"
-#: lib/action.php:503
+#: lib/action.php:516
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:525 lib/adminpanelaction.php:400
+#: lib/action.php:538 lib/adminpanelaction.php:400
msgid "Site notice"
msgstr "Notice du site"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:592
+#: lib/action.php:605
msgid "Local views"
msgstr "Vues locales"
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:659
+#: lib/action.php:675
msgid "Page notice"
msgstr "Avis de la page"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:762
+#: lib/action.php:778
msgid "Secondary site navigation"
msgstr "Navigation secondaire du site"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:768
+#: lib/action.php:784
msgid "Help"
msgstr "Aide"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:771
+#: lib/action.php:787
msgid "About"
msgstr "À propos"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:774
+#: lib/action.php:790
msgid "FAQ"
msgstr "FAQ"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:779
+#: lib/action.php:795
msgid "TOS"
msgstr "CGU"
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:783
+#: lib/action.php:799
msgid "Privacy"
msgstr "Confidentialité"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:786
+#: lib/action.php:802
msgid "Source"
msgstr "Source"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:792
+#: lib/action.php:808
msgid "Contact"
msgstr "Contact"
-#: lib/action.php:794
+#: lib/action.php:810
msgid "Badge"
msgstr "Insigne"
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:823
+#: lib/action.php:839
msgid "StatusNet software license"
msgstr "Licence du logiciel StatusNet"
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:827
+#: lib/action.php:843
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5371,13 +5371,13 @@ msgstr ""
"%site.broughtby%%](%%site.broughtbyurl%%)."
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:830
+#: lib/action.php:846
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr "**%%site.name%%** est un service de micro-blogging."
#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:834
+#: lib/action.php:850
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5389,20 +5389,20 @@ msgstr ""
"(http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:850
+#: lib/action.php:866
msgid "Site content license"
msgstr "Licence du contenu du site"
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:857
+#: lib/action.php:873
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr "Le contenu et les données de %1$s sont privés et confidentiels."
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:864
+#: lib/action.php:880
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
@@ -5410,33 +5410,33 @@ msgstr ""
"réservés."
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:868
+#: lib/action.php:884
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
"Le contenu et les données sont sous le droit d’auteur du contributeur. Tous "
"droits réservés."
#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:881
+#: lib/action.php:897
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr ""
"Tous les contenus %1$s et les données sont disponibles sous la licence %2$s."
#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1192
+#: lib/action.php:1236
msgid "Pagination"
msgstr "Pagination"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: present than the currently displayed information.
-#: lib/action.php:1203
+#: lib/action.php:1247
msgid "After"
msgstr "Après"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: past than the currently displayed information.
-#: lib/action.php:1213
+#: lib/action.php:1257
msgid "Before"
msgstr "Avant"
@@ -5695,6 +5695,31 @@ msgstr "Commande complétée"
msgid "Command failed"
msgstr "Échec de la commande"
+#. TRANS: Command exception text shown when a notice ID is requested that does not exist.
+#: lib/command.php:84 lib/command.php:108
+msgid "Notice with that id does not exist."
+msgstr "Aucun avis avec cet identifiant n’existe."
+
+#. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
+#. TRANS: Error text shown when a last user notice is requested and it does not exist.
+#: lib/command.php:101 lib/command.php:630
+msgid "User has no last notice."
+msgstr "Aucun avis récent pour cet utilisateur."
+
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:130
+#, php-format
+msgid "Could not find a user with nickname %s."
+msgstr "Impossible de trouver un utilisateur avec le pseudo %s."
+
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:150
+#, php-format
+msgid "Could not find a local user with nickname %s."
+msgstr "Impossible de trouver un utilisateur local portant le pseudo %s."
+
#. TRANS: Error text shown when an unimplemented command is given.
#: lib/command.php:185
msgid "Sorry, this command is not yet implemented."
@@ -5705,6 +5730,13 @@ msgstr "Désolé, cette commande n’a pas encore été implémentée."
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 !"
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:240
+#, php-format
+msgid "Nudge sent to %s."
+msgstr "Clin d’œil envoyé à %s."
+
#. TRANS: User statistics text.
#. TRANS: %1$s is the number of other user the user is subscribed to.
#. TRANS: %2$s is the number of users that are subscribed to the user.
@@ -5725,6 +5757,20 @@ msgstr ""
msgid "Notice marked as fave."
msgstr "Avis ajouté aux favoris."
+#. TRANS: Message given having added a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:360
+#, php-format
+msgid "%1$s joined group %2$s."
+msgstr "%1$s a rejoint le groupe %2$s."
+
+#. TRANS: Message given having removed a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:408
+#, php-format
+msgid "%1$s left group %2$s."
+msgstr "%1$s a quitté le groupe %2$s."
+
#. TRANS: Whois output. %s is the full name of the queried user.
#: lib/command.php:434
#, php-format
@@ -5775,21 +5821,70 @@ msgstr ""
msgid "Error sending direct message."
msgstr "Une erreur est survenue pendant l’envoi de votre message."
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:554
+#, php-format
+msgid "Notice from %s repeated."
+msgstr "Avis de %s repris."
+
#. TRANS: Error text shown when repeating a notice fails with an unknown reason.
#: lib/command.php:557
msgid "Error repeating notice."
msgstr "Erreur lors de la reprise de l’avis."
+#. TRANS: Message given if content of a notice for a reply is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:592
+#, php-format
+msgid "Notice too long - maximum is %1$d characters, you sent %2$d."
+msgstr ""
+"Avis trop long ! La taille maximale est de %1$d caractères ; vous en avez "
+"entré %2$d."
+
+#. TRANS: Text shown having sent a reply to a notice successfully.
+#. TRANS: %s is the nickname of the user of the notice the reply was sent to.
+#: lib/command.php:603
+#, php-format
+msgid "Reply to %s sent."
+msgstr "Réponse à %s envoyée."
+
#. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
#: lib/command.php:606
msgid "Error saving notice."
msgstr "Problème lors de l’enregistrement de l’avis."
+#. TRANS: Error text shown when no username was provided when issuing a subscribe command.
+#: lib/command.php:655
+msgid "Specify the name of the user to subscribe to."
+msgstr "Indiquez le nom de l’utilisateur auquel vous souhaitez vous abonner."
+
#. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
#: lib/command.php:664
msgid "Can't subscribe to OMB profiles by command."
msgstr "Impossible de s'inscrire aux profils OMB par cette commande."
+#. TRANS: Text shown after having subscribed to another user successfully.
+#. TRANS: %s is the name of the user the subscription was requested for.
+#: lib/command.php:672
+#, php-format
+msgid "Subscribed to %s."
+msgstr "Abonné à %s."
+
+#. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
+#. TRANS: Error text shown when no username was provided when issuing the command.
+#: lib/command.php:694 lib/command.php:804
+msgid "Specify the name of the user to unsubscribe from."
+msgstr ""
+"Indiquez le nom de l’utilisateur duquel vous souhaitez vous désabonner."
+
+#. TRANS: Text shown after having unsubscribed from another user successfully.
+#. TRANS: %s is the name of the user the unsubscription was requested for.
+#: lib/command.php:705
+#, php-format
+msgid "Unsubscribed from %s."
+msgstr "Désabonné de %s."
+
#. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
#. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
#: lib/command.php:724 lib/command.php:750
@@ -5816,6 +5911,27 @@ msgstr "Avertissements activés."
msgid "Can't turn on notification."
msgstr "Impossible d’activer les avertissements."
+#. TRANS: Error text shown when issuing the login command while login is disabled.
+#: lib/command.php:771
+msgid "Login command is disabled."
+msgstr "La commande d’ouverture de session est désactivée."
+
+#. TRANS: Text shown after issuing the login command successfully.
+#. TRANS: %s is a logon link..
+#: lib/command.php:784
+#, php-format
+msgid "This link is useable only once and is valid for only 2 minutes: %s."
+msgstr ""
+"Ce lien n’est utilisable qu’une seule fois, et est valable uniquement "
+"pendant 2 minutes : %s."
+
+#. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
+#. TRANS: %s is the name of the user the unsubscription was requested for.
+#: lib/command.php:813
+#, php-format
+msgid "Unsubscribed %s."
+msgstr "Désabonné de %s."
+
#. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
#: lib/command.php:831
msgid "You are not subscribed to anyone."
@@ -6973,12 +7089,12 @@ msgid "The theme file is missing or the upload failed."
msgstr "Le fichier de thème est manquant ou le téléversement a échoué."
#: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:253 lib/themeuploader.php:257
-#: lib/themeuploader.php:265 lib/themeuploader.php:272
+#: lib/themeuploader.php:278 lib/themeuploader.php:282
+#: lib/themeuploader.php:290 lib/themeuploader.php:297
msgid "Failed saving theme."
msgstr "L’enregistrement du thème a échoué."
-#: lib/themeuploader.php:139
+#: lib/themeuploader.php:147
msgid "Invalid theme: bad directory structure."
msgstr "Thème invalide : mauvaise arborescence."
@@ -6993,7 +7109,7 @@ msgstr ""
msgid "Invalid theme archive: missing file css/display.css"
msgstr "Archive de thème invalide : fichier css/display.css manquant"
-#: lib/themeuploader.php:205
+#: lib/themeuploader.php:218
msgid ""
"Theme contains invalid file or folder name. Stick with ASCII letters, "
"digits, underscore, and minus sign."
@@ -7001,12 +7117,16 @@ msgstr ""
"Le thème contient un nom de fichier ou de dossier invalide. Limitez-vous aux "
"lettres ASCII et aux chiffres, caractère de soulignement et signe moins."
-#: lib/themeuploader.php:216
+#: lib/themeuploader.php:224
+msgid "Theme contains unsafe file extension names; may be unsafe."
+msgstr ""
+
+#: lib/themeuploader.php:241
#, php-format
msgid "Theme contains file of type '.%s', which is not allowed."
msgstr "Le thème contient un fichier de type « .%s », qui n'est pas autorisé."
-#: lib/themeuploader.php:234
+#: lib/themeuploader.php:259
msgid "Error opening theme archive."
msgstr "Erreur lors de l’ouverture de l’archive du thème."
@@ -7085,56 +7205,56 @@ msgid "Moderator"
msgstr "Modérateur"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1102
msgid "a few seconds ago"
msgstr "il y a quelques secondes"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1106
+#: lib/util.php:1105
msgid "about a minute ago"
msgstr "il y a 1 minute"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1110
+#: lib/util.php:1109
#, php-format
msgid "about %d minutes ago"
msgstr "il y a %d minutes"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1113
+#: lib/util.php:1112
msgid "about an hour ago"
msgstr "il y a 1 heure"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1117
+#: lib/util.php:1116
#, php-format
msgid "about %d hours ago"
msgstr "il y a %d heures"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1120
+#: lib/util.php:1119
msgid "about a day ago"
msgstr "il y a 1 jour"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1124
+#: lib/util.php:1123
#, php-format
msgid "about %d days ago"
msgstr "il y a %d jours"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1127
+#: lib/util.php:1126
msgid "about a month ago"
msgstr "il y a 1 mois"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1131
+#: lib/util.php:1130
#, php-format
msgid "about %d months ago"
msgstr "il y a %d mois"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1134
+#: lib/util.php:1133
msgid "about a year ago"
msgstr "il y a environ 1 an"
diff --git a/locale/ga/LC_MESSAGES/statusnet.po b/locale/ga/LC_MESSAGES/statusnet.po
index 7facd66fc..6682009db 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-08-28 15:28+0000\n"
-"PO-Revision-Date: 2010-08-28 15:30:08+0000\n"
+"POT-Creation-Date: 2010-09-05 09:45+0000\n"
+"PO-Revision-Date: 2010-09-05 09:46:16+0000\n"
"Language-Team: Irish\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r71856); Translate extension (2010-08-20)\n"
+"X-Generator: MediaWiki 1.17alpha (r72319); Translate extension (2010-08-20)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ga\n"
"X-Message-Group: out-statusnet\n"
@@ -2528,6 +2528,10 @@ msgstr ""
msgid "Remote subscribe"
msgstr "Suscrición remota"
+#: actions/remotesubscribe.php:124
+msgid "Subscribe to a remote user"
+msgstr ""
+
#: actions/remotesubscribe.php:129
msgid "User nickname"
msgstr "Alcume de usuario"
@@ -3593,7 +3597,7 @@ msgstr ""
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1751
+#: classes/Notice.php:1757
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -3613,7 +3617,7 @@ msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
msgstr ""
#. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:346
+#: classes/Status_network.php:339
msgid "Unable to save tag."
msgstr "Non se poden gardar as etiquetas."
@@ -3668,118 +3672,118 @@ msgid "Other"
msgstr "Outros"
#. TRANS: Page title for a page without a title set.
-#: lib/action.php:161
+#: lib/action.php:164
msgid "Untitled page"
msgstr ""
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:436
+#: lib/action.php:449
msgid "Primary site navigation"
msgstr ""
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:442
+#: lib/action.php:455
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr ""
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:452
+#: lib/action.php:465
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr ""
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:455
+#: lib/action.php:468
msgid "Connect"
msgstr "Conectar"
#. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:461
+#: lib/action.php:474
msgctxt "MENU"
msgid "Admin"
msgstr ""
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:474
+#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr ""
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:482
+#: lib/action.php:495
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr ""
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:488
+#: lib/action.php:501
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr ""
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:500
+#: lib/action.php:513
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr ""
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:592
+#: lib/action.php:605
msgid "Local views"
msgstr ""
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:762
+#: lib/action.php:778
msgid "Secondary site navigation"
msgstr ""
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:768
+#: lib/action.php:784
msgid "Help"
msgstr "Axuda"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:771
+#: lib/action.php:787
msgid "About"
msgstr "Sobre"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:774
+#: lib/action.php:790
msgid "FAQ"
msgstr "Preguntas frecuentes"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:779
+#: lib/action.php:795
msgid "TOS"
msgstr ""
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:783
+#: lib/action.php:799
msgid "Privacy"
msgstr "Privacidade"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:786
+#: lib/action.php:802
msgid "Source"
msgstr "Fonte"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:792
+#: lib/action.php:808
msgid "Contact"
msgstr "Contacto"
-#: lib/action.php:794
+#: lib/action.php:810
msgid "Badge"
msgstr ""
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:823
+#: lib/action.php:839
msgid "StatusNet software license"
msgstr ""
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:827
+#: lib/action.php:843
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -3787,13 +3791,13 @@ msgid ""
msgstr ""
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:830
+#: lib/action.php:846
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr "**%%site.name%%** é un servizo de microbloguexo."
#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:834
+#: lib/action.php:850
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -3806,43 +3810,43 @@ msgstr ""
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:857
+#: lib/action.php:873
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:864
+#: lib/action.php:880
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:868
+#: lib/action.php:884
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:881
+#: lib/action.php:897
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr ""
#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1192
+#: lib/action.php:1236
msgid "Pagination"
msgstr ""
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: present than the currently displayed information.
-#: lib/action.php:1203
+#: lib/action.php:1247
msgid "After"
msgstr "Outros"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: past than the currently displayed information.
-#: lib/action.php:1213
+#: lib/action.php:1257
msgid "Before"
msgstr ""
@@ -4095,6 +4099,17 @@ msgstr "Acounteceu un erro configurando o usuario."
msgid "Notice too long - maximum is %1$d characters, you sent %2$d."
msgstr ""
+#. TRANS: Error text shown when no username was provided when issuing a subscribe command.
+#: lib/command.php:655
+msgid "Specify the name of the user to subscribe to."
+msgstr ""
+
+#. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
+#. TRANS: Error text shown when no username was provided when issuing the command.
+#: lib/command.php:694 lib/command.php:804
+msgid "Specify the name of the user to unsubscribe from."
+msgstr ""
+
#. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
#. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
#: lib/command.php:724 lib/command.php:750
@@ -4857,6 +4872,11 @@ msgstr "Band. Saída"
msgid "Your sent messages"
msgstr "As túas mensaxes enviadas"
+#: lib/personaltagcloudsection.php:56
+#, php-format
+msgid "Tags in %s's notices"
+msgstr ""
+
#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr "Subscricións"
@@ -4989,7 +5009,7 @@ msgstr ""
msgid "The theme file is missing or the upload failed."
msgstr ""
-#: lib/themeuploader.php:139
+#: lib/themeuploader.php:147
msgid "Invalid theme: bad directory structure."
msgstr ""
@@ -5002,18 +5022,22 @@ msgstr ""
msgid "Invalid theme archive: missing file css/display.css"
msgstr ""
-#: lib/themeuploader.php:205
+#: lib/themeuploader.php:218
msgid ""
"Theme contains invalid file or folder name. Stick with ASCII letters, "
"digits, underscore, and minus sign."
msgstr ""
-#: lib/themeuploader.php:216
+#: lib/themeuploader.php:224
+msgid "Theme contains unsafe file extension names; may be unsafe."
+msgstr ""
+
+#: lib/themeuploader.php:241
#, php-format
msgid "Theme contains file of type '.%s', which is not allowed."
msgstr ""
-#: lib/themeuploader.php:234
+#: lib/themeuploader.php:259
msgid "Error opening theme archive."
msgstr "Acounteceu un erro borrando o bloqueo."
@@ -5064,56 +5088,56 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1102
msgid "a few seconds ago"
msgstr "fai uns segundos"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1106
+#: lib/util.php:1105
msgid "about a minute ago"
msgstr "fai un minuto"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1110
+#: lib/util.php:1109
#, php-format
msgid "about %d minutes ago"
msgstr "fai %d minutos"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1113
+#: lib/util.php:1112
msgid "about an hour ago"
msgstr "fai unha hora"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1117
+#: lib/util.php:1116
#, php-format
msgid "about %d hours ago"
msgstr "fai %d horas"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1120
+#: lib/util.php:1119
msgid "about a day ago"
msgstr "fai un día"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1124
+#: lib/util.php:1123
#, php-format
msgid "about %d days ago"
msgstr "fai %d días"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1127
+#: lib/util.php:1126
msgid "about a month ago"
msgstr "fai un mes"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1131
+#: lib/util.php:1130
#, php-format
msgid "about %d months ago"
msgstr "fai %d meses"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1134
+#: lib/util.php:1133
msgid "about a year ago"
msgstr "fai un ano"
diff --git a/locale/gl/LC_MESSAGES/statusnet.po b/locale/gl/LC_MESSAGES/statusnet.po
index 08610bf54..fff987a4f 100644
--- a/locale/gl/LC_MESSAGES/statusnet.po
+++ b/locale/gl/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-28 15:28+0000\n"
-"PO-Revision-Date: 2010-08-28 15:30:15+0000\n"
+"POT-Creation-Date: 2010-09-05 09:45+0000\n"
+"PO-Revision-Date: 2010-09-05 09:46:22+0000\n"
"Language-Team: Galician\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r71856); Translate extension (2010-08-20)\n"
+"X-Generator: MediaWiki 1.17alpha (r72319); Translate extension (2010-08-20)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: gl\n"
"X-Message-Group: out-statusnet\n"
@@ -610,7 +610,7 @@ msgstr ""
"acceso á súa conta %4$s a xente de confianza."
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:450
+#: actions/apioauthauthorize.php:310 lib/action.php:463
msgid "Account"
msgstr "Conta"
@@ -1022,7 +1022,7 @@ msgstr "Non é o dono desa aplicación."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1263
+#: lib/action.php:1307
msgid "There was a problem with your session token."
msgstr "Houbo un problema co seu pase."
@@ -4846,7 +4846,7 @@ msgid "Plugins"
msgstr "Complementos"
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:789
+#: actions/version.php:198 lib/action.php:805
msgid "Version"
msgstr "Versión"
@@ -5006,7 +5006,7 @@ msgstr "Houbo un problema ao gardar a caixa de entrada do grupo."
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1751
+#: classes/Notice.php:1757
#, php-format
msgid "RT @%1$s %2$s"
msgstr "â™» @%1$s %2$s"
@@ -5033,7 +5033,7 @@ msgid "Missing profile."
msgstr "Falta o perfil de usuario."
#. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:346
+#: classes/Status_network.php:339
msgid "Unable to save tag."
msgstr "Non se puido gardar a nota do sitio."
@@ -5135,199 +5135,199 @@ msgid "Other"
msgstr "Outros"
#. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:145
+#: lib/action.php:148
#, php-format
msgid "%1$s - %2$s"
msgstr "%1$s - %2$s"
#. TRANS: Page title for a page without a title set.
-#: lib/action.php:161
+#: lib/action.php:164
msgid "Untitled page"
msgstr "Páxina sen título"
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:436
+#: lib/action.php:449
msgid "Primary site navigation"
msgstr "Navegación principal do sitio"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:442
+#: lib/action.php:455
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr "Liña do tempo do perfil persoal e os amigos"
#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:445
+#: lib/action.php:458
msgctxt "MENU"
msgid "Personal"
msgstr "Persoal"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:447
+#: lib/action.php:460
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "Cambie o seu correo electrónico, avatar, contrasinal ou perfil"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:452
+#: lib/action.php:465
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "Conectarse aos servizos"
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:455
+#: lib/action.php:468
msgid "Connect"
msgstr "Conectarse"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:458
+#: lib/action.php:471
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "Cambiar a configuración do sitio"
#. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:461
+#: lib/action.php:474
msgctxt "MENU"
msgid "Admin"
msgstr "Administrador"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:465
+#: lib/action.php:478
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "Convide a amigos e compañeiros a unírselle en %s"
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:468
+#: lib/action.php:481
msgctxt "MENU"
msgid "Invite"
msgstr "Convidar"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:474
+#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "Saír ao anonimato"
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:477
+#: lib/action.php:490
msgctxt "MENU"
msgid "Logout"
msgstr "Saír"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:482
+#: lib/action.php:495
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Crear unha conta"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:485
+#: lib/action.php:498
msgctxt "MENU"
msgid "Register"
msgstr "Rexistrarse"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:488
+#: lib/action.php:501
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Identificarse no sitio"
-#: lib/action.php:491
+#: lib/action.php:504
msgctxt "MENU"
msgid "Login"
msgstr "Identificarse"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:494
+#: lib/action.php:507
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Axuda!"
-#: lib/action.php:497
+#: lib/action.php:510
msgctxt "MENU"
msgid "Help"
msgstr "Axuda"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:500
+#: lib/action.php:513
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "Buscar persoas ou palabras"
-#: lib/action.php:503
+#: lib/action.php:516
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:525 lib/adminpanelaction.php:400
+#: lib/action.php:538 lib/adminpanelaction.php:400
msgid "Site notice"
msgstr "Nota do sitio"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:592
+#: lib/action.php:605
msgid "Local views"
msgstr "Vistas locais"
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:659
+#: lib/action.php:675
msgid "Page notice"
msgstr "Nota da páxina"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:762
+#: lib/action.php:778
msgid "Secondary site navigation"
msgstr "Navegación secundaria do sitio"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:768
+#: lib/action.php:784
msgid "Help"
msgstr "Axuda"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:771
+#: lib/action.php:787
msgid "About"
msgstr "Acerca de"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:774
+#: lib/action.php:790
msgid "FAQ"
msgstr "Preguntas máis frecuentes"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:779
+#: lib/action.php:795
msgid "TOS"
msgstr "Condicións do servicio"
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:783
+#: lib/action.php:799
msgid "Privacy"
msgstr "Protección de datos"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:786
+#: lib/action.php:802
msgid "Source"
msgstr "Código fonte"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:792
+#: lib/action.php:808
msgid "Contact"
msgstr "Contacto"
-#: lib/action.php:794
+#: lib/action.php:810
msgid "Badge"
msgstr "Insignia"
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:823
+#: lib/action.php:839
msgid "StatusNet software license"
msgstr "Licenza do software StatusNet"
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:827
+#: lib/action.php:843
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5337,13 +5337,13 @@ msgstr ""
"site.broughtby%%](%%site.broughtbyurl%%)."
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:830
+#: lib/action.php:846
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr "**%%site.name%%** é un servizo de mensaxes de blogue curtas."
#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:834
+#: lib/action.php:850
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5355,20 +5355,20 @@ msgstr ""
"GNU](http://www.fsf.org/licensing/licenses/agpl-3.0.html) (en inglés)."
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:850
+#: lib/action.php:866
msgid "Site content license"
msgstr "Licenza dos contidos do sitio"
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:857
+#: lib/action.php:873
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr "O contido e os datos de %1$s son privados e confidenciais."
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:864
+#: lib/action.php:880
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
@@ -5376,33 +5376,33 @@ msgstr ""
"todos os dereitos."
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:868
+#: lib/action.php:884
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
"Os contidos e datos son propiedade intelectual dos colaboradores. Quedan "
"reservados todos os dereitos."
#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:881
+#: lib/action.php:897
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr ""
"Todos os contidos e datos de %1$s están dispoñibles baixo a licenza %2$s."
#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1192
+#: lib/action.php:1236
msgid "Pagination"
msgstr "Paxinación"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: present than the currently displayed information.
-#: lib/action.php:1203
+#: lib/action.php:1247
msgid "After"
msgstr "Posteriores"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: past than the currently displayed information.
-#: lib/action.php:1213
+#: lib/action.php:1257
msgid "Before"
msgstr "Anteriores"
@@ -5661,6 +5661,31 @@ msgstr "Completouse a orde"
msgid "Command failed"
msgstr "A orde fallou"
+#. TRANS: Command exception text shown when a notice ID is requested that does not exist.
+#: lib/command.php:84 lib/command.php:108
+msgid "Notice with that id does not exist."
+msgstr "Non hai ningunha nota con esa id."
+
+#. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
+#. TRANS: Error text shown when a last user notice is requested and it does not exist.
+#: lib/command.php:101 lib/command.php:630
+msgid "User has no last notice."
+msgstr "O usuario non ten ningunha última nota."
+
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:130
+#, php-format
+msgid "Could not find a user with nickname %s."
+msgstr "Non se deu atopado ningún usuario co alcume %s."
+
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:150
+#, php-format
+msgid "Could not find a local user with nickname %s."
+msgstr "Non se deu atopado ningún usuario local co alcume %s."
+
#. TRANS: Error text shown when an unimplemented command is given.
#: lib/command.php:185
msgid "Sorry, this command is not yet implemented."
@@ -5671,6 +5696,13 @@ msgstr "Esta orde aínda non está integrada."
msgid "It does not make a lot of sense to nudge yourself!"
msgstr "Non ten sentido ningún facerse un aceno a un mesmo!"
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:240
+#, php-format
+msgid "Nudge sent to %s."
+msgstr "Fíxoselle un aceno a %s."
+
#. TRANS: User statistics text.
#. TRANS: %1$s is the number of other user the user is subscribed to.
#. TRANS: %2$s is the number of users that are subscribed to the user.
@@ -5691,6 +5723,20 @@ msgstr ""
msgid "Notice marked as fave."
msgstr "Marcouse a nota como favorita."
+#. TRANS: Message given having added a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:360
+#, php-format
+msgid "%1$s joined group %2$s."
+msgstr "%1$s uniuse ao grupo %2$s."
+
+#. TRANS: Message given having removed a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:408
+#, php-format
+msgid "%1$s left group %2$s."
+msgstr "%1$s deixou o grupo %2$s."
+
#. TRANS: Whois output. %s is the full name of the queried user.
#: lib/command.php:434
#, php-format
@@ -5740,21 +5786,67 @@ msgstr ""
msgid "Error sending direct message."
msgstr "Houbo un erro ao enviar a mensaxe directa."
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:554
+#, php-format
+msgid "Notice from %s repeated."
+msgstr "Repetiuse a nota de %s."
+
#. TRANS: Error text shown when repeating a notice fails with an unknown reason.
#: lib/command.php:557
msgid "Error repeating notice."
msgstr "Houbo un erro ao repetir a nota."
+#. TRANS: Message given if content of a notice for a reply is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:592
+#, php-format
+msgid "Notice too long - maximum is %1$d characters, you sent %2$d."
+msgstr "A nota é longa de máis. O límite son %1$d caracteres, e enviou %2$d."
+
+#. TRANS: Text shown having sent a reply to a notice successfully.
+#. TRANS: %s is the nickname of the user of the notice the reply was sent to.
+#: lib/command.php:603
+#, php-format
+msgid "Reply to %s sent."
+msgstr "Enviouse a resposta a %s."
+
#. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
#: lib/command.php:606
msgid "Error saving notice."
msgstr "Houbo un erro ao gardar a nota."
+#. TRANS: Error text shown when no username was provided when issuing a subscribe command.
+#: lib/command.php:655
+msgid "Specify the name of the user to subscribe to."
+msgstr "Introduza o nome do usuario ao que quere subscribirse."
+
#. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
#: lib/command.php:664
msgid "Can't subscribe to OMB profiles by command."
msgstr "Non se pode subscribir aos perfís OMB cunha orde."
+#. TRANS: Text shown after having subscribed to another user successfully.
+#. TRANS: %s is the name of the user the subscription was requested for.
+#: lib/command.php:672
+#, php-format
+msgid "Subscribed to %s."
+msgstr "Subscribiuse a %s."
+
+#. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
+#. TRANS: Error text shown when no username was provided when issuing the command.
+#: lib/command.php:694 lib/command.php:804
+msgid "Specify the name of the user to unsubscribe from."
+msgstr "Introduza o nome do usuario ao que quer deixar de estar subscrito."
+
+#. TRANS: Text shown after having unsubscribed from another user successfully.
+#. TRANS: %s is the name of the user the unsubscription was requested for.
+#: lib/command.php:705
+#, php-format
+msgid "Unsubscribed from %s."
+msgstr "Cancelou a subscrición a %s."
+
#. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
#. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
#: lib/command.php:724 lib/command.php:750
@@ -5781,6 +5873,27 @@ msgstr "Activar a notificación."
msgid "Can't turn on notification."
msgstr "Non se pode activar a notificación."
+#. TRANS: Error text shown when issuing the login command while login is disabled.
+#: lib/command.php:771
+msgid "Login command is disabled."
+msgstr "A orde de identificación está desactivada."
+
+#. TRANS: Text shown after issuing the login command successfully.
+#. TRANS: %s is a logon link..
+#: lib/command.php:784
+#, php-format
+msgid "This link is useable only once and is valid for only 2 minutes: %s."
+msgstr ""
+"Esta ligazón só se pode utilizar unha vez, e só nos próximos dous minutos: %"
+"s."
+
+#. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
+#. TRANS: %s is the name of the user the unsubscription was requested for.
+#: lib/command.php:813
+#, php-format
+msgid "Unsubscribed %s."
+msgstr "Cancelou a subscrición a %s."
+
#. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
#: lib/command.php:831
msgid "You are not subscribed to anyone."
@@ -6932,12 +7045,12 @@ msgid "The theme file is missing or the upload failed."
msgstr "O ficheiro do tema visual non existe ou a subida fallou."
#: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:253 lib/themeuploader.php:257
-#: lib/themeuploader.php:265 lib/themeuploader.php:272
+#: lib/themeuploader.php:278 lib/themeuploader.php:282
+#: lib/themeuploader.php:290 lib/themeuploader.php:297
msgid "Failed saving theme."
msgstr "Non se puido gardar o tema visual."
-#: lib/themeuploader.php:139
+#: lib/themeuploader.php:147
msgid "Invalid theme: bad directory structure."
msgstr "Tema visual inválido: a estrutura do directorio é incorrecta"
@@ -6952,7 +7065,7 @@ msgstr ""
msgid "Invalid theme archive: missing file css/display.css"
msgstr "Arquivo de tema visual inválido: falta o ficheiro css/display.css"
-#: lib/themeuploader.php:205
+#: lib/themeuploader.php:218
msgid ""
"Theme contains invalid file or folder name. Stick with ASCII letters, "
"digits, underscore, and minus sign."
@@ -6960,12 +7073,16 @@ msgstr ""
"O tema visual contén un ficheiro inválido ou nome de cartafol incorrecto. "
"Limíteo a letras ASCII, díxitos, barras baixas e signos menos."
-#: lib/themeuploader.php:216
+#: lib/themeuploader.php:224
+msgid "Theme contains unsafe file extension names; may be unsafe."
+msgstr ""
+
+#: lib/themeuploader.php:241
#, php-format
msgid "Theme contains file of type '.%s', which is not allowed."
msgstr "O tema visual contén o tipo de ficheiro \".%s\". Non está permitido."
-#: lib/themeuploader.php:234
+#: lib/themeuploader.php:259
msgid "Error opening theme archive."
msgstr "Houbo un erro ao abrir o arquivo do tema visual."
@@ -7044,56 +7161,56 @@ msgid "Moderator"
msgstr "Moderador"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1102
msgid "a few seconds ago"
msgstr "hai uns segundos"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1106
+#: lib/util.php:1105
msgid "about a minute ago"
msgstr "hai como un minuto"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1110
+#: lib/util.php:1109
#, php-format
msgid "about %d minutes ago"
msgstr "hai como %d minutos"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1113
+#: lib/util.php:1112
msgid "about an hour ago"
msgstr "hai como unha hora"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1117
+#: lib/util.php:1116
#, php-format
msgid "about %d hours ago"
msgstr "hai como %d horas"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1120
+#: lib/util.php:1119
msgid "about a day ago"
msgstr "hai como un día"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1124
+#: lib/util.php:1123
#, php-format
msgid "about %d days ago"
msgstr "hai como %d días"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1127
+#: lib/util.php:1126
msgid "about a month ago"
msgstr "hai como un mes"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1131
+#: lib/util.php:1130
#, php-format
msgid "about %d months ago"
msgstr "hai como %d meses"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1134
+#: lib/util.php:1133
msgid "about a year ago"
msgstr "hai como un ano"
diff --git a/locale/he/LC_MESSAGES/statusnet.po b/locale/he/LC_MESSAGES/statusnet.po
index e21cb66ab..34d71bfe6 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-08-28 15:28+0000\n"
-"PO-Revision-Date: 2010-08-28 15:30:17+0000\n"
+"POT-Creation-Date: 2010-09-05 09:45+0000\n"
+"PO-Revision-Date: 2010-09-05 09:46: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 (r71856); Translate extension (2010-08-20)\n"
+"X-Generator: MediaWiki 1.17alpha (r72319); Translate extension (2010-08-20)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: he\n"
"X-Message-Group: out-statusnet\n"
@@ -670,7 +670,7 @@ msgstr "קוד ×”×ישור ×œ× × ×ž×¦×."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1263
+#: lib/action.php:1307
msgid "There was a problem with your session token."
msgstr ""
@@ -3414,7 +3414,7 @@ msgstr ""
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1751
+#: classes/Notice.php:1757
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
@@ -3491,137 +3491,137 @@ msgid "Other"
msgstr ""
#. TRANS: Page title for a page without a title set.
-#: lib/action.php:161
+#: lib/action.php:164
msgid "Untitled page"
msgstr ""
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:436
+#: lib/action.php:449
msgid "Primary site navigation"
msgstr ""
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:442
+#: lib/action.php:455
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr ""
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:447
+#: lib/action.php:460
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr ""
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:452
+#: lib/action.php:465
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr ""
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:455
+#: lib/action.php:468
msgid "Connect"
msgstr "התחבר"
#. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:461
+#: lib/action.php:474
msgctxt "MENU"
msgid "Admin"
msgstr ""
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:465
+#: lib/action.php:478
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr ""
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:468
+#: lib/action.php:481
msgctxt "MENU"
msgid "Invite"
msgstr ""
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:474
+#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr ""
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:482
+#: lib/action.php:495
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr ""
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:488
+#: lib/action.php:501
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr ""
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:500
+#: lib/action.php:513
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr ""
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:592
+#: lib/action.php:605
msgid "Local views"
msgstr ""
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:762
+#: lib/action.php:778
msgid "Secondary site navigation"
msgstr ""
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:768
+#: lib/action.php:784
msgid "Help"
msgstr "עזרה"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:771
+#: lib/action.php:787
msgid "About"
msgstr "×ודות"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:774
+#: lib/action.php:790
msgid "FAQ"
msgstr "רשימת ש×לות נפוצות"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:779
+#: lib/action.php:795
msgid "TOS"
msgstr ""
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:783
+#: lib/action.php:799
msgid "Privacy"
msgstr "פרטיות"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:786
+#: lib/action.php:802
msgid "Source"
msgstr "מקור"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:792
+#: lib/action.php:808
msgid "Contact"
msgstr "צור קשר"
-#: lib/action.php:794
+#: lib/action.php:810
msgid "Badge"
msgstr ""
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:823
+#: lib/action.php:839
msgid "StatusNet software license"
msgstr ""
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:827
+#: lib/action.php:843
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -3629,13 +3629,13 @@ msgid ""
msgstr ""
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:830
+#: lib/action.php:846
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr "**%%site.name%%** ×”×•× ×©×¨×•×ª ביקרובלוג."
#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:834
+#: lib/action.php:850
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -3648,43 +3648,43 @@ msgstr ""
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:857
+#: lib/action.php:873
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:864
+#: lib/action.php:880
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:868
+#: lib/action.php:884
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:881
+#: lib/action.php:897
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr ""
#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1192
+#: lib/action.php:1236
msgid "Pagination"
msgstr ""
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: present than the currently displayed information.
-#: lib/action.php:1203
+#: lib/action.php:1247
msgid "After"
msgstr ""
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: past than the currently displayed information.
-#: lib/action.php:1213
+#: lib/action.php:1257
msgid "Before"
msgstr ""
@@ -3882,6 +3882,20 @@ msgstr ""
msgid "Notice with that id does not exist."
msgstr ""
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:130
+#, php-format
+msgid "Could not find a user with nickname %s."
+msgstr ""
+
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:150
+#, php-format
+msgid "Could not find a local user with nickname %s."
+msgstr ""
+
#. TRANS: Error text shown when an unimplemented command is given.
#: lib/command.php:185
msgid "Sorry, this command is not yet implemented."
@@ -4789,7 +4803,7 @@ msgstr ""
msgid "The theme file is missing or the upload failed."
msgstr ""
-#: lib/themeuploader.php:139
+#: lib/themeuploader.php:147
msgid "Invalid theme: bad directory structure."
msgstr ""
@@ -4802,13 +4816,17 @@ msgstr ""
msgid "Invalid theme archive: missing file css/display.css"
msgstr ""
-#: lib/themeuploader.php:205
+#: lib/themeuploader.php:218
msgid ""
"Theme contains invalid file or folder name. Stick with ASCII letters, "
"digits, underscore, and minus sign."
msgstr ""
-#: lib/themeuploader.php:216
+#: lib/themeuploader.php:224
+msgid "Theme contains unsafe file extension names; may be unsafe."
+msgstr ""
+
+#: lib/themeuploader.php:241
#, php-format
msgid "Theme contains file of type '.%s', which is not allowed."
msgstr ""
@@ -4856,56 +4874,56 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1102
msgid "a few seconds ago"
msgstr "לפני מספר שניות"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1106
+#: lib/util.php:1105
msgid "about a minute ago"
msgstr "לפני כדקה"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1110
+#: lib/util.php:1109
#, php-format
msgid "about %d minutes ago"
msgstr "לפני כ-%d דקות"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1113
+#: lib/util.php:1112
msgid "about an hour ago"
msgstr "לפני כשעה"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1117
+#: lib/util.php:1116
#, php-format
msgid "about %d hours ago"
msgstr "לפני כ-%d שעות"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1120
+#: lib/util.php:1119
msgid "about a day ago"
msgstr "לפני כיו×"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1124
+#: lib/util.php:1123
#, php-format
msgid "about %d days ago"
msgstr "לפני ×›-%d ימי×"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1127
+#: lib/util.php:1126
msgid "about a month ago"
msgstr "לפני כחודש"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1131
+#: lib/util.php:1130
#, php-format
msgid "about %d months ago"
msgstr "לפני ×›-%d חודשי×"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1134
+#: lib/util.php:1133
msgid "about a year ago"
msgstr "לפני כשנה"
diff --git a/locale/hsb/LC_MESSAGES/statusnet.po b/locale/hsb/LC_MESSAGES/statusnet.po
index 4b6a15f7c..0e6a36ac6 100644
--- a/locale/hsb/LC_MESSAGES/statusnet.po
+++ b/locale/hsb/LC_MESSAGES/statusnet.po
@@ -10,12 +10,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-28 15:28+0000\n"
-"PO-Revision-Date: 2010-08-28 15:30:21+0000\n"
+"POT-Creation-Date: 2010-09-05 09:45+0000\n"
+"PO-Revision-Date: 2010-09-05 09:46: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 (r71856); Translate extension (2010-08-20)\n"
+"X-Generator: MediaWiki 1.17alpha (r72319); Translate extension (2010-08-20)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: hsb\n"
"X-Message-Group: out-statusnet\n"
@@ -573,7 +573,7 @@ msgid ""
msgstr ""
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:450
+#: actions/apioauthauthorize.php:310 lib/action.php:463
msgid "Account"
msgstr "Konto"
@@ -952,7 +952,7 @@ msgstr "Njejsy wobsedźer tuteje aplikacije."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1263
+#: lib/action.php:1307
msgid "There was a problem with your session token."
msgstr ""
@@ -1558,10 +1558,6 @@ msgstr "Žane nahrate přiwěški."
msgid "Not expecting this response!"
msgstr "NjewoÄakowana wotmoÅ‚wa!"
-#: 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 "Móžeš lokalny abonement wužiwać!"
@@ -4123,7 +4119,7 @@ msgid "Plugins"
msgstr "TykaÄe"
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:789
+#: actions/version.php:198 lib/action.php:805
msgid "Version"
msgstr "Wersija"
@@ -4245,7 +4241,7 @@ msgstr ""
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1751
+#: classes/Notice.php:1757
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -4270,7 +4266,7 @@ msgid "Missing profile."
msgstr "Falowacy profil."
#. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:346
+#: classes/Status_network.php:339
msgid "Unable to save tag."
msgstr "Njeje móžno, tafliÄku skÅ‚adować."
@@ -4362,173 +4358,173 @@ msgid "Other"
msgstr "Druhe"
#. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:145
+#: lib/action.php:148
#, php-format
msgid "%1$s - %2$s"
msgstr "%1$s - %2$s"
#. TRANS: Page title for a page without a title set.
-#: lib/action.php:161
+#: lib/action.php:164
msgid "Untitled page"
msgstr "Strona bjez titula"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:442
+#: lib/action.php:455
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr ""
#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:445
+#: lib/action.php:458
msgctxt "MENU"
msgid "Personal"
msgstr "Wosobinski"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:447
+#: lib/action.php:460
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "Wašu e-mejl, waš awatar, waše hesło, waš profil změnić"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:452
+#: lib/action.php:465
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "Ze słužbami zwjazać"
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:455
+#: lib/action.php:468
msgid "Connect"
msgstr "Zwjazać"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:458
+#: lib/action.php:471
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "Sydłowu konfiguraciju změnić"
#. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:461
+#: lib/action.php:474
msgctxt "MENU"
msgid "Admin"
msgstr "Administrator"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:465
+#: lib/action.php:478
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "Přećelow a kolegow přeprosyć, so tebi na %s přidružić"
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:468
+#: lib/action.php:481
msgctxt "MENU"
msgid "Invite"
msgstr "Přeprosyć"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:474
+#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "Ze sydła wotzjewić"
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:477
+#: lib/action.php:490
msgctxt "MENU"
msgid "Logout"
msgstr "Wotzjewić"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:482
+#: lib/action.php:495
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Konto załožić"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:485
+#: lib/action.php:498
msgctxt "MENU"
msgid "Register"
msgstr "Registrować"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:488
+#: lib/action.php:501
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Při sydle přizjewić"
-#: lib/action.php:491
+#: lib/action.php:504
msgctxt "MENU"
msgid "Login"
msgstr "Přizjewjenje"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:494
+#: lib/action.php:507
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Pomhaj!"
-#: lib/action.php:497
+#: lib/action.php:510
msgctxt "MENU"
msgid "Help"
msgstr "Pomoc"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:500
+#: lib/action.php:513
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "Za ludźimi abo tekstom pytać"
-#: lib/action.php:503
+#: lib/action.php:516
msgctxt "MENU"
msgid "Search"
msgstr "Pytać"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:768
+#: lib/action.php:784
msgid "Help"
msgstr "Pomoc"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:771
+#: lib/action.php:787
msgid "About"
msgstr "Wo"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:774
+#: lib/action.php:790
msgid "FAQ"
msgstr "Huste prašenja"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:779
+#: lib/action.php:795
msgid "TOS"
msgstr ""
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:783
+#: lib/action.php:799
msgid "Privacy"
msgstr "Priwatnosć"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:786
+#: lib/action.php:802
msgid "Source"
msgstr "Žórło"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:792
+#: lib/action.php:808
msgid "Contact"
msgstr "Kontakt"
-#: lib/action.php:794
+#: lib/action.php:810
msgid "Badge"
msgstr ""
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:823
+#: lib/action.php:839
msgid "StatusNet software license"
msgstr ""
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:827
+#: lib/action.php:843
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4536,13 +4532,13 @@ msgid ""
msgstr ""
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:830
+#: lib/action.php:846
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr ""
#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:834
+#: lib/action.php:850
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4552,38 +4548,38 @@ msgstr ""
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:857
+#: lib/action.php:873
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:864
+#: lib/action.php:880
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:868
+#: lib/action.php:884
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:881
+#: lib/action.php:897
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr ""
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: present than the currently displayed information.
-#: lib/action.php:1203
+#: lib/action.php:1247
msgid "After"
msgstr "Po"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: past than the currently displayed information.
-#: lib/action.php:1213
+#: lib/action.php:1257
msgid "Before"
msgstr "Před"
@@ -4813,6 +4809,17 @@ msgstr "Přikaz wuwjedźeny"
msgid "Command failed"
msgstr "Přikaz je so njeporadźił"
+#. TRANS: Command exception text shown when a notice ID is requested that does not exist.
+#: lib/command.php:84 lib/command.php:108
+msgid "Notice with that id does not exist."
+msgstr "Zdźělenka z tym ID njeeksistuje."
+
+#. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
+#. TRANS: Error text shown when a last user notice is requested and it does not exist.
+#: lib/command.php:101 lib/command.php:630
+msgid "User has no last notice."
+msgstr "Wužiwar nima poslednju powěsć."
+
#. TRANS: Error text shown when an unimplemented command is given.
#: lib/command.php:185
msgid "Sorry, this command is not yet implemented."
@@ -4890,21 +4897,46 @@ msgstr ""
msgid "Error sending direct message."
msgstr "Zmylk při słanju direktneje powěsće,"
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:554
+#, php-format
+msgid "Notice from %s repeated."
+msgstr "Powěsć wot %s wospjetowana."
+
#. TRANS: Error text shown when repeating a notice fails with an unknown reason.
#: lib/command.php:557
msgid "Error repeating notice."
msgstr "Zmylk při wospjetowanju zdźělenki"
+#. TRANS: Text shown having sent a reply to a notice successfully.
+#. TRANS: %s is the nickname of the user of the notice the reply was sent to.
+#: lib/command.php:603
+#, php-format
+msgid "Reply to %s sent."
+msgstr "Wotmołwa na %s pósłana."
+
#. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
#: lib/command.php:606
msgid "Error saving notice."
msgstr "Zmylk při składowanju powěsće"
+#. TRANS: Error text shown when no username was provided when issuing a subscribe command.
+#: lib/command.php:655
+msgid "Specify the name of the user to subscribe to."
+msgstr ""
+
#. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
#: lib/command.php:664
msgid "Can't subscribe to OMB profiles by command."
msgstr "OMB-profile njedadźa so přez přikaz abonować."
+#. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
+#. TRANS: Error text shown when no username was provided when issuing the command.
+#: lib/command.php:694 lib/command.php:804
+msgid "Specify the name of the user to unsubscribe from."
+msgstr ""
+
#. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
#. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
#: lib/command.php:724 lib/command.php:750
@@ -4931,6 +4963,11 @@ msgstr "Zdźělenje zmóžnjene."
msgid "Can't turn on notification."
msgstr "Zdźělenje njeda so zmóžnić."
+#. TRANS: Error text shown when issuing the login command while login is disabled.
+#: lib/command.php:771
+msgid "Login command is disabled."
+msgstr ""
+
#. TRANS: Text shown after issuing the login command successfully.
#. TRANS: %s is a logon link..
#: lib/command.php:784
@@ -5708,6 +5745,11 @@ msgstr "Wuchadny póst"
msgid "Your sent messages"
msgstr "Twoje pósłane powěsće"
+#: lib/personaltagcloudsection.php:56
+#, php-format
+msgid "Tags in %s's notices"
+msgstr ""
+
#: lib/plugin.php:115
msgid "Unknown"
msgstr "Njeznaty"
@@ -5872,12 +5914,12 @@ msgid "The theme file is missing or the upload failed."
msgstr ""
#: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:253 lib/themeuploader.php:257
-#: lib/themeuploader.php:265 lib/themeuploader.php:272
+#: lib/themeuploader.php:278 lib/themeuploader.php:282
+#: lib/themeuploader.php:290 lib/themeuploader.php:297
msgid "Failed saving theme."
msgstr "Składowanje šata je so njeporadźiło."
-#: lib/themeuploader.php:139
+#: lib/themeuploader.php:147
msgid "Invalid theme: bad directory structure."
msgstr ""
@@ -5890,18 +5932,22 @@ msgstr ""
msgid "Invalid theme archive: missing file css/display.css"
msgstr ""
-#: lib/themeuploader.php:205
+#: lib/themeuploader.php:218
msgid ""
"Theme contains invalid file or folder name. Stick with ASCII letters, "
"digits, underscore, and minus sign."
msgstr ""
-#: lib/themeuploader.php:216
+#: lib/themeuploader.php:224
+msgid "Theme contains unsafe file extension names; may be unsafe."
+msgstr ""
+
+#: lib/themeuploader.php:241
#, php-format
msgid "Theme contains file of type '.%s', which is not allowed."
msgstr ""
-#: lib/themeuploader.php:234
+#: lib/themeuploader.php:259
msgid "Error opening theme archive."
msgstr "Zmylk pÅ™i woÄinjenju Å¡atoweho archiwa."
@@ -5972,56 +6018,56 @@ msgid "Moderator"
msgstr "Moderator"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1102
msgid "a few seconds ago"
msgstr "před něšto sekundami"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1106
+#: lib/util.php:1105
msgid "about a minute ago"
msgstr "před něhdźe jednej mjeńšinu"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1110
+#: lib/util.php:1109
#, php-format
msgid "about %d minutes ago"
msgstr "před %d mjeńšinami"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1113
+#: lib/util.php:1112
msgid "about an hour ago"
msgstr "před něhdźe jednej hodźinu"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1117
+#: lib/util.php:1116
#, php-format
msgid "about %d hours ago"
msgstr "před něhdźe %d hodźinami"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1120
+#: lib/util.php:1119
msgid "about a day ago"
msgstr "před něhdźe jednym dnjom"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1124
+#: lib/util.php:1123
#, php-format
msgid "about %d days ago"
msgstr "před něhdźe %d dnjemi"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1127
+#: lib/util.php:1126
msgid "about a month ago"
msgstr "před něhdźe jednym měsacom"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1131
+#: lib/util.php:1130
#, php-format
msgid "about %d months ago"
msgstr "před něhdźe %d měsacami"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1134
+#: lib/util.php:1133
msgid "about a year ago"
msgstr "před něhdźe jednym lětom"
diff --git a/locale/ia/LC_MESSAGES/statusnet.po b/locale/ia/LC_MESSAGES/statusnet.po
index 877d1c1b2..3e831d160 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-08-28 15:28+0000\n"
-"PO-Revision-Date: 2010-08-28 15:30:30+0000\n"
+"POT-Creation-Date: 2010-09-05 09:45+0000\n"
+"PO-Revision-Date: 2010-09-05 09:46:33+0000\n"
"Language-Team: Interlingua\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r71856); Translate extension (2010-08-20)\n"
+"X-Generator: MediaWiki 1.17alpha (r72319); Translate extension (2010-08-20)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ia\n"
"X-Message-Group: out-statusnet\n"
@@ -606,7 +606,7 @@ msgstr ""
"accesso a tu conto de %4$s a tertie personas in le quales tu ha confidentia."
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:450
+#: actions/apioauthauthorize.php:310 lib/action.php:463
msgid "Account"
msgstr "Conto"
@@ -1019,7 +1019,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:1263
+#: lib/action.php:1307
msgid "There was a problem with your session token."
msgstr "Il habeva un problema con tu indicio de session."
@@ -2304,7 +2304,7 @@ msgstr "Nulle pseudonymo o ID."
#: actions/joingroup.php:141
#, php-format
msgid "%1$s joined group %2$s"
-msgstr "%1$s es ora membro del gruppo %2$s"
+msgstr "%1$s se jungeva al gruppo %2$s"
#: actions/leavegroup.php:60
msgid "You must be logged in to leave a group."
@@ -4821,7 +4821,7 @@ msgid "Plugins"
msgstr "Plug-ins"
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:789
+#: actions/version.php:198 lib/action.php:805
msgid "Version"
msgstr "Version"
@@ -4980,7 +4980,7 @@ msgstr "Problema salveguardar le cassa de entrata del gruppo."
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1751
+#: classes/Notice.php:1757
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -5007,7 +5007,7 @@ msgid "Missing profile."
msgstr "Profilo mancante."
#. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:346
+#: classes/Status_network.php:339
msgid "Unable to save tag."
msgstr "Impossibile salveguardar le etiquetta."
@@ -5109,199 +5109,199 @@ msgid "Other"
msgstr "Altere"
#. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:145
+#: lib/action.php:148
#, php-format
msgid "%1$s - %2$s"
msgstr "%1$s - %2$s"
#. TRANS: Page title for a page without a title set.
-#: lib/action.php:161
+#: lib/action.php:164
msgid "Untitled page"
msgstr "Pagina sin titulo"
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:436
+#: lib/action.php:449
msgid "Primary site navigation"
msgstr "Navigation primari del sito"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:442
+#: lib/action.php:455
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr "Profilo personal e chronologia de amicos"
#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:445
+#: lib/action.php:458
msgctxt "MENU"
msgid "Personal"
msgstr "Personal"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:447
+#: lib/action.php:460
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:452
+#: lib/action.php:465
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "Connecter a servicios"
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:455
+#: lib/action.php:468
msgid "Connect"
msgstr "Connecter"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:458
+#: lib/action.php:471
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "Modificar le configuration del sito"
#. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:461
+#: lib/action.php:474
msgctxt "MENU"
msgid "Admin"
msgstr "Admin"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:465
+#: lib/action.php:478
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "Invitar amicos e collegas a accompaniar te in %s"
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:468
+#: lib/action.php:481
msgctxt "MENU"
msgid "Invite"
msgstr "Invitar"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:474
+#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "Terminar le session del sito"
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:477
+#: lib/action.php:490
msgctxt "MENU"
msgid "Logout"
msgstr "Clauder session"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:482
+#: lib/action.php:495
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Crear un conto"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:485
+#: lib/action.php:498
msgctxt "MENU"
msgid "Register"
msgstr "Crear conto"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:488
+#: lib/action.php:501
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Authenticar te a iste sito"
-#: lib/action.php:491
+#: lib/action.php:504
msgctxt "MENU"
msgid "Login"
msgstr "Aperir session"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:494
+#: lib/action.php:507
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Adjuta me!"
-#: lib/action.php:497
+#: lib/action.php:510
msgctxt "MENU"
msgid "Help"
msgstr "Adjuta"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:500
+#: lib/action.php:513
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "Cercar personas o texto"
-#: lib/action.php:503
+#: lib/action.php:516
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:525 lib/adminpanelaction.php:400
+#: lib/action.php:538 lib/adminpanelaction.php:400
msgid "Site notice"
msgstr "Aviso del sito"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:592
+#: lib/action.php:605
msgid "Local views"
msgstr "Vistas local"
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:659
+#: lib/action.php:675
msgid "Page notice"
msgstr "Aviso de pagina"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:762
+#: lib/action.php:778
msgid "Secondary site navigation"
msgstr "Navigation secundari del sito"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:768
+#: lib/action.php:784
msgid "Help"
msgstr "Adjuta"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:771
+#: lib/action.php:787
msgid "About"
msgstr "A proposito"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:774
+#: lib/action.php:790
msgid "FAQ"
msgstr "FAQ"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:779
+#: lib/action.php:795
msgid "TOS"
msgstr "CdS"
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:783
+#: lib/action.php:799
msgid "Privacy"
msgstr "Confidentialitate"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:786
+#: lib/action.php:802
msgid "Source"
msgstr "Fonte"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:792
+#: lib/action.php:808
msgid "Contact"
msgstr "Contacto"
-#: lib/action.php:794
+#: lib/action.php:810
msgid "Badge"
msgstr "Insignia"
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:823
+#: lib/action.php:839
msgid "StatusNet software license"
msgstr "Licentia del software StatusNet"
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:827
+#: lib/action.php:843
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5311,13 +5311,13 @@ msgstr ""
"%](%%site.broughtbyurl%%)."
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:830
+#: lib/action.php:846
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr "**%%site.name%%** es un servicio de microblog."
#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:834
+#: lib/action.php:850
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5329,50 +5329,50 @@ msgstr ""
"(http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:850
+#: lib/action.php:866
msgid "Site content license"
msgstr "Licentia del contento del sito"
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:857
+#: lib/action.php:873
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr "Le contento e datos de %1$s es private e confidential."
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:864
+#: lib/action.php:880
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr "Contento e datos sub copyright de %1$s. Tote le derectos reservate."
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:868
+#: lib/action.php:884
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
"Contento e datos sub copyright del contributores. Tote le derectos reservate."
#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:881
+#: lib/action.php:897
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr "Tote le contento e datos de %1$s es disponibile sub le licentia %2$s."
#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1192
+#: lib/action.php:1236
msgid "Pagination"
msgstr "Pagination"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: present than the currently displayed information.
-#: lib/action.php:1203
+#: lib/action.php:1247
msgid "After"
msgstr "Post"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: past than the currently displayed information.
-#: lib/action.php:1213
+#: lib/action.php:1257
msgid "Before"
msgstr "Ante"
@@ -5633,6 +5633,31 @@ msgstr "Commando complete"
msgid "Command failed"
msgstr "Commando fallite"
+#. TRANS: Command exception text shown when a notice ID is requested that does not exist.
+#: lib/command.php:84 lib/command.php:108
+msgid "Notice with that id does not exist."
+msgstr "Non existe un nota con iste ID."
+
+#. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
+#. TRANS: Error text shown when a last user notice is requested and it does not exist.
+#: lib/command.php:101 lib/command.php:630
+msgid "User has no last notice."
+msgstr "Le usator non ha un ultime nota."
+
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:130
+#, php-format
+msgid "Could not find a user with nickname %s."
+msgstr "Non poteva trovar un usator con pseudonymo %s."
+
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:150
+#, php-format
+msgid "Could not find a local user with nickname %s."
+msgstr "Non poteva trovar un usator local con pseudonymo %s."
+
#. TRANS: Error text shown when an unimplemented command is given.
#: lib/command.php:185
msgid "Sorry, this command is not yet implemented."
@@ -5643,6 +5668,13 @@ msgstr "Pardono, iste commando non es ancora implementate."
msgid "It does not make a lot of sense to nudge yourself!"
msgstr "Non ha multe senso pulsar te mesme!"
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:240
+#, php-format
+msgid "Nudge sent to %s."
+msgstr "Pulsata inviate a %s."
+
#. TRANS: User statistics text.
#. TRANS: %1$s is the number of other user the user is subscribed to.
#. TRANS: %2$s is the number of users that are subscribed to the user.
@@ -5663,6 +5695,20 @@ msgstr ""
msgid "Notice marked as fave."
msgstr "Nota marcate como favorite."
+#. TRANS: Message given having added a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:360
+#, php-format
+msgid "%1$s joined group %2$s."
+msgstr "%1$s se jungeva al gruppo %2$s."
+
+#. TRANS: Message given having removed a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:408
+#, php-format
+msgid "%1$s left group %2$s."
+msgstr "%1$s quitava le gruppo %2$s."
+
#. TRANS: Whois output. %s is the full name of the queried user.
#: lib/command.php:434
#, php-format
@@ -5711,21 +5757,67 @@ msgstr "Message troppo longe - maximo es %1$d characteres, tu inviava %2$d."
msgid "Error sending direct message."
msgstr "Error durante le invio del message directe."
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:554
+#, php-format
+msgid "Notice from %s repeated."
+msgstr "Nota de %s repetite."
+
#. TRANS: Error text shown when repeating a notice fails with an unknown reason.
#: lib/command.php:557
msgid "Error repeating notice."
msgstr "Error durante le repetition del nota."
+#. TRANS: Message given if content of a notice for a reply is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:592
+#, php-format
+msgid "Notice too long - maximum is %1$d characters, you sent %2$d."
+msgstr "Nota troppo longe - maximo es %d characteres, tu inviava %d."
+
+#. TRANS: Text shown having sent a reply to a notice successfully.
+#. TRANS: %s is the nickname of the user of the notice the reply was sent to.
+#: lib/command.php:603
+#, php-format
+msgid "Reply to %s sent."
+msgstr "Responsa a %s inviate."
+
#. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
#: lib/command.php:606
msgid "Error saving notice."
msgstr "Errur durante le salveguarda del nota."
+#. TRANS: Error text shown when no username was provided when issuing a subscribe command.
+#: lib/command.php:655
+msgid "Specify the name of the user to subscribe to."
+msgstr "Specifica le nomine del usator al qual subscriber te."
+
#. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
#: lib/command.php:664
msgid "Can't subscribe to OMB profiles by command."
msgstr "Impossibile subscriber se a profilos OMB per medio de un commando."
+#. TRANS: Text shown after having subscribed to another user successfully.
+#. TRANS: %s is the name of the user the subscription was requested for.
+#: lib/command.php:672
+#, php-format
+msgid "Subscribed to %s."
+msgstr "Subscribite a %s."
+
+#. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
+#. TRANS: Error text shown when no username was provided when issuing the command.
+#: lib/command.php:694 lib/command.php:804
+msgid "Specify the name of the user to unsubscribe from."
+msgstr "Specifica le nomine del usator al qual cancellar le subscription."
+
+#. TRANS: Text shown after having unsubscribed from another user successfully.
+#. TRANS: %s is the name of the user the unsubscription was requested for.
+#: lib/command.php:705
+#, php-format
+msgid "Unsubscribed from %s."
+msgstr "Subscription a %s cancellate."
+
#. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
#. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
#: lib/command.php:724 lib/command.php:750
@@ -5752,6 +5844,27 @@ msgstr "Notification activate."
msgid "Can't turn on notification."
msgstr "Non pote activar notification."
+#. TRANS: Error text shown when issuing the login command while login is disabled.
+#: lib/command.php:771
+msgid "Login command is disabled."
+msgstr "Le commando de apertura de session es disactivate."
+
+#. TRANS: Text shown after issuing the login command successfully.
+#. TRANS: %s is a logon link..
+#: lib/command.php:784
+#, php-format
+msgid "This link is useable only once and is valid for only 2 minutes: %s."
+msgstr ""
+"Iste ligamine pote esser usate solmente un vice, e es valide durante "
+"solmente 2 minutas: %s."
+
+#. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
+#. TRANS: %s is the name of the user the unsubscription was requested for.
+#: lib/command.php:813
+#, php-format
+msgid "Unsubscribed %s."
+msgstr "Subscription de %s cancellate."
+
#. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
#: lib/command.php:831
msgid "You are not subscribed to anyone."
@@ -6901,12 +7014,12 @@ msgid "The theme file is missing or the upload failed."
msgstr "Le file del apparentia manca o le incargamento ha fallite."
#: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:253 lib/themeuploader.php:257
-#: lib/themeuploader.php:265 lib/themeuploader.php:272
+#: lib/themeuploader.php:278 lib/themeuploader.php:282
+#: lib/themeuploader.php:290 lib/themeuploader.php:297
msgid "Failed saving theme."
msgstr "Salveguarda del apparentia fallite."
-#: lib/themeuploader.php:139
+#: lib/themeuploader.php:147
msgid "Invalid theme: bad directory structure."
msgstr "Apparentia invalide: mal structura de directorios."
@@ -6921,7 +7034,7 @@ msgstr ""
msgid "Invalid theme archive: missing file css/display.css"
msgstr "Archivo de apparentia invalide: manca le file css/display.css"
-#: lib/themeuploader.php:205
+#: lib/themeuploader.php:218
msgid ""
"Theme contains invalid file or folder name. Stick with ASCII letters, "
"digits, underscore, and minus sign."
@@ -6929,13 +7042,17 @@ msgstr ""
"Le apparentia contine un nomine de file o dossier invalide. Limita te a "
"litteras ASCII, digitos, sublineamento, e signo minus."
-#: lib/themeuploader.php:216
+#: lib/themeuploader.php:224
+msgid "Theme contains unsafe file extension names; may be unsafe."
+msgstr ""
+
+#: lib/themeuploader.php:241
#, php-format
msgid "Theme contains file of type '.%s', which is not allowed."
msgstr ""
"Le apparentia contine un file del typo '.%s', le qual non es permittite."
-#: lib/themeuploader.php:234
+#: lib/themeuploader.php:259
msgid "Error opening theme archive."
msgstr "Error durante le apertura del archivo del apparentia."
@@ -7014,56 +7131,56 @@ msgid "Moderator"
msgstr "Moderator"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1102
msgid "a few seconds ago"
msgstr "alcun secundas retro"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1106
+#: lib/util.php:1105
msgid "about a minute ago"
msgstr "circa un minuta retro"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1110
+#: lib/util.php:1109
#, php-format
msgid "about %d minutes ago"
msgstr "circa %d minutas retro"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1113
+#: lib/util.php:1112
msgid "about an hour ago"
msgstr "circa un hora retro"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1117
+#: lib/util.php:1116
#, php-format
msgid "about %d hours ago"
msgstr "circa %d horas retro"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1120
+#: lib/util.php:1119
msgid "about a day ago"
msgstr "circa un die retro"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1124
+#: lib/util.php:1123
#, php-format
msgid "about %d days ago"
msgstr "circa %d dies retro"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1127
+#: lib/util.php:1126
msgid "about a month ago"
msgstr "circa un mense retro"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1131
+#: lib/util.php:1130
#, php-format
msgid "about %d months ago"
msgstr "circa %d menses retro"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1134
+#: lib/util.php:1133
msgid "about a year ago"
msgstr "circa un anno retro"
diff --git a/locale/is/LC_MESSAGES/statusnet.po b/locale/is/LC_MESSAGES/statusnet.po
index 1efb2192f..2c8ab1c6b 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-08-28 15:28+0000\n"
-"PO-Revision-Date: 2010-08-28 15:30:32+0000\n"
+"POT-Creation-Date: 2010-09-05 09:45+0000\n"
+"PO-Revision-Date: 2010-09-05 09:46:35+0000\n"
"Language-Team: Icelandic\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r71856); Translate extension (2010-08-20)\n"
+"X-Generator: MediaWiki 1.17alpha (r72319); Translate extension (2010-08-20)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: is\n"
"X-Message-Group: out-statusnet\n"
@@ -392,7 +392,7 @@ msgid ""
msgstr ""
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:450
+#: actions/apioauthauthorize.php:310 lib/action.php:463
msgid "Account"
msgstr "Aðgangur"
@@ -698,7 +698,7 @@ msgstr "Staðfestingarlykill fannst ekki."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1263
+#: lib/action.php:1307
msgid "There was a problem with your session token."
msgstr "Það komu upp vandamál varðandi setutókann þinn."
@@ -3698,7 +3698,7 @@ msgstr ""
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1751
+#: classes/Notice.php:1757
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -3718,7 +3718,7 @@ msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
msgstr ""
#. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:346
+#: classes/Status_network.php:339
msgid "Unable to save tag."
msgstr "Gat ekki vistað merki."
@@ -3788,131 +3788,131 @@ msgid "Other"
msgstr "Annað"
#. TRANS: Page title for a page without a title set.
-#: lib/action.php:161
+#: lib/action.php:164
msgid "Untitled page"
msgstr "Ónafngreind síða"
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:436
+#: lib/action.php:449
msgid "Primary site navigation"
msgstr "Stikl aðalsíðu"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:442
+#: lib/action.php:455
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr ""
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:447
+#: lib/action.php:460
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "Breyta lykilorðinu þínu"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:452
+#: lib/action.php:465
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr ""
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:455
+#: lib/action.php:468
msgid "Connect"
msgstr "Tengjast"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:474
+#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "Skrá þig inn á síðuna"
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:477
+#: lib/action.php:490
msgctxt "MENU"
msgid "Logout"
msgstr "Einkennismerki"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:482
+#: lib/action.php:495
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Búa til nýjan hóp"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:494
+#: lib/action.php:507
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Hjálp"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:500
+#: lib/action.php:513
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr ""
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:525 lib/adminpanelaction.php:400
+#: lib/action.php:538 lib/adminpanelaction.php:400
msgid "Site notice"
msgstr "Babl vefsíðunnar"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:592
+#: lib/action.php:605
msgid "Local views"
msgstr "Staðbundin sýn"
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:659
+#: lib/action.php:675
msgid "Page notice"
msgstr "Babl síðunnar"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:762
+#: lib/action.php:778
msgid "Secondary site navigation"
msgstr "Stikl undirsíðu"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:768
+#: lib/action.php:784
msgid "Help"
msgstr "Hjálp"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:771
+#: lib/action.php:787
msgid "About"
msgstr "Um"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:774
+#: lib/action.php:790
msgid "FAQ"
msgstr "Spurt og svarað"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:779
+#: lib/action.php:795
msgid "TOS"
msgstr ""
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:783
+#: lib/action.php:799
msgid "Privacy"
msgstr "Friðhelgi"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:786
+#: lib/action.php:802
msgid "Source"
msgstr "Frumþula"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:792
+#: lib/action.php:808
msgid "Contact"
msgstr "Tengiliður"
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:823
+#: lib/action.php:839
msgid "StatusNet software license"
msgstr "Hugbúnaðarleyfi StatusNet"
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:827
+#: lib/action.php:843
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -3920,13 +3920,13 @@ msgid ""
msgstr ""
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:830
+#: lib/action.php:846
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr "**%%site.name%%** er örbloggsþjónusta."
#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:834
+#: lib/action.php:850
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -3939,43 +3939,43 @@ msgstr ""
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:857
+#: lib/action.php:873
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:864
+#: lib/action.php:880
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:868
+#: lib/action.php:884
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:881
+#: lib/action.php:897
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr ""
#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1192
+#: lib/action.php:1236
msgid "Pagination"
msgstr "Uppröðun"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: present than the currently displayed information.
-#: lib/action.php:1203
+#: lib/action.php:1247
msgid "After"
msgstr "Eftir"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: past than the currently displayed information.
-#: lib/action.php:1213
+#: lib/action.php:1257
msgid "Before"
msgstr "Ãður"
@@ -4200,6 +4200,17 @@ msgstr "Villa kom upp í stillingu notanda."
msgid "Notice too long - maximum is %1$d characters, you sent %2$d."
msgstr ""
+#. TRANS: Error text shown when no username was provided when issuing a subscribe command.
+#: lib/command.php:655
+msgid "Specify the name of the user to subscribe to."
+msgstr ""
+
+#. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
+#. TRANS: Error text shown when no username was provided when issuing the command.
+#: lib/command.php:694 lib/command.php:804
+msgid "Specify the name of the user to unsubscribe from."
+msgstr ""
+
#. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
#. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
#: lib/command.php:724 lib/command.php:750
@@ -5100,7 +5111,7 @@ msgstr ""
msgid "The theme file is missing or the upload failed."
msgstr ""
-#: lib/themeuploader.php:139
+#: lib/themeuploader.php:147
msgid "Invalid theme: bad directory structure."
msgstr ""
@@ -5113,18 +5124,22 @@ msgstr ""
msgid "Invalid theme archive: missing file css/display.css"
msgstr ""
-#: lib/themeuploader.php:205
+#: lib/themeuploader.php:218
msgid ""
"Theme contains invalid file or folder name. Stick with ASCII letters, "
"digits, underscore, and minus sign."
msgstr ""
-#: lib/themeuploader.php:216
+#: lib/themeuploader.php:224
+msgid "Theme contains unsafe file extension names; may be unsafe."
+msgstr ""
+
+#: lib/themeuploader.php:241
#, php-format
msgid "Theme contains file of type '.%s', which is not allowed."
msgstr ""
-#: lib/themeuploader.php:234
+#: lib/themeuploader.php:259
msgid "Error opening theme archive."
msgstr "Vill kom upp við að aflétta notendalokun."
@@ -5183,56 +5198,56 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1102
msgid "a few seconds ago"
msgstr "fyrir nokkrum sekúndum"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1106
+#: lib/util.php:1105
msgid "about a minute ago"
msgstr "fyrir um einni mínútu síðan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1110
+#: lib/util.php:1109
#, php-format
msgid "about %d minutes ago"
msgstr "fyrir um %d mínútum síðan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1113
+#: lib/util.php:1112
msgid "about an hour ago"
msgstr "fyrir um einum klukkutíma síðan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1117
+#: lib/util.php:1116
#, php-format
msgid "about %d hours ago"
msgstr "fyrir um %d klukkutímum síðan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1120
+#: lib/util.php:1119
msgid "about a day ago"
msgstr "fyrir um einum degi síðan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1124
+#: lib/util.php:1123
#, php-format
msgid "about %d days ago"
msgstr "fyrir um %d dögum síðan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1127
+#: lib/util.php:1126
msgid "about a month ago"
msgstr "fyrir um einum mánuði síðan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1131
+#: lib/util.php:1130
#, php-format
msgid "about %d months ago"
msgstr "fyrir um %d mánuðum síðan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1134
+#: lib/util.php:1133
msgid "about a year ago"
msgstr "fyrir um einu ári síðan"
diff --git a/locale/it/LC_MESSAGES/statusnet.po b/locale/it/LC_MESSAGES/statusnet.po
index 3a75d2c69..06f084180 100644
--- a/locale/it/LC_MESSAGES/statusnet.po
+++ b/locale/it/LC_MESSAGES/statusnet.po
@@ -10,12 +10,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-28 15:28+0000\n"
-"PO-Revision-Date: 2010-08-28 15:30:39+0000\n"
+"POT-Creation-Date: 2010-09-05 09:45+0000\n"
+"PO-Revision-Date: 2010-09-05 09:46:40+0000\n"
"Language-Team: Italian\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r71856); Translate extension (2010-08-20)\n"
+"X-Generator: MediaWiki 1.17alpha (r72319); Translate extension (2010-08-20)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: it\n"
"X-Message-Group: out-statusnet\n"
@@ -604,7 +604,7 @@ msgstr ""
"accesso al proprio account %4$s solo ad applicazioni di cui ci si può fidare."
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:450
+#: actions/apioauthauthorize.php:310 lib/action.php:463
msgid "Account"
msgstr "Account"
@@ -1014,7 +1014,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:1263
+#: lib/action.php:1307
msgid "There was a problem with your session token."
msgstr "Si è verificato un problema con il tuo token di sessione."
@@ -4797,7 +4797,7 @@ msgid "Plugins"
msgstr "Plugin"
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:789
+#: actions/version.php:198 lib/action.php:805
msgid "Version"
msgstr "Versione"
@@ -4951,7 +4951,7 @@ msgstr "Problema nel salvare la casella della posta del gruppo."
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1751
+#: classes/Notice.php:1757
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -5068,199 +5068,199 @@ msgid "Other"
msgstr "Altro"
#. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:145
+#: lib/action.php:148
#, php-format
msgid "%1$s - %2$s"
msgstr "%1$s - %2$s"
#. TRANS: Page title for a page without a title set.
-#: lib/action.php:161
+#: lib/action.php:164
msgid "Untitled page"
msgstr "Pagina senza nome"
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:436
+#: lib/action.php:449
msgid "Primary site navigation"
msgstr "Esplorazione sito primaria"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:442
+#: lib/action.php:455
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr "Profilo personale e attività degli amici"
#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:445
+#: lib/action.php:458
msgctxt "MENU"
msgid "Personal"
msgstr "Personale"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:447
+#: lib/action.php:460
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:452
+#: lib/action.php:465
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "Connettiti con altri servizi"
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:455
+#: lib/action.php:468
msgid "Connect"
msgstr "Connetti"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:458
+#: lib/action.php:471
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "Modifica la configurazione del sito"
#. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:461
+#: lib/action.php:474
msgctxt "MENU"
msgid "Admin"
msgstr "Amministra"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:465
+#: lib/action.php:478
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "Invita amici e colleghi a seguirti su %s"
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:468
+#: lib/action.php:481
msgctxt "MENU"
msgid "Invite"
msgstr "Invita"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:474
+#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "Termina la tua sessione sul sito"
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:477
+#: lib/action.php:490
msgctxt "MENU"
msgid "Logout"
msgstr "Esci"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:482
+#: lib/action.php:495
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Crea un account"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:485
+#: lib/action.php:498
msgctxt "MENU"
msgid "Register"
msgstr "Registrati"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:488
+#: lib/action.php:501
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Accedi al sito"
-#: lib/action.php:491
+#: lib/action.php:504
msgctxt "MENU"
msgid "Login"
msgstr "Accedi"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:494
+#: lib/action.php:507
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Aiutami!"
-#: lib/action.php:497
+#: lib/action.php:510
msgctxt "MENU"
msgid "Help"
msgstr "Aiuto"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:500
+#: lib/action.php:513
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "Cerca persone o del testo"
-#: lib/action.php:503
+#: lib/action.php:516
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:525 lib/adminpanelaction.php:400
+#: lib/action.php:538 lib/adminpanelaction.php:400
msgid "Site notice"
msgstr "Messaggio del sito"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:592
+#: lib/action.php:605
msgid "Local views"
msgstr "Viste locali"
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:659
+#: lib/action.php:675
msgid "Page notice"
msgstr "Pagina messaggio"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:762
+#: lib/action.php:778
msgid "Secondary site navigation"
msgstr "Esplorazione secondaria del sito"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:768
+#: lib/action.php:784
msgid "Help"
msgstr "Aiuto"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:771
+#: lib/action.php:787
msgid "About"
msgstr "Informazioni"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:774
+#: lib/action.php:790
msgid "FAQ"
msgstr "FAQ"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:779
+#: lib/action.php:795
msgid "TOS"
msgstr "TOS"
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:783
+#: lib/action.php:799
msgid "Privacy"
msgstr "Privacy"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:786
+#: lib/action.php:802
msgid "Source"
msgstr "Sorgenti"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:792
+#: lib/action.php:808
msgid "Contact"
msgstr "Contatti"
-#: lib/action.php:794
+#: lib/action.php:810
msgid "Badge"
msgstr "Badge"
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:823
+#: lib/action.php:839
msgid "StatusNet software license"
msgstr "Licenza del software StatusNet"
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:827
+#: lib/action.php:843
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5270,13 +5270,13 @@ msgstr ""
"(%%site.broughtbyurl%%)."
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:830
+#: lib/action.php:846
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr "**%%site.name%%** è un servizio di microblog."
#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:834
+#: lib/action.php:850
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5288,34 +5288,34 @@ msgstr ""
"(http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:850
+#: lib/action.php:866
msgid "Site content license"
msgstr "Licenza del contenuto del sito"
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:857
+#: lib/action.php:873
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr "I contenuti e i dati di %1$s sono privati e confidenziali."
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:864
+#: lib/action.php:880
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
"I contenuti e i dati sono copyright di %1$s. Tutti i diritti riservati."
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:868
+#: lib/action.php:884
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
"I contenuti e i dati sono forniti dai collaboratori. Tutti i diritti "
"riservati."
#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:881
+#: lib/action.php:897
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr ""
@@ -5323,19 +5323,19 @@ msgstr ""
"licenza %2$s."
#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1192
+#: lib/action.php:1236
msgid "Pagination"
msgstr "Paginazione"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: present than the currently displayed information.
-#: lib/action.php:1203
+#: lib/action.php:1247
msgid "After"
msgstr "Successivi"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: past than the currently displayed information.
-#: lib/action.php:1213
+#: lib/action.php:1257
msgid "Before"
msgstr "Precedenti"
@@ -5593,6 +5593,24 @@ msgstr "Comando completato"
msgid "Command failed"
msgstr "Comando non riuscito"
+#. TRANS: Command exception text shown when a notice ID is requested that does not exist.
+#: lib/command.php:84 lib/command.php:108
+msgid "Notice with that id does not exist."
+msgstr "Un messaggio con quel ID non esiste."
+
+#. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
+#. TRANS: Error text shown when a last user notice is requested and it does not exist.
+#: lib/command.php:101 lib/command.php:630
+msgid "User has no last notice."
+msgstr "L'utente non ha un ultimo messaggio."
+
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:130
+#, php-format
+msgid "Could not find a user with nickname %s."
+msgstr "Impossibile trovare un utente col soprannome %s."
+
#. TRANS: Error text shown when an unimplemented command is given.
#: lib/command.php:185
msgid "Sorry, this command is not yet implemented."
@@ -5603,6 +5621,13 @@ msgstr "Questo comando non è ancora implementato."
msgid "It does not make a lot of sense to nudge yourself!"
msgstr "Non ha molto senso se cerchi di richiamarti!"
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:240
+#, php-format
+msgid "Nudge sent to %s."
+msgstr "Richiamo inviato a %s."
+
#. TRANS: User statistics text.
#. TRANS: %1$s is the number of other user the user is subscribed to.
#. TRANS: %2$s is the number of users that are subscribed to the user.
@@ -5671,21 +5696,53 @@ msgstr "Messaggio troppo lungo: massimo %1$d caratteri, inviati %2$d."
msgid "Error sending direct message."
msgstr "Errore nell'inviare il messaggio diretto."
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:554
+#, php-format
+msgid "Notice from %s repeated."
+msgstr "Messaggio da %s ripetuto."
+
#. TRANS: Error text shown when repeating a notice fails with an unknown reason.
#: lib/command.php:557
msgid "Error repeating notice."
msgstr "Errore nel ripetere il messaggio."
+#. TRANS: Message given if content of a notice for a reply is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:592
+#, php-format
+msgid "Notice too long - maximum is %1$d characters, you sent %2$d."
+msgstr "Messaggio troppo lungo: massimo %1$d caratteri, inviati %2$d."
+
+#. TRANS: Text shown having sent a reply to a notice successfully.
+#. TRANS: %s is the nickname of the user of the notice the reply was sent to.
+#: lib/command.php:603
+#, php-format
+msgid "Reply to %s sent."
+msgstr "Risposta a %s inviata."
+
#. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
#: lib/command.php:606
msgid "Error saving notice."
msgstr "Errore nel salvare il messaggio."
+#. TRANS: Error text shown when no username was provided when issuing a subscribe command.
+#: lib/command.php:655
+msgid "Specify the name of the user to subscribe to."
+msgstr "Specifica il nome dell'utente a cui abbonarti."
+
#. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
#: lib/command.php:664
msgid "Can't subscribe to OMB profiles by command."
msgstr "Impossibile abbonarsi ai profili OMB attraverso un comando."
+#. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
+#. TRANS: Error text shown when no username was provided when issuing the command.
+#: lib/command.php:694 lib/command.php:804
+msgid "Specify the name of the user to unsubscribe from."
+msgstr "Specifica il nome dell'utente da cui annullare l'abbonamento."
+
#. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
#. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
#: lib/command.php:724 lib/command.php:750
@@ -5712,6 +5769,18 @@ msgstr "Notifiche attivate."
msgid "Can't turn on notification."
msgstr "Impossibile attivare le notifiche."
+#. TRANS: Error text shown when issuing the login command while login is disabled.
+#: lib/command.php:771
+msgid "Login command is disabled."
+msgstr "Il comando di accesso è disabilitato."
+
+#. TRANS: Text shown after issuing the login command successfully.
+#. TRANS: %s is a logon link..
+#: lib/command.php:784
+#, php-format
+msgid "This link is useable only once and is valid for only 2 minutes: %s."
+msgstr ""
+
#. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
#: lib/command.php:831
msgid "You are not subscribed to anyone."
@@ -6865,12 +6934,12 @@ msgid "The theme file is missing or the upload failed."
msgstr "Manca il file del tema o il caricamento non è riuscito."
#: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:253 lib/themeuploader.php:257
-#: lib/themeuploader.php:265 lib/themeuploader.php:272
+#: lib/themeuploader.php:278 lib/themeuploader.php:282
+#: lib/themeuploader.php:290 lib/themeuploader.php:297
msgid "Failed saving theme."
msgstr "Salvataggio del tema non riuscito."
-#: lib/themeuploader.php:139
+#: lib/themeuploader.php:147
msgid "Invalid theme: bad directory structure."
msgstr "Tema non valido: struttura directory non corretta."
@@ -6884,7 +6953,7 @@ msgstr ""
msgid "Invalid theme archive: missing file css/display.css"
msgstr "File di tema non valido: manca il file css/display.css"
-#: lib/themeuploader.php:205
+#: lib/themeuploader.php:218
msgid ""
"Theme contains invalid file or folder name. Stick with ASCII letters, "
"digits, underscore, and minus sign."
@@ -6892,12 +6961,16 @@ msgstr ""
"Il tema contiene file non o nomi di cartelle non validi. Utilizzare "
"solamente caratteri ASCII, numeri, il trattino basso e il segno meno."
-#: lib/themeuploader.php:216
+#: lib/themeuploader.php:224
+msgid "Theme contains unsafe file extension names; may be unsafe."
+msgstr ""
+
+#: lib/themeuploader.php:241
#, php-format
msgid "Theme contains file of type '.%s', which is not allowed."
msgstr "Il tema contiene file di tipo \".%s\" che non sono supportati."
-#: lib/themeuploader.php:234
+#: lib/themeuploader.php:259
msgid "Error opening theme archive."
msgstr "Errore nell'aprire il file del tema."
@@ -6976,56 +7049,56 @@ msgid "Moderator"
msgstr "Moderatore"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1102
msgid "a few seconds ago"
msgstr "pochi secondi fa"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1106
+#: lib/util.php:1105
msgid "about a minute ago"
msgstr "circa un minuto fa"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1110
+#: lib/util.php:1109
#, php-format
msgid "about %d minutes ago"
msgstr "circa %d minuti fa"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1113
+#: lib/util.php:1112
msgid "about an hour ago"
msgstr "circa un'ora fa"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1117
+#: lib/util.php:1116
#, php-format
msgid "about %d hours ago"
msgstr "circa %d ore fa"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1120
+#: lib/util.php:1119
msgid "about a day ago"
msgstr "circa un giorno fa"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1124
+#: lib/util.php:1123
#, php-format
msgid "about %d days ago"
msgstr "circa %d giorni fa"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1127
+#: lib/util.php:1126
msgid "about a month ago"
msgstr "circa un mese fa"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1131
+#: lib/util.php:1130
#, php-format
msgid "about %d months ago"
msgstr "circa %d mesi fa"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1134
+#: lib/util.php:1133
msgid "about a year ago"
msgstr "circa un anno fa"
diff --git a/locale/ja/LC_MESSAGES/statusnet.po b/locale/ja/LC_MESSAGES/statusnet.po
index c97923aa4..b6678b6bc 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-08-28 15:28+0000\n"
-"PO-Revision-Date: 2010-08-28 15:30:41+0000\n"
+"POT-Creation-Date: 2010-09-05 09:45+0000\n"
+"PO-Revision-Date: 2010-09-05 09:46:42+0000\n"
"Language-Team: Japanese\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r71856); Translate extension (2010-08-20)\n"
+"X-Generator: MediaWiki 1.17alpha (r72319); Translate extension (2010-08-20)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ja\n"
"X-Message-Group: out-statusnet\n"
@@ -576,7 +576,7 @@ msgid ""
msgstr ""
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:450
+#: actions/apioauthauthorize.php:310 lib/action.php:463
msgid "Account"
msgstr "アカウント"
@@ -958,7 +958,7 @@ msgstr "ã“ã®ã‚¢ãƒ—リケーションã®ã‚ªãƒ¼ãƒŠãƒ¼ã§ã¯ã‚りã¾ã›ã‚“。"
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1263
+#: lib/action.php:1307
msgid "There was a problem with your session token."
msgstr "ã‚ãªãŸã®ã‚»ãƒƒã‚·ãƒ§ãƒ³ãƒˆãƒ¼ã‚¯ãƒ³ã«é–¢ã™ã‚‹å•題ãŒã‚りã¾ã—ãŸã€‚"
@@ -4580,7 +4580,7 @@ msgid "Plugins"
msgstr "プラグイン"
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:789
+#: actions/version.php:198 lib/action.php:805
msgid "Version"
msgstr "ãƒãƒ¼ã‚¸ãƒ§ãƒ³"
@@ -4741,7 +4741,7 @@ msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
msgstr ""
#. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:346
+#: classes/Status_network.php:339
msgid "Unable to save tag."
msgstr "ã‚¿ã‚°ã‚’ã‚’ä¿å­˜ã§ãã¾ã›ã‚“。"
@@ -4838,147 +4838,147 @@ msgid "Other"
msgstr "ãã®ä»–"
#. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:145
+#: lib/action.php:148
#, php-format
msgid "%1$s - %2$s"
msgstr ""
#. TRANS: Page title for a page without a title set.
-#: lib/action.php:161
+#: lib/action.php:164
msgid "Untitled page"
msgstr "å称未設定ページ"
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:436
+#: lib/action.php:449
msgid "Primary site navigation"
msgstr "プライマリサイトナビゲーション"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:442
+#: lib/action.php:455
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr ""
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:447
+#: lib/action.php:460
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "パスワードã®å¤‰æ›´"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:452
+#: lib/action.php:465
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "接続"
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:455
+#: lib/action.php:468
msgid "Connect"
msgstr "接続"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:458
+#: lib/action.php:471
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "基本サイト設定"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:474
+#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "サイトã®ãƒ†ãƒ¼ãƒž"
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:477
+#: lib/action.php:490
msgctxt "MENU"
msgid "Logout"
msgstr "ロゴ"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:482
+#: lib/action.php:495
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "æ–°ã—ã„グループを作æˆ"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:494
+#: lib/action.php:507
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "ヘルプ"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:500
+#: lib/action.php:513
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "ã‚‚ã£ã¨ã‚°ãƒ«ãƒ¼ãƒ—を検索"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:525 lib/adminpanelaction.php:400
+#: lib/action.php:538 lib/adminpanelaction.php:400
msgid "Site notice"
msgstr "サイトã¤ã¶ã‚„ã"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:592
+#: lib/action.php:605
msgid "Local views"
msgstr "ローカルビュー"
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:659
+#: lib/action.php:675
msgid "Page notice"
msgstr "ページã¤ã¶ã‚„ã"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:762
+#: lib/action.php:778
msgid "Secondary site navigation"
msgstr "セカンダリサイトナビゲーション"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:768
+#: lib/action.php:784
msgid "Help"
msgstr "ヘルプ"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:771
+#: lib/action.php:787
msgid "About"
msgstr "About"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:774
+#: lib/action.php:790
msgid "FAQ"
msgstr "よãã‚る質å•"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:779
+#: lib/action.php:795
msgid "TOS"
msgstr ""
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:783
+#: lib/action.php:799
msgid "Privacy"
msgstr "プライãƒã‚·ãƒ¼"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:786
+#: lib/action.php:802
msgid "Source"
msgstr "ソース"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:792
+#: lib/action.php:808
msgid "Contact"
msgstr "連絡先"
-#: lib/action.php:794
+#: lib/action.php:810
msgid "Badge"
msgstr "ãƒãƒƒã‚¸"
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:823
+#: lib/action.php:839
msgid "StatusNet software license"
msgstr "StatusNet ソフトウェアライセンス"
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:827
+#: lib/action.php:843
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4986,13 +4986,13 @@ msgid ""
msgstr ""
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:830
+#: lib/action.php:846
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr "**%%site.name%%** ã¯ãƒžã‚¤ã‚¯ãƒ­ãƒ–ログサービスã§ã™ã€‚"
#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:834
+#: lib/action.php:850
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5004,49 +5004,49 @@ msgstr ""
"org/licensing/licenses/agpl-3.0.html)。"
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:850
+#: lib/action.php:866
msgid "Site content license"
msgstr "サイト内容ライセンス"
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:857
+#: lib/action.php:873
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:864
+#: lib/action.php:880
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:868
+#: lib/action.php:884
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:881
+#: lib/action.php:897
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr ""
#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1192
+#: lib/action.php:1236
msgid "Pagination"
msgstr "ページ化"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: present than the currently displayed information.
-#: lib/action.php:1203
+#: lib/action.php:1247
msgid "After"
msgstr "<<後"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: past than the currently displayed information.
-#: lib/action.php:1213
+#: lib/action.php:1257
msgid "Before"
msgstr "å‰>>"
@@ -5359,6 +5359,17 @@ msgstr "ã¤ã¶ã‚„ã繰り返ã—エラー"
msgid "Error saving notice."
msgstr "ã¤ã¶ã‚„ãä¿å­˜ã‚¨ãƒ©ãƒ¼ã€‚"
+#. TRANS: Error text shown when no username was provided when issuing a subscribe command.
+#: lib/command.php:655
+msgid "Specify the name of the user to subscribe to."
+msgstr ""
+
+#. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
+#. TRANS: Error text shown when no username was provided when issuing the command.
+#: lib/command.php:694 lib/command.php:804
+msgid "Specify the name of the user to unsubscribe from."
+msgstr ""
+
#. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
#. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
#: lib/command.php:724 lib/command.php:750
@@ -5385,6 +5396,18 @@ msgstr "通知オン。"
msgid "Can't turn on notification."
msgstr "通知をオンã§ãã¾ã›ã‚“。"
+#. TRANS: Error text shown when issuing the login command while login is disabled.
+#: lib/command.php:771
+msgid "Login command is disabled."
+msgstr ""
+
+#. TRANS: Text shown after issuing the login command successfully.
+#. TRANS: %s is a logon link..
+#: lib/command.php:784
+#, php-format
+msgid "This link is useable only once and is valid for only 2 minutes: %s."
+msgstr ""
+
#. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
#: lib/command.php:831
msgid "You are not subscribed to anyone."
@@ -6388,7 +6411,7 @@ msgstr ""
msgid "The theme file is missing or the upload failed."
msgstr ""
-#: lib/themeuploader.php:139
+#: lib/themeuploader.php:147
msgid "Invalid theme: bad directory structure."
msgstr ""
@@ -6401,18 +6424,22 @@ msgstr ""
msgid "Invalid theme archive: missing file css/display.css"
msgstr ""
-#: lib/themeuploader.php:205
+#: lib/themeuploader.php:218
msgid ""
"Theme contains invalid file or folder name. Stick with ASCII letters, "
"digits, underscore, and minus sign."
msgstr ""
-#: lib/themeuploader.php:216
+#: lib/themeuploader.php:224
+msgid "Theme contains unsafe file extension names; may be unsafe."
+msgstr ""
+
+#: lib/themeuploader.php:241
#, php-format
msgid "Theme contains file of type '.%s', which is not allowed."
msgstr ""
-#: lib/themeuploader.php:234
+#: lib/themeuploader.php:259
msgid "Error opening theme archive."
msgstr "ブロックã®å‰Šé™¤ã‚¨ãƒ©ãƒ¼"
@@ -6482,56 +6509,56 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1102
msgid "a few seconds ago"
msgstr "æ•°ç§’å‰"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1106
+#: lib/util.php:1105
msgid "about a minute ago"
msgstr "ç´„ 1 分å‰"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1110
+#: lib/util.php:1109
#, php-format
msgid "about %d minutes ago"
msgstr "ç´„ %d 分å‰"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1113
+#: lib/util.php:1112
msgid "about an hour ago"
msgstr "ç´„ 1 時間å‰"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1117
+#: lib/util.php:1116
#, php-format
msgid "about %d hours ago"
msgstr "ç´„ %d 時間å‰"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1120
+#: lib/util.php:1119
msgid "about a day ago"
msgstr "ç´„ 1 æ—¥å‰"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1124
+#: lib/util.php:1123
#, php-format
msgid "about %d days ago"
msgstr "ç´„ %d æ—¥å‰"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1127
+#: lib/util.php:1126
msgid "about a month ago"
msgstr "ç´„ 1 ヵ月å‰"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1131
+#: lib/util.php:1130
#, php-format
msgid "about %d months ago"
msgstr "ç´„ %d ヵ月å‰"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1134
+#: lib/util.php:1133
msgid "about a year ago"
msgstr "ç´„ 1 å¹´å‰"
diff --git a/locale/ka/LC_MESSAGES/statusnet.po b/locale/ka/LC_MESSAGES/statusnet.po
new file mode 100644
index 000000000..4f47a57fe
--- /dev/null
+++ b/locale/ka/LC_MESSAGES/statusnet.po
@@ -0,0 +1,5223 @@
+# Translation of StatusNet to Georgian
+#
+# Author@translatewiki.net: Zaal
+# --
+# --
+# 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-09-05 09:45+0000\n"
+"PO-Revision-Date: 2010-09-05 09:46:45+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: MediaWiki 1.17alpha (r72319); Translate extension (2010-08-20)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: ka\n"
+"X-Message-Group: out-statusnet\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#. TRANS: Page title
+#. TRANS: Menu item for site administration
+#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:376
+msgid "Access"
+msgstr "შესვლáƒ"
+
+#. TRANS: Page notice
+#: actions/accessadminpanel.php:67
+msgid "Site access settings"
+msgstr "სáƒáƒ˜áƒ¢áƒ–ე შესვლის პáƒáƒ áƒáƒ›áƒ”ტრები"
+
+#. TRANS: Form legend for registration form.
+#: actions/accessadminpanel.php:161
+msgid "Registration"
+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 "პირáƒáƒ“ი"
+
+#. TRANS: Checkbox instructions for admin setting "Invite only"
+#: actions/accessadminpanel.php:174
+msgid "Make registration invitation only."
+msgstr "რეგისტრáƒáƒªáƒ˜áƒ მხáƒáƒšáƒáƒ“ მáƒáƒ¬áƒ•ევით."
+
+#. TRANS: Checkbox label for configuring site as invite only.
+#: actions/accessadminpanel.php:176
+msgid "Invite only"
+msgstr "მხáƒáƒšáƒáƒ“ მáƒáƒ¬áƒ•ევით"
+
+#. TRANS: Checkbox instructions for admin setting "Closed" (no new registrations)
+#: actions/accessadminpanel.php:183
+msgid "Disable new registrations."
+msgstr "áƒáƒ®áƒáƒšáƒ˜ რეგისტრáƒáƒªáƒ˜áƒ”ბის გáƒáƒ£áƒ¥áƒ›áƒ”ბáƒ."
+
+#. TRANS: Checkbox label for disabling new user registrations.
+#: actions/accessadminpanel.php:185
+msgid "Closed"
+msgstr "დáƒáƒ®áƒ£áƒ áƒ£áƒšáƒ˜"
+
+#. TRANS: Title / tooltip for button to save access settings in site admin panel
+#: actions/accessadminpanel.php:202
+msgid "Save access settings"
+msgstr "შეინáƒáƒ®áƒ” შესვლის პáƒáƒ áƒáƒ›áƒ”ტრები"
+
+#. TRANS: Button label to save e-mail preferences.
+#. TRANS: Button label to save IM preferences.
+#. TRANS: Button label to save SMS preferences.
+#. TRANS: Button label
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
+#: actions/imsettings.php:184 actions/smssettings.php:209
+#: lib/applicationeditform.php:361
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "შეინáƒáƒ®áƒ”"
+
+#. TRANS: Server error when page not found (404)
+#: actions/all.php:68 actions/public.php:98 actions/replies.php:93
+#: actions/showfavorites.php:138 actions/tag.php:52
+msgid "No such page."
+msgstr "áƒáƒ¡áƒ”თი გვერდი áƒáƒ  áƒáƒ áƒ¡áƒ”ბáƒáƒ‘ს."
+
+#. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
+#: actions/all.php:79 actions/allrss.php:68
+#: actions/apiaccountupdatedeliverydevice.php:114
+#: actions/apiaccountupdateprofile.php:105
+#: actions/apiaccountupdateprofilebackgroundimage.php:116
+#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113
+#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100
+#: actions/apigroupleave.php:100 actions/apigrouplist.php:73
+#: actions/apistatusesupdate.php:229 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174
+#: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80
+#: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75
+#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
+#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
+#: actions/otp.php:76 actions/remotesubscribe.php:145
+#: 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:93 actions/userrss.php:40
+#: actions/xrds.php:71 lib/command.php:498 lib/galleryaction.php:59
+#: lib/mailbox.php:82 lib/profileaction.php:77
+msgid "No such user."
+msgstr "áƒáƒ¡áƒ”თი მáƒáƒ›áƒ®áƒ›áƒáƒ áƒ”ბელი áƒáƒ  áƒáƒ áƒ¡áƒ”ბáƒáƒ‘ს."
+
+#. TRANS: Page title. %1$s is user nickname, %2$d is page number
+#: actions/all.php:90
+#, php-format
+msgid "%1$s and friends, page %2$d"
+msgstr "%1$s დრმეგáƒáƒ‘რები, გვერდი %2$d"
+
+#. TRANS: Page title. %1$s is user nickname
+#. TRANS: H1 text. %1$s is user nickname
+#. TRANS: Message is used as link title. %s is a user nickname.
+#: actions/all.php:93 actions/all.php:185 actions/allrss.php:116
+#: actions/apitimelinefriends.php:210 actions/apitimelinehome.php:116
+#: lib/personalgroupnav.php:100
+#, php-format
+msgid "%s and friends"
+msgstr " %s დრმეგáƒáƒ‘რები"
+
+#. TRANS: %1$s is user nickname
+#: actions/all.php:107
+#, php-format
+msgid "Feed for friends of %s (RSS 1.0)"
+msgstr ""
+
+#. TRANS: %1$s is user nickname
+#: actions/all.php:116
+#, php-format
+msgid "Feed for friends of %s (RSS 2.0)"
+msgstr ""
+
+#. TRANS: %1$s is user nickname
+#: actions/all.php:125
+#, php-format
+msgid "Feed for friends of %s (Atom)"
+msgstr ""
+
+#. TRANS: %1$s is user nickname
+#: actions/all.php:138
+#, php-format
+msgid ""
+"This is the timeline for %s and friends but no one has posted anything yet."
+msgstr ""
+"ეს áƒáƒ áƒ˜áƒ¡ $s-ს დრმეგáƒáƒ‘რების გáƒáƒœáƒáƒ®áƒšáƒ”ბების ნáƒáƒ™áƒáƒ“ი, მáƒáƒ’რáƒáƒ› ჯერჯერáƒáƒ‘ით áƒáƒ áƒáƒ•ის "
+"დáƒáƒ£áƒžáƒáƒ¡áƒ¢áƒáƒ•ს."
+
+#: actions/all.php:143
+#, php-format
+msgid ""
+"Try subscribing to more people, [join a group](%%action.groups%%) or post "
+"something yourself."
+msgstr ""
+" გáƒáƒ®áƒ“ი მეტი მáƒáƒ›áƒ®áƒ›áƒáƒ áƒ”ბლის მიმდევáƒáƒ áƒ˜, [გáƒáƒ¬áƒ”ვრიáƒáƒœáƒ“ი ჯგუფში](%%action.groups%%) "
+"áƒáƒœ თáƒáƒ•áƒáƒ“ დáƒáƒžáƒáƒ¡áƒ¢áƒ” რáƒáƒ›áƒ”."
+
+#: actions/all.php:149 actions/replies.php:210 actions/showstream.php:211
+#, php-format
+msgid ""
+"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
+"post a notice to them."
+msgstr ""
+"[გáƒáƒ®áƒ¡áƒ”ნი áƒáƒœáƒ’áƒáƒ áƒ˜áƒ¨áƒ˜](%%%%action.register%%%%) დრგáƒáƒ›áƒáƒ”ხმáƒáƒ£áƒ áƒ” %s-ს áƒáƒœ დáƒáƒ£áƒ¢áƒáƒ•ე "
+"შეტყáƒáƒ‘ინებáƒ."
+
+#. TRANS: H1 text
+#: actions/all.php:182
+msgid "You and friends"
+msgstr "შენ დრმეგáƒáƒ‘რები"
+
+#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
+#. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name.
+#: actions/allrss.php:121 actions/apitimelinefriends.php:216
+#: actions/apitimelinehome.php:122
+#, php-format
+msgid "Updates from %1$s and friends on %2$s!"
+msgstr " %1$s დრმეგáƒáƒ‘რების გáƒáƒœáƒáƒ®áƒšáƒ”ბები %2$s-ზე!"
+
+#: actions/apiaccountratelimitstatus.php:72
+#: actions/apiaccountupdatedeliverydevice.php:94
+#: actions/apiaccountupdateprofile.php:97
+#: actions/apiaccountupdateprofilebackgroundimage.php:94
+#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
+#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101
+#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156
+#: actions/apigroupleave.php:142 actions/apigrouplist.php:137
+#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107
+#: actions/apigroupshow.php:116 actions/apihelptest.php:88
+#: actions/apistatusesdestroy.php:104 actions/apistatusesretweets.php:112
+#: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271
+#: actions/apitimelinegroup.php:154 actions/apitimelinehome.php:175
+#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241
+#: actions/apitimelineretweetedtome.php:121
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+msgid "API method not found."
+msgstr "API მეთáƒáƒ“ი ვერ მáƒáƒ˜áƒ«áƒ”ბნáƒ."
+
+#: actions/apiaccountupdatedeliverydevice.php:86
+#: actions/apiaccountupdateprofile.php:89
+#: actions/apiaccountupdateprofilebackgroundimage.php:86
+#: actions/apiaccountupdateprofilecolors.php:110
+#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
+#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109
+#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92
+#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
+#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92
+#: actions/apigroupleave.php:92 actions/apimediaupload.php:67
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198
+msgid "This method requires a POST."
+msgstr "ეს მეთáƒáƒ“ი მáƒáƒ˜áƒ—ხáƒáƒ•ს POST-ს."
+
+#: actions/apiaccountupdatedeliverydevice.php:106
+msgid ""
+"You must specify a parameter named 'device' with a value of one of: sms, im, "
+"none."
+msgstr ""
+"áƒáƒ£áƒªáƒ˜áƒšáƒ”ბელირპáƒáƒ áƒáƒ›áƒ”ტრ 'device'-ს მიუთითáƒáƒ— შემდეგი მნიშვნელáƒáƒ‘ებიდáƒáƒœ ერთერთი: "
+"sms, im, none."
+
+#: actions/apiaccountupdatedeliverydevice.php:133
+msgid "Could not update user."
+msgstr "მáƒáƒ›áƒ®áƒ›áƒáƒ áƒ”ბლის გáƒáƒœáƒáƒ®áƒšáƒ”ბრვერ მáƒáƒ®áƒ”რხდáƒ."
+
+#: 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:100 lib/galleryaction.php:66
+#: lib/profileaction.php:84
+msgid "User has no profile."
+msgstr "მáƒáƒ›áƒ®áƒ›áƒáƒ áƒ”ბელს პრáƒáƒ¤áƒ˜áƒšáƒ˜ áƒáƒ  გáƒáƒáƒ©áƒœáƒ˜áƒ."
+
+#: actions/apiaccountupdateprofile.php:147
+msgid "Could not save profile."
+msgstr "პრáƒáƒ¤áƒ˜áƒšáƒ˜áƒ¡ შენáƒáƒ®áƒ•რვერ მáƒáƒ®áƒ”რხდáƒ."
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:108
+#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
+#: actions/apistatusesupdate.php:212 actions/avatarsettings.php:257
+#: actions/designadminpanel.php:123 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 ""
+"სáƒáƒ›áƒ¬áƒ£áƒ®áƒáƒ áƒáƒ“ სერვერმრვერ გáƒáƒ£áƒ«áƒšáƒ áƒáƒ›áƒ“ენ POST მáƒáƒœáƒáƒªáƒ”მებს (%s ბáƒáƒ˜áƒ¢áƒ˜) მიმდინáƒáƒ áƒ” "
+"კáƒáƒœáƒ¤áƒ˜áƒ’ურáƒáƒªáƒ˜áƒ˜áƒ¡ გáƒáƒ›áƒ."
+
+#: 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 "სáƒáƒ›áƒ¬áƒ£áƒ®áƒáƒ áƒáƒ“ თქვენი დიზáƒáƒ˜áƒœáƒ˜áƒ¡ პáƒáƒ áƒáƒ›áƒ”ტრების შენáƒáƒ®áƒ•რვერ მáƒáƒ®áƒ”რხდáƒ."
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:187
+#: actions/apiaccountupdateprofilecolors.php:142
+msgid "Could not update your design."
+msgstr "დიზáƒáƒ˜áƒœáƒ˜áƒ¡ გáƒáƒœáƒáƒ®áƒšáƒ”ბრვერ მáƒáƒ®áƒ”რხდáƒ."
+
+#: actions/apiblockcreate.php:105
+msgid "You cannot block yourself!"
+msgstr "სáƒáƒ™áƒ£áƒ—áƒáƒ áƒ˜ თáƒáƒ•ის დáƒáƒ‘ლáƒáƒ™áƒ•რშეუძლებელიáƒ."
+
+#: actions/apiblockcreate.php:126
+msgid "Block user failed."
+msgstr "მáƒáƒ›áƒ®áƒ›áƒáƒ áƒ”ბლის დáƒáƒ‘ლáƒáƒ™áƒ•რვერ მáƒáƒ®áƒ”რხდáƒ."
+
+#: actions/apiblockdestroy.php:114
+msgid "Unblock user failed."
+msgstr "ვერ მáƒáƒ®áƒ”რხდრმáƒáƒ›áƒ®áƒ›áƒáƒ áƒ”ბელზე ბლáƒáƒ™áƒ˜áƒ¡ მáƒáƒ®áƒ¡áƒœáƒ."
+
+#: actions/apidirectmessage.php:89
+#, php-format
+msgid "Direct messages from %s"
+msgstr "პირდáƒáƒžáƒ˜áƒ áƒ˜ შეტყáƒáƒ‘ინებები %s-სგáƒáƒœ"
+
+#: actions/apidirectmessage.php:93
+#, php-format
+msgid "All the direct messages sent from %s"
+msgstr "%s-ს მიერ გáƒáƒ›áƒáƒ’ზáƒáƒ•ნილი ყველრპირდáƒáƒžáƒ˜áƒ áƒ˜ შეტყáƒáƒ‘ინებáƒ"
+
+#: actions/apidirectmessage.php:101
+#, php-format
+msgid "Direct messages to %s"
+msgstr "%s-სთვის გáƒáƒ’ზáƒáƒ•ნილი პირდáƒáƒžáƒ˜áƒ áƒ˜ შეტყáƒáƒ‘ინებები"
+
+#: actions/apidirectmessage.php:105
+#, php-format
+msgid "All the direct messages sent to %s"
+msgstr "%s-სთვის გáƒáƒ’ზáƒáƒ•ნილი ყველრპირდáƒáƒžáƒ˜áƒ áƒ˜ შეტყáƒáƒ‘ინებáƒ"
+
+#: actions/apidirectmessagenew.php:118
+msgid "No message text!"
+msgstr "შეტყáƒáƒ‘ინების ტექსტი áƒáƒ  áƒáƒ áƒ˜áƒ¡!"
+
+#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150
+#, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "ეს ძáƒáƒšáƒ˜áƒáƒœ გრძელიáƒ. შეტყáƒáƒ‘ინებáƒáƒ¨áƒ˜ დáƒáƒ¡áƒáƒ¨áƒ•ებირ%d სიმბáƒáƒšáƒ."
+
+#: actions/apidirectmessagenew.php:138
+msgid "Recipient user not found."
+msgstr "მიმღები მáƒáƒ›áƒ®áƒ›áƒáƒ áƒ”ბელი ვერ მáƒáƒ˜áƒ«áƒ”ბნáƒ."
+
+#: actions/apidirectmessagenew.php:142
+msgid "Can't send direct messages to users who aren't your friend."
+msgstr "ვერ გáƒáƒ£áƒ’ზáƒáƒ•ნი პირდáƒáƒžáƒ˜áƒ  შეტყáƒáƒ‘ინებáƒáƒ¡ იმáƒáƒ¡, ვისთáƒáƒœáƒáƒª áƒáƒ  მეგáƒáƒ‘რáƒáƒ‘."
+
+#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110
+#: actions/apistatusesdestroy.php:121
+msgid "No status found with that ID."
+msgstr "სტáƒáƒ¢áƒ£áƒ¡áƒ˜ áƒáƒ¡áƒ”თი ID-თ ვერ მáƒáƒ˜áƒ«áƒ”ბნáƒ."
+
+#: actions/apifavoritecreate.php:120
+msgid "This status is already a favorite."
+msgstr "ეს სტáƒáƒ¢áƒ£áƒ¡áƒ˜ უკვე ფáƒáƒ•áƒáƒ áƒ˜áƒ¢áƒ˜áƒ."
+
+#. TRANS: Error message text shown when a favorite could not be set.
+#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:296
+msgid "Could not create favorite."
+msgstr "ფáƒáƒ•áƒáƒ áƒ˜áƒ¢áƒ˜áƒ¡ შექმნრვერ მáƒáƒ®áƒ”რხდáƒ."
+
+#: actions/apifavoritedestroy.php:123
+msgid "That status is not a favorite."
+msgstr "ეს სტáƒáƒ¢áƒ£áƒ¡áƒ˜ áƒáƒ áƒ áƒáƒ áƒ˜áƒ¡ ფáƒáƒ•áƒáƒ áƒ˜áƒ¢áƒ˜."
+
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+msgid "Could not delete favorite."
+msgstr "ფáƒáƒ•áƒáƒ áƒ˜áƒ¢áƒ˜áƒ¡ წáƒáƒ¨áƒšáƒ ვერ მáƒáƒ®áƒ”რხდáƒ."
+
+#: actions/apifriendshipscreate.php:109
+msgid "Could not follow user: profile not found."
+msgstr "áƒáƒ› მáƒáƒ›áƒ®áƒ›áƒáƒ áƒ”ბლის მიმდევáƒáƒ áƒ˜ ვერ გáƒáƒ®áƒ“ებით, რáƒáƒ“გáƒáƒœ პრáƒáƒ¤áƒ˜áƒšáƒ˜ ვერ მáƒáƒ˜áƒ«áƒ”ბნáƒ"
+
+#: actions/apifriendshipscreate.php:118
+#, php-format
+msgid "Could not follow user: %s is already on your list."
+msgstr "თქვენ უკვე ხáƒáƒ áƒ— %s-ის მიმდევáƒáƒ áƒ˜."
+
+#: actions/apifriendshipsdestroy.php:109
+msgid "Could not unfollow user: User not found."
+msgstr "მáƒáƒ›áƒ®áƒ›áƒáƒ áƒ”ბლის ჩáƒáƒ›áƒáƒ¨áƒáƒ áƒ”ბრვერ მáƒáƒ®áƒ”რხდáƒ. მáƒáƒ›áƒ®áƒ›áƒáƒ áƒ”ბელი ვერ მáƒáƒ˜áƒ«áƒ”ბნáƒ."
+
+#: actions/apifriendshipsdestroy.php:120
+msgid "You cannot unfollow yourself."
+msgstr "სáƒáƒ™áƒ£áƒ—áƒáƒ áƒ˜ თáƒáƒ•ის ჩáƒáƒ›áƒáƒ¨áƒáƒ áƒ”ბრშეუძლებელიáƒ."
+
+#: actions/apifriendshipsexists.php:91
+msgid "Two valid IDs or screen_names must be supplied."
+msgstr "სáƒáƒ­áƒ˜áƒ áƒáƒ 2 სწáƒáƒ áƒ˜ სáƒáƒ®áƒ”ლის áƒáƒœ ID-ს მáƒáƒ¬áƒáƒ“ებáƒ."
+
+#: 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:167 actions/editgroup.php:186
+#: actions/newgroup.php:126 actions/profilesettings.php:215
+#: actions/register.php:212
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr "მეტსáƒáƒ®áƒ”ლში დáƒáƒ¡áƒáƒ¨áƒ•ებირმხáƒáƒšáƒáƒ“ პáƒáƒ¢áƒáƒ áƒ áƒáƒ¡áƒáƒ”ბი დრციფრები."
+
+#: actions/apigroupcreate.php:176 actions/editgroup.php:190
+#: actions/newgroup.php:130 actions/profilesettings.php:238
+#: actions/register.php:215
+msgid "Nickname already in use. Try another one."
+msgstr "მეტსáƒáƒ®áƒ”ლი უკვე გáƒáƒ›áƒáƒ§áƒ”ნებულიáƒ. სცáƒáƒ“ე სხვáƒ."
+
+#: actions/apigroupcreate.php:183 actions/editgroup.php:193
+#: actions/newgroup.php:133 actions/profilesettings.php:218
+#: actions/register.php:217
+msgid "Not a valid nickname."
+msgstr "მეტსáƒáƒ®áƒ”ლი áƒáƒ áƒáƒ¡áƒ¬áƒáƒ áƒ˜áƒ."
+
+#: actions/apigroupcreate.php:199 actions/editapplication.php:215
+#: actions/editgroup.php:199 actions/newapplication.php:203
+#: actions/newgroup.php:139 actions/profilesettings.php:222
+#: actions/register.php:224
+msgid "Homepage is not a valid URL."
+msgstr "სáƒáƒ¡áƒ¢áƒáƒ áƒ¢áƒ გვერდი áƒáƒ áƒáƒ¡áƒ¬áƒáƒ áƒ˜ URL-იáƒ."
+
+#: actions/apigroupcreate.php:208 actions/editgroup.php:202
+#: actions/newgroup.php:142 actions/profilesettings.php:225
+#: actions/register.php:227
+msgid "Full name is too long (max 255 chars)."
+msgstr "სრული სáƒáƒ®áƒ”ლი ძáƒáƒšáƒ˜áƒáƒœ გრძელირ(áƒáƒ áƒáƒ£áƒ›áƒ”ტეს 255 სიმბáƒáƒšáƒ)."
+
+#: actions/apigroupcreate.php:216 actions/editapplication.php:190
+#: actions/newapplication.php:172
+#, php-format
+msgid "Description is too long (max %d chars)."
+msgstr "áƒáƒ¦áƒ¬áƒ”რრძáƒáƒšáƒ˜áƒáƒœ გრძელირ(áƒáƒ áƒáƒ£áƒ›áƒ”ტეს %d სიმბáƒáƒšáƒ)."
+
+#: actions/apigroupcreate.php:227 actions/editgroup.php:208
+#: actions/newgroup.php:148 actions/profilesettings.php:232
+#: actions/register.php:234
+msgid "Location is too long (max 255 chars)."
+msgstr "áƒáƒ“გილმდებáƒáƒ áƒ”áƒáƒ‘რძáƒáƒšáƒ˜áƒáƒœ გრძელირ(áƒáƒ áƒáƒ£áƒ›áƒ”ტეს 255 სიმბáƒáƒšáƒ)."
+
+#: actions/apigroupcreate.php:246 actions/editgroup.php:219
+#: actions/newgroup.php:159
+#, php-format
+msgid "Too many aliases! Maximum %d."
+msgstr ""
+
+#: actions/apigroupcreate.php:289 actions/editgroup.php:238
+#: actions/newgroup.php:178
+msgid "Alias can't be the same as nickname."
+msgstr ""
+
+#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
+#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
+#: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
+msgid "Group not found."
+msgstr "ჯგუფი ვერ მáƒáƒ˜áƒ«áƒ”ბნáƒ."
+
+#. TRANS: Error text shown a user tries to join a group they already are a member of.
+#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:336
+msgid "You are already a member of that group."
+msgstr "თქვენ უკვე ხáƒáƒ áƒ— áƒáƒ› ჯგუფის წევრი."
+
+#. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
+#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:341
+msgid "You have been blocked from that group by the admin."
+msgstr "თქვენ დáƒáƒ‘ლáƒáƒ™áƒ˜áƒšáƒ˜ ხáƒáƒ áƒ— áƒáƒ› ჯგუფიდáƒáƒœ áƒáƒ“მინისტრáƒáƒ¢áƒáƒ áƒ˜áƒ¡ მიერ."
+
+#. TRANS: Message given having failed to add a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/apigroupjoin.php:139 actions/joingroup.php:134 lib/command.php:353
+#, php-format
+msgid "Could not join user %1$s to group %2$s."
+msgstr "ვერ მáƒáƒ®áƒ”რხდრმáƒáƒ›áƒ®áƒ›áƒáƒ áƒ”ბელ %1$s-სთáƒáƒœ ერთáƒáƒ“ ჯგუფ %2$s-ში გáƒáƒ”რთიáƒáƒœáƒ”ბáƒ."
+
+#: actions/apigroupleave.php:115
+msgid "You are not a member of this group."
+msgstr "თვენ áƒáƒ  ხáƒáƒ áƒ— áƒáƒ› ჯგუფის წევრი."
+
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/apigroupleave.php:125 actions/leavegroup.php:129
+#: lib/command.php:401
+#, php-format
+msgid "Could not remove user %1$s from group %2$s."
+msgstr "მáƒáƒ›áƒ®áƒ›áƒáƒ áƒ”ბლ %1$s-ის გáƒáƒ áƒ˜áƒªáƒ®áƒ•რჯგუფიდáƒáƒœ %2$s ვერ მáƒáƒ®áƒ”რხდáƒ."
+
+#. TRANS: %s is a user name
+#: actions/apigrouplist.php:98
+#, php-format
+msgid "%s's groups"
+msgstr "%s-ს ჯგუფები"
+
+#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s
+#: actions/apigrouplist.php:108
+#, php-format
+msgid "%1$s groups %2$s is a member of."
+msgstr "%1$s-ს ის ჯგუფები რáƒáƒ›áƒšáƒ”ბშიც გáƒáƒ”რთიáƒáƒœáƒ”ბულირ%2$s."
+
+#. TRANS: Message is used as a title. %s is a site name.
+#. TRANS: Message is used as a page title. %s is a nick name.
+#: actions/apigrouplistall.php:92 actions/usergroups.php:63
+#, php-format
+msgid "%s groups"
+msgstr "%s ჯგუფები"
+
+#: actions/apigrouplistall.php:96
+#, php-format
+msgid "groups on %s"
+msgstr "ჯგუფები %s-ზე"
+
+#: actions/apimediaupload.php:99
+msgid "Upload failed."
+msgstr "áƒáƒ¢áƒ•ირთვრვერ მáƒáƒ®áƒ”რხდáƒ."
+
+#: actions/apioauthauthorize.php:101
+msgid "No oauth_token parameter provided."
+msgstr "oauth_token პáƒáƒ áƒáƒ›áƒ”ტრი áƒáƒ  áƒáƒ áƒ˜áƒ¡ მáƒáƒ¬áƒáƒ“ებული."
+
+#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
+#: actions/deletenotice.php:169 actions/disfavor.php:74
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
+#: actions/groupblock.php:66 actions/grouplogo.php:312
+#: actions/groupunblock.php:66 actions/imsettings.php:227
+#: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66
+#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
+#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/profilesettings.php:194 actions/recoverpassword.php:350
+#: actions/register.php:172 actions/remotesubscribe.php:77
+#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
+#: actions/subscribe.php:86 actions/tagother.php:166
+#: actions/unsubscribe.php:69 actions/userauthorization.php:52
+#: 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 "ბáƒáƒ–áƒáƒ› დáƒáƒ£áƒ¨áƒ•რშეცდáƒáƒ›áƒ OAuth áƒáƒžáƒšáƒ˜áƒ™áƒáƒªáƒ˜áƒ˜áƒ¡ მáƒáƒ›áƒ®áƒ›áƒáƒ áƒ”ბლის წáƒáƒ¨áƒšáƒ˜áƒ¡áƒáƒ¡."
+
+#: actions/apioauthauthorize.php:185
+msgid "Database error inserting OAuth application user."
+msgstr "ბáƒáƒ–áƒáƒ› დáƒáƒ£áƒ¨áƒ•რშეცდáƒáƒ›áƒ OAuth áƒáƒžáƒšáƒ˜áƒ™áƒáƒªáƒ˜áƒ˜áƒ¡ მáƒáƒ›áƒ®áƒ›áƒáƒ áƒ”ბლის ჩáƒáƒ¡áƒ›áƒ˜áƒ¡áƒáƒ¡."
+
+#: actions/apioauthauthorize.php:214
+#, php-format
+msgid ""
+"The request token %s has been authorized. Please exchange it for an access "
+"token."
+msgstr ""
+
+#: actions/apioauthauthorize.php:227
+#, php-format
+msgid "The request token %s has been denied and revoked."
+msgstr ""
+
+#: 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 "დáƒáƒ£áƒ¨áƒ•ი áƒáƒœ áƒáƒ™áƒ áƒ«áƒáƒšáƒ” შესვლáƒ"
+
+#: 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 ""
+
+#. TRANS: Main menu option when logged in for access to user settings
+#: actions/apioauthauthorize.php:310 lib/action.php:463
+msgid "Account"
+msgstr "áƒáƒœáƒ’áƒáƒ áƒ˜áƒ¨áƒ˜"
+
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
+#: actions/showgroup.php:245 actions/tagother.php:94
+#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: lib/userprofile.php:132
+msgid "Nickname"
+msgstr "მეტსáƒáƒ®áƒ”ლი"
+
+#. TRANS: Link description in user account settings menu.
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
+msgid "Password"
+msgstr "პáƒáƒ áƒáƒšáƒ˜"
+
+#: actions/apioauthauthorize.php:328
+msgid "Deny"
+msgstr "áƒáƒ™áƒ áƒ«áƒáƒšáƒ•áƒ"
+
+#: actions/apioauthauthorize.php:334
+msgid "Allow"
+msgstr "დáƒáƒ¨áƒ•ებáƒ"
+
+#: actions/apioauthauthorize.php:351
+msgid "Allow or deny access to your account information."
+msgstr "დáƒáƒ£áƒ¨áƒ•ი áƒáƒœ áƒáƒ™áƒ áƒ«áƒáƒšáƒ” წვდáƒáƒ›áƒ თქვენი áƒáƒœáƒ’áƒáƒ áƒ˜áƒ¨áƒ˜áƒ¡ ინფáƒáƒ áƒ›áƒáƒªáƒ˜áƒáƒ–ე."
+
+#: actions/apistatusesdestroy.php:112
+msgid "This method requires a POST or DELETE."
+msgstr "ეს მეთáƒáƒ“ი მáƒáƒ˜áƒ—ხáƒáƒ•ს POST-ს áƒáƒœ DELETE-ს."
+
+#: actions/apistatusesdestroy.php:135
+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 "áƒáƒ¡áƒ”თი შეტყáƒáƒ‘ინებრáƒáƒ  áƒáƒ áƒ¡áƒ”ბáƒáƒ‘ს."
+
+#. TRANS: Error text shown when trying to repeat an own notice.
+#: actions/apistatusesretweet.php:83 lib/command.php:538
+msgid "Cannot repeat your own notice."
+msgstr "სáƒáƒ™áƒ£áƒ—áƒáƒ áƒ˜ შეტყáƒáƒ‘ინების გáƒáƒ›áƒ”áƒáƒ áƒ”ბრáƒáƒ  შეიძლებáƒ."
+
+#. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
+#: actions/apistatusesretweet.php:91 lib/command.php:544
+msgid "Already repeated that notice."
+msgstr "ეს შეტყáƒáƒ‘ინებრუკვე გáƒáƒ›áƒ”áƒáƒ áƒ”ბულიáƒ."
+
+#: actions/apistatusesshow.php:139
+msgid "Status deleted."
+msgstr "სტáƒáƒ¢áƒ£áƒ¡áƒ˜ წáƒáƒ¨áƒšáƒ˜áƒšáƒ˜áƒ."
+
+#: actions/apistatusesshow.php:145
+msgid "No status with that ID found."
+msgstr "áƒáƒ¡áƒ”თი ID-ს სტáƒáƒ¢áƒ£áƒ¡áƒ˜ ვერ მáƒáƒ˜áƒ«áƒ”ბნáƒ."
+
+#: actions/apistatusesupdate.php:221
+msgid "Client must provide a 'status' parameter with a value."
+msgstr ""
+
+#: actions/apistatusesupdate.php:242 actions/newnotice.php:157
+#: lib/mailhandler.php:60
+#, php-format
+msgid "That's too long. Max notice size is %d chars."
+msgstr "შეტყáƒáƒ‘ინების დáƒáƒ¡áƒáƒ«áƒ•ები ზáƒáƒ›áƒáƒ %d სიმბáƒáƒšáƒ."
+
+#: actions/apistatusesupdate.php:283 actions/apiusershow.php:96
+msgid "Not found."
+msgstr "ვერ მáƒáƒ˜áƒ«áƒ”ბნáƒ."
+
+#: actions/apistatusesupdate.php:306 actions/newnotice.php:181
+#, php-format
+msgid "Max notice size is %d chars, including attachment URL."
+msgstr "შეყáƒáƒ‘ინების დáƒáƒ¡áƒáƒ¨áƒ•ები ზáƒáƒ›áƒáƒ %d სიმბáƒáƒšáƒ მიმáƒáƒ’რებული URL-ის ჩáƒáƒ—ვლით."
+
+#: actions/apisubscriptions.php:232 actions/apisubscriptions.php:262
+msgid "Unsupported format."
+msgstr "ფáƒáƒ áƒ›áƒáƒ¢áƒ˜ áƒáƒ  áƒáƒ áƒ˜áƒ¡ მხáƒáƒ áƒ“áƒáƒ­áƒ”რილი."
+
+#: actions/apitimelinementions.php:131
+#, php-format
+msgid "%1$s updates that reply to updates from %2$s / %3$s."
+msgstr ""
+
+#: actions/apitimelinepublic.php:197 actions/publicrss.php:103
+#, php-format
+msgid "%s public timeline"
+msgstr "%s სáƒáƒ¯áƒáƒ áƒ ნáƒáƒ™áƒáƒ“ი"
+
+#: actions/apitimelinepublic.php:202 actions/publicrss.php:105
+#, php-format
+msgid "%s updates from everyone!"
+msgstr "%s გáƒáƒœáƒáƒ®áƒšáƒ”ბები ყველáƒáƒ¡áƒ’áƒáƒœ!"
+
+#: actions/apitimelinetag.php:105 actions/tag.php:67
+#, php-format
+msgid "Notices tagged with %s"
+msgstr "შეტყáƒáƒ‘ინებები მáƒáƒœáƒ˜áƒ¨áƒœáƒ£áƒšáƒ˜ რáƒáƒ’áƒáƒ áƒª %s"
+
+#: actions/apitimelinetag.php:107 actions/tagrss.php:65
+#, php-format
+msgid "Updates tagged with %1$s on %2$s!"
+msgstr "გáƒáƒœáƒáƒ®áƒšáƒ”ბები მáƒáƒœáƒ˜áƒ¨áƒœáƒ£áƒšáƒ˜ რáƒáƒ’áƒáƒ áƒª %1$s %2$s-ზე!"
+
+#: actions/apitrends.php:87
+msgid "API method under construction."
+msgstr "API მეთáƒáƒ“ი დáƒáƒ›áƒ£áƒ¨áƒáƒ•ების პრáƒáƒªáƒ”სშიáƒ."
+
+#: actions/attachment.php:73
+msgid "No such attachment."
+msgstr "áƒáƒ¡áƒ”თი მიმáƒáƒ’რებული დáƒáƒ™áƒ£áƒ›áƒ”ნტი ვერ მáƒáƒ˜áƒ«áƒ”ბნáƒ."
+
+#: 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 "მეტსáƒáƒ®áƒ”ლი უცნáƒáƒ‘იáƒ."
+
+#: actions/avatarbynickname.php:64
+msgid "No size."
+msgstr "ზáƒáƒ›áƒ უცნáƒáƒ‘იáƒ."
+
+#: actions/avatarbynickname.php:69
+msgid "Invalid size."
+msgstr "ზáƒáƒ›áƒ áƒáƒ áƒáƒ¡áƒ¬áƒáƒ áƒ˜áƒ."
+
+#. TRANS: Link description in user account settings menu.
+#: actions/avatarsettings.php:67 actions/showgroup.php:230
+#: lib/accountsettingsaction.php:118
+msgid "Avatar"
+msgstr "áƒáƒ•áƒáƒ¢áƒáƒ áƒ˜"
+
+#: actions/avatarsettings.php:78
+#, php-format
+msgid "You can upload your personal avatar. The maximum file size is %s."
+msgstr ""
+"თქვენ შეგიძლიáƒáƒ— áƒáƒ¢áƒ•ირთáƒáƒ— პერსáƒáƒœáƒáƒšáƒ£áƒ áƒ˜ áƒáƒ•áƒáƒ¢áƒáƒ áƒ˜. ფáƒáƒ˜áƒšáƒ˜áƒ¡ დáƒáƒ¡áƒáƒ¨áƒ•ები ზáƒáƒ›áƒáƒ %s."
+
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:185
+#: actions/grouplogo.php:181 actions/remotesubscribe.php:191
+#: actions/userauthorization.php:72 actions/userrss.php:108
+msgid "User without matching profile."
+msgstr "მáƒáƒ›áƒ®áƒ›áƒáƒ áƒ”ბელი შესáƒáƒ‘áƒáƒ›áƒ˜áƒ¡áƒ˜ პრáƒáƒ¤áƒ˜áƒšáƒ˜áƒ¡ გáƒáƒ áƒ”შე."
+
+#: actions/avatarsettings.php:119 actions/avatarsettings.php:197
+#: actions/grouplogo.php:254
+msgid "Avatar settings"
+msgstr "áƒáƒ•áƒáƒ¢áƒáƒ áƒ˜áƒ¡ პáƒáƒ áƒáƒ›áƒ”ტრები."
+
+#: actions/avatarsettings.php:127 actions/avatarsettings.php:205
+#: actions/grouplogo.php:202 actions/grouplogo.php:262
+msgid "Original"
+msgstr "áƒáƒ áƒ˜áƒ’ინáƒáƒšáƒ˜"
+
+#: actions/avatarsettings.php:142 actions/avatarsettings.php:217
+#: actions/grouplogo.php:213 actions/grouplogo.php:274
+msgid "Preview"
+msgstr "წინáƒáƒ¡áƒ¬áƒáƒ áƒ˜ გáƒáƒ“áƒáƒ®áƒ”დვáƒ"
+
+#: actions/avatarsettings.php:149 actions/showapplication.php:252
+#: lib/deleteuserform.php:66 lib/noticelist.php:657
+msgid "Delete"
+msgstr "წáƒáƒ¨áƒšáƒ"
+
+#: actions/avatarsettings.php:166 actions/grouplogo.php:236
+msgid "Upload"
+msgstr "áƒáƒ¢áƒ•ირთვáƒ"
+
+#: actions/avatarsettings.php:231 actions/grouplogo.php:289
+msgid "Crop"
+msgstr "მáƒáƒ­áƒ áƒ"
+
+#: 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 "áƒáƒ•áƒáƒ¢áƒáƒ áƒ˜ გáƒáƒœáƒáƒ®áƒšáƒ“áƒ."
+
+#: actions/avatarsettings.php:373
+msgid "Failed updating avatar."
+msgstr "áƒáƒ•áƒáƒ¢áƒáƒ áƒ˜áƒ¡ გáƒáƒœáƒáƒ®áƒšáƒ”ბრვერ მáƒáƒ®áƒ”რხდáƒ."
+
+#: actions/avatarsettings.php:397
+msgid "Avatar deleted."
+msgstr "áƒáƒ•áƒáƒ¢áƒáƒ áƒ˜ წáƒáƒ˜áƒ¨áƒáƒšáƒ."
+
+#: actions/block.php:69
+msgid "You already blocked that user."
+msgstr "თქვენ უკვე დáƒáƒ‘ლáƒáƒ™áƒ”თ ეს მáƒáƒ›áƒ®áƒ›áƒáƒ áƒ”ბელი."
+
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
+msgid "Block user"
+msgstr "მáƒáƒ›áƒ®áƒ›áƒáƒ áƒ”ბლის დáƒáƒ‘ლáƒáƒ™áƒ•áƒ"
+
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:153 actions/deleteapplication.php:154
+#: actions/deletenotice.php:147 actions/deleteuser.php:152
+#: actions/groupblock.php:178
+msgctxt "BUTTON"
+msgid "No"
+msgstr "áƒáƒ áƒ"
+
+#. TRANS: Submit button title for 'No' when blocking a user.
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/block.php:157 actions/deleteuser.php:156
+msgid "Do not block this user"
+msgstr "áƒáƒ  დáƒáƒ‘ლáƒáƒ™áƒ ეს მáƒáƒ›áƒ®áƒ›áƒáƒ áƒ”ბელი"
+
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:160 actions/deleteapplication.php:161
+#: actions/deletenotice.php:154 actions/deleteuser.php:159
+#: actions/groupblock.php:185
+msgctxt "BUTTON"
+msgid "Yes"
+msgstr "დიáƒáƒ®"
+
+#. TRANS: Submit button title for 'Yes' when blocking a user.
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
+msgid "Block this user"
+msgstr "დáƒáƒ‘ლáƒáƒ™áƒ” ეს მáƒáƒ›áƒ®áƒ›áƒáƒ áƒ”ბელი"
+
+#: actions/block.php:187
+msgid "Failed to save block information."
+msgstr "დáƒáƒ‘ლáƒáƒ™áƒ•ის შესáƒáƒ®áƒ”ბ ინფáƒáƒ áƒ›áƒáƒªáƒ˜áƒ˜áƒ¡ შენáƒáƒ®áƒ•რვერ მáƒáƒ®áƒ”რხდáƒ."
+
+#. TRANS: Command exception text shown when a group is requested that does not exist.
+#. TRANS: Error text shown when trying to leave a group that does not exist.
+#: actions/blockedfromgroup.php:80 actions/blockedfromgroup.php:87
+#: actions/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:170
+#: lib/command.php:383
+msgid "No such group."
+msgstr "áƒáƒ¡áƒ”თი ჯგუფი ვერ მáƒáƒ˜áƒ«áƒ”ბნáƒ."
+
+#: actions/blockedfromgroup.php:97
+#, php-format
+msgid "%s blocked profiles"
+msgstr "%s დáƒáƒ‘ლáƒáƒ™áƒ˜áƒšáƒ˜ პრáƒáƒ¤áƒ˜áƒšáƒ˜"
+
+#: actions/blockedfromgroup.php:100
+#, php-format
+msgid "%1$s blocked profiles, page %2$d"
+msgstr "%1$s დáƒáƒ‘ლáƒáƒ™áƒ˜áƒšáƒ˜ პრáƒáƒ¤áƒ˜áƒšáƒ˜, გვერდი %2$d"
+
+#: 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 "მáƒáƒ›áƒ®áƒ›áƒáƒ áƒ”ბლის ბლáƒáƒ™áƒ˜áƒ áƒ”ბის მáƒáƒ®áƒ¡áƒœáƒ"
+
+#. TRANS: Title for mini-posting window loaded from bookmarklet.
+#: actions/bookmarklet.php:51
+#, php-format
+msgid "Post to %s"
+msgstr "დáƒáƒ£áƒžáƒáƒ¡áƒ¢áƒ” %s-ს"
+
+#: 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 "ეს დáƒáƒ¡áƒáƒ“áƒáƒ¡áƒ¢áƒ£áƒ áƒ”ბელი კáƒáƒ“ი თქვენთვის áƒáƒ  áƒáƒ áƒ˜áƒ¡!"
+
+#. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'.
+#: actions/confirmaddress.php:91
+#, php-format
+msgid "Unrecognized address type %s."
+msgstr "მისáƒáƒ›áƒáƒ áƒ—ის áƒáƒ›áƒáƒ£áƒªáƒœáƒáƒ‘ი ტიპი %s."
+
+#. TRANS: Client error for an already confirmed email/jabbel/sms address.
+#: actions/confirmaddress.php:96
+msgid "That address has already been confirmed."
+msgstr "ეს მისáƒáƒ›áƒáƒ áƒ—ი უკვე დáƒáƒ“áƒáƒ¡áƒ¢áƒ£áƒ áƒ”ბულიáƒ."
+
+#. TRANS: Server error thrown on database error updating e-mail preferences.
+#. TRANS: Server error thrown on database error removing a registered e-mail address.
+#. TRANS: Server error thrown on database error updating IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
+#: actions/confirmaddress.php:116 actions/emailsettings.php:327
+#: actions/emailsettings.php:473 actions/imsettings.php:280
+#: actions/imsettings.php:439 actions/othersettings.php:174
+#: actions/profilesettings.php:283 actions/smssettings.php:308
+#: actions/smssettings.php:464
+msgid "Couldn't update user."
+msgstr "მáƒáƒ›áƒ®áƒ›áƒáƒ áƒ”ბლის გáƒáƒœáƒáƒ®áƒšáƒ”ბრვერ მáƒáƒ®áƒ”რხდáƒ."
+
+#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
+#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
+#: actions/confirmaddress.php:128 actions/emailsettings.php:433
+#: actions/smssettings.php:422
+msgid "Couldn't delete email confirmation."
+msgstr "ელ. ფáƒáƒ¡áƒ¢áƒ˜áƒ¡ დáƒáƒ“áƒáƒ¡áƒ¢áƒ£áƒ áƒ”ბის წáƒáƒ¨áƒšáƒ ვერ მáƒáƒ®áƒ”რხდáƒ."
+
+#: actions/confirmaddress.php:146
+msgid "Confirm address"
+msgstr "მისáƒáƒ›áƒáƒ áƒ—ის დáƒáƒ¡áƒ¢áƒ£áƒ áƒ˜"
+
+#: actions/confirmaddress.php:161
+#, php-format
+msgid "The address \"%s\" has been confirmed for your account."
+msgstr "მისáƒáƒ›áƒáƒ áƒ—ი \"%s\" დáƒáƒ“áƒáƒ¡áƒ¢áƒ£áƒ áƒ“რთქვენი áƒáƒœáƒ’áƒáƒ áƒ˜áƒ¨áƒ˜áƒ¡áƒ—ვის."
+
+#: actions/conversation.php:99
+msgid "Conversation"
+msgstr "სáƒáƒ£áƒ‘áƒáƒ áƒ˜"
+
+#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
+#: lib/profileaction.php:229 lib/searchgroupnav.php:82
+msgid "Notices"
+msgstr "შეტყáƒáƒ‘ინებები"
+
+#: actions/deleteapplication.php:63
+msgid "You must be logged in to delete an application."
+msgstr "áƒáƒžáƒšáƒ˜áƒ™áƒáƒªáƒ˜áƒ˜áƒ¡ წáƒáƒ¡áƒáƒ¨áƒšáƒ”ლáƒáƒ“ სáƒáƒ­áƒ˜áƒ áƒáƒ áƒáƒ•რáƒáƒ¢áƒ˜áƒ–áƒáƒªáƒ˜áƒ."
+
+#: actions/deleteapplication.php:71
+msgid "Application not found."
+msgstr "áƒáƒžáƒšáƒ˜áƒ™áƒáƒªáƒ˜áƒ ვერ მáƒáƒ˜áƒ«áƒ”ბნáƒ."
+
+#: actions/deleteapplication.php:78 actions/editapplication.php:77
+#: actions/showapplication.php:94
+msgid "You are not the owner of this application."
+msgstr "თქვენ áƒáƒ  ხáƒáƒ áƒ— áƒáƒ› áƒáƒžáƒšáƒ˜áƒ™áƒáƒªáƒ˜áƒ˜áƒ¡ მფლáƒáƒ‘ელი."
+
+#: actions/deleteapplication.php:102 actions/editapplication.php:127
+#: actions/newapplication.php:110 actions/showapplication.php:118
+#: lib/action.php:1307
+msgid "There was a problem with your session token."
+msgstr ""
+
+#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
+msgid "Delete application"
+msgstr "áƒáƒžáƒšáƒ˜áƒ™áƒáƒªáƒ˜áƒ˜áƒ¡ წáƒáƒ¨áƒšáƒ"
+
+#: 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 ""
+"ნáƒáƒ›áƒ“ვილáƒáƒ“ გნებáƒáƒ•თ áƒáƒ› áƒáƒžáƒšáƒ˜áƒ™áƒáƒªáƒ˜áƒ˜áƒ¡ წáƒáƒ¨áƒšáƒ? ეს მáƒáƒ¥áƒ›áƒ”დებრწáƒáƒ¨áƒšáƒ˜áƒ¡ ყველáƒáƒœáƒáƒ˜áƒ  "
+"მáƒáƒœáƒáƒªáƒ”მებს áƒáƒ› áƒáƒžáƒšáƒ˜áƒ™áƒáƒªáƒ˜áƒ˜áƒ¡ შესáƒáƒ®áƒ”ბ, ყველრშეერთებული მáƒáƒ›áƒ®áƒ›áƒáƒ áƒ”ბლის ჩáƒáƒ—ვლით."
+
+#. TRANS: Submit button title for 'No' when deleting an application.
+#: actions/deleteapplication.php:158
+msgid "Do not delete this application"
+msgstr "áƒáƒ  წáƒáƒ¨áƒáƒšáƒ ეს áƒáƒžáƒšáƒ˜áƒ™áƒáƒªáƒ˜áƒ"
+
+#. TRANS: Submit button title for 'Yes' when deleting an application.
+#: actions/deleteapplication.php:164
+msgid "Delete this application"
+msgstr "áƒáƒžáƒšáƒ˜áƒ™áƒáƒªáƒ˜áƒ˜áƒ¡ წáƒáƒ¨áƒšáƒ"
+
+#. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
+#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
+#: 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:64
+#: lib/settingsaction.php:72
+msgid "Not logged in."
+msgstr "áƒáƒ•ტáƒáƒ áƒ˜áƒ–ებული áƒáƒ  ხáƒáƒ áƒ—."
+
+#: 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 "ნáƒáƒ›áƒ“ვილáƒáƒ“ გსურთ áƒáƒ› შეტყáƒáƒ‘ინების წáƒáƒ¨áƒšáƒ?"
+
+#. TRANS: Submit button title for 'No' when deleting a notice.
+#: actions/deletenotice.php:151
+msgid "Do not delete this notice"
+msgstr "áƒáƒ  წáƒáƒ¨áƒáƒšáƒ ეს შეტყáƒáƒ‘ინებáƒ"
+
+#. TRANS: Submit button title for 'Yes' when deleting a notice.
+#: actions/deletenotice.php:158 lib/noticelist.php:657
+msgid "Delete this notice"
+msgstr "შეტყáƒáƒ‘ინების წáƒáƒ¨áƒšáƒ"
+
+#: actions/deleteuser.php:67
+msgid "You cannot delete users."
+msgstr "თქვენ ვერ შეძლებთ მáƒáƒ›áƒ®áƒ›áƒáƒ áƒ”ბლების წáƒáƒ¨áƒšáƒáƒ¡."
+
+#: actions/deleteuser.php:74
+msgid "You can only delete local users."
+msgstr "თქვენ მხáƒáƒšáƒáƒ“ áƒáƒ“გილáƒáƒ‘რივი მáƒáƒ›áƒ®áƒ›áƒáƒ áƒ”ბლების წáƒáƒ¨áƒšáƒ გძáƒáƒšáƒ£áƒ«áƒ—."
+
+#: actions/deleteuser.php:110 actions/deleteuser.php:133
+msgid "Delete user"
+msgstr "მáƒáƒ›áƒ®áƒ›áƒáƒ áƒ”ბლის წáƒáƒ¨áƒšáƒ"
+
+#: 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 ""
+"ნáƒáƒ›áƒ“ვილáƒáƒ“ გნებáƒáƒ•თ áƒáƒ› მáƒáƒ›áƒ®áƒ›áƒáƒ áƒ”ბლის წáƒáƒ¨áƒšáƒ? ეს მáƒáƒ¥áƒ›áƒ”დებრწáƒáƒ¨áƒšáƒ˜áƒ¡ ყველრმáƒáƒœáƒáƒªáƒ”მს "
+"მáƒáƒ›áƒ®áƒ›áƒáƒ áƒ”ბლის შესáƒáƒ®áƒ”ბ სáƒáƒ áƒ”ზერვრáƒáƒ¡áƒšáƒ˜áƒ¡ გáƒáƒ áƒ”შე."
+
+#. TRANS: Submit button title for 'Yes' when deleting a user.
+#: actions/deleteuser.php:163 lib/deleteuserform.php:77
+msgid "Delete this user"
+msgstr "áƒáƒ› მáƒáƒ›áƒ®áƒ›áƒáƒ áƒ”ბლის წáƒáƒ¨áƒšáƒ"
+
+#. TRANS: Message used as title for design settings for the site.
+#. TRANS: Link description in user account settings menu.
+#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139
+#: lib/groupnav.php:119
+msgid "Design"
+msgstr "áƒáƒ› მáƒáƒ›áƒ®áƒ›áƒáƒ áƒ”ბლის წáƒáƒ¨áƒšáƒ"
+
+#: actions/designadminpanel.php:74
+msgid "Design settings for this StatusNet site."
+msgstr "áƒáƒ› სáƒáƒ˜áƒ¢áƒ˜áƒ¡ დიზáƒáƒ˜áƒœáƒ˜áƒ¡ პáƒáƒ áƒáƒ›áƒ”ტრები"
+
+#: actions/designadminpanel.php:318
+msgid "Invalid logo URL."
+msgstr "ლáƒáƒ’áƒáƒ¡ áƒáƒ áƒáƒ¡áƒ¬áƒáƒ áƒ˜ URL-ი"
+
+#: actions/designadminpanel.php:322
+#, php-format
+msgid "Theme not available: %s."
+msgstr "იერსáƒáƒ®áƒ” áƒáƒ  áƒáƒ áƒ˜áƒ¡ ხელმისáƒáƒ¬áƒ•დáƒáƒ›áƒ˜ %s."
+
+#: actions/designadminpanel.php:426
+msgid "Change logo"
+msgstr "შეცვáƒáƒšáƒ” ლáƒáƒ’áƒ"
+
+#: actions/designadminpanel.php:431
+msgid "Site logo"
+msgstr "სáƒáƒ˜áƒ¢áƒ˜áƒ¡ ლáƒáƒ’áƒ"
+
+#: actions/designadminpanel.php:443
+msgid "Change theme"
+msgstr "შეცვáƒáƒšáƒ” იერსáƒáƒ®áƒ”"
+
+#: actions/designadminpanel.php:460
+msgid "Site theme"
+msgstr "სáƒáƒ˜áƒ¢áƒ˜áƒ¡ იერსáƒáƒ®áƒ”"
+
+#: actions/designadminpanel.php:461
+msgid "Theme for the site."
+msgstr "იერსáƒáƒ®áƒ” áƒáƒ› სáƒáƒ˜áƒ¢áƒ˜áƒ¡áƒ—ვის"
+
+#: actions/designadminpanel.php:467
+msgid "Custom theme"
+msgstr "სáƒáƒ™áƒ£áƒ—áƒáƒ áƒ˜ იერსáƒáƒ®áƒ”"
+
+#: actions/designadminpanel.php:471
+msgid "You can upload a custom StatusNet theme as a .ZIP archive."
+msgstr ""
+"თქვენ შეგიძლიáƒáƒ— áƒáƒ¢áƒ•ირთáƒáƒ— სáƒáƒ™áƒ£áƒ—áƒáƒ áƒ˜ StatusNet–იერსáƒáƒ®áƒ” .ZIP áƒáƒ áƒ¥áƒ˜áƒ•ის სáƒáƒ®áƒ˜áƒ—."
+
+#: actions/designadminpanel.php:486 lib/designsettings.php:101
+msgid "Change background image"
+msgstr "შეცვáƒáƒšáƒ” ფáƒáƒœáƒ£áƒ áƒ˜ სურáƒáƒ—ი"
+
+#: actions/designadminpanel.php:491 actions/designadminpanel.php:574
+#: lib/designsettings.php:178
+msgid "Background"
+msgstr "ფáƒáƒœáƒ˜"
+
+#: actions/designadminpanel.php:496
+#, php-format
+msgid ""
+"You can upload a background image for the site. The maximum file size is %1"
+"$s."
+msgstr ""
+"თქვენ შეგიძლიáƒáƒ— áƒáƒ¢áƒ•უირთáƒáƒ— ფáƒáƒœáƒ£áƒ áƒ˜ სურáƒáƒ—ი áƒáƒ› სáƒáƒ˜áƒ¢áƒ˜áƒ¡áƒ—ვის. ფáƒáƒ˜áƒšáƒ˜áƒ¡ დáƒáƒ¡áƒáƒ¨áƒ•ები "
+"ზáƒáƒ›áƒáƒ %1$s."
+
+#. TRANS: Used as radio button label to add a background image.
+#: actions/designadminpanel.php:527 lib/designsettings.php:139
+msgid "On"
+msgstr "ჩáƒáƒ áƒ—ვáƒ"
+
+#. TRANS: Used as radio button label to not add a background image.
+#: actions/designadminpanel.php:544 lib/designsettings.php:155
+msgid "Off"
+msgstr "გáƒáƒ›áƒáƒ áƒ—ვáƒ"
+
+#: actions/designadminpanel.php:545 lib/designsettings.php:156
+msgid "Turn background image on or off."
+msgstr "ჩáƒáƒ áƒ—ე áƒáƒœ გáƒáƒ›áƒáƒ áƒ—ე ფáƒáƒœáƒ£áƒ áƒ˜ სურáƒáƒ—ის ფუნქციáƒ."
+
+#: actions/designadminpanel.php:550 lib/designsettings.php:161
+msgid "Tile background image"
+msgstr "გáƒáƒáƒ›áƒ áƒáƒ•ლე ფáƒáƒœáƒ£áƒ áƒ˜ სურáƒáƒ—ი"
+
+#: actions/designadminpanel.php:564 lib/designsettings.php:170
+msgid "Change colours"
+msgstr "შეცვáƒáƒšáƒ” ფერები"
+
+#: actions/designadminpanel.php:587 lib/designsettings.php:191
+msgid "Content"
+msgstr "შიგთáƒáƒ•სი"
+
+#: actions/designadminpanel.php:600 lib/designsettings.php:204
+msgid "Sidebar"
+msgstr "გვერდითი პáƒáƒœáƒ”ლი"
+
+#: actions/designadminpanel.php:613 lib/designsettings.php:217
+msgid "Text"
+msgstr "ტექსტი"
+
+#: actions/designadminpanel.php:626 lib/designsettings.php:230
+msgid "Links"
+msgstr "ბმულები"
+
+#: actions/designadminpanel.php:651
+msgid "Advanced"
+msgstr "მეტი პáƒáƒ áƒáƒ›áƒ”ტრები"
+
+#: actions/designadminpanel.php:655
+msgid "Custom CSS"
+msgstr "სáƒáƒ™áƒ£áƒ—áƒáƒ áƒ˜ CSS"
+
+#: actions/designadminpanel.php:676 lib/designsettings.php:247
+msgid "Use defaults"
+msgstr "გáƒáƒ›áƒáƒ˜áƒ§áƒ”ნე პირვáƒáƒœáƒ“ელი მდგáƒáƒ›áƒáƒ áƒ”áƒáƒ‘áƒ"
+
+#: actions/designadminpanel.php:677 lib/designsettings.php:248
+msgid "Restore default designs"
+msgstr "დáƒáƒáƒ‘რუნე პირვáƒáƒœáƒ“ელი დიზáƒáƒ˜áƒœáƒ˜"
+
+#: actions/designadminpanel.php:683 lib/designsettings.php:254
+msgid "Reset back to default"
+msgstr "პირვáƒáƒœáƒ“ელის პáƒáƒ áƒáƒ›áƒ”ტრების დáƒáƒ‘რუნებáƒ"
+
+#. TRANS: Submit button title
+#: actions/designadminpanel.php:685 actions/othersettings.php:126
+#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
+#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
+#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
+#: actions/subscriptions.php:226 actions/tagother.php:154
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: lib/designsettings.php:256 lib/groupeditform.php:202
+msgid "Save"
+msgstr "შენáƒáƒ®áƒ•áƒ"
+
+#: actions/designadminpanel.php:686 lib/designsettings.php:257
+msgid "Save design"
+msgstr "შეინáƒáƒ®áƒ” დიზáƒáƒ˜áƒœáƒ˜"
+
+#: actions/disfavor.php:81
+msgid "This notice is not a favorite!"
+msgstr "ეს შეტყáƒáƒ‘ინებრáƒáƒ  áƒáƒ áƒ˜áƒ¡ რჩეული!"
+
+#: actions/disfavor.php:94
+msgid "Add to favorites"
+msgstr "რჩეულებში დáƒáƒ›áƒáƒ¢áƒ”ბáƒ"
+
+#: actions/doc.php:158
+#, php-format
+msgid "No such document \"%s\""
+msgstr "áƒáƒ¡áƒ”თი დáƒáƒ™áƒ£áƒ›áƒ”ნტი áƒáƒ  áƒáƒ áƒ˜áƒ¡ \"%s\""
+
+#: actions/editapplication.php:54
+msgid "Edit Application"
+msgstr "ჩáƒáƒáƒ¡áƒ¬áƒáƒ áƒ” áƒáƒžáƒšáƒ˜áƒ™áƒáƒªáƒ˜áƒ"
+
+#: actions/editapplication.php:66
+msgid "You must be logged in to edit an application."
+msgstr "áƒáƒžáƒšáƒ˜áƒ™áƒáƒªáƒ˜áƒ˜áƒ¡ ჩáƒáƒ¡áƒáƒ¡áƒ¬áƒáƒ áƒ”ბლáƒáƒ“ სáƒáƒ­áƒ˜áƒ áƒáƒ áƒáƒ•რáƒáƒ¢áƒ˜áƒ–áƒáƒªáƒ˜áƒ."
+
+#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:166
+#: actions/showapplication.php:87
+msgid "No such application."
+msgstr "áƒáƒ¡áƒ”თი áƒáƒžáƒšáƒ˜áƒ™áƒáƒªáƒ˜áƒ áƒáƒ  áƒáƒ áƒ˜áƒ¡."
+
+#: actions/editapplication.php:161
+msgid "Use this form to edit your application."
+msgstr "áƒáƒžáƒšáƒ˜áƒ™áƒáƒªáƒ˜áƒáƒ¨áƒ˜ ცვლილებების შესáƒáƒ¢áƒáƒœáƒáƒ“ გáƒáƒ›áƒáƒ˜áƒ§áƒ”ნეთ ეს ფáƒáƒ áƒ›áƒ."
+
+#: actions/editapplication.php:177 actions/newapplication.php:159
+msgid "Name is required."
+msgstr "სáƒáƒ®áƒ”ლი სáƒáƒ•áƒáƒšáƒ“ებულáƒáƒ."
+
+#: actions/editapplication.php:180 actions/newapplication.php:165
+msgid "Name is too long (max 255 chars)."
+msgstr "სáƒáƒ®áƒ”ლი ძáƒáƒšáƒ˜áƒáƒœ გრძელირ(áƒáƒ áƒáƒ£áƒ›áƒ”ტეს 255 სიმბáƒáƒšáƒ)."
+
+#: actions/editapplication.php:183 actions/newapplication.php:162
+msgid "Name already in use. Try another one."
+msgstr "სáƒáƒ®áƒ”ლი უკვე გáƒáƒ›áƒáƒ§áƒ”ნებულიáƒ. სცáƒáƒ“ე სხვáƒ."
+
+#: actions/editapplication.php:186 actions/newapplication.php:168
+msgid "Description is required."
+msgstr "áƒáƒ¦áƒ¬áƒ”რრსáƒáƒ•áƒáƒšáƒ“ებულáƒáƒ."
+
+#: actions/editapplication.php:194
+msgid "Source URL is too long."
+msgstr "წყáƒáƒ áƒáƒ¡ URL ძáƒáƒšáƒ˜áƒáƒœ გრძელიáƒ."
+
+#: actions/editapplication.php:200 actions/newapplication.php:185
+msgid "Source URL is not valid."
+msgstr "წყáƒáƒ áƒáƒ¡ URL áƒáƒ áƒáƒ¡áƒ¬áƒáƒ áƒ˜áƒ."
+
+#: actions/editapplication.php:203 actions/newapplication.php:188
+msgid "Organization is required."
+msgstr "áƒáƒ áƒ’áƒáƒœáƒ˜áƒ–áƒáƒªáƒ˜áƒ სáƒáƒ•áƒáƒšáƒ“ებულáƒáƒ."
+
+#: actions/editapplication.php:206 actions/newapplication.php:191
+msgid "Organization is too long (max 255 chars)."
+msgstr "áƒáƒ áƒ’áƒáƒœáƒ˜áƒ–áƒáƒªáƒ˜áƒ ძáƒáƒšáƒ˜áƒáƒœ გრძელირ(áƒáƒ áƒáƒ£áƒ›áƒ”ტეს 255 სიმბáƒáƒšáƒ)."
+
+#: actions/editapplication.php:209 actions/newapplication.php:194
+msgid "Organization homepage is required."
+msgstr "áƒáƒ áƒ’áƒáƒœáƒ˜áƒ–áƒáƒªáƒ˜áƒ˜áƒ¡ ვებ. გვერდი სáƒáƒ•áƒáƒšáƒ“ებულáƒáƒ."
+
+#: actions/editapplication.php:258
+msgid "Could not update application."
+msgstr "áƒáƒžáƒšáƒ˜áƒ™áƒáƒªáƒ˜áƒ˜áƒ¡ გáƒáƒœáƒáƒ®áƒšáƒ”ბრვერ მáƒáƒ®áƒ”რხდáƒ."
+
+#: actions/editgroup.php:56
+#, php-format
+msgid "Edit %s group"
+msgstr "%s ჯგუფის რედáƒáƒ¥áƒ¢áƒ˜áƒ áƒ”ბáƒ"
+
+#: actions/editgroup.php:68 actions/grouplogo.php:70 actions/newgroup.php:65
+msgid "You must be logged in to create a group."
+msgstr "გჯუფის შესáƒáƒ¥áƒ›áƒœáƒ”ლáƒáƒ“ სáƒáƒ­áƒ˜áƒ áƒáƒ áƒáƒ•ტáƒáƒ áƒ˜áƒ–áƒáƒªáƒ˜áƒ."
+
+#: 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 "ჯგუფის რედáƒáƒ¥áƒ¢áƒ˜áƒ áƒ”ბისáƒáƒ—ვის სáƒáƒ­áƒ˜áƒ áƒáƒ áƒáƒ“მინის უფლებები."
+
+#: actions/editgroup.php:158
+msgid "Use this form to edit the group."
+msgstr "ჯგუფის რედáƒáƒ¥áƒ¢áƒ˜áƒ áƒ”ბისáƒáƒ—ვის გáƒáƒ›áƒáƒ˜áƒ§áƒ”ნეთ ეს ფáƒáƒ áƒ›áƒ."
+
+#: actions/editgroup.php:205 actions/newgroup.php:145
+#, php-format
+msgid "description is too long (max %d chars)."
+msgstr "áƒáƒ¦áƒ¬áƒ”რრძáƒáƒšáƒ˜áƒáƒœ გრძელირ(áƒáƒ áƒáƒ£áƒ›áƒ”ტეს %d სიმბáƒáƒšáƒ)."
+
+#: actions/editgroup.php:258
+msgid "Could not update group."
+msgstr "ჯგუფის გáƒáƒœáƒáƒ®áƒšáƒ”ბრვერ მáƒáƒ®áƒ”რხდáƒ."
+
+#: actions/editgroup.php:280
+msgid "Options saved."
+msgstr "პáƒáƒ áƒáƒ›áƒ”ტრები შენáƒáƒ®áƒ£áƒšáƒ˜áƒ."
+
+#. TRANS: Title for e-mail settings.
+#: actions/emailsettings.php:61
+msgid "Email settings"
+msgstr "ელ. ფáƒáƒ¡áƒ¢áƒ˜áƒ¡ პáƒáƒ áƒáƒ›áƒ”ტრები"
+
+#. TRANS: E-mail settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/emailsettings.php:76
+#, php-format
+msgid "Manage how you get email from %%site.name%%."
+msgstr "%%site.name%%–სგáƒáƒœ ელ. ფáƒáƒ¡áƒ¢áƒ˜áƒ¡ მიღების მáƒáƒ áƒ—ვáƒ."
+
+#. TRANS: Form legend for e-mail settings form.
+#. TRANS: Field label for e-mail address input in e-mail settings form.
+#: actions/emailsettings.php:106 actions/emailsettings.php:132
+msgid "Email address"
+msgstr "ელ. ფáƒáƒ¡áƒ¢áƒ˜áƒ¡ მისáƒáƒ›áƒáƒ áƒ—ი"
+
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:112
+msgid "Current confirmed email address."
+msgstr "მიმდინáƒáƒ áƒ” დáƒáƒ“áƒáƒ¡áƒ¢áƒ£áƒ áƒ”ბული ელ. ფáƒáƒ¡áƒ¢áƒ˜áƒ¡ მისáƒáƒ›áƒáƒ áƒ—ი."
+
+#. TRANS: Button label to remove a confirmed e-mail address.
+#. TRANS: Button label for removing a set sender e-mail address to post notices from.
+#. TRANS: Button label to remove a confirmed IM address.
+#. TRANS: Button label to remove a confirmed SMS address.
+#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
+#: actions/emailsettings.php:115 actions/emailsettings.php:158
+#: actions/imsettings.php:116 actions/smssettings.php:124
+#: actions/smssettings.php:180
+msgctxt "BUTTON"
+msgid "Remove"
+msgstr "წáƒáƒ¨áƒšáƒ"
+
+#: actions/emailsettings.php:122
+msgid ""
+"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
+"a message with further instructions."
+msgstr ""
+"áƒáƒ› მისáƒáƒ›áƒáƒ áƒ—ის დáƒáƒ¡áƒ¢áƒ£áƒ áƒ˜ მáƒáƒšáƒáƒ“ინშიáƒ. შეáƒáƒ›áƒáƒ¬áƒ›áƒ”თ ფáƒáƒ¡áƒ¢áƒ (დრსპáƒáƒ›áƒ˜áƒ¡ ყუთიც!) "
+"შემდგáƒáƒ›áƒ˜ ინსტრუქციებისáƒáƒ—ვის."
+
+#. TRANS: Button label to cancel an e-mail address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
+#. TRANS: Button label to cancel a SMS address confirmation procedure.
+#. TRANS: Button label
+#: actions/emailsettings.php:127 actions/imsettings.php:131
+#: actions/smssettings.php:137 lib/applicationeditform.php:357
+msgctxt "BUTTON"
+msgid "Cancel"
+msgstr "გáƒáƒ£áƒ¥áƒ›áƒ”ბáƒ"
+
+#. TRANS: Instructions for e-mail address input form.
+#: actions/emailsettings.php:135
+msgid "Email address, like \"UserName@example.org\""
+msgstr "ელ. ფáƒáƒ¡áƒ¢áƒ˜áƒ¡ მისáƒáƒ›áƒáƒ áƒ—ი, რáƒáƒ’áƒáƒ áƒª \"UserName@example.org\""
+
+#. TRANS: Button label for adding an e-mail address in e-mail settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
+#. TRANS: Button label for adding a SMS phone number in SMS settings form.
+#: actions/emailsettings.php:139 actions/imsettings.php:148
+#: actions/smssettings.php:162
+msgctxt "BUTTON"
+msgid "Add"
+msgstr "დáƒáƒ›áƒáƒ¢áƒ”ბáƒ"
+
+#. TRANS: Form legend for incoming e-mail settings form.
+#. TRANS: Form legend for incoming SMS settings form.
+#: actions/emailsettings.php:147 actions/smssettings.php:171
+msgid "Incoming email"
+msgstr "შემáƒáƒ›áƒáƒ•áƒáƒšáƒ˜ ელ. ფáƒáƒ¡áƒ¢áƒ"
+
+#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
+#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
+#: actions/emailsettings.php:155 actions/smssettings.php:178
+msgid "Send email to this address to post new notices."
+msgstr "გáƒáƒáƒ’ზáƒáƒ•ნე ელ. ფáƒáƒ¡áƒ¢áƒ áƒáƒ› მისáƒáƒ›áƒáƒ áƒ—ზე áƒáƒ®áƒáƒšáƒ˜ შეტყáƒáƒ‘ინებების დáƒáƒ¡áƒáƒžáƒáƒ¡áƒ¢áƒáƒ“."
+
+#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming SMS e-mail address input form.
+#: actions/emailsettings.php:164 actions/smssettings.php:186
+msgid "Make a new email address for posting to; cancels the old one."
+msgstr ""
+
+#. TRANS: Button label for adding an e-mail address to send notices from.
+#. TRANS: Button label for adding an SMS e-mail address to send notices from.
+#: actions/emailsettings.php:168 actions/smssettings.php:189
+msgctxt "BUTTON"
+msgid "New"
+msgstr "áƒáƒ®áƒáƒšáƒ˜"
+
+#. TRANS: Form legend for e-mail preferences form.
+#: actions/emailsettings.php:174
+msgid "Email preferences"
+msgstr "ელ. ფáƒáƒ¡áƒ¢áƒ˜áƒ¡ პáƒáƒ áƒáƒ›áƒ”ტრები"
+
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:180
+msgid "Send me notices of new subscriptions through email."
+msgstr ""
+"გáƒáƒ›áƒáƒ›áƒ˜áƒ’ზáƒáƒ•ნე შეტყáƒáƒ‘ინებები áƒáƒ®áƒáƒšáƒ˜ გáƒáƒ›áƒáƒ¬áƒ”რების შესáƒáƒ®áƒ”ბ ელ. ფáƒáƒ¡áƒ¢áƒ˜áƒ¡ სáƒáƒ¨áƒ£áƒáƒšáƒ”ბით."
+
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:186
+msgid "Send me email when someone adds my notice as a favorite."
+msgstr ""
+"გáƒáƒ›áƒáƒ›áƒ˜áƒ’ზáƒáƒ•ნე ელ. წერილი რáƒáƒ“ესáƒáƒª ვინმე ჩემს შეტყáƒáƒ‘ინებáƒáƒ¡ რჩეულებში დáƒáƒ˜áƒ›áƒáƒ¢áƒ”ბს."
+
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:193
+msgid "Send me email when someone sends me a private message."
+msgstr "გáƒáƒ›áƒáƒ›áƒ˜áƒ’ზáƒáƒ•ნე ელ. წერილი რáƒáƒ“ესáƒáƒª ვინმე პირáƒáƒ“ შეტყáƒáƒ‘ინებáƒáƒ¡ მáƒáƒ›áƒ¬áƒ”რს."
+
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:199
+msgid "Send me email when someone sends me an \"@-reply\"."
+msgstr "გáƒáƒ›áƒáƒ›áƒ˜áƒ’ზáƒáƒ•ნე წერილი რáƒáƒ“ესáƒáƒª ვინმე გáƒáƒ›áƒáƒ›áƒ˜áƒ’ზáƒáƒ•ნის \"@-პáƒáƒ¡áƒ£áƒ®áƒ¡\"."
+
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:205
+msgid "Allow friends to nudge me and send me an email."
+msgstr ""
+
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:212
+msgid "I want to post notices by email."
+msgstr "მინდრდáƒáƒ•პáƒáƒ¡áƒ¢áƒ შეტყáƒáƒ‘ინებები ელ. ფáƒáƒ¡áƒ¢áƒ˜áƒ—."
+
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:219
+msgid "Publish a MicroID for my email address."
+msgstr "გáƒáƒ›áƒáƒáƒ¥áƒ•ეყნე MicroID ჩემი ელ. ფáƒáƒ¡áƒ¢áƒ˜áƒ¡ მისáƒáƒ›áƒáƒ áƒ—ისთვის."
+
+#. TRANS: Confirmation message for successful e-mail preferences save.
+#: actions/emailsettings.php:334
+msgid "Email preferences saved."
+msgstr "ელ. ფáƒáƒ¡áƒ¢áƒ˜áƒ¡ პáƒáƒ áƒáƒ›áƒ”ტრები შენáƒáƒ®áƒ£áƒšáƒ˜áƒ."
+
+#. TRANS: Message given saving e-mail address without having provided one.
+#: actions/emailsettings.php:353
+msgid "No email address."
+msgstr " ელ. ფáƒáƒ¡áƒ¢áƒ˜áƒ¡ მისáƒáƒ›áƒáƒ áƒ—ი მითითებული áƒáƒ  áƒáƒ áƒ˜áƒ¡."
+
+#. TRANS: Message given saving e-mail address that not valid.
+#: actions/emailsettings.php:366 actions/register.php:208
+#: actions/siteadminpanel.php:144
+msgid "Not a valid email address."
+msgstr "áƒáƒ áƒáƒ¡áƒ¬áƒáƒ áƒ˜ ელ. ფáƒáƒ¡áƒ¢áƒ˜áƒ¡ მისáƒáƒ›áƒáƒ áƒ—ი."
+
+#. TRANS: Message given saving e-mail address that is already set.
+#: actions/emailsettings.php:370
+msgid "That is already your email address."
+msgstr "ეს უკვე áƒáƒ áƒ˜áƒ¡ თქვენი ელ. ფáƒáƒ¡áƒ¢áƒ˜áƒ¡ მისáƒáƒ›áƒáƒ áƒ—ი."
+
+#. TRANS: Message given saving e-mail address that is already set for another user.
+#: actions/emailsettings.php:374
+msgid "That email address already belongs to another user."
+msgstr "ეს ელ. ფáƒáƒ¡áƒ¢áƒ˜áƒ¡ მისáƒáƒ›áƒáƒ áƒ—ი დáƒáƒ™áƒáƒ•ებულიáƒ."
+
+#. TRANS: Server error thrown on database error adding e-mail confirmation code.
+#. TRANS: Server error thrown on database error adding IM confirmation code.
+#. TRANS: Server error thrown on database error adding SMS confirmation code.
+#: actions/emailsettings.php:391 actions/imsettings.php:348
+#: actions/smssettings.php:373
+msgid "Couldn't insert confirmation code."
+msgstr "დáƒáƒ¡áƒ¢áƒ£áƒ áƒ˜áƒ¡ კáƒáƒ“ის ჩáƒáƒ¡áƒ›áƒ ვერ მáƒáƒ®áƒ”რხდáƒ."
+
+#. TRANS: Message given saving valid e-mail address that is to be confirmed.
+#: actions/emailsettings.php:398
+msgid ""
+"A confirmation code was sent to the email address you added. Check your "
+"inbox (and spam box!) for the code and instructions on how to use it."
+msgstr ""
+"დáƒáƒ¡áƒáƒ“áƒáƒ¡áƒ¢áƒ£áƒ áƒ”ბელი კáƒáƒ“ი გáƒáƒ›áƒáƒ’ზáƒáƒ•ნილირთქვენს მიერ მითითებულ ელ. ფáƒáƒ¡áƒ¢áƒ˜áƒ¡ "
+"მისáƒáƒ›áƒáƒ áƒ—ზე. შეáƒáƒ›áƒáƒ¬áƒ›áƒ”თ სáƒáƒ¤áƒáƒ¡áƒ¢áƒ ყუთი (დრსპáƒáƒ›áƒ˜áƒ¡ ყუთიც!), რáƒáƒ› მიიღáƒáƒ— "
+"დáƒáƒ¡áƒáƒ“áƒáƒ¡áƒ¢áƒ£áƒ áƒ”ბელი კáƒáƒ“ი დრინსტრუქცირგáƒáƒ›áƒáƒ§áƒ”ნებისთვის."
+
+#. TRANS: Message given canceling e-mail address confirmation that is not pending.
+#. TRANS: Message given canceling IM address confirmation that is not pending.
+#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
+#: actions/emailsettings.php:419 actions/imsettings.php:383
+#: actions/smssettings.php:408
+msgid "No pending confirmation to cancel."
+msgstr "გáƒáƒ¡áƒáƒ£áƒ¥áƒ›áƒ”ბელიáƒáƒ áƒáƒ¤áƒ”რიáƒ. áƒáƒ  áƒáƒ áƒ˜áƒ¡ მáƒáƒ›áƒšáƒáƒ“ინე დáƒáƒ¡áƒ¢áƒ£áƒ áƒ˜."
+
+#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
+#: actions/emailsettings.php:424
+msgid "That is the wrong email address."
+msgstr "ეს áƒáƒ áƒáƒ¡áƒ¬áƒáƒ áƒ˜ ელ. ფáƒáƒ¡áƒ¢áƒ˜áƒ¡ მისáƒáƒ›áƒáƒ áƒ—იáƒ."
+
+#. TRANS: Message given after successfully canceling e-mail address confirmation.
+#: actions/emailsettings.php:438
+msgid "Email confirmation cancelled."
+msgstr "ელ. ფáƒáƒ¡áƒ¢áƒ˜áƒ¡ დáƒáƒ“áƒáƒ¡áƒ¢áƒ£áƒ áƒ”ბრგáƒáƒ£áƒ¥áƒ›áƒ”ბულიáƒ."
+
+#. TRANS: Message given trying to remove an e-mail address that is not
+#. TRANS: registered for the active user.
+#: actions/emailsettings.php:458
+msgid "That is not your email address."
+msgstr "ეს áƒáƒ  áƒáƒ áƒ˜áƒ¡ თქვენი ელ. ფáƒáƒ¡áƒ¢áƒ˜áƒ¡ მისáƒáƒ›áƒáƒ áƒ—ი."
+
+#. TRANS: Message given after successfully removing a registered e-mail address.
+#: actions/emailsettings.php:479
+msgid "The email address was removed."
+msgstr "ელ. ფáƒáƒ¡áƒ¢áƒ˜áƒ¡ მისáƒáƒ›áƒáƒ áƒ—ი მáƒáƒ¨áƒáƒ áƒ”ბულიáƒ."
+
+#: actions/emailsettings.php:493 actions/smssettings.php:568
+msgid "No incoming email address."
+msgstr "შემáƒáƒ›áƒáƒ•áƒáƒšáƒ˜ ელ. ფáƒáƒ¡áƒ¢áƒ˜áƒ¡ მისáƒáƒ›áƒáƒ áƒ—ი áƒáƒ  áƒáƒ áƒ˜áƒ¡."
+
+#. TRANS: Server error thrown on database error removing incoming e-mail address.
+#. TRANS: Server error thrown on database error adding incoming e-mail address.
+#: actions/emailsettings.php:504 actions/emailsettings.php:528
+#: actions/smssettings.php:578 actions/smssettings.php:602
+msgid "Couldn't update user record."
+msgstr "მáƒáƒ›áƒ®áƒ›áƒáƒ áƒ”ბლის ჩáƒáƒœáƒáƒ¬áƒ”რის გáƒáƒœáƒáƒ®áƒšáƒ”ბრვერ მáƒáƒ®áƒ”რხდáƒ."
+
+#. TRANS: Message given after successfully removing an incoming e-mail address.
+#: actions/emailsettings.php:508 actions/smssettings.php:581
+msgid "Incoming email address removed."
+msgstr "შემáƒáƒ›áƒáƒ•áƒáƒšáƒ˜ ელ. ფáƒáƒ¡áƒ¢áƒ˜áƒ¡ მისáƒáƒ›áƒáƒ áƒ—ი მáƒáƒ¨áƒáƒ áƒ”ბულიáƒ."
+
+#. TRANS: Message given after successfully adding an incoming e-mail address.
+#: actions/emailsettings.php:532 actions/smssettings.php:605
+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 "პáƒáƒžáƒ£áƒšáƒáƒ áƒ£áƒšáƒ˜ შეტყáƒáƒ‘ინებები, გვერდი %d"
+
+#: 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 ""
+"[დáƒáƒ áƒ”გისტრირდი](%%action.register%%) დრშეიტáƒáƒœáƒ” შეტყáƒáƒ‘ინებრშენს რჩეულებში!"
+
+#: actions/favoritesrss.php:111 actions/showfavorites.php:77
+#: lib/personalgroupnav.php:115
+#, php-format
+msgid "%s's favorite notices"
+msgstr "%s-ს რჩეული შეტყáƒáƒ‘ინებები"
+
+#: actions/favoritesrss.php:115
+#, php-format
+msgid "Updates favored by %1$s on %2$s!"
+msgstr "გáƒáƒœáƒáƒ®áƒšáƒ”ბები áƒáƒ áƒ©áƒ”ული %1$s-ს მიერ %2$s-ზე!"
+
+#: 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 "წáƒáƒ áƒ›áƒáƒ“გენილი მáƒáƒ›áƒ®áƒ›áƒáƒ áƒ”ბლები, გვერდი $d"
+
+#: actions/featured.php:99
+#, php-format
+msgid "A selection of some great users on %s"
+msgstr "ზáƒáƒ’იერთ ჩინებულ მáƒáƒ›áƒ®áƒ›áƒáƒ áƒ”ბელთრგáƒáƒœáƒ§áƒáƒ¤áƒ˜áƒšáƒ”ბრ%s-ზე"
+
+#: actions/file.php:34
+msgid "No notice ID."
+msgstr "შეტყáƒáƒ‘ინების ID áƒáƒ  áƒáƒ áƒ˜áƒ¡."
+
+#: actions/file.php:38
+msgid "No notice."
+msgstr "შეტყáƒáƒ‘ინებრáƒáƒ  áƒáƒ áƒ˜áƒ¡."
+
+#: actions/file.php:42
+msgid "No attachments."
+msgstr "მიმáƒáƒ’რებული დáƒáƒ™áƒ£áƒ›áƒ”ნტი áƒáƒ  áƒáƒ áƒ˜áƒ¡."
+
+#: 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 "დáƒáƒ¨áƒáƒ áƒ”ბული სერვისი OMB პრáƒáƒ¢áƒáƒ™áƒáƒšáƒ˜áƒ¡ უცნáƒáƒ‘ ვერსიáƒáƒ¡ იყენებს."
+
+#: actions/finishremotesubscribe.php:138
+msgid "Error updating remote profile."
+msgstr "შეცდáƒáƒ›áƒ დáƒáƒ¨áƒáƒ áƒ”ბული პრáƒáƒ¤áƒ˜áƒšáƒ˜áƒ¡ გáƒáƒœáƒáƒ®áƒšáƒ”ბისáƒáƒ¡."
+
+#: actions/getfile.php:79
+msgid "No such file."
+msgstr "áƒáƒ¡áƒ”თი ფáƒáƒ˜áƒšáƒ˜ áƒáƒ  áƒáƒ áƒ¡áƒ”ბáƒáƒ‘ს."
+
+#: actions/getfile.php:83
+msgid "Cannot read file."
+msgstr "ფáƒáƒ˜áƒšáƒ˜áƒ¡ წáƒáƒ™áƒ˜áƒ—ხვრვერ ხერხდებáƒ."
+
+#: actions/grantrole.php:62 actions/revokerole.php:62
+msgid "Invalid role."
+msgstr "áƒáƒ áƒáƒ¡áƒ¬áƒáƒ áƒ˜ რáƒáƒšáƒ˜."
+
+#: 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:79
+msgid "No profile specified."
+msgstr "პრáƒáƒ¤áƒ˜áƒšáƒ˜ მითითებული áƒáƒ  áƒáƒ áƒ˜áƒ¡."
+
+#: actions/groupblock.php:76 actions/groupunblock.php:76
+#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
+msgid "No profile with that ID."
+msgstr "áƒáƒ¡áƒ”თი ID-ს მქáƒáƒœáƒ” პრáƒáƒ¤áƒ˜áƒšáƒ˜ ვერ მáƒáƒ˜áƒ«áƒ”ბნáƒ."
+
+#: actions/groupblock.php:81 actions/groupunblock.php:81
+#: actions/makeadmin.php:81
+msgid "No group specified."
+msgstr "ჯგუფი მითითებული áƒáƒ  áƒáƒ áƒ˜áƒ¡."
+
+#: 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:134 actions/groupmembers.php:360
+msgid "Block user from group"
+msgstr "მáƒáƒ›áƒ®áƒ›áƒáƒ áƒ”ბლის გáƒáƒ áƒ˜áƒªáƒ®áƒ•რჯგუფიდáƒáƒœ."
+
+#: actions/groupblock.php:160
+#, 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 ""
+"ნáƒáƒ›áƒ“ვილáƒáƒ“ გნებáƒáƒ•თ გáƒáƒ áƒ˜áƒªáƒ®áƒáƒ— \"%1$s\" ჯგუფიდáƒáƒœ \"%2$s\"? ის გáƒáƒ›áƒáƒ˜áƒ áƒ˜áƒªáƒ®áƒ”ბრ"
+"ჯგუფიდáƒáƒœ, ვეღáƒáƒ  შეძლებს დáƒáƒžáƒáƒ¡áƒ¢áƒ•áƒáƒ¡ დრვეღáƒáƒ  გáƒáƒ¬áƒ”ვრიáƒáƒœáƒ“ებრáƒáƒ› ჯგუფში "
+"მáƒáƒ›áƒáƒ•áƒáƒšáƒ¨áƒ˜áƒª."
+
+#. TRANS: Submit button title for 'No' when blocking a user from a group.
+#: actions/groupblock.php:182
+msgid "Do not block this user from this group"
+msgstr "áƒáƒ  გáƒáƒ áƒ˜áƒªáƒ®áƒ ემ მáƒáƒ›áƒ®áƒ›áƒáƒ áƒ”ბელი áƒáƒ› ჯგუფიდáƒáƒœ"
+
+#. TRANS: Submit button title for 'Yes' when blocking a user from a group.
+#: actions/groupblock.php:189
+msgid "Block this user from this group"
+msgstr "გáƒáƒ áƒ˜áƒªáƒ®áƒ” ეს მáƒáƒ›áƒ®áƒ›áƒáƒ áƒ”ბელი áƒáƒ› ჯგუფიდáƒáƒœ"
+
+#: actions/groupblock.php:206
+msgid "Database error blocking user from group."
+msgstr "მáƒáƒ›áƒ®áƒ›áƒáƒ áƒ”ბლის ჯგუფიდáƒáƒœ გáƒáƒ áƒ˜áƒªáƒ®áƒ•ისáƒáƒ¡ მáƒáƒ®áƒ“რშეცდáƒáƒ›áƒ ბáƒáƒ–áƒáƒ¨áƒ˜."
+
+#: actions/groupbyid.php:74 actions/userbyid.php:70
+msgid "No ID."
+msgstr "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 "ჯგუფის ლáƒáƒ’áƒ"
+
+#: actions/grouplogo.php:153
+#, php-format
+msgid ""
+"You can upload a logo image for your group. The maximum file size is %s."
+msgstr ""
+"თქვენ შეგიძლიáƒáƒ— áƒáƒ¢áƒ•ირთáƒáƒ— ლáƒáƒ’áƒáƒ¡ თქვენი ჯგუფისáƒáƒ—ვის. ფáƒáƒ˜áƒšáƒ˜áƒ¡ დáƒáƒ¡áƒáƒ¨áƒ•ები ზáƒáƒ›áƒáƒ %s."
+
+#: 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 "ლáƒáƒ’რგáƒáƒœáƒáƒ®áƒšáƒ“áƒ."
+
+#: actions/grouplogo.php:401
+msgid "Failed updating logo."
+msgstr "ლáƒáƒ’áƒáƒ¡ გáƒáƒœáƒáƒ®áƒšáƒ”ბრვერ მáƒáƒ®áƒ”რხდáƒ."
+
+#: actions/groupmembers.php:100 lib/groupnav.php:92
+#, php-format
+msgid "%s group members"
+msgstr "%s ჯგუფის წევრი"
+
+#: actions/groupmembers.php:103
+#, php-format
+msgid "%1$s group members, page %2$d"
+msgstr "%1$s ჯგუფის წევრი, გვერდი %2$d"
+
+#: 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 "áƒáƒ“მინი"
+
+#: actions/groupmembers.php:392 lib/blockform.php:69
+msgid "Block"
+msgstr "ბლáƒáƒ™áƒ˜áƒ áƒ”ბáƒ"
+
+#: actions/groupmembers.php:487
+msgid "Make user an admin of the group"
+msgstr "მიáƒáƒœáƒ˜áƒ­áƒ” მáƒáƒ›áƒ®áƒ›áƒáƒ áƒ”ბელს ჯგუფის áƒáƒ“მინáƒáƒ‘áƒ"
+
+#: actions/groupmembers.php:519
+msgid "Make Admin"
+msgstr "მიáƒáƒœáƒ˜áƒ­áƒ” áƒáƒ“მინáƒáƒ‘áƒ"
+
+#: actions/groupmembers.php:519
+msgid "Make this user an admin"
+msgstr "მიáƒáƒœáƒ˜áƒ­áƒ” áƒáƒ› მáƒáƒ›áƒ®áƒ›áƒáƒ áƒ”ბელს áƒáƒ“მინáƒáƒ‘áƒ"
+
+#. TRANS: Message is used as link title. %s is a user nickname.
+#. TRANS: Title in atom group notice feed. %s is a group name.
+#. TRANS: Title in atom user notice feed. %s is a user name.
+#: actions/grouprss.php:139 actions/userrss.php:94
+#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:69
+#, php-format
+msgid "%s timeline"
+msgstr "%s-ის ნáƒáƒ™áƒáƒ“ი"
+
+#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
+#: actions/grouprss.php:142
+#, php-format
+msgid "Updates from members of %1$s on %2$s!"
+msgstr "%1$s-ის წევრების გáƒáƒœáƒáƒ®áƒšáƒ”ბები %2$s-ზე!"
+
+#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+msgid "Groups"
+msgstr "ჯგუფები"
+
+#: actions/groups.php:64
+#, php-format
+msgid "Groups, page %d"
+msgstr "ჯგუფები, გვერდი $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 ""
+"%%%%site.name%%%%-ის ჯგუფები გáƒáƒ«áƒšáƒ”ვთ სáƒáƒ¨áƒ£áƒáƒšáƒ”ბáƒáƒ¡ მáƒáƒ«áƒ”ბნáƒáƒ— დრესáƒáƒ£áƒ‘რáƒáƒ— მსგáƒáƒ•სი "
+"ინტერესების მქáƒáƒœáƒ” ხáƒáƒšáƒ®áƒ¡. ჯგუფში გáƒáƒ”რთიáƒáƒœáƒ”ბის შემდეგ, შეძლებთ მიწერáƒáƒ— "
+"შეტყáƒáƒ‘ინებები ჯგუფის სხვრწევრებს áƒáƒ¡áƒ”თი სინტáƒáƒ¥áƒ¡áƒ˜áƒ— - \"!ჯგუფის სáƒáƒ®áƒ”ლი\". ვერ "
+"ხედáƒáƒ•თ მáƒáƒ¡áƒáƒ¬áƒáƒœ ჯგუფს? სცáƒáƒ“ეთ [ძიებáƒ](%%%%action.groupsearch%%%%) áƒáƒœ "
+"[შექმენით სáƒáƒ™áƒ£áƒ—áƒáƒ áƒ˜!](%%%%action.newgroup%%%%)"
+
+#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
+msgid "Create a new group"
+msgstr "შექმენი áƒáƒ®áƒáƒšáƒ˜ ჯგუფი"
+
+#: 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 ""
+"მáƒáƒ«áƒ”ბნეთ ჯგუფები %%site.name%%-ზე მáƒáƒ—ი სáƒáƒ®áƒ”ლის, áƒáƒ“გილის, áƒáƒœ áƒáƒ¦áƒ¬áƒ”რის "
+"მიხედვით. გáƒáƒ›áƒáƒ§áƒáƒ•ით ფრáƒáƒ–ები სივრცით; სáƒáƒ«áƒ˜áƒ”ბრფრáƒáƒ–რ3 სიმბáƒáƒšáƒáƒ–ე მეტი უნდრ"
+"იყáƒáƒ¡."
+
+#: actions/groupsearch.php:58
+msgid "Group search"
+msgstr "ჯგუფის ძიებáƒ"
+
+#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
+msgid "No results."
+msgstr "უშედეგáƒáƒ“."
+
+#: 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 ""
+"თუ ვერ პáƒáƒ£áƒšáƒáƒ‘თ ჯგუფს რáƒáƒ›áƒ”ლსáƒáƒª ეძებთ, შეგიძლიáƒáƒ— თვითáƒáƒœ [შექმნáƒáƒ—](%%action."
+"newgroup%%)."
+
+#: actions/groupsearch.php:85
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and [create the group](%%"
+"action.newgroup%%) yourself!"
+msgstr ""
+"[დáƒáƒáƒ áƒ”გისტრირეთ áƒáƒœáƒ’áƒáƒ áƒ˜áƒ¨áƒ˜](%%action.register%%) დრ[შექმენით ჯგუფი](%%action."
+"newgroup%%) თვითáƒáƒœ!"
+
+#: 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 "შეცდáƒáƒ›áƒ ბლáƒáƒ™áƒ˜áƒ¡ მáƒáƒ®áƒ¡áƒœáƒ˜áƒ¡áƒáƒ¡."
+
+#. TRANS: Title for instance messaging settings.
+#: actions/imsettings.php:60
+msgid "IM settings"
+msgstr "IM პáƒáƒ áƒáƒ›áƒ”ტრები"
+
+#. TRANS: Instant messaging settings page instructions.
+#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
+#. TRANS: the order and formatting of link text and link should remain unchanged.
+#: actions/imsettings.php:74
+#, php-format
+msgid ""
+"You can send and receive notices through Jabber/GTalk [instant messages](%%"
+"doc.im%%). Configure your address and settings below."
+msgstr ""
+"თქვენ შეგიძლიáƒáƒ— მიიღáƒáƒ— დრგáƒáƒáƒ’ზáƒáƒ•ნáƒáƒ— შეტყáƒáƒ‘ინებები Jabber/GTalk [ჩეთით](%%"
+"doc.im%%). მáƒáƒ›áƒáƒ áƒ—ეთ თქვენი მისáƒáƒ›áƒáƒ áƒ—ი დრპáƒáƒ áƒáƒ›áƒ”ტრები ქვევით."
+
+#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#: actions/imsettings.php:94
+msgid "IM is not available."
+msgstr "IM áƒáƒ  áƒáƒ áƒ˜áƒ¡ ხელმისáƒáƒ¬áƒ•დáƒáƒ›áƒ˜."
+
+#. TRANS: Form legend for IM settings form.
+#. TRANS: Field label for IM address input in IM settings form.
+#: actions/imsettings.php:106 actions/imsettings.php:136
+msgid "IM address"
+msgstr "IM მისáƒáƒ›áƒáƒ áƒ—ი"
+
+#: actions/imsettings.php:113
+msgid "Current confirmed Jabber/GTalk address."
+msgstr "მიმდინáƒáƒ áƒ” დáƒáƒ“áƒáƒ¡áƒ¢áƒ£áƒ áƒ”ბული Jabber/GTalk მისáƒáƒ›áƒáƒ áƒ—ი."
+
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:124
+#, 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 ""
+"áƒáƒ› მისáƒáƒ›áƒáƒ áƒ—ის დáƒáƒ“áƒáƒ¡áƒ¢áƒ£áƒ áƒ”ბრმáƒáƒšáƒáƒ“ინშიáƒ. შეáƒáƒ›áƒáƒ¬áƒ›áƒ”თ თქვენი Jabber/GTalk áƒáƒœáƒ’áƒáƒ áƒ˜áƒ¨áƒ˜ "
+"შეტყáƒáƒ‘ინებისáƒáƒ—ვის შემდგáƒáƒ›áƒ˜ ინსტრუქციებით. (დáƒáƒ˜áƒ›áƒáƒ¢áƒ”თ %s მეგáƒáƒ‘რების სიáƒáƒ¨áƒ˜?)"
+
+#. TRANS: IM address input field instructions in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:140
+#, 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 ""
+"Jabber áƒáƒœ GTalk მისáƒáƒ›áƒáƒ áƒ—ი, რáƒáƒ’áƒáƒ áƒª \"UserName@example.org\". პირველ რიგში "
+"დáƒáƒ áƒ¬áƒ›áƒ£áƒœáƒ“ით, რáƒáƒ› დáƒáƒ˜áƒ›áƒáƒ¢áƒ”თ %s მეგáƒáƒ‘რების სიáƒáƒ¨áƒ˜ თქვენს IM კლიენტში áƒáƒœ GTalk-ში."
+
+#. TRANS: Form legend for IM preferences form.
+#: actions/imsettings.php:155
+msgid "IM preferences"
+msgstr "IM პáƒáƒ áƒáƒ›áƒ”ტრები"
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:160
+msgid "Send me notices through Jabber/GTalk."
+msgstr "გáƒáƒ›áƒáƒ›áƒ˜áƒ’ზáƒáƒ•ნე შეტყáƒáƒ‘ინებები Jabber/GTalk-ის მეშვეáƒáƒ‘ით."
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:166
+msgid "Post a notice when my Jabber/GTalk status changes."
+msgstr "დáƒáƒžáƒáƒ¡áƒ¢áƒ” შეტყáƒáƒ‘ინებáƒ, რáƒáƒ“ესáƒáƒª ჩემი Jabber/GTalk სტáƒáƒ¢áƒ£áƒ¡áƒ˜ შეიცვლებáƒ."
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:172
+msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+msgstr ""
+"გáƒáƒ›áƒáƒ›áƒ˜áƒ’ზáƒáƒ•ნე პáƒáƒ¡áƒ£áƒ®áƒ”ბი Jabber/GTalk-ით ხáƒáƒšáƒ®áƒ˜áƒ¡áƒ’áƒáƒœ, რáƒáƒ›áƒšáƒ—რმიმდევáƒáƒ áƒ˜ áƒáƒ  ვáƒáƒ ."
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:179
+msgid "Publish a MicroID for my Jabber/GTalk address."
+msgstr "გáƒáƒ›áƒáƒáƒ¥áƒ•ეყნე MicroID ჩემი Jabber/GTalk მისáƒáƒ›áƒáƒ áƒ—ისთვის."
+
+#. TRANS: Confirmation message for successful IM preferences save.
+#: actions/imsettings.php:287 actions/othersettings.php:180
+msgid "Preferences saved."
+msgstr "პáƒáƒ áƒáƒ›áƒ”ტრები შენáƒáƒ®áƒ£áƒšáƒ˜áƒ."
+
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:309
+msgid "No Jabber ID."
+msgstr "Jabber ID უცნáƒáƒ‘იáƒ."
+
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:317
+msgid "Cannot normalize that Jabber ID"
+msgstr "Jabber ID-ს ნáƒáƒ áƒ›áƒáƒšáƒ˜áƒ–áƒáƒªáƒ˜áƒ ვერ ხერხდებáƒ"
+
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:322
+msgid "Not a valid Jabber ID"
+msgstr "áƒáƒ áƒáƒ¡áƒ¬áƒáƒ áƒ˜ Jabber ID"
+
+#. TRANS: Message given saving IM address that is already set.
+#: actions/imsettings.php:326
+msgid "That is already your Jabber ID."
+msgstr "ეს უკვე áƒáƒ áƒ˜áƒ¡ თქვენი Jabber ID."
+
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:330
+msgid "Jabber ID already belongs to another user."
+msgstr "Jabber ID უკვე ეკუთვნის სხვრმáƒáƒ›áƒ®áƒ›áƒáƒ áƒ”ბელს."
+
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:358
+#, php-format
+msgid ""
+"A confirmation code was sent to the IM address you added. You must approve %"
+"s for sending messages to you."
+msgstr ""
+"დáƒáƒ¡áƒ¢áƒ£áƒ áƒ˜áƒ¡ კáƒáƒ“ი გáƒáƒ›áƒáƒ’ზáƒáƒ•ნილირთქვენს IM მისáƒáƒ›áƒáƒ áƒ—ზე. თქვენ უნდრმისცეთ უფლებრ%"
+"s-ს გáƒáƒ›áƒáƒ’იგზáƒáƒ•ნáƒáƒ— შეტყáƒáƒ‘ინებები."
+
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:388
+msgid "That is the wrong IM address."
+msgstr "ეს áƒáƒ áƒáƒ¡áƒ¬áƒáƒ áƒ˜ IM მისáƒáƒ›áƒáƒ áƒ—იáƒ."
+
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:397
+msgid "Couldn't delete IM confirmation."
+msgstr "IM დáƒáƒ¡áƒ¢áƒ£áƒ áƒ˜áƒ¡ წáƒáƒ¨áƒšáƒ ვერ მáƒáƒ®áƒ”რხდáƒ."
+
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:402
+msgid "IM confirmation cancelled."
+msgstr "IM დáƒáƒ¡áƒ¢áƒ£áƒ áƒ˜ გáƒáƒ£áƒ¥áƒ›áƒ“áƒ."
+
+#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: registered for the active user.
+#: actions/imsettings.php:424
+msgid "That is not your Jabber ID."
+msgstr "ეს áƒáƒ  áƒáƒ áƒ˜áƒ¡ თქვენი Jabber ID"
+
+#. TRANS: Message given after successfully removing a registered IM address.
+#: actions/imsettings.php:447
+msgid "The IM address was removed."
+msgstr "IM მისáƒáƒ›áƒáƒ áƒ—ი მáƒáƒ¨áƒáƒ áƒ”ბულიáƒ."
+
+#: actions/inbox.php:59
+#, php-format
+msgid "Inbox for %1$s - page %2$d"
+msgstr "%1$s-ის შემáƒáƒ›áƒáƒ•áƒáƒšáƒ˜ ფáƒáƒ¡áƒ¢áƒ - გვერდი %2$d"
+
+#: actions/inbox.php:62
+#, php-format
+msgid "Inbox for %s"
+msgstr "%s-ის შემáƒáƒ›áƒáƒ•áƒáƒšáƒ˜ ფáƒáƒ¡áƒ¢áƒ"
+
+#: 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 "%s-ში სხვრმáƒáƒ›áƒ®áƒ›áƒáƒ áƒ”ბლების დáƒáƒ¡áƒáƒžáƒáƒ¢áƒ˜áƒ¯áƒ”ბლáƒáƒ“ სáƒáƒ¬áƒ˜áƒ áƒáƒ áƒáƒ•ტáƒáƒ áƒ˜áƒ–áƒáƒªáƒ˜áƒ."
+
+#: actions/invite.php:72
+#, php-format
+msgid "Invalid email address: %s"
+msgstr "áƒáƒ áƒáƒ¡áƒ¬áƒáƒ áƒ˜ ელექტრáƒáƒœáƒ£áƒšáƒ˜ ფáƒáƒ¡áƒ¢áƒ˜áƒ¡ მისáƒáƒ›áƒáƒ áƒ—ი: %s"
+
+#: actions/invite.php:110
+msgid "Invitation(s) sent"
+msgstr "მáƒáƒ¬áƒ•ევáƒ/მáƒáƒ¬áƒ•ევები გáƒáƒ’ზáƒáƒ•ნილიáƒ"
+
+#: actions/invite.php:112
+msgid "Invite new users"
+msgstr "დáƒáƒžáƒáƒ¢áƒ˜áƒ¯áƒ” áƒáƒ®áƒáƒšáƒ˜ მáƒáƒ›áƒ®áƒ›áƒáƒ áƒ”ბლები"
+
+#: actions/invite.php:128
+msgid "You are already subscribed to these users:"
+msgstr "თქვენ უკვე გáƒáƒ›áƒáƒ¬áƒ”რილი გáƒáƒ¥áƒ•თ áƒáƒ› მáƒáƒ›áƒ®áƒ›áƒáƒ áƒ”ბლების გáƒáƒœáƒáƒ®áƒšáƒ”ბები:"
+
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:430
+#, 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 "ელ. ფáƒáƒ¡áƒ¢áƒ˜áƒ¡ მისáƒáƒ›áƒáƒ áƒ—ები"
+
+#: actions/invite.php:189
+msgid "Addresses of friends to invite (one per line)"
+msgstr "დáƒáƒ¡áƒáƒžáƒáƒ¢áƒ˜áƒŸáƒ”ბელი მáƒáƒ’áƒáƒ‘რების მისáƒáƒ›áƒáƒ áƒ—ები (თითრხáƒáƒ–ზე თითáƒ)"
+
+#: actions/invite.php:192
+msgid "Personal message"
+msgstr "პირáƒáƒ“ი შეტყáƒáƒ‘ინებáƒ"
+
+#: 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 "გáƒáƒ’ზáƒáƒ•ნáƒ"
+
+#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
+#: actions/invite.php:228
+#, php-format
+msgid "%1$s has invited you to join them on %2$s"
+msgstr "%1$s-მრდáƒáƒ’პáƒáƒ¢áƒ˜áƒŸáƒáƒ— რáƒáƒ› შეუერთდეთ მáƒáƒ¡ %2$s-ზე"
+
+#. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
+#: actions/invite.php:231
+#, 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 ""
+"%1$s-მრდáƒáƒ’პáƒáƒ¢áƒ˜áƒŸáƒáƒ— რáƒáƒ› გáƒáƒ”რთიენდეთ %2$s-ზე (%3$s).\n"
+"\n"
+"%2$s áƒáƒ áƒ˜áƒ¡ მიკრáƒ-ბლáƒáƒ’ინგის სერვისი, რáƒáƒ›áƒ”ლიც შესáƒáƒ«áƒšáƒ”ბლáƒáƒ‘áƒáƒ¡ გáƒáƒ«áƒšáƒ”ვთ სáƒáƒ¥áƒ›áƒ˜áƒ¡ "
+"კურსში იყáƒáƒ— თქვენს ნáƒáƒªáƒœáƒáƒ‘ებთáƒáƒœ დრსáƒáƒ˜áƒœáƒ¢áƒ”რესრხáƒáƒšáƒ®áƒ—áƒáƒœ.\n"
+"\n"
+"თქვენ შეგიძლიáƒáƒ— გáƒáƒ£áƒ–იáƒáƒ áƒáƒ— სიáƒáƒ®áƒšáƒ”ები თქვენს შესáƒáƒ®áƒ”ბ, თქვენი áƒáƒ–რები, áƒáƒœ თქვენი "
+"ინტერნეტ-ცხáƒáƒ•რებრხáƒáƒšáƒ®áƒ¡ ვინც გიცნáƒáƒ‘თ. %2$s სáƒáƒ£áƒ™áƒ”თესáƒáƒ áƒáƒ®áƒáƒšáƒ˜ áƒáƒ“áƒáƒ›áƒ˜áƒáƒœáƒ”ბის "
+"გáƒáƒ¡áƒáƒªáƒœáƒáƒ‘áƒáƒ—, ვინც იზიáƒáƒ áƒ”ბენ თქვენს ინტერესებს.\n"
+"\n"
+"%1$s გწერთ:\n"
+"\n"
+"%4$s\n"
+"\n"
+"თქვენ შეგიძლიáƒáƒ— ნáƒáƒ®áƒáƒ— %1$s-ის პრáƒáƒ¤áƒ˜áƒšáƒ˜áƒ¡ გვერდი %2$s-ზე áƒáƒ¥:\n"
+"\n"
+"%5$s\n"
+"\n"
+"თუ გსურთ áƒáƒ› სერვისით სáƒáƒ áƒ’ებლáƒáƒ‘áƒ, მáƒáƒ¨áƒ˜áƒœ დáƒáƒáƒ¬áƒ™áƒáƒžáƒ£áƒœáƒ”თ ქვევით მáƒáƒªáƒ”მულ ლინკზე "
+"მáƒáƒ¬áƒ•ევის მისáƒáƒ¦áƒ”ბáƒáƒ“.\n"
+"\n"
+"%6$s\n"
+"\n"
+"თუ áƒáƒ áƒ, მáƒáƒ¨áƒ˜áƒœ შეგიძლიáƒáƒ— áƒáƒ  მიáƒáƒ¥áƒªáƒ˜áƒáƒ— ყურáƒáƒ“ღებრáƒáƒ› წერილს. გმáƒáƒ“ლáƒáƒ‘თ "
+"მáƒáƒ—მინებისთვის დრდáƒáƒ—მáƒáƒ‘ილი დრáƒáƒ¡áƒ—ვის.\n"
+"\n"
+"პáƒáƒ¢áƒ˜áƒ•ისცემით, %2$s\n"
+
+#: actions/joingroup.php:60
+msgid "You must be logged in to join a group."
+msgstr "გჯუფში გáƒáƒ¬áƒ”ვრიáƒáƒœáƒ”ბისáƒáƒ—ვის სáƒáƒ­áƒ˜áƒ áƒáƒ áƒáƒ•ტáƒáƒ áƒ˜áƒ–áƒáƒªáƒ˜áƒ."
+
+#: actions/joingroup.php:88 actions/leavegroup.php:88
+msgid "No nickname or ID."
+msgstr "მეტსáƒáƒ®áƒ”ლი áƒáƒœ ID უცნáƒáƒ‘იáƒ."
+
+#: actions/joingroup.php:141
+#, php-format
+msgid "%1$s joined group %2$s"
+msgstr "%1$s გáƒáƒ¬áƒ”ვრიáƒáƒœáƒ“რჯგუფში %2$s"
+
+#: actions/leavegroup.php:60
+msgid "You must be logged in to leave a group."
+msgstr "გჯუფის დáƒáƒ¢áƒáƒ•ებისáƒáƒ—ვის სáƒáƒ­áƒ˜áƒ áƒáƒ áƒáƒ•ტáƒáƒ áƒ˜áƒ–áƒáƒªáƒ˜áƒ."
+
+#. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
+#: actions/leavegroup.php:100 lib/command.php:389
+msgid "You are not a member of that group."
+msgstr "თვენ áƒáƒ  ხáƒáƒ áƒ— áƒáƒ› ჯგუფის წევრი."
+
+#: actions/leavegroup.php:137
+#, php-format
+msgid "%1$s left group %2$s"
+msgstr "%1$s-მრდáƒáƒ¢áƒáƒ•რჯგუფი %2$s"
+
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
+msgid "Already logged in."
+msgstr "უკვე áƒáƒ•ტáƒáƒ áƒ˜áƒ–ირებული ხáƒáƒ áƒ—."
+
+#: actions/login.php:148
+msgid "Incorrect username or password."
+msgstr "áƒáƒ áƒáƒ¡áƒ¬áƒáƒ áƒ˜ მáƒáƒ›áƒ®áƒ›áƒáƒ áƒ”ბლის სáƒáƒ®áƒ”ლი áƒáƒœ პáƒáƒ áƒáƒšáƒ˜."
+
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
+msgid "Login"
+msgstr "შესვლáƒ"
+
+#: actions/login.php:249
+msgid "Login to site"
+msgstr "სáƒáƒ˜áƒ¢áƒ–ე შესვლáƒ"
+
+#: actions/login.php:258 actions/register.php:485
+msgid "Remember me"
+msgstr "დáƒáƒ›áƒ˜áƒ›áƒáƒ®áƒ¡áƒáƒ•რე"
+
+#: actions/login.php:259 actions/register.php:487
+msgid "Automatically login in the future; not for shared computers!"
+msgstr "მáƒáƒ›áƒáƒ•áƒáƒšáƒ¨áƒ˜ áƒáƒ•ტáƒáƒ›áƒáƒ¢áƒ£áƒ áƒáƒ“ შემიყვáƒáƒœáƒ”; áƒáƒ áƒ სáƒáƒ–იáƒáƒ áƒ კáƒáƒ›áƒžáƒ˜áƒ£áƒ¢áƒ”რებისáƒáƒ—ვის!"
+
+#: actions/login.php:269
+msgid "Lost or forgotten password?"
+msgstr "დáƒáƒ™áƒáƒ áƒ’ეთ áƒáƒœ დáƒáƒ’áƒáƒ•იწყდáƒáƒ— პáƒáƒ áƒáƒšáƒ˜?"
+
+#: actions/login.php:288
+msgid ""
+"For security reasons, please re-enter your user name and password before "
+"changing your settings."
+msgstr ""
+"უსáƒáƒ¤áƒ áƒ—ხáƒáƒ”ბის მიზნებისáƒáƒ—ვის, გთხáƒáƒ•თ შეიყვáƒáƒœáƒáƒ— თქვენი მáƒáƒ›áƒ®. სáƒáƒ®áƒ”ლი დრპáƒáƒ áƒáƒšáƒ˜ "
+"პáƒáƒ áƒáƒ›áƒ”ტრების შეცვლáƒáƒ›áƒ“ე."
+
+#: actions/login.php:292
+msgid "Login with your username and password."
+msgstr "შედი სáƒáƒ™áƒ£áƒ—áƒáƒ áƒ˜ მáƒáƒ›áƒ®. სáƒáƒ®áƒ”ლით დრპáƒáƒ áƒáƒšáƒ˜áƒ—."
+
+#: actions/login.php:295
+#, php-format
+msgid ""
+"Don't have a username yet? [Register](%%action.register%%) a new account."
+msgstr ""
+"ჯერ კიდევ áƒáƒ  გáƒáƒ¥áƒ•თ მáƒáƒ›áƒ®. სáƒáƒ®áƒ”ლი? [დáƒáƒáƒ áƒ”გისტრირე](%%action.register%%) áƒáƒ®áƒáƒšáƒ˜ "
+"áƒáƒœáƒ’áƒáƒ áƒ˜áƒ¨áƒ˜."
+
+#: actions/makeadmin.php:92
+msgid "Only an admin can make another user an admin."
+msgstr "მხáƒáƒšáƒáƒ“ áƒáƒ“მინს შეძლირსხვრმáƒáƒ›áƒ®áƒ›áƒáƒ áƒ”ბელი áƒáƒ“მინáƒáƒ“ áƒáƒ¥áƒªáƒ˜áƒáƒ¡."
+
+#: actions/makeadmin.php:96
+#, php-format
+msgid "%1$s is already an admin for group \"%2$s\"."
+msgstr "%1$s უკვე áƒáƒ áƒ˜áƒ¡ \"%2$s\" ჯგუფის áƒáƒ“მინი."
+
+#: actions/makeadmin.php:133
+#, php-format
+msgid "Can't get membership record for %1$s in group %2$s."
+msgstr "%1$s–ის წევრáƒáƒ‘ის ჩáƒáƒœáƒáƒ¬áƒ”რის გáƒáƒ›áƒáƒ—ხáƒáƒ•ნრ%2$s ჯგუფიდáƒáƒœ ვერ მáƒáƒ®áƒ”რხდáƒ."
+
+#: actions/makeadmin.php:146
+#, php-format
+msgid "Can't make %1$s an admin for group %2$s."
+msgstr "%1$s–ის %2$s ჯგუფის áƒáƒ“მინáƒáƒ“ ქცევრვერ ხერხდებáƒ."
+
+#: actions/microsummary.php:69
+msgid "No current status."
+msgstr "მიმდინáƒáƒ áƒ” სტáƒáƒ¢áƒ£áƒ¡áƒ˜ áƒáƒ  áƒáƒ áƒ˜áƒ¡."
+
+#: actions/newapplication.php:52
+msgid "New Application"
+msgstr "áƒáƒ®áƒáƒšáƒ˜ áƒáƒžáƒšáƒ˜áƒ™áƒáƒªáƒ˜áƒ"
+
+#: 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 "წყáƒáƒ áƒáƒ¡ URL სáƒáƒ•áƒáƒšáƒ“ებულáƒáƒ."
+
+#: actions/newapplication.php:258 actions/newapplication.php:267
+msgid "Could not create application."
+msgstr "áƒáƒžáƒšáƒ˜áƒ™áƒáƒªáƒ˜áƒ˜áƒ¡ შექმნრვერ მáƒáƒ®áƒ”რხდáƒ."
+
+#: actions/newgroup.php:53
+msgid "New group"
+msgstr "áƒáƒ®áƒáƒšáƒ˜ ჯგუფი"
+
+#: 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 "áƒáƒ®áƒáƒšáƒ˜ შეტყáƒáƒ‘ინებáƒ"
+
+#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:502
+msgid "You can't send a message to this user."
+msgstr "áƒáƒ› მáƒáƒ›áƒ®áƒ›áƒáƒ áƒ”ბელს შეტყáƒáƒ‘ინებáƒáƒ¡ ვერ გáƒáƒ£áƒ’ზáƒáƒ•ნი."
+
+#. TRANS: Command exception text shown when trying to send a direct message to another user without content.
+#. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
+#: actions/newmessage.php:144 actions/newnotice.php:138 lib/command.php:481
+#: lib/command.php:582
+msgid "No content!"
+msgstr "შიგთáƒáƒ•სი áƒáƒ  áƒáƒ áƒ˜áƒ¡!"
+
+#: actions/newmessage.php:158
+msgid "No recipient specified."
+msgstr "მიმღები მითითებული áƒáƒ  áƒáƒ áƒ˜áƒ¡."
+
+#. TRANS: Error text shown when trying to send a direct message to self.
+#: actions/newmessage.php:164 lib/command.php:506
+msgid ""
+"Don't send a message to yourself; just say it to yourself quietly instead."
+msgstr "ნუ გáƒáƒ£áƒ’ზáƒáƒ•ნი შეტყáƒáƒ‘ინებáƒáƒ¡ სáƒáƒ™áƒ£áƒ—áƒáƒ  თáƒáƒ•ს; უბრáƒáƒšáƒáƒ“ ჩუმáƒáƒ“ ჩáƒáƒ£áƒ©áƒ£áƒ áƒ©áƒ£áƒšáƒ”."
+
+#: actions/newmessage.php:181
+msgid "Message sent"
+msgstr "შეტყáƒáƒ‘ინებრგáƒáƒ’ზáƒáƒ•ნილიáƒ"
+
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: actions/newmessage.php:185 lib/command.php:514
+#, php-format
+msgid "Direct message to %s sent."
+msgstr "პირდáƒáƒžáƒ˜áƒ áƒ˜ შეტყáƒáƒ‘ინებრგáƒáƒ”გზáƒáƒ•ნრ%s–ს."
+
+#: actions/newmessage.php:210 actions/newnotice.php:261 lib/channel.php:189
+msgid "Ajax Error"
+msgstr "Ajax შეცდáƒáƒ›áƒ"
+
+#: actions/newnotice.php:69
+msgid "New notice"
+msgstr "áƒáƒ®áƒáƒšáƒ˜ შეტყáƒáƒ‘ინებáƒ"
+
+#: actions/newnotice.php:227
+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 ""
+"მáƒáƒ«áƒ”ბნეთ შეტყáƒáƒ‘ინებები %%site.name%%-ზე მáƒáƒ—ი შიგთáƒáƒ•სის მიხედვით. გáƒáƒ›áƒáƒ§áƒáƒ•ით "
+"ფრáƒáƒ–ები სივრცით; სáƒáƒ«áƒ˜áƒ”ბრფრáƒáƒ–რ3 სიმბáƒáƒšáƒáƒ–ე მეტი უნდრიყáƒáƒ¡."
+
+#: actions/noticesearch.php:78
+msgid "Text search"
+msgstr "ტექსტური ძიებáƒ"
+
+#: actions/noticesearch.php:91
+#, php-format
+msgid "Search results for \"%1$s\" on %2$s"
+msgstr "\"%1$s\"–ს ძიების შედეგები %2$s–ზე"
+
+#: actions/noticesearch.php:121
+#, php-format
+msgid ""
+"Be the first to [post on this topic](%%%%action.newnotice%%%%?"
+"status_textarea=%s)!"
+msgstr ""
+"პირველმრ[დáƒáƒžáƒáƒ¡áƒ¢áƒ” áƒáƒ› თემáƒáƒ–ე](%%%%action.newnotice%%%%?status_textarea=%s)!"
+
+#: actions/noticesearch.php:124
+#, php-format
+msgid ""
+"Why not [register an account](%%%%action.register%%%%) and be the first to "
+"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
+msgstr ""
+"[დáƒáƒ áƒ”გისტრირდი](%%%%action.register%%%%) დრიყáƒáƒ•ი პირველი ვინც áƒáƒ› თემáƒáƒ–ე "
+"[დáƒáƒžáƒáƒ¡áƒ¢áƒáƒ•ს](%%%%action.newnotice%%%%?status_textarea=%s)!"
+
+#: actions/noticesearchrss.php:96
+#, php-format
+msgid "Updates with \"%s\""
+msgstr "გáƒáƒœáƒáƒ®áƒšáƒ”ბები \"%s\"–თ"
+
+#: actions/noticesearchrss.php:98
+#, php-format
+msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgstr "გáƒáƒœáƒáƒ®áƒšáƒ”ბები, რáƒáƒ›áƒšáƒ”ბიც შეიცáƒáƒ•ენ სáƒáƒ«áƒ˜áƒ”ბრსიტყვáƒáƒ¡ \"%1$s\" %2$s–ზე!"
+
+#: actions/nudge.php:85
+msgid ""
+"This user doesn't allow nudges or hasn't confirmed or set their email yet."
+msgstr ""
+
+#: actions/oauthappssettings.php:59
+msgid "You must be logged in to list your applications."
+msgstr "თქვენი áƒáƒžáƒšáƒ˜áƒ™áƒáƒªáƒ˜áƒ”ბის სიის სáƒáƒœáƒáƒ®áƒáƒ•áƒáƒ“ სáƒáƒ­áƒ˜áƒ áƒáƒ áƒáƒ•რáƒáƒ¢áƒ˜áƒ–áƒáƒªáƒ˜áƒ."
+
+#: actions/oauthappssettings.php:74
+msgid "OAuth applications"
+msgstr "OAuth áƒáƒžáƒšáƒ˜áƒ™áƒáƒªáƒ˜áƒ”ბი"
+
+#: 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
+#, php-format
+msgid "Unable to revoke access for app: %s."
+msgstr "%s áƒáƒžáƒšáƒ˜áƒ™áƒáƒªáƒ˜áƒ˜áƒ¡ მიერ ზვდáƒáƒ›áƒ˜áƒ¡ გáƒáƒ£áƒ¥áƒ›áƒ”ბრვერ ხერხდებáƒ."
+
+#: actions/oauthconnectionssettings.php:198
+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:80 actions/shownotice.php:100
+msgid "Notice has no profile."
+msgstr "შეტყáƒáƒ‘ინებáƒáƒ¡ პრფილი áƒáƒ  გáƒáƒáƒ©áƒœáƒ˜áƒ."
+
+#: actions/oembed.php:87 actions/shownotice.php:175
+#, php-format
+msgid "%1$s's status on %2$s"
+msgstr "%1$s–ის სტáƒáƒ¢áƒ£áƒ¡áƒ˜ %2$s–ზე"
+
+#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
+#: actions/oembed.php:159
+#, php-format
+msgid "Content type %s not supported."
+msgstr "შიგთáƒáƒ•სის ტიპი %s áƒáƒ  áƒáƒ áƒ˜áƒ¡ მხáƒáƒ áƒ“áƒáƒ­áƒ”რილი."
+
+#. TRANS: Error message displaying attachments. %s is the site's base URL.
+#: actions/oembed.php:163
+#, php-format
+msgid "Only %s URLs over plain HTTP please."
+msgstr "გთხáƒáƒ•თ გáƒáƒ›áƒáƒ˜áƒ§áƒ”ნáƒáƒ— მხáƒáƒšáƒáƒ“ %s URL–ები წმინდრHTTP მეთáƒáƒ“ით."
+
+#. TRANS: Client error on an API request with an unsupported data format.
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1209
+#: lib/apiaction.php:1237 lib/apiaction.php:1360
+msgid "Not a supported data format."
+msgstr "მáƒáƒœáƒáƒªáƒ”მთრფáƒáƒ áƒ›áƒáƒ¢áƒ˜ მხáƒáƒ áƒ“áƒáƒ­áƒ”რილი áƒáƒ  áƒáƒ áƒ˜áƒ¡."
+
+#: actions/opensearch.php:64
+msgid "People Search"
+msgstr "პირáƒáƒ•ნებების ძიებáƒ"
+
+#: 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 " (უფáƒáƒ¡áƒ სერვისი)"
+
+#: actions/othersettings.php:116
+msgid "Shorten URLs with"
+msgstr "შეáƒáƒ›áƒáƒ™áƒšáƒ” URL–ები შემდეგით"
+
+#: 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 "URL–ს შემáƒáƒ™áƒšáƒ”ბის სერვისი ძáƒáƒšáƒ˜áƒáƒœ გრძელირ(მáƒáƒ¥áƒ¡. 50 სიმბáƒáƒšáƒ)."
+
+#: actions/otp.php:69
+msgid "No user ID specified."
+msgstr "მáƒáƒ›áƒ®áƒ›áƒáƒ áƒ”ბლის ID მითითებული áƒáƒ  áƒáƒ áƒ˜áƒ¡."
+
+#: actions/otp.php:90
+msgid "No login token requested."
+msgstr ""
+
+#: actions/outbox.php:58
+#, php-format
+msgid "Outbox for %1$s - page %2$d"
+msgstr "%1$s-ის გáƒáƒ›áƒáƒ•áƒáƒšáƒ˜ ფáƒáƒ¡áƒ¢áƒ - გვერდი %2$d"
+
+#: actions/outbox.php:61
+#, php-format
+msgid "Outbox for %s"
+msgstr "%s-ის გáƒáƒ›áƒáƒ•áƒáƒšáƒ˜ ფáƒáƒ¡áƒ¢áƒ"
+
+#: actions/outbox.php:116
+msgid "This is your outbox, which lists private messages you have sent."
+msgstr ""
+"ეს áƒáƒ áƒ˜áƒ¡ თქვენი გáƒáƒ›áƒáƒ•áƒáƒšáƒ˜ ფáƒáƒ¡áƒ¢áƒ, რáƒáƒ›áƒ”ლშიც ჩáƒáƒ›áƒáƒ—ვლილირპირáƒáƒ“ი შეტყáƒáƒ‘ინებები "
+"რáƒáƒ›áƒšáƒ”ბიც თქვენ გáƒáƒáƒ’ზáƒáƒ•ნეთ."
+
+#: actions/passwordsettings.php:58
+msgid "Change password"
+msgstr "შეცვáƒáƒšáƒ”თ პáƒáƒ áƒáƒšáƒ˜"
+
+#: actions/passwordsettings.php:69
+msgid "Change your password."
+msgstr "შეცვáƒáƒšáƒ”თ თქვენი პáƒáƒ áƒáƒšáƒ˜."
+
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+msgid "Password change"
+msgstr "პáƒáƒ áƒáƒšáƒ˜áƒ¡ შეცვლáƒ"
+
+#: actions/passwordsettings.php:104
+msgid "Old password"
+msgstr "ძველი პáƒáƒ áƒáƒšáƒ˜"
+
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+msgid "New password"
+msgstr "áƒáƒ®áƒáƒšáƒ˜ პáƒáƒ áƒáƒšáƒ˜"
+
+#: actions/passwordsettings.php:109
+msgid "6 or more characters"
+msgstr "6 áƒáƒœ მეტი სიმბáƒáƒšáƒ"
+
+#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
+#: actions/register.php:440
+msgid "Confirm"
+msgstr "ვáƒáƒ“áƒáƒ¡áƒ¢áƒ£áƒ áƒ”ბ"
+
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+msgid "Same as password above"
+msgstr "იგივე რáƒáƒª ზედრპáƒáƒ áƒáƒšáƒ˜"
+
+#: actions/passwordsettings.php:117
+msgid "Change"
+msgstr "შეცვლáƒ"
+
+#: actions/passwordsettings.php:154 actions/register.php:237
+msgid "Password must be 6 or more characters."
+msgstr "პáƒáƒ áƒáƒšáƒ˜ უნდრშედგებáƒáƒ“ეს 6 áƒáƒœ მეტი სიმბáƒáƒšáƒáƒ¡áƒ’áƒáƒœ."
+
+#: actions/passwordsettings.php:157 actions/register.php:240
+msgid "Passwords don't match."
+msgstr "პáƒáƒ áƒáƒšáƒ”ბი áƒáƒ  ემთხვევáƒ."
+
+#: actions/passwordsettings.php:165
+msgid "Incorrect old password"
+msgstr "áƒáƒ áƒáƒ¡áƒ¬áƒáƒ áƒ˜ ძველი პáƒáƒ áƒáƒšáƒ˜"
+
+#: actions/passwordsettings.php:181
+msgid "Error saving user; invalid."
+msgstr "შეცდáƒáƒ›áƒ მáƒáƒ›áƒ®áƒ›áƒáƒ áƒ”ბლის შენáƒáƒ®áƒ•ისáƒáƒ¡; áƒáƒ áƒáƒ¡áƒ¬áƒáƒ áƒ˜."
+
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
+msgid "Can't save new password."
+msgstr "ვერ ვინáƒáƒ®áƒáƒ• áƒáƒ®áƒáƒš პáƒáƒ áƒáƒšáƒ¡."
+
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+msgid "Password saved."
+msgstr "პáƒáƒ áƒáƒšáƒ˜ შენáƒáƒ®áƒ£áƒšáƒ˜áƒ."
+
+#. TRANS: Menu item for site administration
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:384
+msgid "Paths"
+msgstr "გზები"
+
+#: actions/pathsadminpanel.php:70
+msgid "Path and server settings for this StatusNet site."
+msgstr "áƒáƒ› სáƒáƒ˜áƒ¢áƒ˜áƒ¡ გზრდრსერვერის პáƒáƒ áƒáƒ›áƒ”ტრები."
+
+#: actions/pathsadminpanel.php:157
+#, php-format
+msgid "Theme directory not readable: %s."
+msgstr "იერსáƒáƒ®áƒ˜áƒ¡ დირექტáƒáƒ áƒ˜áƒ áƒáƒ  áƒáƒ áƒ˜áƒ¡ წáƒáƒ™áƒ˜áƒ—ხვáƒáƒ“ი: %s."
+
+#: actions/pathsadminpanel.php:163
+#, php-format
+msgid "Avatar directory not writable: %s."
+msgstr "áƒáƒ•áƒáƒ¢áƒáƒ áƒ˜áƒ¡ დირექტáƒáƒ áƒ˜áƒ áƒáƒ  áƒáƒ áƒ˜áƒ¡ ჩáƒáƒ¬áƒ”რáƒáƒ“ი: %s."
+
+#: actions/pathsadminpanel.php:169
+#, php-format
+msgid "Background directory not writable: %s."
+msgstr "ფáƒáƒœáƒ˜áƒ¡ დირექტáƒáƒ áƒ˜áƒ áƒáƒ  áƒáƒ áƒ˜áƒ¡ ჩáƒáƒ¬áƒ”რáƒáƒ“ი: %s."
+
+#: actions/pathsadminpanel.php:183
+msgid "Invalid SSL server. The maximum length is 255 characters."
+msgstr "áƒáƒ áƒáƒ¡áƒ¬áƒáƒ áƒ˜ SSL სერვერი. მáƒáƒ¥áƒ¡áƒ˜áƒ›áƒáƒšáƒ£áƒ áƒ˜ სიგრძე áƒáƒ áƒ˜áƒ¡ 255 სიმბáƒáƒšáƒ."
+
+#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
+msgid "Site"
+msgstr "სáƒáƒ˜áƒ¢áƒ˜"
+
+#: actions/pathsadminpanel.php:238
+msgid "Server"
+msgstr "სერვერი"
+
+#: actions/pathsadminpanel.php:238
+msgid "Site's server hostname."
+msgstr "სáƒáƒ˜áƒ¢áƒ˜áƒ¡ სერვერის ჰáƒáƒ¡áƒ¢áƒ˜áƒ¡ სáƒáƒ®áƒ”ლი."
+
+#: actions/pathsadminpanel.php:242
+msgid "Path"
+msgstr "გზáƒ"
+
+#: 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 "ლáƒáƒ›áƒáƒ–ი URL–ები"
+
+#: actions/pathsadminpanel.php:252
+msgid "Use fancy (more readable and memorable) URLs?"
+msgstr "გáƒáƒ›áƒáƒ•იყენრლáƒáƒ›áƒáƒ–ი (მეტáƒáƒ“ კითხვáƒáƒ“ი დრდáƒáƒ¡áƒáƒ›áƒáƒ®áƒ¡áƒáƒ•რებელი) URL–ები?"
+
+#: actions/pathsadminpanel.php:259
+msgid "Theme"
+msgstr "იერსáƒáƒ®áƒ”"
+
+#: actions/pathsadminpanel.php:264
+msgid "Theme server"
+msgstr "იერსáƒáƒ®áƒ˜áƒ¡ სერვერი"
+
+#: actions/pathsadminpanel.php:268
+msgid "Theme path"
+msgstr "იერსáƒáƒ®áƒ˜áƒ¡ გზáƒ"
+
+#: actions/pathsadminpanel.php:272
+msgid "Theme directory"
+msgstr "იერსáƒáƒ®áƒ˜áƒ¡ დირექტáƒáƒ áƒ˜áƒ"
+
+#: actions/pathsadminpanel.php:279
+msgid "Avatars"
+msgstr "áƒáƒ•áƒáƒ¢áƒáƒ áƒ”ბი"
+
+#: actions/pathsadminpanel.php:284
+msgid "Avatar server"
+msgstr "áƒáƒ•áƒáƒ¢áƒáƒ áƒ”ბის სერვერი"
+
+#: actions/pathsadminpanel.php:288
+msgid "Avatar path"
+msgstr "áƒáƒ•áƒáƒ¢áƒáƒ áƒ”ბის გზáƒ"
+
+#: actions/pathsadminpanel.php:292
+msgid "Avatar directory"
+msgstr "áƒáƒ•áƒáƒ¢áƒáƒ áƒ”ბის დირექტáƒáƒ áƒ˜áƒ"
+
+#: actions/pathsadminpanel.php:301
+msgid "Backgrounds"
+msgstr "ფáƒáƒœáƒ”ბი"
+
+#: actions/pathsadminpanel.php:305
+msgid "Background server"
+msgstr "ფáƒáƒœáƒ”ბის სერვერი"
+
+#: actions/pathsadminpanel.php:309
+msgid "Background path"
+msgstr "ფáƒáƒœáƒ”ბის გზáƒ"
+
+#: actions/pathsadminpanel.php:313
+msgid "Background directory"
+msgstr "ფáƒáƒœáƒ”ბის დირექტáƒáƒ áƒ˜áƒ"
+
+#: actions/pathsadminpanel.php:320
+msgid "SSL"
+msgstr "SSL"
+
+#: actions/pathsadminpanel.php:323 actions/snapshotadminpanel.php:202
+msgid "Never"
+msgstr "áƒáƒ áƒáƒ¡áƒ“რáƒáƒ¡"
+
+#: actions/pathsadminpanel.php:324
+msgid "Sometimes"
+msgstr "ზáƒáƒ’ჯერ"
+
+#: actions/pathsadminpanel.php:325
+msgid "Always"
+msgstr "მუდáƒáƒ›"
+
+#: actions/pathsadminpanel.php:329
+msgid "Use SSL"
+msgstr "გáƒáƒ›áƒáƒ˜áƒ§áƒ”ნე SSL"
+
+#: actions/pathsadminpanel.php:330
+msgid "When to use SSL"
+msgstr "რáƒáƒ“ის გáƒáƒ›áƒáƒ•იყენრSSL"
+
+#: actions/pathsadminpanel.php:335
+msgid "SSL server"
+msgstr "SSL სერვერი"
+
+#: actions/pathsadminpanel.php:336
+msgid "Server to direct SSL requests to"
+msgstr "სერვერი რáƒáƒ›áƒ”ლზეც მიემáƒáƒ áƒ—áƒáƒ¡ SSL მáƒáƒ—ხáƒáƒ•ნები"
+
+#: 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 ""
+"მáƒáƒ«áƒ”ბნეთ áƒáƒ“áƒáƒ›áƒ˜áƒáƒœáƒ”ბი %%site.name%%-ზე მáƒáƒ—ი სáƒáƒ®áƒ”ლის, áƒáƒ“გილის, áƒáƒœ áƒáƒ¦áƒ¬áƒ”რის "
+"მიხედვით. გáƒáƒ›áƒáƒ§áƒáƒ•ით ფრáƒáƒ–ები სივრცით; სáƒáƒ«áƒ˜áƒ”ბრფრáƒáƒ–რ3 სიმბáƒáƒšáƒáƒ–ე მეტი უნდრ"
+"იყáƒáƒ¡."
+
+#: actions/peoplesearch.php:58
+msgid "People search"
+msgstr "პირáƒáƒ•ნებების ძიებáƒ"
+
+#: actions/peopletag.php:68
+#, php-format
+msgid "Not a valid people tag: %s."
+msgstr "პირáƒáƒ•ნებების áƒáƒ áƒáƒ¡áƒ¬áƒáƒ áƒ˜ სáƒáƒœáƒ˜áƒ¨áƒœáƒ”: %s."
+
+#: actions/peopletag.php:142
+#, php-format
+msgid "Users self-tagged with %1$s - page %2$d"
+msgstr ""
+"მáƒáƒ›áƒ®áƒ›áƒáƒ áƒ”ბლები რáƒáƒ›áƒšáƒ”ბმáƒáƒª სáƒáƒ™áƒ£áƒ—áƒáƒ áƒ˜ თáƒáƒ•ი მáƒáƒœáƒ˜áƒ¨áƒœáƒ”ს რáƒáƒ’áƒáƒ áƒª %1$s – გვერდი %2$d"
+
+#: 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 "შეტყáƒáƒ‘ინების ლიცენზირ‘%1$s’ შეუთáƒáƒ•სებელირსáƒáƒ˜áƒ¢áƒ˜áƒ¡ ლიცენზიáƒáƒ¡áƒ—áƒáƒœ ‘%2$s’."
+
+#: 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 "1–64 პáƒáƒ¢áƒáƒ áƒ áƒáƒ¡áƒáƒ”ბი áƒáƒœ ციფრები. პუნქტუáƒáƒªáƒ˜áƒ”ბი áƒáƒœ სივრცეები დáƒáƒ£áƒ¨áƒ•ებელიáƒ"
+
+#: actions/profilesettings.php:111 actions/register.php:455
+#: actions/showgroup.php:256 actions/tagother.php:104
+#: lib/groupeditform.php:157 lib/userprofile.php:150
+msgid "Full name"
+msgstr "სრული სáƒáƒ®áƒ”ლი"
+
+#. TRANS: Form input field label.
+#: actions/profilesettings.php:115 actions/register.php:460
+#: lib/applicationeditform.php:244 lib/groupeditform.php:161
+msgid "Homepage"
+msgstr "ვებ. გვერსი"
+
+#: actions/profilesettings.php:117 actions/register.php:462
+msgid "URL of your homepage, blog, or profile on another site"
+msgstr "თქვენი ვებ. გვერდის URL, ბლáƒáƒ’ი, áƒáƒœ პრáƒáƒ¤áƒ˜áƒšáƒ˜ სხვრსáƒáƒ˜áƒ¢áƒ–ე"
+
+#: actions/profilesettings.php:122 actions/register.php:468
+#, php-format
+msgid "Describe yourself and your interests in %d chars"
+msgstr "áƒáƒ¦áƒ¬áƒ”რეთ სáƒáƒ™áƒ£áƒ—áƒáƒ áƒ˜ თáƒáƒ•ი დრთქვენი ინტერესები %d სიმბáƒáƒšáƒáƒ—ი"
+
+#: actions/profilesettings.php:125 actions/register.php:471
+msgid "Describe yourself and your interests"
+msgstr "áƒáƒ¦áƒ¬áƒ”რეთ სáƒáƒ™áƒ£áƒ—áƒáƒ áƒ˜ თáƒáƒ•ი დრთქვენი ინტერესები"
+
+#: actions/profilesettings.php:127 actions/register.php:473
+msgid "Bio"
+msgstr "ბიáƒáƒ’რáƒáƒ¤áƒ˜áƒ"
+
+#: actions/profilesettings.php:132 actions/register.php:478
+#: actions/showgroup.php:265 actions/tagother.php:112
+#: actions/userauthorization.php:166 lib/groupeditform.php:177
+#: lib/userprofile.php:165
+msgid "Location"
+msgstr "მდებáƒáƒ áƒ”áƒáƒ‘áƒ"
+
+#: actions/profilesettings.php:134 actions/register.php:480
+msgid "Where you are, like \"City, State (or Region), Country\""
+msgstr "რáƒáƒ›áƒ”ლ ქáƒáƒšáƒáƒ¥áƒ¨áƒ˜, რეგიáƒáƒœáƒ¨áƒ˜, ქვეყáƒáƒœáƒáƒ¨áƒ˜ ხáƒáƒ áƒ—?"
+
+#: actions/profilesettings.php:138
+msgid "Share my current location when posting notices"
+msgstr "გáƒáƒáƒ–იáƒáƒ áƒ” ჩემი მდებáƒáƒ áƒ”áƒáƒ‘რშეტყáƒáƒ‘ინებების დáƒáƒžáƒáƒ¡áƒ¢áƒ•ისáƒáƒ¡"
+
+#: 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 "სáƒáƒœáƒ˜áƒ¨áƒœáƒ”ები"
+
+#: actions/profilesettings.php:147
+msgid ""
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+msgstr ""
+"სáƒáƒ™áƒ£áƒ—áƒáƒ áƒ˜ სáƒáƒœáƒ˜áƒ¨áƒœáƒ”ები (áƒáƒ¡áƒáƒ”ბი, ციფრები, -, ., დრ_). გáƒáƒ›áƒáƒ§áƒáƒ•ით მძიმით áƒáƒœ "
+"სივრცით"
+
+#: actions/profilesettings.php:151
+msgid "Language"
+msgstr "ენáƒ"
+
+#: actions/profilesettings.php:152
+msgid "Preferred language"
+msgstr "სáƒáƒ¡áƒ£áƒ áƒ•ელი ენáƒ"
+
+#: actions/profilesettings.php:161
+msgid "Timezone"
+msgstr "დრáƒáƒ˜áƒ¡ სáƒáƒ áƒ¢áƒ§áƒ”ლი"
+
+#: 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:230
+#, php-format
+msgid "Bio is too long (max %d chars)."
+msgstr "ბიáƒáƒ’რáƒáƒ¤áƒ˜áƒ ძáƒáƒšáƒ˜áƒáƒœ გრძელირ(áƒáƒ áƒáƒ£áƒ›áƒ”ტეს %d სიმბáƒáƒšáƒ)."
+
+#: 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 "ენრძáƒáƒšáƒ˜áƒáƒœ გრძელირ(áƒáƒ áƒáƒ£áƒ›áƒ”ტეს 50 სიმბáƒáƒšáƒ)."
+
+#: actions/profilesettings.php:253 actions/tagother.php:178
+#, php-format
+msgid "Invalid tag: \"%s\""
+msgstr "áƒáƒ áƒáƒ¡áƒ¬áƒáƒ áƒ˜ სáƒáƒœáƒ˜áƒ¨áƒœáƒ”: \"%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 "პáƒáƒ áƒáƒ›áƒ”ტრები შენáƒáƒ®áƒ£áƒšáƒ˜áƒ."
+
+#: actions/public.php:83
+#, php-format
+msgid "Beyond the page limit (%s)."
+msgstr "გვერსიდ სáƒáƒ–ღვრის მიღმრ(%s)."
+
+#: actions/public.php:92
+msgid "Could not retrieve public stream."
+msgstr "სáƒáƒ¯áƒáƒ áƒ ნáƒáƒ™áƒáƒ“ის გáƒáƒ›áƒáƒ—ხáƒáƒ•ნრვერ ხერხდებáƒ."
+
+#: actions/public.php:130
+#, php-format
+msgid "Public timeline, page %d"
+msgstr "სáƒáƒ¯áƒáƒ áƒ გáƒáƒœáƒáƒ®áƒšáƒ”ბების ნáƒáƒ™áƒáƒ“ი, გვერდი %d"
+
+#: 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 "დáƒáƒžáƒáƒ¡áƒ¢áƒ” პირველმáƒ!"
+
+#: actions/public.php:195
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post!"
+msgstr "[დáƒáƒ áƒ”გისტრირდი](%%action.register%%) დრდáƒáƒžáƒáƒ¡áƒ¢áƒ” პირველმáƒ!"
+
+#: 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 ""
+"ეს áƒáƒ áƒ˜áƒ¡ %%site.name%%, [მიკრáƒâ€“ბლáƒáƒ’ინგის](http://en.wikipedia.org/wiki/Micro-"
+"blogging) სერვისი, დáƒáƒ¤áƒ£áƒ«áƒœáƒ”ბული უფáƒáƒ¡áƒ [StatusNet](http://status.net/) კáƒáƒ“ზე. "
+"[შემáƒáƒ’ვიერთდი áƒáƒ®áƒšáƒáƒ•ე](%%action.register%%) დრგáƒáƒ£áƒ–იáƒáƒ áƒ” შეტყáƒáƒ‘ინებები "
+"მეგáƒáƒ‘რებს, áƒáƒ¯áƒáƒ®áƒ˜áƒ¡ წევრებს დრკáƒáƒšáƒ”გებს! ([გáƒáƒ˜áƒ’ე მეტი](%%doc.help%%))"
+
+#: 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 ""
+"რს áƒáƒ áƒ˜áƒ¡ %%site.name%%, [მიკრáƒâ€“ბლáƒáƒ’ინგის](http://en.wikipedia.org/wiki/Micro-"
+"blogging) სერვისი, დáƒáƒ¤áƒ£áƒ«áƒœáƒ”ბული უფáƒáƒ¡áƒ [StatusNet](http://status.net/) კáƒáƒ“ზე."
+
+#: 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 "ეს áƒáƒ áƒ˜áƒ¡ ყველáƒáƒ–ე პáƒáƒžáƒ£áƒšáƒáƒ áƒ£áƒšáƒ˜ სáƒáƒœáƒ˜áƒ¨áƒœáƒ”ები %s–ზე "
+
+#: actions/publictagcloud.php:69
+#, php-format
+msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
+msgstr "ჯერჯერáƒáƒ‘ით áƒáƒ áƒáƒ•ის დáƒáƒ£áƒžáƒáƒ¡áƒ¢áƒáƒ•ს შეტყáƒáƒ‘ინებრ[hashtag](%%doc.tags%%)–ით."
+
+#: 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 "[დáƒáƒ áƒ”გისტრირდი](%%action.register%%) დრდáƒáƒžáƒáƒ¡áƒ¢áƒ” პირველმáƒ!"
+
+#: 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 "უცნáƒáƒ‘ი მáƒáƒ¥áƒ›áƒ”დებáƒ"
+
+#: actions/recoverpassword.php:236
+msgid "6 or more characters, and don't forget it!"
+msgstr "6 áƒáƒœ მეტი სიმბáƒáƒšáƒ, დრáƒáƒ  დáƒáƒ’áƒáƒ•იწყდეთ!"
+
+#: actions/recoverpassword.php:243
+msgid "Reset"
+msgstr "გáƒáƒ“áƒáƒ§áƒ”ნებáƒ"
+
+#: 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 "პáƒáƒ áƒáƒšáƒ˜ უნდრშედგებáƒáƒ“ეს 6 áƒáƒœ მეტი სიმბáƒáƒšáƒáƒ¡áƒ’áƒáƒœ."
+
+#: actions/recoverpassword.php:369
+msgid "Password and confirmation do not match."
+msgstr "პáƒáƒ áƒáƒšáƒ˜ დრდáƒáƒ¡áƒ¢áƒ£áƒ áƒ˜ áƒáƒ  ემთხვევáƒ."
+
+#: actions/recoverpassword.php:388 actions/register.php:255
+msgid "Error setting user."
+msgstr "მáƒáƒ›áƒ®áƒ›áƒáƒ áƒ”ბელის დáƒáƒ§áƒ”ნებისáƒáƒ¡ მáƒáƒ®áƒ“რშეცდáƒáƒ›áƒ."
+
+#: actions/recoverpassword.php:395
+msgid "New password successfully saved. You are now logged in."
+msgstr "áƒáƒ®áƒáƒšáƒ˜ პáƒáƒ áƒáƒšáƒ˜ წáƒáƒ áƒ›áƒáƒ¢áƒ”ბით იქნრშენáƒáƒ®áƒ£áƒšáƒ˜. თქვენ áƒáƒ®áƒšáƒ áƒáƒ•ტáƒáƒ áƒ˜áƒ–ირებული ხáƒáƒ áƒ—."
+
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
+msgid "Sorry, only invited people can register."
+msgstr "ბáƒáƒ“იშს გიხდით, დáƒáƒ áƒ”გისტრირებრმხáƒáƒšáƒáƒ“ მáƒáƒ¬áƒ•ევითáƒáƒ შესáƒáƒ«áƒšáƒ”ბელი."
+
+#: actions/register.php:99
+msgid "Sorry, invalid invitation code."
+msgstr "ბáƒáƒ“იშს გიხდით, მáƒáƒ¡áƒáƒ¬áƒ•ევი კáƒáƒ“ი áƒáƒ áƒáƒ¡áƒ¬áƒáƒ áƒ˜áƒ."
+
+#: actions/register.php:119
+msgid "Registration successful"
+msgstr "რეგისტრáƒáƒªáƒ˜áƒ წáƒáƒ áƒ›áƒáƒ¢áƒ”ბით დáƒáƒ¡áƒ áƒ£áƒšáƒ“áƒ"
+
+#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85
+msgid "Register"
+msgstr "რეგისტრáƒáƒªáƒ˜áƒ"
+
+#: actions/register.php:142
+msgid "Registration not allowed."
+msgstr "რეგისტრáƒáƒªáƒ˜áƒ áƒáƒ  áƒáƒ áƒ˜áƒ¡ დáƒáƒ¨áƒ•ებული."
+
+#: actions/register.php:205
+msgid "You can't register if you don't agree to the license."
+msgstr "ვერ დáƒáƒ áƒ”გისტრირდებით თუ áƒáƒ  დáƒáƒ”თáƒáƒœáƒ®áƒ›áƒ”ბით ლიცენზიის პირáƒáƒ‘ებს."
+
+#: actions/register.php:219
+msgid "Email address already exists."
+msgstr "ელ. ფáƒáƒ¡áƒ¢áƒ˜áƒ¡ მისáƒáƒ›áƒáƒ áƒ—ი უკვე áƒáƒ áƒ¡áƒ”ბáƒáƒ‘ს."
+
+#: actions/register.php:250 actions/register.php:272
+msgid "Invalid username or password."
+msgstr "áƒáƒ áƒáƒ¡áƒ¬áƒáƒ áƒ˜ მáƒáƒ›áƒ®áƒ›áƒáƒ áƒ”ბლის სáƒáƒ®áƒ”ლი áƒáƒœ პáƒáƒ áƒáƒšáƒ˜."
+
+#: actions/register.php:350
+msgid ""
+"With this form you can create a new account. You can then post notices and "
+"link up to friends and colleagues. "
+msgstr ""
+"áƒáƒ› ფáƒáƒ áƒ›áƒ˜áƒ— შეგიძლიáƒáƒ— შექმნáƒáƒ— áƒáƒ®áƒáƒšáƒ˜ áƒáƒœáƒ’áƒáƒ áƒ˜áƒ¨áƒ˜. შემდგáƒáƒ› შეძლებთ შეტყáƒáƒ‘ინებების "
+"დáƒáƒžáƒáƒ¡áƒ¢áƒ•áƒáƒ¡ დრმეგáƒáƒ‘რებთáƒáƒœ დრკáƒáƒšáƒ”გებთáƒáƒœ ურთიერთáƒáƒ‘áƒáƒ¡. "
+
+#: actions/register.php:432
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+msgstr ""
+"1–64 პáƒáƒ¢áƒáƒ áƒ áƒáƒ¡áƒáƒ”ბი áƒáƒœ ციფრები. პუნქტუáƒáƒªáƒ˜áƒ”ბი áƒáƒœ სივრცეები დáƒáƒ£áƒ¨áƒ•ებელიáƒ. "
+"სáƒáƒ•áƒáƒšáƒ“ებულáƒ."
+
+#: actions/register.php:437
+msgid "6 or more characters. Required."
+msgstr "6 áƒáƒœ მეტი სიმბáƒáƒšáƒ. სáƒáƒ•áƒáƒšáƒ“ებულáƒ."
+
+#: actions/register.php:441
+msgid "Same as password above. Required."
+msgstr "იგივე, რáƒáƒª პáƒáƒ áƒáƒšáƒ˜ ზევით. სáƒáƒ•áƒáƒšáƒ“ებულáƒ."
+
+#. TRANS: Link description in user account settings menu.
+#: actions/register.php:445 actions/register.php:449
+#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
+msgid "Email"
+msgstr "ელ. ფáƒáƒ¡áƒ¢áƒ"
+
+#: actions/register.php:446 actions/register.php:450
+msgid "Used only for updates, announcements, and password recovery"
+msgstr ""
+"გáƒáƒ›áƒáƒ˜áƒ§áƒ”ნებრმხáƒáƒšáƒáƒ“ გáƒáƒœáƒáƒ®áƒšáƒ”ბებისთვის, გáƒáƒœáƒªáƒ®áƒáƒ“ებებისთვის დრპáƒáƒ áƒáƒšáƒ˜áƒ¡ áƒáƒ¦áƒ¡áƒáƒ“გენáƒáƒ“"
+
+#: actions/register.php:457
+msgid "Longer name, preferably your \"real\" name"
+msgstr "გრძელი სáƒáƒ®áƒ”ლი, სáƒáƒ¡áƒ£áƒ áƒ•ელირთქვენი ნáƒáƒ›áƒ“ვილი სáƒáƒ®áƒ”ლი"
+
+#: actions/register.php:518
+#, php-format
+msgid ""
+"I understand that content and data of %1$s are private and confidential."
+msgstr ""
+"მე ვáƒáƒªáƒœáƒáƒ‘იერებ, რáƒáƒ› %1$s–ის შიგთáƒáƒ•სი დრმáƒáƒœáƒáƒªáƒ”მები áƒáƒ áƒ˜áƒ¡ პირáƒáƒ“ული დრ"
+"კáƒáƒœáƒªáƒ˜áƒ“ენციáƒáƒšáƒ£áƒ áƒ˜."
+
+#: actions/register.php:528
+#, php-format
+msgid "My text and files are copyright by %1$s."
+msgstr "ჩემი ტექსტის დრფáƒáƒ˜áƒšáƒ”ბის სáƒáƒáƒ•ტáƒáƒ áƒ უფლებრეკუტვნის %1$s–ს."
+
+#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
+#: actions/register.php:532
+msgid "My text and files remain under my own copyright."
+msgstr "ჩემი ტექსტი დრფáƒáƒ˜áƒšáƒ”ბი ჩემივე სáƒáƒ™áƒ£áƒ—რებáƒáƒ."
+
+#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
+#: actions/register.php:535
+msgid "All rights reserved."
+msgstr "ყველრუფლებრდáƒáƒªáƒ£áƒšáƒ˜áƒ."
+
+#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
+#: actions/register.php:540
+#, php-format
+msgid ""
+"My text and files are available under %s except this private data: password, "
+"email address, IM address, and phone number."
+msgstr ""
+"ჩემი ტექსტი დრფáƒáƒ˜áƒšáƒ”ბი ხელმისáƒáƒ¬áƒ•დáƒáƒ›áƒ˜áƒ %s–ით, გáƒáƒ áƒ“რáƒáƒ› პირáƒáƒ“ი ინფáƒáƒ áƒ›áƒáƒªáƒ˜áƒ˜áƒ¡áƒ: "
+"პáƒáƒ áƒáƒšáƒ˜, ელ. ფáƒáƒ¡áƒ¢áƒ˜áƒ¡ მისáƒáƒ›áƒáƒ áƒ—ი, IM მისáƒáƒ›áƒáƒ áƒ—ი დრტელეფáƒáƒœáƒ˜áƒ¡ ნáƒáƒ›áƒ”რი."
+
+#: actions/register.php:583
+#, 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 ""
+"გილáƒáƒªáƒáƒ•თ %1$s! დრმáƒáƒ’ესáƒáƒšáƒ›áƒ”ბით %%%%site.name%%%%–ზე. თქვენი შემდეგი ნáƒáƒ‘იჯები "
+"შეიძლებრიყáƒáƒ¡...\n"
+"\n"
+"* გáƒáƒ“áƒáƒ“ი [შენს პრáƒáƒ¤áƒ˜áƒšáƒ–ე](%2$s) დრდáƒáƒžáƒáƒ¡áƒ¢áƒ” შენი პიáƒáƒ áƒ•ელი შეტყáƒáƒ‘ინებáƒ.\n"
+"* დáƒáƒáƒ›áƒáƒ¢áƒ” [Jabber/GTalk მისáƒáƒ›áƒáƒ áƒ—ები](%%%%action.imsettings%%%%), რáƒáƒ› "
+"გáƒáƒáƒ’ზáƒáƒ•ნრშეტყáƒáƒ‘ინებები შენი ჩáƒáƒ—–კლიენტიდáƒáƒœ.\n"
+"* [მáƒáƒ«áƒ”ბნე áƒáƒ“áƒáƒ›áƒ˜áƒáƒœáƒ”ბი](%%%%action.peoplesearch%%%%) რáƒáƒ›áƒšáƒ”ბსáƒáƒª შეიძლებრ"
+"იცნáƒáƒ‘, áƒáƒœ ვისთáƒáƒœáƒáƒª იზიáƒáƒ áƒ”ბ ინტერესებს.\n"
+"* გáƒáƒœáƒáƒáƒ®áƒšáƒ” შენი [პრáƒáƒ¤áƒ˜áƒšáƒ˜áƒ¡ პáƒáƒ áƒáƒ›áƒ”ტრები](%%%%action.profilesettings%%%%), რáƒáƒ› "
+"მეტი გáƒáƒáƒ’ებინრსხვებს შენ შესáƒáƒ®áƒ”ბ.\n"
+"* გáƒáƒ“áƒáƒ˜áƒ™áƒ˜áƒ—ხე [დáƒáƒ™áƒ£áƒ›áƒ”ნტáƒáƒªáƒ˜áƒ](%%%%doc.help%%%%) იმ შესáƒáƒ«áƒšáƒ”ბლáƒáƒ‘ების გáƒáƒ¡áƒáƒ’ებáƒáƒ“, "
+"რáƒáƒ›áƒšáƒ”ბიც შეიძლებრგáƒáƒ›áƒáƒ’რჩენáƒáƒ“áƒ.\n"
+"\n"
+"გმáƒáƒ“ლáƒáƒ‘თ რáƒáƒ› დáƒáƒ áƒ”გისტრირდით. იმედი გვáƒáƒ¥áƒ•ს ისიáƒáƒ›áƒáƒ•ნებთ áƒáƒ› სერვისით."
+
+#: actions/register.php:607
+msgid ""
+"(You should receive a message by email momentarily, with instructions on how "
+"to confirm your email address.)"
+msgstr ""
+"(თქვენ უნდრმიიღáƒáƒ¡ ელ. წერილი მáƒáƒ›áƒ”ნტáƒáƒšáƒ£áƒ áƒáƒ“. ინსტრუქციებით, თუ რáƒáƒ’áƒáƒ  "
+"დáƒáƒáƒ“áƒáƒ¡áƒ¢áƒ£áƒ áƒáƒ— თქვენი ელ. ფáƒáƒ¡áƒ¢áƒ˜áƒ¡ მისáƒáƒ›áƒáƒ áƒ—ი.)"
+
+#: actions/remotesubscribe.php:98
+#, php-format
+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 ""
+"გáƒáƒ›áƒáƒ¡áƒáƒ¬áƒ”რáƒáƒ“, თქვენ შეგიძლიáƒáƒ— [შეხვიდეთ](%%action.login%%), áƒáƒœ "
+"[დáƒáƒáƒ áƒ”გისტრირáƒáƒ—](%%action.register%%) áƒáƒ®áƒáƒšáƒ˜ áƒáƒœáƒ’áƒáƒ áƒ˜áƒ¨áƒ˜. თუ თქვენ უკვე გáƒáƒ¥áƒ•თ "
+"áƒáƒœáƒ’áƒáƒ áƒ˜áƒ¨áƒ˜ [თáƒáƒ•სებáƒáƒ“ მიკრáƒáƒ‘ლáƒáƒ’ინგის სáƒáƒ˜áƒ¢áƒ–ე](%%doc.openmublog%%), მáƒáƒ¨áƒ˜áƒœ "
+"შეიყვáƒáƒœáƒ”თ თქვენი პრáƒáƒ¤áƒ˜áƒšáƒ˜áƒ¡ URL ქვევით."
+
+#: 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 "პრáƒáƒ¤áƒ˜áƒšáƒ˜áƒ¡ URL"
+
+#: actions/remotesubscribe.php:134
+msgid "URL of your profile on another compatible microblogging service"
+msgstr "თქვენი პრáƒáƒ¤áƒ˜áƒšáƒ˜áƒ¡ URL სხვრთáƒáƒ•სებáƒáƒ“ მიკრáƒáƒ‘ლáƒáƒ’ინგის სერვისზე"
+
+#: 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 "პრáƒáƒ¤áƒ˜áƒšáƒ˜áƒ¡ áƒáƒ áƒáƒ¡áƒ¬áƒáƒ áƒ˜ URL (ცუდი ფáƒáƒ áƒ›áƒáƒ¢áƒ˜)"
+
+#: actions/remotesubscribe.php:168
+msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
+msgstr ""
+"ეს áƒáƒ  áƒáƒ áƒ˜áƒ¡ პრáƒáƒ¤áƒ˜áƒšáƒ˜áƒ¡ სწáƒáƒ áƒ˜ URL (YADIS დáƒáƒ™áƒ£áƒ›áƒ”ნტი áƒáƒ  áƒáƒ áƒ˜áƒ¡, áƒáƒœ áƒáƒ áƒáƒ¡áƒ¬áƒáƒ áƒ˜ XRDS–რ"
+"გáƒáƒœáƒ¡áƒáƒ–ღვრული)."
+
+#: 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:676
+msgid "Repeated"
+msgstr "გáƒáƒ›áƒ”áƒáƒ áƒ”ბული"
+
+#: actions/repeat.php:119
+msgid "Repeated!"
+msgstr "გáƒáƒ›áƒ”áƒáƒ áƒ”ბული!"
+
+#: actions/replies.php:126 actions/repliesrss.php:68
+#: lib/personalgroupnav.php:105
+#, php-format
+msgid "Replies to %s"
+msgstr "პáƒáƒ¡áƒ£áƒ®áƒ”ბი %s–ს"
+
+#: actions/replies.php:128
+#, php-format
+msgid "Replies to %1$s, page %2$d"
+msgstr "პáƒáƒ¡áƒ£áƒ®áƒ”ბი %1$s–ს, გვერდი %2$d"
+
+#: 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:199
+#, php-format
+msgid ""
+"This is the timeline showing replies to %1$s but %2$s hasn't received a "
+"notice to them yet."
+msgstr ""
+"ეს áƒáƒ áƒ˜áƒ¡ პáƒáƒ¡áƒ£áƒ®áƒ”ბის ნáƒáƒ™áƒáƒ“ი %1$s–სთვის, მáƒáƒ’რáƒáƒ› %2$s–ს ჯერ áƒáƒ  მიუღირშეტყáƒáƒ‘ინებრ"
+"მáƒáƒ— შესáƒáƒ®áƒ”ბ."
+
+#: 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 ""
+"თქვენ შეგიძლიáƒáƒ— ჩáƒáƒ”რთáƒáƒ— სáƒáƒ£áƒ‘áƒáƒ áƒ¨áƒ˜ სხვრმáƒáƒ›áƒ®áƒ›áƒáƒ áƒ”ბლებთáƒáƒœ ერთáƒáƒ“, გáƒáƒ›áƒáƒ˜áƒ¬áƒ”რáƒáƒ— მეტი "
+"პირáƒáƒ•ნებების გáƒáƒœáƒáƒ®áƒšáƒ”ბები, áƒáƒœ [გáƒáƒ¬áƒ”ვრიáƒáƒœáƒ“ეთ ჯგუფში](%%action.groups%%)."
+
+#: actions/repliesrss.php:72
+#, php-format
+msgid "Replies to %1$s on %2$s!"
+msgstr "პáƒáƒ¡áƒ£áƒ®áƒ”ბი %1$s–ს %2$s–ზე!"
+
+#: 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:159
+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:392
+msgid "Sessions"
+msgstr "სესიები"
+
+#: 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 "სესიების შეცდáƒáƒ›áƒ”ბის გáƒáƒ›áƒáƒ¡áƒ¬áƒáƒ áƒ”ბრ(debugging)"
+
+#: 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 "áƒáƒžáƒšáƒ˜áƒ™áƒáƒªáƒ˜áƒ˜áƒ¡ პრáƒáƒ¤áƒ˜áƒšáƒ˜"
+
+#. TRANS: Form input field label for application icon.
+#: actions/showapplication.php:159 lib/applicationeditform.php:182
+msgid "Icon"
+msgstr ""
+
+#. TRANS: Form input field label for application name.
+#: actions/showapplication.php:169 actions/version.php:197
+#: lib/applicationeditform.php:199
+msgid "Name"
+msgstr "დáƒáƒ¡áƒáƒ®áƒ”ლებáƒ"
+
+#. TRANS: Form input field label.
+#: actions/showapplication.php:178 lib/applicationeditform.php:235
+msgid "Organization"
+msgstr "áƒáƒ áƒ’áƒáƒœáƒ˜áƒ–áƒáƒªáƒ˜áƒ"
+
+#. TRANS: Form input field label.
+#: actions/showapplication.php:187 actions/version.php:200
+#: lib/applicationeditform.php:216 lib/groupeditform.php:172
+msgid "Description"
+msgstr "áƒáƒ¦áƒ¬áƒ”რáƒ"
+
+#: actions/showapplication.php:192 actions/showgroup.php:436
+#: lib/profileaction.php:187
+msgid "Statistics"
+msgstr "სტáƒáƒ¢áƒ˜áƒ¡áƒ¢áƒ˜áƒ™áƒ"
+
+#: 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 "URL-ის áƒáƒ•ტáƒáƒ áƒ˜áƒ–áƒáƒªáƒ˜áƒ"
+
+#: actions/showapplication.php:288
+msgid ""
+"Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
+"signature method."
+msgstr ""
+"შენიშვნáƒ: ჩვენ მხáƒáƒ áƒ¡ ვუჭერთ HMAC-SHA1 ხელმáƒáƒ¬áƒ”რებს. ჩვენ áƒáƒ  ვუჭერთ მხáƒáƒ áƒ¡ "
+"მხáƒáƒšáƒáƒ“ ტექსტური ხელმáƒáƒ¬áƒ”რის მეთáƒáƒ“ს."
+
+#: 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 "%1$s-ის რჩეული შეტყáƒáƒ‘ინებები, გვერდი %2$d"
+
+#: 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 favorite notices yet. 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:272 actions/tagother.php:118
+#: actions/userauthorization.php:175 lib/userprofile.php:178
+msgid "URL"
+msgstr ""
+
+#: 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:393 actions/showgroup.php:445 lib/groupnav.php:91
+msgid "Members"
+msgstr ""
+
+#: 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:404
+msgid "All members"
+msgstr ""
+
+#: actions/showmessage.php:98
+msgid "Only the sender and recipient may read this message."
+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:205
+msgid ""
+"Seen anything interesting recently? You haven't posted any notices yet, now "
+"would be a good time to start :)"
+msgstr ""
+
+#: 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 "უცნáƒáƒ‘ი ენრ\"%s\"."
+
+#: actions/siteadminpanel.php:165
+msgid "Minimum text limit is 0 (unlimited)."
+msgstr "ტექსტის მინიმáƒáƒšáƒ£áƒ áƒ˜ ზღვáƒáƒ áƒ˜áƒ 0 (ულიმიტáƒ)."
+
+#: actions/siteadminpanel.php:171
+msgid "Dupe limit must be one or more seconds."
+msgstr ""
+
+#: actions/siteadminpanel.php:221
+msgid "General"
+msgstr "ძირითáƒáƒ“ი"
+
+#: 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 "URL გáƒáƒ›áƒáƒ§áƒ”ნებული კრედიტებისáƒáƒ—ვის თითáƒáƒ”ული გვერდი ბáƒáƒšáƒáƒ¡"
+
+#: actions/siteadminpanel.php:239
+msgid "Contact email address for your site"
+msgstr "თქვენი სáƒáƒ˜áƒ¢áƒ˜áƒ¡ სáƒáƒ™áƒáƒœáƒ¢áƒáƒ¥áƒ¢áƒ ელ. ფáƒáƒ¡áƒ¢áƒ˜áƒ¡ მისáƒáƒ›áƒáƒ áƒ—ი"
+
+#: actions/siteadminpanel.php:245
+msgid "Local"
+msgstr "ლáƒáƒ™áƒáƒšáƒ£áƒ áƒ˜"
+
+#: actions/siteadminpanel.php:256
+msgid "Default timezone"
+msgstr "პირვáƒáƒœáƒ“ელი დრáƒáƒ˜áƒ¡ სáƒáƒ áƒ¢áƒ§áƒ”ლი"
+
+#: actions/siteadminpanel.php:257
+msgid "Default timezone for the site; usually UTC."
+msgstr "პირვáƒáƒœáƒ“ელი დრáƒáƒ˜áƒ¡ სáƒáƒ áƒ¢áƒ§áƒ”ლი áƒáƒ› სáƒáƒ˜áƒ¢áƒ˜áƒ¡áƒ—ვის; ძირითáƒáƒ“áƒáƒ“ UTC."
+
+#: 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 "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 "სáƒáƒ˜áƒ¢áƒ˜áƒ¡ მáƒáƒ›áƒªáƒ•ელი შეტყáƒáƒ‘ინების მáƒáƒ¥áƒ¡. ზáƒáƒ›áƒáƒ 255 სიმბáƒáƒšáƒ."
+
+#: actions/sitenoticeadminpanel.php:176
+msgid "Site notice text"
+msgstr "სáƒáƒ˜áƒ¢áƒ˜áƒ¡ შეტყáƒáƒ‘ინების ტექსტი"
+
+#: actions/sitenoticeadminpanel.php:178
+msgid "Site-wide notice text (255 chars max; HTML okay)"
+msgstr ""
+
+#. TRANS: Form guide in IM settings form.
+#: actions/smssettings.php:133
+msgid "Awaiting confirmation on this phone number."
+msgstr ""
+
+#. TRANS: Form field instructions in SMS settings form.
+#: actions/smssettings.php:144
+msgid "Enter the code you received on your phone."
+msgstr ""
+
+#. TRANS: Field label for SMS phone number input in SMS settings form.
+#: actions/smssettings.php:153
+msgid "SMS phone number"
+msgstr ""
+
+#. TRANS: Checkbox label in SMS preferences form.
+#: actions/smssettings.php:201
+msgid ""
+"Send me notices through SMS; I understand I may incur exorbitant charges "
+"from my carrier."
+msgstr ""
+
+#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:511
+msgid "Mobile carrier"
+msgstr ""
+
+#. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:516
+msgid "Select a carrier"
+msgstr ""
+
+#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
+#. TRANS: %s is an administrative contact's e-mail address.
+#: actions/smssettings.php:525
+#, 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 ""
+
+#. TRANS: Menu item for site administration
+#: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
+#: lib/adminpanelaction.php:408
+msgid "Snapshots"
+msgstr ""
+
+#: actions/snapshotadminpanel.php:65
+msgid "Manage snapshot configuration"
+msgstr ""
+
+#: actions/snapshotadminpanel.php:133
+msgid "Snapshot frequency must be a number."
+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 ""
+
+#: 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/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr ""
+
+#: actions/subscribe.php:117
+msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
+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/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/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:81 actions/userauthorization.php:132
+#: lib/userprofile.php:103
+msgid "Photo"
+msgstr ""
+
+#: actions/tagother.php:193
+msgid ""
+"You can only tag people you are subscribed to or who are subscribed to you."
+msgstr ""
+
+#. TRANS: User admin panel title
+#: actions/useradminpanel.php:59
+msgctxt "TITLE"
+msgid "User"
+msgstr ""
+
+#: actions/useradminpanel.php:149
+msgid "Invalid bio limit. Must be numeric."
+msgstr ""
+
+#: actions/useradminpanel.php:165
+#, php-format
+msgid "Invalid default subscripton: '%1$s' is not user."
+msgstr ""
+
+#: actions/useradminpanel.php:223
+msgid "Maximum length of a profile bio in characters."
+msgstr ""
+
+#: actions/useradminpanel.php:235
+msgid "New user welcome"
+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:232
+msgid "No authorization request!"
+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: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: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:282
+msgid "Enjoy your hotdog!"
+msgstr ""
+
+#: actions/usergroups.php:132
+msgid "Search for more groups"
+msgstr ""
+
+#: actions/usergroups.php:164
+#, php-format
+msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
+msgstr ""
+
+#: actions/version.php:155
+#, php-format
+msgid ""
+"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
+"Inc. and contributors."
+msgstr ""
+
+#: actions/version.php:163
+msgid "Contributors"
+msgstr ""
+
+#: actions/version.php:170
+msgid ""
+"StatusNet is free software: you can redistribute it and/or modify it under "
+"the terms of the GNU Affero General Public License as published by the Free "
+"Software Foundation, either version 3 of the License, or (at your option) "
+"any later version. "
+msgstr ""
+
+#: actions/version.php:176
+msgid ""
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License "
+"for more details. "
+msgstr ""
+
+#: actions/version.php:182
+#, php-format
+msgid ""
+"You should have received a copy of the GNU Affero General Public License "
+"along with this program. If not, see %s."
+msgstr ""
+
+#: actions/version.php:191
+msgid "Plugins"
+msgstr ""
+
+#: actions/version.php:199
+msgid "Author(s)"
+msgstr ""
+
+#. TRANS: Server exception thrown when a URL cannot be processed.
+#: classes/File.php:143
+#, php-format
+msgid "Cannot process URL '%s'"
+msgstr ""
+
+#. TRANS: Server exception thrown when... Robin thinks something is impossible!
+#: classes/File.php:175
+msgid "Robin thinks something is impossible."
+msgstr ""
+
+#. TRANS: Message given if an upload is larger than the configured maximum.
+#. TRANS: %1$d is the byte limit for uploads, %2$d is the byte count for the uploaded file.
+#: classes/File.php:190
+#, php-format
+msgid ""
+"No file may be larger than %1$d bytes and the file you sent was %2$d bytes. "
+"Try to upload a smaller version."
+msgstr ""
+
+#. TRANS: Message given if an upload would exceed user quota.
+#. TRANS: %d (number) is the user quota in bytes.
+#: classes/File.php:202
+#, php-format
+msgid "A file this large would exceed your user quota of %d bytes."
+msgstr ""
+
+#. TRANS: Message given id an upload would exceed a user's monthly quota.
+#. TRANS: $d (number) is the monthly user quota in bytes.
+#: classes/File.php:211
+#, php-format
+msgid "A file this large would exceed your monthly quota of %d bytes."
+msgstr ""
+
+#. TRANS: Exception thrown when database name or Data Source Name could not be found.
+#: classes/Memcached_DataObject.php:533
+msgid "No database name or DSN found anywhere."
+msgstr ""
+
+#. TRANS: Client exception thrown when a user tries to send a direct message while being banned from sending them.
+#: classes/Message.php:46
+msgid "You are banned from sending direct messages."
+msgstr ""
+
+#. TRANS: Server exception thrown when a user profile for a notice cannot be found.
+#. TRANS: %1$d is a profile ID (number), %2$d is a notice ID (number).
+#: classes/Notice.php:98
+#, php-format
+msgid "No such profile (%1$d) for notice (%2$d)."
+msgstr ""
+
+#. TRANS: Client exception thrown if a notice contains too many characters.
+#: classes/Notice.php:265
+msgid "Problem saving notice. Too long."
+msgstr ""
+
+#. TRANS: Client exception thrown when trying to save a notice for an unknown user.
+#: classes/Notice.php:270
+msgid "Problem saving notice. Unknown user."
+msgstr ""
+
+#. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
+#: classes/Notice.php:276
+msgid ""
+"Too many notices too fast; take a breather and post again in a few minutes."
+msgstr ""
+
+#. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
+#: classes/Notice.php:283
+msgid ""
+"Too many duplicate messages too quickly; take a breather and post again in a "
+"few minutes."
+msgstr ""
+
+#. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
+#: classes/Notice.php:897
+msgid "Bad type provided to saveKnownGroups"
+msgstr ""
+
+#. TRANS: Server exception thrown when an update for a group inbox fails.
+#: classes/Notice.php:996
+msgid "Problem saving group inbox."
+msgstr ""
+
+#. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
+#. TRANS: %1$s is the role name, %2$s is the user ID (number).
+#: classes/Profile.php:737
+#, php-format
+msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
+msgstr ""
+
+#. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
+#. TRANS: %1$s is the role name, %2$s is the user ID (number).
+#: classes/Profile.php:746
+#, php-format
+msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
+msgstr ""
+
+#. TRANS: Link title attribute in user account settings menu.
+#: lib/accountsettingsaction.php:130
+msgid "Change email handling"
+msgstr ""
+
+#. TRANS: Link description in user account settings menu.
+#: lib/accountsettingsaction.php:146
+msgid "Other"
+msgstr ""
+
+#. TRANS: Page title for a page without a title set.
+#: lib/action.php:164
+msgid "Untitled page"
+msgstr ""
+
+#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
+#: lib/action.php:449
+msgid "Primary site navigation"
+msgstr ""
+
+#. TRANS: Tooltip for main menu option "Personal"
+#: lib/action.php:455
+msgctxt "TOOLTIP"
+msgid "Personal profile and friends timeline"
+msgstr ""
+
+#. TRANS: Tooltip for main menu option "Services"
+#: lib/action.php:465
+msgctxt "TOOLTIP"
+msgid "Connect to services"
+msgstr ""
+
+#. TRANS: Tooltip for menu option "Admin"
+#: lib/action.php:471
+msgctxt "TOOLTIP"
+msgid "Change site configuration"
+msgstr ""
+
+#. TRANS: Tooltip for main menu option "Help"
+#: lib/action.php:507
+msgctxt "TOOLTIP"
+msgid "Help me!"
+msgstr ""
+
+#: lib/action.php:510
+msgctxt "MENU"
+msgid "Help"
+msgstr ""
+
+#. TRANS: Tooltip for main menu option "Search"
+#: lib/action.php:513
+msgctxt "TOOLTIP"
+msgid "Search for people or text"
+msgstr ""
+
+#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
+#: lib/action.php:778
+msgid "Secondary site navigation"
+msgstr ""
+
+#. TRANS: Secondary navigation menu option leading to help on StatusNet.
+#: lib/action.php:784
+msgid "Help"
+msgstr ""
+
+#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
+#: lib/action.php:790
+msgid "FAQ"
+msgstr ""
+
+#. TRANS: Secondary navigation menu option leading to Terms of Service.
+#: lib/action.php:795
+msgid "TOS"
+msgstr ""
+
+#. TRANS: Secondary navigation menu option.
+#: lib/action.php:802
+msgid "Source"
+msgstr ""
+
+#: lib/action.php:810
+msgid "Badge"
+msgstr ""
+
+#. TRANS: DT element for StatusNet software license.
+#: lib/action.php:839
+msgid "StatusNet software license"
+msgstr ""
+
+#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
+#: lib/action.php:843
+#, php-format
+msgid ""
+"**%%site.name%%** is a microblogging service brought to you by [%%site."
+"broughtby%%](%%site.broughtbyurl%%)."
+msgstr ""
+
+#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
+#: lib/action.php:846
+#, php-format
+msgid "**%%site.name%%** is a microblogging service."
+msgstr ""
+
+#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
+#: lib/action.php:850
+#, 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 ""
+
+#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
+#. TRANS: %1$s is the copyright owner.
+#: lib/action.php:880
+#, php-format
+msgid "Content and data copyright by %1$s. All rights reserved."
+msgstr ""
+
+#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
+#: lib/action.php:884
+msgid "Content and data copyright by contributors. All rights reserved."
+msgstr ""
+
+#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
+#: lib/action.php:897
+#, php-format
+msgid "All %1$s content and data are available under the %2$s license."
+msgstr ""
+
+#. TRANS: Pagination message to go to a page displaying information more in the
+#. TRANS: present than the currently displayed information.
+#: lib/action.php:1247
+msgid "After"
+msgstr ""
+
+#. TRANS: Pagination message to go to a page displaying information more in the
+#. TRANS: past than the currently displayed information.
+#: lib/action.php:1257
+msgid "Before"
+msgstr ""
+
+#. TRANS: Client exception thrown when a feed instance is a DOMDocument.
+#: lib/activity.php:122
+msgid "Expecting a root feed element but got a whole XML document."
+msgstr ""
+
+#: lib/activityutils.php:208
+msgid "Can't handle remote content yet."
+msgstr ""
+
+#: lib/activityutils.php:244
+msgid "Can't handle embedded XML content yet."
+msgstr ""
+
+#: lib/activityutils.php:248
+msgid "Can't handle embedded Base64 content yet."
+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: Menu item title/tooltip
+#: lib/adminpanelaction.php:350
+msgid "Basic site configuration"
+msgstr ""
+
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:358
+msgid "Design configuration"
+msgstr ""
+
+#. TRANS: Menu item for site administration
+#: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
+msgid "User"
+msgstr ""
+
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:374
+msgid "Access configuration"
+msgstr ""
+
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:406
+msgid "Snapshots configuration"
+msgstr ""
+
+#. TRANS: Client error 401.
+#: lib/apiauth.php:113
+msgid "API resource requires read-write access, but you only have read access."
+msgstr ""
+
+#. TRANS: Form input field instructions.
+#: lib/applicationeditform.php:242
+msgid "URL for the homepage of the organization"
+msgstr ""
+
+#. TRANS: Form input field instructions.
+#: lib/applicationeditform.php:251
+msgid "URL to redirect to after authentication"
+msgstr ""
+
+#. TRANS: Radio button label for application type
+#: lib/applicationeditform.php:278
+msgid "Browser"
+msgstr ""
+
+#. TRANS: Radio button label for application type
+#: lib/applicationeditform.php:295
+msgid "Desktop"
+msgstr ""
+
+#. TRANS: Form guide.
+#: lib/applicationeditform.php:297
+msgid "Type of application, browser or desktop"
+msgstr ""
+
+#. TRANS: Radio button label for access type.
+#: lib/applicationeditform.php:320
+msgid "Read-only"
+msgstr ""
+
+#. TRANS: Radio button label for access type.
+#: lib/applicationeditform.php:339
+msgid "Read-write"
+msgstr ""
+
+#. TRANS: Form guide.
+#: lib/applicationeditform.php:341
+msgid "Default access for this application: read-only, or read-write"
+msgstr ""
+
+#. TRANS: Application access type
+#: lib/applicationlist.php:136
+msgid "read-write"
+msgstr ""
+
+#. TRANS: Application access type
+#: lib/applicationlist.php:138
+msgid "read-only"
+msgstr ""
+
+#. TRANS: Used in application list. %1$s is a modified date, %2$s is access type (read-write or read-only)
+#: lib/applicationlist.php:144
+#, php-format
+msgid "Approved %1$s - \"%2$s\" access."
+msgstr ""
+
+#: lib/attachmentnoticesection.php:67
+msgid "Notices where this attachment appears"
+msgstr ""
+
+#: lib/channel.php:229 lib/mailhandler.php:142
+msgid "Command complete"
+msgstr ""
+
+#. TRANS: Error text shown when an unimplemented command is given.
+#: lib/command.php:185
+msgid "Sorry, this command is not yet implemented."
+msgstr ""
+
+#. TRANS: Command exception text shown when a user tries to nudge themselves.
+#: lib/command.php:231
+msgid "It does not make a lot of sense to nudge yourself!"
+msgstr ""
+
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:240
+#, php-format
+msgid "Nudge sent to %s."
+msgstr ""
+
+#. TRANS: User statistics text.
+#. TRANS: %1$s is the number of other user the user is subscribed to.
+#. TRANS: %2$s is the number of users that are subscribed to the user.
+#. TRANS: %3$s is the number of notices the user has sent.
+#: lib/command.php:270
+#, php-format
+msgid ""
+"Subscriptions: %1$s\n"
+"Subscribers: %2$s\n"
+"Notices: %3$s"
+msgstr ""
+
+#. TRANS: Whois output. %s is the bio information of the queried user.
+#: lib/command.php:446
+#, php-format
+msgid "About: %s"
+msgstr ""
+
+#. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
+#: lib/command.php:474
+#, php-format
+msgid ""
+"%s is a remote profile; you can only send direct messages to users on the "
+"same server."
+msgstr ""
+
+#. TRANS: Message given if content is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:491 lib/xmppmanager.php:403
+#, php-format
+msgid "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr ""
+
+#. TRANS: Message given if content of a notice for a reply is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:592
+#, php-format
+msgid "Notice too long - maximum is %1$d characters, you sent %2$d."
+msgstr ""
+
+#. TRANS: Error text shown when no username was provided when issuing a subscribe command.
+#: lib/command.php:655
+msgid "Specify the name of the user to subscribe to."
+msgstr ""
+
+#. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
+#: lib/command.php:664
+msgid "Can't subscribe to OMB profiles by command."
+msgstr ""
+
+#. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
+#. TRANS: Error text shown when no username was provided when issuing the command.
+#: lib/command.php:694 lib/command.php:804
+msgid "Specify the name of the user to unsubscribe from."
+msgstr ""
+
+#. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
+#. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
+#: lib/command.php:724 lib/command.php:750
+msgid "Command not yet implemented."
+msgstr ""
+
+#. TRANS: Error text shown when the command "off" fails for an unknown reason.
+#: lib/command.php:731
+msgid "Can't turn off notification."
+msgstr ""
+
+#. TRANS: Error text shown when issuing the login command while login is disabled.
+#: lib/command.php:771
+msgid "Login command is disabled."
+msgstr ""
+
+#. TRANS: Text shown after issuing the login command successfully.
+#. TRANS: %s is a logon link..
+#: lib/command.php:784
+#, php-format
+msgid "This link is useable only once and is valid for only 2 minutes: %s."
+msgstr ""
+
+#. TRANS: Text shown after requesting other users that are subscribed to a user
+#. TRANS: (followers) without having any subscribers.
+#: lib/command.php:858
+msgid "No one is subscribed to you."
+msgstr ""
+
+#. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribing users.
+#: lib/command.php:863
+msgid "This person is subscribed to you:"
+msgid_plural "These people are subscribed to you:"
+msgstr[0] ""
+
+#: lib/command.php:905
+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: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 ""
+
+#: lib/connectsettingsaction.php:110
+msgid "IM"
+msgstr ""
+
+#: lib/connectsettingsaction.php:111
+msgid "Updates by instant messenger (IM)"
+msgstr ""
+
+#: lib/connectsettingsaction.php:116
+msgid "Updates by SMS"
+msgstr ""
+
+#: lib/dberroraction.php:60
+msgid "Database error"
+msgstr ""
+
+#: lib/favorform.php:140
+msgid "Favor"
+msgstr ""
+
+#: lib/feed.php:85
+msgid "RSS 1.0"
+msgstr ""
+
+#: lib/feed.php:87
+msgid "RSS 2.0"
+msgstr ""
+
+#: lib/feed.php:89
+msgid "Atom"
+msgstr ""
+
+#: lib/feed.php:91
+msgid "FOAF"
+msgstr ""
+
+#: lib/feedlist.php:64
+msgid "Export data"
+msgstr ""
+
+#: lib/galleryaction.php:121
+msgid "Filter tags"
+msgstr ""
+
+#: lib/galleryaction.php:139
+msgid "Select tag to filter"
+msgstr ""
+
+#: lib/galleryaction.php:141
+msgid "Choose a tag to narrow list"
+msgstr ""
+
+#: lib/galleryaction.php:143
+msgid "Go"
+msgstr ""
+
+#: lib/grantroleform.php:91
+#, php-format
+msgid "Grant this user the \"%s\" role"
+msgstr ""
+
+#: lib/groupeditform.php:168
+msgid "Describe the group or topic"
+msgstr ""
+
+#: lib/groupeditform.php:187
+#, php-format
+msgid "Extra nicknames for the group, comma- or space- separated, max %d"
+msgstr ""
+
+#: 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/groupsbypostssection.php:71
+msgid "Groups with most posts"
+msgstr ""
+
+#: lib/grouptagcloudsection.php:56
+#, php-format
+msgid "Tags in %s group's notices"
+msgstr ""
+
+#. TRANS: Client exception 406
+#: lib/htmloutputter.php:104
+msgid "This page is not available in a media type you accept"
+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:163 lib/imagefile.php:224
+msgid "Unknown file type"
+msgstr ""
+
+#: lib/imagefile.php:244
+msgid "MB"
+msgstr ""
+
+#: lib/imagefile.php:246
+msgid "kB"
+msgstr ""
+
+#: lib/jabber.php:387
+#, php-format
+msgid "[%s]"
+msgstr ""
+
+#: lib/logingroupnav.php:86
+msgid "Sign up for a new account"
+msgstr ""
+
+#. TRANS: Body for address confirmation email.
+#: lib/mail.php:177
+#, 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:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+
+#. TRANS: Main body of new-subscriber notification e-mail
+#: lib/mail.php:254
+#, 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 ""
+
+#. TRANS: Body of notification mail for new posting email address
+#: lib/mail.php:308
+#, 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 ""
+
+#. TRANS: Main body heading for SMS-by-email address confirmation message
+#: lib/mail.php:463
+#, php-format
+msgid "%s: confirm you own this phone number with this code:"
+msgstr ""
+
+#. TRANS: Subject for 'nudge' notification email
+#: lib/mail.php:484
+#, php-format
+msgid "You've been nudged by %s"
+msgstr ""
+
+#. TRANS: Body for 'nudge' notification email
+#: lib/mail.php:489
+#, 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 ""
+
+#. TRANS: Body for direct-message notification email
+#: lib/mail.php:541
+#, 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 ""
+
+#. TRANS: Body for favorite notification email
+#: lib/mail.php:592
+#, 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 ""
+
+#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
+#: lib/mail.php:651
+#, php-format
+msgid ""
+"The full conversation can be read here:\n"
+"\n"
+"\t%s"
+msgstr ""
+
+#: lib/mail.php:657
+#, php-format
+msgid "%s (@%s) sent a notice to your attention"
+msgstr ""
+
+#. TRANS: Body of @-reply notification e-mail.
+#: lib/mail.php:660
+#, 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"
+"%5$sYou can reply back here:\n"
+"\n"
+"\t%6$s\n"
+"\n"
+"The list of all @-replies for you here:\n"
+"\n"
+"%7$s\n"
+"\n"
+"Faithfully yours,\n"
+"%2$s\n"
+"\n"
+"P.S. You can turn off these email notifications here: %8$s\n"
+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:228 lib/noticelist.php:506
+msgid "from"
+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:217
+msgid "File exceeds user's quota."
+msgstr ""
+
+#: lib/mediafile.php:197 lib/mediafile.php:234
+msgid "File could not be moved to destination directory."
+msgstr ""
+
+#: lib/mediafile.php:318
+#, php-format
+msgid " Try using another %s format."
+msgstr ""
+
+#: lib/mediafile.php:323
+#, php-format
+msgid "%s is not a supported file type on this server."
+msgstr ""
+
+#: lib/messageform.php:146
+msgid "To"
+msgstr ""
+
+#: lib/noticeform.php:174
+#, php-format
+msgid "What's up, %s?"
+msgstr ""
+
+#: lib/noticeform.php:193
+msgid "Attach"
+msgstr ""
+
+#: lib/noticeform.php:197
+msgid "Attach a file"
+msgstr ""
+
+#: lib/noticeform.php:213
+msgid "Share my location"
+msgstr ""
+
+#: lib/noticeform.php:217
+msgid ""
+"Sorry, retrieving your geo location is taking longer than expected, please "
+"try again later"
+msgstr ""
+
+#. TRANS: Used in coordinates as abbreviation of south
+#: lib/noticelist.php:438
+msgid "S"
+msgstr ""
+
+#. TRANS: Used in coordinates as abbreviation of east
+#: lib/noticelist.php:440
+msgid "E"
+msgstr ""
+
+#. TRANS: Used in coordinates as abbreviation of west
+#: lib/noticelist.php:442
+msgid "W"
+msgstr ""
+
+#: lib/noticelist.php:444
+#, php-format
+msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
+msgstr ""
+
+#: lib/noticelist.php:502
+msgid "web"
+msgstr ""
+
+#: lib/noticelist.php:631
+msgid "Reply"
+msgstr ""
+
+#: lib/nudgeform.php:128
+msgid "Nudge"
+msgstr ""
+
+#: lib/personalgroupnav.php:125
+msgid "Inbox"
+msgstr ""
+
+#: lib/personaltagcloudsection.php:56
+#, php-format
+msgid "Tags in %s's notices"
+msgstr ""
+
+#: lib/profileaction.php:191
+msgid "User ID"
+msgstr ""
+
+#. TRANS: Average count of posts made per day since account registration
+#: lib/profileaction.php:235
+msgid "Daily average"
+msgstr ""
+
+#: lib/profileformaction.php:123
+msgid "Unimplemented method."
+msgstr ""
+
+#: lib/publicgroupnav.php:78
+msgid "Public"
+msgstr ""
+
+#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
+msgid "Recent tags"
+msgstr ""
+
+#: lib/router.php:709
+msgid "No single user defined for single-user mode."
+msgstr ""
+
+#: lib/sandboxform.php:67
+msgid "Sandbox"
+msgstr ""
+
+#: lib/searchaction.php:120
+msgid "Search site"
+msgstr ""
+
+#: lib/searchaction.php:126
+msgid "Keyword(s)"
+msgstr ""
+
+#: lib/searchaction.php:162
+msgid "Search help"
+msgstr ""
+
+#: lib/searchgroupnav.php:81
+msgid "Find people on this site"
+msgstr ""
+
+#: lib/searchgroupnav.php:83
+msgid "Find content of notices"
+msgstr ""
+
+#: lib/section.php:89
+msgid "Untitled section"
+msgstr ""
+
+#: lib/section.php:106
+msgid "More..."
+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/themeuploader.php:50
+msgid "This server cannot handle theme uploads without ZIP support."
+msgstr ""
+
+#: lib/themeuploader.php:58 lib/themeuploader.php:61
+msgid "The theme file is missing or the upload failed."
+msgstr ""
+
+#: lib/themeuploader.php:147
+msgid "Invalid theme: bad directory structure."
+msgstr ""
+
+#: lib/themeuploader.php:166
+#, php-format
+msgid "Uploaded theme is too large; must be less than %d bytes uncompressed."
+msgstr ""
+
+#: lib/themeuploader.php:178
+msgid "Invalid theme archive: missing file css/display.css"
+msgstr ""
+
+#: lib/themeuploader.php:218
+msgid ""
+"Theme contains invalid file or folder name. Stick with ASCII letters, "
+"digits, underscore, and minus sign."
+msgstr ""
+
+#: lib/themeuploader.php:224
+msgid "Theme contains unsafe file extension names; may be unsafe."
+msgstr ""
+
+#: lib/themeuploader.php:241
+#, php-format
+msgid "Theme contains file of type '.%s', which is not allowed."
+msgstr ""
+
+#: lib/topposterssection.php:74
+msgid "Top posters"
+msgstr ""
+
+#: lib/unsandboxform.php:69
+msgid "Unsandbox"
+msgstr ""
+
+#: lib/unsilenceform.php:67
+msgid "Unsilence"
+msgstr ""
+
+#: lib/userprofile.php:237
+msgid "User deletion in progress..."
+msgstr ""
+
+#: lib/userprofile.php:264
+msgid "Edit"
+msgstr ""
+
+#: lib/userprofile.php:326
+msgid "Moderate"
+msgstr ""
+
+#: lib/userprofile.php:366
+msgctxt "role"
+msgid "Administrator"
+msgstr ""
+
+#: lib/userprofile.php:367
+msgctxt "role"
+msgid "Moderator"
+msgstr ""
+
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1102
+msgid "a few seconds ago"
+msgstr ""
+
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1105
+msgid "about a minute ago"
+msgstr ""
+
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1109
+#, php-format
+msgid "about %d minutes ago"
+msgstr ""
+
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1112
+msgid "about an hour ago"
+msgstr ""
+
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1116
+#, php-format
+msgid "about %d hours ago"
+msgstr ""
+
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1119
+msgid "about a day ago"
+msgstr ""
+
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1123
+#, php-format
+msgid "about %d days ago"
+msgstr ""
+
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1126
+msgid "about a month ago"
+msgstr ""
+
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1130
+#, php-format
+msgid "about %d months ago"
+msgstr ""
+
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1133
+msgid "about a year ago"
+msgstr ""
+
+#: lib/webcolor.php:123
+#, php-format
+msgid "%s is not a valid color! Use 3 or 6 hex chars."
+msgstr ""
diff --git a/locale/ko/LC_MESSAGES/statusnet.po b/locale/ko/LC_MESSAGES/statusnet.po
index 2c1429452..7a2504c04 100644
--- a/locale/ko/LC_MESSAGES/statusnet.po
+++ b/locale/ko/LC_MESSAGES/statusnet.po
@@ -10,12 +10,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-28 15:28+0000\n"
-"PO-Revision-Date: 2010-08-28 15:30:53+0000\n"
+"POT-Creation-Date: 2010-09-05 09:45+0000\n"
+"PO-Revision-Date: 2010-09-05 09:46:50+0000\n"
"Language-Team: Korean\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r71856); Translate extension (2010-08-20)\n"
+"X-Generator: MediaWiki 1.17alpha (r72319); Translate extension (2010-08-20)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ko\n"
"X-Message-Group: out-statusnet\n"
@@ -434,7 +434,7 @@ msgstr "위치가 너무 ê¹ë‹ˆë‹¤. (최대 255글ìž)"
#: actions/newgroup.php:159
#, php-format
msgid "Too many aliases! Maximum %d."
-msgstr ""
+msgstr "ë³„ëª…ì´ ë„ˆë¬´ 많습니다! 최대 %dê°œ."
#: actions/apigroupcreate.php:276 actions/editgroup.php:232
#: actions/newgroup.php:172
@@ -584,7 +584,7 @@ msgstr ""
"$s ê³„ì •ì˜ ì ‘ê·¼ì„ í—ˆìš©í•´ì•¼ 합니다."
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:450
+#: actions/apioauthauthorize.php:310 lib/action.php:463
msgid "Account"
msgstr "계정"
@@ -963,7 +963,7 @@ msgstr "ì´ ì‘용프로그램 ì‚­ì œ 않기"
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1263
+#: lib/action.php:1307
msgid "There was a problem with your session token."
msgstr "ë‹¹ì‹ ì˜ ì„¸ì…˜í† í°ê´€ë ¨ 문제가 있습니다."
@@ -1136,6 +1136,10 @@ msgstr "ìƒ‰ìƒ ë³€ê²½"
msgid "Content"
msgstr "만족하는"
+#: actions/designadminpanel.php:600 lib/designsettings.php:204
+msgid "Sidebar"
+msgstr "가장ìžë¦¬ ì°½"
+
#: actions/designadminpanel.php:613 lib/designsettings.php:217
msgid "Text"
msgstr "문ìž"
@@ -1209,6 +1213,14 @@ msgstr "기관 ì´ë¦„ì´ í•„ìš”í•©ë‹ˆë‹¤."
msgid "Description is required."
msgstr "기관 ì´ë¦„ì´ í•„ìš”í•©ë‹ˆë‹¤."
+#: actions/editapplication.php:194
+msgid "Source URL is too long."
+msgstr "소스 URLì´ ë„ˆë¬´ ê¹ë‹ˆë‹¤."
+
+#: actions/editapplication.php:200 actions/newapplication.php:185
+msgid "Source URL is not valid."
+msgstr "소스 URLì´ ì˜¬ë°”ë¥´ì§€ 않습니다."
+
#: actions/editapplication.php:203 actions/newapplication.php:188
msgid "Organization is required."
msgstr "기관 ì´ë¦„ì´ í•„ìš”í•©ë‹ˆë‹¤."
@@ -1221,14 +1233,6 @@ msgstr "기관 ì´ë¦„ì´ ë„ˆë¬´ ê¹ë‹ˆë‹¤. (최대 255글ìž)"
msgid "Organization homepage is required."
msgstr "기관 홈페ì´ì§€ê°€ 필요합니다."
-#: actions/editapplication.php:218 actions/newapplication.php:206
-msgid "Callback is too long."
-msgstr ""
-
-#: actions/editapplication.php:225 actions/newapplication.php:215
-msgid "Callback URL is not valid."
-msgstr ""
-
#: actions/editapplication.php:258
msgid "Could not update application."
msgstr "관심소ì‹ì„ ìƒì„±í•  수 없습니다."
@@ -2206,6 +2210,10 @@ msgstr "ì‹ ê·œ ì‘ìš© 프로그램"
msgid "You must be logged in to register an application."
msgstr "ì‘ìš© 프로그램 ìˆ˜ì •ì„ ìœ„í•´ì„œëŠ” 로그ì¸í•´ì•¼ 합니다."
+#: actions/newapplication.php:176
+msgid "Source URL is required."
+msgstr "소스 URLì´ í•„ìš”í•©ë‹ˆë‹¤."
+
#: actions/newapplication.php:258 actions/newapplication.php:267
msgid "Could not create application."
msgstr "관심소ì‹ì„ ìƒì„±í•  수 없습니다."
@@ -2328,6 +2336,10 @@ msgstr "ì‘용프로그램 ì‚­ì œ"
msgid "Applications you have registered"
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 "ë‹¤ìŒ ì‘ìš© í”„ë¡œê·¸ëž¨ì´ ê³„ì •ì— ì ‘ê·¼í•˜ë„ë¡ í—ˆìš©ë˜ì–´ 있습니다."
@@ -2491,6 +2503,11 @@ msgstr "새 비밀번호를 저장 할 수 없습니다."
msgid "Password saved."
msgstr "비밀 번호 저장"
+#. TRANS: Menu item for site administration
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:384
+msgid "Paths"
+msgstr "경로"
+
#: actions/pathsadminpanel.php:157
#, php-format
msgid "Theme directory not readable: %s."
@@ -2545,6 +2562,22 @@ msgstr ""
msgid "Theme"
msgstr "테마"
+#: actions/pathsadminpanel.php:264
+msgid "Theme server"
+msgstr "테마 서버"
+
+#: actions/pathsadminpanel.php:268
+msgid "Theme path"
+msgstr "테마 경로"
+
+#: actions/pathsadminpanel.php:272
+msgid "Theme directory"
+msgstr "테마 디렉터리"
+
+#: actions/pathsadminpanel.php:279
+msgid "Avatars"
+msgstr "아바타"
+
#: actions/pathsadminpanel.php:284
msgid "Avatar server"
msgstr "아바타가 ì‚­ì œë˜ì—ˆìŠµë‹ˆë‹¤."
@@ -4100,11 +4133,6 @@ msgstr ""
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’."
@@ -4199,7 +4227,7 @@ msgid "Plugins"
msgstr "플러그ì¸"
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:789
+#: actions/version.php:198 lib/action.php:805
msgid "Version"
msgstr "버전"
@@ -4313,7 +4341,7 @@ msgstr ""
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1751
+#: classes/Notice.php:1757
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -4333,7 +4361,7 @@ msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
msgstr ""
#. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:346
+#: classes/Status_network.php:339
msgid "Unable to save tag."
msgstr "태그를 저장할 수 없습니다."
@@ -4420,192 +4448,192 @@ msgid "Other"
msgstr "기타"
#. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:145
+#: lib/action.php:148
#, php-format
msgid "%1$s - %2$s"
msgstr "%1$s - %2$s"
#. TRANS: Page title for a page without a title set.
-#: lib/action.php:161
+#: lib/action.php:164
msgid "Untitled page"
msgstr "제목없는 페ì´ì§€"
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:436
+#: lib/action.php:449
msgid "Primary site navigation"
msgstr "주 사ì´íЏ 네비게ì´ì…˜"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:442
+#: lib/action.php:455
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr ""
#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:445
+#: lib/action.php:458
msgctxt "MENU"
msgid "Personal"
msgstr "ê°œì¸"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:447
+#: lib/action.php:460
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "ë‹¹ì‹ ì˜ ë©”ì¼, 아바타, 비밀 번호, í”„ë¡œí•„ì„ ë³€ê²½í•˜ì„¸ìš”."
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:452
+#: lib/action.php:465
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "ì—°ê²°"
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:455
+#: lib/action.php:468
msgid "Connect"
msgstr "ì—°ê²°"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:458
+#: lib/action.php:471
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "ë©”ì¼ ì£¼ì†Œ 확ì¸"
#. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:461
+#: lib/action.php:474
msgctxt "MENU"
msgid "Admin"
msgstr "관리"
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:468
+#: lib/action.php:481
msgctxt "MENU"
msgid "Invite"
msgstr "초대"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:474
+#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "ì´ ì‚¬ì´íЏì—서 로그아웃"
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:477
+#: lib/action.php:490
msgctxt "MENU"
msgid "Logout"
msgstr "로그아웃"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:482
+#: lib/action.php:495
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "새 계정 만들기"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:485
+#: lib/action.php:498
msgctxt "MENU"
msgid "Register"
msgstr "등ë¡"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:488
+#: lib/action.php:501
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "ì´ ì‚¬ì´íŠ¸ì— ë¡œê·¸ì¸"
-#: lib/action.php:491
+#: lib/action.php:504
msgctxt "MENU"
msgid "Login"
msgstr "로그ì¸"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:494
+#: lib/action.php:507
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "ë„움ë§"
-#: lib/action.php:497
+#: lib/action.php:510
msgctxt "MENU"
msgid "Help"
msgstr "ë„움ë§"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:500
+#: lib/action.php:513
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr ""
-#: lib/action.php:503
+#: lib/action.php:516
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:525 lib/adminpanelaction.php:400
+#: lib/action.php:538 lib/adminpanelaction.php:400
msgid "Site notice"
msgstr "사ì´íЏ 공지"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:592
+#: lib/action.php:605
msgid "Local views"
msgstr "로컬 뷰"
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:659
+#: lib/action.php:675
msgid "Page notice"
msgstr "페ì´ì§€ 공지"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:762
+#: lib/action.php:778
msgid "Secondary site navigation"
msgstr "ë³´ì¡° 사ì´íЏ 네비게ì´ì…˜"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:768
+#: lib/action.php:784
msgid "Help"
msgstr "ë„움ë§"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:771
+#: lib/action.php:787
msgid "About"
msgstr "ì •ë³´"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:774
+#: lib/action.php:790
msgid "FAQ"
msgstr "ìžì£¼ 묻는 질문"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:779
+#: lib/action.php:795
msgid "TOS"
msgstr "서비스 약관"
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:783
+#: lib/action.php:799
msgid "Privacy"
msgstr "ê°œì¸ì •ë³´ 취급방침"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:786
+#: lib/action.php:802
msgid "Source"
msgstr "소스 코드"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:792
+#: lib/action.php:808
msgid "Contact"
msgstr "ì—°ë½í•˜ê¸°"
-#: lib/action.php:794
+#: lib/action.php:810
msgid "Badge"
msgstr "ë°°ì§€"
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:823
+#: lib/action.php:839
msgid "StatusNet software license"
msgstr "StatusNet 소프트웨어 ë¼ì´ì„ ìФ"
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:827
+#: lib/action.php:843
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4613,13 +4641,13 @@ msgid ""
msgstr ""
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:830
+#: lib/action.php:846
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr "**%%site.name%%** 는 마ì´í¬ë¡œë¸”로깅서비스입니다."
#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:834
+#: lib/action.php:850
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4631,50 +4659,50 @@ msgstr ""
"fsf.org/licensing/licenses/agpl-3.0.html) ë¼ì´ì„ ìŠ¤ì— ë”°ë¼ ì‚¬ìš©í•  수 있습니다."
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:850
+#: lib/action.php:866
msgid "Site content license"
msgstr "사ì´íЏ 컨í…츠 ë¼ì´ì„ ìФ"
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:857
+#: lib/action.php:873
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr "%1$sì˜ ì»¨í…츠와 ë°ì´í„°ëŠ” 외부 ìœ ì¶œì„ ê¸ˆì§€í•©ë‹ˆë‹¤."
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:864
+#: lib/action.php:880
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr "컨í…츠와 ë°ì´í„°ì˜ ì €ìž‘ê¶Œì€ %1$sì˜ ì†Œìœ ìž…ë‹ˆë‹¤. All rights reserved."
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:868
+#: lib/action.php:884
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
"컨í…츠와 ë°ì´í„°ì˜ ì €ìž‘ê¶Œì€ ê° ì´ìš©ìžì˜ 소유입니다. All rights reserved."
#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:881
+#: lib/action.php:897
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr "%1$sì˜ ëª¨ë“  컨í…츠와 ë°ì´í„°ëŠ” %2$s ë¼ì´ì„ ìŠ¤ì— ë”°ë¼ ì´ìš©í•  수 있습니다."
#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1192
+#: lib/action.php:1236
msgid "Pagination"
msgstr "페ì´ì§€ìˆ˜"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: present than the currently displayed information.
-#: lib/action.php:1203
+#: lib/action.php:1247
msgid "After"
msgstr "ë’· 페ì´ì§€"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: past than the currently displayed information.
-#: lib/action.php:1213
+#: lib/action.php:1257
msgid "Before"
msgstr "앞 페ì´ì§€"
@@ -4967,6 +4995,17 @@ msgstr ""
msgid "Error saving notice."
msgstr "ì‚¬ìš©ìž ì„¸íŒ… 오류"
+#. TRANS: Error text shown when no username was provided when issuing a subscribe command.
+#: lib/command.php:655
+msgid "Specify the name of the user to subscribe to."
+msgstr ""
+
+#. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
+#. TRANS: Error text shown when no username was provided when issuing the command.
+#: lib/command.php:694 lib/command.php:804
+msgid "Specify the name of the user to unsubscribe from."
+msgstr ""
+
#. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
#. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
#: lib/command.php:724 lib/command.php:750
@@ -5899,7 +5938,7 @@ msgstr ""
msgid "The theme file is missing or the upload failed."
msgstr ""
-#: lib/themeuploader.php:139
+#: lib/themeuploader.php:147
msgid "Invalid theme: bad directory structure."
msgstr ""
@@ -5912,18 +5951,22 @@ msgstr ""
msgid "Invalid theme archive: missing file css/display.css"
msgstr ""
-#: lib/themeuploader.php:205
+#: lib/themeuploader.php:218
msgid ""
"Theme contains invalid file or folder name. Stick with ASCII letters, "
"digits, underscore, and minus sign."
msgstr ""
-#: lib/themeuploader.php:216
+#: lib/themeuploader.php:224
+msgid "Theme contains unsafe file extension names; may be unsafe."
+msgstr ""
+
+#: lib/themeuploader.php:241
#, php-format
msgid "Theme contains file of type '.%s', which is not allowed."
msgstr ""
-#: lib/themeuploader.php:234
+#: lib/themeuploader.php:259
msgid "Error opening theme archive."
msgstr "차단 제거 ì—러!"
@@ -5990,56 +6033,56 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1102
msgid "a few seconds ago"
msgstr "몇 초 전"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1106
+#: lib/util.php:1105
msgid "about a minute ago"
msgstr "1ë¶„ ì „"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1110
+#: lib/util.php:1109
#, php-format
msgid "about %d minutes ago"
msgstr "%dë¶„ ì „"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1113
+#: lib/util.php:1112
msgid "about an hour ago"
msgstr "1시간 전"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1117
+#: lib/util.php:1116
#, php-format
msgid "about %d hours ago"
msgstr "%d시간 전"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1120
+#: lib/util.php:1119
msgid "about a day ago"
msgstr "하루 전"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1124
+#: lib/util.php:1123
#, php-format
msgid "about %d days ago"
msgstr "%dì¼ ì „"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1127
+#: lib/util.php:1126
msgid "about a month ago"
msgstr "1달 전"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1131
+#: lib/util.php:1130
#, php-format
msgid "about %d months ago"
msgstr "%d달 전"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1134
+#: lib/util.php:1133
msgid "about a year ago"
msgstr "1ë…„ ì „"
diff --git a/locale/mk/LC_MESSAGES/statusnet.po b/locale/mk/LC_MESSAGES/statusnet.po
index 982858e9c..00339c08a 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-08-28 15:28+0000\n"
-"PO-Revision-Date: 2010-08-28 15:30:59+0000\n"
+"POT-Creation-Date: 2010-09-05 09:45+0000\n"
+"PO-Revision-Date: 2010-09-05 09:46:56+0000\n"
"Language-Team: Macedonian\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r71856); Translate extension (2010-08-20)\n"
+"X-Generator: MediaWiki 1.17alpha (r72319); Translate extension (2010-08-20)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: mk\n"
"X-Message-Group: out-statusnet\n"
@@ -609,7 +609,7 @@ msgstr ""
"приÑтап до Вашата %4$s Ñметка Ñамо на трети Ñтрани на кои им верувате."
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:450
+#: actions/apioauthauthorize.php:310 lib/action.php:463
msgid "Account"
msgstr "Сметка"
@@ -1022,7 +1022,7 @@ msgstr "Ðе Ñте ÑопÑтвеник на овој програм."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1263
+#: lib/action.php:1307
msgid "There was a problem with your session token."
msgstr "Се појави проблем Ñо Вашиот ÑеÑиÑки жетон."
@@ -1949,7 +1949,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 букви."
#: actions/groupsearch.php:58
@@ -2234,7 +2234,7 @@ msgstr "Можете да додадете и лична порака во поÐ
#: actions/invite.php:198
msgctxt "BUTTON"
msgid "Send"
-msgstr "ИÑпрати"
+msgstr "Прати"
#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
#: actions/invite.php:228
@@ -2909,7 +2909,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 "
"знаци."
@@ -2991,7 +2991,7 @@ msgstr "Биографија"
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
-msgstr "Локација"
+msgstr "МеÑтоположба"
#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
@@ -2999,7 +2999,8 @@ 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
@@ -3061,7 +3062,7 @@ msgstr "Ðе можев да го подновам кориÑникот за аÐ
#: actions/profilesettings.php:363
msgid "Couldn't save location prefs."
-msgstr "Ðе можев да ги зачувам нагодувањата за локација"
+msgstr "Ðе можев да ги зачувам нагодувањата за меÑтоположба"
#: actions/profilesettings.php:375
msgid "Couldn't save profile."
@@ -4839,7 +4840,7 @@ msgid "Plugins"
msgstr "Приклучоци"
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:789
+#: actions/version.php:198 lib/action.php:805
msgid "Version"
msgstr "Верзија"
@@ -4999,7 +5000,7 @@ msgstr "Проблем при зачувувањето на групното пÑ
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1751
+#: classes/Notice.php:1757
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -5028,7 +5029,7 @@ msgid "Missing profile."
msgstr "ÐедоÑтаÑува профил."
#. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:346
+#: classes/Status_network.php:339
msgid "Unable to save tag."
msgstr "Ðе можам да ја зачувам ознаката."
@@ -5125,199 +5126,199 @@ msgid "Other"
msgstr "Друго"
#. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:145
+#: lib/action.php:148
#, php-format
msgid "%1$s - %2$s"
msgstr "%1$s - %2$s"
#. TRANS: Page title for a page without a title set.
-#: lib/action.php:161
+#: lib/action.php:164
msgid "Untitled page"
msgstr "Страница без наÑлов"
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:436
+#: lib/action.php:449
msgid "Primary site navigation"
msgstr "Главна навигација"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:442
+#: lib/action.php:455
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr "Личен профил и хронологија на пријатели"
#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:445
+#: lib/action.php:458
msgctxt "MENU"
msgid "Personal"
msgstr "Лично"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:447
+#: lib/action.php:460
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "Промена на е-пошта, аватар, лозинка, профил"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:452
+#: lib/action.php:465
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "Поврзи Ñе Ñо уÑлуги"
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:455
+#: lib/action.php:468
msgid "Connect"
msgstr "Поврзи Ñе"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:458
+#: lib/action.php:471
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "Промена на поÑтавките на мрежното меÑто"
#. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:461
+#: lib/action.php:474
msgctxt "MENU"
msgid "Admin"
msgstr "Ðдмин"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:465
+#: lib/action.php:478
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "Поканете пријатели и колеги да Ви Ñе придружат на %s"
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:468
+#: lib/action.php:481
msgctxt "MENU"
msgid "Invite"
msgstr "Покани"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:474
+#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "Одјава"
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:477
+#: lib/action.php:490
msgctxt "MENU"
msgid "Logout"
msgstr "Одјава"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:482
+#: lib/action.php:495
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Создај Ñметка"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:485
+#: lib/action.php:498
msgctxt "MENU"
msgid "Register"
msgstr "РегиÑтрација"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:488
+#: lib/action.php:501
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Ðајава"
-#: lib/action.php:491
+#: lib/action.php:504
msgctxt "MENU"
msgid "Login"
msgstr "Ðајава"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:494
+#: lib/action.php:507
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Ðапомош!"
-#: lib/action.php:497
+#: lib/action.php:510
msgctxt "MENU"
msgid "Help"
msgstr "Помош"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:500
+#: lib/action.php:513
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "Пребарајте луѓе или текÑÑ‚"
-#: lib/action.php:503
+#: lib/action.php:516
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:525 lib/adminpanelaction.php:400
+#: lib/action.php:538 lib/adminpanelaction.php:400
msgid "Site notice"
msgstr "Ðапомена за мрежното меÑто"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:592
+#: lib/action.php:605
msgid "Local views"
msgstr "Локални прегледи"
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:659
+#: lib/action.php:675
msgid "Page notice"
msgstr "Ðапомена за Ñтраницата"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:762
+#: lib/action.php:778
msgid "Secondary site navigation"
msgstr "Споредна навигација"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:768
+#: lib/action.php:784
msgid "Help"
msgstr "Помош"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:771
+#: lib/action.php:787
msgid "About"
msgstr "За"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:774
+#: lib/action.php:790
msgid "FAQ"
msgstr "ЧПП"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:779
+#: lib/action.php:795
msgid "TOS"
msgstr "УÑлови"
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:783
+#: lib/action.php:799
msgid "Privacy"
msgstr "ПриватноÑÑ‚"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:786
+#: lib/action.php:802
msgid "Source"
msgstr "Изворен код"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:792
+#: lib/action.php:808
msgid "Contact"
msgstr "Контакт"
-#: lib/action.php:794
+#: lib/action.php:810
msgid "Badge"
msgstr "Значка"
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:823
+#: lib/action.php:839
msgid "StatusNet software license"
msgstr "Лиценца на програмот StatusNet"
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:827
+#: lib/action.php:843
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5327,13 +5328,13 @@ msgstr ""
"%](%%site.broughtbyurl%%)."
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:830
+#: lib/action.php:846
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr "**%%site.name%%** е ÑÐµÑ€Ð²Ð¸Ñ Ð·Ð° микроблогирање."
#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:834
+#: lib/action.php:850
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5345,20 +5346,20 @@ msgstr ""
"(http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:850
+#: lib/action.php:866
msgid "Site content license"
msgstr "Лиценца на Ñодржините на мрежното меÑто"
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:857
+#: lib/action.php:873
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr "Содржината и податоците на %1$s Ñе лични и доверливи."
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:864
+#: lib/action.php:880
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
@@ -5366,32 +5367,32 @@ msgstr ""
"права задржани."
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:868
+#: lib/action.php:884
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
"ÐвторÑките права на Ñодржината и податоците им припаѓаат на учеÑниците. Сите "
"права задржани."
#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:881
+#: lib/action.php:897
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr "Сите Ñодржини и податоци на %1$s Ñе доÑтапни под лиценцата %2$s."
#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1192
+#: lib/action.php:1236
msgid "Pagination"
msgstr "Прелом на Ñтраници"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: present than the currently displayed information.
-#: lib/action.php:1203
+#: lib/action.php:1247
msgid "After"
msgstr "Следно"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: past than the currently displayed information.
-#: lib/action.php:1213
+#: lib/action.php:1257
msgid "Before"
msgstr "Претходно"
@@ -5649,6 +5650,31 @@ msgstr "Ðаредбата е завршена"
msgid "Command failed"
msgstr "Ðаредбата не уÑпеа"
+#. TRANS: Command exception text shown when a notice ID is requested that does not exist.
+#: lib/command.php:84 lib/command.php:108
+msgid "Notice with that id does not exist."
+msgstr "Ðе поÑтои забелешка Ñо таков id."
+
+#. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
+#. TRANS: Error text shown when a last user notice is requested and it does not exist.
+#: lib/command.php:101 lib/command.php:630
+msgid "User has no last notice."
+msgstr "КориÑникот нема поÑледна забелешка"
+
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:130
+#, php-format
+msgid "Could not find a user with nickname %s."
+msgstr "Ðе можев да пронајдам кориÑник Ñо прекар %s."
+
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:150
+#, php-format
+msgid "Could not find a local user with nickname %s."
+msgstr "Ðе можев да најдам локален кориÑник Ñо прекар %s."
+
#. TRANS: Error text shown when an unimplemented command is given.
#: lib/command.php:185
msgid "Sorry, this command is not yet implemented."
@@ -5659,6 +5685,13 @@ msgstr "Жалиме, оваа наредба Ñè уште не е имплем
msgid "It does not make a lot of sense to nudge yourself!"
msgstr "Ðема баш логика да Ñе подбуцнувате Ñами ÑебеÑи."
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:240
+#, php-format
+msgid "Nudge sent to %s."
+msgstr "ИÑпратено подбуцнување на %s."
+
#. TRANS: User statistics text.
#. TRANS: %1$s is the number of other user the user is subscribed to.
#. TRANS: %2$s is the number of users that are subscribed to the user.
@@ -5679,6 +5712,20 @@ msgstr ""
msgid "Notice marked as fave."
msgstr "Забелешката е обележана како омилена."
+#. TRANS: Message given having added a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:360
+#, php-format
+msgid "%1$s joined group %2$s."
+msgstr "%1$s Ñе зачлени во групата %2$s."
+
+#. TRANS: Message given having removed a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:408
+#, php-format
+msgid "%1$s left group %2$s."
+msgstr "%1$s ја напушти групата %2$s."
+
#. TRANS: Whois output. %s is the full name of the queried user.
#: lib/command.php:434
#, php-format
@@ -5690,7 +5737,7 @@ msgstr "Име и презиме: %s"
#: lib/command.php:438 lib/mail.php:268
#, php-format
msgid "Location: %s"
-msgstr "Локација: %s"
+msgstr "МеÑтоположба: %s"
#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
@@ -5728,21 +5775,69 @@ msgstr ""
msgid "Error sending direct message."
msgstr "Грашка при иÑпаќањето на директната порака."
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:554
+#, php-format
+msgid "Notice from %s repeated."
+msgstr "Забелешката од %s е повторена."
+
#. TRANS: Error text shown when repeating a notice fails with an unknown reason.
#: lib/command.php:557
msgid "Error repeating notice."
msgstr "Грешка при повторувањето на белешката."
+#. TRANS: Message given if content of a notice for a reply is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:592
+#, php-format
+msgid "Notice too long - maximum is %1$d characters, you sent %2$d."
+msgstr ""
+"Забелешката е предолга - треба да нема повеќе од %1$d знаци, а Вие "
+"иÑпративте %2$d."
+
+#. TRANS: Text shown having sent a reply to a notice successfully.
+#. TRANS: %s is the nickname of the user of the notice the reply was sent to.
+#: lib/command.php:603
+#, php-format
+msgid "Reply to %s sent."
+msgstr "Одговорот на %s е иÑпратен."
+
#. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
#: lib/command.php:606
msgid "Error saving notice."
msgstr "Грешка при зачувувањето на белешката."
+#. TRANS: Error text shown when no username was provided when issuing a subscribe command.
+#: lib/command.php:655
+msgid "Specify the name of the user to subscribe to."
+msgstr "Ðазначете го името на кориÑникот на којшто Ñакате да Ñе претплатите."
+
#. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
#: lib/command.php:664
msgid "Can't subscribe to OMB profiles by command."
msgstr "Ðе можете да Ñе претплаќате на OMB профили по наредба."
+#. TRANS: Text shown after having subscribed to another user successfully.
+#. TRANS: %s is the name of the user the subscription was requested for.
+#: lib/command.php:672
+#, php-format
+msgid "Subscribed to %s."
+msgstr "Претплатено на %s."
+
+#. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
+#. TRANS: Error text shown when no username was provided when issuing the command.
+#: lib/command.php:694 lib/command.php:804
+msgid "Specify the name of the user to unsubscribe from."
+msgstr "Ðазначете го името на кориÑникот од кого откажувате претплата."
+
+#. TRANS: Text shown after having unsubscribed from another user successfully.
+#. TRANS: %s is the name of the user the unsubscription was requested for.
+#: lib/command.php:705
+#, php-format
+msgid "Unsubscribed from %s."
+msgstr "Откажана претплата на %s."
+
#. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
#. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
#: lib/command.php:724 lib/command.php:750
@@ -5769,6 +5864,25 @@ msgstr "ИзвеÑтувањето е вклучено."
msgid "Can't turn on notification."
msgstr "Ðе можам да вклучам извеÑтување."
+#. TRANS: Error text shown when issuing the login command while login is disabled.
+#: lib/command.php:771
+msgid "Login command is disabled."
+msgstr "Ðаредбата за најава е оневозможена."
+
+#. TRANS: Text shown after issuing the login command successfully.
+#. TRANS: %s is a logon link..
+#: lib/command.php:784
+#, php-format
+msgid "This link is useable only once and is valid for only 2 minutes: %s."
+msgstr "Оваа врÑка може да Ñе употреби Ñамо еднаш, и трае Ñамо 2 минути: %s"
+
+#. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
+#. TRANS: %s is the name of the user the unsubscription was requested for.
+#: lib/command.php:813
+#, php-format
+msgid "Unsubscribed %s."
+msgstr "Откажана претплата на %s."
+
#. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
#: lib/command.php:831
msgid "You are not subscribed to anyone."
@@ -6024,7 +6138,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
@@ -6569,7 +6683,7 @@ msgstr "РаÑположиви знаци"
#: lib/messageform.php:178 lib/noticeform.php:237
msgctxt "Send button for sending notice"
msgid "Send"
-msgstr "ИÑпрати"
+msgstr "Прати"
#: lib/noticeform.php:160
msgid "Send a notice"
@@ -6590,11 +6704,11 @@ msgstr "Приложи податотека"
#: lib/noticeform.php:213
msgid "Share my location"
-msgstr "Споделете ја мојата локација."
+msgstr "Прикажи ја мојата меÑтоположба."
#: lib/noticeform.php:216
msgid "Do not share my location"
-msgstr "Ðе ја прикажувај мојата локација"
+msgstr "Ðе ја прикажувај мојата меÑтоположба"
#: lib/noticeform.php:217
msgid ""
@@ -6916,12 +7030,12 @@ msgid "The theme file is missing or the upload failed."
msgstr "Податотеката за изгледот недоÑтаÑува или подигањето не уÑпеало."
#: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:253 lib/themeuploader.php:257
-#: lib/themeuploader.php:265 lib/themeuploader.php:272
+#: lib/themeuploader.php:278 lib/themeuploader.php:282
+#: lib/themeuploader.php:290 lib/themeuploader.php:297
msgid "Failed saving theme."
msgstr "Зачувувањето на мотивот не уÑпеа."
-#: lib/themeuploader.php:139
+#: lib/themeuploader.php:147
msgid "Invalid theme: bad directory structure."
msgstr "Ðеважечки изглед: лош ÑоÑтав на папката."
@@ -6935,7 +7049,7 @@ msgstr ""
msgid "Invalid theme archive: missing file css/display.css"
msgstr "Ðеважечки архив за изглеедот: недоÑтаÑува податотеката css/display.css"
-#: lib/themeuploader.php:205
+#: lib/themeuploader.php:218
msgid ""
"Theme contains invalid file or folder name. Stick with ASCII letters, "
"digits, underscore, and minus sign."
@@ -6943,12 +7057,16 @@ msgstr ""
"Изгледот Ñодржи неважечки назив на податотека или папка. Дозволени Ñе Ñамо "
"ASCII-букви, бројки, долна црта и знак за минуÑ."
-#: lib/themeuploader.php:216
+#: lib/themeuploader.php:224
+msgid "Theme contains unsafe file extension names; may be unsafe."
+msgstr ""
+
+#: lib/themeuploader.php:241
#, php-format
msgid "Theme contains file of type '.%s', which is not allowed."
msgstr "Изгледот Ñодржи податотека од типот „.%s“, која не е дозволена."
-#: lib/themeuploader.php:234
+#: lib/themeuploader.php:259
msgid "Error opening theme archive."
msgstr "Грешка при отворањето на архивот за мотив."
@@ -7027,56 +7145,56 @@ msgid "Moderator"
msgstr "Модератор"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1102
msgid "a few seconds ago"
msgstr "пред неколку Ñекунди"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1106
+#: lib/util.php:1105
msgid "about a minute ago"
msgstr "пред една минута"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1110
+#: lib/util.php:1109
#, php-format
msgid "about %d minutes ago"
msgstr "пред %d минути"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1113
+#: lib/util.php:1112
msgid "about an hour ago"
msgstr "пред еден чаÑ"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1117
+#: lib/util.php:1116
#, php-format
msgid "about %d hours ago"
msgstr "пред %d чаÑа"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1120
+#: lib/util.php:1119
msgid "about a day ago"
msgstr "пред еден ден"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1124
+#: lib/util.php:1123
#, php-format
msgid "about %d days ago"
msgstr "пред %d дена"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1127
+#: lib/util.php:1126
msgid "about a month ago"
msgstr "пред еден меÑец"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1131
+#: lib/util.php:1130
#, php-format
msgid "about %d months ago"
msgstr "пред %d меÑеца"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1134
+#: lib/util.php:1133
msgid "about a year ago"
msgstr "пред една година"
diff --git a/locale/nb/LC_MESSAGES/statusnet.po b/locale/nb/LC_MESSAGES/statusnet.po
index f86e72ab2..44820c158 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-08-28 15:28+0000\n"
-"PO-Revision-Date: 2010-08-28 15:31:01+0000\n"
+"POT-Creation-Date: 2010-09-05 09:45+0000\n"
+"PO-Revision-Date: 2010-09-05 09:46:58+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 (r71856); Translate extension (2010-08-20)\n"
+"X-Generator: MediaWiki 1.17alpha (r72319); Translate extension (2010-08-20)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: no\n"
"X-Message-Group: out-statusnet\n"
@@ -474,6 +474,10 @@ msgstr "%s grupper"
msgid "groups on %s"
msgstr "grupper på %s"
+#: actions/apimediaupload.php:99
+msgid "Upload failed."
+msgstr "Opplasting feilet."
+
#: actions/apioauthauthorize.php:101
msgid "No oauth_token parameter provided."
msgstr "Ingen verdi for oauth_token er oppgitt."
@@ -556,7 +560,7 @@ msgstr ""
"$s-konto til tredjeparter du stoler på."
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:450
+#: actions/apioauthauthorize.php:310 lib/action.php:463
msgid "Account"
msgstr "Konto"
@@ -4457,31 +4461,26 @@ msgid ""
"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 ""
+msgstr "Profil-URL ‘%s’ er for en lokal bruker."
+
+#: actions/userauthorization.php:345
+#, php-format
+msgid "Avatar URL ‘%s’ is not valid."
+msgstr "Avatar-URL ‘%s’ er ikke gyldig."
#: actions/userauthorization.php:350
#, php-format
msgid "Can’t read avatar URL ‘%s’."
msgstr "Kan ikke lese avatar-URL ‘%s’"
+#: actions/userauthorization.php:355
+#, php-format
+msgid "Wrong image type for avatar URL ‘%s’."
+msgstr "Feil bildetype for avatar-URL ‘%s’."
+
#: actions/userdesignsettings.php:76 lib/designsettings.php:65
msgid "Profile design"
msgstr "Vis profilutseender"
@@ -4567,7 +4566,7 @@ msgid "Plugins"
msgstr "Programtillegg"
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:789
+#: actions/version.php:198 lib/action.php:805
msgid "Version"
msgstr "Versjon"
@@ -4629,6 +4628,11 @@ msgstr "Kunne ikke oppdatere gruppe."
msgid "Group leave failed."
msgstr "Gruppeprofil"
+#. TRANS: Server exception thrown when updating a local group fails.
+#: classes/Local_group.php:42
+msgid "Could not update local group."
+msgstr "Kunne ikke oppdatere lokal gruppe."
+
#. TRANS: Exception thrown when trying creating a login token failed.
#. TRANS: %s is the user nickname for which token creation failed.
#: classes/Login_token.php:78
@@ -4699,7 +4703,7 @@ msgstr "Problem ved lagring av gruppeinnboks."
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1751
+#: classes/Notice.php:1757
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -4718,6 +4722,11 @@ msgstr ""
msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
msgstr ""
+#. TRANS: Exception thrown when a right for a non-existing user profile is checked.
+#: classes/Remote_profile.php:54
+msgid "Missing profile."
+msgstr "Manglende profil."
+
#. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
#: classes/Subscription.php:85
msgid "User has blocked you."
@@ -4801,185 +4810,185 @@ msgid "Other"
msgstr "Andre"
#. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:145
+#: lib/action.php:148
#, php-format
msgid "%1$s - %2$s"
msgstr "%1$s - %2$s"
#. TRANS: Page title for a page without a title set.
-#: lib/action.php:161
+#: lib/action.php:164
msgid "Untitled page"
msgstr "Side uten tittel"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:442
+#: lib/action.php:455
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr ""
#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:445
+#: lib/action.php:458
msgctxt "MENU"
msgid "Personal"
msgstr "Personlig"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:447
+#: lib/action.php:460
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "Endre e-posten, avateren, passordet og profilen din"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:452
+#: lib/action.php:465
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "Koble til tjenester"
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:455
+#: lib/action.php:468
msgid "Connect"
msgstr "Koble til"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:458
+#: lib/action.php:471
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "Endre nettstedskonfigurasjon"
#. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:461
+#: lib/action.php:474
msgctxt "MENU"
msgid "Admin"
msgstr "Administrator"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:465
+#: lib/action.php:478
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "Inviter venner og kollegaer til å bli med deg på %s"
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:468
+#: lib/action.php:481
msgctxt "MENU"
msgid "Invite"
msgstr "Inviter"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:474
+#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "Logg ut fra nettstedet"
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:477
+#: lib/action.php:490
msgctxt "MENU"
msgid "Logout"
msgstr "Logg ut"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:482
+#: lib/action.php:495
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Opprett en konto"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:485
+#: lib/action.php:498
msgctxt "MENU"
msgid "Register"
msgstr "Registrer"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:488
+#: lib/action.php:501
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Log inn på nettstedet"
-#: lib/action.php:491
+#: lib/action.php:504
msgctxt "MENU"
msgid "Login"
msgstr "Logg inn"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:494
+#: lib/action.php:507
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Hjelp meg."
-#: lib/action.php:497
+#: lib/action.php:510
msgctxt "MENU"
msgid "Help"
msgstr "Hjelp"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:500
+#: lib/action.php:513
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "Søk etter personer eller tekst"
-#: lib/action.php:503
+#: lib/action.php:516
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:525 lib/adminpanelaction.php:400
+#: lib/action.php:538 lib/adminpanelaction.php:400
msgid "Site notice"
msgstr "Nettstedsnotis"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:592
+#: lib/action.php:605
msgid "Local views"
msgstr "Lokale visninger"
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:659
+#: lib/action.php:675
msgid "Page notice"
msgstr "Sidenotis"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:762
+#: lib/action.php:778
msgid "Secondary site navigation"
msgstr ""
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:768
+#: lib/action.php:784
msgid "Help"
msgstr "Hjelp"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:771
+#: lib/action.php:787
msgid "About"
msgstr "Om"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:774
+#: lib/action.php:790
msgid "FAQ"
msgstr "OSS/FAQ"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:779
+#: lib/action.php:795
msgid "TOS"
msgstr ""
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:786
+#: lib/action.php:802
msgid "Source"
msgstr "Kilde"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:792
+#: lib/action.php:808
msgid "Contact"
msgstr "Kontakt"
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:823
+#: lib/action.php:839
msgid "StatusNet software license"
msgstr "Programvarelisens for StatusNet"
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:827
+#: lib/action.php:843
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4989,13 +4998,13 @@ msgstr ""
"broughtby%%](%%site.broughtbyurl%%)."
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:830
+#: lib/action.php:846
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr "**%%site.name%%** er en mikrobloggingtjeneste."
#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:834
+#: lib/action.php:850
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5005,38 +5014,38 @@ msgstr ""
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:857
+#: lib/action.php:873
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:864
+#: lib/action.php:880
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:868
+#: lib/action.php:884
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:881
+#: lib/action.php:897
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr ""
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: present than the currently displayed information.
-#: lib/action.php:1203
+#: lib/action.php:1247
msgid "After"
msgstr "Etter"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: past than the currently displayed information.
-#: lib/action.php:1213
+#: lib/action.php:1257
msgid "Before"
msgstr "Før"
@@ -6004,10 +6013,6 @@ msgstr ""
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 ""
@@ -6181,6 +6186,11 @@ msgstr "Utboks"
msgid "Your sent messages"
msgstr "Dine sendte meldinger"
+#: lib/personaltagcloudsection.php:56
+#, php-format
+msgid "Tags in %s's notices"
+msgstr ""
+
#: lib/plugin.php:115
msgid "Unknown"
msgstr "Ukjent"
@@ -6325,7 +6335,7 @@ msgstr ""
msgid "The theme file is missing or the upload failed."
msgstr ""
-#: lib/themeuploader.php:139
+#: lib/themeuploader.php:147
msgid "Invalid theme: bad directory structure."
msgstr ""
@@ -6338,13 +6348,17 @@ msgstr ""
msgid "Invalid theme archive: missing file css/display.css"
msgstr ""
-#: lib/themeuploader.php:205
+#: lib/themeuploader.php:218
msgid ""
"Theme contains invalid file or folder name. Stick with ASCII letters, "
"digits, underscore, and minus sign."
msgstr ""
-#: lib/themeuploader.php:216
+#: lib/themeuploader.php:224
+msgid "Theme contains unsafe file extension names; may be unsafe."
+msgstr ""
+
+#: lib/themeuploader.php:241
#, php-format
msgid "Theme contains file of type '.%s', which is not allowed."
msgstr ""
@@ -6400,56 +6414,56 @@ msgid "Moderator"
msgstr "Moderator"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1102
msgid "a few seconds ago"
msgstr "noen få sekunder siden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1106
+#: lib/util.php:1105
msgid "about a minute ago"
msgstr "omtrent ett minutt siden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1110
+#: lib/util.php:1109
#, php-format
msgid "about %d minutes ago"
msgstr "omtrent %d minutter siden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1113
+#: lib/util.php:1112
msgid "about an hour ago"
msgstr "omtrent én time siden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1117
+#: lib/util.php:1116
#, php-format
msgid "about %d hours ago"
msgstr "omtrent %d timer siden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1120
+#: lib/util.php:1119
msgid "about a day ago"
msgstr "omtrent én dag siden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1124
+#: lib/util.php:1123
#, php-format
msgid "about %d days ago"
msgstr "omtrent %d dager siden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1127
+#: lib/util.php:1126
msgid "about a month ago"
msgstr "omtrent én måned siden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1131
+#: lib/util.php:1130
#, php-format
msgid "about %d months ago"
msgstr "omtrent %d måneder siden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1134
+#: lib/util.php:1133
msgid "about a year ago"
msgstr "omtrent ett år siden"
diff --git a/locale/nl/LC_MESSAGES/statusnet.po b/locale/nl/LC_MESSAGES/statusnet.po
index 7f5f40b21..5e8bc6980 100644
--- a/locale/nl/LC_MESSAGES/statusnet.po
+++ b/locale/nl/LC_MESSAGES/statusnet.po
@@ -11,12 +11,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-28 15:28+0000\n"
-"PO-Revision-Date: 2010-08-28 15:31:13+0000\n"
+"POT-Creation-Date: 2010-09-05 09:45+0000\n"
+"PO-Revision-Date: 2010-09-05 09:47:07+0000\n"
"Language-Team: Dutch\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r71856); Translate extension (2010-08-20)\n"
+"X-Generator: MediaWiki 1.17alpha (r72319); Translate extension (2010-08-20)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: nl\n"
"X-Message-Group: out-statusnet\n"
@@ -622,7 +622,7 @@ msgstr ""
"toegang tot uw gebruiker bij %4$s aan derde partijen die u vertrouwt."
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:450
+#: actions/apioauthauthorize.php:310 lib/action.php:463
msgid "Account"
msgstr "Gebruiker"
@@ -1034,7 +1034,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:1263
+#: lib/action.php:1307
msgid "There was a problem with your session token."
msgstr "Er is een probleem met uw sessietoken."
@@ -4874,7 +4874,7 @@ msgid "Plugins"
msgstr "Plug-ins"
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:789
+#: actions/version.php:198 lib/action.php:805
msgid "Version"
msgstr "Versie"
@@ -5042,7 +5042,7 @@ msgstr ""
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1751
+#: classes/Notice.php:1757
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -5071,7 +5071,7 @@ msgid "Missing profile."
msgstr "Ontbrekend profiel."
#. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:346
+#: classes/Status_network.php:339
msgid "Unable to save tag."
msgstr "Het was niet mogelijk om het label op te slaan."
@@ -5174,199 +5174,199 @@ msgid "Other"
msgstr "Overige"
#. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:145
+#: lib/action.php:148
#, php-format
msgid "%1$s - %2$s"
msgstr "%1$s - %2$s"
#. TRANS: Page title for a page without a title set.
-#: lib/action.php:161
+#: lib/action.php:164
msgid "Untitled page"
msgstr "Naamloze pagina"
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:436
+#: lib/action.php:449
msgid "Primary site navigation"
msgstr "Primaire sitenavigatie"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:442
+#: lib/action.php:455
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr "Persoonlijk profiel en tijdlijn van vrienden"
#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:445
+#: lib/action.php:458
msgctxt "MENU"
msgid "Personal"
msgstr "Persoonlijk"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:447
+#: lib/action.php:460
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:452
+#: lib/action.php:465
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "Met andere diensten koppelen"
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:455
+#: lib/action.php:468
msgid "Connect"
msgstr "Koppelen"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:458
+#: lib/action.php:471
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "Websiteinstellingen wijzigen"
#. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:461
+#: lib/action.php:474
msgctxt "MENU"
msgid "Admin"
msgstr "Beheer"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:465
+#: lib/action.php:478
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "Vrienden en collega's uitnodigen om u te vergezellen op %s"
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:468
+#: lib/action.php:481
msgctxt "MENU"
msgid "Invite"
msgstr "Uitnodigingen"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:474
+#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "Gebruiker afmelden"
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:477
+#: lib/action.php:490
msgctxt "MENU"
msgid "Logout"
msgstr "Afmelden"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:482
+#: lib/action.php:495
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Gebruiker aanmaken"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:485
+#: lib/action.php:498
msgctxt "MENU"
msgid "Register"
msgstr "Registreren"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:488
+#: lib/action.php:501
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Gebruiker aanmelden"
-#: lib/action.php:491
+#: lib/action.php:504
msgctxt "MENU"
msgid "Login"
msgstr "Aanmelden"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:494
+#: lib/action.php:507
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Help me!"
-#: lib/action.php:497
+#: lib/action.php:510
msgctxt "MENU"
msgid "Help"
msgstr "Help"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:500
+#: lib/action.php:513
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "Naar gebruikers of tekst zoeken"
-#: lib/action.php:503
+#: lib/action.php:516
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:525 lib/adminpanelaction.php:400
+#: lib/action.php:538 lib/adminpanelaction.php:400
msgid "Site notice"
msgstr "Mededeling van de website"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:592
+#: lib/action.php:605
msgid "Local views"
msgstr "Lokale weergaven"
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:659
+#: lib/action.php:675
msgid "Page notice"
msgstr "Mededeling van de pagina"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:762
+#: lib/action.php:778
msgid "Secondary site navigation"
msgstr "Secundaire sitenavigatie"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:768
+#: lib/action.php:784
msgid "Help"
msgstr "Help"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:771
+#: lib/action.php:787
msgid "About"
msgstr "Over"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:774
+#: lib/action.php:790
msgid "FAQ"
msgstr "Veel gestelde vragen"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:779
+#: lib/action.php:795
msgid "TOS"
msgstr "Gebruiksvoorwaarden"
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:783
+#: lib/action.php:799
msgid "Privacy"
msgstr "Privacy"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:786
+#: lib/action.php:802
msgid "Source"
msgstr "Broncode"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:792
+#: lib/action.php:808
msgid "Contact"
msgstr "Contact"
-#: lib/action.php:794
+#: lib/action.php:810
msgid "Badge"
msgstr "Widget"
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:823
+#: lib/action.php:839
msgid "StatusNet software license"
msgstr "Licentie van de StatusNet-software"
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:827
+#: lib/action.php:843
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5376,13 +5376,13 @@ msgstr ""
"broughtbyurl%%)."
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:830
+#: lib/action.php:846
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr "**%%site.name%%** is een microblogdienst."
#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:834
+#: lib/action.php:850
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5394,20 +5394,20 @@ msgstr ""
"www.fsf.org/licensing/licenses/agpl-3.0.html)."
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:850
+#: lib/action.php:866
msgid "Site content license"
msgstr "Licentie voor siteinhoud"
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:857
+#: lib/action.php:873
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr "Inhoud en gegevens van %1$s zijn persoonlijk en vertrouwelijk."
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:864
+#: lib/action.php:880
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
@@ -5415,33 +5415,33 @@ msgstr ""
"voorbehouden."
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:868
+#: lib/action.php:884
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
"Auteursrechten op inhoud en gegevens rusten bij de respectievelijke "
"gebruikers. Alle rechten voorbehouden."
#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:881
+#: lib/action.php:897
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr ""
"Alle inhoud en gegevens van %1$s zijn beschikbaar onder de licentie %2$s."
#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1192
+#: lib/action.php:1236
msgid "Pagination"
msgstr "Paginering"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: present than the currently displayed information.
-#: lib/action.php:1203
+#: lib/action.php:1247
msgid "After"
msgstr "Later"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: past than the currently displayed information.
-#: lib/action.php:1213
+#: lib/action.php:1257
msgid "Before"
msgstr "Eerder"
@@ -5699,6 +5699,31 @@ msgstr "Het commando is uitgevoerd"
msgid "Command failed"
msgstr "Het uitvoeren van het commando is mislukt"
+#. TRANS: Command exception text shown when a notice ID is requested that does not exist.
+#: lib/command.php:84 lib/command.php:108
+msgid "Notice with that id does not exist."
+msgstr "Er bestaat geen mededeling met dat ID."
+
+#. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
+#. TRANS: Error text shown when a last user notice is requested and it does not exist.
+#: lib/command.php:101 lib/command.php:630
+msgid "User has no last notice."
+msgstr "Deze gebruiker heeft geen laatste mededeling."
+
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:130
+#, php-format
+msgid "Could not find a user with nickname %s."
+msgstr "De gebruiker %s is niet aangetroffen."
+
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:150
+#, php-format
+msgid "Could not find a local user with nickname %s."
+msgstr "De lokale gebruiker %s is niet aangetroffen."
+
#. TRANS: Error text shown when an unimplemented command is given.
#: lib/command.php:185
msgid "Sorry, this command is not yet implemented."
@@ -5709,6 +5734,13 @@ msgstr "Dit commando is nog niet geïmplementeerd."
msgid "It does not make a lot of sense to nudge yourself!"
msgstr "Het heeft niet zoveel zin om uzelf te porren..."
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:240
+#, php-format
+msgid "Nudge sent to %s."
+msgstr "De por naar %s is verzonden."
+
#. TRANS: User statistics text.
#. TRANS: %1$s is the number of other user the user is subscribed to.
#. TRANS: %2$s is the number of users that are subscribed to the user.
@@ -5729,6 +5761,20 @@ msgstr ""
msgid "Notice marked as fave."
msgstr "De mededeling is op de favorietenlijst geplaatst."
+#. TRANS: Message given having added a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:360
+#, php-format
+msgid "%1$s joined group %2$s."
+msgstr "%1$s is lid geworden van de groep %2$s."
+
+#. TRANS: Message given having removed a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:408
+#, php-format
+msgid "%1$s left group %2$s."
+msgstr "%1$s heeft de groep %2$s verlaten."
+
#. TRANS: Whois output. %s is the full name of the queried user.
#: lib/command.php:434
#, php-format
@@ -5779,21 +5825,70 @@ msgstr ""
msgid "Error sending direct message."
msgstr "Er is een fout opgetreden bij het verzonden van het directe bericht."
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:554
+#, php-format
+msgid "Notice from %s repeated."
+msgstr "De mededeling van %s is herhaald."
+
#. TRANS: Error text shown when repeating a notice fails with an unknown reason.
#: lib/command.php:557
msgid "Error repeating notice."
msgstr "Er is een fout opgetreden bij het herhalen van de mededeling."
+#. TRANS: Message given if content of a notice for a reply is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:592
+#, php-format
+msgid "Notice too long - maximum is %1$d characters, you sent %2$d."
+msgstr ""
+"De mededeling is te lang. De maximale lengte is %1$d tekens. Uw mededeling "
+"bevatte %2$d tekens."
+
+#. TRANS: Text shown having sent a reply to a notice successfully.
+#. TRANS: %s is the nickname of the user of the notice the reply was sent to.
+#: lib/command.php:603
+#, php-format
+msgid "Reply to %s sent."
+msgstr "Het antwoord aan %s is verzonden."
+
#. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
#: lib/command.php:606
msgid "Error saving notice."
msgstr "Er is een fout opgetreden bij het opslaan van de mededeling."
+#. TRANS: Error text shown when no username was provided when issuing a subscribe command.
+#: lib/command.php:655
+msgid "Specify the name of the user to subscribe to."
+msgstr "Geef de naam op van de gebruiker waarop u zich wilt abonneren."
+
#. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
#: lib/command.php:664
msgid "Can't subscribe to OMB profiles by command."
msgstr "Abonneren op OMB-profielen op commando is niet mogelijk."
+#. TRANS: Text shown after having subscribed to another user successfully.
+#. TRANS: %s is the name of the user the subscription was requested for.
+#: lib/command.php:672
+#, php-format
+msgid "Subscribed to %s."
+msgstr "Geabonneerd op %s."
+
+#. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
+#. TRANS: Error text shown when no username was provided when issuing the command.
+#: lib/command.php:694 lib/command.php:804
+msgid "Specify the name of the user to unsubscribe from."
+msgstr ""
+"Geef de naam op van de gebruiker waarop u het abonnement wilt opzeggen."
+
+#. TRANS: Text shown after having unsubscribed from another user successfully.
+#. TRANS: %s is the name of the user the unsubscription was requested for.
+#: lib/command.php:705
+#, php-format
+msgid "Unsubscribed from %s."
+msgstr "Uw abonnement op %s is opgezegd."
+
#. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
#. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
#: lib/command.php:724 lib/command.php:750
@@ -5820,6 +5915,27 @@ msgstr "Notificaties ingeschakeld."
msgid "Can't turn on notification."
msgstr "Het is niet mogelijk de notificatie uit te schakelen."
+#. TRANS: Error text shown when issuing the login command while login is disabled.
+#: lib/command.php:771
+msgid "Login command is disabled."
+msgstr "Het aanmeldcommando is uitgeschakeld."
+
+#. TRANS: Text shown after issuing the login command successfully.
+#. TRANS: %s is a logon link..
+#: lib/command.php:784
+#, php-format
+msgid "This link is useable only once and is valid for only 2 minutes: %s."
+msgstr ""
+"Deze verwijzing kan slechts één keer gebruikt worden en is twee minuten "
+"geldig: %s."
+
+#. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
+#. TRANS: %s is the name of the user the unsubscription was requested for.
+#: lib/command.php:813
+#, php-format
+msgid "Unsubscribed %s."
+msgstr "Het abonnement van %s is opgeheven."
+
#. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
#: lib/command.php:831
msgid "You are not subscribed to anyone."
@@ -6978,12 +7094,12 @@ msgid "The theme file is missing or the upload failed."
msgstr "Het vormgevingsbestand ontbreekt of is de upload mislukt."
#: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:253 lib/themeuploader.php:257
-#: lib/themeuploader.php:265 lib/themeuploader.php:272
+#: lib/themeuploader.php:278 lib/themeuploader.php:282
+#: lib/themeuploader.php:290 lib/themeuploader.php:297
msgid "Failed saving theme."
msgstr "Het opslaan van de vormgeving is mislukt."
-#: lib/themeuploader.php:139
+#: lib/themeuploader.php:147
msgid "Invalid theme: bad directory structure."
msgstr "Ongeldige vormgeving: de mappenstructuur is onjuist."
@@ -6999,7 +7115,7 @@ msgid "Invalid theme archive: missing file css/display.css"
msgstr ""
"Ongeldig bestand met vormgeving: het bestand css/display.css is niet aanwezig"
-#: lib/themeuploader.php:205
+#: lib/themeuploader.php:218
msgid ""
"Theme contains invalid file or folder name. Stick with ASCII letters, "
"digits, underscore, and minus sign."
@@ -7007,13 +7123,17 @@ msgstr ""
"De vormgeving bevat een ongeldige bestandsnaam of mapnaam. Gebruik alleen "
"maar ASCII-letters, getallen, liggende streepjes en het minteken."
-#: lib/themeuploader.php:216
+#: lib/themeuploader.php:224
+msgid "Theme contains unsafe file extension names; may be unsafe."
+msgstr ""
+
+#: lib/themeuploader.php:241
#, php-format
msgid "Theme contains file of type '.%s', which is not allowed."
msgstr ""
"De vormgeving bevat een bestand van het type \".%s\". Dit is niet toegestaan."
-#: lib/themeuploader.php:234
+#: lib/themeuploader.php:259
msgid "Error opening theme archive."
msgstr ""
"Er is een fout opgetreden tijdens het openen van het archiefbestand met de "
@@ -7094,56 +7214,56 @@ msgid "Moderator"
msgstr "Moderator"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1102
msgid "a few seconds ago"
msgstr "een paar seconden geleden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1106
+#: lib/util.php:1105
msgid "about a minute ago"
msgstr "ongeveer een minuut geleden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1110
+#: lib/util.php:1109
#, php-format
msgid "about %d minutes ago"
msgstr "ongeveer %d minuten geleden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1113
+#: lib/util.php:1112
msgid "about an hour ago"
msgstr "ongeveer een uur geleden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1117
+#: lib/util.php:1116
#, php-format
msgid "about %d hours ago"
msgstr "ongeveer %d uur geleden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1120
+#: lib/util.php:1119
msgid "about a day ago"
msgstr "ongeveer een dag geleden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1124
+#: lib/util.php:1123
#, php-format
msgid "about %d days ago"
msgstr "ongeveer %d dagen geleden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1127
+#: lib/util.php:1126
msgid "about a month ago"
msgstr "ongeveer een maand geleden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1131
+#: lib/util.php:1130
#, php-format
msgid "about %d months ago"
msgstr "ongeveer %d maanden geleden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1134
+#: lib/util.php:1133
msgid "about a year ago"
msgstr "ongeveer een jaar geleden"
diff --git a/locale/nn/LC_MESSAGES/statusnet.po b/locale/nn/LC_MESSAGES/statusnet.po
index 11c61934f..4dd5d023c 100644
--- a/locale/nn/LC_MESSAGES/statusnet.po
+++ b/locale/nn/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-28 15:28+0000\n"
-"PO-Revision-Date: 2010-08-28 15:31:06+0000\n"
+"POT-Creation-Date: 2010-09-05 09:45+0000\n"
+"PO-Revision-Date: 2010-09-05 09:47:02+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 (r71856); Translate extension (2010-08-20)\n"
+"X-Generator: MediaWiki 1.17alpha (r72319); Translate extension (2010-08-20)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: nn\n"
"X-Message-Group: out-statusnet\n"
@@ -379,7 +379,7 @@ msgid ""
msgstr ""
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:450
+#: actions/apioauthauthorize.php:310 lib/action.php:463
msgid "Account"
msgstr "Konto"
@@ -693,7 +693,7 @@ msgstr "Fann ikkje stadfestingskode."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1263
+#: lib/action.php:1307
msgid "There was a problem with your session token."
msgstr "Det var eit problem med sesjons billetten din."
@@ -3739,7 +3739,7 @@ msgstr ""
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1751
+#: classes/Notice.php:1757
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -3759,7 +3759,7 @@ msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
msgstr ""
#. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:346
+#: classes/Status_network.php:339
msgid "Unable to save tag."
msgstr "Kunne ikkje lagra emneord."
@@ -3829,137 +3829,137 @@ msgid "Other"
msgstr "Anna"
#. TRANS: Page title for a page without a title set.
-#: lib/action.php:161
+#: lib/action.php:164
msgid "Untitled page"
msgstr "Ingen tittel"
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:436
+#: lib/action.php:449
msgid "Primary site navigation"
msgstr "Navigasjon for hovudsida"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:442
+#: lib/action.php:455
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr ""
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:447
+#: lib/action.php:460
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "Endra passordet ditt"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:452
+#: lib/action.php:465
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr ""
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:455
+#: lib/action.php:468
msgid "Connect"
msgstr "Kopla til"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:474
+#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "Logg inn "
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:477
+#: lib/action.php:490
msgctxt "MENU"
msgid "Logout"
msgstr "Logo"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:482
+#: lib/action.php:495
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Opprett ei ny gruppe"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:488
+#: lib/action.php:501
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Logg inn "
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:494
+#: lib/action.php:507
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Hjelp"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:500
+#: lib/action.php:513
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr ""
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:525 lib/adminpanelaction.php:400
+#: lib/action.php:538 lib/adminpanelaction.php:400
msgid "Site notice"
msgstr "Statusmelding"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:592
+#: lib/action.php:605
msgid "Local views"
msgstr "Lokale syningar"
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:659
+#: lib/action.php:675
msgid "Page notice"
msgstr "Sidenotis"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:762
+#: lib/action.php:778
msgid "Secondary site navigation"
msgstr "Andrenivås side navigasjon"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:768
+#: lib/action.php:784
msgid "Help"
msgstr "Hjelp"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:771
+#: lib/action.php:787
msgid "About"
msgstr "Om"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:774
+#: lib/action.php:790
msgid "FAQ"
msgstr "OSS"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:779
+#: lib/action.php:795
msgid "TOS"
msgstr ""
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:783
+#: lib/action.php:799
msgid "Privacy"
msgstr "Personvern"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:786
+#: lib/action.php:802
msgid "Source"
msgstr "Kjeldekode"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:792
+#: lib/action.php:808
msgid "Contact"
msgstr "Kontakt"
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:823
+#: lib/action.php:839
msgid "StatusNet software license"
msgstr "StatusNets programvarelisens"
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:827
+#: lib/action.php:843
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -3967,13 +3967,13 @@ msgid ""
msgstr ""
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:830
+#: lib/action.php:846
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr "**%%site.name%%** er ei mikrobloggingteneste."
#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:834
+#: lib/action.php:850
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -3986,43 +3986,43 @@ msgstr ""
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:857
+#: lib/action.php:873
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:864
+#: lib/action.php:880
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:868
+#: lib/action.php:884
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:881
+#: lib/action.php:897
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr ""
#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1192
+#: lib/action.php:1236
msgid "Pagination"
msgstr "Paginering"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: present than the currently displayed information.
-#: lib/action.php:1203
+#: lib/action.php:1247
msgid "After"
msgstr "« Etter"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: past than the currently displayed information.
-#: lib/action.php:1213
+#: lib/action.php:1257
msgid "Before"
msgstr "Før »"
@@ -4242,6 +4242,17 @@ msgstr "Feil ved å setja brukar."
msgid "Notice too long - maximum is %1$d characters, you sent %2$d."
msgstr ""
+#. TRANS: Error text shown when no username was provided when issuing a subscribe command.
+#: lib/command.php:655
+msgid "Specify the name of the user to subscribe to."
+msgstr ""
+
+#. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
+#. TRANS: Error text shown when no username was provided when issuing the command.
+#: lib/command.php:694 lib/command.php:804
+msgid "Specify the name of the user to unsubscribe from."
+msgstr ""
+
#. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
#. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
#: lib/command.php:724 lib/command.php:750
@@ -5146,7 +5157,7 @@ msgstr ""
msgid "The theme file is missing or the upload failed."
msgstr ""
-#: lib/themeuploader.php:139
+#: lib/themeuploader.php:147
msgid "Invalid theme: bad directory structure."
msgstr ""
@@ -5159,18 +5170,22 @@ msgstr ""
msgid "Invalid theme archive: missing file css/display.css"
msgstr ""
-#: lib/themeuploader.php:205
+#: lib/themeuploader.php:218
msgid ""
"Theme contains invalid file or folder name. Stick with ASCII letters, "
"digits, underscore, and minus sign."
msgstr ""
-#: lib/themeuploader.php:216
+#: lib/themeuploader.php:224
+msgid "Theme contains unsafe file extension names; may be unsafe."
+msgstr ""
+
+#: lib/themeuploader.php:241
#, php-format
msgid "Theme contains file of type '.%s', which is not allowed."
msgstr ""
-#: lib/themeuploader.php:234
+#: lib/themeuploader.php:259
msgid "Error opening theme archive."
msgstr "Feil ved fjerning av blokka."
@@ -5229,56 +5244,56 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1102
msgid "a few seconds ago"
msgstr "eit par sekund sidan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1106
+#: lib/util.php:1105
msgid "about a minute ago"
msgstr "omtrent eitt minutt sidan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1110
+#: lib/util.php:1109
#, php-format
msgid "about %d minutes ago"
msgstr "~%d minutt sidan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1113
+#: lib/util.php:1112
msgid "about an hour ago"
msgstr "omtrent ein time sidan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1117
+#: lib/util.php:1116
#, php-format
msgid "about %d hours ago"
msgstr "~%d timar sidan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1120
+#: lib/util.php:1119
msgid "about a day ago"
msgstr "omtrent ein dag sidan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1124
+#: lib/util.php:1123
#, php-format
msgid "about %d days ago"
msgstr "~%d dagar sidan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1127
+#: lib/util.php:1126
msgid "about a month ago"
msgstr "omtrent ein månad sidan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1131
+#: lib/util.php:1130
#, php-format
msgid "about %d months ago"
msgstr "~%d månadar sidan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1134
+#: lib/util.php:1133
msgid "about a year ago"
msgstr "omtrent eitt år sidan"
diff --git a/locale/pl/LC_MESSAGES/statusnet.po b/locale/pl/LC_MESSAGES/statusnet.po
index 26e00b482..eb826b7d1 100644
--- a/locale/pl/LC_MESSAGES/statusnet.po
+++ b/locale/pl/LC_MESSAGES/statusnet.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-28 15:28+0000\n"
-"PO-Revision-Date: 2010-08-28 15:31:15+0000\n"
+"POT-Creation-Date: 2010-09-05 09:45+0000\n"
+"PO-Revision-Date: 2010-09-05 09:47:09+0000\n"
"Last-Translator: Piotr DrÄ…g <piotrdrag@gmail.com>\n"
"Language-Team: Polish <pl@li.org>\n"
"MIME-Version: 1.0\n"
@@ -20,7 +20,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
"|| n%100>=20) ? 1 : 2);\n"
-"X-Generator: MediaWiki 1.17alpha (r71856); Translate extension (2010-08-20)\n"
+"X-Generator: MediaWiki 1.17alpha (r72319); Translate extension (2010-08-20)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: pl\n"
"X-Message-Group: out-statusnet\n"
@@ -611,7 +611,7 @@ msgstr ""
"$s powinien być udostępniany tylko zaufanym osobom trzecim."
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:450
+#: actions/apioauthauthorize.php:310 lib/action.php:463
msgid "Account"
msgstr "Konto"
@@ -1019,7 +1019,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:1263
+#: lib/action.php:1307
msgid "There was a problem with your session token."
msgstr "Wystąpił problem z tokenem sesji."
@@ -4809,7 +4809,7 @@ msgid "Plugins"
msgstr "Wtyczki"
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:789
+#: actions/version.php:198 lib/action.php:805
msgid "Version"
msgstr "Wersja"
@@ -4971,7 +4971,7 @@ msgstr "Problem podczas zapisywania skrzynki odbiorczej grupy."
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1751
+#: classes/Notice.php:1757
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -4997,7 +4997,7 @@ msgid "Missing profile."
msgstr "Brak profilu."
#. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:346
+#: classes/Status_network.php:339
msgid "Unable to save tag."
msgstr "Nie można zapisać etykiety."
@@ -5099,199 +5099,199 @@ msgid "Other"
msgstr "Inne"
#. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:145
+#: lib/action.php:148
#, php-format
msgid "%1$s - %2$s"
msgstr "%1$s - %2$s"
#. TRANS: Page title for a page without a title set.
-#: lib/action.php:161
+#: lib/action.php:164
msgid "Untitled page"
msgstr "Strona bez nazwy"
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:436
+#: lib/action.php:449
msgid "Primary site navigation"
msgstr "Główna nawigacja witryny"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:442
+#: lib/action.php:455
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr "Profil osobisty i oś czasu przyjaciół"
#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:445
+#: lib/action.php:458
msgctxt "MENU"
msgid "Personal"
msgstr "Osobiste"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:447
+#: lib/action.php:460
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:452
+#: lib/action.php:465
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "Połącz z serwisami"
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:455
+#: lib/action.php:468
msgid "Connect"
msgstr "Połącz"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:458
+#: lib/action.php:471
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "Zmień konfigurację witryny"
#. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:461
+#: lib/action.php:474
msgctxt "MENU"
msgid "Admin"
msgstr "Administrator"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:465
+#: lib/action.php:478
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "Zaproś przyjaciół i kolegów do dołączenia do ciebie na %s"
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:468
+#: lib/action.php:481
msgctxt "MENU"
msgid "Invite"
msgstr "ZaproÅ›"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:474
+#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "Wyloguj siÄ™ z witryny"
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:477
+#: lib/action.php:490
msgctxt "MENU"
msgid "Logout"
msgstr "Wyloguj siÄ™"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:482
+#: lib/action.php:495
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Utwórz konto"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:485
+#: lib/action.php:498
msgctxt "MENU"
msgid "Register"
msgstr "Zarejestruj siÄ™"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:488
+#: lib/action.php:501
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Zaloguj siÄ™ na witrynie"
-#: lib/action.php:491
+#: lib/action.php:504
msgctxt "MENU"
msgid "Login"
msgstr "Zaloguj siÄ™"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:494
+#: lib/action.php:507
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Pomóż mi."
-#: lib/action.php:497
+#: lib/action.php:510
msgctxt "MENU"
msgid "Help"
msgstr "Pomoc"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:500
+#: lib/action.php:513
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "Wyszukaj osoby lub tekst"
-#: lib/action.php:503
+#: lib/action.php:516
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:525 lib/adminpanelaction.php:400
+#: lib/action.php:538 lib/adminpanelaction.php:400
msgid "Site notice"
msgstr "Wpis witryny"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:592
+#: lib/action.php:605
msgid "Local views"
msgstr "Lokalne widoki"
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:659
+#: lib/action.php:675
msgid "Page notice"
msgstr "Wpis strony"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:762
+#: lib/action.php:778
msgid "Secondary site navigation"
msgstr "Druga nawigacja witryny"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:768
+#: lib/action.php:784
msgid "Help"
msgstr "Pomoc"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:771
+#: lib/action.php:787
msgid "About"
msgstr "O usłudze"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:774
+#: lib/action.php:790
msgid "FAQ"
msgstr "FAQ"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:779
+#: lib/action.php:795
msgid "TOS"
msgstr "TOS"
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:783
+#: lib/action.php:799
msgid "Privacy"
msgstr "Prywatność"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:786
+#: lib/action.php:802
msgid "Source"
msgstr "Kod źródłowy"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:792
+#: lib/action.php:808
msgid "Contact"
msgstr "Kontakt"
-#: lib/action.php:794
+#: lib/action.php:810
msgid "Badge"
msgstr "Odznaka"
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:823
+#: lib/action.php:839
msgid "StatusNet software license"
msgstr "Licencja oprogramowania StatusNet"
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:827
+#: lib/action.php:843
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5301,13 +5301,13 @@ msgstr ""
"broughtby%%](%%site.broughtbyurl%%)."
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:830
+#: lib/action.php:846
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr "**%%site.name%%** jest usługą mikroblogowania."
#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:834
+#: lib/action.php:850
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5319,20 +5319,20 @@ msgstr ""
"Affero](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:850
+#: lib/action.php:866
msgid "Site content license"
msgstr "Licencja zawartości witryny"
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:857
+#: lib/action.php:873
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr "Treść i dane %1$s są prywatne i poufne."
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:864
+#: lib/action.php:880
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
@@ -5340,14 +5340,14 @@ msgstr ""
"zastrzeżone."
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:868
+#: lib/action.php:884
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
"Prawa autorskie do treści i danych są własnością współtwórców. Wszystkie "
"prawa zastrzeżone."
#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:881
+#: lib/action.php:897
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr ""
@@ -5355,19 +5355,19 @@ msgstr ""
"$s."
#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1192
+#: lib/action.php:1236
msgid "Pagination"
msgstr "Paginacja"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: present than the currently displayed information.
-#: lib/action.php:1203
+#: lib/action.php:1247
msgid "After"
msgstr "Później"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: past than the currently displayed information.
-#: lib/action.php:1213
+#: lib/action.php:1257
msgid "Before"
msgstr "Wcześniej"
@@ -5625,6 +5625,31 @@ msgstr "Zakończono polecenie"
msgid "Command failed"
msgstr "Polecenie nie powiodło się"
+#. TRANS: Command exception text shown when a notice ID is requested that does not exist.
+#: lib/command.php:84 lib/command.php:108
+msgid "Notice with that id does not exist."
+msgstr "Wpis z tym identyfikatorem nie istnieje."
+
+#. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
+#. TRANS: Error text shown when a last user notice is requested and it does not exist.
+#: lib/command.php:101 lib/command.php:630
+msgid "User has no last notice."
+msgstr "Użytkownik nie posiada ostatniego wpisu."
+
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:130
+#, php-format
+msgid "Could not find a user with nickname %s."
+msgstr "Nie można odnaleźć użytkownika z pseudonimem %s."
+
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:150
+#, php-format
+msgid "Could not find a local user with nickname %s."
+msgstr "Nie można odnaleźć lokalnego użytkownika o pseudonimie %s."
+
#. TRANS: Error text shown when an unimplemented command is given.
#: lib/command.php:185
msgid "Sorry, this command is not yet implemented."
@@ -5635,6 +5660,13 @@ msgstr "Te polecenie nie zostało jeszcze zaimplementowane."
msgid "It does not make a lot of sense to nudge yourself!"
msgstr "Szturchanie samego siebie nie ma zbyt wiele sensu."
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:240
+#, php-format
+msgid "Nudge sent to %s."
+msgstr "Wysłano szturchnięcie do użytkownika %s."
+
#. TRANS: User statistics text.
#. TRANS: %1$s is the number of other user the user is subscribed to.
#. TRANS: %2$s is the number of users that are subscribed to the user.
@@ -5655,6 +5687,20 @@ msgstr ""
msgid "Notice marked as fave."
msgstr "Zaznaczono wpis jako ulubiony."
+#. TRANS: Message given having added a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:360
+#, php-format
+msgid "%1$s joined group %2$s."
+msgstr "Użytkownik %1$s dołączył do grupy %2$s."
+
+#. TRANS: Message given having removed a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:408
+#, php-format
+msgid "%1$s left group %2$s."
+msgstr "Użytkownik %1$s opuścił grupę %2$s."
+
#. TRANS: Whois output. %s is the full name of the queried user.
#: lib/command.php:434
#, php-format
@@ -5703,21 +5749,67 @@ msgstr "Wiadomość jest za długa - maksymalnie %1$d znaków, wysłano %2$d."
msgid "Error sending direct message."
msgstr "Błąd podczas wysyłania bezpośredniej wiadomości."
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:554
+#, php-format
+msgid "Notice from %s repeated."
+msgstr "Powtórzono wpis od użytkownika %s."
+
#. TRANS: Error text shown when repeating a notice fails with an unknown reason.
#: lib/command.php:557
msgid "Error repeating notice."
msgstr "Błąd podczas powtarzania wpisu."
+#. TRANS: Message given if content of a notice for a reply is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:592
+#, php-format
+msgid "Notice too long - maximum is %1$d characters, you sent %2$d."
+msgstr "Wpis jest za długi - maksymalnie %1$d znaków, wysłano %2$d."
+
+#. TRANS: Text shown having sent a reply to a notice successfully.
+#. TRANS: %s is the nickname of the user of the notice the reply was sent to.
+#: lib/command.php:603
+#, php-format
+msgid "Reply to %s sent."
+msgstr "Wysłano odpowiedź do %s."
+
#. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
#: lib/command.php:606
msgid "Error saving notice."
msgstr "Błąd podczas zapisywania wpisu."
+#. TRANS: Error text shown when no username was provided when issuing a subscribe command.
+#: lib/command.php:655
+msgid "Specify the name of the user to subscribe to."
+msgstr "Podaj nazwę użytkownika do subskrybowania."
+
#. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
#: lib/command.php:664
msgid "Can't subscribe to OMB profiles by command."
msgstr "Nie można subskrybować profili OMB za pomocą polecenia."
+#. TRANS: Text shown after having subscribed to another user successfully.
+#. TRANS: %s is the name of the user the subscription was requested for.
+#: lib/command.php:672
+#, php-format
+msgid "Subscribed to %s."
+msgstr "Subskrybowano użytkownika %s."
+
+#. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
+#. TRANS: Error text shown when no username was provided when issuing the command.
+#: lib/command.php:694 lib/command.php:804
+msgid "Specify the name of the user to unsubscribe from."
+msgstr "Podaj nazwę użytkownika do usunięcia subskrypcji."
+
+#. TRANS: Text shown after having unsubscribed from another user successfully.
+#. TRANS: %s is the name of the user the unsubscription was requested for.
+#: lib/command.php:705
+#, php-format
+msgid "Unsubscribed from %s."
+msgstr "Usunięto subskrypcję użytkownika %s."
+
#. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
#. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
#: lib/command.php:724 lib/command.php:750
@@ -5744,6 +5836,26 @@ msgstr "Włączono powiadomienia."
msgid "Can't turn on notification."
msgstr "Nie można włączyć powiadomień."
+#. TRANS: Error text shown when issuing the login command while login is disabled.
+#: lib/command.php:771
+msgid "Login command is disabled."
+msgstr "Polecenie logowania jest wyłączone."
+
+#. TRANS: Text shown after issuing the login command successfully.
+#. TRANS: %s is a logon link..
+#: lib/command.php:784
+#, php-format
+msgid "This link is useable only once and is valid for only 2 minutes: %s."
+msgstr ""
+"Tego odnośnika można użyć tylko raz i jest ważny przez dwie minuty: %s."
+
+#. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
+#. TRANS: %s is the name of the user the unsubscription was requested for.
+#: lib/command.php:813
+#, php-format
+msgid "Unsubscribed %s."
+msgstr "Usunięto subskrypcję użytkownika %s."
+
#. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
#: lib/command.php:831
msgid "You are not subscribed to anyone."
@@ -6897,12 +7009,12 @@ msgid "The theme file is missing or the upload failed."
msgstr "Brak pliku motywu lub wysłanie nie powiodło się."
#: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:253 lib/themeuploader.php:257
-#: lib/themeuploader.php:265 lib/themeuploader.php:272
+#: lib/themeuploader.php:278 lib/themeuploader.php:282
+#: lib/themeuploader.php:290 lib/themeuploader.php:297
msgid "Failed saving theme."
msgstr "Zapisanie motywu nie powiodło się."
-#: lib/themeuploader.php:139
+#: lib/themeuploader.php:147
msgid "Invalid theme: bad directory structure."
msgstr "Nieprawidłowy motyw: błędna struktura katalogów."
@@ -6917,7 +7029,7 @@ msgstr ""
msgid "Invalid theme archive: missing file css/display.css"
msgstr "Nieprawidłowe archiwum motywu: brak pliku css/display.css"
-#: lib/themeuploader.php:205
+#: lib/themeuploader.php:218
msgid ""
"Theme contains invalid file or folder name. Stick with ASCII letters, "
"digits, underscore, and minus sign."
@@ -6925,12 +7037,16 @@ msgstr ""
"Motyw zawiera nieprawidłowy plik lub nazwę katalogu. Należy używać tylko "
"liter, cyfr, podkreślników i znaku minus z zestawu ASCII."
-#: lib/themeuploader.php:216
+#: lib/themeuploader.php:224
+msgid "Theme contains unsafe file extension names; may be unsafe."
+msgstr ""
+
+#: lib/themeuploader.php:241
#, php-format
msgid "Theme contains file of type '.%s', which is not allowed."
msgstr "Motyw zawiera plik typu \\\".%s\\\", który nie jest dozwolony."
-#: lib/themeuploader.php:234
+#: lib/themeuploader.php:259
msgid "Error opening theme archive."
msgstr "Błąd podczas otwierania archiwum motywu."
@@ -7009,56 +7125,56 @@ msgid "Moderator"
msgstr "Moderator"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1102
msgid "a few seconds ago"
msgstr "kilka sekund temu"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1106
+#: lib/util.php:1105
msgid "about a minute ago"
msgstr "około minutę temu"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1110
+#: lib/util.php:1109
#, php-format
msgid "about %d minutes ago"
msgstr "około %d minut temu"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1113
+#: lib/util.php:1112
msgid "about an hour ago"
msgstr "około godzinę temu"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1117
+#: lib/util.php:1116
#, php-format
msgid "about %d hours ago"
msgstr "około %d godzin temu"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1120
+#: lib/util.php:1119
msgid "about a day ago"
msgstr "blisko dzień temu"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1124
+#: lib/util.php:1123
#, php-format
msgid "about %d days ago"
msgstr "około %d dni temu"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1127
+#: lib/util.php:1126
msgid "about a month ago"
msgstr "około miesiąc temu"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1131
+#: lib/util.php:1130
#, php-format
msgid "about %d months ago"
msgstr "około %d miesięcy temu"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1134
+#: lib/util.php:1133
msgid "about a year ago"
msgstr "około rok temu"
diff --git a/locale/pt/LC_MESSAGES/statusnet.po b/locale/pt/LC_MESSAGES/statusnet.po
index 1b3853931..8b0f8901b 100644
--- a/locale/pt/LC_MESSAGES/statusnet.po
+++ b/locale/pt/LC_MESSAGES/statusnet.po
@@ -12,12 +12,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-28 15:28+0000\n"
-"PO-Revision-Date: 2010-08-28 15:31:17+0000\n"
+"POT-Creation-Date: 2010-09-05 09:45+0000\n"
+"PO-Revision-Date: 2010-09-05 09:47:11+0000\n"
"Language-Team: Portuguese\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r71856); Translate extension (2010-08-20)\n"
+"X-Generator: MediaWiki 1.17alpha (r72319); Translate extension (2010-08-20)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: pt\n"
"X-Message-Group: out-statusnet\n"
@@ -605,7 +605,7 @@ msgstr ""
"permitir acesso à sua conta %4$s a terceiros da sua confiança."
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:450
+#: actions/apioauthauthorize.php:310 lib/action.php:463
msgid "Account"
msgstr "Conta"
@@ -1013,7 +1013,7 @@ msgstr "Não é o proprietário desta aplicação."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1263
+#: lib/action.php:1307
msgid "There was a problem with your session token."
msgstr "Ocorreu um problema com a sua sessão."
@@ -4816,7 +4816,7 @@ msgid "Plugins"
msgstr "Plugins"
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:789
+#: actions/version.php:198 lib/action.php:805
msgid "Version"
msgstr "Versão"
@@ -4976,7 +4976,7 @@ msgstr "Problema na gravação da caixa de entrada do grupo."
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1751
+#: classes/Notice.php:1757
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -5004,7 +5004,7 @@ msgid "Missing profile."
msgstr "Perfil não existe."
#. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:346
+#: classes/Status_network.php:339
msgid "Unable to save tag."
msgstr "Não foi possível gravar a categoria."
@@ -5106,199 +5106,199 @@ msgid "Other"
msgstr "Outras"
#. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:145
+#: lib/action.php:148
#, php-format
msgid "%1$s - %2$s"
msgstr "%1$s - %2$s"
#. TRANS: Page title for a page without a title set.
-#: lib/action.php:161
+#: lib/action.php:164
msgid "Untitled page"
msgstr "Página sem título"
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:436
+#: lib/action.php:449
msgid "Primary site navigation"
msgstr "Navegação primária deste site"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:442
+#: lib/action.php:455
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr "Perfil pessoal e notas dos amigos"
#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:445
+#: lib/action.php:458
msgctxt "MENU"
msgid "Personal"
msgstr "Pessoal"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:447
+#: lib/action.php:460
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:452
+#: lib/action.php:465
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "Ligar aos serviços"
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:455
+#: lib/action.php:468
msgid "Connect"
msgstr "Ligar"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:458
+#: lib/action.php:471
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "Alterar a configuração do site"
#. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:461
+#: lib/action.php:474
msgctxt "MENU"
msgid "Admin"
msgstr "Gestor"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:465
+#: lib/action.php:478
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "Convidar amigos e colegas para se juntarem a si em %s"
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:468
+#: lib/action.php:481
msgctxt "MENU"
msgid "Invite"
msgstr "Convidar"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:474
+#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "Terminar esta sessão"
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:477
+#: lib/action.php:490
msgctxt "MENU"
msgid "Logout"
msgstr "Sair"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:482
+#: lib/action.php:495
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Criar uma conta"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:485
+#: lib/action.php:498
msgctxt "MENU"
msgid "Register"
msgstr "Registar"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:488
+#: lib/action.php:501
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Iniciar uma sessão"
-#: lib/action.php:491
+#: lib/action.php:504
msgctxt "MENU"
msgid "Login"
msgstr "Entrar"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:494
+#: lib/action.php:507
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Ajudem-me!"
-#: lib/action.php:497
+#: lib/action.php:510
msgctxt "MENU"
msgid "Help"
msgstr "Ajuda"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:500
+#: lib/action.php:513
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "Procurar pessoas ou pesquisar texto"
-#: lib/action.php:503
+#: lib/action.php:516
msgctxt "MENU"
msgid "Search"
msgstr "Pesquisa"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:525 lib/adminpanelaction.php:400
+#: lib/action.php:538 lib/adminpanelaction.php:400
msgid "Site notice"
msgstr "Aviso do site"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:592
+#: lib/action.php:605
msgid "Local views"
msgstr "Vistas locais"
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:659
+#: lib/action.php:675
msgid "Page notice"
msgstr "Aviso da página"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:762
+#: lib/action.php:778
msgid "Secondary site navigation"
msgstr "Navegação secundária deste site"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:768
+#: lib/action.php:784
msgid "Help"
msgstr "Ajuda"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:771
+#: lib/action.php:787
msgid "About"
msgstr "Sobre"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:774
+#: lib/action.php:790
msgid "FAQ"
msgstr "FAQ"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:779
+#: lib/action.php:795
msgid "TOS"
msgstr "Termos"
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:783
+#: lib/action.php:799
msgid "Privacy"
msgstr "Privacidade"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:786
+#: lib/action.php:802
msgid "Source"
msgstr "Código fonte"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:792
+#: lib/action.php:808
msgid "Contact"
msgstr "Contacto"
-#: lib/action.php:794
+#: lib/action.php:810
msgid "Badge"
msgstr "Emblema"
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:823
+#: lib/action.php:839
msgid "StatusNet software license"
msgstr "Licença de software do StatusNet"
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:827
+#: lib/action.php:843
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5308,13 +5308,13 @@ msgstr ""
"broughtby%%](%%site.broughtbyurl%%)."
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:830
+#: lib/action.php:846
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr "**%%site.name%%** é um serviço de microblogues."
#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:834
+#: lib/action.php:850
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5326,20 +5326,20 @@ msgstr ""
"fsf.org/licensing/licenses/agpl-3.0.html)."
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:850
+#: lib/action.php:866
msgid "Site content license"
msgstr "Licença de conteúdos do site"
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:857
+#: lib/action.php:873
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr "O conteúdo e dados do site %1$s são privados e confidenciais."
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:864
+#: lib/action.php:880
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
@@ -5347,14 +5347,14 @@ msgstr ""
"direitos reservados."
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:868
+#: lib/action.php:884
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
"Direitos de autor sobre o conteúdo e dados detidos pelos contribuidores. "
"Todos os direitos reservados."
#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:881
+#: lib/action.php:897
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr ""
@@ -5362,19 +5362,19 @@ msgstr ""
"licença %2$s."
#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1192
+#: lib/action.php:1236
msgid "Pagination"
msgstr "Paginação"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: present than the currently displayed information.
-#: lib/action.php:1203
+#: lib/action.php:1247
msgid "After"
msgstr "Posteriores"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: past than the currently displayed information.
-#: lib/action.php:1213
+#: lib/action.php:1257
msgid "Before"
msgstr "Anteriores"
@@ -5631,6 +5631,24 @@ msgstr "Comando terminado"
msgid "Command failed"
msgstr "Comando falhou"
+#. TRANS: Command exception text shown when a notice ID is requested that does not exist.
+#: lib/command.php:84 lib/command.php:108
+msgid "Notice with that id does not exist."
+msgstr "Não existe nenhuma nota com essa identificação."
+
+#. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
+#. TRANS: Error text shown when a last user notice is requested and it does not exist.
+#: lib/command.php:101 lib/command.php:630
+msgid "User has no last notice."
+msgstr "Utilizador não tem nenhuma última nota."
+
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:130
+#, php-format
+msgid "Could not find a user with nickname %s."
+msgstr "Não foi encontrado um utilizador com a alcunha %s."
+
#. TRANS: Error text shown when an unimplemented command is given.
#: lib/command.php:185
msgid "Sorry, this command is not yet implemented."
@@ -5641,6 +5659,13 @@ msgstr "Desculpe, este comando ainda não foi implementado."
msgid "It does not make a lot of sense to nudge yourself!"
msgstr "Não faz muito sentido tocar-nos a nós mesmos!"
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:240
+#, php-format
+msgid "Nudge sent to %s."
+msgstr "Toque enviado para %s."
+
#. TRANS: User statistics text.
#. TRANS: %1$s is the number of other user the user is subscribed to.
#. TRANS: %2$s is the number of users that are subscribed to the user.
@@ -5709,21 +5734,53 @@ msgstr "Mensagem demasiado extensa - máx. %1$d caracteres, enviou %2$d."
msgid "Error sending direct message."
msgstr "Erro no envio da mensagem directa."
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:554
+#, php-format
+msgid "Notice from %s repeated."
+msgstr "Nota de %s repetida."
+
#. TRANS: Error text shown when repeating a notice fails with an unknown reason.
#: lib/command.php:557
msgid "Error repeating notice."
msgstr "Erro ao repetir nota."
+#. TRANS: Message given if content of a notice for a reply is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:592
+#, php-format
+msgid "Notice too long - maximum is %1$d characters, you sent %2$d."
+msgstr "Nota demasiado extensa - máx. %1$d caracteres, enviou %2$d."
+
+#. TRANS: Text shown having sent a reply to a notice successfully.
+#. TRANS: %s is the nickname of the user of the notice the reply was sent to.
+#: lib/command.php:603
+#, php-format
+msgid "Reply to %s sent."
+msgstr "Resposta a %s enviada."
+
#. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
#: lib/command.php:606
msgid "Error saving notice."
msgstr "Erro ao gravar nota."
+#. TRANS: Error text shown when no username was provided when issuing a subscribe command.
+#: lib/command.php:655
+msgid "Specify the name of the user to subscribe to."
+msgstr "Introduza o nome do utilizador para subscrever."
+
#. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
#: lib/command.php:664
msgid "Can't subscribe to OMB profiles by command."
msgstr "Não pode subscrever perfis OMB por comando."
+#. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
+#. TRANS: Error text shown when no username was provided when issuing the command.
+#: lib/command.php:694 lib/command.php:804
+msgid "Specify the name of the user to unsubscribe from."
+msgstr "Introduza o nome do utilizador para deixar de subscrever."
+
#. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
#. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
#: lib/command.php:724 lib/command.php:750
@@ -5750,6 +5807,18 @@ msgstr "Notificação ligada."
msgid "Can't turn on notification."
msgstr "Não foi possível ligar a notificação."
+#. TRANS: Error text shown when issuing the login command while login is disabled.
+#: lib/command.php:771
+msgid "Login command is disabled."
+msgstr "Comando para iniciar sessão foi desactivado."
+
+#. TRANS: Text shown after issuing the login command successfully.
+#. TRANS: %s is a logon link..
+#: lib/command.php:784
+#, php-format
+msgid "This link is useable only once and is valid for only 2 minutes: %s."
+msgstr ""
+
#. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
#: lib/command.php:831
msgid "You are not subscribed to anyone."
@@ -6898,12 +6967,12 @@ msgid "The theme file is missing or the upload failed."
msgstr "O ficheiro do tema não foi localizado ou o upload falhou."
#: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:253 lib/themeuploader.php:257
-#: lib/themeuploader.php:265 lib/themeuploader.php:272
+#: lib/themeuploader.php:278 lib/themeuploader.php:282
+#: lib/themeuploader.php:290 lib/themeuploader.php:297
msgid "Failed saving theme."
msgstr "Não foi possível gravar o tema."
-#: lib/themeuploader.php:139
+#: lib/themeuploader.php:147
msgid "Invalid theme: bad directory structure."
msgstr "Tema inválido: estrutura de directórios incorrecta."
@@ -6918,7 +6987,7 @@ msgstr ""
msgid "Invalid theme archive: missing file css/display.css"
msgstr "Arquivo do tema inválido: falta o ficheiro css/display.css"
-#: lib/themeuploader.php:205
+#: lib/themeuploader.php:218
msgid ""
"Theme contains invalid file or folder name. Stick with ASCII letters, "
"digits, underscore, and minus sign."
@@ -6926,12 +6995,16 @@ msgstr ""
"Tema contém um nome de ficheiro ou de directório inválido. Use somente "
"letras ASCII, algarismos, sublinhados e o sinal de menos."
-#: lib/themeuploader.php:216
+#: lib/themeuploader.php:224
+msgid "Theme contains unsafe file extension names; may be unsafe."
+msgstr ""
+
+#: lib/themeuploader.php:241
#, php-format
msgid "Theme contains file of type '.%s', which is not allowed."
msgstr "Tema contém um ficheiro do tipo '.%s', o que não é permitido."
-#: lib/themeuploader.php:234
+#: lib/themeuploader.php:259
msgid "Error opening theme archive."
msgstr "Ocorreu um erro ao abrir o arquivo do tema."
@@ -7010,56 +7083,56 @@ msgid "Moderator"
msgstr "Moderador"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1102
msgid "a few seconds ago"
msgstr "há alguns segundos"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1106
+#: lib/util.php:1105
msgid "about a minute ago"
msgstr "há cerca de um minuto"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1110
+#: lib/util.php:1109
#, php-format
msgid "about %d minutes ago"
msgstr "há cerca de %d minutos"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1113
+#: lib/util.php:1112
msgid "about an hour ago"
msgstr "há cerca de uma hora"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1117
+#: lib/util.php:1116
#, php-format
msgid "about %d hours ago"
msgstr "há cerca de %d horas"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1120
+#: lib/util.php:1119
msgid "about a day ago"
msgstr "há cerca de um dia"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1124
+#: lib/util.php:1123
#, php-format
msgid "about %d days ago"
msgstr "há cerca de %d dias"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1127
+#: lib/util.php:1126
msgid "about a month ago"
msgstr "há cerca de um mês"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1131
+#: lib/util.php:1130
#, php-format
msgid "about %d months ago"
msgstr "há cerca de %d meses"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1134
+#: lib/util.php:1133
msgid "about a year ago"
msgstr "há cerca de um ano"
diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.po b/locale/pt_BR/LC_MESSAGES/statusnet.po
index 3bc3b07cb..35d77d6af 100644
--- a/locale/pt_BR/LC_MESSAGES/statusnet.po
+++ b/locale/pt_BR/LC_MESSAGES/statusnet.po
@@ -14,12 +14,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-28 15:28+0000\n"
-"PO-Revision-Date: 2010-08-28 15:31:20+0000\n"
+"POT-Creation-Date: 2010-09-05 09:45+0000\n"
+"PO-Revision-Date: 2010-09-05 09:47:12+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 (r71856); Translate extension (2010-08-20)\n"
+"X-Generator: MediaWiki 1.17alpha (r72319); Translate extension (2010-08-20)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: pt-br\n"
"X-Message-Group: out-statusnet\n"
@@ -617,7 +617,7 @@ msgstr ""
"confia."
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:450
+#: actions/apioauthauthorize.php:310 lib/action.php:463
msgid "Account"
msgstr "Conta"
@@ -805,7 +805,7 @@ msgstr "Original"
#: actions/avatarsettings.php:142 actions/avatarsettings.php:217
#: actions/grouplogo.php:213 actions/grouplogo.php:274
msgid "Preview"
-msgstr "Visualização"
+msgstr "Pré-visualizar"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
#: lib/deleteuserform.php:66 lib/noticelist.php:657
@@ -1027,7 +1027,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:1263
+#: lib/action.php:1307
msgid "There was a problem with your session token."
msgstr "Ocorreu um problema com o seu token de sessão."
@@ -4845,7 +4845,7 @@ msgid "Plugins"
msgstr "Plugins"
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:789
+#: actions/version.php:198 lib/action.php:805
msgid "Version"
msgstr "Versão"
@@ -5004,7 +5004,7 @@ msgstr "Problema no salvamento das mensagens recebidas do grupo."
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1751
+#: classes/Notice.php:1757
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -5031,7 +5031,7 @@ msgid "Missing profile."
msgstr "Perfil não existe."
#. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:346
+#: classes/Status_network.php:339
msgid "Unable to save tag."
msgstr "Não foi salvar gravar a categoria."
@@ -5133,199 +5133,199 @@ msgid "Other"
msgstr "Outras"
#. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:145
+#: lib/action.php:148
#, php-format
msgid "%1$s - %2$s"
msgstr "%1$s - %2$s"
#. TRANS: Page title for a page without a title set.
-#: lib/action.php:161
+#: lib/action.php:164
msgid "Untitled page"
msgstr "Página sem título"
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:436
+#: lib/action.php:449
msgid "Primary site navigation"
msgstr "Navegação primária no site"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:442
+#: lib/action.php:455
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr "Perfil pessoal e fluxo de mensagens dos amigos"
#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:445
+#: lib/action.php:458
msgctxt "MENU"
msgid "Personal"
msgstr "Pessoal"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:447
+#: lib/action.php:460
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "Altere seu e-mail, avatar, senha, perfil"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:452
+#: lib/action.php:465
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "Conecte-se a outros serviços"
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:455
+#: lib/action.php:468
msgid "Connect"
msgstr "Conectar"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:458
+#: lib/action.php:471
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "Altere as configurações do site"
#. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:461
+#: lib/action.php:474
msgctxt "MENU"
msgid "Admin"
msgstr "Administrar"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:465
+#: lib/action.php:478
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "Convide seus amigos e colegas para unir-se a você no %s"
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:468
+#: lib/action.php:481
msgctxt "MENU"
msgid "Invite"
msgstr "Convidar"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:474
+#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "Sair do site"
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:477
+#: lib/action.php:490
msgctxt "MENU"
msgid "Logout"
msgstr "Sair"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:482
+#: lib/action.php:495
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Criar uma conta"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:485
+#: lib/action.php:498
msgctxt "MENU"
msgid "Register"
msgstr "Registrar-se"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:488
+#: lib/action.php:501
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Autentique-se no site"
-#: lib/action.php:491
+#: lib/action.php:504
msgctxt "MENU"
msgid "Login"
msgstr "Entrar"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:494
+#: lib/action.php:507
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Ajudem-me!"
-#: lib/action.php:497
+#: lib/action.php:510
msgctxt "MENU"
msgid "Help"
msgstr "Ajuda"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:500
+#: lib/action.php:513
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "Procure por pessoas ou textos"
-#: lib/action.php:503
+#: lib/action.php:516
msgctxt "MENU"
msgid "Search"
msgstr "Pesquisar"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:525 lib/adminpanelaction.php:400
+#: lib/action.php:538 lib/adminpanelaction.php:400
msgid "Site notice"
msgstr "Mensagem do site"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:592
+#: lib/action.php:605
msgid "Local views"
msgstr "Visualizações locais"
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:659
+#: lib/action.php:675
msgid "Page notice"
msgstr "Notícia da página"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:762
+#: lib/action.php:778
msgid "Secondary site navigation"
msgstr "Navegação secundária no site"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:768
+#: lib/action.php:784
msgid "Help"
msgstr "Ajuda"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:771
+#: lib/action.php:787
msgid "About"
msgstr "Sobre"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:774
+#: lib/action.php:790
msgid "FAQ"
msgstr "FAQ"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:779
+#: lib/action.php:795
msgid "TOS"
msgstr "Termos de uso"
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:783
+#: lib/action.php:799
msgid "Privacy"
msgstr "Privacidade"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:786
+#: lib/action.php:802
msgid "Source"
msgstr "Fonte"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:792
+#: lib/action.php:808
msgid "Contact"
msgstr "Contato"
-#: lib/action.php:794
+#: lib/action.php:810
msgid "Badge"
msgstr "Mini-aplicativo"
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:823
+#: lib/action.php:839
msgid "StatusNet software license"
msgstr "Licença do software StatusNet"
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:827
+#: lib/action.php:843
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5335,13 +5335,13 @@ msgstr ""
"broughtby%%](%%site.broughtbyurl%%). "
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:830
+#: lib/action.php:846
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr "**%%site.name%%** é um serviço de microblog."
#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:834
+#: lib/action.php:850
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5353,51 +5353,51 @@ msgstr ""
"fsf.org/licensing/licenses/agpl-3.0.html)."
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:850
+#: lib/action.php:866
msgid "Site content license"
msgstr "Licença do conteúdo do site"
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:857
+#: lib/action.php:873
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr "O conteúdo e os dados de %1$s são privados e confidenciais."
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:864
+#: lib/action.php:880
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr "Conteúdo e dados licenciados sob %1$s. Todos os direitos reservados."
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:868
+#: lib/action.php:884
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
"Conteúdo e dados licenciados pelos colaboradores. Todos os direitos "
"reservados."
#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:881
+#: lib/action.php:897
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr "Todo o conteúdo e dados de %1$s estão disponíveis sob a licença %2$s."
#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1192
+#: lib/action.php:1236
msgid "Pagination"
msgstr "Paginação"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: present than the currently displayed information.
-#: lib/action.php:1203
+#: lib/action.php:1247
msgid "After"
msgstr "Próximo"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: past than the currently displayed information.
-#: lib/action.php:1213
+#: lib/action.php:1257
msgid "Before"
msgstr "Anterior"
@@ -5657,6 +5657,32 @@ msgstr "O comando foi completado"
msgid "Command failed"
msgstr "O comando falhou"
+#. TRANS: Command exception text shown when a notice ID is requested that does not exist.
+#: lib/command.php:84 lib/command.php:108
+msgid "Notice with that id does not exist."
+msgstr "Não existe uma mensagem com essa id."
+
+#. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
+#. TRANS: Error text shown when a last user notice is requested and it does not exist.
+#: lib/command.php:101 lib/command.php:630
+msgid "User has no last notice."
+msgstr "O usuário não tem nenhuma \"última mensagem\"."
+
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:130
+#, php-format
+msgid "Could not find a user with nickname %s."
+msgstr "Não foi possível encontrar nenhum usuário com a identificação %s."
+
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:150
+#, php-format
+msgid "Could not find a local user with nickname %s."
+msgstr ""
+"Não foi possível encontrar nenhum usuário local com a identificação %s."
+
#. TRANS: Error text shown when an unimplemented command is given.
#: lib/command.php:185
msgid "Sorry, this command is not yet implemented."
@@ -5667,6 +5693,13 @@ msgstr "Desculpe, mas esse comando ainda não foi implementado."
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!"
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:240
+#, php-format
+msgid "Nudge sent to %s."
+msgstr "Foi enviada a chamada de atenção para %s."
+
#. TRANS: User statistics text.
#. TRANS: %1$s is the number of other user the user is subscribed to.
#. TRANS: %2$s is the number of users that are subscribed to the user.
@@ -5687,6 +5720,20 @@ msgstr ""
msgid "Notice marked as fave."
msgstr "Mensagem marcada como favorita."
+#. TRANS: Message given having added a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:360
+#, php-format
+msgid "%1$s joined group %2$s."
+msgstr "%1$s associou-se ao grupo %2$s."
+
+#. TRANS: Message given having removed a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:408
+#, php-format
+msgid "%1$s left group %2$s."
+msgstr "%1$s deixou o grupo %2$s."
+
#. TRANS: Whois output. %s is the full name of the queried user.
#: lib/command.php:434
#, php-format
@@ -5736,21 +5783,68 @@ msgstr ""
msgid "Error sending direct message."
msgstr "Ocorreu um erro durante o envio da mensagem direta."
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:554
+#, php-format
+msgid "Notice from %s repeated."
+msgstr "A mensagem de %s foi repetida."
+
#. TRANS: Error text shown when repeating a notice fails with an unknown reason.
#: lib/command.php:557
msgid "Error repeating notice."
msgstr "Erro na repetição da mensagem."
+#. TRANS: Message given if content of a notice for a reply is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:592
+#, php-format
+msgid "Notice too long - maximum is %1$d characters, you sent %2$d."
+msgstr ""
+"A mensagem é muito extensa - o máximo são %1$d caracteres e você enviou %2$d."
+
+#. TRANS: Text shown having sent a reply to a notice successfully.
+#. TRANS: %s is the nickname of the user of the notice the reply was sent to.
+#: lib/command.php:603
+#, php-format
+msgid "Reply to %s sent."
+msgstr "A resposta para %s foi enviada."
+
#. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
#: lib/command.php:606
msgid "Error saving notice."
msgstr "Erro no salvamento da mensagem."
+#. TRANS: Error text shown when no username was provided when issuing a subscribe command.
+#: lib/command.php:655
+msgid "Specify the name of the user to subscribe to."
+msgstr "Especifique o nome do usuário que será assinado."
+
#. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
#: lib/command.php:664
msgid "Can't subscribe to OMB profiles by command."
msgstr "Não é possível assinar perfis OMB com comandos."
+#. TRANS: Text shown after having subscribed to another user successfully.
+#. TRANS: %s is the name of the user the subscription was requested for.
+#: lib/command.php:672
+#, php-format
+msgid "Subscribed to %s."
+msgstr "Foi efetuada a assinatura de $s."
+
+#. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
+#. TRANS: Error text shown when no username was provided when issuing the command.
+#: lib/command.php:694 lib/command.php:804
+msgid "Specify the name of the user to unsubscribe from."
+msgstr "Especifique o nome do usuário cuja assinatura será cancelada."
+
+#. TRANS: Text shown after having unsubscribed from another user successfully.
+#. TRANS: %s is the name of the user the unsubscription was requested for.
+#: lib/command.php:705
+#, php-format
+msgid "Unsubscribed from %s."
+msgstr "Foi cancelada a assinatura de %s."
+
#. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
#. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
#: lib/command.php:724 lib/command.php:750
@@ -5777,6 +5871,27 @@ msgstr "Notificação ligada."
msgid "Can't turn on notification."
msgstr "Não é possível ligar a notificação."
+#. TRANS: Error text shown when issuing the login command while login is disabled.
+#: lib/command.php:771
+msgid "Login command is disabled."
+msgstr "O comando para autenticação está desabilitado."
+
+#. TRANS: Text shown after issuing the login command successfully.
+#. TRANS: %s is a logon link..
+#: lib/command.php:784
+#, php-format
+msgid "This link is useable only once and is valid for only 2 minutes: %s."
+msgstr ""
+"Este link é utilizável somente uma vez e é válido somente por dois minutos: %"
+"s."
+
+#. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
+#. TRANS: %s is the name of the user the unsubscription was requested for.
+#: lib/command.php:813
+#, php-format
+msgid "Unsubscribed %s."
+msgstr "Foi cancelada a assinatura de %s."
+
#. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
#: lib/command.php:831
msgid "You are not subscribed to anyone."
@@ -6930,12 +7045,12 @@ msgid "The theme file is missing or the upload failed."
msgstr "O arquivo do tema não foi localizado ou ocorreu uma erro no envio."
#: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:253 lib/themeuploader.php:257
-#: lib/themeuploader.php:265 lib/themeuploader.php:272
+#: lib/themeuploader.php:278 lib/themeuploader.php:282
+#: lib/themeuploader.php:290 lib/themeuploader.php:297
msgid "Failed saving theme."
msgstr "Não foi possível salvar o tema."
-#: lib/themeuploader.php:139
+#: lib/themeuploader.php:147
msgid "Invalid theme: bad directory structure."
msgstr "Tema inválido: estrutura de diretórios incorreta."
@@ -6949,7 +7064,7 @@ msgstr ""
msgid "Invalid theme archive: missing file css/display.css"
msgstr "Arquivo de tema inválido: está faltando o arquivo css/display.css"
-#: lib/themeuploader.php:205
+#: lib/themeuploader.php:218
msgid ""
"Theme contains invalid file or folder name. Stick with ASCII letters, "
"digits, underscore, and minus sign."
@@ -6957,12 +7072,16 @@ msgstr ""
"O tema contém um nome de arquivo ou de diretório inválido. Use somente "
"caracteres ASCII, números e os sinais de sublinhado e hífen."
-#: lib/themeuploader.php:216
+#: lib/themeuploader.php:224
+msgid "Theme contains unsafe file extension names; may be unsafe."
+msgstr ""
+
+#: lib/themeuploader.php:241
#, php-format
msgid "Theme contains file of type '.%s', which is not allowed."
msgstr "O tema contém um arquivo do tipo '.%s', que não é permitido."
-#: lib/themeuploader.php:234
+#: lib/themeuploader.php:259
msgid "Error opening theme archive."
msgstr "Ocorreu um erro ao abrir o arquivo do tema."
@@ -7041,56 +7160,56 @@ msgid "Moderator"
msgstr "Moderador"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1102
msgid "a few seconds ago"
msgstr "alguns segundos atrás"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1106
+#: lib/util.php:1105
msgid "about a minute ago"
msgstr "cerca de 1 minuto atrás"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1110
+#: lib/util.php:1109
#, php-format
msgid "about %d minutes ago"
msgstr "cerca de %d minutos atrás"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1113
+#: lib/util.php:1112
msgid "about an hour ago"
msgstr "cerca de 1 hora atrás"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1117
+#: lib/util.php:1116
#, php-format
msgid "about %d hours ago"
msgstr "cerca de %d horas atrás"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1120
+#: lib/util.php:1119
msgid "about a day ago"
msgstr "cerca de 1 dia atrás"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1124
+#: lib/util.php:1123
#, php-format
msgid "about %d days ago"
msgstr "cerca de %d dias atrás"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1127
+#: lib/util.php:1126
msgid "about a month ago"
msgstr "cerca de 1 mês atrás"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1131
+#: lib/util.php:1130
#, php-format
msgid "about %d months ago"
msgstr "cerca de %d meses atrás"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1134
+#: lib/util.php:1133
msgid "about a year ago"
msgstr "cerca de 1 ano atrás"
diff --git a/locale/ru/LC_MESSAGES/statusnet.po b/locale/ru/LC_MESSAGES/statusnet.po
index e7b69c84b..f5920331c 100644
--- a/locale/ru/LC_MESSAGES/statusnet.po
+++ b/locale/ru/LC_MESSAGES/statusnet.po
@@ -13,12 +13,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-28 15:28+0000\n"
-"PO-Revision-Date: 2010-08-28 15:31:25+0000\n"
+"POT-Creation-Date: 2010-09-05 09:45+0000\n"
+"PO-Revision-Date: 2010-09-05 09:47:14+0000\n"
"Language-Team: Russian\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r71856); Translate extension (2010-08-20)\n"
+"X-Generator: MediaWiki 1.17alpha (r72319); Translate extension (2010-08-20)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ru\n"
"X-Message-Group: out-statusnet\n"
@@ -613,7 +613,7 @@ msgstr ""
"Ñторонним приложениÑм, которым вы доверÑете."
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:450
+#: actions/apioauthauthorize.php:310 lib/action.php:463
msgid "Account"
msgstr "ÐаÑтройки"
@@ -1022,7 +1022,7 @@ msgstr "Ð’Ñ‹ не ÑвлÑетеÑÑŒ владельцем Ñтого прилоÐ
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1263
+#: lib/action.php:1307
msgid "There was a problem with your session token."
msgstr "Проблема Ñ Ð’Ð°ÑˆÐµÐ¹ ÑеÑÑией. Попробуйте ещё раз, пожалуйÑта."
@@ -4829,7 +4829,7 @@ msgid "Plugins"
msgstr "Плагины"
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:789
+#: actions/version.php:198 lib/action.php:805
msgid "Version"
msgstr "ВерÑиÑ"
@@ -4988,7 +4988,7 @@ msgstr "Проблемы Ñ Ñохранением входÑщих Ñообще
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1751
+#: classes/Notice.php:1757
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -5016,7 +5016,7 @@ msgid "Missing profile."
msgstr "ОтÑутÑтвующий профиль."
#. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:346
+#: classes/Status_network.php:339
msgid "Unable to save tag."
msgstr "Ðе удаётÑÑ Ñохранить тег."
@@ -5118,199 +5118,199 @@ msgid "Other"
msgstr "Другое"
#. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:145
+#: lib/action.php:148
#, php-format
msgid "%1$s - %2$s"
msgstr "%1$s — %2$s"
#. TRANS: Page title for a page without a title set.
-#: lib/action.php:161
+#: lib/action.php:164
msgid "Untitled page"
msgstr "Страница без названиÑ"
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:436
+#: lib/action.php:449
msgid "Primary site navigation"
msgstr "Ð“Ð»Ð°Ð²Ð½Ð°Ñ Ð½Ð°Ð²Ð¸Ð³Ð°Ñ†Ð¸Ñ"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:442
+#: lib/action.php:455
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr "Личный профиль и лента друзей"
#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:445
+#: lib/action.php:458
msgctxt "MENU"
msgid "Personal"
msgstr "Личное"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:447
+#: lib/action.php:460
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "Изменить ваш email, аватар, пароль, профиль"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:452
+#: lib/action.php:465
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "Соединить Ñ ÑервиÑами"
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:455
+#: lib/action.php:468
msgid "Connect"
msgstr "Соединить"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:458
+#: lib/action.php:471
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "Изменить конфигурацию Ñайта"
#. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:461
+#: lib/action.php:474
msgctxt "MENU"
msgid "Admin"
msgstr "ÐаÑтройки"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:465
+#: lib/action.php:478
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "ПриглаÑите друзей и коллег Ñтать такими же как Ð’Ñ‹ учаÑтниками %s"
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:468
+#: lib/action.php:481
msgctxt "MENU"
msgid "Invite"
msgstr "ПриглаÑить"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:474
+#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "Выйти"
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:477
+#: lib/action.php:490
msgctxt "MENU"
msgid "Logout"
msgstr "Выход"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:482
+#: lib/action.php:495
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Создать новый аккаунт"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:485
+#: lib/action.php:498
msgctxt "MENU"
msgid "Register"
msgstr "РегиÑтрациÑ"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:488
+#: lib/action.php:501
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Войти"
-#: lib/action.php:491
+#: lib/action.php:504
msgctxt "MENU"
msgid "Login"
msgstr "Вход"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:494
+#: lib/action.php:507
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Помощь"
-#: lib/action.php:497
+#: lib/action.php:510
msgctxt "MENU"
msgid "Help"
msgstr "Помощь"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:500
+#: lib/action.php:513
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "ИÑкать людей или текÑÑ‚"
-#: lib/action.php:503
+#: lib/action.php:516
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:525 lib/adminpanelaction.php:400
+#: lib/action.php:538 lib/adminpanelaction.php:400
msgid "Site notice"
msgstr "Уведомление Ñайта"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:592
+#: lib/action.php:605
msgid "Local views"
msgstr "Локальные виды"
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:659
+#: lib/action.php:675
msgid "Page notice"
msgstr "ÐÐ¾Ð²Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:762
+#: lib/action.php:778
msgid "Secondary site navigation"
msgstr "ÐÐ°Ð²Ð¸Ð³Ð°Ñ†Ð¸Ñ Ð¿Ð¾ подпиÑкам"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:768
+#: lib/action.php:784
msgid "Help"
msgstr "Помощь"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:771
+#: lib/action.php:787
msgid "About"
msgstr "О проекте"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:774
+#: lib/action.php:790
msgid "FAQ"
msgstr "ЧаВо"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:779
+#: lib/action.php:795
msgid "TOS"
msgstr "TOS"
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:783
+#: lib/action.php:799
msgid "Privacy"
msgstr "ПользовательÑкое Ñоглашение"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:786
+#: lib/action.php:802
msgid "Source"
msgstr "ИÑходный код"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:792
+#: lib/action.php:808
msgid "Contact"
msgstr "ÐšÐ¾Ð½Ñ‚Ð°ÐºÑ‚Ð½Ð°Ñ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ"
-#: lib/action.php:794
+#: lib/action.php:810
msgid "Badge"
msgstr "Бедж"
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:823
+#: lib/action.php:839
msgid "StatusNet software license"
msgstr "StatusNet лицензиÑ"
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:827
+#: lib/action.php:843
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5320,13 +5320,13 @@ msgstr ""
"broughtby%%](%%site.broughtbyurl%%)."
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:830
+#: lib/action.php:846
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr "**%%site.name%%** — ÑÐµÑ€Ð²Ð¸Ñ Ð¼Ð¸ÐºÑ€Ð¾Ð±Ð»Ð¾Ð³Ð¸Ð½Ð³Ð°."
#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:834
+#: lib/action.php:850
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5339,52 +5339,52 @@ msgstr ""
"licenses/agpl-3.0.html)."
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:850
+#: lib/action.php:866
msgid "Site content license"
msgstr "Ð›Ð¸Ñ†ÐµÐ½Ð·Ð¸Ñ Ñодержимого Ñайта"
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:857
+#: lib/action.php:873
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr "Содержание и данные %1$s ÑвлÑÑŽÑ‚ÑÑ Ð»Ð¸Ñ‡Ð½Ñ‹Ð¼Ð¸ и конфиденциальными."
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:864
+#: lib/action.php:880
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
"ÐвторÑкие права на Ñодержание и данные принадлежат %1$s. Ð’Ñе права защищены."
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:868
+#: lib/action.php:884
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
"ÐвторÑкие права на Ñодержание и данные принадлежат разработчикам. Ð’Ñе права "
"защищены."
#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:881
+#: lib/action.php:897
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr "Ð’Ñе материалы и данные %1$s доÑтупны на уÑловиÑÑ… лицензии %2$s."
#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1192
+#: lib/action.php:1236
msgid "Pagination"
msgstr "Разбиение на Ñтраницы"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: present than the currently displayed information.
-#: lib/action.php:1203
+#: lib/action.php:1247
msgid "After"
msgstr "Сюда"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: past than the currently displayed information.
-#: lib/action.php:1213
+#: lib/action.php:1257
msgid "Before"
msgstr "Туда"
@@ -5642,6 +5642,31 @@ msgstr "Команда завершена"
msgid "Command failed"
msgstr "Команда неудачна"
+#. TRANS: Command exception text shown when a notice ID is requested that does not exist.
+#: lib/command.php:84 lib/command.php:108
+msgid "Notice with that id does not exist."
+msgstr "ЗапиÑи Ñ Ñ‚Ð°ÐºÐ¸Ð¼ id не ÑущеÑтвует."
+
+#. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
+#. TRANS: Error text shown when a last user notice is requested and it does not exist.
+#: lib/command.php:101 lib/command.php:630
+msgid "User has no last notice."
+msgstr "У Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð½ÐµÑ‚ поÑледней запиÑи."
+
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:130
+#, php-format
+msgid "Could not find a user with nickname %s."
+msgstr "Ðе удаётÑÑ Ð½Ð°Ð¹Ñ‚Ð¸ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼ %s."
+
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:150
+#, php-format
+msgid "Could not find a local user with nickname %s."
+msgstr "Ðе удаётÑÑ Ð½Ð°Ð¹Ñ‚Ð¸ локального Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼ %s."
+
#. TRANS: Error text shown when an unimplemented command is given.
#: lib/command.php:185
msgid "Sorry, this command is not yet implemented."
@@ -5652,6 +5677,13 @@ msgstr "ПроÑтите, Ñта команда ещё не выполнена."
msgid "It does not make a lot of sense to nudge yourself!"
msgstr "Ðет ÑмыÑла «подталкивать» Ñамого ÑебÑ!"
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:240
+#, php-format
+msgid "Nudge sent to %s."
+msgstr "«Подталкивание» поÑлано %s."
+
#. TRANS: User statistics text.
#. TRANS: %1$s is the number of other user the user is subscribed to.
#. TRANS: %2$s is the number of users that are subscribed to the user.
@@ -5672,6 +5704,20 @@ msgstr ""
msgid "Notice marked as fave."
msgstr "ЗапиÑÑŒ помечена как любимаÑ."
+#. TRANS: Message given having added a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:360
+#, php-format
+msgid "%1$s joined group %2$s."
+msgstr "%1$s приÑоединилÑÑ Ðº группе %2$s."
+
+#. TRANS: Message given having removed a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:408
+#, php-format
+msgid "%1$s left group %2$s."
+msgstr "%1$s покинул группу %2$s."
+
#. TRANS: Whois output. %s is the full name of the queried user.
#: lib/command.php:434
#, php-format
@@ -5721,21 +5767,67 @@ msgstr ""
msgid "Error sending direct message."
msgstr "Ошибка при отправке прÑмого ÑообщениÑ."
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:554
+#, php-format
+msgid "Notice from %s repeated."
+msgstr "ЗапиÑÑŒ %s повторена."
+
#. TRANS: Error text shown when repeating a notice fails with an unknown reason.
#: lib/command.php:557
msgid "Error repeating notice."
msgstr "Ошибка при повторении запиÑи."
+#. TRANS: Message given if content of a notice for a reply is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:592
+#, php-format
+msgid "Notice too long - maximum is %1$d characters, you sent %2$d."
+msgstr "ЗапиÑÑŒ Ñлишком Ð´Ð»Ð¸Ð½Ð½Ð°Ñ â€” не больше %1$d Ñимволов, вы отправили %2$d."
+
+#. TRANS: Text shown having sent a reply to a notice successfully.
+#. TRANS: %s is the nickname of the user of the notice the reply was sent to.
+#: lib/command.php:603
+#, php-format
+msgid "Reply to %s sent."
+msgstr "Ответ %s отправлен."
+
#. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
#: lib/command.php:606
msgid "Error saving notice."
msgstr "Проблемы Ñ Ñохранением запиÑи."
+#. TRANS: Error text shown when no username was provided when issuing a subscribe command.
+#: lib/command.php:655
+msgid "Specify the name of the user to subscribe to."
+msgstr "Укажите Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð´Ð»Ñ Ð¿Ð¾Ð´Ð¿Ð¸Ñки."
+
#. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
#: lib/command.php:664
msgid "Can't subscribe to OMB profiles by command."
msgstr "Ðевозможно подпиÑатьÑÑ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¾Ð¹ на профили OMB."
+#. TRANS: Text shown after having subscribed to another user successfully.
+#. TRANS: %s is the name of the user the subscription was requested for.
+#: lib/command.php:672
+#, php-format
+msgid "Subscribed to %s."
+msgstr "ПодпиÑалÑÑ Ð½Ð° %s."
+
+#. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
+#. TRANS: Error text shown when no username was provided when issuing the command.
+#: lib/command.php:694 lib/command.php:804
+msgid "Specify the name of the user to unsubscribe from."
+msgstr "Укажите Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð´Ð»Ñ Ð¾Ñ‚Ð¼ÐµÐ½Ñ‹ подпиÑки."
+
+#. TRANS: Text shown after having unsubscribed from another user successfully.
+#. TRANS: %s is the name of the user the unsubscription was requested for.
+#: lib/command.php:705
+#, php-format
+msgid "Unsubscribed from %s."
+msgstr "ОтпиÑатьÑÑ Ð¾Ñ‚ %s."
+
#. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
#. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
#: lib/command.php:724 lib/command.php:750
@@ -5762,6 +5854,27 @@ msgstr "ЕÑть оповещение."
msgid "Can't turn on notification."
msgstr "ЕÑть оповещение."
+#. TRANS: Error text shown when issuing the login command while login is disabled.
+#: lib/command.php:771
+msgid "Login command is disabled."
+msgstr "Команда входа отключена."
+
+#. TRANS: Text shown after issuing the login command successfully.
+#. TRANS: %s is a logon link..
+#: lib/command.php:784
+#, php-format
+msgid "This link is useable only once and is valid for only 2 minutes: %s."
+msgstr ""
+"Эта ÑÑылка Ñработает только один раз, она дейÑтвительна в течение 2 минут: %"
+"s."
+
+#. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
+#. TRANS: %s is the name of the user the unsubscription was requested for.
+#: lib/command.php:813
+#, php-format
+msgid "Unsubscribed %s."
+msgstr "ОтпиÑано %s."
+
#. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
#: lib/command.php:831
msgid "You are not subscribed to anyone."
@@ -6911,12 +7024,12 @@ msgid "The theme file is missing or the upload failed."
msgstr "Файл темы отÑутÑтвует или произошёл Ñбой при загрузке."
#: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:253 lib/themeuploader.php:257
-#: lib/themeuploader.php:265 lib/themeuploader.php:272
+#: lib/themeuploader.php:278 lib/themeuploader.php:282
+#: lib/themeuploader.php:290 lib/themeuploader.php:297
msgid "Failed saving theme."
msgstr "Ошибка при Ñохранении темы."
-#: lib/themeuploader.php:139
+#: lib/themeuploader.php:147
msgid "Invalid theme: bad directory structure."
msgstr "ÐžÑˆÐ¸Ð±Ð¾Ñ‡Ð½Ð°Ñ Ñ‚ÐµÐ¼Ð°. ÐŸÐ»Ð¾Ñ…Ð°Ñ Ñтруктура директорий."
@@ -6931,7 +7044,7 @@ msgstr ""
msgid "Invalid theme archive: missing file css/display.css"
msgstr "ÐедопуÑтимый архив: темы. ОтÑутÑтвует файл css/display.css"
-#: lib/themeuploader.php:205
+#: lib/themeuploader.php:218
msgid ""
"Theme contains invalid file or folder name. Stick with ASCII letters, "
"digits, underscore, and minus sign."
@@ -6939,12 +7052,16 @@ msgstr ""
"Тема Ñодержит недопуÑтимое Ð¸Ð¼Ñ Ñ„Ð°Ð¹Ð»Ð° или папки. ДопуÑтимы буквы ASCII, "
"цифры, подчеркивание и знак минуÑа."
-#: lib/themeuploader.php:216
+#: lib/themeuploader.php:224
+msgid "Theme contains unsafe file extension names; may be unsafe."
+msgstr ""
+
+#: lib/themeuploader.php:241
#, php-format
msgid "Theme contains file of type '.%s', which is not allowed."
msgstr "Тема Ñодержит файл недопуÑтимого типа «.%s»."
-#: lib/themeuploader.php:234
+#: lib/themeuploader.php:259
msgid "Error opening theme archive."
msgstr "Ошибка Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ð¸Ñ Ð°Ñ€Ñ…Ð¸Ð²Ð° темы."
@@ -7023,56 +7140,56 @@ msgid "Moderator"
msgstr "Модератор"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1102
msgid "a few seconds ago"
msgstr "пару Ñекунд назад"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1106
+#: lib/util.php:1105
msgid "about a minute ago"
msgstr "около минуты назад"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1110
+#: lib/util.php:1109
#, php-format
msgid "about %d minutes ago"
msgstr "около %d минут(ы) назад"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1113
+#: lib/util.php:1112
msgid "about an hour ago"
msgstr "около чаÑа назад"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1117
+#: lib/util.php:1116
#, php-format
msgid "about %d hours ago"
msgstr "около %d чаÑа(ов) назад"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1120
+#: lib/util.php:1119
msgid "about a day ago"
msgstr "около Ð´Ð½Ñ Ð½Ð°Ð·Ð°Ð´"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1124
+#: lib/util.php:1123
#, php-format
msgid "about %d days ago"
msgstr "около %d днÑ(ей) назад"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1127
+#: lib/util.php:1126
msgid "about a month ago"
msgstr "около меÑÑца назад"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1131
+#: lib/util.php:1130
#, php-format
msgid "about %d months ago"
msgstr "около %d меÑÑца(ев) назад"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1134
+#: lib/util.php:1133
msgid "about a year ago"
msgstr "около года назад"
diff --git a/locale/statusnet.pot b/locale/statusnet.pot
index 012a39fbd..1816b21ab 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-08-28 15:28+0000\n"
+"POT-Creation-Date: 2010-09-05 09:45+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"
@@ -584,7 +584,7 @@ msgid ""
msgstr ""
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:450
+#: actions/apioauthauthorize.php:310 lib/action.php:463
msgid "Account"
msgstr ""
@@ -989,7 +989,7 @@ msgstr ""
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1263
+#: lib/action.php:1307
msgid "There was a problem with your session token."
msgstr ""
@@ -4542,7 +4542,7 @@ msgid "Plugins"
msgstr ""
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:789
+#: actions/version.php:198 lib/action.php:805
msgid "Version"
msgstr ""
@@ -4695,7 +4695,7 @@ msgstr ""
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1751
+#: classes/Notice.php:1757
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
@@ -4720,7 +4720,7 @@ msgid "Missing profile."
msgstr ""
#. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:346
+#: classes/Status_network.php:339
msgid "Unable to save tag."
msgstr ""
@@ -4822,199 +4822,199 @@ msgid "Other"
msgstr ""
#. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:145
+#: lib/action.php:148
#, php-format
msgid "%1$s - %2$s"
msgstr ""
#. TRANS: Page title for a page without a title set.
-#: lib/action.php:161
+#: lib/action.php:164
msgid "Untitled page"
msgstr ""
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:436
+#: lib/action.php:449
msgid "Primary site navigation"
msgstr ""
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:442
+#: lib/action.php:455
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr ""
#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:445
+#: lib/action.php:458
msgctxt "MENU"
msgid "Personal"
msgstr ""
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:447
+#: lib/action.php:460
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr ""
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:452
+#: lib/action.php:465
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr ""
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:455
+#: lib/action.php:468
msgid "Connect"
msgstr ""
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:458
+#: lib/action.php:471
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr ""
#. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:461
+#: lib/action.php:474
msgctxt "MENU"
msgid "Admin"
msgstr ""
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:465
+#: lib/action.php:478
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr ""
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:468
+#: lib/action.php:481
msgctxt "MENU"
msgid "Invite"
msgstr ""
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:474
+#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr ""
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:477
+#: lib/action.php:490
msgctxt "MENU"
msgid "Logout"
msgstr ""
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:482
+#: lib/action.php:495
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr ""
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:485
+#: lib/action.php:498
msgctxt "MENU"
msgid "Register"
msgstr ""
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:488
+#: lib/action.php:501
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr ""
-#: lib/action.php:491
+#: lib/action.php:504
msgctxt "MENU"
msgid "Login"
msgstr ""
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:494
+#: lib/action.php:507
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr ""
-#: lib/action.php:497
+#: lib/action.php:510
msgctxt "MENU"
msgid "Help"
msgstr ""
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:500
+#: lib/action.php:513
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr ""
-#: lib/action.php:503
+#: lib/action.php:516
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:525 lib/adminpanelaction.php:400
+#: lib/action.php:538 lib/adminpanelaction.php:400
msgid "Site notice"
msgstr ""
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:592
+#: lib/action.php:605
msgid "Local views"
msgstr ""
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:659
+#: lib/action.php:675
msgid "Page notice"
msgstr ""
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:762
+#: lib/action.php:778
msgid "Secondary site navigation"
msgstr ""
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:768
+#: lib/action.php:784
msgid "Help"
msgstr ""
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:771
+#: lib/action.php:787
msgid "About"
msgstr ""
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:774
+#: lib/action.php:790
msgid "FAQ"
msgstr ""
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:779
+#: lib/action.php:795
msgid "TOS"
msgstr ""
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:783
+#: lib/action.php:799
msgid "Privacy"
msgstr ""
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:786
+#: lib/action.php:802
msgid "Source"
msgstr ""
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:792
+#: lib/action.php:808
msgid "Contact"
msgstr ""
-#: lib/action.php:794
+#: lib/action.php:810
msgid "Badge"
msgstr ""
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:823
+#: lib/action.php:839
msgid "StatusNet software license"
msgstr ""
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:827
+#: lib/action.php:843
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5022,13 +5022,13 @@ msgid ""
msgstr ""
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:830
+#: lib/action.php:846
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr ""
#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:834
+#: lib/action.php:850
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5037,49 +5037,49 @@ msgid ""
msgstr ""
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:850
+#: lib/action.php:866
msgid "Site content license"
msgstr ""
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:857
+#: lib/action.php:873
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:864
+#: lib/action.php:880
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:868
+#: lib/action.php:884
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:881
+#: lib/action.php:897
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr ""
#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1192
+#: lib/action.php:1236
msgid "Pagination"
msgstr ""
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: present than the currently displayed information.
-#: lib/action.php:1203
+#: lib/action.php:1247
msgid "After"
msgstr ""
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: past than the currently displayed information.
-#: lib/action.php:1213
+#: lib/action.php:1257
msgid "Before"
msgstr ""
@@ -6555,12 +6555,12 @@ msgid "The theme file is missing or the upload failed."
msgstr ""
#: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:253 lib/themeuploader.php:257
-#: lib/themeuploader.php:265 lib/themeuploader.php:272
+#: lib/themeuploader.php:278 lib/themeuploader.php:282
+#: lib/themeuploader.php:290 lib/themeuploader.php:297
msgid "Failed saving theme."
msgstr ""
-#: lib/themeuploader.php:139
+#: lib/themeuploader.php:147
msgid "Invalid theme: bad directory structure."
msgstr ""
@@ -6573,18 +6573,22 @@ msgstr ""
msgid "Invalid theme archive: missing file css/display.css"
msgstr ""
-#: lib/themeuploader.php:205
+#: lib/themeuploader.php:218
msgid ""
"Theme contains invalid file or folder name. Stick with ASCII letters, "
"digits, underscore, and minus sign."
msgstr ""
-#: lib/themeuploader.php:216
+#: lib/themeuploader.php:224
+msgid "Theme contains unsafe file extension names; may be unsafe."
+msgstr ""
+
+#: lib/themeuploader.php:241
#, php-format
msgid "Theme contains file of type '.%s', which is not allowed."
msgstr ""
-#: lib/themeuploader.php:234
+#: lib/themeuploader.php:259
msgid "Error opening theme archive."
msgstr ""
@@ -6663,56 +6667,56 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1102
msgid "a few seconds ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1106
+#: lib/util.php:1105
msgid "about a minute ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1110
+#: lib/util.php:1109
#, php-format
msgid "about %d minutes ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1113
+#: lib/util.php:1112
msgid "about an hour ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1117
+#: lib/util.php:1116
#, php-format
msgid "about %d hours ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1120
+#: lib/util.php:1119
msgid "about a day ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1124
+#: lib/util.php:1123
#, php-format
msgid "about %d days ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1127
+#: lib/util.php:1126
msgid "about a month ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1131
+#: lib/util.php:1130
#, php-format
msgid "about %d months ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1134
+#: lib/util.php:1133
msgid "about a year ago"
msgstr ""
diff --git a/locale/sv/LC_MESSAGES/statusnet.po b/locale/sv/LC_MESSAGES/statusnet.po
index 7adc55991..b8f2aed97 100644
--- a/locale/sv/LC_MESSAGES/statusnet.po
+++ b/locale/sv/LC_MESSAGES/statusnet.po
@@ -10,12 +10,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-28 15:28+0000\n"
-"PO-Revision-Date: 2010-08-28 15:31:27+0000\n"
+"POT-Creation-Date: 2010-09-05 09:45+0000\n"
+"PO-Revision-Date: 2010-09-05 09:47:15+0000\n"
"Language-Team: Swedish\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r71856); Translate extension (2010-08-20)\n"
+"X-Generator: MediaWiki 1.17alpha (r72319); Translate extension (2010-08-20)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: sv\n"
"X-Message-Group: out-statusnet\n"
@@ -597,7 +597,7 @@ msgstr ""
"ge tillgång till ditt %4$s-konto till tredje-parter du litar på."
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:450
+#: actions/apioauthauthorize.php:310 lib/action.php:463
msgid "Account"
msgstr "Konto"
@@ -1007,7 +1007,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:1263
+#: lib/action.php:1307
msgid "There was a problem with your session token."
msgstr "Det var ett problem med din sessions-token."
@@ -4790,7 +4790,7 @@ msgid "Plugins"
msgstr "Insticksmoduler"
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:789
+#: actions/version.php:198 lib/action.php:805
msgid "Version"
msgstr "Version"
@@ -4942,7 +4942,7 @@ msgstr "Problem med att spara gruppinkorg."
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1751
+#: classes/Notice.php:1757
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -5059,199 +5059,199 @@ msgid "Other"
msgstr "Övrigt"
#. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:145
+#: lib/action.php:148
#, php-format
msgid "%1$s - %2$s"
msgstr "%1$s - %2$s"
#. TRANS: Page title for a page without a title set.
-#: lib/action.php:161
+#: lib/action.php:164
msgid "Untitled page"
msgstr "Namnlös sida"
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:436
+#: lib/action.php:449
msgid "Primary site navigation"
msgstr "Primär webbplatsnavigation"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:442
+#: lib/action.php:455
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr "Personlig profil och vänners tidslinje"
#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:445
+#: lib/action.php:458
msgctxt "MENU"
msgid "Personal"
msgstr "Personligt"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:447
+#: lib/action.php:460
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:452
+#: lib/action.php:465
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "Anslut till tjänster"
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:455
+#: lib/action.php:468
msgid "Connect"
msgstr "Anslut"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:458
+#: lib/action.php:471
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "Ändra webbplatskonfiguration"
#. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:461
+#: lib/action.php:474
msgctxt "MENU"
msgid "Admin"
msgstr "Administratör"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:465
+#: lib/action.php:478
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "Bjud in vänner och kollegor att gå med dig på %s"
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:468
+#: lib/action.php:481
msgctxt "MENU"
msgid "Invite"
msgstr "Bjud in"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:474
+#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "Logga ut från webbplatsen"
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:477
+#: lib/action.php:490
msgctxt "MENU"
msgid "Logout"
msgstr "Logga ut"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:482
+#: lib/action.php:495
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Skapa ett konto"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:485
+#: lib/action.php:498
msgctxt "MENU"
msgid "Register"
msgstr "Registrera"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:488
+#: lib/action.php:501
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Logga in på webbplatsen"
-#: lib/action.php:491
+#: lib/action.php:504
msgctxt "MENU"
msgid "Login"
msgstr "Logga in"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:494
+#: lib/action.php:507
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Hjälp mig!"
-#: lib/action.php:497
+#: lib/action.php:510
msgctxt "MENU"
msgid "Help"
msgstr "Hjälp"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:500
+#: lib/action.php:513
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "Sök efter personer eller text"
-#: lib/action.php:503
+#: lib/action.php:516
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:525 lib/adminpanelaction.php:400
+#: lib/action.php:538 lib/adminpanelaction.php:400
msgid "Site notice"
msgstr "Webbplatsnotis"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:592
+#: lib/action.php:605
msgid "Local views"
msgstr "Lokala vyer"
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:659
+#: lib/action.php:675
msgid "Page notice"
msgstr "Sidnotis"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:762
+#: lib/action.php:778
msgid "Secondary site navigation"
msgstr "Sekundär webbplatsnavigation"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:768
+#: lib/action.php:784
msgid "Help"
msgstr "Hjälp"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:771
+#: lib/action.php:787
msgid "About"
msgstr "Om"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:774
+#: lib/action.php:790
msgid "FAQ"
msgstr "Frågor & svar"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:779
+#: lib/action.php:795
msgid "TOS"
msgstr "Användarvillkor"
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:783
+#: lib/action.php:799
msgid "Privacy"
msgstr "Sekretess"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:786
+#: lib/action.php:802
msgid "Source"
msgstr "Källa"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:792
+#: lib/action.php:808
msgid "Contact"
msgstr "Kontakt"
-#: lib/action.php:794
+#: lib/action.php:810
msgid "Badge"
msgstr "Emblem"
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:823
+#: lib/action.php:839
msgid "StatusNet software license"
msgstr "Programvarulicens för StatusNet"
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:827
+#: lib/action.php:843
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5261,13 +5261,13 @@ msgstr ""
"%%](%%site.broughtbyurl%%)."
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:830
+#: lib/action.php:846
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr "**%%site.name%%** är en mikrobloggtjänst."
#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:834
+#: lib/action.php:850
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5279,50 +5279,50 @@ msgstr ""
"fsf.org/licensing/licenses/agpl-3.0.html)."
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:850
+#: lib/action.php:866
msgid "Site content license"
msgstr "Licens för webbplatsinnehåll"
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:857
+#: lib/action.php:873
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr "Innehåll och data av %1$s är privat och konfidensiell."
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:864
+#: lib/action.php:880
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr "Innehåll och data copyright av %1$s. Alla rättigheter reserverade."
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:868
+#: lib/action.php:884
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
"Innehåll och data copyright av medarbetare. Alla rättigheter reserverade."
#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:881
+#: lib/action.php:897
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr "Innehåll och data på %1$s är tillgänglig under licensen %2$s."
#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1192
+#: lib/action.php:1236
msgid "Pagination"
msgstr "Numrering av sidor"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: present than the currently displayed information.
-#: lib/action.php:1203
+#: lib/action.php:1247
msgid "After"
msgstr "Senare"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: past than the currently displayed information.
-#: lib/action.php:1213
+#: lib/action.php:1257
msgid "Before"
msgstr "Tidigare"
@@ -5667,11 +5667,22 @@ msgstr "Fel vid upprepning av notis."
msgid "Error saving notice."
msgstr "Fel vid sparande av notis."
+#. TRANS: Error text shown when no username was provided when issuing a subscribe command.
+#: lib/command.php:655
+msgid "Specify the name of the user to subscribe to."
+msgstr ""
+
#. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
#: lib/command.php:664
msgid "Can't subscribe to OMB profiles by command."
msgstr "Kan inte prenumera på OMB-profiler via kommando."
+#. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
+#. TRANS: Error text shown when no username was provided when issuing the command.
+#: lib/command.php:694 lib/command.php:804
+msgid "Specify the name of the user to unsubscribe from."
+msgstr ""
+
#. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
#. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
#: lib/command.php:724 lib/command.php:750
@@ -5698,6 +5709,18 @@ msgstr "Notifikation på."
msgid "Can't turn on notification."
msgstr "Kan inte stänga av notifikation."
+#. TRANS: Error text shown when issuing the login command while login is disabled.
+#: lib/command.php:771
+msgid "Login command is disabled."
+msgstr ""
+
+#. TRANS: Text shown after issuing the login command successfully.
+#. TRANS: %s is a logon link..
+#: lib/command.php:784
+#, php-format
+msgid "This link is useable only once and is valid for only 2 minutes: %s."
+msgstr ""
+
#. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
#: lib/command.php:831
msgid "You are not subscribed to anyone."
@@ -6842,12 +6865,12 @@ msgid "The theme file is missing or the upload failed."
msgstr "Temafilen saknas eller uppladdningen misslyckades."
#: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:253 lib/themeuploader.php:257
-#: lib/themeuploader.php:265 lib/themeuploader.php:272
+#: lib/themeuploader.php:278 lib/themeuploader.php:282
+#: lib/themeuploader.php:290 lib/themeuploader.php:297
msgid "Failed saving theme."
msgstr "Kunde inte spara tema."
-#: lib/themeuploader.php:139
+#: lib/themeuploader.php:147
msgid "Invalid theme: bad directory structure."
msgstr "Ogiltigt tema: dålig katalogstruktur."
@@ -6861,7 +6884,7 @@ msgstr ""
msgid "Invalid theme archive: missing file css/display.css"
msgstr "Ogiltigt temaarkiv: filen css/display.css saknas"
-#: lib/themeuploader.php:205
+#: lib/themeuploader.php:218
msgid ""
"Theme contains invalid file or folder name. Stick with ASCII letters, "
"digits, underscore, and minus sign."
@@ -6869,12 +6892,16 @@ msgstr ""
"Tema innehåller ogiltigt fil- eller mappnamn. Använd bara ASCII-bokstäver, "
"siffror, understreck och minustecken."
-#: lib/themeuploader.php:216
+#: lib/themeuploader.php:224
+msgid "Theme contains unsafe file extension names; may be unsafe."
+msgstr ""
+
+#: lib/themeuploader.php:241
#, php-format
msgid "Theme contains file of type '.%s', which is not allowed."
msgstr "Tema innehåller fil av typen '.%s', vilket inte är tillåtet."
-#: lib/themeuploader.php:234
+#: lib/themeuploader.php:259
msgid "Error opening theme archive."
msgstr "Fel vid öppning temaarkiv."
@@ -6953,56 +6980,56 @@ msgid "Moderator"
msgstr "Moderator"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1102
msgid "a few seconds ago"
msgstr "ett par sekunder sedan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1106
+#: lib/util.php:1105
msgid "about a minute ago"
msgstr "för nån minut sedan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1110
+#: lib/util.php:1109
#, php-format
msgid "about %d minutes ago"
msgstr "för %d minuter sedan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1113
+#: lib/util.php:1112
msgid "about an hour ago"
msgstr "för en timma sedan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1117
+#: lib/util.php:1116
#, php-format
msgid "about %d hours ago"
msgstr "för %d timmar sedan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1120
+#: lib/util.php:1119
msgid "about a day ago"
msgstr "för en dag sedan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1124
+#: lib/util.php:1123
#, php-format
msgid "about %d days ago"
msgstr "för %d dagar sedan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1127
+#: lib/util.php:1126
msgid "about a month ago"
msgstr "för en månad sedan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1131
+#: lib/util.php:1130
#, php-format
msgid "about %d months ago"
msgstr "för %d månader sedan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1134
+#: lib/util.php:1133
msgid "about a year ago"
msgstr "för ett år sedan"
diff --git a/locale/te/LC_MESSAGES/statusnet.po b/locale/te/LC_MESSAGES/statusnet.po
index 8bed78d3b..187d96298 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-08-28 15:28+0000\n"
-"PO-Revision-Date: 2010-08-28 15:31:30+0000\n"
+"POT-Creation-Date: 2010-09-05 09:45+0000\n"
+"PO-Revision-Date: 2010-09-05 09:47:17+0000\n"
"Language-Team: Telugu\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r71856); Translate extension (2010-08-20)\n"
+"X-Generator: MediaWiki 1.17alpha (r72319); Translate extension (2010-08-20)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: te\n"
"X-Message-Group: out-statusnet\n"
@@ -526,7 +526,7 @@ msgid ""
msgstr ""
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:450
+#: actions/apioauthauthorize.php:310 lib/action.php:463
msgid "Account"
msgstr "ఖాతా"
@@ -900,7 +900,7 @@ msgstr "మీరౠఈ ఉపకరణం యొకà±à°• యజమాని à
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1263
+#: lib/action.php:1307
msgid "There was a problem with your session token."
msgstr ""
@@ -4036,7 +4036,7 @@ msgid "Plugins"
msgstr "à°ªà±à°²à°—à°¿à°¨à±à°²à±"
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:789
+#: actions/version.php:198 lib/action.php:805
msgid "Version"
msgstr "సంచిక"
@@ -4154,7 +4154,7 @@ msgstr ""
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1751
+#: classes/Notice.php:1757
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -4174,7 +4174,7 @@ msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
msgstr ""
#. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:346
+#: classes/Status_network.php:339
msgid "Unable to save tag."
msgstr "à°Ÿà±à°¯à°¾à°—à±à°²à°¨à°¿ à°­à°¦à±à°°à°ªà°°à°šà°²à±‡à°•పోయాం."
@@ -4266,193 +4266,193 @@ msgid "Other"
msgstr "ఇతర"
#. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:145
+#: lib/action.php:148
#, php-format
msgid "%1$s - %2$s"
msgstr "%1$s - %2$s"
#. TRANS: Page title for a page without a title set.
-#: lib/action.php:161
+#: lib/action.php:164
msgid "Untitled page"
msgstr "శీరà±à°·à°¿à°•లేని పేజీ"
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:436
+#: lib/action.php:449
msgid "Primary site navigation"
msgstr "à°ªà±à°°à°¾à°§à°®à°¿à°• సైటౠమారà±à°—దరà±à°¶à°¿à°¨à°¿"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:442
+#: lib/action.php:455
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr ""
#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:445
+#: lib/action.php:458
msgctxt "MENU"
msgid "Personal"
msgstr "à°µà±à°¯à°•à±à°¤à°¿à°—à°¤"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:447
+#: lib/action.php:460
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "మీ ఈమెయిలà±, అవతారం, సంకేతపదం మరియౠపà±à°°à±Œà°«à±ˆà°³à±à°³à°¨à± మారà±à°šà±à°•ోండి"
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:455
+#: lib/action.php:468
msgid "Connect"
msgstr "à°…à°¨à±à°¸à°‚ధానించà±"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:458
+#: lib/action.php:471
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "సైటౠసà±à°µà°°à±‚పణానà±à°¨à°¿ మారà±à°šà°‚à°¡à°¿"
#. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:461
+#: lib/action.php:474
msgctxt "MENU"
msgid "Admin"
msgstr "నిరà±à°µà°¾à°¹à°•à±à°²à±"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:465
+#: lib/action.php:478
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "%sలో తోడà±à°•ై మీ à°¸à±à°¨à±‡à°¹à°¿à°¤à±à°²à°¨à°¿ మరియౠసహోదà±à°¯à±‹à°—à±à°²à°¨à°¿ ఆహà±à°µà°¾à°¨à°¿à°‚à°šà°‚à°¡à°¿"
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:468
+#: lib/action.php:481
msgctxt "MENU"
msgid "Invite"
msgstr "ఆహà±à°µà°¾à°¨à°¿à°‚à°šà±"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:474
+#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "సైటౠనà±à°‚à°¡à°¿ నిషà±à°•à±à°°à°®à°¿à°‚à°šà±"
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:477
+#: lib/action.php:490
msgctxt "MENU"
msgid "Logout"
msgstr "నిషà±à°•à±à°°à°®à°¿à°‚à°šà±"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:482
+#: lib/action.php:495
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "ఖాతాని సృషà±à°Ÿà°¿à°‚à°šà±à°•ోండి"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:485
+#: lib/action.php:498
msgctxt "MENU"
msgid "Register"
msgstr "నమోదà±"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:488
+#: lib/action.php:501
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "సైటౠలోనికి à°ªà±à°°à°µà±‡à°¶à°¿à°‚à°šà°‚à°¡à°¿"
-#: lib/action.php:491
+#: lib/action.php:504
msgctxt "MENU"
msgid "Login"
msgstr "à°ªà±à°°à°µà±‡à°¶à°¿à°‚à°šà±"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:494
+#: lib/action.php:507
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "సహాయం కావాలి!"
-#: lib/action.php:497
+#: lib/action.php:510
msgctxt "MENU"
msgid "Help"
msgstr "సహాయం"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:500
+#: lib/action.php:513
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "à°ªà±à°°à°œà°²à± లేదా పాఠà±à°¯à°‚ కొరకౠవెతకండి"
-#: lib/action.php:503
+#: lib/action.php:516
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:525 lib/adminpanelaction.php:400
+#: lib/action.php:538 lib/adminpanelaction.php:400
msgid "Site notice"
msgstr "సైటౠగమనిక"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:592
+#: lib/action.php:605
msgid "Local views"
msgstr "à°¸à±à°¥à°¾à°¨à°¿à°• వీకà±à°·à°£à°²à±"
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:659
+#: lib/action.php:675
msgid "Page notice"
msgstr "పేజీ గమనిక"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:762
+#: lib/action.php:778
msgid "Secondary site navigation"
msgstr "à°¦à±à°µà°¿à°¤à±€à°¯ సైటౠమారà±à°—దరà±à°¶à°¿à°¨à°¿"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:768
+#: lib/action.php:784
msgid "Help"
msgstr "సహాయం"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:771
+#: lib/action.php:787
msgid "About"
msgstr "à°—à±à°°à°¿à°‚à°šà°¿"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:774
+#: lib/action.php:790
msgid "FAQ"
msgstr "à°ªà±à°°à°¶à±à°¨à°²à±"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:779
+#: lib/action.php:795
msgid "TOS"
msgstr "సేవా నియమాలà±"
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:783
+#: lib/action.php:799
msgid "Privacy"
msgstr "అంతరంగికత"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:786
+#: lib/action.php:802
msgid "Source"
msgstr "మూలమà±"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:792
+#: lib/action.php:808
msgid "Contact"
msgstr "సంపà±à°°à°¦à°¿à°‚à°šà±"
-#: lib/action.php:794
+#: lib/action.php:810
msgid "Badge"
msgstr "బాడà±à°œà°¿"
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:823
+#: lib/action.php:839
msgid "StatusNet software license"
msgstr "à°¸à±à°Ÿà±‡à°Ÿà°¸à±â€Œà°¨à±†à°Ÿà± మృదూపకరణ లైసెనà±à°¸à±"
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:827
+#: lib/action.php:843
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4462,13 +4462,13 @@ msgstr ""
"అందిసà±à°¤à±à°¨à±à°¨ సూకà±à°·à±à°® à°¬à±à°²à°¾à°—ింగౠసేవ."
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:830
+#: lib/action.php:846
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr "**%%site.name%%** అనేది మైకà±à°°à±‹ à°¬à±à°²à°¾à°—ింగౠసదà±à°ªà°¾à°¯à°‚."
#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:834
+#: lib/action.php:850
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4480,49 +4480,49 @@ msgstr ""
"పై నడà±à°¸à±à°¤à±à°‚ది."
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:850
+#: lib/action.php:866
msgid "Site content license"
msgstr "à°¸à±à°Ÿà±‡à°Ÿà°¸à±â€Œà°¨à±†à°Ÿà± మృదూపకరణ లైసెనà±à°¸à±"
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:857
+#: lib/action.php:873
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:864
+#: lib/action.php:880
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:868
+#: lib/action.php:884
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:881
+#: lib/action.php:897
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr ""
#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1192
+#: lib/action.php:1236
msgid "Pagination"
msgstr "పేజీకరణ"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: present than the currently displayed information.
-#: lib/action.php:1203
+#: lib/action.php:1247
msgid "After"
msgstr "తరà±à°µà°¾à°¤"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: past than the currently displayed information.
-#: lib/action.php:1213
+#: lib/action.php:1257
msgid "Before"
msgstr "ఇంతకà±à°°à°¿à°¤à°‚"
@@ -4748,6 +4748,13 @@ msgstr "à°•à±à°·à°®à°¿à°‚à°šà°‚à°¡à°¿, à°ˆ ఆదేశం ఇంకా à°…à°®à
msgid "It does not make a lot of sense to nudge yourself!"
msgstr ""
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:240
+#, php-format
+msgid "Nudge sent to %s."
+msgstr ""
+
#. TRANS: User statistics text.
#. TRANS: %1$s is the number of other user the user is subscribed to.
#. TRANS: %2$s is the number of users that are subscribed to the user.
@@ -4819,11 +4826,22 @@ msgstr "నోటీసà±à°¨à°¿ à°ªà±à°¨à°°à°¾à°µà±ƒà°¤à°¿à°‚చడంలో à
msgid "Error saving notice."
msgstr "నోటీసà±à°¨à°¿ à°­à°¦à±à°°à°ªà°°à°šà°¡à°‚లో పొరపాటà±."
+#. TRANS: Error text shown when no username was provided when issuing a subscribe command.
+#: lib/command.php:655
+msgid "Specify the name of the user to subscribe to."
+msgstr ""
+
#. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
#: lib/command.php:664
msgid "Can't subscribe to OMB profiles by command."
msgstr ""
+#. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
+#. TRANS: Error text shown when no username was provided when issuing the command.
+#: lib/command.php:694 lib/command.php:804
+msgid "Specify the name of the user to unsubscribe from."
+msgstr ""
+
#. TRANS: Error text shown when the command "off" fails for an unknown reason.
#: lib/command.php:731
msgid "Can't turn off notification."
@@ -4834,6 +4852,13 @@ msgstr ""
msgid "Login command is disabled."
msgstr ""
+#. TRANS: Text shown after issuing the login command successfully.
+#. TRANS: %s is a logon link..
+#: lib/command.php:784
+#, php-format
+msgid "This link is useable only once and is valid for only 2 minutes: %s."
+msgstr ""
+
#. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
#: lib/command.php:831
msgid "You are not subscribed to anyone."
@@ -5843,7 +5868,7 @@ msgstr ""
msgid "The theme file is missing or the upload failed."
msgstr ""
-#: lib/themeuploader.php:139
+#: lib/themeuploader.php:147
msgid "Invalid theme: bad directory structure."
msgstr ""
@@ -5856,18 +5881,22 @@ msgstr ""
msgid "Invalid theme archive: missing file css/display.css"
msgstr ""
-#: lib/themeuploader.php:205
+#: lib/themeuploader.php:218
msgid ""
"Theme contains invalid file or folder name. Stick with ASCII letters, "
"digits, underscore, and minus sign."
msgstr ""
-#: lib/themeuploader.php:216
+#: lib/themeuploader.php:224
+msgid "Theme contains unsafe file extension names; may be unsafe."
+msgstr ""
+
+#: lib/themeuploader.php:241
#, php-format
msgid "Theme contains file of type '.%s', which is not allowed."
msgstr ""
-#: lib/themeuploader.php:234
+#: lib/themeuploader.php:259
msgid "Error opening theme archive."
msgstr "నిరోధానà±à°¨à°¿ తొలగించడంలో పొరపాటà±."
@@ -5934,56 +5963,56 @@ msgid "Moderator"
msgstr "సమనà±à°µà°¯à°•à°°à±à°¤"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1102
msgid "a few seconds ago"
msgstr "కొనà±à°¨à°¿ à°•à±à°·à°£à°¾à°² à°•à±à°°à°¿à°¤à°‚"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1106
+#: lib/util.php:1105
msgid "about a minute ago"
msgstr "à°“ నిమిషం à°•à±à°°à°¿à°¤à°‚"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1110
+#: lib/util.php:1109
#, php-format
msgid "about %d minutes ago"
msgstr "%d నిమిషాల à°•à±à°°à°¿à°¤à°‚"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1113
+#: lib/util.php:1112
msgid "about an hour ago"
msgstr "à°’à°• à°—à°‚à°Ÿ à°•à±à°°à°¿à°¤à°‚"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1117
+#: lib/util.php:1116
#, php-format
msgid "about %d hours ago"
msgstr "%d à°—à°‚à°Ÿà°² à°•à±à°°à°¿à°¤à°‚"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1120
+#: lib/util.php:1119
msgid "about a day ago"
msgstr "à°“ రోజౠకà±à°°à°¿à°¤à°‚"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1124
+#: lib/util.php:1123
#, php-format
msgid "about %d days ago"
msgstr "%d రోజà±à°² à°•à±à°°à°¿à°¤à°‚"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1127
+#: lib/util.php:1126
msgid "about a month ago"
msgstr "à°“ నెల à°•à±à°°à°¿à°¤à°‚"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1131
+#: lib/util.php:1130
#, php-format
msgid "about %d months ago"
msgstr "%d నెలల à°•à±à°°à°¿à°¤à°‚"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1134
+#: lib/util.php:1133
msgid "about a year ago"
msgstr "à°’à°• సంవతà±à°¸à°°à°‚ à°•à±à°°à°¿à°¤à°‚"
diff --git a/locale/tr/LC_MESSAGES/statusnet.po b/locale/tr/LC_MESSAGES/statusnet.po
index 4208d10e0..1ca9d3ddf 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-08-28 15:28+0000\n"
-"PO-Revision-Date: 2010-08-28 15:31:35+0000\n"
+"POT-Creation-Date: 2010-09-05 09:45+0000\n"
+"PO-Revision-Date: 2010-09-05 09:47:22+0000\n"
"Language-Team: Turkish\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r71856); Translate extension (2010-08-20)\n"
+"X-Generator: MediaWiki 1.17alpha (r72319); Translate extension (2010-08-20)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: tr\n"
"X-Message-Group: out-statusnet\n"
@@ -697,7 +697,7 @@ msgstr "Onay kodu bulunamadı."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1263
+#: lib/action.php:1307
msgid "There was a problem with your session token."
msgstr ""
@@ -3480,7 +3480,7 @@ msgstr ""
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1751
+#: classes/Notice.php:1757
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
@@ -3557,137 +3557,137 @@ msgid "Other"
msgstr ""
#. TRANS: Page title for a page without a title set.
-#: lib/action.php:161
+#: lib/action.php:164
msgid "Untitled page"
msgstr ""
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:436
+#: lib/action.php:449
msgid "Primary site navigation"
msgstr ""
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:442
+#: lib/action.php:455
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr ""
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:447
+#: lib/action.php:460
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr ""
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:452
+#: lib/action.php:465
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr ""
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:455
+#: lib/action.php:468
msgid "Connect"
msgstr "BaÄŸlan"
#. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:461
+#: lib/action.php:474
msgctxt "MENU"
msgid "Admin"
msgstr ""
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:465
+#: lib/action.php:478
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr ""
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:468
+#: lib/action.php:481
msgctxt "MENU"
msgid "Invite"
msgstr ""
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:474
+#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr ""
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:482
+#: lib/action.php:495
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr ""
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:488
+#: lib/action.php:501
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr ""
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:500
+#: lib/action.php:513
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr ""
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:592
+#: lib/action.php:605
msgid "Local views"
msgstr ""
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:762
+#: lib/action.php:778
msgid "Secondary site navigation"
msgstr ""
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:768
+#: lib/action.php:784
msgid "Help"
msgstr "Yardım"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:771
+#: lib/action.php:787
msgid "About"
msgstr "Hakkında"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:774
+#: lib/action.php:790
msgid "FAQ"
msgstr "SSS"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:779
+#: lib/action.php:795
msgid "TOS"
msgstr ""
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:783
+#: lib/action.php:799
msgid "Privacy"
msgstr "Gizlilik"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:786
+#: lib/action.php:802
msgid "Source"
msgstr "Kaynak"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:792
+#: lib/action.php:808
msgid "Contact"
msgstr "İletişim"
-#: lib/action.php:794
+#: lib/action.php:810
msgid "Badge"
msgstr ""
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:823
+#: lib/action.php:839
msgid "StatusNet software license"
msgstr ""
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:827
+#: lib/action.php:843
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -3695,13 +3695,13 @@ msgid ""
msgstr ""
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:830
+#: lib/action.php:846
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr "**%%site.name%%** bir aninda mesajlaşma sosyal ağıdır."
#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:834
+#: lib/action.php:850
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -3714,43 +3714,43 @@ msgstr ""
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:857
+#: lib/action.php:873
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:864
+#: lib/action.php:880
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:868
+#: lib/action.php:884
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:881
+#: lib/action.php:897
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr ""
#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1192
+#: lib/action.php:1236
msgid "Pagination"
msgstr ""
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: present than the currently displayed information.
-#: lib/action.php:1203
+#: lib/action.php:1247
msgid "After"
msgstr ""
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: past than the currently displayed information.
-#: lib/action.php:1213
+#: lib/action.php:1257
msgid "Before"
msgstr ""
@@ -3938,6 +3938,20 @@ msgstr ""
msgid "Notice with that id does not exist."
msgstr ""
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:130
+#, php-format
+msgid "Could not find a user with nickname %s."
+msgstr ""
+
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:150
+#, php-format
+msgid "Could not find a local user with nickname %s."
+msgstr ""
+
#. TRANS: Error text shown when an unimplemented command is given.
#: lib/command.php:185
msgid "Sorry, this command is not yet implemented."
@@ -4857,7 +4871,7 @@ msgstr ""
msgid "The theme file is missing or the upload failed."
msgstr ""
-#: lib/themeuploader.php:139
+#: lib/themeuploader.php:147
msgid "Invalid theme: bad directory structure."
msgstr ""
@@ -4870,13 +4884,17 @@ msgstr ""
msgid "Invalid theme archive: missing file css/display.css"
msgstr ""
-#: lib/themeuploader.php:205
+#: lib/themeuploader.php:218
msgid ""
"Theme contains invalid file or folder name. Stick with ASCII letters, "
"digits, underscore, and minus sign."
msgstr ""
-#: lib/themeuploader.php:216
+#: lib/themeuploader.php:224
+msgid "Theme contains unsafe file extension names; may be unsafe."
+msgstr ""
+
+#: lib/themeuploader.php:241
#, php-format
msgid "Theme contains file of type '.%s', which is not allowed."
msgstr ""
@@ -4928,56 +4946,56 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1102
msgid "a few seconds ago"
msgstr "birkaç saniye önce"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1106
+#: lib/util.php:1105
msgid "about a minute ago"
msgstr "yaklaşık bir dakika önce"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1110
+#: lib/util.php:1109
#, php-format
msgid "about %d minutes ago"
msgstr "yaklaşık %d dakika önce"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1113
+#: lib/util.php:1112
msgid "about an hour ago"
msgstr "yaklaşık bir saat önce"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1117
+#: lib/util.php:1116
#, php-format
msgid "about %d hours ago"
msgstr "yaklaşık %d saat önce"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1120
+#: lib/util.php:1119
msgid "about a day ago"
msgstr "yaklaşık bir gün önce"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1124
+#: lib/util.php:1123
#, php-format
msgid "about %d days ago"
msgstr "yaklaşık %d gün önce"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1127
+#: lib/util.php:1126
msgid "about a month ago"
msgstr "yaklaşık bir ay önce"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1131
+#: lib/util.php:1130
#, php-format
msgid "about %d months ago"
msgstr "yaklaşık %d ay önce"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1134
+#: lib/util.php:1133
msgid "about a year ago"
msgstr "yaklaşık bir yıl önce"
diff --git a/locale/uk/LC_MESSAGES/statusnet.po b/locale/uk/LC_MESSAGES/statusnet.po
index 618c41964..bc3312e46 100644
--- a/locale/uk/LC_MESSAGES/statusnet.po
+++ b/locale/uk/LC_MESSAGES/statusnet.po
@@ -11,12 +11,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-28 15:28+0000\n"
-"PO-Revision-Date: 2010-08-28 15:31:39+0000\n"
+"POT-Creation-Date: 2010-09-05 09:45+0000\n"
+"PO-Revision-Date: 2010-09-05 09:47:25+0000\n"
"Language-Team: Ukrainian\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r71856); Translate extension (2010-08-20)\n"
+"X-Generator: MediaWiki 1.17alpha (r72319); Translate extension (2010-08-20)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: uk\n"
"X-Message-Group: out-statusnet\n"
@@ -611,7 +611,7 @@ msgstr ""
"довірÑєте."
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:450
+#: actions/apioauthauthorize.php:310 lib/action.php:463
msgid "Account"
msgstr "Ðкаунт"
@@ -1021,7 +1021,7 @@ msgstr "Ви не Ñ” влаÑником цього додатку."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1263
+#: lib/action.php:1307
msgid "There was a problem with your session token."
msgstr "Виникли певні проблеми з токеном поточної ÑеÑÑ–Ñ—."
@@ -4817,7 +4817,7 @@ msgid "Plugins"
msgstr "Додатки"
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:789
+#: actions/version.php:198 lib/action.php:805
msgid "Version"
msgstr "ВерÑÑ–Ñ"
@@ -4976,7 +4976,7 @@ msgstr "Проблема при збереженні вхідних допиÑÑ–
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1751
+#: classes/Notice.php:1757
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -5002,7 +5002,7 @@ msgid "Missing profile."
msgstr "Загублений профіль."
#. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:346
+#: classes/Status_network.php:339
msgid "Unable to save tag."
msgstr "Ðе вдаєтьÑÑ Ð·Ð±ÐµÑ€ÐµÐ³Ñ‚Ð¸ теґ."
@@ -5104,199 +5104,199 @@ msgid "Other"
msgstr "Інше"
#. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:145
+#: lib/action.php:148
#, php-format
msgid "%1$s - %2$s"
msgstr "%1$s — %2$s"
#. TRANS: Page title for a page without a title set.
-#: lib/action.php:161
+#: lib/action.php:164
msgid "Untitled page"
msgstr "Сторінка без заголовку"
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:436
+#: lib/action.php:449
msgid "Primary site navigation"
msgstr "Відправна Ð½Ð°Ð²Ñ–Ð³Ð°Ñ†Ñ–Ñ Ð¿Ð¾ Ñайту"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:442
+#: lib/action.php:455
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr "ПерÑональний профіль Ñ– Ñтрічка друзів"
#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:445
+#: lib/action.php:458
msgctxt "MENU"
msgid "Personal"
msgstr "ОÑобиÑте"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:447
+#: lib/action.php:460
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "Змінити електронну адреÑу, аватару, пароль, профіль"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:452
+#: lib/action.php:465
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "Ð—â€™Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð· ÑервіÑами"
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:455
+#: lib/action.php:468
msgid "Connect"
msgstr "З’єднаннÑ"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:458
+#: lib/action.php:471
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "Змінити конфігурацію Ñайту"
#. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:461
+#: lib/action.php:474
msgctxt "MENU"
msgid "Admin"
msgstr "Ðдмін"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:465
+#: lib/action.php:478
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "ЗапроÑіть друзів та колег приєднатиÑÑŒ до Ð’Ð°Ñ Ð½Ð° %s"
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:468
+#: lib/action.php:481
msgctxt "MENU"
msgid "Invite"
msgstr "ЗапроÑити"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:474
+#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "Вийти з Ñайту"
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:477
+#: lib/action.php:490
msgctxt "MENU"
msgid "Logout"
msgstr "Вийти"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:482
+#: lib/action.php:495
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Створити новий акаунт"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:485
+#: lib/action.php:498
msgctxt "MENU"
msgid "Register"
msgstr "РеєÑтраціÑ"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:488
+#: lib/action.php:501
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Увійти на Ñайт"
-#: lib/action.php:491
+#: lib/action.php:504
msgctxt "MENU"
msgid "Login"
msgstr "Увійти"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:494
+#: lib/action.php:507
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Допоможіть!"
-#: lib/action.php:497
+#: lib/action.php:510
msgctxt "MENU"
msgid "Help"
msgstr "Довідка"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:500
+#: lib/action.php:513
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "Пошук людей або текÑтів"
-#: lib/action.php:503
+#: lib/action.php:516
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:525 lib/adminpanelaction.php:400
+#: lib/action.php:538 lib/adminpanelaction.php:400
msgid "Site notice"
msgstr "Об’Ñви на Ñайті"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:592
+#: lib/action.php:605
msgid "Local views"
msgstr "ОглÑд"
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:659
+#: lib/action.php:675
msgid "Page notice"
msgstr "Ð—Ð°ÑƒÐ²Ð°Ð¶ÐµÐ½Ð½Ñ Ñторінки"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:762
+#: lib/action.php:778
msgid "Secondary site navigation"
msgstr "ДругорÑдна Ð½Ð°Ð²Ñ–Ð³Ð°Ñ†Ñ–Ñ Ð¿Ð¾ Ñайту"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:768
+#: lib/action.php:784
msgid "Help"
msgstr "Допомога"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:771
+#: lib/action.php:787
msgid "About"
msgstr "Про"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:774
+#: lib/action.php:790
msgid "FAQ"
msgstr "ЧаП"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:779
+#: lib/action.php:795
msgid "TOS"
msgstr "Умови"
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:783
+#: lib/action.php:799
msgid "Privacy"
msgstr "ПриватніÑть"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:786
+#: lib/action.php:802
msgid "Source"
msgstr "Джерело"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:792
+#: lib/action.php:808
msgid "Contact"
msgstr "Контакт"
-#: lib/action.php:794
+#: lib/action.php:810
msgid "Badge"
msgstr "Бедж"
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:823
+#: lib/action.php:839
msgid "StatusNet software license"
msgstr "Ð›Ñ–Ñ†ÐµÐ½Ð·Ñ–Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð½Ð¾Ð³Ð¾ Ð·Ð°Ð±ÐµÐ·Ð¿ÐµÑ‡ÐµÐ½Ð½Ñ StatusNet"
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:827
+#: lib/action.php:843
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5306,13 +5306,13 @@ msgstr ""
"site.broughtbyurl%%)."
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:830
+#: lib/action.php:846
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr "**%%site.name%%** — це ÑÐµÑ€Ð²Ñ–Ñ Ð¼Ñ–ÐºÑ€Ð¾Ð±Ð»Ð¾Ò‘Ñ–Ð²."
#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:834
+#: lib/action.php:850
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5324,50 +5324,50 @@ msgstr ""
"License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:850
+#: lib/action.php:866
msgid "Site content license"
msgstr "Ð›Ñ–Ñ†ÐµÐ½Ð·Ñ–Ñ Ð·Ð¼Ñ–Ñту Ñайту"
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:857
+#: lib/action.php:873
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr "ЗміÑÑ‚ Ñ– дані %1$s Ñ” приватними Ñ– конфіденційними."
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:864
+#: lib/action.php:880
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr "ÐвторÑькі права на зміÑÑ‚ Ñ– дані належать %1$s. Ð’ÑÑ– права захищено."
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:868
+#: lib/action.php:884
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
"ÐвторÑькі права на зміÑÑ‚ Ñ– дані належать розробникам. Ð’ÑÑ– права захищено."
#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:881
+#: lib/action.php:897
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr "ВеÑÑŒ зміÑÑ‚ Ñ– дані %1$s доÑтупні на умовах ліцензії %2$s."
#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1192
+#: lib/action.php:1236
msgid "Pagination"
msgstr "ÐÑƒÐ¼ÐµÑ€Ð°Ñ†Ñ–Ñ Ñторінок"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: present than the currently displayed information.
-#: lib/action.php:1203
+#: lib/action.php:1247
msgid "After"
msgstr "Вперед"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: past than the currently displayed information.
-#: lib/action.php:1213
+#: lib/action.php:1257
msgid "Before"
msgstr "Ðазад"
@@ -5626,6 +5626,31 @@ msgstr "Команду виконано"
msgid "Command failed"
msgstr "Команду не виконано"
+#. TRANS: Command exception text shown when a notice ID is requested that does not exist.
+#: lib/command.php:84 lib/command.php:108
+msgid "Notice with that id does not exist."
+msgstr "ДопиÑу з таким id не Ñ–Ñнує."
+
+#. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
+#. TRANS: Error text shown when a last user notice is requested and it does not exist.
+#: lib/command.php:101 lib/command.php:630
+msgid "User has no last notice."
+msgstr "КориÑтувач не має оÑтаннього допиÑу."
+
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:130
+#, php-format
+msgid "Could not find a user with nickname %s."
+msgstr "Ðе вдалоÑÑ Ð·Ð½Ð°Ð¹Ñ‚Ð¸ кориÑтувача з ім’Ñм %s."
+
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:150
+#, php-format
+msgid "Could not find a local user with nickname %s."
+msgstr "КориÑтувача з нікнеймом %s на даному Ñайті не знайдено."
+
#. TRANS: Error text shown when an unimplemented command is given.
#: lib/command.php:185
msgid "Sorry, this command is not yet implemented."
@@ -5636,6 +5661,13 @@ msgstr "Даруйте, але Ð²Ð¸ÐºÐ¾Ð½Ð°Ð½Ð½Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¸ ще не заÐ
msgid "It does not make a lot of sense to nudge yourself!"
msgstr "Гадаємо, кориÑті від «розштовхуваннÑ» Ñамого Ñебе небагато, чи не так?!"
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:240
+#, php-format
+msgid "Nudge sent to %s."
+msgstr "Спробу «розштовхати» %s зараховано."
+
#. TRANS: User statistics text.
#. TRANS: %1$s is the number of other user the user is subscribed to.
#. TRANS: %2$s is the number of users that are subscribed to the user.
@@ -5656,6 +5688,20 @@ msgstr ""
msgid "Notice marked as fave."
msgstr "Ð”Ð¾Ð¿Ð¸Ñ Ð¿Ð¾Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¾ Ñк обраний."
+#. TRANS: Message given having added a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:360
+#, php-format
+msgid "%1$s joined group %2$s."
+msgstr "%1$s приєднавÑÑ Ð´Ð¾ групи %2$s."
+
+#. TRANS: Message given having removed a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:408
+#, php-format
+msgid "%1$s left group %2$s."
+msgstr "%1$s залишив групу %2$s."
+
#. TRANS: Whois output. %s is the full name of the queried user.
#: lib/command.php:434
#, php-format
@@ -5705,21 +5751,67 @@ msgstr ""
msgid "Error sending direct message."
msgstr "Помилка при відправці прÑмого повідомленнÑ."
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:554
+#, php-format
+msgid "Notice from %s repeated."
+msgstr "ДопиÑу від %s вторували."
+
#. TRANS: Error text shown when repeating a notice fails with an unknown reason.
#: lib/command.php:557
msgid "Error repeating notice."
msgstr "Помилка при повторенні допиÑу."
+#. TRANS: Message given if content of a notice for a reply is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:592
+#, php-format
+msgid "Notice too long - maximum is %1$d characters, you sent %2$d."
+msgstr "Ð”Ð¾Ð¿Ð¸Ñ Ð½Ð°Ð´Ñ‚Ð¾ довгий — макÑимум %1$d Ñимволів, а Ви надÑилаєте %2$d."
+
+#. TRANS: Text shown having sent a reply to a notice successfully.
+#. TRANS: %s is the nickname of the user of the notice the reply was sent to.
+#: lib/command.php:603
+#, php-format
+msgid "Reply to %s sent."
+msgstr "Відповідь Ð´Ð»Ñ %s надіÑлано."
+
#. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
#: lib/command.php:606
msgid "Error saving notice."
msgstr "Проблема при збереженні допиÑу."
+#. TRANS: Error text shown when no username was provided when issuing a subscribe command.
+#: lib/command.php:655
+msgid "Specify the name of the user to subscribe to."
+msgstr "Зазначте Ñ–Ð¼â€™Ñ ÐºÐ¾Ñ€Ð¸Ñтувача, до Ñкого бажаєте підпиÑатиÑÑŒ."
+
#. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
#: lib/command.php:664
msgid "Can't subscribe to OMB profiles by command."
msgstr "Ðе можу підпиÑатиÑÑŒ до профілю OMB за командою."
+#. TRANS: Text shown after having subscribed to another user successfully.
+#. TRANS: %s is the name of the user the subscription was requested for.
+#: lib/command.php:672
+#, php-format
+msgid "Subscribed to %s."
+msgstr "Тепер Ви підпиÑані на допиÑи %s."
+
+#. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
+#. TRANS: Error text shown when no username was provided when issuing the command.
+#: lib/command.php:694 lib/command.php:804
+msgid "Specify the name of the user to unsubscribe from."
+msgstr "Зазначте Ñ–Ð¼â€™Ñ ÐºÐ¾Ñ€Ð¸Ñтувача, від Ñкого бажаєте відпиÑатиÑÑŒ."
+
+#. TRANS: Text shown after having unsubscribed from another user successfully.
+#. TRANS: %s is the name of the user the unsubscription was requested for.
+#: lib/command.php:705
+#, php-format
+msgid "Unsubscribed from %s."
+msgstr "ПідпиÑку на допиÑи від %s ÑкаÑовано."
+
#. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
#. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
#: lib/command.php:724 lib/command.php:750
@@ -5746,6 +5838,26 @@ msgstr "Ð¡Ð¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ ÑƒÐ²Ñ–Ð¼ÐºÐ½ÑƒÑ‚Ð¾."
msgid "Can't turn on notification."
msgstr "Ðе можна увімкнути ÑповіщеннÑ."
+#. TRANS: Error text shown when issuing the login command while login is disabled.
+#: lib/command.php:771
+msgid "Login command is disabled."
+msgstr "Команду входу відключено."
+
+#. TRANS: Text shown after issuing the login command successfully.
+#. TRANS: %s is a logon link..
+#: lib/command.php:784
+#, php-format
+msgid "This link is useable only once and is valid for only 2 minutes: %s."
+msgstr ""
+"Дане поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð¼Ð¾Ð¶Ð½Ð° викориÑтати лише раз, воно дійÑне протÑгом 2 хвилин: %s."
+
+#. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
+#. TRANS: %s is the name of the user the unsubscription was requested for.
+#: lib/command.php:813
+#, php-format
+msgid "Unsubscribed %s."
+msgstr "ПідпиÑку %s ÑкаÑовано."
+
#. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
#: lib/command.php:831
msgid "You are not subscribed to anyone."
@@ -6893,12 +7005,12 @@ msgid "The theme file is missing or the upload failed."
msgstr "Файл теми відÑутній, або ÑтавÑÑ Ð·Ð±Ñ–Ð¹ при завантаженні."
#: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:253 lib/themeuploader.php:257
-#: lib/themeuploader.php:265 lib/themeuploader.php:272
+#: lib/themeuploader.php:278 lib/themeuploader.php:282
+#: lib/themeuploader.php:290 lib/themeuploader.php:297
msgid "Failed saving theme."
msgstr "Помилка при збереженні теми."
-#: lib/themeuploader.php:139
+#: lib/themeuploader.php:147
msgid "Invalid theme: bad directory structure."
msgstr "Ðевірна тема: хибна Ñтруктура каталогів."
@@ -6913,7 +7025,7 @@ msgstr ""
msgid "Invalid theme archive: missing file css/display.css"
msgstr "Ð’ архіві з темою Ñ” помилка: відÑутній файл css/display.css"
-#: lib/themeuploader.php:205
+#: lib/themeuploader.php:218
msgid ""
"Theme contains invalid file or folder name. Stick with ASCII letters, "
"digits, underscore, and minus sign."
@@ -6921,12 +7033,16 @@ msgstr ""
"Тема міÑтить неприпуÑтиме Ñ–Ð¼â€™Ñ Ñ„Ð°Ð¹Ð»Ñƒ або теки. ВикориÑтовуйте літери "
"Ñтандарту ASCII, цифри, знаки підкреÑÐ»ÐµÐ½Ð½Ñ Ñ‚Ð° мінуÑу."
-#: lib/themeuploader.php:216
+#: lib/themeuploader.php:224
+msgid "Theme contains unsafe file extension names; may be unsafe."
+msgstr ""
+
+#: lib/themeuploader.php:241
#, php-format
msgid "Theme contains file of type '.%s', which is not allowed."
msgstr "Тема міÑтить файл типу «.%s», Ñкий Ñ” неприпуÑтимим."
-#: lib/themeuploader.php:234
+#: lib/themeuploader.php:259
msgid "Error opening theme archive."
msgstr "Помилка при відкритті архіву з темою."
@@ -7005,56 +7121,56 @@ msgid "Moderator"
msgstr "Модератор"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1102
msgid "a few seconds ago"
msgstr "мить тому"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1106
+#: lib/util.php:1105
msgid "about a minute ago"
msgstr "хвилину тому"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1110
+#: lib/util.php:1109
#, php-format
msgid "about %d minutes ago"
msgstr "близько %d хвилин тому"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1113
+#: lib/util.php:1112
msgid "about an hour ago"
msgstr "годину тому"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1117
+#: lib/util.php:1116
#, php-format
msgid "about %d hours ago"
msgstr "близько %d годин тому"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1120
+#: lib/util.php:1119
msgid "about a day ago"
msgstr "день тому"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1124
+#: lib/util.php:1123
#, php-format
msgid "about %d days ago"
msgstr "близько %d днів тому"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1127
+#: lib/util.php:1126
msgid "about a month ago"
msgstr "міÑÑць тому"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1131
+#: lib/util.php:1130
#, php-format
msgid "about %d months ago"
msgstr "близько %d міÑÑців тому"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1134
+#: lib/util.php:1133
msgid "about a year ago"
msgstr "рік тому"
diff --git a/locale/vi/LC_MESSAGES/statusnet.po b/locale/vi/LC_MESSAGES/statusnet.po
index 143a5f83b..32b5eb0c4 100644
--- a/locale/vi/LC_MESSAGES/statusnet.po
+++ b/locale/vi/LC_MESSAGES/statusnet.po
@@ -8,12 +8,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-28 15:28+0000\n"
-"PO-Revision-Date: 2010-08-28 15:31:41+0000\n"
+"POT-Creation-Date: 2010-09-05 09:45+0000\n"
+"PO-Revision-Date: 2010-09-05 09:47:27+0000\n"
"Language-Team: Vietnamese\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r71856); Translate extension (2010-08-20)\n"
+"X-Generator: MediaWiki 1.17alpha (r72319); Translate extension (2010-08-20)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: vi\n"
"X-Message-Group: out-statusnet\n"
@@ -393,7 +393,7 @@ msgid ""
msgstr ""
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:450
+#: actions/apioauthauthorize.php:310 lib/action.php:463
msgid "Account"
msgstr "Tài khoản"
@@ -3518,7 +3518,7 @@ msgstr ""
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1751
+#: classes/Notice.php:1757
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -3598,124 +3598,124 @@ msgid "Other"
msgstr ""
#. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:145
+#: lib/action.php:148
#, php-format
msgid "%1$s - %2$s"
msgstr "Trạng thái của %1$s vào %2$s"
#. TRANS: Page title for a page without a title set.
-#: lib/action.php:161
+#: lib/action.php:164
msgid "Untitled page"
msgstr ""
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:436
+#: lib/action.php:449
msgid "Primary site navigation"
msgstr ""
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:442
+#: lib/action.php:455
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr ""
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:452
+#: lib/action.php:465
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr ""
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:455
+#: lib/action.php:468
msgid "Connect"
msgstr "Kết nối"
#. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:461
+#: lib/action.php:474
msgctxt "MENU"
msgid "Admin"
msgstr ""
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:474
+#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr ""
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:482
+#: lib/action.php:495
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr ""
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:488
+#: lib/action.php:501
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr ""
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:500
+#: lib/action.php:513
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr ""
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:592
+#: lib/action.php:605
msgid "Local views"
msgstr ""
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:762
+#: lib/action.php:778
msgid "Secondary site navigation"
msgstr ""
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:768
+#: lib/action.php:784
msgid "Help"
msgstr "Hướng dẫn"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:771
+#: lib/action.php:787
msgid "About"
msgstr "Giới thiệu"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:774
+#: lib/action.php:790
msgid "FAQ"
msgstr "FAQ"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:779
+#: lib/action.php:795
msgid "TOS"
msgstr ""
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:783
+#: lib/action.php:799
msgid "Privacy"
msgstr "Riêng tư"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:786
+#: lib/action.php:802
msgid "Source"
msgstr "Nguồn"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:792
+#: lib/action.php:808
msgid "Contact"
msgstr "Liên hệ"
-#: lib/action.php:794
+#: lib/action.php:810
msgid "Badge"
msgstr ""
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:823
+#: lib/action.php:839
msgid "StatusNet software license"
msgstr ""
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:827
+#: lib/action.php:843
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -3723,13 +3723,13 @@ msgid ""
msgstr ""
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:830
+#: lib/action.php:846
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr "**%%site.name%%** là dịch vụ gửi tin nhắn."
#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:834
+#: lib/action.php:850
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -3739,38 +3739,38 @@ msgstr ""
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:857
+#: lib/action.php:873
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:864
+#: lib/action.php:880
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:868
+#: lib/action.php:884
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:881
+#: lib/action.php:897
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr ""
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: present than the currently displayed information.
-#: lib/action.php:1203
+#: lib/action.php:1247
msgid "After"
msgstr ""
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: past than the currently displayed information.
-#: lib/action.php:1213
+#: lib/action.php:1257
msgid "Before"
msgstr ""
@@ -4855,7 +4855,7 @@ msgstr ""
msgid "The theme file is missing or the upload failed."
msgstr ""
-#: lib/themeuploader.php:139
+#: lib/themeuploader.php:147
msgid "Invalid theme: bad directory structure."
msgstr ""
@@ -4868,13 +4868,17 @@ msgstr ""
msgid "Invalid theme archive: missing file css/display.css"
msgstr ""
-#: lib/themeuploader.php:205
+#: lib/themeuploader.php:218
msgid ""
"Theme contains invalid file or folder name. Stick with ASCII letters, "
"digits, underscore, and minus sign."
msgstr ""
-#: lib/themeuploader.php:216
+#: lib/themeuploader.php:224
+msgid "Theme contains unsafe file extension names; may be unsafe."
+msgstr ""
+
+#: lib/themeuploader.php:241
#, php-format
msgid "Theme contains file of type '.%s', which is not allowed."
msgstr ""
@@ -4926,56 +4930,56 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1102
msgid "a few seconds ago"
msgstr "vài giây trước"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1106
+#: lib/util.php:1105
msgid "about a minute ago"
msgstr "1 phút trước"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1110
+#: lib/util.php:1109
#, php-format
msgid "about %d minutes ago"
msgstr "%d phút trước"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1113
+#: lib/util.php:1112
msgid "about an hour ago"
msgstr "1 giỠtrước"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1117
+#: lib/util.php:1116
#, php-format
msgid "about %d hours ago"
msgstr "%d giỠtrước"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1120
+#: lib/util.php:1119
msgid "about a day ago"
msgstr "1 ngày trước"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1124
+#: lib/util.php:1123
#, php-format
msgid "about %d days ago"
msgstr "%d ngày trước"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1127
+#: lib/util.php:1126
msgid "about a month ago"
msgstr "1 tháng trước"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1131
+#: lib/util.php:1130
#, php-format
msgid "about %d months ago"
msgstr "%d tháng trước"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1134
+#: lib/util.php:1133
msgid "about a year ago"
msgstr "1 năm trước"
diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po
index 5f7b70af3..67fa98718 100644
--- a/locale/zh_CN/LC_MESSAGES/statusnet.po
+++ b/locale/zh_CN/LC_MESSAGES/statusnet.po
@@ -14,12 +14,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-28 15:28+0000\n"
-"PO-Revision-Date: 2010-08-28 15:31:46+0000\n"
+"POT-Creation-Date: 2010-09-05 09:45+0000\n"
+"PO-Revision-Date: 2010-09-05 09:47: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 (r71856); Translate extension (2010-08-20)\n"
+"X-Generator: MediaWiki 1.17alpha (r72319); Translate extension (2010-08-20)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: zh-hans\n"
"X-Message-Group: out-statusnet\n"
@@ -599,7 +599,7 @@ msgstr ""
"strong>您的%4$s账户数æ®ã€‚您应该åªå…许您信任的第三方程åºè®¿é—®æ‚¨çš„%4$s账户。"
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:450
+#: actions/apioauthauthorize.php:310 lib/action.php:463
msgid "Account"
msgstr "å¸å·"
@@ -635,7 +635,7 @@ msgstr "此方法接å—POST或DELETE请求。"
#: actions/apistatusesdestroy.php:135
msgid "You may not delete another user's status."
-msgstr "您ä¸èƒ½åˆ é™¤å…¶ä»–用户的状æ€ã€‚"
+msgstr "您ä¸èƒ½åˆ é™¤å…¶ä»–用户的消æ¯ã€‚"
#: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72
#: actions/deletenotice.php:52 actions/shownotice.php:92
@@ -1006,7 +1006,7 @@ msgstr "æ‚¨ä¸æ˜¯è¯¥åº”用的拥有者。"
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1263
+#: lib/action.php:1307
msgid "There was a problem with your session token."
msgstr "您的 session token 出现了问题。"
@@ -1841,7 +1841,7 @@ msgstr "该组æˆå‘˜åˆ—表。"
#: actions/groupmembers.php:182 lib/groupnav.php:107
msgid "Admin"
-msgstr "管ç†å‘˜"
+msgstr "管ç†"
#: actions/groupmembers.php:392 lib/blockform.php:69
msgid "Block"
@@ -3507,7 +3507,7 @@ msgstr "用于已ç»åœ¨æ²™ç›’中了。"
#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
#: lib/adminpanelaction.php:392
msgid "Sessions"
-msgstr "会è¯"
+msgstr "Sessions"
#: actions/sessionsadminpanel.php:65
msgid "Session settings for this StatusNet site."
@@ -3515,7 +3515,7 @@ msgstr "这个 StatusNet 网站的设计设置"
#: actions/sessionsadminpanel.php:175
msgid "Handle sessions"
-msgstr "管ç†ä¼šè¯"
+msgstr "ç®¡ç† sessions"
#: actions/sessionsadminpanel.php:177
msgid "Whether to handle sessions ourselves."
@@ -3523,11 +3523,11 @@ msgstr "是å¦è‡ªå·±å¤„ç†sessions。"
#: actions/sessionsadminpanel.php:181
msgid "Session debugging"
-msgstr "会è¯è°ƒè¯•"
+msgstr "Session 调试"
#: actions/sessionsadminpanel.php:183
msgid "Turn on debugging output for sessions."
-msgstr "打开会è¯çš„调试输出。"
+msgstr "打开 sessions 的调试输出。"
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
#: actions/useradminpanel.php:294
@@ -3723,7 +3723,7 @@ msgstr "%s çš„å‘ä»¶ç®±"
#: actions/showgroup.php:393 actions/showgroup.php:445 lib/groupnav.php:91
msgid "Members"
-msgstr "æˆå‘˜"
+msgstr "å°ç»„æˆå‘˜"
#: actions/showgroup.php:398 lib/profileaction.php:117
#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95
@@ -3984,31 +3984,31 @@ msgstr "ç”¨æˆ·å†æ¬¡å‘布相åŒå†…容时需è¦ç­‰å¾…的时间(秒)。"
#: actions/sitenoticeadminpanel.php:56
msgid "Site Notice"
-msgstr "网站消æ¯"
+msgstr "网站公告"
#: actions/sitenoticeadminpanel.php:67
msgid "Edit site-wide message"
-msgstr "编辑整个网站的消æ¯"
+msgstr "编辑整个网站的公告"
#: actions/sitenoticeadminpanel.php:103
msgid "Unable to save site notice."
-msgstr "ä¿å­˜ç½‘站消æ¯"
+msgstr "无法ä¿å­˜ç½‘站公告。"
#: actions/sitenoticeadminpanel.php:113
msgid "Max length for the site-wide notice is 255 chars."
-msgstr "整个网站最长的消æ¯é™åˆ¶ä¸º255字符。"
+msgstr "整个网站的公告最长é™åˆ¶ä¸º255字符。"
#: actions/sitenoticeadminpanel.php:176
msgid "Site notice text"
-msgstr "ç½‘ç«™æ¶ˆæ¯æ–‡å­—"
+msgstr "网站公告文字"
#: actions/sitenoticeadminpanel.php:178
msgid "Site-wide notice text (255 chars max; HTML okay)"
-msgstr "æ•´ä¸ªç½‘ç«™çš„æ¶ˆæ¯æ–‡å­—(最长255字符;å¯ä½¿ç”¨HTML)"
+msgstr "整个网站的公告文字(最长255字符;å¯ä½¿ç”¨HTML)"
#: actions/sitenoticeadminpanel.php:198
msgid "Save site notice"
-msgstr "ä¿å­˜ç½‘站消æ¯"
+msgstr "ä¿å­˜ç½‘站公告"
#. TRANS: Title for SMS settings.
#: actions/smssettings.php:59
@@ -4680,7 +4680,7 @@ msgid "Plugins"
msgstr "æ’ä»¶"
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:789
+#: actions/version.php:198 lib/action.php:805
msgid "Version"
msgstr "版本"
@@ -4834,7 +4834,7 @@ msgstr "ä¿å­˜å°ç»„收件箱时出错。"
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1751
+#: classes/Notice.php:1757
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -4859,7 +4859,7 @@ msgid "Missing profile."
msgstr "丢失的个人信æ¯ã€‚"
#. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:346
+#: classes/Status_network.php:339
msgid "Unable to save tag."
msgstr "无法ä¿å­˜æ ‡ç­¾ã€‚"
@@ -4961,199 +4961,199 @@ msgid "Other"
msgstr "å…¶ä»–"
#. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:145
+#: lib/action.php:148
#, php-format
msgid "%1$s - %2$s"
msgstr "%1$s - %2$s"
#. TRANS: Page title for a page without a title set.
-#: lib/action.php:161
+#: lib/action.php:164
msgid "Untitled page"
msgstr "无标题页"
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:436
+#: lib/action.php:449
msgid "Primary site navigation"
msgstr "主站导航"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:442
+#: lib/action.php:455
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr "ä¸ªäººèµ„æ–™åŠæœ‹å‹çš„æ—¶é—´çº¿"
#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:445
+#: lib/action.php:458
msgctxt "MENU"
msgid "Personal"
msgstr "个人"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:447
+#: lib/action.php:460
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "修改您的 email 地å€ã€å¤´åƒã€å¯†ç ã€èµ„æ–™"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:452
+#: lib/action.php:465
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "å…³è”çš„æœåŠ¡"
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:455
+#: lib/action.php:468
msgid "Connect"
msgstr "å…³è”"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:458
+#: lib/action.php:471
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "更改网站é…ç½®"
#. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:461
+#: lib/action.php:474
msgctxt "MENU"
msgid "Admin"
msgstr "管ç†"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:465
+#: lib/action.php:478
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "邀请好å‹å’ŒåŒäº‹åŠ å…¥%s。"
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:468
+#: lib/action.php:481
msgctxt "MENU"
msgid "Invite"
msgstr "邀请"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:474
+#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "从网站登出"
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:477
+#: lib/action.php:490
msgctxt "MENU"
msgid "Logout"
msgstr "登出"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:482
+#: lib/action.php:495
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "创建一个账户"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:485
+#: lib/action.php:498
msgctxt "MENU"
msgid "Register"
msgstr "注册"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:488
+#: lib/action.php:501
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "登录这个网站"
-#: lib/action.php:491
+#: lib/action.php:504
msgctxt "MENU"
msgid "Login"
msgstr "登录"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:494
+#: lib/action.php:507
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "帮助我ï¼"
-#: lib/action.php:497
+#: lib/action.php:510
msgctxt "MENU"
msgid "Help"
msgstr "帮助"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:500
+#: lib/action.php:513
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "æœç´¢äººæˆ–文字"
-#: lib/action.php:503
+#: lib/action.php:516
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:525 lib/adminpanelaction.php:400
+#: lib/action.php:538 lib/adminpanelaction.php:400
msgid "Site notice"
msgstr "网站消æ¯"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:592
+#: lib/action.php:605
msgid "Local views"
msgstr "本地显示"
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:659
+#: lib/action.php:675
msgid "Page notice"
msgstr "页颿¶ˆæ¯"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:762
+#: lib/action.php:778
msgid "Secondary site navigation"
msgstr "副站导航"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:768
+#: lib/action.php:784
msgid "Help"
msgstr "帮助"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:771
+#: lib/action.php:787
msgid "About"
msgstr "关于"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:774
+#: lib/action.php:790
msgid "FAQ"
msgstr "FAQ"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:779
+#: lib/action.php:795
msgid "TOS"
msgstr "æ¡æ¬¾"
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:783
+#: lib/action.php:799
msgid "Privacy"
msgstr "éšç§"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:786
+#: lib/action.php:802
msgid "Source"
msgstr "æºç "
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:792
+#: lib/action.php:808
msgid "Contact"
msgstr "è”ç³»"
-#: lib/action.php:794
+#: lib/action.php:810
msgid "Badge"
msgstr "挂件"
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:823
+#: lib/action.php:839
msgid "StatusNet software license"
msgstr "StatusNet 软件许å¯è¯"
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:827
+#: lib/action.php:843
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5163,13 +5163,13 @@ msgstr ""
"broughtbyurl%%)。"
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:830
+#: lib/action.php:846
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr "**%%site.name%%** 是一个微åšå®¢æœåŠ¡ã€‚"
#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:834
+#: lib/action.php:850
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5180,49 +5180,49 @@ msgstr ""
"(http://www.fsf.org/licensing/licenses/agpl-3.0.html)授æƒã€‚"
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:850
+#: lib/action.php:866
msgid "Site content license"
msgstr "网站内容许å¯åè®®"
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:857
+#: lib/action.php:873
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr "%1$sçš„å†…å®¹å’Œæ•°æ®æ˜¯ç§äººä¸”ä¿å¯†çš„。"
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:864
+#: lib/action.php:880
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr "内容和数æ®%1$sç‰ˆæƒæ‰€æœ‰å¹¶ä¿ç•™æ‰€æœ‰æƒåˆ©ã€‚"
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:868
+#: lib/action.php:884
msgid "Content and data copyright by contributors. All rights reserved."
msgstr "内容和数æ®è´¡çŒ®è€…ç‰ˆæƒæ‰€æœ‰å¹¶ä¿ç•™æ‰€æœ‰æƒåˆ©ã€‚"
#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:881
+#: lib/action.php:897
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr "所有%1$s的内容和数æ®åœ¨%2$s许å¯ä¸‹æœ‰æ•ˆã€‚"
#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1192
+#: lib/action.php:1236
msgid "Pagination"
msgstr "分页"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: present than the currently displayed information.
-#: lib/action.php:1203
+#: lib/action.php:1247
msgid "After"
msgstr "之åŽ"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: past than the currently displayed information.
-#: lib/action.php:1213
+#: lib/action.php:1257
msgid "Before"
msgstr "之å‰"
@@ -5477,6 +5477,31 @@ msgstr "执行完毕"
msgid "Command failed"
msgstr "执行失败"
+#. TRANS: Command exception text shown when a notice ID is requested that does not exist.
+#: lib/command.php:84 lib/command.php:108
+msgid "Notice with that id does not exist."
+msgstr "没有此 id 的消æ¯ã€‚"
+
+#. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
+#. TRANS: Error text shown when a last user notice is requested and it does not exist.
+#: lib/command.php:101 lib/command.php:630
+msgid "User has no last notice."
+msgstr "用户没有最åŽä¸€æ¡çš„æ¶ˆæ¯ã€‚"
+
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:130
+#, php-format
+msgid "Could not find a user with nickname %s."
+msgstr "无法找到昵称为 %s 的用户。"
+
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:150
+#, php-format
+msgid "Could not find a local user with nickname %s."
+msgstr "无法在本地找到昵称为%s的用户。"
+
#. TRANS: Error text shown when an unimplemented command is given.
#: lib/command.php:185
msgid "Sorry, this command is not yet implemented."
@@ -5487,6 +5512,13 @@ msgstr "对ä¸èµ·ï¼Œè¿™ä¸ªå‘½ä»¤è¿˜æ²¡æœ‰å®žçŽ°ã€‚"
msgid "It does not make a lot of sense to nudge yourself!"
msgstr "呼å«è‡ªå·±ä¸å¤ªç¬¦åˆé€»è¾‘å§ã€‚"
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:240
+#, php-format
+msgid "Nudge sent to %s."
+msgstr "呼å«å·²å‘ç»™ %s。"
+
#. TRANS: User statistics text.
#. TRANS: %1$s is the number of other user the user is subscribed to.
#. TRANS: %2$s is the number of users that are subscribed to the user.
@@ -5507,6 +5539,20 @@ msgstr ""
msgid "Notice marked as fave."
msgstr "消æ¯è¢«æ ‡è®°ä¸ºæ”¶è—。"
+#. TRANS: Message given having added a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:360
+#, php-format
+msgid "%1$s joined group %2$s."
+msgstr "%1$s加入了%2$så°ç»„。"
+
+#. TRANS: Message given having removed a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:408
+#, php-format
+msgid "%1$s left group %2$s."
+msgstr "%1$s离开了%2$så°ç»„。"
+
#. TRANS: Whois output. %s is the full name of the queried user.
#: lib/command.php:434
#, php-format
@@ -5553,21 +5599,67 @@ msgstr "消æ¯åŒ…å«%2$d个字符,超出长度é™åˆ¶ - ä¸èƒ½è¶…过%1$d个字ç
msgid "Error sending direct message."
msgstr "å‘逿¶ˆæ¯å‡ºé”™ã€‚"
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:554
+#, php-format
+msgid "Notice from %s repeated."
+msgstr "æ¥è‡ª %s 的消æ¯å·²è½¬å‘。"
+
#. TRANS: Error text shown when repeating a notice fails with an unknown reason.
#: lib/command.php:557
msgid "Error repeating notice."
msgstr "è½¬å‘æ¶ˆæ¯æ—¶å‡ºé”™ã€‚"
+#. TRANS: Message given if content of a notice for a reply is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:592
+#, php-format
+msgid "Notice too long - maximum is %1$d characters, you sent %2$d."
+msgstr "消æ¯è¿‡é•¿ - 最长%1$d个字符,您å‘é€çš„æ˜¯%2$d。"
+
+#. TRANS: Text shown having sent a reply to a notice successfully.
+#. TRANS: %s is the nickname of the user of the notice the reply was sent to.
+#: lib/command.php:603
+#, php-format
+msgid "Reply to %s sent."
+msgstr "ç»™ %s 的回å¤å·²å‘é€ã€‚"
+
#. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
#: lib/command.php:606
msgid "Error saving notice."
msgstr "ä¿å­˜æ¶ˆæ¯æ—¶å‡ºé”™ã€‚"
+#. TRANS: Error text shown when no username was provided when issuing a subscribe command.
+#: lib/command.php:655
+msgid "Specify the name of the user to subscribe to."
+msgstr "指定è¦å…³æ³¨çš„用户å。"
+
#. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
#: lib/command.php:664
msgid "Can't subscribe to OMB profiles by command."
msgstr "无法通过命令行关注 OMB 用户。"
+#. TRANS: Text shown after having subscribed to another user successfully.
+#. TRANS: %s is the name of the user the subscription was requested for.
+#: lib/command.php:672
+#, php-format
+msgid "Subscribed to %s."
+msgstr "已关注%s。"
+
+#. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
+#. TRANS: Error text shown when no username was provided when issuing the command.
+#: lib/command.php:694 lib/command.php:804
+msgid "Specify the name of the user to unsubscribe from."
+msgstr "指定è¦å–消关注的用户å。"
+
+#. TRANS: Text shown after having unsubscribed from another user successfully.
+#. TRANS: %s is the name of the user the unsubscription was requested for.
+#: lib/command.php:705
+#, php-format
+msgid "Unsubscribed from %s."
+msgstr "å–æ¶ˆå…³æ³¨%s。"
+
#. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
#. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
#: lib/command.php:724 lib/command.php:750
@@ -5594,6 +5686,25 @@ msgstr "通知已开å¯ã€‚"
msgid "Can't turn on notification."
msgstr "无法开å¯é€šçŸ¥ã€‚"
+#. TRANS: Error text shown when issuing the login command while login is disabled.
+#: lib/command.php:771
+msgid "Login command is disabled."
+msgstr "登录命令被ç¦ç”¨ã€‚"
+
+#. TRANS: Text shown after issuing the login command successfully.
+#. TRANS: %s is a logon link..
+#: lib/command.php:784
+#, php-format
+msgid "This link is useable only once and is valid for only 2 minutes: %s."
+msgstr "这个链接åªèƒ½ä½¿ç”¨ä¸€æ¬¡å¹¶ä¸”仅在2分钟内有效:%s。"
+
+#. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
+#. TRANS: %s is the name of the user the unsubscription was requested for.
+#: lib/command.php:813
+#, php-format
+msgid "Unsubscribed %s."
+msgstr "已喿¶ˆå…³æ³¨%s。"
+
#. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
#: lib/command.php:831
msgid "You are not subscribed to anyone."
@@ -5858,7 +5969,7 @@ msgstr "å°ç»„"
#: lib/groupnav.php:101
msgid "Blocked"
-msgstr "被å±è”½"
+msgstr "å±è”½ç”¨æˆ·"
#: lib/groupnav.php:102
#, php-format
@@ -6725,12 +6836,12 @@ msgid "The theme file is missing or the upload failed."
msgstr "主题文件丢失或上传失败。"
#: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:253 lib/themeuploader.php:257
-#: lib/themeuploader.php:265 lib/themeuploader.php:272
+#: lib/themeuploader.php:278 lib/themeuploader.php:282
+#: lib/themeuploader.php:290 lib/themeuploader.php:297
msgid "Failed saving theme."
msgstr "ä¿å­˜ä¸»é¢˜å¤±è´¥"
-#: lib/themeuploader.php:139
+#: lib/themeuploader.php:147
msgid "Invalid theme: bad directory structure."
msgstr "无效的主题:目录结构æŸå。"
@@ -6743,19 +6854,23 @@ msgstr "上传的主题过大,解压åŽå¿…é¡»å°äºŽ%d字节。"
msgid "Invalid theme archive: missing file css/display.css"
msgstr "无效的主题存档:css/display.css 文件丢失"
-#: lib/themeuploader.php:205
+#: lib/themeuploader.php:218
msgid ""
"Theme contains invalid file or folder name. Stick with ASCII letters, "
"digits, underscore, and minus sign."
msgstr ""
"ä¸»é¢˜åŒ…å«æ— æ•ˆçš„æ–‡ä»¶æˆ–文件夹的å称。请åªä½¿ç”¨ ASCII å­—æ¯ï¼Œæ•°å­—,下划线和å‡å·ã€‚"
-#: lib/themeuploader.php:216
+#: lib/themeuploader.php:224
+msgid "Theme contains unsafe file extension names; may be unsafe."
+msgstr ""
+
+#: lib/themeuploader.php:241
#, php-format
msgid "Theme contains file of type '.%s', which is not allowed."
msgstr "主题包å«ä¸å…许的â€.%sâ€œæ ¼å¼æ–‡ä»¶ã€‚"
-#: lib/themeuploader.php:234
+#: lib/themeuploader.php:259
msgid "Error opening theme archive."
msgstr "打开主题文件时出错。"
@@ -6813,7 +6928,7 @@ msgstr "给该用户å‘é€ç§ä¿¡"
#: lib/userprofile.php:288
msgid "Message"
-msgstr "消æ¯"
+msgstr "ç§ä¿¡"
#: lib/userprofile.php:326
msgid "Moderate"
@@ -6834,56 +6949,56 @@ msgid "Moderator"
msgstr "审核员"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1102
msgid "a few seconds ago"
msgstr "几秒å‰"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1106
+#: lib/util.php:1105
msgid "about a minute ago"
msgstr "约1分钟å‰"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1110
+#: lib/util.php:1109
#, php-format
msgid "about %d minutes ago"
msgstr "约%d分钟å‰"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1113
+#: lib/util.php:1112
msgid "about an hour ago"
msgstr "约1å°æ—¶å‰"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1117
+#: lib/util.php:1116
#, php-format
msgid "about %d hours ago"
msgstr "约%då°æ—¶å‰"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1120
+#: lib/util.php:1119
msgid "about a day ago"
msgstr "约1天å‰"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1124
+#: lib/util.php:1123
#, php-format
msgid "about %d days ago"
msgstr "约%d天å‰"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1127
+#: lib/util.php:1126
msgid "about a month ago"
msgstr "约1个月å‰"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1131
+#: lib/util.php:1130
#, php-format
msgid "about %d months ago"
msgstr "约%d个月å‰"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1134
+#: lib/util.php:1133
msgid "about a year ago"
msgstr "约1å¹´å‰"
diff --git a/locale/zh_TW/LC_MESSAGES/statusnet.po b/locale/zh_TW/LC_MESSAGES/statusnet.po
index 99a4e357e..be1444e94 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-08-28 15:28+0000\n"
-"PO-Revision-Date: 2010-08-28 15:31:48+0000\n"
+"POT-Creation-Date: 2010-09-05 09:45+0000\n"
+"PO-Revision-Date: 2010-09-05 09:47:33+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 (r71856); Translate extension (2010-08-20)\n"
+"X-Generator: MediaWiki 1.17alpha (r72319); Translate extension (2010-08-20)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: zh-hant\n"
"X-Message-Group: out-statusnet\n"
@@ -748,7 +748,7 @@ msgstr "ç„¡æ³•å–æ¶ˆä¿¡ç®±ç¢ºèª"
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1263
+#: lib/action.php:1307
msgid "There was a problem with your session token."
msgstr ""
@@ -3526,7 +3526,7 @@ msgid "Plugins"
msgstr ""
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:789
+#: actions/version.php:198 lib/action.php:805
msgid "Version"
msgstr ""
@@ -3648,7 +3648,7 @@ msgstr ""
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1751
+#: classes/Notice.php:1757
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
@@ -3673,7 +3673,7 @@ msgid "Missing profile."
msgstr "新的更人資料輸入錯誤"
#. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:346
+#: classes/Status_network.php:339
msgid "Unable to save tag."
msgstr "無法儲存個人資料"
@@ -3745,156 +3745,156 @@ msgid "Other"
msgstr ""
#. TRANS: Page title for a page without a title set.
-#: lib/action.php:161
+#: lib/action.php:164
msgid "Untitled page"
msgstr ""
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:442
+#: lib/action.php:455
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr ""
#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:445
+#: lib/action.php:458
msgctxt "MENU"
msgid "Personal"
msgstr ""
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:447
+#: lib/action.php:460
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr ""
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:452
+#: lib/action.php:465
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr ""
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:455
+#: lib/action.php:468
msgid "Connect"
msgstr "連çµ"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:458
+#: lib/action.php:471
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "無確èªç¢¼"
#. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:461
+#: lib/action.php:474
msgctxt "MENU"
msgid "Admin"
msgstr ""
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:465
+#: lib/action.php:478
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr ""
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:468
+#: lib/action.php:481
msgctxt "MENU"
msgid "Invite"
msgstr ""
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:474
+#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr ""
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:477
+#: lib/action.php:490
msgctxt "MENU"
msgid "Logout"
msgstr "登入"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:482
+#: lib/action.php:495
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr ""
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:485
+#: lib/action.php:498
msgctxt "MENU"
msgid "Register"
msgstr ""
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:488
+#: lib/action.php:501
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr ""
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:500
+#: lib/action.php:513
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr ""
-#: lib/action.php:503
+#: lib/action.php:516
msgctxt "MENU"
msgid "Search"
msgstr ""
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:592
+#: lib/action.php:605
msgid "Local views"
msgstr ""
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:768
+#: lib/action.php:784
msgid "Help"
msgstr "求救"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:771
+#: lib/action.php:787
msgid "About"
msgstr "關於"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:774
+#: lib/action.php:790
msgid "FAQ"
msgstr "常見å•題"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:779
+#: lib/action.php:795
msgid "TOS"
msgstr ""
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:783
+#: lib/action.php:799
msgid "Privacy"
msgstr ""
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:786
+#: lib/action.php:802
msgid "Source"
msgstr ""
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:792
+#: lib/action.php:808
msgid "Contact"
msgstr "好å‹åå–®"
-#: lib/action.php:794
+#: lib/action.php:810
msgid "Badge"
msgstr ""
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:823
+#: lib/action.php:839
msgid "StatusNet software license"
msgstr ""
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:827
+#: lib/action.php:843
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -3902,13 +3902,13 @@ msgid ""
msgstr ""
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:830
+#: lib/action.php:846
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr "**%%site.name%%**æ˜¯å€‹å¾®åž‹éƒ¨è½æ ¼"
#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:834
+#: lib/action.php:850
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -3917,49 +3917,49 @@ msgid ""
msgstr ""
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:850
+#: lib/action.php:866
msgid "Site content license"
msgstr ""
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:857
+#: lib/action.php:873
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:864
+#: lib/action.php:880
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:868
+#: lib/action.php:884
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:881
+#: lib/action.php:897
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr ""
#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1192
+#: lib/action.php:1236
msgid "Pagination"
msgstr ""
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: present than the currently displayed information.
-#: lib/action.php:1203
+#: lib/action.php:1247
msgid "After"
msgstr ""
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: past than the currently displayed information.
-#: lib/action.php:1213
+#: lib/action.php:1257
msgid "Before"
msgstr ""
@@ -5141,7 +5141,7 @@ msgstr ""
msgid "The theme file is missing or the upload failed."
msgstr ""
-#: lib/themeuploader.php:139
+#: lib/themeuploader.php:147
msgid "Invalid theme: bad directory structure."
msgstr ""
@@ -5154,13 +5154,17 @@ msgstr ""
msgid "Invalid theme archive: missing file css/display.css"
msgstr ""
-#: lib/themeuploader.php:205
+#: lib/themeuploader.php:218
msgid ""
"Theme contains invalid file or folder name. Stick with ASCII letters, "
"digits, underscore, and minus sign."
msgstr ""
-#: lib/themeuploader.php:216
+#: lib/themeuploader.php:224
+msgid "Theme contains unsafe file extension names; may be unsafe."
+msgstr ""
+
+#: lib/themeuploader.php:241
#, php-format
msgid "Theme contains file of type '.%s', which is not allowed."
msgstr ""
@@ -5212,56 +5216,56 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1102
msgid "a few seconds ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1106
+#: lib/util.php:1105
msgid "about a minute ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1110
+#: lib/util.php:1109
#, php-format
msgid "about %d minutes ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1113
+#: lib/util.php:1112
msgid "about an hour ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1117
+#: lib/util.php:1116
#, php-format
msgid "about %d hours ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1120
+#: lib/util.php:1119
msgid "about a day ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1124
+#: lib/util.php:1123
#, php-format
msgid "about %d days ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1127
+#: lib/util.php:1126
msgid "about a month ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1131
+#: lib/util.php:1130
#, php-format
msgid "about %d months ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1134
+#: lib/util.php:1133
msgid "about a year ago"
msgstr ""
diff --git a/plugins/DisqusPlugin.php b/plugins/DisqusPlugin.php
index dc56f320c..c07eaaabd 100644
--- a/plugins/DisqusPlugin.php
+++ b/plugins/DisqusPlugin.php
@@ -148,7 +148,7 @@ ENDOFSCRIPT;
$noticeUrl .= '#disqus_thread';
$noticeListItem->out->element(
- 'a', array('href' => $noticeUrl, 'class' => 'disqus_count', 'Comments')
+ 'a', array('href' => $noticeUrl, 'class' => 'disqus_count'), 'Comments'
);
$noticeListItem->showNoticeOptions();
diff --git a/plugins/MobileProfile/MobileProfilePlugin.php b/plugins/MobileProfile/MobileProfilePlugin.php
index 6076bbde0..72a6a04fb 100644
--- a/plugins/MobileProfile/MobileProfilePlugin.php
+++ b/plugins/MobileProfile/MobileProfilePlugin.php
@@ -241,7 +241,7 @@ class MobileProfilePlugin extends WAP20Plugin
return true;
}
- $action->cssLink('css/display.css');
+ $action->primaryCssLink();
if (file_exists(Theme::file('css/mp-screen.css'))) {
$action->cssLink('css/mp-screen.css', null, 'screen');
diff --git a/plugins/NoticeTitle/NoticeTitlePlugin.php b/plugins/NoticeTitle/NoticeTitlePlugin.php
index f7fb1e4d0..9f53173db 100644
--- a/plugins/NoticeTitle/NoticeTitlePlugin.php
+++ b/plugins/NoticeTitle/NoticeTitlePlugin.php
@@ -278,5 +278,54 @@ class NoticeTitlePlugin extends Plugin
return true;
}
+
+ /**
+ * If a notice has a title, show it in the <title> element
+ *
+ * @param Action $action Action being executed
+ *
+ * @return boolean hook value
+ */
+
+ function onStartShowHeadTitle($action)
+ {
+ $actionName = $action->trimmed('action');
+
+ if ($actionName == 'shownotice') {
+ $title = Notice_title::fromNotice($action->notice);
+ if (!empty($title)) {
+ $action->element('title', null,
+ // TRANS: Page title. %1$s is the title, %2$s is the site name.
+ sprintf(_("%1\$s - %2\$s"),
+ $title,
+ common_config('site', 'name')));
+ }
+ }
+
+ return true;
+ }
+
+ /**
+ * If a notice has a title, show it in the <h1> element
+ *
+ * @param Action $action Action being executed
+ *
+ * @return boolean hook value
+ */
+
+ function onStartShowPageTitle($action)
+ {
+ $actionName = $action->trimmed('action');
+
+ if ($actionName == 'shownotice') {
+ $title = Notice_title::fromNotice($action->notice);
+ if (!empty($title)) {
+ $action->element('h1', null, $title);
+ return false;
+ }
+ }
+
+ return true;
+ }
}
diff --git a/plugins/OStatus/OStatusPlugin.php b/plugins/OStatus/OStatusPlugin.php
index 6fef20d6f..77bc9872b 100644
--- a/plugins/OStatus/OStatusPlugin.php
+++ b/plugins/OStatus/OStatusPlugin.php
@@ -248,17 +248,6 @@ class OStatusPlugin extends Plugin
}
/**
- * Check if we've got remote replies to send via Salmon.
- *
- * @fixme push webfinger lookup & sending to a background queue
- * @fixme also detect short-form name for remote subscribees where not ambiguous
- */
-
- function onEndNoticeSave($notice)
- {
- }
-
- /**
* Find any explicit remote mentions. Accepted forms:
* Webfinger: @user@example.com
* Profile link: @example.com/mublog/user
@@ -492,7 +481,7 @@ class OStatusPlugin extends Plugin
* Tell the FeedSub infrastructure whether we have any active OStatus
* usage for the feed; if not it'll be able to garbage-collect the
* feed subscription.
- *
+ *
* @param FeedSub $feedsub
* @param integer $count in/out
* @return mixed hook return code
@@ -575,7 +564,9 @@ class OStatusPlugin extends Plugin
$act->time = time();
$act->title = _("Follow");
- $act->content = sprintf(_("%s is now following %s."),
+ // TRANS: Success message for subscribe to user attempt through OStatus.
+ // TRANS: %1$s is the subscriber name, %2$s is the subscribed user's name.
+ $act->content = sprintf(_("%1$s is now following %2$s."),
$subscriber->getBestName(),
$other->getBestName());
@@ -623,7 +614,9 @@ class OStatusPlugin extends Plugin
$act->time = time();
$act->title = _("Unfollow");
- $act->content = sprintf(_("%s stopped following %s."),
+ // TRANS: Success message for unsubscribe from user attempt through OStatus.
+ // TRANS: %1$s is the unsubscriber's name, %2$s is the unsubscribed user's name.
+ $act->content = sprintf(_("%1$s stopped following %2$s."),
$profile->getBestName(),
$other->getBestName());
@@ -668,7 +661,9 @@ class OStatusPlugin extends Plugin
$act->time = time();
$act->title = _m("Join");
- $act->content = sprintf(_m("%s has joined group %s."),
+ // TRANS: Success message for subscribe to group attempt through OStatus.
+ // TRANS: %1$s is the member name, %2$s is the subscribed group's name.
+ $act->content = sprintf(_m("%1$s has joined group %2$s."),
$member->getBestName(),
$oprofile->getBestName());
@@ -717,7 +712,9 @@ class OStatusPlugin extends Plugin
$act->time = time();
$act->title = _m("Leave");
- $act->content = sprintf(_m("%s has left group %s."),
+ // TRANS: Success message for unsubscribe from group attempt through OStatus.
+ // TRANS: %1$s is the member name, %2$s is the unsubscribed group's name.
+ $act->content = sprintf(_m("%1$s has left group %2$s."),
$member->getBestName(),
$oprofile->getBestName());
@@ -757,7 +754,9 @@ class OStatusPlugin extends Plugin
$act->time = time();
$act->title = _("Favor");
- $act->content = sprintf(_("%s marked notice %s as a favorite."),
+ // TRANS: Success message for adding a favorite notice through OStatus.
+ // TRANS: %1$s is the favoring user's name, %2$s is URI to the favored notice.
+ $act->content = sprintf(_("%1$s marked notice %2$s as a favorite."),
$profile->getBestName(),
$notice->uri);
@@ -801,7 +800,9 @@ class OStatusPlugin extends Plugin
common_date_iso8601(time()));
$act->time = time();
$act->title = _("Disfavor");
- $act->content = sprintf(_("%s marked notice %s as no longer a favorite."),
+ // TRANS: Success message for remove a favorite notice through OStatus.
+ // TRANS: %1$s is the unfavoring user's name, %2$s is URI to the no longer favored notice.
+ $act->content = sprintf(_("%1$s marked notice %2$s as no longer a favorite."),
$profile->getBestName(),
$notice->uri);
@@ -876,7 +877,7 @@ class OStatusPlugin extends Plugin
'class' => 'entity_subscribe'));
$action->element('a', array('href' => common_local_url($target),
'class' => 'entity_remote_subscribe')
- , _m('Remote'));
+ , _m('Remote')); // @todo: i18n: Add translator hint for this text.
$action->elementEnd('p');
$action->elementEnd('div');
}
@@ -916,6 +917,8 @@ class OStatusPlugin extends Plugin
common_date_iso8601(time()));
$act->time = time();
$act->title = _m("Profile update");
+ // TRANS: Ping text for remote profile update through OStatus.
+ // TRANS: %s is user that updated their profile.
$act->content = sprintf(_m("%s has updated their profile page."),
$profile->getBestName());
@@ -945,7 +948,7 @@ class OStatusPlugin extends Plugin
array('nickname' => $profileUser->nickname));
$output->element('a', array('href' => $url,
'class' => 'entity_remote_subscribe'),
- _m('Subscribe'));
+ _m('Subscribe')); // @todo: i18n: Add context.
$output->elementEnd('li');
}
}
@@ -961,7 +964,7 @@ class OStatusPlugin extends Plugin
'homepage' => 'http://status.net/wiki/Plugin:OStatus',
'rawdescription' =>
_m('Follow people across social networks that implement '.
- '<a href="http://ostatus.org/">OStatus</a>.'));
+ '<a href="http://ostatus.org/">OStatus</a>.')); // @todo i18n: Add translator hint.
return true;
}
@@ -995,4 +998,18 @@ class OStatusPlugin extends Plugin
$feed = $oprofile->feeduri;
return false;
}
+
+ function onStartGetProfileFromURI($uri, &$profile) {
+
+ // XXX: do discovery here instead (OStatus_profile::ensureProfileURI($uri))
+
+ $oprofile = Ostatus_profile::staticGet('uri', $uri);
+
+ if (!empty($oprofile) && !$oprofile->isGroup()) {
+ $profile = $oprofile->localProfile();
+ return false;
+ }
+
+ return true;
+ }
}
diff --git a/plugins/OStatus/actions/ostatusgroup.php b/plugins/OStatus/actions/ostatusgroup.php
index 1b368de63..1861e866f 100644
--- a/plugins/OStatus/actions/ostatusgroup.php
+++ b/plugins/OStatus/actions/ostatusgroup.php
@@ -74,7 +74,7 @@ class OStatusGroupAction extends OStatusSubAction
$this->input('profile',
_m('Join group'),
$this->profile_uri,
- _m("OStatus group's address, like http://example.net/group/nickname"));
+ _m("OStatus group's address, like http://example.net/group/nickname."));
$this->elementEnd('li');
$this->elementEnd('ul');
diff --git a/plugins/OStatus/actions/ostatusinit.php b/plugins/OStatus/actions/ostatusinit.php
index 22aea9f70..0c991aba9 100644
--- a/plugins/OStatus/actions/ostatusinit.php
+++ b/plugins/OStatus/actions/ostatusinit.php
@@ -45,13 +45,13 @@ class OStatusInitAction extends Action
// Local user or group the remote wants to subscribe to
$this->nickname = $this->trimmed('nickname');
$this->group = $this->trimmed('group');
-
+
// Webfinger or profile URL of the remote user
$this->profile = $this->trimmed('profile');
return true;
}
-
+
function handle($args)
{
parent::handle($args);
@@ -69,7 +69,7 @@ class OStatusInitAction extends Action
$this->showForm();
}
}
-
+
function showForm($err = null)
{
$this->err = $err;
@@ -109,12 +109,12 @@ class OStatusInitAction extends Action
$this->elementStart('ul', 'form_data');
$this->elementStart('li', array('id' => 'ostatus_nickname'));
$this->input('nickname', _m('User nickname'), $this->nickname,
- _m('Nickname of the user you want to follow'));
+ _m('Nickname of the user you want to follow.'));
$this->hidden('group', $this->group); // pass-through for magic links
$this->elementEnd('li');
$this->elementStart('li', array('id' => 'ostatus_profile'));
$this->input('profile', _m('Profile Account'), $this->profile,
- _m('Your account id (i.e. user@identi.ca)'));
+ _m('Your account id (e.g. user@identi.ca).'));
$this->elementEnd('li');
$this->elementEnd('ul');
$this->submit('submit', $submit);
@@ -199,7 +199,7 @@ class OStatusInitAction extends Action
function title()
{
- return _m('OStatus Connect');
+ return _m('OStatus Connect');
}
-
+
}
diff --git a/plugins/OStatus/actions/ostatussub.php b/plugins/OStatus/actions/ostatussub.php
index 28714514f..4cbd7d034 100644
--- a/plugins/OStatus/actions/ostatussub.php
+++ b/plugins/OStatus/actions/ostatussub.php
@@ -64,11 +64,11 @@ class OStatusSubAction extends Action
$this->input('profile',
_m('Subscribe to'),
$this->profile_uri,
- _m("OStatus user's address, like nickname@example.com or http://example.net/nickname"));
+ _m("OStatus user's address, like nickname@example.com or http://example.net/nickname")); // @todo i18n FIXME: needs context/translator hint.
$this->elementEnd('li');
$this->elementEnd('ul');
- $this->submit('validate', _m('Continue'));
+ $this->submit('validate', _m('Continue')); // @todo i18n FIXME: needs context/translator hint.
$this->elementEnd('fieldset');
@@ -103,10 +103,10 @@ class OStatusSubAction extends Action
$this->hidden('profile', $this->profile_uri);
if ($this->oprofile->isGroup()) {
$this->submit('submit', _m('Join'), 'submit', null,
- _m('Join this group'));
+ _m('Join this group')); // @todo i18n FIXME: needs context/translator hint.
} else {
$this->submit('submit', _m('Confirm'), 'submit', null,
- _m('Subscribe to this user'));
+ _m('Subscribe to this user')); // @todo i18n FIXME: needs context/translator hint.
}
$this->elementEnd('fieldset');
$this->elementEnd('form');
@@ -244,13 +244,13 @@ class OStatusSubAction extends Action
} else if (Validate::uri($this->profile_uri)) {
$this->oprofile = Ostatus_profile::ensureProfileURL($this->profile_uri);
} else {
- $this->error = _m("Sorry, we could not reach that address. Please make sure that the OStatus address is like nickname@example.com or http://example.net/nickname");
+ $this->error = _m("Sorry, we could not reach that address. Please make sure that the OStatus address is like nickname@example.com or http://example.net/nickname.");
common_debug('Invalid address format.', __FILE__);
return false;
}
return true;
} catch (FeedSubBadURLException $e) {
- $this->error = _m("Sorry, we could not reach that address. Please make sure that the OStatus address is like nickname@example.com or http://example.net/nickname");
+ $this->error = _m("Sorry, we could not reach that address. Please make sure that the OStatus address is like nickname@example.com or http://example.net/nickname.");
common_debug('Invalid URL or could not reach server.', __FILE__);
} catch (FeedSubBadResponseException $e) {
$this->error = _m("Sorry, we could not reach that feed. Please try that OStatus address again later.");
@@ -269,7 +269,7 @@ class OStatusSubAction extends Action
common_debug('Not a recognized feed type.', __FILE__);
} catch (Exception $e) {
// Any new ones we forgot about
- $this->error = _m("Sorry, we could not reach that address. Please make sure that the OStatus address is like nickname@example.com or http://example.net/nickname");
+ $this->error = _m("Sorry, we could not reach that address. Please make sure that the OStatus address is like nickname@example.com or http://example.net/nickname.");
common_debug(sprintf('Bad feed URL: %s %s', get_class($e), $e->getMessage()), __FILE__);
}
diff --git a/plugins/OStatus/actions/ownerxrd.php b/plugins/OStatus/actions/ownerxrd.php
index 9c141d8c7..3fcb982b8 100644
--- a/plugins/OStatus/actions/ownerxrd.php
+++ b/plugins/OStatus/actions/ownerxrd.php
@@ -32,7 +32,7 @@ class OwnerxrdAction extends XrdAction
function prepare($args)
{
$this->user = User::siteOwner();
-
+
if (!$this->user) {
$this->clientError(_('No such user.'), 404);
return false;
@@ -40,7 +40,7 @@ class OwnerxrdAction extends XrdAction
$nick = common_canonical_nickname($this->user->nickname);
$acct = 'acct:' . $nick . '@' . common_config('site', 'server');
-
+
$this->xrd = new XRD();
// Check to see if a $config['webfinger']['owner'] has been set
diff --git a/plugins/OStatus/actions/pushcallback.php b/plugins/OStatus/actions/pushcallback.php
index 9a2067b8c..6c6978745 100644
--- a/plugins/OStatus/actions/pushcallback.php
+++ b/plugins/OStatus/actions/pushcallback.php
@@ -37,7 +37,7 @@ class PushCallbackAction extends Action
$this->handleGet();
}
}
-
+
/**
* Handler for POST content updates from the hub
*/
@@ -46,11 +46,12 @@ class PushCallbackAction extends Action
$feedid = $this->arg('feed');
common_log(LOG_INFO, "POST for feed id $feedid");
if (!$feedid) {
- throw new ServerException('Empty or invalid feed id', 400);
+ throw new ServerException('Empty or invalid feed id.', 400);
}
$feedsub = FeedSub::staticGet('id', $feedid);
if (!$feedsub) {
+ // @todo i18n FIXME: added i18n and use sprintf when using parameters.
throw new ServerException('Unknown PuSH feed id ' . $feedid, 400);
}
@@ -70,7 +71,7 @@ class PushCallbackAction extends Action
$qm = QueueManager::get();
$qm->enqueue($data, 'pushin');
}
-
+
/**
* Handler for GET verification requests from the hub.
*/
@@ -88,20 +89,24 @@ class PushCallbackAction extends Action
$feedsub = FeedSub::staticGet('uri', $topic);
if (!$feedsub) {
- throw new ClientException("Bad hub.topic feed $topic", 404);
+ // @todo i18n FIXME: added i18n and use sprintf when using parameters.
+ throw new ClientException("Bad hub.topic feed $topic.", 404);
}
if ($feedsub->verify_token !== $verify_token) {
- throw new ClientException("Bad hub.verify_token $token for $topic", 404);
+ // @todo i18n FIXME: added i18n and use sprintf when using parameters.
+ throw new ClientException("Bad hub.verify_token $token for $topic.", 404);
}
if ($mode == 'subscribe') {
// We may get re-sub requests legitimately.
if ($feedsub->sub_state != 'subscribe' && $feedsub->sub_state != 'active') {
+ // @todo i18n FIXME: added i18n and use sprintf when using parameters.
throw new ClientException("Unexpected subscribe request for $topic.", 404);
}
} else {
if ($feedsub->sub_state != 'unsubscribe') {
+ // @todo i18n FIXME: added i18n and use sprintf when using parameters.
throw new ClientException("Unexpected unsubscribe request for $topic.", 404);
}
}
diff --git a/plugins/OStatus/actions/pushhub.php b/plugins/OStatus/actions/pushhub.php
index 842d65e7d..6909b8539 100644
--- a/plugins/OStatus/actions/pushhub.php
+++ b/plugins/OStatus/actions/pushhub.php
@@ -36,7 +36,6 @@ Things to consider...
*/
-
class PushHubAction extends Action
{
function arg($arg, $def=null)
@@ -63,8 +62,10 @@ class PushHubAction extends Action
$this->subunsub($mode);
break;
case "publish":
+ // @todo i18n FIXME: added i18n and use sprintf when using parameters.
throw new ClientException("Publishing outside feeds not supported.", 400);
default:
+ // @todo i18n FIXME: added i18n and use sprintf when using parameters.
throw new ClientException("Unrecognized mode '$mode'.", 400);
}
}
@@ -84,16 +85,19 @@ class PushHubAction extends Action
$topic = $this->argUrl('hub.topic');
if (!$this->recognizedFeed($topic)) {
+ // @todo i18n FIXME: added i18n and use sprintf when using parameters.
throw new ClientException("Unsupported hub.topic $topic; this hub only serves local user and group Atom feeds.");
}
$verify = $this->arg('hub.verify'); // @fixme may be multiple
if ($verify != 'sync' && $verify != 'async') {
+ // @todo i18n FIXME: added i18n and use sprintf when using parameters.
throw new ClientException("Invalid hub.verify $verify; must be sync or async.");
}
$lease = $this->arg('hub.lease_seconds', null);
if ($mode == 'subscribe' && $lease != '' && !preg_match('/^\d+$/', $lease)) {
+ // @todo i18n FIXME: added i18n and use sprintf when using parameters.
throw new ClientException("Invalid hub.lease $lease; must be empty or positive integer.");
}
@@ -101,6 +105,7 @@ class PushHubAction extends Action
$secret = $this->arg('hub.secret', null);
if ($secret != '' && strlen($secret) >= 200) {
+ // @todo i18n FIXME: added i18n and use sprintf when using parameters.
throw new ClientException("Invalid hub.secret $secret; must be under 200 bytes.");
}
@@ -152,6 +157,7 @@ class PushHubAction extends Action
if ($feed == $userFeed) {
$user = User::staticGet('id', $id);
if (!$user) {
+ // @todo i18n FIXME: added i18n and use sprintf when using parameters.
throw new ClientException("Invalid hub.topic $feed; user doesn't exist.");
} else {
return true;
@@ -160,6 +166,7 @@ class PushHubAction extends Action
if ($feed == $groupFeed) {
$user = User_group::staticGet('id', $id);
if (!$user) {
+ // @todo i18n FIXME: added i18n and use sprintf when using parameters.
throw new ClientException("Invalid hub.topic $feed; group doesn't exist.");
} else {
return true;
@@ -183,6 +190,7 @@ class PushHubAction extends Action
if (Validate::uri($url, $params)) {
return $url;
} else {
+ // @todo i18n FIXME: added i18n and use sprintf when using parameters.
throw new ClientException("Invalid URL passed for $arg: '$url'");
}
}
@@ -199,4 +207,3 @@ class PushHubAction extends Action
return HubSub::staticGet($feed, $callback);
}
}
-
diff --git a/plugins/OStatus/actions/usersalmon.php b/plugins/OStatus/actions/usersalmon.php
index 641e131ab..06a72bf02 100644
--- a/plugins/OStatus/actions/usersalmon.php
+++ b/plugins/OStatus/actions/usersalmon.php
@@ -71,6 +71,7 @@ class UsersalmonAction extends SalmonAction
// Notice must either be a) in reply to a notice by this user
// or b) to the attention of this user
+ // or c) in reply to a notice to the attention of this user
$context = $this->activity->context;
@@ -79,8 +80,9 @@ class UsersalmonAction extends SalmonAction
if (empty($notice)) {
throw new ClientException("In reply to unknown notice");
}
- if ($notice->profile_id != $this->user->id) {
- throw new ClientException("In reply to a notice not by this user");
+ if ($notice->profile_id != $this->user->id &&
+ !in_array($this->user->id, $notice->getReplies())) {
+ throw new ClientException("In reply to a notice not by this user and not mentioning this user");
}
} else if (!empty($context->attention)) {
if (!in_array($this->user->uri, $context->attention) &&
diff --git a/plugins/OStatus/actions/userxrd.php b/plugins/OStatus/actions/userxrd.php
index 6a6886eb8..dd720568b 100644
--- a/plugins/OStatus/actions/userxrd.php
+++ b/plugins/OStatus/actions/userxrd.php
@@ -33,7 +33,7 @@ class UserxrdAction extends XrdAction
$this->uri = $this->trimmed('uri');
$this->uri = Discovery::normalize($this->uri);
-
+
if (Discovery::isWebfinger($this->uri)) {
$parts = explode('@', substr(urldecode($this->uri), 5));
if (count($parts) == 2) {
diff --git a/plugins/OStatus/classes/FeedSub.php b/plugins/OStatus/classes/FeedSub.php
index dd1968db1..6f9e0856a 100644
--- a/plugins/OStatus/classes/FeedSub.php
+++ b/plugins/OStatus/classes/FeedSub.php
@@ -249,7 +249,7 @@ class FeedSub extends Memcached_DataObject
// We'll never actually get updates in this mode.
return true;
} else {
- throw new ServerException("Attempting to start PuSH subscription for feed with no hub");
+ throw new ServerException("Attempting to start PuSH subscription for feed with no hub.");
}
}
@@ -279,7 +279,7 @@ class FeedSub extends Memcached_DataObject
// We'll never actually get updates in this mode.
return true;
} else {
- throw new ServerException("Attempting to end PuSH subscription for feed with no hub");
+ throw new ServerException("Attempting to end PuSH subscription for feed with no hub.");
}
}
@@ -502,4 +502,3 @@ class FeedSub extends Memcached_DataObject
}
}
-
diff --git a/plugins/OStatus/classes/HubSub.php b/plugins/OStatus/classes/HubSub.php
index 7db528a4e..e01ae4e79 100644
--- a/plugins/OStatus/classes/HubSub.php
+++ b/plugins/OStatus/classes/HubSub.php
@@ -206,6 +206,7 @@ class HubSub extends Memcached_DataObject
if ($status >= 200 && $status < 300) {
common_log(LOG_INFO, "Verified $mode of $this->callback:$this->topic");
} else {
+ // @todo i18n FIXME: add i18n and use sprintf for parameter.
throw new ClientException("Hub subscriber verification returned HTTP $status");
}
@@ -307,9 +308,9 @@ class HubSub extends Memcached_DataObject
/**
* Queue up a large batch of pushes to multiple subscribers
* for this same topic update.
- *
+ *
* If queues are disabled, this will run immediately.
- *
+ *
* @param string $atom well-formed Atom feed
* @param array $pushCallbacks list of callback URLs
*/
@@ -359,4 +360,3 @@ class HubSub extends Memcached_DataObject
}
}
}
-
diff --git a/plugins/OStatus/classes/Magicsig.php b/plugins/OStatus/classes/Magicsig.php
index f8c56a05f..e39a6d8f7 100644
--- a/plugins/OStatus/classes/Magicsig.php
+++ b/plugins/OStatus/classes/Magicsig.php
@@ -33,21 +33,21 @@ class Magicsig extends Memcached_DataObject
{
const PUBLICKEYREL = 'magic-public-key';
-
+
public $__table = 'magicsig';
public $user_id;
public $keypair;
public $alg;
-
+
public $publicKey;
public $privateKey;
-
+
public function __construct($alg = 'RSA-SHA256')
{
$this->alg = $alg;
}
-
+
public /*static*/ function staticGet($k, $v=null)
{
$obj = parent::staticGet(__CLASS__, $k, $v);
@@ -111,7 +111,7 @@ class Magicsig extends Memcached_DataObject
public function generate($user_id)
{
$rsa = new Crypt_RSA();
-
+
$keypair = $rsa->createKey();
$rsa->loadKey($keypair['privatekey']);
@@ -121,7 +121,7 @@ class Magicsig extends Memcached_DataObject
$this->publicKey = new Crypt_RSA();
$this->publicKey->loadKey($keypair['publickey']);
-
+
$this->user_id = $user_id;
$this->insert();
}
@@ -136,13 +136,13 @@ class Magicsig extends Memcached_DataObject
$private_exp = '.' . Magicsig::base64_url_encode($this->privateKey->exponent->toBytes());
}
- return 'RSA.' . $mod . '.' . $exp . $private_exp;
+ return 'RSA.' . $mod . '.' . $exp . $private_exp;
}
-
+
public static function fromString($text)
{
$magic_sig = new Magicsig();
-
+
// remove whitespace
$text = preg_replace('/\s+/', '', $text);
@@ -150,7 +150,7 @@ class Magicsig extends Memcached_DataObject
if (!preg_match('/RSA\.([^\.]+)\.([^\.]+)(.([^\.]+))?/', $text, $matches)) {
return false;
}
-
+
$mod = $matches[1];
$exp = $matches[2];
if (!empty($matches[4])) {
@@ -184,7 +184,7 @@ class Magicsig extends Memcached_DataObject
$this->publicKey = $rsa;
}
}
-
+
public function getName()
{
return $this->alg;
@@ -199,7 +199,7 @@ class Magicsig extends Memcached_DataObject
}
}
-
+
public function sign($bytes)
{
$sig = $this->privateKey->sign($bytes);
@@ -223,5 +223,3 @@ class Magicsig extends Memcached_DataObject
return base64_decode(strtr($input, '-_', '+/'));
}
}
-
-
diff --git a/plugins/OStatus/classes/Ostatus_profile.php b/plugins/OStatus/classes/Ostatus_profile.php
index cc4307b14..6a0fd1f3b 100644
--- a/plugins/OStatus/classes/Ostatus_profile.php
+++ b/plugins/OStatus/classes/Ostatus_profile.php
@@ -188,9 +188,11 @@ class Ostatus_profile extends Memcached_DataObject
} else if ($this->group_id && !$this->profile_id) {
return true;
} else if ($this->group_id && $this->profile_id) {
- throw new ServerException("Invalid ostatus_profile state: both group and profile IDs set for $this->uri");
+ // @todo i18n FIXME: use sprintf and add i18n.
+ throw new ServerException("Invalid ostatus_profile state: both group and profile IDs set for $this->uri.");
} else {
- throw new ServerException("Invalid ostatus_profile state: both group and profile IDs empty for $this->uri");
+ // @todo i18n FIXME: use sprintf and add i18n.
+ throw new ServerException("Invalid ostatus_profile state: both group and profile IDs empty for $this->uri.");
}
}
@@ -370,7 +372,8 @@ class Ostatus_profile extends Memcached_DataObject
} else if ($entry instanceof Notice) {
return $preamble . $entry->asAtomEntry(true, true);
} else {
- throw new ServerException("Invalid type passed to Ostatus_profile::notify; must be XML string or Activity entry");
+ // @todo i18n FIXME: use sprintf and add i18n.
+ throw new ServerException("Invalid type passed to Ostatus_profile::notify; must be XML string or Activity entry.");
}
}
@@ -549,7 +552,8 @@ class Ostatus_profile extends Memcached_DataObject
$sourceContent = $note->title;
} else {
// @fixme fetch from $sourceUrl?
- throw new ClientException("No content for notice {$sourceUri}");
+ // @todo i18n FIXME: use sprintf and add i18n.
+ throw new ClientException("No content for notice {$sourceUri}.");
}
// Get (safe!) HTML and text versions of the content
@@ -587,7 +591,7 @@ class Ostatus_profile extends Memcached_DataObject
' class="attachment more"' .
' title="'. htmlspecialchars(_m('Show more')) . '">' .
'&#8230;' .
- '</a>';
+ '</a>'; // @todo i18n FIXME: add translator hint/context.
}
}
@@ -700,14 +704,16 @@ class Ostatus_profile extends Memcached_DataObject
}
// Is the recipient a remote group?
- $oprofile = Ostatus_profile::staticGet('uri', $recipient);
+ $oprofile = Ostatus_profile::ensureProfileURI($recipient);
+
if ($oprofile) {
if ($oprofile->isGroup()) {
// Deliver to local members of this remote group.
// @fixme sender verification?
$groups[] = $oprofile->group_id;
} else {
- common_log(LOG_DEBUG, "Skipping reply to remote profile $recipient");
+ // may be canonicalized or something
+ $replies[] = $oprofile->uri;
}
continue;
}
@@ -770,6 +776,7 @@ class Ostatus_profile extends Memcached_DataObject
$response = $client->get($profile_url);
if (!$response->isOk()) {
+ // @todo i18n FIXME: use sprintf and add i18n.
throw new Exception("Could not reach profile page: " . $profile_url);
}
@@ -827,6 +834,7 @@ class Ostatus_profile extends Memcached_DataObject
return self::ensureFeedURL($feedurl, $hints);
}
+ // @todo i18n FIXME: use sprintf and add i18n.
throw new Exception("Could not find a feed URL for profile page " . $finalUrl);
}
@@ -859,6 +867,7 @@ class Ostatus_profile extends Memcached_DataObject
$user = User::staticGet('id', $profile->id);
if (!empty($user)) {
+ // @todo i18n FIXME: use sprintf and add i18n.
throw new OStatusShadowException($profile, "'$profile_url' is the profile for local user '{$user->nickname}'.");
}
@@ -1023,7 +1032,7 @@ class Ostatus_profile extends Memcached_DataObject
return;
}
if (!common_valid_http_url($url)) {
- throw new ServerException(sprintf(_m("Invalid avatar URL %s"), $url));
+ throw new ServerException(sprintf(_m("Invalid avatar URL %s."), $url));
}
if ($this->isGroup()) {
@@ -1033,7 +1042,7 @@ class Ostatus_profile extends Memcached_DataObject
}
if (!$self) {
throw new ServerException(sprintf(
- _m("Tried to update avatar for unsaved remote profile %s"),
+ _m("Tried to update avatar for unsaved remote profile %s."),
$this->uri));
}
@@ -1041,7 +1050,7 @@ class Ostatus_profile extends Memcached_DataObject
// ripped from oauthstore.php (for old OMB client)
$temp_filename = tempnam(sys_get_temp_dir(), 'listener_avatar');
if (!copy($url, $temp_filename)) {
- throw new ServerException(sprintf(_m("Unable to fetch avatar from %s"), $url));
+ throw new ServerException(sprintf(_m("Unable to fetch avatar from %s."), $url));
}
if ($this->isGroup()) {
@@ -1224,7 +1233,7 @@ class Ostatus_profile extends Memcached_DataObject
if ($object->link && common_valid_http_url($object->link)) {
return $object->link;
}
- throw new ServerException("No author ID URI found");
+ throw new ServerException("No author ID URI found.");
}
/**
@@ -1254,10 +1263,12 @@ class Ostatus_profile extends Memcached_DataObject
$user = User::staticGet('uri', $homeuri);
if ($user) {
+ // @todo i18n FIXME: add i18n.
throw new Exception("Local user can't be referenced as remote.");
}
if (OStatusPlugin::localGroupFromUrl($homeuri)) {
+ // @todo i18n FIXME: add i18n.
throw new Exception("Local group can't be referenced as remote.");
}
@@ -1309,7 +1320,8 @@ class Ostatus_profile extends Memcached_DataObject
$oprofile->profile_id = $profile->insert();
if (!$oprofile->profile_id) {
- throw new ServerException("Can't save local profile");
+ // @todo i18n FIXME: add i18n.
+ throw new ServerException("Can't save local profile.");
}
} else {
$group = new User_group();
@@ -1319,14 +1331,16 @@ class Ostatus_profile extends Memcached_DataObject
$oprofile->group_id = $group->insert();
if (!$oprofile->group_id) {
- throw new ServerException("Can't save local profile");
+ // @todo i18n FIXME: add i18n.
+ throw new ServerException("Can't save local profile.");
}
}
$ok = $oprofile->insert();
if (!$ok) {
- throw new ServerException("Can't save OStatus profile");
+ // @todo i18n FIXME: add i18n.
+ throw new ServerException("Can't save OStatus profile.");
}
$avatar = self::getActivityObjectAvatar($object, $hints);
@@ -1584,6 +1598,7 @@ class Ostatus_profile extends Memcached_DataObject
if ($uri !== false) {
if (is_null($uri)) {
// Negative cache entry
+ // @todo i18n FIXME: add i18n.
throw new Exception('Not a valid webfinger address.');
}
$oprofile = Ostatus_profile::staticGet('uri', $uri);
@@ -1611,6 +1626,7 @@ class Ostatus_profile extends Memcached_DataObject
// Save negative cache entry so we don't waste time looking it up again.
// @fixme distinguish temporary failures?
self::cacheSet(sprintf('ostatus_profile:webfinger:%s', $addr), null);
+ // @todo i18n FIXME: add i18n.
throw new Exception('Not a valid webfinger address.');
}
@@ -1692,7 +1708,8 @@ class Ostatus_profile extends Memcached_DataObject
if (!$profile_id) {
common_log_db_error($profile, 'INSERT', __FILE__);
- throw new Exception("Couldn't save profile for '$addr'");
+ // @todo i18n FIXME: add i18n and use sprintf for parameter.
+ throw new Exception("Couldn't save profile for '$addr'.");
}
$oprofile = new Ostatus_profile();
@@ -1710,13 +1727,15 @@ class Ostatus_profile extends Memcached_DataObject
if (!$result) {
common_log_db_error($oprofile, 'INSERT', __FILE__);
- throw new Exception("Couldn't save ostatus_profile for '$addr'");
+ // @todo i18n FIXME: add i18n and use sprintf for parameter.
+ throw new Exception("Couldn't save ostatus_profile for '$addr'.");
}
self::cacheSet(sprintf('ostatus_profile:webfinger:%s', $addr), $oprofile->uri);
return $oprofile;
}
+ // @todo i18n FIXME: add i18n and use sprintf for parameter.
throw new Exception("Couldn't find a valid profile for '$addr'");
}
@@ -1764,6 +1783,37 @@ class Ostatus_profile extends Memcached_DataObject
return $file;
}
+
+ static function ensureProfileURI($uri)
+ {
+ $oprofile = null;
+
+ // First, try to query it
+
+ $oprofile = Ostatus_profile::staticGet('uri', $uri);
+
+ // If unfound, do discovery stuff
+
+ if (empty($oprofile)) {
+ if (preg_match("/^(\w+)\:(.*)/", $uri, $match)) {
+ $protocol = $match[1];
+ switch ($protocol) {
+ case 'http':
+ case 'https':
+ $oprofile = Ostatus_profile::ensureProfileURL($uri);
+ break;
+ case 'acct':
+ case 'mailto':
+ $rest = $match[2];
+ $oprofile = Ostatus_profile::ensureWebfinger($rest);
+ default:
+ common_log("Unrecognized URI protocol for profile: $protocol ($uri)");
+ break;
+ }
+ }
+ }
+ return $oprofile;
+ }
}
/**
@@ -1785,4 +1835,3 @@ class OStatusShadowException extends Exception
parent::__construct($message);
}
}
-
diff --git a/plugins/OStatus/lib/discovery.php b/plugins/OStatus/lib/discovery.php
index 7187c1f3e..04c672720 100644
--- a/plugins/OStatus/lib/discovery.php
+++ b/plugins/OStatus/lib/discovery.php
@@ -106,7 +106,8 @@ class Discovery
}
}
- throw new Exception('Unable to find services for '. $id);
+ // @todo Needs i18n.
+ throw new Exception('Unable to find services for '. $id . '.');
}
public static function getService($links, $service) {
@@ -160,7 +161,7 @@ class Discovery_LRDD_Host_Meta implements Discovery_LRDD
} else {
$domain = parse_url($uri, PHP_URL_HOST);
}
-
+
$url = 'http://'. $domain .'/.well-known/host-meta';
$xrd = Discovery::fetchXrd($url);
diff --git a/plugins/OStatus/lib/hubconfqueuehandler.php b/plugins/OStatus/lib/hubconfqueuehandler.php
index c8e0b72fe..8219f8420 100644
--- a/plugins/OStatus/lib/hubconfqueuehandler.php
+++ b/plugins/OStatus/lib/hubconfqueuehandler.php
@@ -51,4 +51,3 @@ class HubConfQueueHandler extends QueueHandler
return true;
}
}
-
diff --git a/plugins/OStatus/lib/magicenvelope.php b/plugins/OStatus/lib/magicenvelope.php
index 967e5f6d1..bbd4ce17a 100644
--- a/plugins/OStatus/lib/magicenvelope.php
+++ b/plugins/OStatus/lib/magicenvelope.php
@@ -32,7 +32,7 @@ class MagicEnvelope
const ENCODING = 'base64url';
const NS = 'http://salmon-protocol.org/ns/magic-env';
-
+
private function normalizeUser($user_id)
{
if (substr($user_id, 0, 5) == 'http:' ||
@@ -70,13 +70,13 @@ class MagicEnvelope
$keypair = $parts[1];
}
}
-
+
if ($keypair) {
return $keypair;
}
}
}
- throw new Exception('Unable to locate signer public key');
+ throw new Exception('Unable to locate signer public key.');
}
@@ -92,8 +92,7 @@ class MagicEnvelope
'sig' => $signature_alg->sign($armored_text),
'alg' => $signature_alg->getName()
);
-
-
+
}
public function toXML($env) {
@@ -105,13 +104,13 @@ class MagicEnvelope
$xs->element('me:alg', null, $env['alg']);
$xs->element('me:sig', null, $env['sig']);
$xs->elementEnd('me:env');
-
+
$string = $xs->getString();
common_debug($string);
return $string;
}
-
+
public function unfold($env)
{
$dom = new DOMDocument();
@@ -137,7 +136,7 @@ class MagicEnvelope
return $dom->saveXML();
}
-
+
public function getAuthor($text) {
$doc = new DOMDocument();
if (!$doc->loadXML($text)) {
@@ -154,12 +153,12 @@ class MagicEnvelope
}
}
}
-
+
public function checkAuthor($text, $signer_uri)
{
return ($this->getAuthor($text) == $signer_uri);
}
-
+
public function verify($env)
{
if ($env['alg'] != 'RSA-SHA256') {
@@ -181,14 +180,14 @@ class MagicEnvelope
common_log(LOG_DEBUG, "Salmon error: ".$e->getMessage());
return false;
}
-
+
$verifier = Magicsig::fromString($keypair);
if (!$verifier) {
common_log(LOG_DEBUG, "Salmon error: unable to parse keypair");
return false;
}
-
+
return $verifier->verify($env['data'], $env['sig']);
}
diff --git a/plugins/OStatus/lib/ostatusqueuehandler.php b/plugins/OStatus/lib/ostatusqueuehandler.php
index 8905d2e21..9814cab9f 100644
--- a/plugins/OStatus/lib/ostatusqueuehandler.php
+++ b/plugins/OStatus/lib/ostatusqueuehandler.php
@@ -67,6 +67,17 @@ class OStatusQueueHandler extends QueueHandler
}
}
+ if (!empty($this->notice->reply_to)) {
+ $replyTo = Notice::staticGet('id', $this->notice->reply_to);
+ if (!empty($replyTo)) {
+ foreach($replyTo->getReplies() as $profile_id) {
+ $oprofile = Ostatus_profile::staticGet('profile_id', $profile_id);
+ if ($oprofile) {
+ $this->pingReply($oprofile);
+ }
+ }
+ }
+ }
return true;
}
@@ -161,7 +172,7 @@ class OStatusQueueHandler extends QueueHandler
* Queue up direct feed update pushes to subscribers on our internal hub.
* If there are a large number of subscriber sites, intermediate bulk
* distribution triggers may be queued.
- *
+ *
* @param string $atom update feed, containing only new/changed items
* @param HubSub $sub open query of subscribers
*/
@@ -212,4 +223,3 @@ class OStatusQueueHandler extends QueueHandler
}
}
-
diff --git a/plugins/OStatus/lib/salmon.php b/plugins/OStatus/lib/salmon.php
index ef7719a40..631ebc7d8 100644
--- a/plugins/OStatus/lib/salmon.php
+++ b/plugins/OStatus/lib/salmon.php
@@ -31,10 +31,10 @@ class Salmon
const REL_SALMON = 'salmon';
const REL_MENTIONED = 'mentioned';
- // XXX: these are deprecated
+ // XXX: these are deprecated
const NS_REPLIES = "http://salmon-protocol.org/ns/salmon-replies";
const NS_MENTIONS = "http://salmon-protocol.org/ns/salmon-mention";
-
+
/**
* Sign and post the given Atom entry as a Salmon message.
*
@@ -87,9 +87,10 @@ class Salmon
// No keypair yet, let's generate one.
$magickey = new Magicsig();
$magickey->generate($user->id);
- }
+ }
} else {
- throw new Exception("Salmon invalid actor for signing");
+ // @todo i18n FIXME: added i18n and use sprintf when using parameters.
+ throw new Exception("Salmon invalid actor for signing.");
}
try {
@@ -104,7 +105,7 @@ class Salmon
public function verifyMagicEnv($text)
{
$magic_env = new MagicEnvelope();
-
+
$env = $magic_env->parse($text);
return $magic_env->verify($env);
diff --git a/plugins/OStatus/lib/salmonaction.php b/plugins/OStatus/lib/salmonaction.php
index 9d6c6b269..5fdb11abe 100644
--- a/plugins/OStatus/lib/salmonaction.php
+++ b/plugins/OStatus/lib/salmonaction.php
@@ -42,7 +42,7 @@ class SalmonAction extends Action
}
if (empty($_SERVER['CONTENT_TYPE']) || $_SERVER['CONTENT_TYPE'] != 'application/magic-envelope+xml') {
- $this->clientError(_m('Salmon requires application/magic-envelope+xml'));
+ $this->clientError(_m('Salmon requires "application/magic-envelope+xml".'));
}
$xml = file_get_contents('php://input');
diff --git a/plugins/OStatus/lib/salmonqueuehandler.php b/plugins/OStatus/lib/salmonqueuehandler.php
index 7eeb5f8e9..56d3c9eff 100644
--- a/plugins/OStatus/lib/salmonqueuehandler.php
+++ b/plugins/OStatus/lib/salmonqueuehandler.php
@@ -36,7 +36,7 @@ class SalmonQueueHandler extends QueueHandler
assert(is_string($data['entry']));
$actor = Profile::staticGet($data['actor']);
-
+
$salmon = new Salmon();
$salmon->post($data['salmonuri'], $data['entry'], $actor);
diff --git a/plugins/OStatus/lib/xrd.php b/plugins/OStatus/lib/xrd.php
index a10b9f427..145cd64cb 100644
--- a/plugins/OStatus/lib/xrd.php
+++ b/plugins/OStatus/lib/xrd.php
@@ -31,11 +31,11 @@
class XRD
{
const XML_NS = 'http://www.w3.org/2000/xmlns/';
-
+
const XRD_NS = 'http://docs.oasis-open.org/ns/xri/xrd-1.0';
const HOST_META_NS = 'http://host-meta.net/xrd/1.0';
-
+
public $expires;
public $subject;
@@ -43,11 +43,11 @@ class XRD
public $host;
public $alias = array();
-
+
public $types = array();
-
+
public $links = array();
-
+
public static function parse($xml)
{
$xrd = new XRD();
@@ -61,11 +61,11 @@ class XRD
error_reporting($old);
if (!$ok) {
- throw new Exception("Invalid XML");
+ throw new Exception("Invalid XML.");
}
$xrd_element = $dom->getElementsByTagName('XRD')->item(0);
if (!$xrd_element) {
- throw new Exception("Invalid XML, missing XRD root");
+ throw new Exception("Invalid XML, missing XRD root.");
}
// Check for host-meta host
@@ -86,7 +86,7 @@ class XRD
case 'Subject':
$xrd->subject = $node->nodeValue;
break;
-
+
case 'Alias':
$xrd->alias[] = $node->nodeValue;
break;
@@ -114,7 +114,7 @@ class XRD
if ($this->host) {
$xs->element('hm:Host', array('xmlns:hm' => XRD::HOST_META_NS), $this->host);
}
-
+
if ($this->expires) {
$xs->element('Expires', null, $this->expires);
}
@@ -139,7 +139,7 @@ class XRD
}
$xs->elementEnd('Link');
}
-
+
$xs->elementEnd('XRD');
return $xs->getString();
@@ -149,7 +149,7 @@ class XRD
{
return array();
}
-
+
function parseLink($element)
{
$link = array();
@@ -169,4 +169,3 @@ class XRD
return $link;
}
}
-
diff --git a/plugins/OStatus/lib/xrdaction.php b/plugins/OStatus/lib/xrdaction.php
index d8cf648d6..91bb87cc2 100644
--- a/plugins/OStatus/lib/xrdaction.php
+++ b/plugins/OStatus/lib/xrdaction.php
@@ -26,13 +26,12 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
class XrdAction extends Action
{
-
public $uri;
-
+
public $user;
public $xrd;
-
+
function handle()
{
$nick = $this->user->nickname;
diff --git a/plugins/OStatus/scripts/fixup-shadow.php b/plugins/OStatus/scripts/fixup-shadow.php
index 6522ca240..4b6ad08a3 100644
--- a/plugins/OStatus/scripts/fixup-shadow.php
+++ b/plugins/OStatus/scripts/fixup-shadow.php
@@ -77,7 +77,7 @@ while ($oprofile->fetch()) {
echo "$uri matched query, but we don't recognize it.\n";
continue;
}
-
+
if ($dry) {
echo " - skipping\n";
} else {
@@ -93,4 +93,3 @@ if ($count && $dry) {
} else {
echo "done.\n";
}
-
diff --git a/plugins/OStatus/scripts/testfeed.php b/plugins/OStatus/scripts/testfeed.php
index 5e3ccd433..82a1c6586 100644
--- a/plugins/OStatus/scripts/testfeed.php
+++ b/plugins/OStatus/scripts/testfeed.php
@@ -86,4 +86,3 @@ if ($skip || $count) {
}
Event::handle('StartFeedSubReceive', array($sub, $feed));
-
diff --git a/plugins/OStatus/scripts/updateostatus.php b/plugins/OStatus/scripts/updateostatus.php
index 622ded56a..052cca146 100644
--- a/plugins/OStatus/scripts/updateostatus.php
+++ b/plugins/OStatus/scripts/updateostatus.php
@@ -44,14 +44,14 @@ try {
if (empty($user)) {
throw new Exception("Can't find user with id '$id'.");
}
- updateProfileURL($user);
+ updateOStatus($user);
} else if (have_option('n', 'nickname')) {
$nickname = get_option_value('n', 'nickname');
$user = User::staticGet('nickname', $nickname);
if (empty($user)) {
- throw new Exception("Can't find user with nickname '$nickname'");
+ throw new Exception("Can't find user with nickname '$nickname'.");
}
- updateProfileURL($user);
+ updateOStatus($user);
} else if (have_option('a', 'all')) {
$user = new User();
if ($user->find()) {
diff --git a/plugins/OStatus/tests/FeedDiscoveryTest.php b/plugins/OStatus/tests/FeedDiscoveryTest.php
index 0e6354a86..3be4bf736 100644
--- a/plugins/OStatus/tests/FeedDiscoveryTest.php
+++ b/plugins/OStatus/tests/FeedDiscoveryTest.php
@@ -53,7 +53,7 @@ class FeedDiscoveryTest extends PHPUnit_Framework_TestCase
</style>
<link rel="EditURI" type="application/rsd+xml" title="RSD" href="http://leuksman.com/log/xmlrpc.php?rsd" />
-<link rel="wlwmanifest" type="application/wlwmanifest+xml" href="http://leuksman.com/log/wp-includes/wlwmanifest.xml" />
+<link rel="wlwmanifest" type="application/wlwmanifest+xml" href="http://leuksman.com/log/wp-includes/wlwmanifest.xml" />
<link rel='index' title='leÅ­ksman' href='http://leuksman.com/log' />
<meta name="generator" content="WordPress 2.8.6" />
</head>
diff --git a/plugins/OStatus/tests/remote-tests.php b/plugins/OStatus/tests/remote-tests.php
index 24b4b1660..c2c9a5d97 100644
--- a/plugins/OStatus/tests/remote-tests.php
+++ b/plugins/OStatus/tests/remote-tests.php
@@ -500,7 +500,7 @@ class SNTestClient extends TestBase
$me = $this->getProfileUri();
return $this->checkSubscription($profile_uri, $me);
}
-
+
protected function checkSubscription($subscriber, $subscribed)
{
// Using FOAF as the API methods for checking the social graph
@@ -552,4 +552,3 @@ $b = $args[1];
$tester = new OStatusTester($a, $b);
$tester->run();
-
diff --git a/plugins/TwitterBridge/Notice_to_status.php b/plugins/TwitterBridge/Notice_to_status.php
new file mode 100644
index 000000000..2e32ba963
--- /dev/null
+++ b/plugins/TwitterBridge/Notice_to_status.php
@@ -0,0 +1,180 @@
+<?php
+/**
+ * Data class for remembering notice-to-status mappings
+ *
+ * PHP version 5
+ *
+ * @category Data
+ * @package StatusNet
+ * @author Evan Prodromou <evan@status.net>
+ * @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link http://status.net/
+ *
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2010, StatusNet, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+if (!defined('STATUSNET')) {
+ exit(1);
+}
+
+require_once INSTALLDIR . '/classes/Memcached_DataObject.php';
+
+/**
+ * Data class for mapping notices to statuses
+ *
+ * Notices flow back and forth between Twitter and StatusNet. We use this
+ * table to remember which StatusNet notice corresponds to which Twitter
+ * status.
+ *
+ * Note that notice_id is unique only within a single database; if you
+ * want to share this data for some reason, get the notice's URI and use
+ * that instead, since it's universally unique.
+ *
+ * @category Action
+ * @package StatusNet
+ * @author Evan Prodromou <evan@status.net>
+ * @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link http://status.net/
+ *
+ * @see DB_DataObject
+ */
+
+class Notice_to_status extends Memcached_DataObject
+{
+ public $__table = 'notice_to_status'; // table name
+ public $notice_id; // int(4) primary_key not_null
+ public $status_id; // int(4)
+ public $created; // datetime
+
+ /**
+ * Get an instance by key
+ *
+ * This is a utility method to get a single instance with a given key value.
+ *
+ * @param string $k Key to use to lookup
+ * @param mixed $v Value to lookup
+ *
+ * @return Notice_to_status object found, or null for no hits
+ *
+ */
+
+ function staticGet($k, $v=null)
+ {
+ return Memcached_DataObject::staticGet('Notice_to_status', $k, $v);
+ }
+
+ /**
+ * return table definition for DB_DataObject
+ *
+ * DB_DataObject needs to know something about the table to manipulate
+ * instances. This method provides all the DB_DataObject needs to know.
+ *
+ * @return array array of column definitions
+ */
+
+ function table()
+ {
+ return array('notice_id' => DB_DATAOBJECT_INT + DB_DATAOBJECT_NOTNULL,
+ 'status_id' => DB_DATAOBJECT_INT + DB_DATAOBJECT_NOTNULL,
+ 'created' => DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME + DB_DATAOBJECT_NOTNULL);
+ }
+
+ /**
+ * return key definitions for DB_DataObject
+ *
+ * DB_DataObject needs to know about keys that the table has, since it
+ * won't appear in StatusNet's own keys list. In most cases, this will
+ * simply reference your keyTypes() function.
+ *
+ * @return array list of key field names
+ */
+
+ function keys()
+ {
+ return array_keys($this->keyTypes());
+ }
+
+ /**
+ * return key definitions for Memcached_DataObject
+ *
+ * Our caching system uses the same key definitions, but uses a different
+ * method to get them. This key information is used to store and clear
+ * cached data, so be sure to list any key that will be used for static
+ * lookups.
+ *
+ * @return array associative array of key definitions, field name to type:
+ * 'K' for primary key: for compound keys, add an entry for each component;
+ * 'U' for unique keys: compound keys are not well supported here.
+ */
+
+ function keyTypes()
+ {
+ return array('notice_id' => 'K', 'status_id' => 'U');
+ }
+
+ /**
+ * Magic formula for non-autoincrementing integer primary keys
+ *
+ * If a table has a single integer column as its primary key, DB_DataObject
+ * assumes that the column is auto-incrementing and makes a sequence table
+ * to do this incrementation. Since we don't need this for our class, we
+ * overload this method and return the magic formula that DB_DataObject needs.
+ *
+ * @return array magic three-false array that stops auto-incrementing.
+ */
+
+ function sequenceKey()
+ {
+ return array(false, false, false);
+ }
+
+ /**
+ * Save a mapping between a notice and a status
+ *
+ * @param integer $notice_id ID of the notice in StatusNet
+ * @param integer $status_id ID of the status in Twitter
+ *
+ * @return Notice_to_status new object for this value
+ */
+
+ static function saveNew($notice_id, $status_id)
+ {
+ $n2s = Notice_to_status::staticGet('notice_id', $notice_id);
+
+ if (!empty($n2s)) {
+ return $n2s;
+ }
+
+ $n2s = Notice_to_status::staticGet('status_id', $status_id);
+
+ if (!empty($n2s)) {
+ return $n2s;
+ }
+
+ common_debug("Mapping notice {$notice_id} to Twitter status {$status_id}");
+
+ $n2s = new Notice_to_status();
+
+ $n2s->notice_id = $notice_id;
+ $n2s->status_id = $status_id;
+ $n2s->created = common_sql_now();
+
+ $n2s->insert();
+
+ return $n2s;
+ }
+}
diff --git a/plugins/TwitterBridge/TwitterBridgePlugin.php b/plugins/TwitterBridge/TwitterBridgePlugin.php
index 0505a328f..21a10775d 100644
--- a/plugins/TwitterBridge/TwitterBridgePlugin.php
+++ b/plugins/TwitterBridge/TwitterBridgePlugin.php
@@ -194,18 +194,22 @@ class TwitterBridgePlugin extends Plugin
*/
function onAutoload($cls)
{
+ $dir = dirname(__FILE__);
+
switch ($cls) {
case 'TwittersettingsAction':
case 'TwitterauthorizationAction':
case 'TwitterloginAction':
case 'TwitteradminpanelAction':
- include_once INSTALLDIR . '/plugins/TwitterBridge/' .
- strtolower(mb_substr($cls, 0, -6)) . '.php';
+ include_once $dir . '/' . strtolower(mb_substr($cls, 0, -6)) . '.php';
return false;
case 'TwitterOAuthClient':
case 'TwitterQueueHandler':
- include_once INSTALLDIR . '/plugins/TwitterBridge/' .
- strtolower($cls) . '.php';
+ include_once $dir . '/' . strtolower($cls) . '.php';
+ return false;
+ case 'Notice_to_status':
+ case 'Twitter_synch_status':
+ include_once $dir . '/' . $cls . '.php';
return false;
default:
return true;
@@ -335,5 +339,208 @@ class TwitterBridgePlugin extends Plugin
return (bool)$this->adminImportControl;
}
-}
+ /**
+ * When the site is set to ssl=sometimes mode, we should make sure our
+ * various auth-related pages are on SSL to keep things looking happy.
+ * Although we're not submitting passwords directly, we do link out to
+ * an authentication source and it's a lot happier if we've got some
+ * protection against MitM.
+ *
+ * @param string $action name
+ * @param boolean $ssl outval to force SSL
+ * @return mixed hook return value
+ */
+ function onSensitiveAction($action, &$ssl)
+ {
+ $sensitive = array('twitteradminpanel',
+ 'twittersettings',
+ 'twitterauthorization',
+ 'twitterlogin');
+ if (in_array($action, $sensitive)) {
+ $ssl = true;
+ return false;
+ } else {
+ return true;
+ }
+ }
+
+ /**
+ * Database schema setup
+ *
+ * We maintain a table mapping StatusNet notices to Twitter statuses
+ *
+ * @see Schema
+ * @see ColumnDef
+ *
+ * @return boolean hook value; true means continue processing, false means stop.
+ */
+
+ function onCheckSchema()
+ {
+ $schema = Schema::get();
+
+ // For saving the last-synched status of various timelines
+ // home_timeline, messages (in), messages (out), ...
+
+ $schema->ensureTable('twitter_synch_status',
+ array(new ColumnDef('foreign_id', 'bigint', null,
+ false, 'PRI'),
+ new ColumnDef('timeline', 'varchar', 255,
+ false, 'PRI'),
+ new ColumnDef('last_id', 'bigint', null, // XXX: check for PostgreSQL
+ false),
+ new ColumnDef('created', 'datetime', null,
+ false),
+ new ColumnDef('modified', 'datetime', null,
+ false)));
+
+ // For storing user-submitted flags on profiles
+
+ $schema->ensureTable('notice_to_status',
+ array(new ColumnDef('notice_id', 'integer', null,
+ false, 'PRI'),
+ new ColumnDef('status_id', 'bigint', null, // XXX: check for PostgreSQL
+ false, 'UNI'),
+ new ColumnDef('created', 'datetime', null,
+ false)));
+
+ // We update any notices that may have come in from
+ // Twitter that we don't have a status_id for. Note that
+ // this won't catch notices that originated at this StatusNet site.
+
+ $n = new Notice();
+
+ $n->query('SELECT notice.id, notice.uri ' .
+ 'FROM notice LEFT JOIN notice_to_status ' .
+ 'ON notice.id = notice_to_status.notice_id ' .
+ 'WHERE notice.source = "twitter"' .
+ 'AND notice_to_status.status_id IS NULL');
+
+ while ($n->fetch()) {
+ if (preg_match('#^http://twitter.com/[\w_.]+/status/(\d+)$#', $n->uri, $match)) {
+
+ $status_id = $match[1];
+
+ Notice_to_status::saveNew($n->id, $status_id);
+ }
+ }
+
+ return true;
+ }
+
+ /**
+ * If a notice gets deleted, remove the Notice_to_status mapping
+ *
+ * @param Notice $notice The notice getting deleted
+ *
+ * @return boolean hook value
+ */
+
+ function onNoticeDeleteRelated($notice)
+ {
+ $n2s = Notice_to_status::staticGet('notice_id', $notice->id);
+
+ if (!empty($n2s)) {
+
+ $user = common_current_user();
+
+ if (empty($user) || $user->id != $notice->profile_id) {
+ $this->log(LOG_INFO, "Skipping deleting notice for {$notice->id} since it doesn't seem to be by the author.");
+ return true;
+ }
+
+ $flink = Foreign_link::getByUserID($notice->profile_id,
+ TWITTER_SERVICE); // twitter service
+
+ if (empty($flink)) {
+ return true;
+ }
+
+ if (!TwitterOAuthClient::isPackedToken($flink->credentials)) {
+ $this->log(LOG_INFO, "Skipping deleting notice for {$notice->id} since link is not OAuth.");
+ return true;
+ }
+
+ $token = TwitterOAuthClient::unpackToken($flink->credentials);
+ $client = new TwitterOAuthClient($token->key, $token->secret);
+
+ $client->statusesDestroy($n2s->status_id);
+
+ $n2s->delete();
+ }
+ return true;
+ }
+
+ /**
+ * Notify remote users when their notices get favorited.
+ *
+ * @param Profile or User $profile of local user doing the faving
+ * @param Notice $notice being favored
+ * @return hook return value
+ */
+
+ function onEndFavorNotice(Profile $profile, Notice $notice)
+ {
+ $flink = Foreign_link::getByUserID($profile->id,
+ TWITTER_SERVICE); // twitter service
+
+ if (empty($flink)) {
+ return true;
+ }
+
+ if (!TwitterOAuthClient::isPackedToken($flink->credentials)) {
+ $this->log(LOG_INFO, "Skipping fave processing for {$profile->id} since link is not OAuth.");
+ return true;
+ }
+
+ $status_id = twitter_status_id($notice);
+
+ if (empty($status_id)) {
+ return true;
+ }
+
+ $token = TwitterOAuthClient::unpackToken($flink->credentials);
+ $client = new TwitterOAuthClient($token->key, $token->secret);
+
+ $client->favoritesCreate($status_id);
+
+ return true;
+ }
+ /**
+ * Notify remote users when their notices get de-favorited.
+ *
+ * @param Profile $profile Profile person doing the de-faving
+ * @param Notice $notice Notice being favored
+ *
+ * @return hook return value
+ */
+
+ function onEndDisfavorNotice(Profile $profile, Notice $notice)
+ {
+ $flink = Foreign_link::getByUserID($profile->id,
+ TWITTER_SERVICE); // twitter service
+
+ if (empty($flink)) {
+ return true;
+ }
+
+ if (!TwitterOAuthClient::isPackedToken($flink->credentials)) {
+ $this->log(LOG_INFO, "Skipping fave processing for {$profile->id} since link is not OAuth.");
+ return true;
+ }
+
+ $status_id = twitter_status_id($notice);
+
+ if (empty($status_id)) {
+ return true;
+ }
+
+ $token = TwitterOAuthClient::unpackToken($flink->credentials);
+ $client = new TwitterOAuthClient($token->key, $token->secret);
+
+ $client->favoritesDestroy($status_id);
+
+ return true;
+ }
+}
diff --git a/plugins/TwitterBridge/Twitter_synch_status.php b/plugins/TwitterBridge/Twitter_synch_status.php
new file mode 100644
index 000000000..2a5f1fd60
--- /dev/null
+++ b/plugins/TwitterBridge/Twitter_synch_status.php
@@ -0,0 +1,202 @@
+<?php
+/**
+ * Store last-touched ID for various timelines
+ *
+ * PHP version 5
+ *
+ * @category Data
+ * @package StatusNet
+ * @author Evan Prodromou <evan@status.net>
+ * @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link http://status.net/
+ *
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2010, StatusNet, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+if (!defined('STATUSNET')) {
+ exit(1);
+}
+
+require_once INSTALLDIR . '/classes/Memcached_DataObject.php';
+
+/**
+ * Store various timeline data
+ *
+ * We don't want to keep re-fetching the same statuses and direct messages from Twitter.
+ * So, we store the last ID we see from a timeline, and store it. Next time
+ * around, we use that ID in the since_id parameter.
+ *
+ * @category Action
+ * @package StatusNet
+ * @author Evan Prodromou <evan@status.net>
+ * @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link http://status.net/
+ *
+ * @see DB_DataObject
+ */
+
+class Twitter_synch_status extends Memcached_DataObject
+{
+ public $__table = 'twitter_synch_status'; // table name
+ public $foreign_id; // int(4) primary_key not_null
+ public $timeline; // varchar(255) primary_key not_null
+ public $last_id; // bigint not_null
+ public $created; // datetime not_null
+ public $modified; // datetime not_null
+
+ /**
+ * Get an instance by key
+ *
+ * @param string $k Key to use to lookup (usually 'foreign_id' for this class)
+ * @param mixed $v Value to lookup
+ *
+ * @return Twitter_synch_status object found, or null for no hits
+ *
+ */
+
+ function staticGet($k, $v=null)
+ {
+ throw new Exception("Use pkeyGet() for this class.");
+ }
+
+ /**
+ * Get an instance by compound primary key
+ *
+ * @param array $kv key-value pair array
+ *
+ * @return Twitter_synch_status object found, or null for no hits
+ *
+ */
+
+ function pkeyGet($kv)
+ {
+ return Memcached_DataObject::pkeyGet('Twitter_synch_status', $kv);
+ }
+
+ /**
+ * return table definition for DB_DataObject
+ *
+ * DB_DataObject needs to know something about the table to manipulate
+ * instances. This method provides all the DB_DataObject needs to know.
+ *
+ * @return array array of column definitions
+ */
+
+ function table()
+ {
+ return array('foreign_id' => DB_DATAOBJECT_INT + DB_DATAOBJECT_NOTNULL,
+ 'timeline' => DB_DATAOBJECT_STR + DB_DATAOBJECT_NOTNULL,
+ 'last_id' => DB_DATAOBJECT_INT + DB_DATAOBJECT_NOTNULL,
+ 'created' => DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME + DB_DATAOBJECT_NOTNULL,
+ 'modified' => DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME + DB_DATAOBJECT_NOTNULL
+ );
+ }
+
+ /**
+ * return key definitions for DB_DataObject
+ *
+ * DB_DataObject needs to know about keys that the table has, since it
+ * won't appear in StatusNet's own keys list. In most cases, this will
+ * simply reference your keyTypes() function.
+ *
+ * @return array list of key field names
+ */
+
+ function keys()
+ {
+ return array_keys($this->keyTypes());
+ }
+
+ /**
+ * return key definitions for Memcached_DataObject
+ *
+ * Our caching system uses the same key definitions, but uses a different
+ * method to get them. This key information is used to store and clear
+ * cached data, so be sure to list any key that will be used for static
+ * lookups.
+ *
+ * @return array associative array of key definitions, field name to type:
+ * 'K' for primary key: for compound keys, add an entry for each component;
+ * 'U' for unique keys: compound keys are not well supported here.
+ */
+
+ function keyTypes()
+ {
+ return array('foreign_id' => 'K',
+ 'timeline' => 'K');
+ }
+
+ /**
+ * Magic formula for non-autoincrementing integer primary keys
+ *
+ * If a table has a single integer column as its primary key, DB_DataObject
+ * assumes that the column is auto-incrementing and makes a sequence table
+ * to do this incrementation. Since we don't need this for our class, we
+ * overload this method and return the magic formula that DB_DataObject needs.
+ *
+ * @return array magic three-false array that stops auto-incrementing.
+ */
+
+ function sequenceKey()
+ {
+ return array(false, false, false);
+ }
+
+ static function getLastId($foreign_id, $timeline)
+ {
+ $tss = self::pkeyGet(array('foreign_id' => $foreign_id,
+ 'timeline' => $timeline));
+
+ if (empty($tss)) {
+ return null;
+ } else {
+ return $tss->last_id;
+ }
+ }
+
+ static function setLastId($foreign_id, $timeline, $last_id)
+ {
+ $tss = self::pkeyGet(array('foreign_id' => $foreign_id,
+ 'timeline' => $timeline));
+
+ if (empty($tss)) {
+
+ $tss = new Twitter_synch_status();
+
+ $tss->foreign_id = $foreign_id;
+ $tss->timeline = $timeline;
+ $tss->last_id = $last_id;
+ $tss->created = common_sql_now();
+ $tss->modified = $tss->created;
+
+ $tss->insert();
+
+ return true;
+
+ } else {
+
+ $orig = clone($tss);
+
+ $tss->last_id = $last_id;
+ $tss->modified = common_sql_now();
+
+ $tss->update();
+
+ return true;
+ }
+ }
+}
diff --git a/plugins/TwitterBridge/daemons/synctwitterfriends.php b/plugins/TwitterBridge/daemons/synctwitterfriends.php
index df7da0943..02546a02c 100755
--- a/plugins/TwitterBridge/daemons/synctwitterfriends.php
+++ b/plugins/TwitterBridge/daemons/synctwitterfriends.php
@@ -33,7 +33,6 @@ END_OF_TRIM_HELP;
require_once INSTALLDIR . '/scripts/commandline.inc';
require_once INSTALLDIR . '/lib/parallelizingdaemon.php';
require_once INSTALLDIR . '/plugins/TwitterBridge/twitter.php';
-require_once INSTALLDIR . '/plugins/TwitterBridge/twitterbasicauthclient.php';
require_once INSTALLDIR . '/plugins/TwitterBridge/twitteroauthclient.php';
/**
@@ -144,8 +143,8 @@ class SyncTwitterFriendsDaemon extends ParallelizingDaemon
$client = new TwitterOAuthClient($token->key, $token->secret);
common_debug($this->name() . '- Grabbing friends IDs with OAuth.');
} else {
- $client = new TwitterBasicAuthClient($flink);
- common_debug($this->name() . '- Grabbing friends IDs with basic auth.');
+ common_debug("Skipping Twitter friends for {$flink->user_id} since not OAuth.");
+ return $friends;
}
try {
diff --git a/plugins/TwitterBridge/daemons/twitterstatusfetcher.php b/plugins/TwitterBridge/daemons/twitterstatusfetcher.php
index 7c624fdb3..f1305696b 100755
--- a/plugins/TwitterBridge/daemons/twitterstatusfetcher.php
+++ b/plugins/TwitterBridge/daemons/twitterstatusfetcher.php
@@ -40,7 +40,6 @@ require_once INSTALLDIR . '/scripts/commandline.inc';
require_once INSTALLDIR . '/lib/common.php';
require_once INSTALLDIR . '/lib/daemon.php';
require_once INSTALLDIR . '/plugins/TwitterBridge/twitter.php';
-require_once INSTALLDIR . '/plugins/TwitterBridge/twitterbasicauthclient.php';
require_once INSTALLDIR . '/plugins/TwitterBridge/twitteroauthclient.php';
/**
@@ -104,7 +103,6 @@ class TwitterStatusFetcher extends ParallelizingDaemon
function getObjects()
{
global $_DB_DATAOBJECT;
-
$flink = new Foreign_link();
$conn = &$flink->getDatabaseConnection();
@@ -168,10 +166,6 @@ class TwitterStatusFetcher extends ParallelizingDaemon
common_debug($this->name() . ' - Trying to get timeline for Twitter user ' .
$flink->foreign_id);
- // XXX: Biggest remaining issue - How do we know at which status
- // to start importing? How many statuses? Right now I'm going
- // with the default last 20.
-
$client = null;
if (TwitterOAuthClient::isPackedToken($flink->credentials)) {
@@ -179,14 +173,17 @@ class TwitterStatusFetcher extends ParallelizingDaemon
$client = new TwitterOAuthClient($token->key, $token->secret);
common_debug($this->name() . ' - Grabbing friends timeline with OAuth.');
} else {
- $client = new TwitterBasicAuthClient($flink);
- common_debug($this->name() . ' - Grabbing friends timeline with basic auth.');
+ common_debug("Skipping friends timeline for $flink->foreign_id since not OAuth.");
}
$timeline = null;
+ $lastId = Twitter_synch_status::getLastId($flink->foreign_id, 'home_timeline');
+
+ common_debug("Got lastId value '{$lastId}' for foreign id '{$flink->foreign_id}' and timeline 'home_timeline'");
+
try {
- $timeline = $client->statusesFriendsTimeline();
+ $timeline = $client->statusesHomeTimeline($lastId);
} catch (Exception $e) {
common_log(LOG_WARNING, $this->name() .
' - Twitter client unable to get friends timeline for user ' .
@@ -215,7 +212,23 @@ class TwitterStatusFetcher extends ParallelizingDaemon
continue;
}
- $this->saveStatus($status, $flink);
+ // Don't save it if the user is protected
+ // FIXME: save it but treat it as private
+
+ if ($status->user->protected) {
+ continue;
+ }
+
+ $notice = $this->saveStatus($status);
+
+ if (!empty($notice)) {
+ Inbox::insertNotice($flink->user_id, $notice->id);
+ }
+ }
+
+ if (!empty($timeline)) {
+ Twitter_synch_status::setLastId($flink->foreign_id, 'home_timeline', $timeline[0]->id);
+ common_debug("Set lastId value '{$timeline[0]->id}' for foreign id '{$flink->foreign_id}' and timeline 'home_timeline'");
}
// Okay, record the time we synced with Twitter for posterity
@@ -224,32 +237,61 @@ class TwitterStatusFetcher extends ParallelizingDaemon
$flink->update();
}
- function saveStatus($status, $flink)
+ function saveStatus($status)
{
$profile = $this->ensureProfile($status->user);
if (empty($profile)) {
common_log(LOG_ERR, $this->name() .
' - Problem saving notice. No associated Profile.');
- return;
+ return null;
}
- $statusUri = 'http://twitter.com/'
- . $status->user->screen_name
- . '/status/'
- . $status->id;
+ $statusUri = $this->makeStatusURI($status->user->screen_name, $status->id);
// check to see if we've already imported the status
- $dupe = $this->checkDupe($profile, $statusUri);
+ $n2s = Notice_to_status::staticGet('status_id', $status->id);
- if (!empty($dupe)) {
+ if (!empty($n2s)) {
common_log(
LOG_INFO,
$this->name() .
- " - Ignoring duplicate import: $statusUri"
+ " - Ignoring duplicate import: {$status->id}"
);
- return;
+ return Notice::staticGet('id', $n2s->notice_id);
+ }
+
+ // If it's a retweet, save it as a repeat!
+
+ if (!empty($status->retweeted_status)) {
+ common_log(LOG_INFO, "Status {$status->id} is a retweet of {$status->retweeted_status->id}.");
+ $original = $this->saveStatus($status->retweeted_status);
+ if (empty($original)) {
+ return null;
+ } else {
+ $author = $original->getProfile();
+ // TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
+ // TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
+ $content = sprintf(_('RT @%1$s %2$s'),
+ $author->nickname,
+ $original->content);
+
+ if (Notice::contentTooLong($content)) {
+ $contentlimit = Notice::maxContent();
+ $content = mb_substr($content, 0, $contentlimit - 4) . ' ...';
+ }
+
+ $repeat = Notice::saveNew($profile->id,
+ $content,
+ 'twitter',
+ array('repeat_of' => $original->id,
+ 'uri' => $statusUri,
+ 'is_local' => Notice::GATEWAY));
+ common_log(LOG_INFO, "Saved {$repeat->id} as a repeat of {$original->id}");
+ Notice_to_status::saveNew($repeat->id, $status->id);
+ return $repeat;
+ }
}
$notice = new Notice();
@@ -263,14 +305,36 @@ class TwitterStatusFetcher extends ParallelizingDaemon
);
$notice->source = 'twitter';
+
$notice->reply_to = null;
+
+ if (!empty($status->in_reply_to_status_id)) {
+ common_log(LOG_INFO, "Status {$status->id} is a reply to status {$status->in_reply_to_status_id}");
+ $n2s = Notice_to_status::staticGet('status_id', $status->in_reply_to_status_id);
+ if (empty($n2s)) {
+ common_log(LOG_INFO, "Couldn't find local notice for status {$status->in_reply_to_status_id}");
+ } else {
+ $reply = Notice::staticGet('id', $n2s->notice_id);
+ if (empty($reply)) {
+ common_log(LOG_INFO, "Couldn't find local notice for status {$status->in_reply_to_status_id}");
+ } else {
+ common_log(LOG_INFO, "Found local notice {$reply->id} for status {$status->in_reply_to_status_id}");
+ $notice->reply_to = $reply->id;
+ $notice->conversation = $reply->conversation;
+ }
+ }
+ }
+
+ if (empty($notice->conversation)) {
+ $conv = Conversation::create();
+ $notice->conversation = $conv->id;
+ common_log(LOG_INFO, "No known conversation for status {$status->id} so making a new one {$conv->id}.");
+ }
+
$notice->is_local = Notice::GATEWAY;
- $notice->content = common_shorten_links($status->text);
- $notice->rendered = common_render_content(
- $notice->content,
- $notice
- );
+ $notice->content = html_entity_decode($status->text);
+ $notice->rendered = $this->linkify($status);
if (Event::handle('StartNoticeSave', array(&$notice))) {
@@ -285,24 +349,32 @@ class TwitterStatusFetcher extends ParallelizingDaemon
Event::handle('EndNoticeSave', array($notice));
}
- $orig = clone($notice);
- $conv = Conversation::create();
+ Notice_to_status::saveNew($notice->id, $status->id);
- $notice->conversation = $conv->id;
+ $this->saveStatusMentions($notice, $status);
- if (!$notice->update($orig)) {
- common_log_db_error($notice, 'UPDATE', __FILE__);
- common_log(LOG_ERR, $this->name() .
- ' - Problem saving notice.');
- }
-
- Inbox::insertNotice($flink->user_id, $notice->id);
$notice->blowOnInsert();
return $notice;
}
/**
+ * Make an URI for a status.
+ *
+ * @param object $status status object
+ *
+ * @return string URI
+ */
+
+ function makeStatusURI($username, $id)
+ {
+ return 'http://twitter.com/'
+ . $username
+ . '/status/'
+ . $id;
+ }
+
+ /**
* Look up a Profile by profileurl field. Profile::staticGet() was
* not working consistently.
*
@@ -631,6 +703,104 @@ class TwitterStatusFetcher extends ParallelizingDaemon
return true;
}
+
+ const URL = 1;
+ const HASHTAG = 2;
+ const MENTION = 3;
+
+ function linkify($status)
+ {
+ $text = $status->text;
+
+ if (empty($status->entities)) {
+ return $text;
+ }
+
+ // Move all the entities into order so we can
+ // replace them in reverse order and thus
+ // not mess up their indices
+
+ $toReplace = array();
+
+ if (!empty($status->entities->urls)) {
+ foreach ($status->entities->urls as $url) {
+ $toReplace[$url->indices[0]] = array(self::URL, $url);
+ }
+ }
+
+ if (!empty($status->entities->hashtags)) {
+ foreach ($status->entities->hashtags as $hashtag) {
+ $toReplace[$hashtag->indices[0]] = array(self::HASHTAG, $hashtag);
+ }
+ }
+
+ if (!empty($status->entities->user_mentions)) {
+ foreach ($status->entities->user_mentions as $mention) {
+ $toReplace[$mention->indices[0]] = array(self::MENTION, $mention);
+ }
+ }
+
+ // sort in reverse order by key
+
+ krsort($toReplace);
+
+ foreach ($toReplace as $part) {
+ list($type, $object) = $part;
+ switch($type) {
+ case self::URL:
+ $linkText = $this->makeUrlLink($object);
+ break;
+ case self::HASHTAG:
+ $linkText = $this->makeHashtagLink($object);
+ break;
+ case self::MENTION:
+ $linkText = $this->makeMentionLink($object);
+ break;
+ default:
+ continue;
+ }
+ $text = mb_substr($text, 0, $object->indices[0]) . $linkText . mb_substr($text, $object->indices[1]);
+ }
+ return $text;
+ }
+
+ function makeUrlLink($object)
+ {
+ return "<a href='{$object->url}' class='extlink'>{$object->url}</a>";
+ }
+
+ function makeHashtagLink($object)
+ {
+ return "#<a href='https://twitter.com/search?q=%23{$object->text}' class='hashtag'>{$object->text}</a>";
+ }
+
+ function makeMentionLink($object)
+ {
+ return "@<a href='http://twitter.com/{$object->screen_name}' title='{$object->name}'>{$object->screen_name}</a>";
+ }
+
+ function saveStatusMentions($notice, $status)
+ {
+ $mentions = array();
+
+ if (empty($status->entities) || empty($status->entities->user_mentions)) {
+ return;
+ }
+
+ foreach ($status->entities->user_mentions as $mention) {
+ $flink = Foreign_link::getByForeignID($mention->id, TWITTER_SERVICE);
+ if (!empty($flink)) {
+ $user = User::staticGet('id', $flink->user_id);
+ if (!empty($user)) {
+ $reply = new Reply();
+ $reply->notice_id = $notice->id;
+ $reply->profile_id = $user->id;
+ common_log(LOG_INFO, __METHOD__ . ": saving reply: notice {$notice->id} to profile {$user->id}");
+ $id = $reply->insert();
+ }
+ }
+ }
+ }
}
$id = null;
diff --git a/plugins/TwitterBridge/twitter.php b/plugins/TwitterBridge/twitter.php
index 306ba2442..90b0f0f14 100644
--- a/plugins/TwitterBridge/twitter.php
+++ b/plugins/TwitterBridge/twitter.php
@@ -23,7 +23,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
define('TWITTER_SERVICE', 1); // Twitter is foreign_service ID 1
-require_once INSTALLDIR . '/plugins/TwitterBridge/twitterbasicauthclient.php';
require_once INSTALLDIR . '/plugins/TwitterBridge/twitteroauthclient.php';
function add_twitter_user($twitter_id, $screen_name)
@@ -115,9 +114,12 @@ function is_twitter_bound($notice, $flink) {
// Check to see if notice should go to Twitter
if (!empty($flink) && ($flink->noticesync & FOREIGN_NOTICE_SEND)) {
- // If it's not a Twitter-style reply, or if the user WANTS to send replies.
+ // If it's not a Twitter-style reply, or if the user WANTS to send replies,
+ // or if it's in reply to a twitter notice
+
if (!preg_match('/^@[a-zA-Z0-9_]{1,15}\b/u', $notice->content) ||
- ($flink->noticesync & FOREIGN_NOTICE_SEND_REPLY)) {
+ ($flink->noticesync & FOREIGN_NOTICE_SEND_REPLY) ||
+ is_twitter_notice($notice->reply_to)) {
return true;
}
}
@@ -125,22 +127,64 @@ function is_twitter_bound($notice, $flink) {
return false;
}
+function is_twitter_notice($id)
+{
+ $n2s = Notice_to_status::staticGet('notice_id', $id);
+
+ return (!empty($n2s));
+}
+
function broadcast_twitter($notice)
{
$flink = Foreign_link::getByUserID($notice->profile_id,
TWITTER_SERVICE);
- if (is_twitter_bound($notice, $flink)) {
- if (TwitterOAuthClient::isPackedToken($flink->credentials)) {
+ // Don't bother with basic auth, since it's no longer allowed
+
+ if (!empty($flink) && TwitterOAuthClient::isPackedToken($flink->credentials)) {
+ if (!empty($notice->repeat_of) && is_twitter_notice($notice->repeat_of)) {
+ $retweet = retweet_notice($flink, Notice::staticGet('id', $notice->repeat_of));
+ if (!empty($retweet)) {
+ Notice_to_status::saveNew($notice->id, $retweet->id);
+ }
+ } else if (is_twitter_bound($notice, $flink)) {
return broadcast_oauth($notice, $flink);
- } else {
- return broadcast_basicauth($notice, $flink);
}
}
return true;
}
+function retweet_notice($flink, $notice)
+{
+ $token = TwitterOAuthClient::unpackToken($flink->credentials);
+ $client = new TwitterOAuthClient($token->key, $token->secret);
+
+ $id = twitter_status_id($notice);
+
+ if (empty($id)) {
+ common_log(LOG_WARNING, "Trying to retweet notice {$notice->id} with no known status id.");
+ return null;
+ }
+
+ try {
+ $status = $client->statusesRetweet($id);
+ return $status;
+ } catch (OAuthClientException $e) {
+ return process_error($e, $flink, $notice);
+ }
+}
+
+function twitter_status_id($notice)
+{
+ $n2s = Notice_to_status::staticGet('notice_id', $notice->id);
+ if (empty($n2s)) {
+ return null;
+ } else {
+ return $n2s->status_id;
+ }
+}
+
/**
* Pull any extra information from a notice that we should transfer over
* to Twitter beyond the notice text itself.
@@ -156,10 +200,13 @@ function twitter_update_params($notice)
$params['lat'] = $notice->lat;
$params['long'] = $notice->lon;
}
+ if (!empty($notice->reply_to) && is_twitter_notice($notice->reply_to)) {
+ $reply = Notice::staticGet('id', $notice->reply_to);
+ $params['in_reply_to_status_id'] = twitter_status_id($reply);
+ }
return $params;
}
-
function broadcast_oauth($notice, $flink) {
$user = $flink->getUser();
$statustxt = format_status($notice);
@@ -171,6 +218,9 @@ function broadcast_oauth($notice, $flink) {
try {
$status = $client->statusesUpdate($statustxt, $params);
+ if (!empty($status)) {
+ Notice_to_status::saveNew($notice->id, $status->id);
+ }
} catch (OAuthClientException $e) {
return process_error($e, $flink, $notice);
}
@@ -204,52 +254,6 @@ function broadcast_oauth($notice, $flink) {
return true;
}
-function broadcast_basicauth($notice, $flink)
-{
- $user = $flink->getUser();
-
- $statustxt = format_status($notice);
- $params = twitter_update_params($notice);
-
- $client = new TwitterBasicAuthClient($flink);
- $status = null;
-
- try {
- $status = $client->statusesUpdate($statustxt, $params);
- } catch (BasicAuthException $e) {
- return process_error($e, $flink, $notice);
- }
-
- if (empty($status)) {
-
- $errmsg = sprintf('Twitter bridge - No data returned by Twitter API when ' .
- 'trying to post notice %d for %s (user id %d).',
- $notice->id,
- $user->nickname,
- $user->id);
-
- common_log(LOG_WARNING, $errmsg);
-
- $errmsg = sprintf('No data returned by Twitter API when ' .
- 'trying to post notice %d for %s (user id %d).',
- $notice->id,
- $user->nickname,
- $user->id);
- common_log(LOG_WARNING, $errmsg);
- return false;
- }
-
- $msg = sprintf('Twitter bridge - posted notice %d to Twitter using ' .
- 'HTTP basic auth for User %s (user id %d).',
- $notice->id,
- $user->nickname,
- $user->id);
-
- common_log(LOG_INFO, $msg);
-
- return true;
-}
-
function process_error($e, $flink, $notice)
{
$user = $flink->getUser();
diff --git a/plugins/TwitterBridge/twitterbasicauthclient.php b/plugins/TwitterBridge/twitterbasicauthclient.php
deleted file mode 100644
index 2c18c9469..000000000
--- a/plugins/TwitterBridge/twitterbasicauthclient.php
+++ /dev/null
@@ -1,229 +0,0 @@
-<?php
-/**
- * StatusNet, the distributed open-source microblogging tool
- *
- * Class for doing OAuth calls against Twitter
- *
- * 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 Integration
- * @package StatusNet
- * @author Zach Copley <zach@status.net>
- * @copyright 2009 StatusNet, Inc.
- * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link http://status.net/
- */
-
-if (!defined('STATUSNET') && !defined('LACONICA')) {
- exit(1);
-}
-
-/**
- * General Exception wrapper for HTTP basic auth errors
- *
- * @category Integration
- * @package StatusNet
- * @author Zach Copley <zach@status.net>
- * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link http://status.net/
- *
- */
-class BasicAuthException extends Exception
-{
-}
-
-/**
- * Class for talking to the Twitter API with HTTP Basic Auth.
- *
- * @category Integration
- * @package StatusNet
- * @author Zach Copley <zach@status.net>
- * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link http://status.net/
- *
- */
-class TwitterBasicAuthClient
-{
- var $screen_name = null;
- var $password = null;
-
- /**
- * constructor
- *
- * @param Foreign_link $flink a Foreign_link storing the
- * Twitter user's password, etc.
- */
- function __construct($flink)
- {
- $fuser = $flink->getForeignUser();
- $this->screen_name = $fuser->nickname;
- $this->password = $flink->credentials;
- }
-
- /**
- * Calls Twitter's /statuses/update API method
- *
- * @param string $status text of the status
- * @param mixed $params optional other parameters to pass to Twitter,
- * as defined. For back-compatibility, if an int
- * is passed we'll consider it a reply-to ID.
- *
- * @return mixed the status
- */
- function statusesUpdate($status, $in_reply_to_status_id = null)
- {
- $url = 'https://twitter.com/statuses/update.json';
- if (is_numeric($params)) {
- $params = array('in_reply_to_status_id' => intval($params));
- }
- $params['status'] = $status;
- $params['source'] = common_config('integration', 'source');
- $response = $this->httpRequest($url, $params);
- $status = json_decode($response);
- return $status;
- }
-
- /**
- * Calls Twitter's /statuses/friends_timeline API method
- *
- * @param int $since_id show statuses after this id
- * @param int $max_id show statuses before this id
- * @param int $cnt number of statuses to show
- * @param int $page page number
- *
- * @return mixed an array of statuses
- */
- function statusesFriendsTimeline($since_id = null, $max_id = null,
- $cnt = null, $page = null)
- {
- $url = 'https://twitter.com/statuses/friends_timeline.json';
- $params = array('since_id' => $since_id,
- 'max_id' => $max_id,
- 'count' => $cnt,
- 'page' => $page);
- $qry = http_build_query($params);
-
- if (!empty($qry)) {
- $url .= "?$qry";
- }
-
- $response = $this->httpRequest($url);
- $statuses = json_decode($response);
- return $statuses;
- }
-
- /**
- * Calls Twitter's /statuses/friends API method
- *
- * @param int $id id of the user whom you wish to see friends of
- * @param int $user_id numerical user id
- * @param int $screen_name screen name
- * @param int $page page number
- *
- * @return mixed an array of twitter users and their latest status
- */
- function statusesFriends($id = null, $user_id = null, $screen_name = null,
- $page = null)
- {
- $url = "https://twitter.com/statuses/friends.json";
-
- $params = array('id' => $id,
- 'user_id' => $user_id,
- 'screen_name' => $screen_name,
- 'page' => $page);
- $qry = http_build_query($params);
-
- if (!empty($qry)) {
- $url .= "?$qry";
- }
-
- $response = $this->httpRequest($url);
- $friends = json_decode($response);
- return $friends;
- }
-
- /**
- * Calls Twitter's /statuses/friends/ids API method
- *
- * @param int $id id of the user whom you wish to see friends of
- * @param int $user_id numerical user id
- * @param int $screen_name screen name
- * @param int $page page number
- *
- * @return mixed a list of ids, 100 per page
- */
- function friendsIds($id = null, $user_id = null, $screen_name = null,
- $page = null)
- {
- $url = "https://twitter.com/friends/ids.json";
-
- $params = array('id' => $id,
- 'user_id' => $user_id,
- 'screen_name' => $screen_name,
- 'page' => $page);
- $qry = http_build_query($params);
-
- if (!empty($qry)) {
- $url .= "?$qry";
- }
-
- $response = $this->httpRequest($url);
- $ids = json_decode($response);
- return $ids;
- }
-
- /**
- * Make an HTTP request
- *
- * @param string $url Where to make the request
- * @param array $params post parameters
- *
- * @return mixed the request
- * @throws BasicAuthException
- */
- function httpRequest($url, $params = null, $auth = true)
- {
- $request = HTTPClient::start();
- $request->setConfig(array(
- 'follow_redirects' => true,
- 'connect_timeout' => 120,
- 'timeout' => 120,
- 'ssl_verify_peer' => false,
- 'ssl_verify_host' => false
- ));
-
- if ($auth) {
- $request->setAuth($this->screen_name, $this->password);
- }
-
- if (isset($params)) {
- // Twitter is strict about accepting invalid "Expect" headers
- $headers = array('Expect:');
- $response = $request->post($url, $headers, $params);
- } else {
- $response = $request->get($url);
- }
-
- $code = $response->getStatus();
-
- if ($code < 200 || $code >= 400) {
- throw new BasicAuthException($response->getBody(), $code);
- }
-
- return $response->getBody();
- }
-
-}
diff --git a/plugins/TwitterBridge/twitteroauthclient.php b/plugins/TwitterBridge/twitteroauthclient.php
index d895d8c73..876e30425 100644
--- a/plugins/TwitterBridge/twitteroauthclient.php
+++ b/plugins/TwitterBridge/twitteroauthclient.php
@@ -188,7 +188,7 @@ class TwitterOAuthClient extends OAuthClient
}
/**
- * Calls Twitter's /statuses/friends_timeline API method
+ * Calls Twitter's /statuses/home_timeline API method
*
* @param int $since_id show statuses after this id
* @param int $max_id show statuses before this id
@@ -197,22 +197,28 @@ class TwitterOAuthClient extends OAuthClient
*
* @return mixed an array of statuses
*/
- function statusesFriendsTimeline($since_id = null, $max_id = null,
- $cnt = null, $page = null)
+ function statusesHomeTimeline($since_id = null, $max_id = null,
+ $cnt = null, $page = null)
{
- $url = 'https://twitter.com/statuses/friends_timeline.json';
- $params = array('since_id' => $since_id,
- 'max_id' => $max_id,
- 'count' => $cnt,
- 'page' => $page);
- $qry = http_build_query($params);
+ $url = 'https://twitter.com/statuses/home_timeline.json';
- if (!empty($qry)) {
- $url .= "?$qry";
+ $params = array('include_entities' => 'true');
+
+ if (!empty($since_id)) {
+ $params['since_id'] = $since_id;
+ }
+ if (!empty($max_id)) {
+ $params['max_id'] = $max_id;
+ }
+ if (!empty($cnt)) {
+ $params['count'] = $cnt;
+ }
+ if (!empty($page)) {
+ $params['page'] = $page;
}
- $response = $this->oAuthGet($url);
+ $response = $this->oAuthGet($url, $params);
$statuses = json_decode($response);
return $statuses;
}
@@ -232,17 +238,25 @@ class TwitterOAuthClient extends OAuthClient
{
$url = "https://twitter.com/statuses/friends.json";
- $params = array('id' => $id,
- 'user_id' => $user_id,
- 'screen_name' => $screen_name,
- 'page' => $page);
- $qry = http_build_query($params);
+ $params = array();
- if (!empty($qry)) {
- $url .= "?$qry";
+ if (!empty($id)) {
+ $params['id'] = $id;
}
- $response = $this->oAuthGet($url);
+ if (!empty($user_id)) {
+ $params['user_id'] = $user_id;
+ }
+
+ if (!empty($screen_name)) {
+ $params['screen_name'] = $screen_name;
+ }
+
+ if (!empty($page)) {
+ $params['page'] = $page;
+ }
+
+ $response = $this->oAuthGet($url, $params);
$friends = json_decode($response);
return $friends;
}
@@ -262,19 +276,90 @@ class TwitterOAuthClient extends OAuthClient
{
$url = "https://twitter.com/friends/ids.json";
- $params = array('id' => $id,
- 'user_id' => $user_id,
- 'screen_name' => $screen_name,
- 'page' => $page);
- $qry = http_build_query($params);
+ $params = array();
+
+ if (!empty($id)) {
+ $params['id'] = $id;
+ }
+
+ if (!empty($user_id)) {
+ $params['user_id'] = $user_id;
+ }
+
+ if (!empty($screen_name)) {
+ $params['screen_name'] = $screen_name;
+ }
- if (!empty($qry)) {
- $url .= "?$qry";
+ if (!empty($page)) {
+ $params['page'] = $page;
}
- $response = $this->oAuthGet($url);
+ $response = $this->oAuthGet($url, $params);
$ids = json_decode($response);
return $ids;
}
+ /**
+ * Calls Twitter's /statuses/retweet/id.json API method
+ *
+ * @param int $id id of the notice to retweet
+ *
+ * @return retweeted status
+ */
+
+ function statusesRetweet($id)
+ {
+ $url = "http://api.twitter.com/1/statuses/retweet/$id.json";
+ $response = $this->oAuthPost($url);
+ $status = json_decode($response);
+ return $status;
+ }
+
+ /**
+ * Calls Twitter's /favorites/create API method
+ *
+ * @param int $id ID of the status to favorite
+ *
+ * @return object faved status
+ */
+
+ function favoritesCreate($id)
+ {
+ $url = "http://api.twitter.com/1/favorites/create/$id.json";
+ $response = $this->oAuthPost($url);
+ $status = json_decode($response);
+ return $status;
+ }
+
+ /**
+ * Calls Twitter's /favorites/destroy API method
+ *
+ * @param int $id ID of the status to unfavorite
+ *
+ * @return object unfaved status
+ */
+
+ function favoritesDestroy($id)
+ {
+ $url = "http://api.twitter.com/1/favorites/destroy/$id.json";
+ $response = $this->oAuthPost($url);
+ $status = json_decode($response);
+ return $status;
+ }
+
+ /**
+ * Calls Twitter's /statuses/destroy API method
+ *
+ * @param int $id ID of the status to destroy
+ *
+ * @return object destroyed
+ */
+
+ function statusesDestroy($id)
+ {
+ $url = "http://api.twitter.com/1/statuses/destroy/$id.json";
+ $response = $this->oAuthPost($url);
+ $status = json_decode($response);
+ return $status;
+ }
}
diff --git a/theme/README b/theme/README
index e154a723c..56a7a66c3 100644
--- a/theme/README
+++ b/theme/README
@@ -3,7 +3,7 @@
* @package StatusNet
* @author Sarven Capadisli <csarven@status.net>
* @copyright 2010 StatusNet, Inc.
- * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @license http://creativecommons.org/licenses/by/3.0/ Creative Commons Attribution 3.0 unported
* @link http://status.net/
*/
@@ -23,25 +23,19 @@ default/default-avatar-stream.png #48x48 default avatar for notice timelines
default/default-avatar-profile.png #96x96 default avatar for the profile page
</nowiki></pre>
-
== How to create your own theme ==
-
You probably want to do one of the following:
-
* If you just want to change the text, link, background, content, sidebar colours, background image:
** Do this from the Admin->Design settings (recommended!). You could also create a directory and a file structure like the default theme, search and replace with your own values. This is more work, but, you can do this if you plan to make additional *minimal* changes.
-
* If you want to change the background images and colours:
# Create a directory and a file structure like the default theme.
# Have your stylesheet import base/css/display.css and add your own styles below. It is okay to add *minimal* changes here.
-
* If you want to create a different layout, typography, background images and colours:
** Create your own theme directory (base or default) with stylesheets and images like.
-
Finally, enable your theme by selecting it from the Admin->Design interface. You can set site's logo from here as well.
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index f48bdf55e..a278126dc 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -3,7 +3,7 @@
* @package StatusNet
* @author Sarven Capadisli <csarven@status.net>
* @copyright 2009-2010 StatusNet, Inc.
- * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @license http://creativecommons.org/licenses/by/3.0/ Creative Commons Attribution 3.0 Unported
* @link http://status.net/
*/
diff --git a/theme/base/css/ie.css b/theme/base/css/ie.css
index 41d053ac4..48b5cd6af 100644
--- a/theme/base/css/ie.css
+++ b/theme/base/css/ie.css
@@ -1,3 +1,10 @@
+/**
+ * @package StatusNet
+ * @author Sarven Capadisli <csarven@status.net>
+ * @copyright 2009-2010 StatusNet, Inc.
+ * @license http://creativecommons.org/licenses/by/3.0/ Creative Commons Attribution 3.0 Unported
+ * @link http://status.net/
+ */
/* IE specific styles */
input.checkbox,
input.radio {
diff --git a/theme/base/css/ie6.css b/theme/base/css/ie6.css
index 6df5e01ce..1784677d0 100644
--- a/theme/base/css/ie6.css
+++ b/theme/base/css/ie6.css
@@ -1,3 +1,10 @@
+/**
+ * @package StatusNet
+ * @author Sarven Capadisli <csarven@status.net>
+ * @copyright 2009-2010 StatusNet, Inc.
+ * @license http://creativecommons.org/licenses/by/3.0/ Creative Commons Attribution 3.0 Unported
+ * @link http://status.net/
+ */
/* IE6 specific styles */
address {
margin-left:7px;
diff --git a/theme/base/css/jquery.Jcrop.css b/theme/base/css/jquery.Jcrop.css
index b35f332aa..a3f0d2277 100644
--- a/theme/base/css/jquery.Jcrop.css
+++ b/theme/base/css/jquery.Jcrop.css
@@ -1,3 +1,10 @@
+/**
+ * @package StatusNet
+ * @author Sarven Capadisli <csarven@status.net>
+ * @copyright 2009-2010 StatusNet, Inc.
+ * @license http://creativecommons.org/licenses/by/3.0/ Creative Commons Attribution 3.0 Unported
+ * @link http://status.net/
+ */
/* Fixes issue here http://code.google.com/p/jcrop/issues/detail?id=1 */
.jcrop-holder { text-align: left; }
diff --git a/theme/base/css/uap.css b/theme/base/css/uap.css
index 73be5f0c1..80c73e2ea 100644
--- a/theme/base/css/uap.css
+++ b/theme/base/css/uap.css
@@ -7,7 +7,7 @@
* @package StatusNet
* @author Sarven Capadisli <csarven@status.net>
* @copyright 2010 StatusNet, Inc.
- * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @license http://creativecommons.org/licenses/by/3.0/ Creative Commons Attribution 3.0 Unported
* @link http://status.net/
*/
diff --git a/theme/biz/css/base.css b/theme/biz/css/base.css
index f5efdb49c..c0ca64884 100644
--- a/theme/biz/css/base.css
+++ b/theme/biz/css/base.css
@@ -3,7 +3,7 @@
* @package StatusNet
* @author Sarven Capadisli <csarven@status.net>
* @copyright 2009 StatusNet, Inc.
- * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @license http://creativecommons.org/licenses/by/3.0/ Creative Commons Attribution 3.0 Unported
* @link http://status.net/
*/
diff --git a/theme/biz/css/display.css b/theme/biz/css/display.css
index e735d8683..8b49cbb24 100644
--- a/theme/biz/css/display.css
+++ b/theme/biz/css/display.css
@@ -3,7 +3,7 @@
* @package StatusNet
* @author Sarven Capadisli <csarven@status.net>
* @copyright 2009 StatusNet, Inc.
- * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @license http://creativecommons.org/licenses/by/3.0/ Creative Commons Attribution 3.0 Unported
* @link http://status.net/
*/
diff --git a/theme/biz/css/ie.css b/theme/biz/css/ie.css
index 2f463bb44..46d14c202 100644
--- a/theme/biz/css/ie.css
+++ b/theme/biz/css/ie.css
@@ -1,3 +1,10 @@
+/**
+ * @package StatusNet
+ * @author Sarven Capadisli <csarven@status.net>
+ * @copyright 2009-2010 StatusNet, Inc.
+ * @license http://creativecommons.org/licenses/by/3.0/ Creative Commons Attribution 3.0 Unported
+ * @link http://status.net/
+ */
/* IE specific styles */
.notice-options input.submit {
diff --git a/theme/cloudy/css/display.css b/theme/cloudy/css/display.css
index caea5cf44..d93cd398f 100644
--- a/theme/cloudy/css/display.css
+++ b/theme/cloudy/css/display.css
@@ -3,7 +3,7 @@
* @package StatusNet
* @author Sarven Capadisli <csarven@status.net>
* @copyright 2009 StatusNet, Inc.
- * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @license http://creativecommons.org/licenses/by/3.0/ Creative Commons Attribution 3.0 Unported
* @link http://status.net/
*/
diff --git a/theme/cloudy/css/ie.css b/theme/cloudy/css/ie.css
index a698676fb..e8f964ef4 100644
--- a/theme/cloudy/css/ie.css
+++ b/theme/cloudy/css/ie.css
@@ -1,3 +1,10 @@
+/**
+ * @package StatusNet
+ * @author Sarven Capadisli <csarven@status.net>
+ * @copyright 2009-2010 StatusNet, Inc.
+ * @license http://creativecommons.org/licenses/by/3.0/ Creative Commons Attribution 3.0 Unported
+ * @link http://status.net/
+ */
/* IE specific styles */
.notice-options input.submit {
diff --git a/theme/default/css/display.css b/theme/default/css/display.css
index 9a1dabb51..a9d9910d4 100644
--- a/theme/default/css/display.css
+++ b/theme/default/css/display.css
@@ -3,7 +3,7 @@
* @package StatusNet
* @author Sarven Capadisli <csarven@status.net>
* @copyright 2009-2010 StatusNet, Inc.
- * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @license http://creativecommons.org/licenses/by/3.0/ Creative Commons Attribution 3.0 Unported
* @link http://status.net/
*/
diff --git a/theme/default/css/ie.css b/theme/default/css/ie.css
index 228347166..6a95e0369 100644
--- a/theme/default/css/ie.css
+++ b/theme/default/css/ie.css
@@ -1,3 +1,10 @@
+/**
+ * @package StatusNet
+ * @author Sarven Capadisli <csarven@status.net>
+ * @copyright 2009-2010 StatusNet, Inc.
+ * @license http://creativecommons.org/licenses/by/3.0/ Creative Commons Attribution 3.0 Unported
+ * @link http://status.net/
+ */
/* IE specific styles */
.notice-options input.submit {
diff --git a/theme/h4ck3r/css/base.css b/theme/h4ck3r/css/base.css
index 4c0e74218..a4dac0145 100644
--- a/theme/h4ck3r/css/base.css
+++ b/theme/h4ck3r/css/base.css
@@ -3,7 +3,7 @@
* @package StatusNet
* @author Sarven Capadisli <csarven@status.net>
* @copyright 2009 StatusNet, Inc.
- * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @license http://creativecommons.org/licenses/by/3.0/ Creative Commons Attribution 3.0 Unported
* @link http://status.net/
*/
diff --git a/theme/h4ck3r/css/display.css b/theme/h4ck3r/css/display.css
index 276659dce..edf071a65 100644
--- a/theme/h4ck3r/css/display.css
+++ b/theme/h4ck3r/css/display.css
@@ -3,7 +3,7 @@
* @package StatusNet
* @author Sarven Capadisli <csarven@status.net>
* @copyright 2009 StatusNet, Inc.
- * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @license http://creativecommons.org/licenses/by/3.0/ Creative Commons Attribution 3.0 Unported
* @link http://status.net/
*/
diff --git a/theme/h4ck3r/css/ie.css b/theme/h4ck3r/css/ie.css
index 2f463bb44..46d14c202 100644
--- a/theme/h4ck3r/css/ie.css
+++ b/theme/h4ck3r/css/ie.css
@@ -1,3 +1,10 @@
+/**
+ * @package StatusNet
+ * @author Sarven Capadisli <csarven@status.net>
+ * @copyright 2009-2010 StatusNet, Inc.
+ * @license http://creativecommons.org/licenses/by/3.0/ Creative Commons Attribution 3.0 Unported
+ * @link http://status.net/
+ */
/* IE specific styles */
.notice-options input.submit {
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index d7f150bcb..755775cf2 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -3,7 +3,7 @@
* @package StatusNet
* @author Sarven Capadisli <csarven@status.net>
* @copyright 2009-2010 StatusNet, Inc.
- * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @license http://creativecommons.org/licenses/by/3.0/ Creative Commons Attribution 3.0 Unported
* @link http://status.net/
*/
diff --git a/theme/identica/css/ie.css b/theme/identica/css/ie.css
index f69c13ae7..62b62748b 100644
--- a/theme/identica/css/ie.css
+++ b/theme/identica/css/ie.css
@@ -1,3 +1,10 @@
+/**
+ * @package StatusNet
+ * @author Sarven Capadisli <csarven@status.net>
+ * @copyright 2009-2010 StatusNet, Inc.
+ * @license http://creativecommons.org/licenses/by/3.0/ Creative Commons Attribution 3.0 Unported
+ * @link http://status.net/
+ */
/* IE specific styles */
.notice-options input.submit {
diff --git a/theme/pigeonthoughts/css/base.css b/theme/pigeonthoughts/css/base.css
index bc2e24dc5..c31ea6b67 100644
--- a/theme/pigeonthoughts/css/base.css
+++ b/theme/pigeonthoughts/css/base.css
@@ -3,7 +3,7 @@
* @package StatusNet
* @author Sarven Capadisli <csarven@status.net>
* @copyright 2009 StatusNet, Inc.
- * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @license http://creativecommons.org/licenses/by/3.0/ Creative Commons Attribution 3.0 Unported
* @link http://status.net/
*/
diff --git a/theme/pigeonthoughts/css/display.css b/theme/pigeonthoughts/css/display.css
index 3d6db00e1..91078806a 100644
--- a/theme/pigeonthoughts/css/display.css
+++ b/theme/pigeonthoughts/css/display.css
@@ -3,7 +3,7 @@
* @package StatusNet
* @author Sarven Capadisli <csarven@status.net>
* @copyright 2009 StatusNet, Inc.
- * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @license http://creativecommons.org/licenses/by/3.0/ Creative Commons Attribution 3.0 Unported
* @link http://status.net/
*/
diff --git a/theme/pigeonthoughts/css/ie.css b/theme/pigeonthoughts/css/ie.css
index 2f463bb44..46d14c202 100644
--- a/theme/pigeonthoughts/css/ie.css
+++ b/theme/pigeonthoughts/css/ie.css
@@ -1,3 +1,10 @@
+/**
+ * @package StatusNet
+ * @author Sarven Capadisli <csarven@status.net>
+ * @copyright 2009-2010 StatusNet, Inc.
+ * @license http://creativecommons.org/licenses/by/3.0/ Creative Commons Attribution 3.0 Unported
+ * @link http://status.net/
+ */
/* IE specific styles */
.notice-options input.submit {