summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README1
-rw-r--r--actions/api.php47
-rw-r--r--actions/avatarsettings.php10
-rw-r--r--actions/editgroup.php7
-rw-r--r--actions/emailsettings.php6
-rw-r--r--actions/facebooksettings.php11
-rw-r--r--actions/foaf.php14
-rw-r--r--actions/grouplogo.php2
-rw-r--r--actions/groupsearch.php8
-rw-r--r--actions/invite.php6
-rw-r--r--actions/login.php8
-rw-r--r--actions/newnotice.php7
-rw-r--r--actions/noticesearch.php8
-rw-r--r--actions/openidlogin.php6
-rw-r--r--actions/openidsettings.php6
-rw-r--r--actions/othersettings.php6
-rw-r--r--actions/passwordsettings.php6
-rw-r--r--actions/peoplesearch.php6
-rw-r--r--actions/profilesettings.php8
-rw-r--r--actions/register.php6
-rw-r--r--actions/requesttoken.php2
-rw-r--r--actions/showstream.php7
-rw-r--r--actions/smssettings.php6
-rw-r--r--actions/subscriptions.php6
-rw-r--r--actions/twitapifriendships.php6
-rw-r--r--actions/twitapistatuses.php11
-rw-r--r--classes/File.php4
-rw-r--r--classes/Notice.php3
-rw-r--r--classes/Profile.php75
-rw-r--r--classes/Session.php13
-rw-r--r--classes/Status_network.php2
-rw-r--r--classes/User.php58
-rw-r--r--db/notice_source.sql1
-rw-r--r--db/sms_carrier.sql3
-rw-r--r--doc-src/bookmarklet4
-rw-r--r--doc-src/contact2
-rw-r--r--doc-src/im4
-rw-r--r--extlib/Auth/OpenID/BigMath.php2
-rw-r--r--extlib/Auth/Yadis/XML.php2
-rw-r--r--extlib/OAuth.php5
-rw-r--r--extlib/PEAR.php2
-rw-r--r--extlib/Services/oEmbed.php10
-rw-r--r--extlib/Stomp.php2
-rw-r--r--extlib/php-gettext/ChangeLog16
-rw-r--r--extlib/php-gettext/gettext.inc6
-rw-r--r--extlib/php-gettext/gettext.php6
-rw-r--r--index.php8
-rw-r--r--install.php52
-rw-r--r--lib/action.php1
-rw-r--r--lib/clienterroraction.php43
-rw-r--r--lib/command.php105
-rw-r--r--lib/commandinterpreter.php20
-rw-r--r--lib/common.php7
-rw-r--r--lib/designsettings.php3
-rw-r--r--lib/error.php6
-rw-r--r--lib/facebookutil.php4
-rw-r--r--lib/galleryaction.php5
-rw-r--r--lib/htmloutputter.php31
-rw-r--r--lib/mail.php16
-rw-r--r--lib/mailbox.php30
-rw-r--r--lib/noticeform.php11
-rw-r--r--lib/noticelist.php18
-rw-r--r--lib/omb.php2
-rw-r--r--lib/router.php10
-rw-r--r--lib/searchaction.php12
-rw-r--r--lib/servererroraction.php19
-rw-r--r--lib/twitterapi.php56
-rw-r--r--lib/util.php29
-rw-r--r--locale/el_GR/LC_MESSAGES/statusnet.mobin7230 -> 27725 bytes
-rw-r--r--locale/el_GR/LC_MESSAGES/statusnet.po266
-rw-r--r--locale/he_IL/LC_MESSAGES/statusnet.mobin31408 -> 42235 bytes
-rw-r--r--locale/he_IL/LC_MESSAGES/statusnet.po6
-rw-r--r--locale/is_IS/LC_MESSAGES/statusnet.po4860
-rw-r--r--locale/nb_NO/LC_MESSAGES/statusnet.mobin14685 -> 22230 bytes
-rw-r--r--locale/nb_NO/LC_MESSAGES/statusnet.po102
-rw-r--r--locale/pl_PL/LC_MESSAGES/statusnet.mobin38812 -> 124708 bytes
-rw-r--r--locale/pl_PL/LC_MESSAGES/statusnet.po4754
-rw-r--r--locale/zh_CN/LC_MESSAGES/statusnet.mobin63488 -> 76504 bytes
-rw-r--r--locale/zh_CN/LC_MESSAGES/statusnet.po26
-rw-r--r--plugins/Autocomplete/Autocomplete.js51
-rw-r--r--plugins/Autocomplete/AutocompletePlugin.php16
-rw-r--r--plugins/Autocomplete/autocomplete.php136
-rw-r--r--plugins/Autocomplete/readme.txt2
-rw-r--r--plugins/FBConnect/FBCLoginGroupNav.php20
-rw-r--r--plugins/FBConnect/FBCSettingsNav.php42
-rw-r--r--plugins/FBConnect/FBConnectPlugin.php43
-rw-r--r--plugins/InfiniteScroll/InfiniteScrollPlugin.php2
-rw-r--r--plugins/InfiniteScroll/infinitescroll.js2
-rw-r--r--plugins/InfiniteScroll/jquery.infinitescroll.js22
-rw-r--r--plugins/LinkbackPlugin.php15
-rw-r--r--plugins/Meteor/meteorupdater.js5
-rw-r--r--plugins/PiwikAnalyticsPlugin.php30
-rw-r--r--plugins/Realtime/RealtimePlugin.php169
-rw-r--r--plugins/Realtime/icon_external.gifbin0 -> 90 bytes
-rw-r--r--plugins/Realtime/jquery.getUrlParam.js72
-rw-r--r--plugins/Realtime/realtimeupdate.js125
-rw-r--r--plugins/recaptcha/README2
-rw-r--r--scripts/commandline.inc1
-rw-r--r--scripts/deleteuser.php68
-rwxr-xr-xscripts/fixup_conversations.php14
-rwxr-xr-xscripts/maildaemon.php4
-rwxr-xr-xscripts/synctwitterfriends.php2
-rwxr-xr-xscripts/twitterqueuehandler.php2
-rwxr-xr-xscripts/twitterstatusfetcher.php2
-rw-r--r--tests/URLDetectionTest.php28
-rw-r--r--theme/base/css/display.css25
-rw-r--r--theme/biz/css/base.css25
-rw-r--r--theme/biz/css/display.css110
-rw-r--r--theme/biz/logo.pngbin2228 -> 6389 bytes
-rw-r--r--theme/cloudy/css/display.css25
-rw-r--r--theme/cloudy/logo.pngbin2228 -> 6389 bytes
-rw-r--r--theme/default/css/display.css7
-rw-r--r--theme/h4ck3r/logo.pngbin2228 -> 6389 bytes
-rw-r--r--theme/identica/css/display.css3
-rw-r--r--theme/pigeonthoughts/logo.pngbin2228 -> 6389 bytes
115 files changed, 10029 insertions, 1980 deletions
diff --git a/README b/README
index 3dd365e1f..756219981 100644
--- a/README
+++ b/README
@@ -146,6 +146,7 @@ Your PHP installation must include the following PHP extensions:
- GD. For scaling down avatar images.
- mbstring. For handling Unicode (UTF-8) encoded strings.
- gettext. For multiple languages. Default on many PHP installs.
+- tidy. Used to clean up HTML/URLs for the URL shortener to consume.
For some functionality, you will also need the following extensions:
diff --git a/actions/api.php b/actions/api.php
index f425a8dcd..3705d035c 100644
--- a/actions/api.php
+++ b/actions/api.php
@@ -27,6 +27,8 @@ class ApiAction extends Action
var $api_arg;
var $api_method;
var $api_action;
+ var $auth_user;
+ var $auth_pw;
function handle($args)
{
@@ -35,6 +37,7 @@ class ApiAction extends Action
$this->api_action = $this->arg('apiaction');
$method = $this->arg('method');
$argument = $this->arg('argument');
+ $this->basic_auth_process_header();
if (isset($argument)) {
$cmdext = explode('.', $argument);
@@ -50,7 +53,7 @@ class ApiAction extends Action
}
if ($this->requires_auth()) {
- if (!isset($_SERVER['PHP_AUTH_USER'])) {
+ if (!isset($this->auth_user)) {
# This header makes basic auth go
header('WWW-Authenticate: Basic realm="StatusNet API"');
@@ -58,8 +61,8 @@ class ApiAction extends Action
# If the user hits cancel -- bam!
$this->show_basic_auth_error();
} else {
- $nickname = $_SERVER['PHP_AUTH_USER'];
- $password = $_SERVER['PHP_AUTH_PW'];
+ $nickname = $this->auth_user;
+ $password = $this->auth_pw;
$user = common_check_user($nickname, $password);
if ($user) {
@@ -76,8 +79,8 @@ class ApiAction extends Action
} else {
// Caller might give us a username even if not required
- if (isset($_SERVER['PHP_AUTH_USER'])) {
- $user = User::staticGet('nickname', $_SERVER['PHP_AUTH_USER']);
+ if (isset($this->auth_user)) {
+ $user = User::staticGet('nickname', $this->auth_user);
if ($user) {
$this->user = $user;
}
@@ -139,6 +142,7 @@ class ApiAction extends Action
static $bareauth = array('statuses/user_timeline',
'statuses/friends_timeline',
+ 'statuses/home_timeline',
'statuses/friends',
'statuses/replies',
'statuses/mentions',
@@ -203,6 +207,39 @@ class ApiAction extends Action
}
}
+ function basic_auth_process_header()
+ {
+ if(isset($_SERVER['AUTHORIZATION']) || isset($_SERVER['HTTP_AUTHORIZATION']))
+ {
+ $authorization_header = isset($_SERVER['HTTP_AUTHORIZATION'])?$_SERVER['HTTP_AUTHORIZATION']:$_SERVER['AUTHORIZATION'];
+ }
+
+ if(isset($_SERVER['PHP_AUTH_USER']))
+ {
+ $this->auth_user = $_SERVER['PHP_AUTH_USER'];
+ $this->auth_pw = $_SERVER['PHP_AUTH_PW'];
+ }
+ elseif ( isset($authorization_header) && strstr(substr($authorization_header, 0,5),'Basic') )
+ {
+ // decode the HTTP_AUTHORIZATION header on php-cgi server self
+ // on fcgid server the header name is AUTHORIZATION
+
+ $auth_hash = base64_decode( substr($authorization_header, 6) );
+ list($this->auth_user, $this->auth_pw) = explode(':', $auth_hash);
+
+ // set all to NULL on a empty basic auth request
+ if($this->auth_user == "") {
+ $this->auth_user = NULL;
+ $this->auth_pw = NULL;
+ }
+ }
+ else
+ {
+ $this->auth_user = NULL;
+ $this->auth_pw = NULL;
+ }
+ }
+
function show_basic_auth_error()
{
header('HTTP/1.1 401 Unauthorized');
diff --git a/actions/avatarsettings.php b/actions/avatarsettings.php
index 0bc439ff1..ded419dd7 100644
--- a/actions/avatarsettings.php
+++ b/actions/avatarsettings.php
@@ -362,13 +362,13 @@ class AvatarsettingsAction extends AccountSettingsAction
$profile = $user->getProfile();
$avatar = $profile->getOriginalAvatar();
- $avatar->delete();
+ if($avatar) $avatar->delete();
$avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE);
- $avatar->delete();
+ if($avatar) $avatar->delete();
$avatar = $profile->getAvatar(AVATAR_STREAM_SIZE);
- $avatar->delete();
+ if($avatar) $avatar->delete();
$avatar = $profile->getAvatar(AVATAR_MINI_SIZE);
- $avatar->delete();
+ if($avatar) $avatar->delete();
$this->showForm(_('Avatar deleted.'), true);
}
@@ -399,5 +399,7 @@ class AvatarsettingsAction extends AccountSettingsAction
$this->script('js/jcrop/jquery.Jcrop.min.js');
$this->script('js/jcrop/jquery.Jcrop.go.js');
}
+
+ $this->autofocus('avatarfile');
}
}
diff --git a/actions/editgroup.php b/actions/editgroup.php
index cac910e9b..b8dac31cb 100644
--- a/actions/editgroup.php
+++ b/actions/editgroup.php
@@ -160,6 +160,12 @@ class EditgroupAction extends GroupDesignAction
}
}
+ function showScripts()
+ {
+ parent::showScripts();
+ $this->autofocus('nickname');
+ }
+
function trySave()
{
$cur = common_current_user();
@@ -244,7 +250,6 @@ class EditgroupAction extends GroupDesignAction
$this->group->homepage = $homepage;
$this->group->description = $description;
$this->group->location = $location;
- $this->group->created = common_sql_now();
$result = $this->group->update($orig);
diff --git a/actions/emailsettings.php b/actions/emailsettings.php
index af528a892..6eff06c0d 100644
--- a/actions/emailsettings.php
+++ b/actions/emailsettings.php
@@ -71,6 +71,12 @@ class EmailsettingsAction extends AccountSettingsAction
return _('Manage how you get email from %%site.name%%.');
}
+ function showScripts()
+ {
+ parent::showScripts();
+ $this->autofocus('email');
+ }
+
/**
* Content area of the page
*
diff --git a/actions/facebooksettings.php b/actions/facebooksettings.php
index 84bdde910..b2b1d6807 100644
--- a/actions/facebooksettings.php
+++ b/actions/facebooksettings.php
@@ -58,8 +58,15 @@ class FacebooksettingsAction extends FacebookAction
$this->flink->set_flags($noticesync, $replysync, false, false);
$result = $this->flink->update($original);
+ if ($prefix == '' || $prefix == '0') {
+ // Facebook bug: saving empty strings to prefs now fails
+ // http://bugs.developers.facebook.com/show_bug.cgi?id=7110
+ $trimmed = $prefix . ' ';
+ } else {
+ $trimmed = substr($prefix, 0, 128);
+ }
$this->facebook->api_client->data_setUserPreference(FACEBOOK_NOTICE_PREFIX,
- substr($prefix, 0, 128));
+ $trimmed);
if ($result === false) {
$this->showForm(_('There was a problem saving your sync preferences!'));
@@ -101,7 +108,7 @@ class FacebooksettingsAction extends FacebookAction
$this->elementStart('li');
- $prefix = $this->facebook->api_client->data_getUserPreference(FACEBOOK_NOTICE_PREFIX);
+ $prefix = trim($this->facebook->api_client->data_getUserPreference(FACEBOOK_NOTICE_PREFIX));
$this->input('prefix', _('Prefix'),
($prefix) ? $prefix : null,
diff --git a/actions/foaf.php b/actions/foaf.php
index 4dae9dfc1..356393304 100644
--- a/actions/foaf.php
+++ b/actions/foaf.php
@@ -146,8 +146,10 @@ class FoafAction extends Action
while ($sub->fetch()) {
if ($sub->token) {
$other = Remote_profile::staticGet('id', $sub->subscriber);
+ $profile = Profile::staticGet('id', $sub->subscriber);
} else {
$other = User::staticGet('id', $sub->subscriber);
+ $profile = Profile::staticGet('id', $sub->subscriber);
}
if (!$other) {
common_debug('Got a bad subscription: '.print_r($sub,true));
@@ -158,12 +160,15 @@ class FoafAction extends Action
} else {
$person[$other->uri] = array(LISTENER,
$other->id,
- $other->nickname,
+ $profile->nickname,
(empty($sub->token)) ? 'User' : 'Remote_profile');
}
$other->free();
$other = null;
unset($other);
+ $profile->free();
+ $profile = null;
+ unset($profile);
}
}
@@ -254,8 +259,10 @@ class FoafAction extends Action
while ($sub->fetch()) {
if (!empty($sub->token)) {
$other = Remote_profile::staticGet('id', $sub->subscribed);
+ $profile = Profile::staticGet('id', $sub->subscribed);
} else {
$other = User::staticGet('id', $sub->subscribed);
+ $profile = Profile::staticGet('id', $sub->subscribed);
}
if (empty($other)) {
common_debug('Got a bad subscription: '.print_r($sub,true));
@@ -264,11 +271,14 @@ class FoafAction extends Action
$this->element('sioc:follows', array('rdf:resource' => $other->uri.'#acct'));
$person[$other->uri] = array(LISTENEE,
$other->id,
- $other->nickname,
+ $profile->nickname,
(empty($sub->token)) ? 'User' : 'Remote_profile');
$other->free();
$other = null;
unset($other);
+ $profile->free();
+ $profile = null;
+ unset($profile);
}
}
diff --git a/actions/grouplogo.php b/actions/grouplogo.php
index c6f376915..63ba769c7 100644
--- a/actions/grouplogo.php
+++ b/actions/grouplogo.php
@@ -445,6 +445,8 @@ class GrouplogoAction extends GroupDesignAction
$this->script('js/jcrop/jquery.Jcrop.min.js');
$this->script('js/jcrop/jquery.Jcrop.go.js');
}
+
+ $this->autofocus('avatarfile');
}
function showLocalNav()
diff --git a/actions/groupsearch.php b/actions/groupsearch.php
index bbd4c3a74..517f12789 100644
--- a/actions/groupsearch.php
+++ b/actions/groupsearch.php
@@ -91,6 +91,12 @@ class GroupsearchAction extends SearchAction
$user_group->free();
}
}
+
+ function showScripts()
+ {
+ parent::showScripts();
+ $this->autofocus('q');
+ }
}
class GroupSearchResults extends GroupList
@@ -100,7 +106,7 @@ class GroupSearchResults extends GroupList
function __construct($user_group, $terms, $action)
{
- parent::__construct($user_group, $terms, $action);
+ parent::__construct($user_group, null, $action);
$this->terms = array_map('preg_quote',
array_map('htmlspecialchars', $terms));
$this->pattern = '/('.implode('|',$terms).')/i';
diff --git a/actions/invite.php b/actions/invite.php
index ab43a2491..9fa6a76f6 100644
--- a/actions/invite.php
+++ b/actions/invite.php
@@ -98,6 +98,12 @@ class InviteAction extends CurrentUserDesignAction
$this->showPage();
}
+ function showScripts()
+ {
+ parent::showScripts();
+ $this->autofocus('addresses');
+ }
+
function title()
{
if ($this->mode == 'sent') {
diff --git a/actions/login.php b/actions/login.php
index 37f3c54ff..ac8c40c3e 100644
--- a/actions/login.php
+++ b/actions/login.php
@@ -22,6 +22,7 @@
* @category Login
* @package StatusNet
* @author Evan Prodromou <evan@status.net>
+ * @author Sarven Capadisli <csarven@status.net>
* @copyright 2008-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/
@@ -37,6 +38,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
* @category Personal
* @package StatusNet
* @author Evan Prodromou <evan@status.net>
+ * @author Sarven Capadisli <csarven@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/
*/
@@ -162,6 +164,12 @@ class LoginAction extends Action
$this->showPage();
}
+ function showScripts()
+ {
+ parent::showScripts();
+ $this->autofocus('nickname');
+ }
+
/**
* Title of the page
*
diff --git a/actions/newnotice.php b/actions/newnotice.php
index 00a822860..8c0476f70 100644
--- a/actions/newnotice.php
+++ b/actions/newnotice.php
@@ -239,6 +239,10 @@ class NewnoticeAction extends Action
$this->maybeAddRedir($fileRecord->id, $fileurl);
$short_fileurl = common_shorten_url($fileurl);
+ if (!$short_fileurl) {
+ // todo -- Consider forcing default shortener if none selected?
+ $short_fileurl = $fileurl;
+ }
$content_shortened .= ' ' . $short_fileurl;
if (mb_strlen($content_shortened) > 140) {
@@ -431,13 +435,14 @@ class NewnoticeAction extends Action
$content = $this->trimmed('status_textarea');
if (!$content) {
$replyto = $this->trimmed('replyto');
+ $inreplyto = $this->trimmed('inreplyto');
$profile = Profile::staticGet('nickname', $replyto);
if ($profile) {
$content = '@' . $profile->nickname . ' ';
}
}
- $notice_form = new NoticeForm($this, '', $content);
+ $notice_form = new NoticeForm($this, '', $content, null, $inreplyto);
$notice_form->show();
}
diff --git a/actions/noticesearch.php b/actions/noticesearch.php
index 1188e7e10..69dcd1a46 100644
--- a/actions/noticesearch.php
+++ b/actions/noticesearch.php
@@ -137,6 +137,12 @@ class NoticesearchAction extends SearchAction
$this->pagination($page > 1, $cnt > NOTICES_PER_PAGE,
$page, 'noticesearch', array('q' => $q));
}
+
+ function showScripts()
+ {
+ parent::showScripts();
+ $this->autofocus('q');
+ }
}
class SearchNoticeList extends NoticeList {
@@ -192,7 +198,7 @@ class SearchNoticeListItem extends NoticeListItem {
$result = preg_replace($pattern, '<strong>\\1</strong>', $text);
/* Remove highlighting from inside links, loop incase multiple highlights in links */
- $pattern = '/(href="[^"]*)<strong>('.$options.')<\/strong>([^"]*")/iU';
+ $pattern = '/(\w+="[^"]*)<strong>('.$options.')<\/strong>([^"]*")/iU';
do {
$result = preg_replace($pattern, '\\1\\2\\3', $result, -1, $count);
} while ($count);
diff --git a/actions/openidlogin.php b/actions/openidlogin.php
index 4b5338694..9b7deefb6 100644
--- a/actions/openidlogin.php
+++ b/actions/openidlogin.php
@@ -86,6 +86,12 @@ class OpenidloginAction extends Action
}
}
+ function showScripts()
+ {
+ parent::showScripts();
+ $this->autofocus('openid_url');
+ }
+
function title()
{
return _('OpenID Login');
diff --git a/actions/openidsettings.php b/actions/openidsettings.php
index 13da64a4f..30725fc1b 100644
--- a/actions/openidsettings.php
+++ b/actions/openidsettings.php
@@ -72,6 +72,12 @@ class OpenidsettingsAction extends AccountSettingsAction
' Manage your associated OpenIDs from here.');
}
+ function showScripts()
+ {
+ parent::showScripts();
+ $this->autofocus('openid_url');
+ }
+
/**
* Show the form for OpenID management
*
diff --git a/actions/othersettings.php b/actions/othersettings.php
index 8b674161a..f898e2207 100644
--- a/actions/othersettings.php
+++ b/actions/othersettings.php
@@ -71,6 +71,12 @@ class OthersettingsAction extends AccountSettingsAction
return _('Manage various other options.');
}
+ function showScripts()
+ {
+ parent::showScripts();
+ $this->autofocus('urlshorteningservice');
+ }
+
/**
* Content area of the page
*
diff --git a/actions/passwordsettings.php b/actions/passwordsettings.php
index ec842600f..cd4beac3f 100644
--- a/actions/passwordsettings.php
+++ b/actions/passwordsettings.php
@@ -69,6 +69,12 @@ class PasswordsettingsAction extends AccountSettingsAction
return _('Change your password.');
}
+ function showScripts()
+ {
+ parent::showScripts();
+ $this->autofocus('oldpassword');
+ }
+
/**
* Content area of the page
*
diff --git a/actions/peoplesearch.php b/actions/peoplesearch.php
index ba0f71e39..38135ecbd 100644
--- a/actions/peoplesearch.php
+++ b/actions/peoplesearch.php
@@ -85,6 +85,12 @@ class PeoplesearchAction extends SearchAction
$profile->free();
}
}
+
+ function showScripts()
+ {
+ parent::showScripts();
+ $this->autofocus('q');
+ }
}
/**
diff --git a/actions/profilesettings.php b/actions/profilesettings.php
index f9c16351d..2d66e9946 100644
--- a/actions/profilesettings.php
+++ b/actions/profilesettings.php
@@ -23,6 +23,7 @@
* @package StatusNet
* @author Evan Prodromou <evan@status.net>
* @author Zach Copley <zach@status.net>
+ * @author Sarven Capadisli <csarven@status.net>
* @copyright 2008-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/
@@ -41,6 +42,7 @@ require_once INSTALLDIR.'/lib/accountsettingsaction.php';
* @package StatusNet
* @author Evan Prodromou <evan@status.net>
* @author Zach Copley <zach@status.net>
+ * @author Sarven Capadisli <csarven@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/
*/
@@ -70,6 +72,12 @@ class ProfilesettingsAction extends AccountSettingsAction
'so people know more about you.');
}
+ function showScripts()
+ {
+ parent::showScripts();
+ $this->autofocus('nickname');
+ }
+
/**
* Content area of the page
*
diff --git a/actions/register.php b/actions/register.php
index c431aeee3..eefbc340a 100644
--- a/actions/register.php
+++ b/actions/register.php
@@ -140,6 +140,12 @@ class RegisterAction extends Action
}
}
+ function showScripts()
+ {
+ parent::showScripts();
+ $this->autofocus('nickname');
+ }
+
/**
* Try to register a user
*
diff --git a/actions/requesttoken.php b/actions/requesttoken.php
index 48fe1db08..a17efcdd5 100644
--- a/actions/requesttoken.php
+++ b/actions/requesttoken.php
@@ -72,7 +72,7 @@ class RequesttokenAction extends Action
$req = OAuthRequest::from_request('POST', common_local_url('requesttoken'));
$server = omb_oauth_server();
$token = $server->fetch_request_token($req);
- print $token;
+ print $token.'&omb_version='.OMB_VERSION_01;
} catch (OAuthException $e) {
$this->serverError($e->getMessage());
}
diff --git a/actions/showstream.php b/actions/showstream.php
index 4d3067eed..89285b13c 100644
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -380,8 +380,13 @@ class ShowstreamAction extends ProfileAction
$this->showEmptyListMessage();
}
+ $args = array('nickname' => $this->user->nickname);
+ if (!empty($this->tag))
+ {
+ $args['tag'] = $this->tag;
+ }
$this->pagination($this->page>1, $cnt>NOTICES_PER_PAGE, $this->page,
- 'showstream', array('nickname' => $this->user->nickname));
+ 'showstream', $args);
}
function showAnonymousMessage()
diff --git a/actions/smssettings.php b/actions/smssettings.php
index b956cceba..672abcef8 100644
--- a/actions/smssettings.php
+++ b/actions/smssettings.php
@@ -69,6 +69,12 @@ class SmssettingsAction extends ConnectSettingsAction
return _('You can receive SMS messages through email from %%site.name%%.');
}
+ function showScripts()
+ {
+ parent::showScripts();
+ $this->autofocus('sms');
+ }
+
/**
* Content area of the page
*
diff --git a/actions/subscriptions.php b/actions/subscriptions.php
index b1c668228..cc7b38ee4 100644
--- a/actions/subscriptions.php
+++ b/actions/subscriptions.php
@@ -107,6 +107,12 @@ class SubscriptionsAction extends GalleryAction
array('nickname' => $this->user->nickname));
}
+ function showScripts()
+ {
+ parent::showScripts();
+ $this->autofocus('tag');
+ }
+
function showEmptyListMessage()
{
if (common_logged_in()) {
diff --git a/actions/twitapifriendships.php b/actions/twitapifriendships.php
index f2ea46910..eea8945c3 100644
--- a/actions/twitapifriendships.php
+++ b/actions/twitapifriendships.php
@@ -99,6 +99,12 @@ class TwitapifriendshipsAction extends TwitterapiAction
$other = $this->get_profile($id);
$user = $apidata['user']; // Alwyas the auth user
+ if ($user->id == $other->id) {
+ $this->clientError(_("You cannot unfollow yourself!"),
+ 403, $apidata['content-type']);
+ return;
+ }
+
$sub = new Subscription();
$sub->subscriber = $user->id;
$sub->subscribed = $other->id;
diff --git a/actions/twitapistatuses.php b/actions/twitapistatuses.php
index edee239a0..360dff27c 100644
--- a/actions/twitapistatuses.php
+++ b/actions/twitapistatuses.php
@@ -136,6 +136,11 @@ class TwitapistatusesAction extends TwitterapiAction
}
+ function home_timeline($args, $apidata)
+ {
+ call_user_func(array($this, 'friends_timeline'), $args, $apidata);
+ }
+
function user_timeline($args, $apidata)
{
parent::handle($args);
@@ -292,7 +297,7 @@ class TwitapistatusesAction extends TwitterapiAction
$source, 1, $reply_to);
if (is_string($notice)) {
- $this->serverError($notice);
+ $this->serverError($notice, 500, $apidata['content-type']);
return;
}
@@ -449,7 +454,7 @@ class TwitapistatusesAction extends TwitterapiAction
function friends($args, $apidata)
{
parent::handle($args);
- $includeStatuses=! (boolean) $args['lite'];
+ $includeStatuses= !(array_key_exists('lite', $args) and $args['lite']);
return $this->subscriptions($apidata, 'subscribed', 'subscriber', false, $includeStatuses);
}
@@ -462,7 +467,7 @@ class TwitapistatusesAction extends TwitterapiAction
function followers($args, $apidata)
{
parent::handle($args);
- $includeStatuses=! (boolean) $args['lite'];
+ $includeStatuses= !(array_key_exists('lite', $args) and $args['lite']);
return $this->subscriptions($apidata, 'subscriber', 'subscribed', false, $includeStatuses);
}
diff --git a/classes/File.php b/classes/File.php
index f4d0a3a48..308d0a771 100644
--- a/classes/File.php
+++ b/classes/File.php
@@ -78,7 +78,7 @@ class File extends Memcached_DataObject
$file_id = $x->insert();
if (isset($redir_data['type'])
- && ('text/html' === substr($redir_data['type'], 0, 9))
+ && (('text/html' === substr($redir_data['type'], 0, 9) || 'application/xhtml+xml' === substr($redir_data['type'], 0, 21)))
&& ($oembed_data = File_oembed::_getOembed($given_url))) {
File_oembed::saveNew($oembed_data, $file_id);
}
@@ -201,7 +201,7 @@ class File extends Memcached_DataObject
if(isset($this->filename)){
return true;
}
- $notEnclosureMimeTypes = array('text/html','application/xhtml+xml');
+ $notEnclosureMimeTypes = array('text/html','application/xhtml+xml',null);
$mimetype = strtolower($this->mimetype);
$semicolon = strpos($mimetype,';');
if($semicolon){
diff --git a/classes/Notice.php b/classes/Notice.php
index 89afe9d1d..7d0502626 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -897,7 +897,8 @@ class Notice extends Memcached_DataObject
$qry .= '('.$id.', '.$this->id.', '.$source.", '".$this->created. "') ";
$cnt++;
if (rand() % NOTICE_INBOX_SOFT_LIMIT == 0) {
- Notice_inbox::gc($id);
+ // FIXME: Causes lag in replicated servers
+ // Notice_inbox::gc($id);
}
if ($cnt >= MAX_BOXCARS) {
$inbox = new Notice_inbox();
diff --git a/classes/Profile.php b/classes/Profile.php
index 6ad0e7a3a..8385ebf88 100644
--- a/classes/Profile.php
+++ b/classes/Profile.php
@@ -461,4 +461,79 @@ class Profile extends Memcached_DataObject
$c->delete(common_cache_key('profile:notice_count:'.$this->id));
}
}
+
+ function delete()
+ {
+ $this->_deleteNotices();
+ $this->_deleteSubscriptions();
+ $this->_deleteMessages();
+ $this->_deleteTags();
+ $this->_deleteBlocks();
+
+ $related = array('Avatar',
+ 'Reply',
+ 'Group_member',
+ );
+
+ foreach ($related as $cls) {
+ $inst = new $cls();
+ $inst->profile_id = $this->id;
+ $inst->delete();
+ }
+
+ parent::delete();
+ }
+
+ function _deleteNotices()
+ {
+ $notice = new Notice();
+ $notice->profile_id = $this->id;
+
+ if ($notice->find()) {
+ while ($notice->fetch()) {
+ $other = clone($notice);
+ $other->delete();
+ }
+ }
+ }
+
+ function _deleteSubscriptions()
+ {
+ $sub = new Subscription();
+ $sub->subscriber = $this->id;
+ $sub->delete();
+
+ $subd = new Subscription();
+ $subd->subscribed = $this->id;
+ $subd->delete();
+ }
+
+ function _deleteMessages()
+ {
+ $msg = new Message();
+ $msg->from_profile = $this->id;
+ $msg->delete();
+
+ $msg = new Message();
+ $msg->to_profile = $this->id;
+ $msg->delete();
+ }
+
+ function _deleteTags()
+ {
+ $tag = new Profile_tag();
+ $tag->tagged = $this->id;
+ $tag->delete();
+ }
+
+ function _deleteBlocks()
+ {
+ $block = new Profile_block();
+ $block->blocked = $this->id;
+ $block->delete();
+
+ $block = new Group_block();
+ $block->blocked = $this->id;
+ $block->delete();
+ }
}
diff --git a/classes/Session.php b/classes/Session.php
index d641edbbe..79a69a96e 100644
--- a/classes/Session.php
+++ b/classes/Session.php
@@ -85,9 +85,18 @@ class Session extends Memcached_DataObject
return $session->insert();
} else {
- $session->session_data = $session_data;
+ if (strcmp($session->session_data, $session_data) == 0) {
+ self::logdeb("Not writing session '$id'; unchanged");
+ return true;
+ } else {
+ self::logdeb("Session '$id' data changed; updating");
+
+ $orig = clone($session);
+
+ $session->session_data = $session_data;
- return $session->update();
+ return $session->update($orig);
+ }
}
}
diff --git a/classes/Status_network.php b/classes/Status_network.php
index d526cb4d6..fe4f0b0c5 100644
--- a/classes/Status_network.php
+++ b/classes/Status_network.php
@@ -54,7 +54,7 @@ class Status_network extends DB_DataObject
global $config;
$config['db']['database_'.$dbname] = "mysqli://$dbuser:$dbpass@$dbhost/$dbname";
- $config['db']['ini_'.$dbname] = INSTALLDIR.'/classes/statusnet.ini';
+ $config['db']['ini_'.$dbname] = INSTALLDIR.'/classes/status_network.ini';
$config['db']['table_status_network'] = $dbname;
self::$cache = new Memcache();
diff --git a/classes/User.php b/classes/User.php
index 14d3cf54f..007662131 100644
--- a/classes/User.php
+++ b/classes/User.php
@@ -120,11 +120,15 @@ class User extends Memcached_DataObject
function allowed_nickname($nickname)
{
// XXX: should already be validated for size, content, etc.
- static $blacklist = array('rss', 'xrds', 'doc', 'main',
- 'settings', 'notice', 'user',
- 'search', 'avatar', 'tag', 'tags',
- 'api', 'message', 'group', 'groups',
- 'local');
+
+ $blacklist = array();
+
+ //all directory and file names should be blacklisted
+ $d = dir(INSTALLDIR);
+ while (false !== ($entry = $d->read())) {
+ $blacklist[]=$entry;
+ }
+ $d->close();
$merged = array_merge($blacklist, common_config('nickname', 'blacklist'));
return !in_array($nickname, $merged);
}
@@ -685,4 +689,48 @@ class User extends Memcached_DataObject
{
return Design::staticGet('id', $this->design_id);
}
+
+ function delete()
+ {
+ $profile = $this->getProfile();
+ $profile->delete();
+
+ $related = array('Fave',
+ 'User_openid',
+ 'Confirm_address',
+ 'Remember_me',
+ 'Foreign_link',
+ 'Invitation',
+ );
+
+ if (common_config('inboxes', 'enabled')) {
+ $related[] = 'Notice_inbox';
+ }
+
+ foreach ($related as $cls) {
+ $inst = new $cls();
+ $inst->user_id = $this->id;
+ $inst->delete();
+ }
+
+ $this->_deleteTags();
+ $this->_deleteBlocks();
+
+ parent::delete();
+ }
+
+ function _deleteTags()
+ {
+ $tag = new Profile_tag();
+ $tag->tagger = $this->id;
+ $tag->delete();
+ }
+
+ function _deleteBlocks()
+ {
+ $block = new Profile_block();
+ $block->blocker = $this->id;
+ $block->delete();
+ // XXX delete group block? Reset blocker?
+ }
}
diff --git a/db/notice_source.sql b/db/notice_source.sql
index f590d1b97..2657763f4 100644
--- a/db/notice_source.sql
+++ b/db/notice_source.sql
@@ -21,6 +21,7 @@ VALUES
('identichat','identichat','http://identichat.prosody.im/', now()),
('IdentiFox','IdentiFox','http://www.bitbucket.org/uncryptic/identifox/', now()),
('identitwitch','IdentiTwitch','http://richfish.org/identitwitch/', now()),
+ ('Jiminy','Jiminy','http://code.google.com/p/jiminy/', now()),
('LaTwit','LaTwit','http://latwit.mac65.com/', now()),
('LiveTweeter', 'LiveTweeter', 'http://addons.songbirdnest.com/addon/1204', now()),
('livetweeter', 'livetweeter', 'http://addons.songbirdnest.com/addon/1204', now()),
diff --git a/db/sms_carrier.sql b/db/sms_carrier.sql
index 055606f58..0e94df296 100644
--- a/db/sms_carrier.sql
+++ b/db/sms_carrier.sql
@@ -61,4 +61,5 @@ VALUES
(100113, 'T-Mobile Germany', '%s@t-mobile-sms.de', now()),
(100114, 'Vodafone Germany', '%s@vodafone-sms.de', now()),
(100115, 'E-Plus', '%s@smsmail.eplus.de', now()),
- (100116, 'Cellular South', '%s@csouth1.com', now());
+ (100116, 'Cellular South', '%s@csouth1.com', now()),
+ (100117, 'ChinaMobile (139)', '%s@139.com', now());
diff --git a/doc-src/bookmarklet b/doc-src/bookmarklet
index 6cd2c08f9..e5ded7702 100644
--- a/doc-src/bookmarklet
+++ b/doc-src/bookmarklet
@@ -2,6 +2,4 @@ A bookmarklet is a small piece of javascript code used as a bookmark. This one w
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.
-<MTMarkdownOptions output='raw'>
-<a href="javascript:var%20d=document,w=window,e=w.getSelection,k=d.getSelection,x=d.selection,s=(e?e():(k)?k():(x?x.createRange().text:0)),f='http://%%site.server%%/%%site.path%%/index.php?action=newnotice',l=d.location,e=encodeURIComponent,g=f+'&status_textarea=%22'+((e(s))?e(s):e(document.title))+'%22 from '+l.href;function%20a(){if(!w.open(g,'t','toolbar=0,resizable=0,scrollbars=1,status=1,width=800,height=570')){l.href=g;}}a();void(0);">Post to %%site.name%%</a>
-</MTMarkdownOptions>
+<a href="javascript:var%20d=document,w=window,e=w.getSelection,k=d.getSelection,x=d.selection,s=(e?e():(k)?k():(x?x.createRange().text:0)),f='http://%%site.server%%/%%site.path%%/index.php?action=newnotice',l=d.location,e=encodeURIComponent,g=f+'&amp;status_textarea=%22'+((e(s))?e(s):e(document.title))+'%22 from '+l.href;function%20a(){if(!w.open(g,'t','toolbar=0,resizable=0,scrollbars=1,status=1,width=800,height=570')){l.href=g;}}a();void(0);">Post to %%site.name%%</a>
diff --git a/doc-src/contact b/doc-src/contact
index 31f3a4d2b..c63fcd01a 100644
--- a/doc-src/contact
+++ b/doc-src/contact
@@ -13,7 +13,7 @@ Bugs
----
If you think you've found a bug in the [StatusNet](http://status.net/) software,
-or if there's a new feature you'd like to see, add it into the [StatusNet bug database](http://status.net/PITS/HomePage). Don't forget to check the list of
+or if there's a new feature you'd like to see, add it into the [StatusNet bug database](http://status.net/bugs/). Don't forget to check the list of
existing bugs to make sure it hasn't already been reported!
Email
diff --git a/doc-src/im b/doc-src/im
index c722a4e2c..631f6d9bb 100644
--- a/doc-src/im
+++ b/doc-src/im
@@ -37,10 +37,10 @@ currently-implemented commands:
* **help**: Show this help. List available Jabber/XMPP commands
* **follow &lt;nickname&gt;**: Subscribe to &lt;nickname&gt;
* **sub &lt;nickname&gt;**: Same as follow
-* **leave &lt;nickname&gt;**: Subscribe to &lt;nickname&gt;
+* **leave &lt;nickname&gt;**: Unsubscribe from &lt;nickname&gt;
* **unsub &lt;nickname&gt;**: Same as leave
* **d &lt;nickname&gt; &lt;text&gt;**: Send direct message to &lt;nickname&gt; with message body &lt;text&gt;
* **get &lt;nickname&gt;**: Get last notice from &lt;nickname&gt;
* **last &lt;nickname&gt;**: Same as 'get'
* **whois &lt;nickname&gt;**: Get Profile info on &lt;nickname&gt;
-* **fav &lt;nickname&gt;**: Add user's last notice as a favorite \ No newline at end of file
+* **fav &lt;nickname&gt;**: Add user's last notice as a favorite
diff --git a/extlib/Auth/OpenID/BigMath.php b/extlib/Auth/OpenID/BigMath.php
index 45104947d..b5fc627a0 100644
--- a/extlib/Auth/OpenID/BigMath.php
+++ b/extlib/Auth/OpenID/BigMath.php
@@ -376,7 +376,7 @@ function Auth_OpenID_detectMathLibrary($exts)
// Try to load dynamic modules.
if (!$loaded) {
foreach ($extension['modules'] as $module) {
- if (@dl($module . "." . PHP_SHLIB_SUFFIX)) {
+ if (function_exists('dl') && ini_get('enable_dl') && !ini_get('safe_mode') && @dl($module . "." . PHP_SHLIB_SUFFIX)) {
$loaded = true;
break;
}
diff --git a/extlib/Auth/Yadis/XML.php b/extlib/Auth/Yadis/XML.php
index 4854f12bb..7232d6cbd 100644
--- a/extlib/Auth/Yadis/XML.php
+++ b/extlib/Auth/Yadis/XML.php
@@ -349,7 +349,7 @@ function &Auth_Yadis_getXMLParser()
foreach ($extensions as $name => $params) {
if (!extension_loaded($name)) {
foreach ($params['libname'] as $libname) {
- if (@dl($libname)) {
+ if (function_exists('dl') && ini_get('enable_dl') && !ini_get('safe_mode') && @dl($libname)) {
$classname = $params['classname'];
}
}
diff --git a/extlib/OAuth.php b/extlib/OAuth.php
index 029166175..648627b57 100644
--- a/extlib/OAuth.php
+++ b/extlib/OAuth.php
@@ -199,7 +199,8 @@ class OAuthRequest {/*{{{*/
} else {
// collect request parameters from query string (GET) and post-data (POST) if appropriate (note: POST vars have priority)
$req_parameters = $_GET;
- if ($http_method == "POST" && @strstr($request_headers["Content-Type"], "application/x-www-form-urlencoded") ) {
+ if ($http_method == "POST" &&
+ ( @strstr($request_headers["Content-Type"], "application/x-www-form-urlencoded") || @strstr($_ENV["CONTENT_TYPE"], "application/x-www-form-urlencoded") )) {
$req_parameters = array_merge($req_parameters, $_POST);
}
@@ -326,7 +327,7 @@ class OAuthRequest {/*{{{*/
public function get_normalized_http_url() {/*{{{*/
$parts = parse_url($this->http_url);
- $port = @$parts['port'];
+ $port = isset($parts['port']) ? $parts['port'] : null;
$scheme = $parts['scheme'];
$host = $parts['host'];
$path = @$parts['path'];
diff --git a/extlib/PEAR.php b/extlib/PEAR.php
index 4c24c6006..fcefa964a 100644
--- a/extlib/PEAR.php
+++ b/extlib/PEAR.php
@@ -746,7 +746,7 @@ class PEAR
{
if (!extension_loaded($ext)) {
// if either returns true dl() will produce a FATAL error, stop that
- if ((ini_get('enable_dl') != 1) || (ini_get('safe_mode') == 1)) {
+ if ((ini_get('enable_dl') != 1) || (ini_get('safe_mode') == 1) || !function_exists('dl')) {
return false;
}
if (OS_WINDOWS) {
diff --git a/extlib/Services/oEmbed.php b/extlib/Services/oEmbed.php
index 7d507b6f6..0dc8f01b2 100644
--- a/extlib/Services/oEmbed.php
+++ b/extlib/Services/oEmbed.php
@@ -256,7 +256,7 @@ class Services_oEmbed
$code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
if (substr($code, 0, 1) != '2') {
- throw new Services_oEmbed_Exception('Non-200 code returned');
+ throw new Services_oEmbed_Exception('Non-200 code returned. Got code ' . $code);
}
curl_close($ch);
@@ -302,8 +302,8 @@ class Services_oEmbed
// Find all <link /> tags that have a valid oembed type set. We then
// extract the href attribute for each type.
- $regexp = '#<link([^>]*)type="' .
- '(application/json|text/xml)\+oembed"([^>]*)>#i';
+ $regexp = '#<link([^>]*)type[\s\n]*=[\s\n]*"' .
+ '(application/json|text/xml)\+oembed"([^>]*)>#im';
$m = $ret = array();
if (!preg_match_all($regexp, $body, $m)) {
@@ -314,7 +314,7 @@ class Services_oEmbed
foreach ($m[0] as $i => $link) {
$h = array();
- if (preg_match('/href="([^"]+)"/i', $link, $h)) {
+ if (preg_match('/[\s\n]+href[\s\n]*=[\s\n]*"([^"]+)"/im', $link, $h)) {
$ret[$m[2][$i]] = $h[1];
}
}
@@ -347,7 +347,7 @@ class Services_oEmbed
$code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
if (substr($code, 0, 1) != '2') {
- throw new Services_oEmbed_Exception('Non-200 code returned');
+ throw new Services_oEmbed_Exception('Non-200 code returned. Got code ' . $code);
}
return $result;
diff --git a/extlib/Stomp.php b/extlib/Stomp.php
index 9e1c97b3b..abd9cba62 100644
--- a/extlib/Stomp.php
+++ b/extlib/Stomp.php
@@ -454,7 +454,7 @@ class Stomp
*/
public function disconnect ()
{
- $header = array();
+ $headers = array();
if ($this->clientId != null) {
$headers["client-id"] = $this->clientId;
diff --git a/extlib/php-gettext/ChangeLog b/extlib/php-gettext/ChangeLog
index 5e0949dfd..ab77d8081 100644
--- a/extlib/php-gettext/ChangeLog
+++ b/extlib/php-gettext/ChangeLog
@@ -1,3 +1,19 @@
+2006-02-28 Danilo Å egan <danilo@gnome.org>
+
+ * gettext.php: Added some comments about these workarounds for
+ different PHP versions and architectures.
+
+2006-02-28 Danilo Å egan <danilo@gnome.org>
+
+ Fixes bug #15923.
+
+ * gettext.php (gettext_reader): make magic check work on 64-bit
+ platforms as well (by Steffen Pingel).
+
+2006-02-20 Danilo Å egan <danilo@gnome.org>
+
+ * gettext.inc (_bindtextdomain): Use php_uname to detect Windows.
+
2006-02-07 Danilo Å egan <danilo@gnome.org>
* examples/pigs_dropin.php: comment-out bind_textdomain_codeset
diff --git a/extlib/php-gettext/gettext.inc b/extlib/php-gettext/gettext.inc
index eb94b256a..fcaafe7c9 100644
--- a/extlib/php-gettext/gettext.inc
+++ b/extlib/php-gettext/gettext.inc
@@ -148,9 +148,9 @@ function _setlocale($category, $locale) {
*/
function _bindtextdomain($domain, $path) {
global $text_domains;
- // ensure $path ends with a slash
- if ($path[strlen($path) - 1] != '/') $path .= '/';
- elseif ($path[strlen($path) - 1] != '\\') $path .= '\\';
+ // ensure $path ends with a slash
+ if ($path[strlen($path) - 1] != '/') $path .= '/';
+ elseif ($path[strlen($path) - 1] != '\\') $path .= '\\';
$text_domains[$domain]->path = $path;
}
diff --git a/extlib/php-gettext/gettext.php b/extlib/php-gettext/gettext.php
index ad94a987b..cd080444c 100644
--- a/extlib/php-gettext/gettext.php
+++ b/extlib/php-gettext/gettext.php
@@ -102,16 +102,16 @@ class gettext_reader {
// Caching can be turned off
$this->enable_cache = $enable_cache;
- // $MAGIC1 = (int)0x950412de; //bug in PHP 5
+ // $MAGIC1 = (int)0x950412de; //bug in PHP 5.0.2, see https://savannah.nongnu.org/bugs/?func=detailitem&item_id=10565
$MAGIC1 = (int) - 1794895138;
// $MAGIC2 = (int)0xde120495; //bug
$MAGIC2 = (int) - 569244523;
$this->STREAM = $Reader;
$magic = $this->readint();
- if ($magic == $MAGIC1) {
+ if ($magic == ($MAGIC1 & 0xFFFFFFFF)) { // to make sure it works for 64-bit platforms
$this->BYTEORDER = 0;
- } elseif ($magic == $MAGIC2) {
+ } elseif ($magic == ($MAGIC2 & 0xFFFFFFFF)) {
$this->BYTEORDER = 1;
} else {
$this->error = 1; // not MO file
diff --git a/index.php b/index.php
index 7669778f6..362ab3cd3 100644
--- a/index.php
+++ b/index.php
@@ -32,7 +32,13 @@ function getPath($req)
&& array_key_exists('p', $req)) {
return $req['p'];
} else if (array_key_exists('PATH_INFO', $_SERVER)) {
- return $_SERVER['PATH_INFO'];
+ $path = $_SERVER['PATH_INFO'];
+ $script = $_SERVER['SCRIPT_NAME'];
+ if (substr($path, 0, mb_strlen($script)) == $script) {
+ return substr($path, mb_strlen($script));
+ } else {
+ return $path;
+ }
} else {
return null;
}
diff --git a/install.php b/install.php
index a59b9469d..425ea91ef 100644
--- a/install.php
+++ b/install.php
@@ -189,9 +189,9 @@ function main()
return;
}
- if( $_GET['checklibs'] ){
+ if (isset($_GET['checklibs'])) {
showLibs();
- }else{
+ } else {
if ($_SERVER['REQUEST_METHOD'] == 'POST') {
handlePost();
} else {
@@ -202,7 +202,7 @@ function main()
function haveExternalLibrary($external_library)
{
- if(isset($external_library['include']) && ! include_once($external_library['include'])){
+ if(isset($external_library['include']) && ! haveIncludeFile($external_library['include'])){
return false;
}
if(isset($external_library['check_function']) && ! function_exists($external_library['check_function'])){
@@ -214,6 +214,15 @@ function haveExternalLibrary($external_library)
return true;
}
+// Attempt to include a PHP file and report if it worked, while
+// suppressing the annoying warning messages on failure.
+function haveIncludeFile($filename) {
+ $old = error_reporting(error_reporting() & ~E_WARNING);
+ $ok = include_once($filename);
+ error_reporting($old);
+ return $ok;
+}
+
function checkPrereqs()
{
$pass = true;
@@ -230,7 +239,7 @@ function checkPrereqs()
}
$reqs = array('gd', 'curl',
- 'xmlwriter', 'mbstring');
+ 'xmlwriter', 'mbstring','tidy');
foreach ($reqs as $req) {
if (!checkExtension($req)) {
@@ -267,12 +276,19 @@ function checkPrereqs()
function checkExtension($name)
{
- if (!extension_loaded($name)) {
- if (!@dl($name.'.so')) {
- return false;
- }
+ if (extension_loaded($name)) {
+ return true;
+ } elseif (function_exists('dl') && ini_get('enable_dl') && !ini_get('safe_mode')) {
+ // dl will throw a fatal error if it's disabled or we're in safe mode.
+ // More fun, it may not even exist under some SAPIs in 5.3.0 or later...
+ $soname = $name . '.' . PHP_SHLIB_SUFFIX;
+ if (PHP_SHLIB_SUFFIX == 'dll') {
+ $soname = "php_" . $soname;
+ }
+ return @dl($soname);
+ } else {
+ return false;
}
- return true;
}
function showLibs()
@@ -289,7 +305,7 @@ function showLibs()
}
echo<<<E_O_T
<div class="instructions">
- <p>Laconica comes bundled with a number of libraries required for the application to work. However, it is best that you use PEAR or you distribution to manage
+ <p>StatusNet comes bundled with a number of libraries required for the application to work. However, it is best that you use PEAR or you distribution to manage
libraries instead, as they tend to provide security updates faster, and may offer improved performance.</p>
<p>On Debian based distributions, such as Ubuntu, use a package manager (such as &quot;aptitude&quot;, &quot;apt-get&quot;, and &quot;synaptic&quot;) to install the package listed.</p>
<p>On RPM based distributions, such as Red Hat, Fedora, CentOS, Scientific Linux, Yellow Dog Linux and Oracle Enterprise Linux, use a package manager (such as &quot;yum&quot;, &quot;apt-rpm&quot;, and &quot;up2date&quot;) to install the package listed.</p>
@@ -301,19 +317,19 @@ E_O_T;
foreach($absent_libraries as $library)
{
echo '<li>';
- if($library['url']){
- echo '<a href=">'.$library['url'].'">'.htmlentities($library['name']).'</a>';
+ if(isset($library['url'])){
+ echo '<a href="'.$library['url'].'">'.htmlentities($library['name']).'</a>';
}else{
echo htmlentities($library['name']);
}
echo '<ul>';
- if($library['deb']){
+ if(isset($library['deb'])){
echo '<li class="deb package">deb: <a href="apt:' . urlencode($library['deb']) . '">' . htmlentities($library['deb']) . '</a></li>';
}
- if($library['rpm']){
+ if(isset($library['rpm'])){
echo '<li class="rpm package">rpm: ' . htmlentities($library['rpm']) . '</li>';
}
- if($library['pear']){
+ if(isset($library['pear'])){
echo '<li class="pear package">pear: ' . htmlentities($library['pear']) . '</li>';
}
echo '</ul>';
@@ -326,8 +342,8 @@ E_O_T;
foreach($present_libraries as $library)
{
echo '<li>';
- if($library['url']){
- echo '<a href=">'.$library['url'].'">'.htmlentities($library['name']).'</a>';
+ if(isset($library['url'])){
+ echo '<a href="'.$library['url'].'">'.htmlentities($library['name']).'</a>';
}else{
echo htmlentities($library['name']);
}
@@ -349,7 +365,7 @@ function showForm()
<dd>
<div class="instructions">
<p>Enter your database connection information below to initialize the database.</p>
- <p>Laconica bundles a number of libraries for ease of installation. <a href="?checklibs=true">You can see what bundled libraries you are using, versus what libraries are installed on your server.</a>
+ <p>StatusNet bundles a number of libraries for ease of installation. <a href="?checklibs=true">You can see what bundled libraries you are using, versus what libraries are installed on your server.</a>
</div>
</dd>
</dl>
diff --git a/lib/action.php b/lib/action.php
index fafb2c6fc..670eb498c 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -881,6 +881,7 @@ class Action extends HTMLOutputter // lawsuit
*/
function handle($argarray=null)
{
+ header('Vary: Accept-Encoding,Cookie');
$lm = $this->lastModified();
$etag = $this->etag();
if ($etag) {
diff --git a/lib/clienterroraction.php b/lib/clienterroraction.php
index 7d007a756..1b98a1064 100644
--- a/lib/clienterroraction.php
+++ b/lib/clienterroraction.php
@@ -46,28 +46,28 @@ require_once INSTALLDIR.'/lib/error.php';
*/
class ClientErrorAction extends ErrorAction
{
+ static $status = array(400 => 'Bad Request',
+ 401 => 'Unauthorized',
+ 402 => 'Payment Required',
+ 403 => 'Forbidden',
+ 404 => 'Not Found',
+ 405 => 'Method Not Allowed',
+ 406 => 'Not Acceptable',
+ 407 => 'Proxy Authentication Required',
+ 408 => 'Request Timeout',
+ 409 => 'Conflict',
+ 410 => 'Gone',
+ 411 => 'Length Required',
+ 412 => 'Precondition Failed',
+ 413 => 'Request Entity Too Large',
+ 414 => 'Request-URI Too Long',
+ 415 => 'Unsupported Media Type',
+ 416 => 'Requested Range Not Satisfiable',
+ 417 => 'Expectation Failed');
+
function __construct($message='Error', $code=400)
{
parent::__construct($message, $code);
-
- $this->status = array(400 => 'Bad Request',
- 401 => 'Unauthorized',
- 402 => 'Payment Required',
- 403 => 'Forbidden',
- 404 => 'Not Found',
- 405 => 'Method Not Allowed',
- 406 => 'Not Acceptable',
- 407 => 'Proxy Authentication Required',
- 408 => 'Request Timeout',
- 409 => 'Conflict',
- 410 => 'Gone',
- 411 => 'Length Required',
- 412 => 'Precondition Failed',
- 413 => 'Request Entity Too Large',
- 414 => 'Request-URI Too Long',
- 415 => 'Unsupported Media Type',
- 416 => 'Requested Range Not Satisfiable',
- 417 => 'Expectation Failed');
$this->default = 400;
}
@@ -91,9 +91,4 @@ class ClientErrorAction extends ErrorAction
$this->showPage();
}
-
- function title()
- {
- return $this->status[$this->code];
- }
}
diff --git a/lib/command.php b/lib/command.php
index 91a20b810..01b14f83e 100644
--- a/lib/command.php
+++ b/lib/command.php
@@ -114,7 +114,6 @@ class StatsCommand extends Command
class FavCommand extends Command
{
-
var $other = null;
function __construct($user, $other)
@@ -158,6 +157,108 @@ class FavCommand extends Command
$channel->output($this->user, _('Notice marked as fave.'));
}
+
+}
+class JoinCommand extends Command
+{
+ var $other = null;
+
+ function __construct($user, $other)
+ {
+ parent::__construct($user);
+ $this->other = $other;
+ }
+
+ function execute($channel)
+ {
+
+ $nickname = common_canonical_nickname($this->other);
+ $group = User_group::staticGet('nickname', $nickname);
+ $cur = $this->user;
+
+ if (!$group) {
+ $channel->error($cur, _('No such group.'));
+ return;
+ }
+
+ if ($cur->isMember($group)) {
+ $channel->error($cur, _('You are already a member of that group'));
+ return;
+ }
+ if (Group_block::isBlocked($group, $cur->getProfile())) {
+ $channel->error($cur, _('You have been blocked from that group by the admin.'));
+ return;
+ }
+
+ $member = new Group_member();
+
+ $member->group_id = $group->id;
+ $member->profile_id = $cur->id;
+ $member->created = common_sql_now();
+
+ $result = $member->insert();
+ if (!$result) {
+ common_log_db_error($member, 'INSERT', __FILE__);
+ $channel->error($cur, sprintf(_('Could not join user %s to group %s'),
+ $cur->nickname, $group->nickname));
+ return;
+ }
+
+ $channel->output($cur, sprintf(_('%s joined group %s'),
+ $cur->nickname,
+ $group->nickname));
+ }
+
+}
+class DropCommand extends Command
+{
+ var $other = null;
+
+ function __construct($user, $other)
+ {
+ parent::__construct($user);
+ $this->other = $other;
+ }
+
+ function execute($channel)
+ {
+
+ $nickname = common_canonical_nickname($this->other);
+ $group = User_group::staticGet('nickname', $nickname);
+ $cur = $this->user;
+
+ if (!$group) {
+ $channel->error($cur, _('No such group.'));
+ return;
+ }
+
+ if (!$cur->isMember($group)) {
+ $channel->error($cur, _('You are not a member of that group.'));
+ return;
+ }
+
+ $member = new Group_member();
+
+ $member->group_id = $group->id;
+ $member->profile_id = $cur->id;
+
+ if (!$member->find(true)) {
+ $channel->error($cur,_('Could not find membership record.'));
+ return;
+ }
+ $result = $member->delete();
+ if (!$result) {
+ common_log_db_error($member, 'INSERT', __FILE__);
+ $channel->error($cur, sprintf(_('Could not remove user %s to group %s'),
+ $cur->nickname, $group->nickname));
+ return;
+ }
+
+ $channel->output($cur, sprintf(_('%s left group %s'),
+ $cur->nickname,
+ $group->nickname));
+ }
+
}
class WhoisCommand extends Command
@@ -392,6 +493,8 @@ class HelpCommand extends Command
"get <nickname> - get last notice from user\n".
"whois <nickname> - get profile info on user\n".
"fav <nickname> - add user's last notice as a 'fave'\n".
+ "join <group> - join group\n".
+ "drop <group> - leave group\n".
"stats - get your stats\n".
"stop - same as 'off'\n".
"quit - same as 'off'\n".
diff --git a/lib/commandinterpreter.php b/lib/commandinterpreter.php
index ac6bf73c8..6e4340e5d 100644
--- a/lib/commandinterpreter.php
+++ b/lib/commandinterpreter.php
@@ -70,6 +70,26 @@ class CommandInterpreter
} else {
return new OffCommand($user);
}
+ case 'join':
+ if (!$arg) {
+ return null;
+ }
+ list($other, $extra) = explode(' ', $arg, 2);
+ if ($extra) {
+ return null;
+ } else {
+ return new JoinCommand($user, $other);
+ }
+ case 'drop':
+ if (!$arg) {
+ return null;
+ }
+ list($other, $extra) = explode(' ', $arg, 2);
+ if ($extra) {
+ return null;
+ } else {
+ return new DropCommand($user, $other);
+ }
case 'follow':
case 'sub':
if (!$arg) {
diff --git a/lib/common.php b/lib/common.php
index 39d4ffc9b..0b4e03184 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -19,7 +19,7 @@
if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
-define('STATUSNET_VERSION', '0.8.1');
+define('STATUSNET_VERSION', '0.8.2dev');
define('LACONICA_VERSION', STATUSNET_VERSION); // compatibility
define('STATUSNET_CODENAME', 'Second Guessing');
@@ -196,15 +196,14 @@ $config =
array('enabled' => true),
'sms' =>
array('enabled' => true),
- 'twitter' =>
- array('enabled' => true),
'twitterbridge' =>
array('enabled' => false),
'integration' =>
array('source' => 'StatusNet', # source attribute for Twitter
'taguri' => $_server.',2009'), # base for tag URIs
'twitter' =>
- array('consumer_key' => null,
+ array('enabled' => true,
+ 'consumer_key' => null,
'consumer_secret' => null),
'memcached' =>
array('enabled' => false,
diff --git a/lib/designsettings.php b/lib/designsettings.php
index fe4222597..820d534f2 100644
--- a/lib/designsettings.php
+++ b/lib/designsettings.php
@@ -325,8 +325,9 @@ class DesignSettingsAction extends AccountSettingsAction
parent::showScripts();
$this->script('js/farbtastic/farbtastic.js');
- $this->script('js/farbtastic/farbtastic.go.js');
$this->script('js/userdesign.go.js');
+
+ $this->autofocus('design_background-image_file');
}
/**
diff --git a/lib/error.php b/lib/error.php
index 0c521db08..6a9b76be1 100644
--- a/lib/error.php
+++ b/lib/error.php
@@ -44,9 +44,10 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
*/
class ErrorAction extends Action
{
+ static $status = array();
+
var $code = null;
var $message = null;
- var $status = null;
var $default = null;
function __construct($message, $code, $output='php://output', $indent=true)
@@ -88,9 +89,10 @@ class ErrorAction extends Action
*
* @return page title
*/
+
function title()
{
- return $this->message;
+ return self::$status[$this->code];
}
function isReadOnly($args)
diff --git a/lib/facebookutil.php b/lib/facebookutil.php
index ad61b6f0a..c29576b64 100644
--- a/lib/facebookutil.php
+++ b/lib/facebookutil.php
@@ -99,8 +99,8 @@ function facebookBroadcastNotice($notice)
// XXX: Does this call count against our per user FB request limit?
// If so we should consider storing verb elsewhere or not storing
- $prefix = $facebook->api_client->data_getUserPreference(FACEBOOK_NOTICE_PREFIX,
- $fbuid);
+ $prefix = trim($facebook->api_client->data_getUserPreference(FACEBOOK_NOTICE_PREFIX,
+ $fbuid));
$status = "$prefix $notice->content";
diff --git a/lib/galleryaction.php b/lib/galleryaction.php
index 18cc7b929..31e36803a 100644
--- a/lib/galleryaction.php
+++ b/lib/galleryaction.php
@@ -132,13 +132,16 @@ class GalleryAction extends OwnerDesignAction
$this->elementEnd('li');
$this->elementStart('li', array('id'=>'filter_tags_item'));
$this->elementStart('form', array('name' => 'bytag',
- 'id' => 'bytag',
+ 'id' => 'form_filter_bytag',
'action' => common_path('?action=' . $this->trimmed('action')),
'method' => 'post'));
+ $this->elementStart('fieldset');
+ $this->element('legend', null, _('Select tag to filter'));
$this->dropdown('tag', _('Tag'), $content,
_('Choose a tag to narrow list'), false, $tag);
$this->hidden('nickname', $this->user->nickname);
$this->submit('submit', _('Go'));
+ $this->elementEnd('fieldset');
$this->elementEnd('form');
$this->elementEnd('li');
$this->elementEnd('ul');
diff --git a/lib/htmloutputter.php b/lib/htmloutputter.php
index 8ad7dc20f..2ff9380cc 100644
--- a/lib/htmloutputter.php
+++ b/lib/htmloutputter.php
@@ -106,14 +106,16 @@ class HTMLOutputter extends XMLOutputter
}
}
- header('Content-Type: '.$type);
+ header('Content-Type: '.$type.'; charset=UTF-8');
$this->extraHeaders();
- if( ! substr($type,0,strlen('text/html'))=='text/html' ){
- // Browsers don't like it when <?xml it output for non-xhtml documents
+ if (preg_match("/.*\/.*xml/", $type)) {
+ // Required for XML documents
$this->xw->startDocument('1.0', 'UTF-8');
}
- $this->xw->writeDTD('html');
+ $this->xw->writeDTD('html',
+ '-//W3C//DTD XHTML 1.0 Strict//EN',
+ 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd');
$language = $this->getLanguage();
@@ -412,4 +414,25 @@ class HTMLOutputter extends XMLOutputter
$this->element('p', 'form_guide', $instructions);
}
}
+
+
+ /**
+ * Internal script to autofocus the given element on page onload.
+ *
+ * @param string $id element ID, must refer to an existing element
+ *
+ * @return void
+ *
+ */
+ function autofocus($id)
+ {
+ $this->elementStart('script', array('type' => 'text/javascript'));
+ $this->raw('/*<![CDATA[*/'.
+ ' $(document).ready(function() {'.
+ ' var el = $("#' . $id . '");'.
+ ' if (el.length) { el.focus(); }'.
+ ' });'.
+ ' /*]]>*/');
+ $this->elementEnd('script');
+ }
}
diff --git a/lib/mail.php b/lib/mail.php
index df585406c..5bf4d7425 100644
--- a/lib/mail.php
+++ b/lib/mail.php
@@ -551,9 +551,9 @@ function mail_notify_fave($other, $user, $notice)
common_init_locale($other->language);
- $subject = sprintf(_('%s added your notice as a favorite'), $bestname);
+ $subject = sprintf(_('%s (@%s) added your notice as a favorite'), $bestname, $user->nickname);
- $body = sprintf(_("%1\$s just added your notice from %2\$s".
+ $body = sprintf(_("%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" .
@@ -570,7 +570,8 @@ function mail_notify_fave($other, $user, $notice)
$notice->content,
common_local_url('showfavorites',
array('nickname' => $user->nickname)),
- common_config('site', 'name'));
+ common_config('site', 'name'),
+ $user->nickname);
common_init_locale();
mail_to_user($other, $subject, $body);
@@ -607,9 +608,9 @@ function mail_notify_attn($user, $notice)
$conversationUrl = null;
}
- $subject = sprintf(_('%s sent a notice to your attention'), $bestname);
+ $subject = sprintf(_('%s (@%s) sent a notice to your attention'), $bestname, $sender->nickname);
- $body = sprintf(_("%1\$s just sent a notice to your attention (an '@-reply') on %2\$s.\n\n".
+ $body = sprintf(_("%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".
@@ -629,10 +630,11 @@ function mail_notify_attn($user, $notice)
$notice->content,//%4
$conversationUrl,//%5
common_local_url('newnotice',
- array('replyto' => $sender->nickname)),//%6
+ array('replyto' => $sender->nickname, 'inreplyto' => $notice->id)),//%6
common_local_url('replies',
array('nickname' => $user->nickname)),//%7
- common_local_url('emailsettings'));//%8
+ common_local_url('emailsettings'), //%8
+ $sender->nickname); //%9
common_init_locale();
mail_to_user($user, $subject, $body);
diff --git a/lib/mailbox.php b/lib/mailbox.php
index a09bf1060..e1d384a06 100644
--- a/lib/mailbox.php
+++ b/lib/mailbox.php
@@ -213,26 +213,20 @@ class MailboxAction extends CurrentUserDesignAction
}
$this->elementStart('div', 'entry-content');
- $this->elementStart('dl', 'timestamp');
- $this->element('dt', null, _('Published'));
- $this->elementStart('dd', null);
- $dt = common_date_iso8601($message->created);
$this->elementStart('a', array('rel' => 'bookmark',
+ 'class' => 'timestamp',
'href' => $messageurl));
+ $dt = common_date_iso8601($message->created);
$this->element('abbr', array('class' => 'published',
'title' => $dt),
common_date_string($message->created));
$this->elementEnd('a');
- $this->elementEnd('dd');
- $this->elementEnd('dl');
if ($message->source) {
- $this->elementStart('dl', 'device');
- $this->elementStart('dt');
- $this->text(_('From'));
- $this->elementEnd('dt');
- $this->showSource($message->source);
- $this->elementEnd('dl');
+ $this->elementStart('span', 'source');
+ $this->text(_('from'));
+ $this->element('span', 'device', $this->showSource($message->source));
+ $this->elementEnd('span');
}
$this->elementEnd('div');
@@ -277,18 +271,18 @@ class MailboxAction extends CurrentUserDesignAction
case 'mail':
case 'omb':
case 'api':
- $this->element('dd', null, $source_name);
+ $this->element('span', 'device', $source_name);
break;
default:
$ns = Notice_source::staticGet($source);
if ($ns) {
- $this->elementStart('dd', null);
+ $this->elementStart('span', 'device');
$this->element('a', array('href' => $ns->url,
- 'rel' => 'external'),
- $ns->name);
- $this->elementEnd('dd');
+ 'rel' => 'external'),
+ $ns->name);
+ $this->elementEnd('span');
} else {
- $this->element('dd', null, $source_name);
+ $this->out->element('span', 'device', $source_name);
}
break;
}
diff --git a/lib/noticeform.php b/lib/noticeform.php
index 1e3a45142..350e37db8 100644
--- a/lib/noticeform.php
+++ b/lib/noticeform.php
@@ -70,6 +70,12 @@ class NoticeForm extends Form
var $user = null;
/**
+ * The notice being replied to
+ */
+
+ var $inreplyto = null;
+
+ /**
* Constructor
*
* @param HTMLOutputter $out output channel
@@ -77,12 +83,13 @@ class NoticeForm extends Form
* @param string $content content to pre-fill
*/
- function __construct($out=null, $action=null, $content=null, $user=null)
+ function __construct($out=null, $action=null, $content=null, $user=null, $inreplyto=null)
{
parent::__construct($out);
$this->action = $action;
$this->content = $content;
+ $this->inreplyto = $inreplyto;
if ($user) {
$this->user = $user;
@@ -161,7 +168,7 @@ class NoticeForm extends Form
if ($this->action) {
$this->out->hidden('notice_return-to', $this->action, 'returnto');
}
- $this->out->hidden('notice_in-reply-to', $this->action, 'inreplyto');
+ $this->out->hidden('notice_in-reply-to', $this->inreplyto, 'inreplyto');
}
/**
diff --git a/lib/noticelist.php b/lib/noticelist.php
index ec85e4a5c..d4cd3ff6e 100644
--- a/lib/noticelist.php
+++ b/lib/noticelist.php
@@ -261,7 +261,7 @@ class NoticeListItem extends Widget
$attrs = array('href' => $this->profile->profileurl,
'class' => 'url');
if (!empty($this->profile->fullname)) {
- $attrs['title'] = $this->profile->fullname . ' (' . $this->profile->nickname . ') ';
+ $attrs['title'] = $this->profile->fullname . ' (' . $this->profile->nickname . ')';
}
$this->out->elementStart('a', $attrs);
$this->showAvatar();
@@ -418,9 +418,17 @@ class NoticeListItem extends Widget
function showContext()
{
- // XXX: also show context if there are replies to this notice
- if (!empty($this->notice->conversation)
- && $this->notice->conversation != $this->notice->id) {
+ $hasConversation = false;
+ if( !empty($this->notice->conversation)
+ && $this->notice->conversation != $this->notice->id){
+ $hasConversation = true;
+ }else{
+ $conversation = Notice::conversationStream($this->notice->id, 1, 1);
+ if($conversation->N > 0){
+ $hasConversation = true;
+ }
+ }
+ if ($hasConversation){
$convurl = common_local_url('conversation',
array('id' => $this->notice->conversation));
$this->out->element('a', array('href' => $convurl.'#notice-'.$this->notice->id,
@@ -442,7 +450,7 @@ class NoticeListItem extends Widget
{
if (common_logged_in()) {
$reply_url = common_local_url('newnotice',
- array('replyto' => $this->profile->nickname));
+ array('replyto' => $this->profile->nickname, 'inreplyto' => $this->notice->id));
$this->out->elementStart('a', array('href' => $reply_url,
'class' => 'notice_reply',
'title' => _('Reply to this notice')));
diff --git a/lib/omb.php b/lib/omb.php
index 0d6244599..7dca760c6 100644
--- a/lib/omb.php
+++ b/lib/omb.php
@@ -135,7 +135,7 @@ function omb_broadcast_remote_subscribers($notice)
$posted = array();
while ($rp->fetch()) {
- if (!$posted[$rp->postnoticeurl]) {
+ if (!array_key_exists($rp->postnoticeurl, $posted)) {
common_log(LOG_DEBUG, 'Posting to ' . $rp->postnoticeurl);
if (omb_post_notice_keys($notice, $rp->postnoticeurl, $rp->token, $rp->secret)) {
common_log(LOG_DEBUG, 'Finished to ' . $rp->postnoticeurl);
diff --git a/lib/router.php b/lib/router.php
index 00e728f55..5529e60ac 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -175,6 +175,10 @@ class Router
$m->connect('notice/new?replyto=:replyto',
array('action' => 'newnotice'),
array('replyto' => '[A-Za-z0-9_-]+'));
+ $m->connect('notice/new?replyto=:replyto&inreplyto=:inreplyto',
+ array('action' => 'newnotice'),
+ array('replyto' => '[A-Za-z0-9_-]+'),
+ array('inreplyto' => '[0-9]+'));
$m->connect('notice/:notice/file',
array('action' => 'file'),
@@ -268,12 +272,12 @@ class Router
$m->connect('api/statuses/:method',
array('action' => 'api',
'apiaction' => 'statuses'),
- array('method' => '(public_timeline|friends_timeline|user_timeline|update|replies|mentions|show|friends|followers|featured)(\.(atom|rss|xml|json))?'));
+ array('method' => '(public_timeline|home_timeline|friends_timeline|user_timeline|update|replies|mentions|show|friends|followers|featured)(\.(atom|rss|xml|json))?'));
$m->connect('api/statuses/:method/:argument',
array('action' => 'api',
'apiaction' => 'statuses'),
- array('method' => '(|user_timeline|friends_timeline|replies|mentions|show|destroy|friends|followers)'));
+ array('method' => '(user_timeline|home_timeline|friends_timeline|replies|mentions|show|destroy|friends|followers)'));
// users
@@ -432,7 +436,7 @@ class Router
$m->connect('api/statuses/:method/:argument',
array('action' => 'api',
'apiaction' => 'statuses'),
- array('method' => '(|user_timeline|friends_timeline|replies|mentions|show|destroy|friends|followers)'));
+ array('method' => '(user_timeline|home_timeline|friends_timeline|replies|mentions|show|destroy|friends|followers)'));
$m->connect('api/statusnet/groups/:method/:argument',
array('action' => 'api',
diff --git a/lib/searchaction.php b/lib/searchaction.php
index 0d9f85a8f..130b28ff5 100644
--- a/lib/searchaction.php
+++ b/lib/searchaction.php
@@ -135,16 +135,21 @@ class SearchAction extends Action
}
function searchSuggestions($q) {
- $qe = urlencode($q);
- $message = sprintf(_(<<<E_O_T
+ $message = _(<<<E_O_T
* Make sure all words are spelled correctly.
* Try different keywords.
* Try more general keywords.
* Try fewer keywords.
+E_O_T
+);
+ if (!common_config('site', 'private')) {
+ $qe = urlencode($q);
+ $message .= sprintf(_(<<<E_O_T
+
You can also try your search on other engines:
-* [Twingly](http://www.twingly.com/search?q=%s&content=microblog&site=identi.ca)
+* [Twingly](http://www.twingly.com/search?q=%s&content=microblog&site=%%%%site.server%%%%)
* [Tweet scan](http://www.tweetscan.com/indexi.php?s=%s)
* [Google](http://www.google.com/search?q=site%%3A%%%%site.server%%%%+%s)
* [Yahoo](http://search.yahoo.com/search?p=site%%3A%%%%site.server%%%%+%s)
@@ -152,6 +157,7 @@ You can also try your search on other engines:
E_O_T
), $qe, $qe, $qe, $qe, $qe);
+ }
$this->elementStart('dl', array('id' => 'help_search', 'class' => 'help'));
$this->element('dt', null, _('Search help'));
$this->elementStart('dd', 'instructions');
diff --git a/lib/servererroraction.php b/lib/servererroraction.php
index c6400605e..0993a63bc 100644
--- a/lib/servererroraction.php
+++ b/lib/servererroraction.php
@@ -55,17 +55,17 @@ require_once INSTALLDIR.'/lib/error.php';
class ServerErrorAction extends ErrorAction
{
+ static $status = array(500 => 'Internal Server Error',
+ 501 => 'Not Implemented',
+ 502 => 'Bad Gateway',
+ 503 => 'Service Unavailable',
+ 504 => 'Gateway Timeout',
+ 505 => 'HTTP Version Not Supported');
+
function __construct($message='Error', $code=500)
{
parent::__construct($message, $code);
- $this->status = array(500 => 'Internal Server Error',
- 501 => 'Not Implemented',
- 502 => 'Bad Gateway',
- 503 => 'Service Unavailable',
- 504 => 'Gateway Timeout',
- 505 => 'HTTP Version Not Supported');
-
$this->default = 500;
// Server errors must be logged.
@@ -93,9 +93,4 @@ class ServerErrorAction extends ErrorAction
$this->showPage();
}
-
- function title()
- {
- return $this->status[$this->code];
- }
}
diff --git a/lib/twitterapi.php b/lib/twitterapi.php
index 638efba24..3bac400e2 100644
--- a/lib/twitterapi.php
+++ b/lib/twitterapi.php
@@ -501,7 +501,7 @@ class TwitterapiAction extends Action
$enclosure = $entry['enclosures'][0];
$this->element('enclosure', array('url'=>$enclosure['url'],'type'=>$enclosure['mimetype'],'length'=>$enclosure['size']), null);
}
-
+
if(array_key_exists('tags', $entry)){
foreach($entry['tags'] as $tag){
$this->element('category', null,$tag);
@@ -939,35 +939,16 @@ class TwitterapiAction extends Action
function clientError($msg, $code = 400, $content_type = 'json')
{
-
- static $status = array(400 => 'Bad Request',
- 401 => 'Unauthorized',
- 402 => 'Payment Required',
- 403 => 'Forbidden',
- 404 => 'Not Found',
- 405 => 'Method Not Allowed',
- 406 => 'Not Acceptable',
- 407 => 'Proxy Authentication Required',
- 408 => 'Request Timeout',
- 409 => 'Conflict',
- 410 => 'Gone',
- 411 => 'Length Required',
- 412 => 'Precondition Failed',
- 413 => 'Request Entity Too Large',
- 414 => 'Request-URI Too Long',
- 415 => 'Unsupported Media Type',
- 416 => 'Requested Range Not Satisfiable',
- 417 => 'Expectation Failed');
-
$action = $this->trimmed('action');
common_debug("User error '$code' on '$action': $msg", __FILE__);
- if (!array_key_exists($code, $status)) {
+ if (!array_key_exists($code, ClientErrorAction::$status)) {
$code = 400;
}
- $status_string = $status[$code];
+ $status_string = ClientErrorAction::$status[$code];
+
header('HTTP/1.1 '.$code.' '.$status_string);
if ($content_type == 'xml') {
@@ -986,6 +967,35 @@ class TwitterapiAction extends Action
}
+ function serverError($msg, $code = 500, $content_type = 'json')
+ {
+ $action = $this->trimmed('action');
+
+ common_debug("Server error '$code' on '$action': $msg", __FILE__);
+
+ if (!array_key_exists($code, ServerErrorAction::$status)) {
+ $code = 400;
+ }
+
+ $status_string = ServerErrorAction::$status[$code];
+
+ header('HTTP/1.1 '.$code.' '.$status_string);
+
+ if ($content_type == 'xml') {
+ $this->init_document('xml');
+ $this->elementStart('hash');
+ $this->element('error', null, $msg);
+ $this->element('request', null, $_SERVER['REQUEST_URI']);
+ $this->elementEnd('hash');
+ $this->end_document('xml');
+ } else {
+ $this->init_document('json');
+ $error_array = array('error' => $msg, 'request' => $_SERVER['REQUEST_URI']);
+ print(json_encode($error_array));
+ $this->end_document('json');
+ }
+ }
+
function init_twitter_rss()
{
$this->startXML();
diff --git a/lib/util.php b/lib/util.php
index 87d5800f6..047faeef0 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -59,7 +59,7 @@ function common_init_language()
textdomain("statusnet");
setlocale(LC_CTYPE, 'C');
if(!$locale_set) {
- common_log(LOG_INFO,'Language requested:'.$language.' - locale could not be set:',__FILE__);
+ common_log(LOG_INFO, 'Language requested:' . $language . ' - locale could not be set. Perhaps that system locale is not installed.', __FILE__);
}
}
@@ -391,7 +391,7 @@ function common_render_content($text, $notice)
{
$r = common_render_text($text);
$id = $notice->profile_id;
- $r = preg_replace('/(^|\s+)@([A-Za-z0-9]{1,64})/e', "'\\1@'.common_at_link($id, '\\2')", $r);
+ $r = preg_replace('/(^|\s+)@(['.NICKNAME_FMT.']{1,64})/e', "'\\1@'.common_at_link($id, '\\2')", $r);
$r = preg_replace('/^T ([A-Z0-9]{1,64}) /e', "'T '.common_at_link($id, '\\1').' '", $r);
$r = preg_replace('/(^|\s+)@#([A-Za-z0-9]{1,64})/e', "'\\1@#'.common_at_hash_link($id, '\\2')", $r);
$r = preg_replace('/(^|\s)!([A-Za-z0-9]{1,64})/e', "'\\1!'.common_group_link($id, '\\2')", $r);
@@ -421,7 +421,7 @@ function common_replace_urls_callback($text, $callback, $notice_id = null) {
'|'.
'(?:(?:mailto|aim|tel|xmpp):)'.
')'.
- '(?:[\pN\pL\-\_\+]+(?::[\pN\pL\-\_\+]+)?\@)?'. //user:pass@
+ '(?:[\pN\pL\-\_\+\%\~]+(?::[\pN\pL\-\_\+\%\~]+)?\@)?'. //user:pass@
'(?:'.
'(?:'.
'\[[\pN\pL\-\_\:\.]+(?<![\.\:])\]'. //[dns]
@@ -432,9 +432,9 @@ function common_replace_urls_callback($text, $callback, $notice_id = null) {
')'.
'|(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)'. //IPv4
'|(?:'. //IPv6
- '\[?(?:(?:(?:[0-9A-Fa-f]{1,4}:){7}(?:(?:[0-9A-Fa-f]{1,4})|:))|(?:(?:[0-9A-Fa-f]{1,4}:){6}(?::|(?:(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})(?:\.(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})|(?::[0-9A-Fa-f]{1,4})))|(?:(?:[0-9A-Fa-f]{1,4}:){5}(?:(?::(?:(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})(?:\.(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})?)|(?:(?::[0-9A-Fa-f]{1,4}){1,2})))|(?:(?:[0-9A-Fa-f]{1,4}:){4}(?::[0-9A-Fa-f]{1,4}){0,1}(?:(?::(?:(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})(?:\.(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})?)|(?:(?::[0-9A-Fa-f]{1,4}){1,2})))|(?:(?:[0-9A-Fa-f]{1,4}:){3}(?::[0-9A-Fa-f]{1,4}){0,2}(?:(?::(?:(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})(?:\.(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})?)|(?:(?::[0-9A-Fa-f]{1,4}){1,2})))|(?:(?:[0-9A-Fa-f]{1,4}:){2}(?::[0-9A-Fa-f]{1,4}){0,3}(?:(?::(?:(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})(?:\.(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})?)|(?:(?::[0-9A-Fa-f]{1,4}){1,2})))|(?:(?:[0-9A-Fa-f]{1,4}:)(?::[0-9A-Fa-f]{1,4}){0,4}(?:(?::(?:(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})(?:\.(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})?)|(?:(?::[0-9A-Fa-f]{1,4}){1,2})))|(?::(?::[0-9A-Fa-f]{1,4}){0,5}(?:(?::(?:(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})(?:\.(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})?)|(?:(?::[0-9A-Fa-f]{1,4}){1,2})))|(?:(?:(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})(?:\.(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})))\]?'.
+ '\[?(?:(?:(?:[0-9A-Fa-f]{1,4}:){7}(?:(?:[0-9A-Fa-f]{1,4})|:))|(?:(?:[0-9A-Fa-f]{1,4}:){6}(?::|(?:(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})(?:\.(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})|(?::[0-9A-Fa-f]{1,4})))|(?:(?:[0-9A-Fa-f]{1,4}:){5}(?:(?::(?:(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})(?:\.(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})?)|(?:(?::[0-9A-Fa-f]{1,4}){1,2})))|(?:(?:[0-9A-Fa-f]{1,4}:){4}(?::[0-9A-Fa-f]{1,4}){0,1}(?:(?::(?:(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})(?:\.(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})?)|(?:(?::[0-9A-Fa-f]{1,4}){1,2})))|(?:(?:[0-9A-Fa-f]{1,4}:){3}(?::[0-9A-Fa-f]{1,4}){0,2}(?:(?::(?:(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})(?:\.(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})?)|(?:(?::[0-9A-Fa-f]{1,4}){1,2})))|(?:(?:[0-9A-Fa-f]{1,4}:){2}(?::[0-9A-Fa-f]{1,4}){0,3}(?:(?::(?:(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})(?:\.(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})?)|(?:(?::[0-9A-Fa-f]{1,4}){1,2})))|(?:(?:[0-9A-Fa-f]{1,4}:)(?::[0-9A-Fa-f]{1,4}){0,4}(?:(?::(?:(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})(?:\.(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})?)|(?:(?::[0-9A-Fa-f]{1,4}){1,2})))|(?::(?::[0-9A-Fa-f]{1,4}){0,5}(?:(?::(?:(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})(?:\.(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})?)|(?:(?::[0-9A-Fa-f]{1,4}){1,2})))|(?:(?:(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})(?:\.(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})))\]?(?<!:)'.
')|(?:'. //DNS
- '(?:[\pN\pL\-\_\+]+(?:\:[\pN\pL\-\_\+]+)?\@)?'. //user:pass@
+ '(?:[\pN\pL\-\_\+\%\~]+(?:\:[\pN\pL\-\_\+\%\~]+)?\@)?'. //user:pass@
'[\pN\pL\-\_]+(?:\.[\pN\pL\-\_]+)*\.'.
//tld list from http://data.iana.org/TLD/tlds-alpha-by-domain.txt, also added local, loc, and onion
'(?:AC|AD|AE|AERO|AF|AG|AI|AL|AM|AN|AO|AQ|AR|ARPA|AS|ASIA|AT|AU|AW|AX|AZ|BA|BB|BD|BE|BF|BG|BH|BI|BIZ|BJ|BM|BN|BO|BR|BS|BT|BV|BW|BY|BZ|CA|CAT|CC|CD|CF|CG|CH|CI|CK|CL|CM|CN|CO|COM|COOP|CR|CU|CV|CX|CY|CZ|DE|DJ|DK|DM|DO|DZ|EC|EDU|EE|EG|ER|ES|ET|EU|FI|FJ|FK|FM|FO|FR|GA|GB|GD|GE|GF|GG|GH|GI|GL|GM|GN|GOV|GP|GQ|GR|GS|GT|GU|GW|GY|HK|HM|HN|HR|HT|HU|ID|IE|IL|IM|IN|INFO|INT|IO|IQ|IR|IS|IT|JE|JM|JO|JOBS|JP|KE|KG|KH|KI|KM|KN|KP|KR|KW|KY|KZ|LA|LB|LC|LI|LK|LR|LS|LT|LU|LV|LY|MA|MC|MD|ME|MG|MH|MIL|MK|ML|MM|MN|MO|MOBI|MP|MQ|MR|MS|MT|MU|MUSEUM|MV|MW|MX|MY|MZ|NA|NAME|NC|NE|NET|NF|NG|NI|NL|NO|NP|NR|NU|NZ|OM|ORG|PA|PE|PF|PG|PH|PK|PL|PM|PN|PR|PRO|PS|PT|PW|PY|QA|RE|RO|RS|RU|RW|SA|SB|SC|SD|SE|SG|SH|SI|SJ|SK|SL|SM|SN|SO|SR|ST|SU|SV|SY|SZ|TC|TD|TEL|TF|TG|TH|TJ|TK|TL|TM|TN|TO|TP|TR|TRAVEL|TT|TV|TW|TZ|UA|UG|UK|US|UY|UZ|VA|VC|VE|VG|VI|VN|VU|WF|WS|XN--0ZWM56D|测试|XN--11B5BS3A9AJ6G|परीकà¥à¤·à¤¾|XN--80AKHBYKNJ4F|иÑпытание|XN--9T4B11YI5A|테스트|XN--DEBA0AD|טעסט|XN--G6W251D|測試|XN--HGBK6AJ7F53BBA|آزمایشی|XN--HLCJ6AYA9ESC7A|பரிடà¯à®šà¯ˆ|XN--JXALPDLP|δοκιμή|XN--KGBECHTV|إختبار|XN--ZCKZAH|テスト|YE|YT|YU|ZA|ZM|ZW|local|loc|onion)'.
@@ -442,13 +442,13 @@ function common_replace_urls_callback($text, $callback, $notice_id = null) {
')'.
'(?:'.
'(?:\:\d+)?'. //:port
- '(?:/[\pN\pL$\[\]\,\!\(\)\.\-\_\+\/\=\&\;]*)?'. // /path
- '(?:\?[\pN\pL\$\[\]\,\!\(\)\.\-\_\+\/\=\&\;\/]*)?'. // ?query string
- '(?:\#[\pN\pL$\[\]\,\!\(\)\.\-\_\+\/\=\&\;\/\?\#]*)?'. // #fragment
+ '(?:/[\pN\pL$\[\]\,\!\(\)\.\:\-\_\+\/\=\&\;\%\~\*\$\+\'\"@]*)?'. // /path
+ '(?:\?[\pN\pL\$\[\]\,\!\(\)\.\:\-\_\+\/\=\&\;\%\~\*\$\+\'\"@\/]*)?'. // ?query string
+ '(?:\#[\pN\pL$\[\]\,\!\(\)\.\:\-\_\+\/\=\&\;\%\~\*\$\+\'\"\@/\?\#]*)?'. // #fragment
')(?<![\?\.\,\#\,])'.
')'.
'#ixu';
- preg_match_all($regex,$text,$matches);
+ //preg_match_all($regex,$text,$matches);
//print_r($matches);
return preg_replace_callback($regex, curry('callback_helper',$callback,$notice_id) ,$text);
}
@@ -495,7 +495,7 @@ function callback_helper($matches, $callback, $notice_id) {
if(empty($notice_id)){
$result = call_user_func_array($callback,$url);
}else{
- $result = call_user_func_array($callback, array($url,$notice_id) );
+ $result = call_user_func_array($callback, array(array($url,$notice_id)) );
}
return substr($matches[0],0,$left) . $result . substr($matches[0],$right);
}
@@ -552,12 +552,13 @@ function common_linkify($url) {
}
if (!empty($f)) {
- if (isset($f->filename)) {
+ if ($f->isEnclosure()) {
$is_attachment = true;
$attachment_id = $f->id;
- } else { // if it has OEmbed info, it's an attachment, too
+ } else {
$foe = File_oembed::staticGet('file_id', $f->id);
if (!empty($foe)) {
+ // if it has OEmbed info, it's an attachment, too
$is_attachment = true;
$attachment_id = $f->id;
@@ -980,7 +981,7 @@ function common_set_returnto($url)
function common_get_returnto()
{
common_ensure_session();
- return $_SESSION['returnto'];
+ return (array_key_exists('returnto', $_SESSION)) ? $_SESSION['returnto'] : null;
}
function common_timestamp()
@@ -1147,7 +1148,7 @@ function common_negotiate_type($cprefs, $sprefs)
}
if ('text/html' === $besttype) {
- return "text/html; charset=utf-8";
+ return "text/html";
}
return $besttype;
}
diff --git a/locale/el_GR/LC_MESSAGES/statusnet.mo b/locale/el_GR/LC_MESSAGES/statusnet.mo
index 071ea3bc5..184639963 100644
--- a/locale/el_GR/LC_MESSAGES/statusnet.mo
+++ b/locale/el_GR/LC_MESSAGES/statusnet.mo
Binary files differ
diff --git a/locale/el_GR/LC_MESSAGES/statusnet.po b/locale/el_GR/LC_MESSAGES/statusnet.po
index 314dd358c..4a54996a8 100644
--- a/locale/el_GR/LC_MESSAGES/statusnet.po
+++ b/locale/el_GR/LC_MESSAGES/statusnet.po
@@ -3,24 +3,24 @@
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
-#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-01-25 16:24+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2009-09-08 20:21+0000\n"
+"Last-Translator: Giannis Pappas <papasj@mailinator.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Pootle 1.1.0\n"
#: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
#: actions/noticesearchrss.php:88
#, php-format
msgid " Search Stream for \"%s\""
-msgstr ""
+msgstr "Αναζήτηση Ïοής για \"%s\""
#: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
#: actions/finishopenidlogin.php:88 actions/register.php:205
@@ -28,11 +28,13 @@ msgstr ""
msgid ""
" except this private data: password, email address, IM address, phone number."
msgstr ""
+"εκτός από τα εξής Ï€Ïοσωπικά δεδομένα: κωδικός Ï€Ïόσβασης, διεÏθυνση email, "
+"διεÏθυνση IM, τηλεφωνικό νοÏμεÏο."
#: ../actions/showstream.php:400 ../lib/stream.php:109
#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
msgid " from "
-msgstr ""
+msgstr "από"
#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
#: actions/twitapistatuses.php:347
@@ -108,7 +110,7 @@ msgstr ""
#: actions/invite.php:99 actions/invite.php:123 actions/invite.php:131
#, php-format
msgid "%s (%s)"
-msgstr ""
+msgstr "%s (%s)"
#: ../actions/publicrss.php:62 actions/publicrss.php:48
#: actions/publicrss.php:90
@@ -134,13 +136,14 @@ msgstr ""
#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411
#, php-format
msgid "%s status"
-msgstr ""
+msgstr "Κατάσταση του/της %s"
#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
#: actions/twitapistatuses.php:199
#, php-format
+#, fuzzy
msgid "%s timeline"
-msgstr ""
+msgstr "ΧÏονοδιάγÏαμμα του χÏήστη %s"
#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
#: actions/twitapistatuses.php:36
@@ -153,18 +156,25 @@ msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
msgstr ""
+"(ΣÏντομα θα λάβετε μέσω ηλεκτÏÎ¿Î½Î¹ÎºÎ¿Ï Ï„Î±Ï‡Ï…Î´Ïομείου ένα μήνυμα με οδηγίες για "
+"την επιβεβαίωση της ηλεκτÏονικής σας διεÏθυνσης.)"
#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605
#, php-format
+#, fuzzy
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
"broughtby%%](%%site.broughtbyurl%%). "
msgstr ""
+"To **%%site.name%%** είναι μία υπηÏεσία microblogging (μικÏο-ιστολογίου) που "
+"έφεÏε κοντά σας το [%%site.broughtby%%](%%site.broughtbyurl%%). "
#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607
#, php-format
+#, fuzzy
msgid "**%%site.name%%** is a microblogging service. "
msgstr ""
+"Το **%%site.name%%** είναι μία υπηÏεσία microblogging (μικÏο-ιστολογίου). "
#: ../lib/util.php:274 lib/util.php:290
msgid ". Contributors should be attributed by full name or nickname."
@@ -175,11 +185,11 @@ msgstr ""
#: actions/finishopenidlogin.php:101 actions/profilesettings.php:100
#: lib/groupeditform.php:139
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr ""
+msgstr "1-64 μικÏά γÏάμματα ή αÏιθμοί, χωÏίς σημεία στίξης ή κενά"
#: ../actions/register.php:152 actions/register.php:166
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
+msgstr "1-64 μικÏά γÏάμματα ή αÏιθμοί, χωÏίς σημεία στίξης ή κενά. ΑπαÏαίτητο."
#: ../actions/password.php:42 actions/profilesettings.php:181
#: actions/passwordsettings.php:102
@@ -194,7 +204,7 @@ msgstr "6 ή πεÏισσότεÏοι χαÏακτήÏες και μην το ξ
#: ../actions/register.php:154 actions/register.php:168
#: actions/register.php:373
msgid "6 or more characters. Required."
-msgstr ""
+msgstr "6 ή πεÏισσότεÏοι χαÏακτήÏες. ΑπαÏαίτητο."
#: ../actions/imsettings.php:197 actions/imsettings.php:205
#, php-format
@@ -202,18 +212,26 @@ msgid ""
"A confirmation code was sent to the IM address you added. You must approve %"
"s for sending messages to you."
msgstr ""
+"Έχει αποσταλεί ένας κωδικός επιβεβαίωσης στην διεÏθυνση IM που Ï€Ïοσθέσατε. "
+"ΠÏέπει να αποδεχτείτε τον/την %s για αποστολή μηνυμάτων Ï€Ïος εσας. "
#: ../actions/emailsettings.php:213 actions/emailsettings.php:231
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 ""
+"Έχει αποσταλεί ένας κωδικός επιβεβαίωσης στην διεÏθυνση email που "
+"Ï€Ïοσθέσατε. Ελέγξτε τα εισεÏχόμενα (και τον φάκελο ανεπιθÏμητης "
+"αλληλογÏαφίας) για τον κωδικό και για το πως να τον χÏησιμοποιήσετε."
#: ../actions/smssettings.php:216 actions/smssettings.php:224
msgid ""
"A confirmation code was sent to the phone number you added. Check your inbox "
"(and spam box!) for the code and instructions on how to use it."
msgstr ""
+"Έχει αποσταλεί ένας κωδικός επιβεβαίωσης στο τηλεφωνικό νοÏμεÏο που "
+"Ï€Ïοσθέσατε. Ελέγξτε τα εισεÏχόμενα (και τον φάκελο ανεπιθÏμητης "
+"αλληλογÏαφίας) για τον κωδικό και για το πως να τον χÏησιμοποιήσετε."
#: ../actions/twitapiaccount.php:49 ../actions/twitapihelp.php:45
#: ../actions/twitapistatuses.php:88 ../actions/twitapistatuses.php:259
@@ -235,7 +253,7 @@ msgstr ""
#: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429
#: actions/twitapiusers.php:32
msgid "API method not found!"
-msgstr ""
+msgstr "Η μέθοδος του ΑΡΙ δε βÏέθηκε!"
#: ../actions/twitapiaccount.php:57 ../actions/twitapiaccount.php:113
#: ../actions/twitapiaccount.php:119 ../actions/twitapiblocks.php:28
@@ -258,7 +276,7 @@ msgstr ""
#: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37
#: actions/twitapistatuses.php:562
msgid "API method under construction."
-msgstr ""
+msgstr "Η μέθοδος του ΑΡΙ είναι υπό κατασκευή."
#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568
msgid "About"
@@ -287,7 +305,7 @@ msgstr "ΠÏοσθήκη OpenID"
#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
#: lib/accountsettingsaction.php:117
msgid "Add or remove OpenIDs"
-msgstr ""
+msgstr "ΠÏοσθήκη ή διαγÏαφή OpenIDs"
#: ../actions/emailsettings.php:38 ../actions/imsettings.php:39
#: ../actions/smssettings.php:39 actions/emailsettings.php:39
@@ -299,24 +317,24 @@ msgstr "ΔιεÏθυνση"
#: ../actions/invite.php:131 actions/invite.php:139 actions/invite.php:176
msgid "Addresses of friends to invite (one per line)"
-msgstr ""
+msgstr "ΔιευθÏνσεις φίλων σου που θες να Ï€Ïοσκαλέσεις (μία ανά γÏαμμή)"
#: ../actions/showstream.php:273 actions/showstream.php:288
#: actions/showstream.php:422
msgid "All subscriptions"
-msgstr ""
+msgstr "Όλες οι συνδÏομές"
#: ../actions/publicrss.php:64 actions/publicrss.php:50
#: actions/publicrss.php:92
#, php-format
msgid "All updates for %s"
-msgstr ""
+msgstr "Όλες οι ενημεÏώσεις για %s"
#: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
#: actions/noticesearchrss.php:90
#, php-format
msgid "All updates matching search term \"%s\""
-msgstr ""
+msgstr "Όλες οι ενημεÏώσεις που ταιÏιάζουν με τον ÏŒÏο αναζήτησης \"%s\""
#: ../actions/finishopenidlogin.php:29 ../actions/login.php:31
#: ../actions/openidlogin.php:29 ../actions/register.php:30
@@ -325,31 +343,34 @@ msgstr ""
#: actions/finishopenidlogin.php:34 actions/login.php:77
#: actions/openidlogin.php:30 actions/register.php:92
msgid "Already logged in."
-msgstr ""
+msgstr "Ήδη συνδεδεμένος."
#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49
msgid "Already subscribed!."
-msgstr ""
+msgstr "Είσαι ήδη συνδÏομητής!."
#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
#: actions/deletenotice.php:113
msgid "Are you sure you want to delete this notice?"
-msgstr ""
+msgstr "Είσαι σίγουÏος ότι θες να διαγÏάψεις αυτό το μήνυμα;"
#: ../actions/userauthorization.php:77 actions/userauthorization.php:83
#: actions/userauthorization.php:81
msgid "Authorize subscription"
-msgstr ""
+msgstr "Εξουσιοδοτημένη συνδÏομή"
#: ../actions/login.php:104 ../actions/register.php:178
#: actions/register.php:192
msgid "Automatically login in the future; not for shared computers!"
-msgstr ""
+msgstr "Αυτόματη σÏνδεση στο μέλλον. ΟΧΙ για κοινόχÏηστους υπολογιστές!"
#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
+#, fuzzy
msgid ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
msgstr ""
+"Αυτόματα γίνε συνδÏομητής σε όσους γίνονται συνδÏομητές σε μένα (χÏήση "
+"κυÏίως από λογισμικό και όχι ανθÏώπους)"
#: ../actions/avatar.php:32 ../lib/settingsaction.php:90
#: actions/profilesettings.php:34 actions/avatarsettings.php:65
@@ -364,25 +385,33 @@ msgstr ""
#: ../actions/imsettings.php:55 actions/imsettings.php:56
#, php-format
+#, fuzzy
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 στη "
+"λίστα φίλων?)"
#: ../actions/emailsettings.php:54 actions/emailsettings.php:55
+#, fuzzy
msgid ""
"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
"a message with further instructions."
msgstr ""
+"Αναμένωντας επιβεβαίωση σε αυτή τη διεÏθυνση. Έλεγξε το mail σου (και το "
+"φάκελο spam!) για μήνυμα με πεÏαιτέÏω οδηγίες. "
#: ../actions/smssettings.php:58 actions/smssettings.php:58
#: actions/smssettings.php:111
msgid "Awaiting confirmation on this phone number."
-msgstr ""
+msgstr "Αναμένωντας επιβεβαίωση σ' αυτό το νοÏμεÏο τηλεφώνου."
#: ../lib/util.php:1318 lib/util.php:1452
+#, fuzzy
msgid "Before »"
-msgstr ""
+msgstr "ΠÏοηγοÏμενο »"
#: ../actions/profilesettings.php:49 ../actions/register.php:170
#: actions/profilesettings.php:82 actions/register.php:184
@@ -399,8 +428,9 @@ msgid "Bio is too long (max 140 chars)."
msgstr "Το βιογÏαφικό είναι Ï€Î¿Î»Ï Î¼ÎµÎ³Î¬Î»Î¿ (μέγιστο 140 χαÏακτ.)."
#: ../lib/deleteaction.php:41 lib/deleteaction.php:41 lib/deleteaction.php:69
+#, fuzzy
msgid "Can't delete this notice."
-msgstr ""
+msgstr "Αδυναμία διαγÏαφής Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… μηνÏματος."
#: ../actions/updateprofile.php:119 actions/updateprofile.php:120
#: actions/updateprofile.php:123
@@ -424,17 +454,17 @@ msgstr "ΑκÏÏωση"
#: ../lib/openid.php:121 lib/openid.php:121 lib/openid.php:130
msgid "Cannot instantiate OpenID consumer object."
-msgstr ""
+msgstr "Απέτυχη η χÏήση αντικειμένου OpenID consumer."
#: ../actions/imsettings.php:163 actions/imsettings.php:171
#: actions/imsettings.php:286
msgid "Cannot normalize that Jabber ID"
-msgstr ""
+msgstr "Αδυναμία κανονικοποίησης του Jabber ID"
#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
#: actions/emailsettings.php:311
msgid "Cannot normalize that email address"
-msgstr ""
+msgstr "Αδυναμία κανονικοποίησης αυτής της email διεÏθυνσης"
#: ../actions/password.php:45 actions/profilesettings.php:184
#: actions/passwordsettings.php:110
@@ -453,12 +483,12 @@ msgstr "Αλλαγή κωδικοÏ"
#: ../lib/settingsaction.php:94 lib/accountsettingsaction.php:111
msgid "Change your password"
-msgstr ""
+msgstr "Αλλάξτε τον κωδικό σας"
#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
#: lib/accountsettingsaction.php:105
msgid "Change your profile settings"
-msgstr ""
+msgstr "Αλλάξτε τις Ïυθμίσεις του Ï€Ïοφίλ σας"
#: ../actions/password.php:43 ../actions/recoverpassword.php:181
#: ../actions/register.php:155 ../actions/smssettings.php:65
@@ -494,6 +524,7 @@ msgstr "Ο κωδικός επιβεβαίωσης δεν βÏέθηκε."
#: ../actions/register.php:202
#, php-format
+#, fuzzy
msgid ""
"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
"want to...\n"
@@ -510,6 +541,22 @@ msgid ""
"\n"
"Thanks for signing up and we hope you enjoy using this service."
msgstr ""
+"ΣυγχαÏητήÏια, %s! και καλωσήÏθες στο %%%%site.name%%%%. Από εδώ μποÏείς "
+"να...\n"
+"\n"
+"* Πας στο [your profile](%s) και να στείλεις το Ï€Ïώτο σου μήνυμα.\n"
+"* ΠÏοσθέσεις ένα [Jabber/GTalk address](%%%%action.imsettings%%%%) ώστε να "
+"δέχεσε μηνÏματα στο instant messager σου.\n"
+"* [Search for people](%%%%action.peoplesearch%%%%) που μποÏεί να ξέÏεις ή "
+"που έχουν τα ίδια ενδιαφέÏοντα με σένα. \n"
+"* ΕνημεÏώσεις το Ï€Ïοφίλ σου [profile "
+"settings](%%%%action.profilesettings%%%%) για να μάθουν οι άλλοι πεÏισσότεÏα "
+"για σένα. \n"
+"* Διαβάσεις τα [online docs](%%%%doc.help%%%%) για λειτουÏγίες που μποÏεί να "
+"μην έχεις μάθει ακόμα. \n"
+"\n"
+"ΕυχαÏιστοÏμε που εγγÏάφηκες και ευχόμαστε να πεÏάσεις καλά με την υπηÏεσία "
+"μας."
#: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
#: actions/finishopenidlogin.php:119 lib/action.php:330
@@ -528,29 +575,29 @@ msgstr "Επικοινωνία"
#: ../lib/openid.php:178 lib/openid.php:178 lib/openid.php:187
#, php-format
msgid "Could not create OpenID form: %s"
-msgstr ""
+msgstr "Αδυναμία δημιουÏγίας φόÏμας OpenID: %s "
#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
#: actions/twitapifriendships.php:48 actions/twitapifriendships.php:64
#, php-format
msgid "Could not follow user: %s is already on your list."
-msgstr ""
+msgstr "Δε μποÏÏŽ να ακολουθήσω το χÏήστη: ο χÏήστης %s είναι ήδη στη λίστα σου."
#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
#: actions/twitapifriendships.php:41
msgid "Could not follow user: User not found."
-msgstr ""
+msgstr "Δε μποÏÏŽ να ακολουθήσω το χÏήστη: ο χÏήστης δε βÏέθηκε."
#: ../lib/openid.php:160 lib/openid.php:160 lib/openid.php:169
#, php-format
msgid "Could not redirect to server: %s"
-msgstr ""
+msgstr "Αδυναμία ανακατεÏθηνσης στο διακομιστή: %s"
#: ../actions/updateprofile.php:162 actions/updateprofile.php:163
#: actions/updateprofile.php:166
msgid "Could not save avatar info"
-msgstr ""
+msgstr "Δε μπόÏεσα να σώσω την πληÏοφοÏία του avatar"
#: ../actions/updateprofile.php:155 actions/updateprofile.php:156
#: actions/updateprofile.php:159
@@ -559,21 +606,21 @@ msgstr "ΑδÏνατη η αποθήκευση των νέων πληÏοφοÏÎ
#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72
msgid "Could not subscribe other to you."
-msgstr ""
+msgstr "Δεν επιτÏέπεται να κάνεις συνδÏομητές του λογαÏÎ¹Î±ÏƒÎ¼Î¿Ï ÏƒÎ¿Ï… άλλους."
#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57
msgid "Could not subscribe."
-msgstr ""
+msgstr "Απέτυχε η συνδÏομή."
#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
#: actions/recoverpassword.php:111
msgid "Could not update user with confirmed email address."
-msgstr ""
+msgstr "Απέτυχε η ενημέÏωση χÏήστη μέσω επιβεβαιωμένης email διεÏθυνσης."
#: ../actions/finishremotesubscribe.php:99
#: actions/finishremotesubscribe.php:101 actions/finishremotesubscribe.php:114
msgid "Couldn't convert request tokens to access tokens."
-msgstr ""
+msgstr "Απέτυχε η μετατÏοπή αιτοÏμενων tokens σε tokens Ï€Ïόσβασης."
#: ../actions/confirmaddress.php:84 ../actions/emailsettings.php:234
#: ../actions/imsettings.php:218 ../actions/smssettings.php:241
@@ -582,16 +629,16 @@ msgstr ""
#: actions/confirmaddress.php:126 actions/emailsettings.php:375
#: actions/imsettings.php:357 actions/smssettings.php:370
msgid "Couldn't delete email confirmation."
-msgstr ""
+msgstr "Απέτυχε η διαγÏαφή email επιβεβαίωσης."
#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134
msgid "Couldn't delete subscription."
-msgstr ""
+msgstr "Απέτυχε η διαγÏαφή συνδÏομής."
#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
#: actions/twitapistatuses.php:84
msgid "Couldn't find any statuses."
-msgstr ""
+msgstr "Απέτυχε η εÏÏεση οποιασδήποτε κατάστασης."
#: ../actions/remotesubscribe.php:127 actions/remotesubscribe.php:136
#: actions/remotesubscribe.php:178
@@ -604,29 +651,29 @@ msgstr ""
#: actions/emailsettings.php:337 actions/imsettings.php:311
#: actions/smssettings.php:325
msgid "Couldn't insert confirmation code."
-msgstr ""
+msgstr "Απέτυχε η εισαγωγή ÎºÏ‰Î´Î¹ÎºÎ¿Ï ÎµÏ€Î¹Î²ÎµÎ²Î±Î¯Ï‰ÏƒÎ·Ï‚."
#: ../actions/finishremotesubscribe.php:180
#: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:218
msgid "Couldn't insert new subscription."
-msgstr ""
+msgstr "Απέτυχε η εισαγωγή νέας συνδÏομής."
#: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
#: actions/profilesettings.php:299 actions/twitapiaccount.php:94
#: actions/profilesettings.php:302 actions/twitapiaccount.php:81
msgid "Couldn't save profile."
-msgstr "ΑδÏνατη η αποθήκευση του Ï€Ïοφίλ."
+msgstr "Απέτυχε η αποθήκευση του Ï€Ïοφίλ."
#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
#: actions/profilesettings.php:279
msgid "Couldn't update user for autosubscribe."
-msgstr ""
+msgstr "Απέτυχε η ενημέÏωση του χÏήστη για την αυτόματη συνδÏομή."
#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
#: actions/emailsettings.php:298 actions/emailsettings.php:312
#: actions/emailsettings.php:440 actions/emailsettings.php:462
msgid "Couldn't update user record."
-msgstr ""
+msgstr "Απέτυχε η ενημέÏωση εγγÏαφής του χÏήστη."
#: ../actions/confirmaddress.php:72 ../actions/emailsettings.php:156
#: ../actions/emailsettings.php:259 ../actions/imsettings.php:138
@@ -642,7 +689,7 @@ msgstr ""
#: actions/profilesettings.php:259 actions/smssettings.php:266
#: actions/smssettings.php:408
msgid "Couldn't update user."
-msgstr ""
+msgstr "Απέτυχε η ενημέÏωση του χÏήστη."
#: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
#: actions/finishopenidlogin.php:112
@@ -661,23 +708,24 @@ msgstr "ΔημιουÏγία νέου λογαÏιασμοÏ"
#: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
#: actions/finishopenidlogin.php:231
+#, fuzzy
msgid "Creating new account for OpenID that already has a user."
-msgstr ""
+msgstr "ΜετατÏοπή υπάÏχοντος λογαÏÎ¹Î±ÏƒÎ¼Î¿Ï ÏƒÎµ λογαÏιασμό OpenID."
#: ../actions/imsettings.php:45 actions/imsettings.php:46
#: actions/imsettings.php:100
msgid "Current confirmed Jabber/GTalk address."
-msgstr ""
+msgstr "ΤÏέχουσα επιβεβαιωμένη Jabber/GTalk διεÏθυνση."
#: ../actions/smssettings.php:46 actions/smssettings.php:46
#: actions/smssettings.php:100
msgid "Current confirmed SMS-enabled phone number."
-msgstr ""
+msgstr "ΤÏέχων επιβεβαιωμένο, μέσω SMS, νοÏμεÏο ÎºÎ¹Î½Î·Ï„Î¿Ï Ï„Î·Î»ÎµÏ†ÏŽÎ½Î¿Ï…."
#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
#: actions/emailsettings.php:99
msgid "Current confirmed email address."
-msgstr ""
+msgstr "ΤÏέχουσα επιβεβαιωμένη email διεÏθυνση."
#: ../actions/showstream.php:356 actions/showstream.php:367
msgid "Currently"
@@ -686,40 +734,40 @@ msgstr ""
#: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:91
#, php-format
msgid "DB error inserting hashtag: %s"
-msgstr ""
+msgstr "Σφάλμα στη βάση δεδομένων κατά την εισαγωγή hashtag: %s"
#: ../lib/util.php:1061 lib/util.php:1110 classes/Notice.php:698
#, php-format
msgid "DB error inserting reply: %s"
-msgstr ""
+msgstr "Σφάλμα βάσης δεδομένων κατά την εισαγωγή απάντησης: %s"
#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
#: actions/deletenotice.php:79
msgid "Delete notice"
-msgstr ""
+msgstr "ΔιαγÏαφή μηνÏματος"
#: ../actions/profilesettings.php:51 ../actions/register.php:172
#: actions/profilesettings.php:84 actions/register.php:186
#: actions/profilesettings.php:114
msgid "Describe yourself and your interests in 140 chars"
-msgstr ""
+msgstr "ΠεÏιέγÏαψε τον εαυτό σου και τα ενδιαφέÏοντά σου σε 140 χαÏακτήÏες"
#: ../actions/register.php:158 ../actions/register.php:161
#: ../lib/settingsaction.php:87 actions/register.php:172
#: actions/register.php:175 lib/settingsaction.php:87 actions/register.php:381
#: actions/register.php:385 lib/accountsettingsaction.php:113
msgid "Email"
-msgstr ""
+msgstr "Email"
#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
#: actions/emailsettings.php:115
msgid "Email Address"
-msgstr ""
+msgstr "ΔιεÏθυνση Email"
#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
#: actions/emailsettings.php:60
msgid "Email Settings"
-msgstr ""
+msgstr "Ρυθμίσεις Email"
#: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
msgid "Email address already exists."
@@ -732,11 +780,11 @@ msgstr "Επιβεβαίωση διεÏθυνσης email"
#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
#: actions/emailsettings.php:117
msgid "Email address, like \"UserName@example.org\""
-msgstr ""
+msgstr "ΔιεÏθυνση email, Ï€.χ: \"UserName@example.org\""
#: ../actions/invite.php:129 actions/invite.php:137 actions/invite.php:174
msgid "Email addresses"
-msgstr ""
+msgstr "ΔιευθÏνσεις email"
#: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
#: actions/recoverpassword.php:231
@@ -917,22 +965,22 @@ msgstr "Η αÏχική σελίδα δεν είναι έγκυÏο URL."
#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
#: actions/emailsettings.php:173
msgid "I want to post notices by email."
-msgstr ""
+msgstr "Θέλω να δημοσιεÏω ενημεÏώσεις μέσω email"
#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
#: lib/connectsettingsaction.php:104
msgid "IM"
-msgstr ""
+msgstr "ΙΜ"
#: ../actions/imsettings.php:60 actions/imsettings.php:61
#: actions/imsettings.php:118
msgid "IM Address"
-msgstr ""
+msgstr "ΔιεÏθυνση ΙΜ"
#: ../actions/imsettings.php:33 actions/imsettings.php:33
#: actions/imsettings.php:59
msgid "IM Settings"
-msgstr ""
+msgstr "Ρυθμίσεις ΙΜ"
#: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
#: actions/finishopenidlogin.php:116
@@ -940,29 +988,35 @@ msgid ""
"If you already have an account, login with your username and password to "
"connect it to your OpenID."
msgstr ""
+"Εάν έχετε ήδη λογαÏιασμό, συνδεθείτε με το όνομα χÏήστη και τον κωδικό για "
+"να τον συνδέσετε στο OpenID σας."
#: ../actions/openidsettings.php:45
msgid ""
"If you want to add an OpenID to your account, enter it in the box below and "
"click \"Add\"."
msgstr ""
+"Εάν θέλετε να Ï€Ïοσθέσετε ένα OpenID στον λογαÏιασμό σας, πληκτÏολογήστε τον "
+"από κάτω και πατήστε \"ΠÏοσθήκη\"."
#: ../actions/recoverpassword.php:137
msgid ""
"If you've forgotten or lost your password, you can get a new one sent to the "
"email address you have stored in your account."
msgstr ""
+"Εάν έχετε ξεχάσει ή χάσει τον κωδικό σας, μποÏεί να σας αποσταλλεί "
+"καινοÏÏιος στην διεÏθυνση email που έχετε καταχωÏήσει στον λογαÏιασμό σας."
#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
#: actions/emailsettings.php:68 actions/smssettings.php:76
#: actions/emailsettings.php:127 actions/smssettings.php:140
msgid "Incoming email"
-msgstr ""
+msgstr "ΕισεÏχόμενο email"
#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
#: actions/emailsettings.php:443
msgid "Incoming email address removed."
-msgstr ""
+msgstr "Η διεÏθυνση του εισεÏχόμενου email αφαιÏέθηκε."
#: ../actions/password.php:69 actions/profilesettings.php:388
#: actions/passwordsettings.php:153
@@ -4225,20 +4279,19 @@ msgstr ""
#: actions/twittersettings.php:119
msgid "Twitter user name"
-msgstr ""
+msgstr "Όνομα χÏήστη στο Twitter"
#: actions/twittersettings.php:126
-#, fuzzy
msgid "Twitter password"
-msgstr "Îέος κωδικός"
+msgstr "Κωδικός στο Twitter"
#: actions/twittersettings.php:228
msgid "Twitter Friends"
-msgstr ""
+msgstr "Φίλοι στο Twitter"
#: actions/twittersettings.php:327
msgid "Username must have only numbers, "
-msgstr ""
+msgstr "Το όνομα χÏήστη Ï€Ïέπει να έχει μόνο νοÏμεÏα,"
#: actions/twittersettings.php:341
#, php-format
@@ -4440,47 +4493,46 @@ msgstr ""
#: lib/groupeditform.php:151
msgid "Description"
-msgstr ""
+msgstr "ΠεÏιγÏαφή"
#: lib/groupeditform.php:153
msgid "Describe the group or topic in 140 chars"
-msgstr ""
+msgstr "ΠεÏιγÏάψτε την ομάδα ή το θέμα μέχÏι 140 χαÏακτήÏες"
#: lib/groupeditform.php:158
msgid ""
"Location for the group, if any, like \"City, State (or Region), Country\""
-msgstr ""
+msgstr "Τοποθεσία της ομάδας (εάν υπάÏχει), πχ: \"Πόλη, ΠεÏιοχή, ΧώÏα)"
#: lib/groupnav.php:84 lib/searchgroupnav.php:84
msgid "Group"
-msgstr ""
+msgstr "Ομάδα"
#: lib/groupnav.php:100
msgid "Admin"
-msgstr ""
+msgstr "ΔιαχειÏιστής"
#: lib/groupnav.php:101
#, php-format
msgid "Edit %s group properties"
-msgstr ""
+msgstr "ΕπεξεÏγασία ιδιοτήτων της ομάδας %s"
#: lib/groupnav.php:106
-#, fuzzy
msgid "Logo"
-msgstr "ΑποσÏνδεση"
+msgstr "Λογότυπο"
#: lib/groupnav.php:107
#, php-format
msgid "Add or edit %s logo"
-msgstr ""
+msgstr "ΠÏοσθήκη ή επεξεÏγασία λογότυπου για την ομάδα %s"
#: lib/groupsbymemberssection.php:71
msgid "Groups with most members"
-msgstr ""
+msgstr "Ομάδες με τα πεÏισσότεÏα μέλη"
#: lib/groupsbypostssection.php:71
msgid "Groups with most posts"
-msgstr ""
+msgstr "Ομάδες με τις πεÏισσότεÏες δημοσιεÏσεις"
#: lib/grouptagcloudsection.php:56
#, php-format
@@ -4495,16 +4547,15 @@ msgstr "Η αÏχική σελίδα δεν είναι έγκυÏο URL."
#: lib/joinform.php:114
#, fuzzy
msgid "Join"
-msgstr "ΣÏνδεση"
+msgstr "Συμμετοχή"
#: lib/leaveform.php:114
msgid "Leave"
-msgstr ""
+msgstr "ΑποχώÏηση"
#: lib/logingroupnav.php:76
-#, fuzzy
msgid "Login with a username and password"
-msgstr "Λάθος όνομα χÏήστη ή κωδικός"
+msgstr "ΣÏνδεση με όνομα χÏήστη και κωδικό"
#: lib/logingroupnav.php:79
#, fuzzy
@@ -4513,7 +4564,7 @@ msgstr "ΔημιουÏγία νέου λογαÏιασμοÏ"
#: lib/logingroupnav.php:82
msgid "Login or register with OpenID"
-msgstr ""
+msgstr "ΣÏνδεση ή δημιουÏγία λογαÏÎ¹Î±ÏƒÎ¼Î¿Ï Î¼Îµ OpenID"
#: lib/mail.php:175
#, php-format
@@ -4521,6 +4572,8 @@ msgid ""
"Hey, %s.\n"
"\n"
msgstr ""
+"Γεια σου, %s.\n"
+"\n"
#: lib/mail.php:236
#, php-format
@@ -4530,12 +4583,12 @@ msgstr ""
#: lib/mail.php:254
#, fuzzy, php-format
msgid "Location: %s\n"
-msgstr "Τοποθεσία"
+msgstr "Τοποθεσία: %s\n"
#: lib/mail.php:256
#, fuzzy, php-format
msgid "Homepage: %s\n"
-msgstr "ΑÏχική σελίδα"
+msgstr "ΑÏχική σελίδα: %s\n"
#: lib/mail.php:258
#, php-format
@@ -4543,6 +4596,8 @@ msgid ""
"Bio: %s\n"
"\n"
msgstr ""
+"ΒιογÏαφικό: %s\n"
+"\n"
#: lib/mail.php:461
#, php-format
@@ -4561,7 +4616,7 @@ msgstr ""
#: lib/mailbox.php:229 lib/noticelist.php:380
msgid "From"
-msgstr ""
+msgstr "Από"
#: lib/messageform.php:110
msgid "Send a direct notice"
@@ -4614,40 +4669,41 @@ msgid "Tags in %s's notices"
msgstr ""
#: lib/profilelist.php:182
+#, fuzzy
msgid "(none)"
-msgstr ""
+msgstr "(κανένα)"
#: lib/publicgroupnav.php:76
msgid "Public"
-msgstr ""
+msgstr "Δημόσια"
#: lib/publicgroupnav.php:80
msgid "User groups"
-msgstr ""
+msgstr "Ομάδες χÏηστών"
#: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
msgid "Recent tags"
-msgstr ""
+msgstr "ΠÏόσφατες ετικέτες "
#: lib/publicgroupnav.php:86
msgid "Featured"
-msgstr ""
+msgstr "ΠÏοτεινόμενα"
#: lib/publicgroupnav.php:90
msgid "Popular"
-msgstr ""
+msgstr "Δημοφιλή"
#: lib/searchgroupnav.php:82
msgid "Notice"
-msgstr ""
+msgstr "Μήνυμα"
#: lib/searchgroupnav.php:85
msgid "Find groups on this site"
-msgstr ""
+msgstr "Î’Ïες ομάδες στο site"
#: lib/section.php:89
msgid "Untitled section"
-msgstr ""
+msgstr "Ενότητα χωÏίς τίτλο"
#: lib/subgroupnav.php:81
#, php-format
@@ -4667,7 +4723,7 @@ msgstr ""
#: lib/subgroupnav.php:104
#, php-format
msgid "Invite friends and colleagues to join you on %s"
-msgstr ""
+msgstr "ΠÏοσκάλεσε φίλους και συναδέλφους σου να γίνουν μέλη στο %s"
#: lib/subs.php:53
msgid "User has blocked you."
@@ -4675,15 +4731,15 @@ msgstr ""
#: lib/subscribeform.php:115 lib/subscribeform.php:139
msgid "Subscribe to this user"
-msgstr ""
+msgstr "Γίνε συνδÏομητής Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… χÏήστη"
#: lib/tagcloudsection.php:56
msgid "None"
-msgstr ""
+msgstr "Κανένα"
#: lib/topposterssection.php:74
msgid "Top posters"
-msgstr ""
+msgstr "ΚοÏυφαίοι δημοσιευτές"
#: lib/unblockform.php:120 lib/unblockform.php:150
msgid "Unblock this user"
diff --git a/locale/he_IL/LC_MESSAGES/statusnet.mo b/locale/he_IL/LC_MESSAGES/statusnet.mo
index fce14f20a..609918d92 100644
--- a/locale/he_IL/LC_MESSAGES/statusnet.mo
+++ b/locale/he_IL/LC_MESSAGES/statusnet.mo
Binary files differ
diff --git a/locale/he_IL/LC_MESSAGES/statusnet.po b/locale/he_IL/LC_MESSAGES/statusnet.po
index 8d43dfeaa..97a44a030 100644
--- a/locale/he_IL/LC_MESSAGES/statusnet.po
+++ b/locale/he_IL/LC_MESSAGES/statusnet.po
@@ -3705,7 +3705,7 @@ msgstr ""
#: actions/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
#: lib/subgroupnav.php:96
msgid "Groups"
-msgstr ""
+msgstr "קבוצות"
#: actions/groups.php:64
#, php-format
@@ -4645,12 +4645,12 @@ msgstr "%1$s כעת מ×זין להודעות שלך ב-%2$s"
#: lib/mail.php:254
#, fuzzy, php-format
msgid "Location: %s\n"
-msgstr "מיקו×"
+msgstr ""
#: lib/mail.php:256
#, fuzzy, php-format
msgid "Homepage: %s\n"
-msgstr "×תר בית"
+msgstr ""
#: lib/mail.php:258
#, php-format
diff --git a/locale/is_IS/LC_MESSAGES/statusnet.po b/locale/is_IS/LC_MESSAGES/statusnet.po
new file mode 100644
index 000000000..524b85a0d
--- /dev/null
+++ b/locale/is_IS/LC_MESSAGES/statusnet.po
@@ -0,0 +1,4860 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-01-25 16:24+0000\n"
+"PO-Revision-Date: 2009-04-24 13:32+0000\n"
+"Last-Translator: Tryggvi Björgvinsson <tryggvib@hi.is>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Pootle 1.1.0\n"
+
+#: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
+#: actions/noticesearchrss.php:88
+#, php-format
+msgid " Search Stream for \"%s\""
+msgstr "Leita í bablveitu að \"%s\""
+
+#: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
+#: actions/finishopenidlogin.php:88 actions/register.php:205
+#: actions/finishopenidlogin.php:110
+msgid ""
+" except this private data: password, email address, IM address, phone number."
+msgstr ""
+"nema þessi persónulegu gögn: lykilorð, tölvupóstfang, snarskilaboðafang (IM "
+"netfang), símanúmer."
+
+#: ../actions/showstream.php:400 ../lib/stream.php:109
+#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
+msgid " from "
+msgstr "frá"
+
+#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
+#: actions/twitapistatuses.php:347
+#, php-format
+msgid "%1$s / Updates replying to %2$s"
+msgstr "%1$s / Færslur sem svar til %2$s"
+
+#: ../actions/invite.php:168 actions/invite.php:176 actions/invite.php:211
+#, php-format
+msgid "%1$s has invited you to join them on %2$s"
+msgstr "%1$s hefur boðið þér að slást í hópinn með þeim á %2$s"
+
+#: ../actions/invite.php:170
+#, 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 hefur boðið þér að slást í hópinn með þeim á %2$s (%3$s).\n"
+"\n"
+"%2$s er örbloggsþjónusta sem leyfir þér að fylgjast með með fólki sem þú "
+"þekkir eða öðru áhugaverðu fólki í rauntíma.\n"
+"\n"
+"Þú getur líka sent inn fréttir af þér og deilt hugleiðingum og netveru þinni "
+"með fólki sem þekkir til þín. Þetta er frábær leið til þess að kynnast "
+"fólki sem hefur sömu áhugamál og þú.\n"
+"\n"
+"%1$s sagði:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Þú getur séð persónulega síðu %1$s á %2$s hér:\n"
+"\n"
+"%5$s\n"
+"\n"
+"Ef þig langar til að prófa þjónustuna, smelltu þá á hlekkinn hér fyrir neðan "
+"til að taka þessu boði.\n"
+"\n"
+"%6$s\n"
+"\n"
+"Ef ekki, þá getur þú hunsað þessi skilaboð. Takk fyrir tímann og "
+"þolinmæðina.\n"
+"\n"
+"Með bestu kveðju, %2$s\n"
+
+#: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:241
+#, php-format
+msgid "%1$s is now listening to your notices on %2$s."
+msgstr "%1$s er að hlusta á bablið þitt á %2$s."
+
+#: ../lib/mail.php:126
+#, php-format
+msgid ""
+"%1$s is now listening to your notices on %2$s.\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"Faithfully yours,\n"
+"%4$s.\n"
+msgstr ""
+"%1$s er að hlusta á bablið þitt á %2$s.\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"Með kveðju,\n"
+"%4$s.\n"
+
+#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
+#: actions/twitapistatuses.php:350
+#, php-format
+msgid "%1$s updates that reply to updates from %2$s / %3$s."
+msgstr "%1$s færslur sem svara færslum frá %2$s / %3$s."
+
+#: ../actions/shownotice.php:45 actions/shownotice.php:45
+#: actions/shownotice.php:161
+#, php-format
+msgid "%1$s's status on %2$s"
+msgstr "Staða %1$s á %2$s"
+
+#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
+#: actions/invite.php:99 actions/invite.php:123 actions/invite.php:131
+#, php-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: ../actions/publicrss.php:62 actions/publicrss.php:48
+#: actions/publicrss.php:90
+#, php-format
+msgid "%s Public Stream"
+msgstr "%s Opinber bablveita"
+
+#: ../actions/all.php:47 ../actions/allrss.php:60
+#: ../actions/twitapistatuses.php:238 ../lib/stream.php:51 actions/all.php:47
+#: actions/allrss.php:60 actions/twitapistatuses.php:155 lib/personal.php:51
+#: actions/all.php:65 actions/allrss.php:103 actions/facebookhome.php:164
+#: actions/twitapistatuses.php:126 lib/personalgroupnav.php:99
+#, php-format
+msgid "%s and friends"
+msgstr "%s og vinirnir"
+
+#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
+#: actions/twitapistatuses.php:33
+#, php-format
+msgid "%s public timeline"
+msgstr "Almenningsrás %s"
+
+#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411
+#, php-format
+msgid "%s status"
+msgstr "Staða %s"
+
+#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
+#: actions/twitapistatuses.php:199
+#, php-format
+msgid "%s timeline"
+msgstr "Rás %s"
+
+#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
+#: actions/twitapistatuses.php:36
+#, php-format
+msgid "%s updates from everyone!"
+msgstr "%s færslur frá öllum!"
+
+#: ../actions/register.php:213
+msgid ""
+"(You should receive a message by email momentarily, with instructions on how "
+"to confirm your email address.)"
+msgstr ""
+"(Þú ættir að fá tölvupóst eftir smá stund. à tölvupóstinum eru leiðbeiningar "
+"um það hvernig þú staðfestir tölvupóstfangið þitt.)"
+
+#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605
+#, php-format
+msgid ""
+"**%%site.name%%** is a microblogging service brought to you by [%%site."
+"broughtby%%](%%site.broughtbyurl%%). "
+msgstr ""
+"**%%site.name%%** er örbloggsþjónusta í boði "
+"[%%site.broughtby%%](%%site.broughtbyurl%%). "
+
+#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607
+#, php-format
+msgid "**%%site.name%%** is a microblogging service. "
+msgstr "**%%site.name%%** er örbloggsþjónusta."
+
+#: ../lib/util.php:274 lib/util.php:290
+msgid ". Contributors should be attributed by full name or nickname."
+msgstr "Fulls nafns eða stuttnefnis efnishöfunda skal vera getið."
+
+#: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
+#: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
+#: actions/finishopenidlogin.php:101 actions/profilesettings.php:100
+#: lib/groupeditform.php:139
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+msgstr "1-64 lágstafir eða tölustafir, engin greinarmerki eða bil"
+
+#: ../actions/register.php:152 actions/register.php:166
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+msgstr "1-64 lágstafir eða tölustafir, engin greinarmerki eða bil. Nauðsynlegt."
+
+#: ../actions/password.php:42 actions/profilesettings.php:181
+#: actions/passwordsettings.php:102
+msgid "6 or more characters"
+msgstr "6 eða fleiri tákn"
+
+#: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
+#: actions/recoverpassword.php:220
+msgid "6 or more characters, and don't forget it!"
+msgstr "6 eða fleiri tákn og ekki gleyma því!"
+
+#: ../actions/register.php:154 actions/register.php:168
+#: actions/register.php:373
+msgid "6 or more characters. Required."
+msgstr "6 eða fleiri tákn. Nauðsynlegt"
+
+#: ../actions/imsettings.php:197 actions/imsettings.php:205
+#, php-format
+msgid ""
+"A confirmation code was sent to the IM address you added. You must approve %"
+"s for sending messages to you."
+msgstr ""
+"Staðfestingarlykill var sendur á snarskilaboðafangið sem þú varst að bæta "
+"við. Þú verður að leyfa %s að senda snarskilaboð til þín."
+
+#: ../actions/emailsettings.php:213 actions/emailsettings.php:231
+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 ""
+"Staðfestingarlykill var sendur á tölvupóstfangið sem þú varst að bæta við. "
+"Athugaðu innhólfið þitt (og ruslpóstinn þinn!). Þar ætti "
+"staðfestingarlykillinn að vera og leiðbeingar um hvernig eigi að nota hann. "
+
+#: ../actions/smssettings.php:216 actions/smssettings.php:224
+msgid ""
+"A confirmation code was sent to the phone number you added. Check your inbox "
+"(and spam box!) for the code and instructions on how to use it."
+msgstr ""
+"Staðfestingarlykill var sendur á símanúmerið sem þú varst að bæta við. "
+"Athugaðu innhólfið þitt (og ruslpóstinn þinn!). Þar ætti "
+"staðfestingarlykillinn að vera og leiðbeingar um hvernig eigi að nota hann."
+
+#: ../actions/twitapiaccount.php:49 ../actions/twitapihelp.php:45
+#: ../actions/twitapistatuses.php:88 ../actions/twitapistatuses.php:259
+#: ../actions/twitapistatuses.php:370 ../actions/twitapistatuses.php:532
+#: ../actions/twitapiusers.php:122 actions/twitapiaccount.php:49
+#: actions/twitapidirect_messages.php:104 actions/twitapifavorites.php:111
+#: actions/twitapifavorites.php:120 actions/twitapifriendships.php:156
+#: actions/twitapihelp.php:46 actions/twitapistatuses.php:93
+#: actions/twitapistatuses.php:176 actions/twitapistatuses.php:288
+#: actions/twitapistatuses.php:298 actions/twitapistatuses.php:454
+#: actions/twitapistatuses.php:463 actions/twitapistatuses.php:504
+#: actions/twitapiusers.php:55 actions/twitapiaccount.php:37
+#: actions/twitapidirect_messages.php:111 actions/twitapifavorites.php:85
+#: actions/twitapifavorites.php:102 actions/twitapifriendships.php:121
+#: actions/twitapihelp.php:44 actions/twitapilaconica.php:82
+#: actions/twitapilaconica.php:151 actions/twitapistatuses.php:79
+#: actions/twitapistatuses.php:147 actions/twitapistatuses.php:228
+#: actions/twitapistatuses.php:239 actions/twitapistatuses.php:392
+#: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429
+#: actions/twitapiusers.php:32
+msgid "API method not found!"
+msgstr "Aðferð í forritsskilum fannst ekki!"
+
+#: ../actions/twitapiaccount.php:57 ../actions/twitapiaccount.php:113
+#: ../actions/twitapiaccount.php:119 ../actions/twitapiblocks.php:28
+#: ../actions/twitapiblocks.php:34 ../actions/twitapidirect_messages.php:43
+#: ../actions/twitapidirect_messages.php:49
+#: ../actions/twitapidirect_messages.php:56
+#: ../actions/twitapidirect_messages.php:62 ../actions/twitapifavorites.php:41
+#: ../actions/twitapifavorites.php:47 ../actions/twitapifavorites.php:53
+#: ../actions/twitapihelp.php:52 ../actions/twitapinotifications.php:29
+#: ../actions/twitapinotifications.php:35 ../actions/twitapistatuses.php:768
+#: actions/twitapiaccount.php:56 actions/twitapiaccount.php:109
+#: actions/twitapiaccount.php:114 actions/twitapiblocks.php:28
+#: actions/twitapiblocks.php:33 actions/twitapidirect_messages.php:170
+#: actions/twitapifavorites.php:168 actions/twitapihelp.php:53
+#: actions/twitapinotifications.php:29 actions/twitapinotifications.php:34
+#: actions/twitapistatuses.php:690 actions/twitapiaccount.php:45
+#: actions/twitapiaccount.php:97 actions/twitapiaccount.php:103
+#: actions/twitapidirect_messages.php:184 actions/twitapifavorites.php:143
+#: actions/twitapihelp.php:52 actions/twitapilaconica.php:172
+#: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37
+#: actions/twitapistatuses.php:562
+msgid "API method under construction."
+msgstr "Aðferð í forritsskilum er í þróun."
+
+#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568
+msgid "About"
+msgstr "Um"
+
+#: ../actions/userauthorization.php:119 actions/userauthorization.php:126
+#: actions/userauthorization.php:143
+msgid "Accept"
+msgstr "Samþykkja"
+
+#: ../actions/emailsettings.php:62 ../actions/imsettings.php:63
+#: ../actions/openidsettings.php:57 ../actions/smssettings.php:71
+#: actions/emailsettings.php:63 actions/imsettings.php:64
+#: actions/openidsettings.php:58 actions/smssettings.php:71
+#: actions/twittersettings.php:85 actions/emailsettings.php:120
+#: actions/imsettings.php:127 actions/openidsettings.php:111
+#: actions/smssettings.php:133 actions/twittersettings.php:163
+msgid "Add"
+msgstr "Bæta við"
+
+#: ../actions/openidsettings.php:43 actions/openidsettings.php:44
+#: actions/openidsettings.php:93
+msgid "Add OpenID"
+msgstr "Bæta við OpenID"
+
+#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
+#: lib/accountsettingsaction.php:117
+msgid "Add or remove OpenIDs"
+msgstr "Bæta við eða fjarlægja OpenID"
+
+#: ../actions/emailsettings.php:38 ../actions/imsettings.php:39
+#: ../actions/smssettings.php:39 actions/emailsettings.php:39
+#: actions/imsettings.php:40 actions/smssettings.php:39
+#: actions/emailsettings.php:94 actions/imsettings.php:94
+#: actions/smssettings.php:92
+msgid "Address"
+msgstr "Tölvupóstfang"
+
+#: ../actions/invite.php:131 actions/invite.php:139 actions/invite.php:176
+msgid "Addresses of friends to invite (one per line)"
+msgstr "Tölvupóstfang vina sem þú vilt bjóða (eitt póstfang í hverja línu)"
+
+#: ../actions/showstream.php:273 actions/showstream.php:288
+#: actions/showstream.php:422
+msgid "All subscriptions"
+msgstr "Allar áskriftir"
+
+#: ../actions/publicrss.php:64 actions/publicrss.php:50
+#: actions/publicrss.php:92
+#, php-format
+msgid "All updates for %s"
+msgstr "Allar færslur %s"
+
+#: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
+#: actions/noticesearchrss.php:90
+#, php-format
+msgid "All updates matching search term \"%s\""
+msgstr "Allar færslur sem passa við \"%s\""
+
+#: ../actions/finishopenidlogin.php:29 ../actions/login.php:31
+#: ../actions/openidlogin.php:29 ../actions/register.php:30
+#: actions/finishopenidlogin.php:29 actions/login.php:31
+#: actions/openidlogin.php:29 actions/register.php:30
+#: actions/finishopenidlogin.php:34 actions/login.php:77
+#: actions/openidlogin.php:30 actions/register.php:92
+msgid "Already logged in."
+msgstr "Þú hefur nú þegar skráð þig inn."
+
+#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49
+msgid "Already subscribed!."
+msgstr "Þú ert nú þegar áskrifandi!"
+
+#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
+#: actions/deletenotice.php:113
+msgid "Are you sure you want to delete this notice?"
+msgstr "Ertu viss um að þú viljir eyða þessu babli?"
+
+#: ../actions/userauthorization.php:77 actions/userauthorization.php:83
+#: actions/userauthorization.php:81
+msgid "Authorize subscription"
+msgstr "Heimila áskriftir"
+
+#: ../actions/login.php:104 ../actions/register.php:178
+#: actions/register.php:192
+msgid "Automatically login in the future; not for shared computers!"
+msgstr ""
+"Sjálfvirk innskráning í framtíðinni. Ekki nota þetta á tölvu sem aðrir deila "
+"með þér!"
+
+#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
+msgid ""
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+msgstr ""
+"Gerast sjálfkrafa áskrifandi að hverjum þeim sem gerist áskrifandi að þér "
+"(best fyrir ómannlega notendur)"
+
+#: ../actions/avatar.php:32 ../lib/settingsaction.php:90
+#: actions/profilesettings.php:34 actions/avatarsettings.php:65
+#: actions/showgroup.php:209 lib/accountsettingsaction.php:107
+msgid "Avatar"
+msgstr "Mynd"
+
+#: ../actions/avatar.php:113 actions/profilesettings.php:350
+#: actions/avatarsettings.php:395
+msgid "Avatar updated."
+msgstr "Mynd hefur verið uppfærð."
+
+#: ../actions/imsettings.php:55 actions/imsettings.php:56
+#, 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 ""
+"Býð eftir staðfestingu frá þessu netfangi. Athugaðu Jabber/GTalk aðganginn "
+"þinn. Þar ættu að vera skilaboð með ítarlegri leiðbeiningum. (Hefurðu bætt "
+"%s við í vinalistann þinn?)"
+
+#: ../actions/emailsettings.php:54 actions/emailsettings.php:55
+msgid ""
+"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
+"a message with further instructions."
+msgstr ""
+"Býð eftir staðfestingu frá þessu netfangi. Athugaðu innhólfið þitt (og "
+"ruslpóstinn þinn!). Þar ættu að vera skilaboð með ítarlegri leiðbeiningum."
+
+#: ../actions/smssettings.php:58 actions/smssettings.php:58
+#: actions/smssettings.php:111
+msgid "Awaiting confirmation on this phone number."
+msgstr "Býð eftir staðfestingu varðandi þetta símanúmer."
+
+#: ../lib/util.php:1318 lib/util.php:1452
+msgid "Before »"
+msgstr "Eldri »"
+
+#: ../actions/profilesettings.php:49 ../actions/register.php:170
+#: actions/profilesettings.php:82 actions/register.php:184
+#: actions/profilesettings.php:112 actions/register.php:402
+msgid "Bio"
+msgstr "Lýsing"
+
+#: ../actions/profilesettings.php:101 ../actions/register.php:82
+#: ../actions/updateprofile.php:103 actions/profilesettings.php:216
+#: actions/register.php:89 actions/updateprofile.php:104
+#: actions/profilesettings.php:205 actions/register.php:174
+#: actions/updateprofile.php:107
+msgid "Bio is too long (max 140 chars)."
+msgstr "Lýsingin er of löng (í mesta lagi 140 tákn)."
+
+#: ../lib/deleteaction.php:41 lib/deleteaction.php:41 lib/deleteaction.php:69
+msgid "Can't delete this notice."
+msgstr "Get ekki eytt þessu babli."
+
+#: ../actions/updateprofile.php:119 actions/updateprofile.php:120
+#: actions/updateprofile.php:123
+#, php-format
+msgid "Can't read avatar URL '%s'"
+msgstr "Get ekki lesið slóðina fyrir myndina '%s'"
+
+#: ../actions/password.php:85 ../actions/recoverpassword.php:300
+#: actions/profilesettings.php:404 actions/recoverpassword.php:313
+#: actions/passwordsettings.php:169 actions/recoverpassword.php:347
+msgid "Can't save new password."
+msgstr "Get ekki vistað nýja lykilorðið."
+
+#: ../actions/emailsettings.php:57 ../actions/imsettings.php:58
+#: ../actions/smssettings.php:62 actions/emailsettings.php:58
+#: actions/imsettings.php:59 actions/smssettings.php:62
+#: actions/emailsettings.php:111 actions/imsettings.php:114
+#: actions/smssettings.php:114
+msgid "Cancel"
+msgstr "Hætta við"
+
+#: ../lib/openid.php:121 lib/openid.php:121 lib/openid.php:130
+msgid "Cannot instantiate OpenID consumer object."
+msgstr "Get ekki útbúið OpenID notandahlut."
+
+#: ../actions/imsettings.php:163 actions/imsettings.php:171
+#: actions/imsettings.php:286
+msgid "Cannot normalize that Jabber ID"
+msgstr "Get ekki staðlað þetta Jabber kenni"
+
+#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
+#: actions/emailsettings.php:311
+msgid "Cannot normalize that email address"
+msgstr "Get ekki staðlað þetta tölvupóstfang"
+
+#: ../actions/password.php:45 actions/profilesettings.php:184
+#: actions/passwordsettings.php:110
+msgid "Change"
+msgstr "Breyta"
+
+#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
+#: lib/accountsettingsaction.php:114
+msgid "Change email handling"
+msgstr "Breyta tölvupóstumsjón"
+
+#: ../actions/password.php:32 actions/profilesettings.php:36
+#: actions/passwordsettings.php:58
+msgid "Change password"
+msgstr "Breyta lykilorði"
+
+#: ../lib/settingsaction.php:94 lib/accountsettingsaction.php:111
+msgid "Change your password"
+msgstr "Breyta lykilorðinu þínu"
+
+#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
+#: lib/accountsettingsaction.php:105
+msgid "Change your profile settings"
+msgstr "Breyta persónulegu stillingunum þínum"
+
+#: ../actions/password.php:43 ../actions/recoverpassword.php:181
+#: ../actions/register.php:155 ../actions/smssettings.php:65
+#: actions/profilesettings.php:182 actions/recoverpassword.php:187
+#: actions/register.php:169 actions/smssettings.php:65
+#: actions/passwordsettings.php:105 actions/recoverpassword.php:221
+#: actions/register.php:376 actions/smssettings.php:122
+msgid "Confirm"
+msgstr "Staðfesta"
+
+#: ../actions/confirmaddress.php:90 actions/confirmaddress.php:90
+#: actions/confirmaddress.php:144
+msgid "Confirm Address"
+msgstr "Staðfesta tölvupóstfang"
+
+#: ../actions/emailsettings.php:238 ../actions/imsettings.php:222
+#: ../actions/smssettings.php:245 actions/emailsettings.php:256
+#: actions/imsettings.php:230 actions/smssettings.php:253
+#: actions/emailsettings.php:379 actions/imsettings.php:361
+#: actions/smssettings.php:374
+msgid "Confirmation cancelled."
+msgstr "Hætt við staðfestingu."
+
+#: ../actions/smssettings.php:63 actions/smssettings.php:63
+#: actions/smssettings.php:118
+msgid "Confirmation code"
+msgstr "Staðfestingarlykill"
+
+#: ../actions/confirmaddress.php:38 actions/confirmaddress.php:38
+#: actions/confirmaddress.php:80
+msgid "Confirmation code not found."
+msgstr "Staðfestingarlykill fannst ekki."
+
+#: ../actions/register.php:202
+#, php-format
+msgid ""
+"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
+"want to...\n"
+"\n"
+"* Go to [your profile](%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 ""
+"Til hamingju %s! Frábært að þú skulir hafa skráð þig á %%%%site.name%%%%. "
+"Héðan vilt þú kannski...\n"
+"\n"
+"* Fara á [persónulegu síðuna þína](%s) senda inn þitt fyrsta babl.\n"
+"* Bæta við [Jabber/GTalk snarskilaboðafangi](%%%%action.imsettings%%%%) svo "
+"þú getir sent inn babl í snarskilaboðum.\n"
+"* [Leita að fólki](%%%%action.peoplesearch%%%%) sem þú þekkir eða hefur sömu "
+"áhugamál og þú. \n"
+"* Uppfæra [persónulegu síðuna](%%%%action.profilesettings%%%%) þína til þess "
+"að leyfa öðrum að kynnast þér betur.\n"
+"* Lesa [vefleiðbeiningarnar](%%%%doc.help%%%%) til þess að læra að babla "
+"betur.\n"
+"\n"
+"Takk fyrir að skrá þig og við vonum að þú njótir þjónustunnar."
+
+#: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
+#: actions/finishopenidlogin.php:119 lib/action.php:330
+msgid "Connect"
+msgstr "Tengjast"
+
+#: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
+#: actions/finishopenidlogin.php:114
+msgid "Connect existing account"
+msgstr "Tengja aðgang sem nú þegar er til"
+
+#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576
+msgid "Contact"
+msgstr "Tengiliður"
+
+#: ../lib/openid.php:178 lib/openid.php:178 lib/openid.php:187
+#, php-format
+msgid "Could not create OpenID form: %s"
+msgstr "Gat ekki búið til OpenID eyðublað: %s"
+
+#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
+#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
+#: actions/twitapifriendships.php:48 actions/twitapifriendships.php:64
+#, php-format
+msgid "Could not follow user: %s is already on your list."
+msgstr ""
+"Get ekki fylgst með notanda: %s. Þessi notandi er nú þegar í listanum þínum."
+
+#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
+#: actions/twitapifriendships.php:41
+msgid "Could not follow user: User not found."
+msgstr "Get ekki fylgst með notanda: Notandinn finnst ekki."
+
+#: ../lib/openid.php:160 lib/openid.php:160 lib/openid.php:169
+#, php-format
+msgid "Could not redirect to server: %s"
+msgstr "Gat ekki framsent til vefþjóns: %s"
+
+#: ../actions/updateprofile.php:162 actions/updateprofile.php:163
+#: actions/updateprofile.php:166
+msgid "Could not save avatar info"
+msgstr "Gat ekki vistað myndupplýsingar"
+
+#: ../actions/updateprofile.php:155 actions/updateprofile.php:156
+#: actions/updateprofile.php:159
+msgid "Could not save new profile info"
+msgstr "Gat ekki vistað nýjar persónuupplýsingar"
+
+#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72
+msgid "Could not subscribe other to you."
+msgstr "Gat ekki leyft öðrum að gerast áskrifandi að þér."
+
+#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57
+msgid "Could not subscribe."
+msgstr "Gat ekki farið í áskrift."
+
+#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
+#: actions/recoverpassword.php:111
+msgid "Could not update user with confirmed email address."
+msgstr "Gat ekki uppfært notanda með staðfestu tölvupóstfangi."
+
+#: ../actions/finishremotesubscribe.php:99
+#: actions/finishremotesubscribe.php:101 actions/finishremotesubscribe.php:114
+msgid "Couldn't convert request tokens to access tokens."
+msgstr "Gat ekki breytt beiðnistókum í aðgangstóka."
+
+#: ../actions/confirmaddress.php:84 ../actions/emailsettings.php:234
+#: ../actions/imsettings.php:218 ../actions/smssettings.php:241
+#: actions/confirmaddress.php:84 actions/emailsettings.php:252
+#: actions/imsettings.php:226 actions/smssettings.php:249
+#: actions/confirmaddress.php:126 actions/emailsettings.php:375
+#: actions/imsettings.php:357 actions/smssettings.php:370
+msgid "Couldn't delete email confirmation."
+msgstr "Gat ekki eytt tölvupóstsstaðfestingu."
+
+#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134
+msgid "Couldn't delete subscription."
+msgstr "Gat ekki eytt áskrift."
+
+#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
+#: actions/twitapistatuses.php:84
+msgid "Couldn't find any statuses."
+msgstr "Gat ekki fundið neinar notendastöður."
+
+#: ../actions/remotesubscribe.php:127 actions/remotesubscribe.php:136
+#: actions/remotesubscribe.php:178
+msgid "Couldn't get a request token."
+msgstr "Gat ekki komist yfir beiðnistóka."
+
+#: ../actions/emailsettings.php:205 ../actions/imsettings.php:187
+#: ../actions/smssettings.php:206 actions/emailsettings.php:223
+#: actions/imsettings.php:195 actions/smssettings.php:214
+#: actions/emailsettings.php:337 actions/imsettings.php:311
+#: actions/smssettings.php:325
+msgid "Couldn't insert confirmation code."
+msgstr "Gat ekki sett inn staðfestingarlykil."
+
+#: ../actions/finishremotesubscribe.php:180
+#: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:218
+msgid "Couldn't insert new subscription."
+msgstr "Gat ekki sett inn nýja áskrift."
+
+#: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
+#: actions/profilesettings.php:299 actions/twitapiaccount.php:94
+#: actions/profilesettings.php:302 actions/twitapiaccount.php:81
+msgid "Couldn't save profile."
+msgstr "Gat ekki vistað persónulega síðu."
+
+#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
+#: actions/profilesettings.php:279
+msgid "Couldn't update user for autosubscribe."
+msgstr "Gat ekki uppfært notanda í sjálfvirka áskrift."
+
+#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
+#: actions/emailsettings.php:298 actions/emailsettings.php:312
+#: actions/emailsettings.php:440 actions/emailsettings.php:462
+msgid "Couldn't update user record."
+msgstr "Gat ekki uppfært skráarfærslu notanda."
+
+#: ../actions/confirmaddress.php:72 ../actions/emailsettings.php:156
+#: ../actions/emailsettings.php:259 ../actions/imsettings.php:138
+#: ../actions/imsettings.php:243 ../actions/profilesettings.php:141
+#: ../actions/smssettings.php:157 ../actions/smssettings.php:269
+#: actions/confirmaddress.php:72 actions/emailsettings.php:174
+#: actions/emailsettings.php:277 actions/imsettings.php:146
+#: actions/imsettings.php:251 actions/profilesettings.php:256
+#: actions/smssettings.php:165 actions/smssettings.php:277
+#: actions/confirmaddress.php:114 actions/emailsettings.php:280
+#: actions/emailsettings.php:411 actions/imsettings.php:252
+#: actions/imsettings.php:395 actions/othersettings.php:162
+#: actions/profilesettings.php:259 actions/smssettings.php:266
+#: actions/smssettings.php:408
+msgid "Couldn't update user."
+msgstr "Gat ekki uppfært notanda."
+
+#: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
+#: actions/finishopenidlogin.php:112
+msgid "Create"
+msgstr "Búa til"
+
+#: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
+#: actions/finishopenidlogin.php:98
+msgid "Create a new user with this nickname."
+msgstr "Búa til nýjan notanda með þessu stuttnefni."
+
+#: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
+#: actions/finishopenidlogin.php:96
+msgid "Create new account"
+msgstr "Búa til nýjan aðgang"
+
+#: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
+#: actions/finishopenidlogin.php:231
+msgid "Creating new account for OpenID that already has a user."
+msgstr "Búa til nýjan aðgang fyrir OpenID sem nú þegar hefur notanda."
+
+#: ../actions/imsettings.php:45 actions/imsettings.php:46
+#: actions/imsettings.php:100
+msgid "Current confirmed Jabber/GTalk address."
+msgstr "Núverandi staðfesta Jabber/GTalk snarskilaboðafangið."
+
+#: ../actions/smssettings.php:46 actions/smssettings.php:46
+#: actions/smssettings.php:100
+msgid "Current confirmed SMS-enabled phone number."
+msgstr "Núverandi staðfesta SMS símanúmerið."
+
+#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
+#: actions/emailsettings.php:99
+msgid "Current confirmed email address."
+msgstr "Núverandi staðfesta tölvupóstfangið."
+
+#: ../actions/showstream.php:356 actions/showstream.php:367
+msgid "Currently"
+msgstr "à gangi núna"
+
+#: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:91
+#, php-format
+msgid "DB error inserting hashtag: %s"
+msgstr "Gagnagrunnsvilla við innsetningu myllumerkis: %s"
+
+#: ../lib/util.php:1061 lib/util.php:1110 classes/Notice.php:698
+#, php-format
+msgid "DB error inserting reply: %s"
+msgstr "Gagnagrunnsvilla við innsetningu svars: %s"
+
+#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
+#: actions/deletenotice.php:79
+msgid "Delete notice"
+msgstr "Eyða babli"
+
+#: ../actions/profilesettings.php:51 ../actions/register.php:172
+#: actions/profilesettings.php:84 actions/register.php:186
+#: actions/profilesettings.php:114
+msgid "Describe yourself and your interests in 140 chars"
+msgstr "Lýstu þér og áhugamálum þínum í 140 táknum"
+
+#: ../actions/register.php:158 ../actions/register.php:161
+#: ../lib/settingsaction.php:87 actions/register.php:172
+#: actions/register.php:175 lib/settingsaction.php:87 actions/register.php:381
+#: actions/register.php:385 lib/accountsettingsaction.php:113
+msgid "Email"
+msgstr "Tölvupóstur"
+
+#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
+#: actions/emailsettings.php:115
+msgid "Email Address"
+msgstr "Tölvupóstfang"
+
+#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
+#: actions/emailsettings.php:60
+msgid "Email Settings"
+msgstr "Tölvupóstsstillingar"
+
+#: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
+msgid "Email address already exists."
+msgstr "Tölvupóstfang er nú þegar skráð."
+
+#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173
+msgid "Email address confirmation"
+msgstr "Staðfesting tölvupóstfangs"
+
+#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
+#: actions/emailsettings.php:117
+msgid "Email address, like \"UserName@example.org\""
+msgstr "Tölvupóstfang eins og \"notandi@eitthvað.is\""
+
+#: ../actions/invite.php:129 actions/invite.php:137 actions/invite.php:174
+msgid "Email addresses"
+msgstr "Tölvupóstföng"
+
+#: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
+#: actions/recoverpassword.php:231
+msgid "Enter a nickname or email address."
+msgstr "Sláðu inn stuttnefni eða tölvupóstfang."
+
+#: ../actions/smssettings.php:64 actions/smssettings.php:64
+#: actions/smssettings.php:119
+msgid "Enter the code you received on your phone."
+msgstr "Sláðu inn lykilinn sem þú fékkst í símann þinn."
+
+#: ../actions/userauthorization.php:137 actions/userauthorization.php:144
+#: actions/userauthorization.php:161
+msgid "Error authorizing token"
+msgstr "Villa kom upp í heimilun tóka"
+
+#: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
+#: actions/finishopenidlogin.php:297
+msgid "Error connecting user to OpenID."
+msgstr "Villa kom upp í tengingu notanda við OpenID."
+
+#: ../actions/finishaddopenid.php:78 actions/finishaddopenid.php:78
+#: actions/finishaddopenid.php:126
+msgid "Error connecting user."
+msgstr "Villa kom upp við að tengja notanda."
+
+#: ../actions/finishremotesubscribe.php:151
+#: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:166
+msgid "Error inserting avatar"
+msgstr "Villa kom upp við að setja inn mynd"
+
+#: ../actions/finishremotesubscribe.php:143
+#: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:158
+msgid "Error inserting new profile"
+msgstr "Villa kom upp við að setja inn nýja persónulega síðu"
+
+#: ../actions/finishremotesubscribe.php:167
+#: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:182
+msgid "Error inserting remote profile"
+msgstr "Villa kom upp við að setja inn persónulega fjarsíðu"
+
+#: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
+#: actions/recoverpassword.php:280
+msgid "Error saving address confirmation."
+msgstr "Villa kom upp í vistun netfangsstaðfestingar."
+
+#: ../actions/userauthorization.php:140 actions/userauthorization.php:147
+#: actions/userauthorization.php:164
+msgid "Error saving remote profile"
+msgstr "Villa kom upp í vistun persónulegrar fjarsíðu"
+
+#: ../lib/openid.php:226 lib/openid.php:226 lib/openid.php:235
+msgid "Error saving the profile."
+msgstr "Villa kom upp í vistun persónulegu síðunnar."
+
+#: ../lib/openid.php:237 lib/openid.php:237 lib/openid.php:246
+msgid "Error saving the user."
+msgstr "Villa kom upp í vistun notandans."
+
+#: ../actions/password.php:80 actions/profilesettings.php:399
+#: actions/passwordsettings.php:164
+msgid "Error saving user; invalid."
+msgstr "Villa kom upp í vistun notanda: ótækt."
+
+#: ../actions/login.php:47 ../actions/login.php:73
+#: ../actions/recoverpassword.php:307 ../actions/register.php:98
+#: actions/login.php:47 actions/login.php:73 actions/recoverpassword.php:320
+#: actions/register.php:108 actions/login.php:112 actions/login.php:138
+#: actions/recoverpassword.php:354 actions/register.php:198
+msgid "Error setting user."
+msgstr "Villa kom upp í stillingu notanda."
+
+#: ../actions/finishaddopenid.php:83 actions/finishaddopenid.php:83
+#: actions/finishaddopenid.php:131
+msgid "Error updating profile"
+msgstr "Villa kom upp í uppfærslu persónulegu síðunnar"
+
+#: ../actions/finishremotesubscribe.php:161
+#: actions/finishremotesubscribe.php:163 actions/finishremotesubscribe.php:176
+msgid "Error updating remote profile"
+msgstr "Villa kom upp í uppfærslu persónulegrar fjarsíðu"
+
+#: ../actions/recoverpassword.php:80 actions/recoverpassword.php:80
+#: actions/recoverpassword.php:86
+msgid "Error with confirmation code."
+msgstr "Villa kom upp varðandi staðfestingarlykilinn."
+
+#: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
+#: actions/finishopenidlogin.php:117
+msgid "Existing nickname"
+msgstr "Stuttnefni er nú þegar til"
+
+#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570
+msgid "FAQ"
+msgstr "Spurt og svarað"
+
+#: ../actions/avatar.php:115 actions/profilesettings.php:352
+#: actions/avatarsettings.php:397
+msgid "Failed updating avatar."
+msgstr "Mistókst að uppfæra mynd"
+
+#: ../actions/all.php:61 ../actions/allrss.php:64 actions/all.php:61
+#: actions/allrss.php:64 actions/all.php:75 actions/allrss.php:107
+#, php-format
+msgid "Feed for friends of %s"
+msgstr "Vinaveita %s"
+
+#: ../actions/replies.php:65 ../actions/repliesrss.php:80
+#: actions/replies.php:65 actions/repliesrss.php:66 actions/replies.php:134
+#: actions/repliesrss.php:71
+#, php-format
+msgid "Feed for replies to %s"
+msgstr "Svaraveita %s"
+
+#: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:61
+#, php-format
+msgid "Feed for tag %s"
+msgstr "Merkjaveita %s"
+
+#: ../lib/searchaction.php:105 lib/searchaction.php:105
+#: lib/searchgroupnav.php:83
+msgid "Find content of notices"
+msgstr "Finna innihald babls"
+
+#: ../lib/searchaction.php:101 lib/searchaction.php:101
+#: lib/searchgroupnav.php:81
+msgid "Find people on this site"
+msgstr "Finna persónur á þessu vefsvæði"
+
+#: ../actions/login.php:122
+msgid ""
+"For security reasons, please re-enter your user name and password before "
+"changing your settings."
+msgstr ""
+"Af öryggisástæðum, vinsamlegast sláðu aftur inn notendanafnið þitt og "
+"lykilorð áður en þú breytir stillingunum þínum."
+
+#: ../actions/profilesettings.php:44 ../actions/register.php:164
+#: actions/profilesettings.php:77 actions/register.php:178
+#: actions/profilesettings.php:103 actions/register.php:391
+#: actions/showgroup.php:235 actions/showstream.php:262
+#: actions/tagother.php:105 lib/groupeditform.php:142
+msgid "Full name"
+msgstr "Fullt nafn"
+
+#: ../actions/profilesettings.php:98 ../actions/register.php:79
+#: ../actions/updateprofile.php:93 actions/profilesettings.php:213
+#: actions/register.php:86 actions/updateprofile.php:94
+#: actions/editgroup.php:195 actions/newgroup.php:146
+#: actions/profilesettings.php:202 actions/register.php:171
+#: actions/updateprofile.php:97
+msgid "Full name is too long (max 255 chars)."
+msgstr "Fullt nafn er of langt (í mesta lagi 255 stafir)."
+
+#: ../lib/util.php:322 lib/util.php:338 lib/action.php:344 lib/action.php:566
+msgid "Help"
+msgstr "Hjálp"
+
+#: ../lib/util.php:298 lib/util.php:314 lib/action.php:322
+#: lib/facebookaction.php:200
+msgid "Home"
+msgstr "Heim"
+
+#: ../actions/profilesettings.php:46 ../actions/register.php:167
+#: actions/profilesettings.php:79 actions/register.php:181
+#: actions/profilesettings.php:107 actions/register.php:396
+#: lib/groupeditform.php:146
+msgid "Homepage"
+msgstr "Heimasíða"
+
+#: ../actions/profilesettings.php:95 ../actions/register.php:76
+#: actions/profilesettings.php:210 actions/register.php:83
+#: actions/editgroup.php:192 actions/newgroup.php:143
+#: actions/profilesettings.php:199 actions/register.php:168
+msgid "Homepage is not a valid URL."
+msgstr "Heimasíða er ekki gild vefslóð."
+
+#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
+#: actions/emailsettings.php:173
+msgid "I want to post notices by email."
+msgstr "Ég vil babla í gegnum tölvupóst."
+
+#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
+#: lib/connectsettingsaction.php:104
+msgid "IM"
+msgstr "Snarskilaboð"
+
+#: ../actions/imsettings.php:60 actions/imsettings.php:61
+#: actions/imsettings.php:118
+msgid "IM Address"
+msgstr "Snarskilaboðafang"
+
+#: ../actions/imsettings.php:33 actions/imsettings.php:33
+#: actions/imsettings.php:59
+msgid "IM Settings"
+msgstr "Snarskilaboðastillingar"
+
+#: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
+#: actions/finishopenidlogin.php:116
+msgid ""
+"If you already have an account, login with your username and password to "
+"connect it to your OpenID."
+msgstr ""
+"Ef ert nú þegar með aðgang, skráðu þig inn með notendanafni og lykilorði til "
+"þess að tengjast OpenID aðganginum þínum."
+
+#: ../actions/openidsettings.php:45
+msgid ""
+"If you want to add an OpenID to your account, enter it in the box below and "
+"click \"Add\"."
+msgstr ""
+"Ef þig langar til það bæta við OpenID í aðganginn þinn, sláðu það þá inn í "
+"reitinn hér fyrir neðan og smelltu á \"Bæta við\"."
+
+#: ../actions/recoverpassword.php:137
+msgid ""
+"If you've forgotten or lost your password, you can get a new one sent to the "
+"email address you have stored in your account."
+msgstr ""
+"Ef þú hefur gleymt eða tapað lykilorðinu þínu getur þú fengið nýtt sent á "
+"tölvupóstfangið sem þú hefur vistað í notendaaðganginum þínum."
+
+#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
+#: actions/emailsettings.php:68 actions/smssettings.php:76
+#: actions/emailsettings.php:127 actions/smssettings.php:140
+msgid "Incoming email"
+msgstr "Móttökutölvupóstur"
+
+#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
+#: actions/emailsettings.php:443
+msgid "Incoming email address removed."
+msgstr "Móttökutölvupóstfang fjarlægt."
+
+#: ../actions/password.php:69 actions/profilesettings.php:388
+#: actions/passwordsettings.php:153
+msgid "Incorrect old password"
+msgstr "Rangt eldra lykilorð"
+
+#: ../actions/login.php:67 actions/login.php:67 actions/facebookhome.php:131
+#: actions/login.php:132
+msgid "Incorrect username or password."
+msgstr "Rangt notendanafn eða lykilorð."
+
+#: ../actions/recoverpassword.php:265
+msgid ""
+"Instructions for recovering your password have been sent to the email "
+"address registered to your account."
+msgstr ""
+"Leiðbeiningar um það hvernig þú getur endurheimt lykilorðið þitt hafa verið "
+"sendar á tölvupóstfangið sem er tengt notendaaðganginum þínum."
+
+#: ../actions/updateprofile.php:114 actions/updateprofile.php:115
+#: actions/updateprofile.php:118
+#, php-format
+msgid "Invalid avatar URL '%s'"
+msgstr "Ótæk myndarslóð '%s'"
+
+#: ../actions/invite.php:55 actions/invite.php:62 actions/invite.php:70
+#, php-format
+msgid "Invalid email address: %s"
+msgstr "Ótækt tölvupóstfang: %s"
+
+#: ../actions/updateprofile.php:98 actions/updateprofile.php:99
+#: actions/updateprofile.php:102
+#, php-format
+msgid "Invalid homepage '%s'"
+msgstr "Ótæk heimasíða '%s'"
+
+#: ../actions/updateprofile.php:82 actions/updateprofile.php:83
+#: actions/updateprofile.php:86
+#, php-format
+msgid "Invalid license URL '%s'"
+msgstr "Ótæk leyfisslóð '%s'"
+
+#: ../actions/postnotice.php:61 actions/postnotice.php:62
+#: actions/postnotice.php:66
+msgid "Invalid notice content"
+msgstr "Ótækt bablinnihald"
+
+#: ../actions/postnotice.php:67 actions/postnotice.php:68
+#: actions/postnotice.php:72
+msgid "Invalid notice uri"
+msgstr "Ótækt veffang babls"
+
+#: ../actions/postnotice.php:72 actions/postnotice.php:73
+#: actions/postnotice.php:77
+msgid "Invalid notice url"
+msgstr "Ótækt veffang babls"
+
+#: ../actions/updateprofile.php:87 actions/updateprofile.php:88
+#: actions/updateprofile.php:91
+#, php-format
+msgid "Invalid profile URL '%s'."
+msgstr "Ótækt veffang persónulegrar síðu '%s'."
+
+#: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
+#: actions/remotesubscribe.php:135
+msgid "Invalid profile URL (bad format)"
+msgstr "Ótækt veffang persónulegrar síðu (vitlaust snið)"
+
+#: ../actions/finishremotesubscribe.php:77
+#: actions/finishremotesubscribe.php:79 actions/finishremotesubscribe.php:80
+msgid "Invalid profile URL returned by server."
+msgstr "Ótæku veffangi persónulegrar síðu skilað af vefþjóni."
+
+#: ../actions/avatarbynickname.php:37 actions/avatarbynickname.php:37
+#: actions/avatarbynickname.php:69
+msgid "Invalid size."
+msgstr "Ótæk stærð."
+
+#: ../actions/finishopenidlogin.php:235 ../actions/register.php:93
+#: ../actions/register.php:111 actions/finishopenidlogin.php:241
+#: actions/register.php:103 actions/register.php:121
+#: actions/finishopenidlogin.php:279 actions/register.php:193
+#: actions/register.php:211
+msgid "Invalid username or password."
+msgstr "Ótækt notendanafn eða lykilorð."
+
+#: ../actions/invite.php:79 actions/invite.php:86 actions/invite.php:102
+msgid "Invitation(s) sent"
+msgstr "Boðskort hefur verið sent út"
+
+#: ../actions/invite.php:97 actions/invite.php:104 actions/invite.php:136
+msgid "Invitation(s) sent to the following people:"
+msgstr "Boðskort sent á eftirfarandi aðila:"
+
+#: ../lib/util.php:306 lib/util.php:322 lib/facebookaction.php:207
+#: lib/subgroupnav.php:103
+msgid "Invite"
+msgstr "Bjóða"
+
+#: ../actions/invite.php:123 actions/invite.php:130 actions/invite.php:104
+msgid "Invite new users"
+msgstr "Bjóða nýjum notendum að vera með"
+
+#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609
+#, 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 ""
+"Það keyrir [StatusNet](http://status.net/) örbloggshugbúnaðinn, útgáfu %s, sem "
+"er gefinn út undir [GNU Affero "
+"almenningsleyfinu](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
+
+#: ../actions/imsettings.php:173 actions/imsettings.php:181
+#: actions/imsettings.php:296
+msgid "Jabber ID already belongs to another user."
+msgstr "Jabber-kennið tilheyrir öðrum notanda."
+
+#: ../actions/imsettings.php:62 actions/imsettings.php:63
+#, 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 eða GTalk netfang eins og \"notandi@eitthvað.is\". Fyrst skaltu vera "
+"viss um að bæta %s við í vinalistann þinn í snarskilaboðaforritinu þínu eða "
+"á GTalk."
+
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+#: actions/profilesettings.php:128
+msgid "Language"
+msgstr "Tungumál"
+
+#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
+#: actions/profilesettings.php:217
+msgid "Language is too long (max 50 chars)."
+msgstr "Tungumál er of langt (í mesta lagi 50 stafir)."
+
+#: ../actions/profilesettings.php:52 ../actions/register.php:173
+#: actions/profilesettings.php:85 actions/register.php:187
+#: actions/profilesettings.php:117 actions/register.php:408
+#: actions/showgroup.php:244 actions/showstream.php:271
+#: actions/tagother.php:113 lib/groupeditform.php:156 lib/grouplist.php:126
+#: lib/profilelist.php:125
+msgid "Location"
+msgstr "Staðsetning"
+
+#: ../actions/profilesettings.php:104 ../actions/register.php:85
+#: ../actions/updateprofile.php:108 actions/profilesettings.php:219
+#: actions/register.php:92 actions/updateprofile.php:109
+#: actions/editgroup.php:201 actions/newgroup.php:152
+#: actions/profilesettings.php:208 actions/register.php:177
+#: actions/updateprofile.php:112
+msgid "Location is too long (max 255 chars)."
+msgstr "Staðsetning er of löng (í mesta lagi 255 stafir)."
+
+#: ../actions/login.php:97 ../actions/login.php:106
+#: ../actions/openidlogin.php:68 ../lib/util.php:310 actions/login.php:97
+#: actions/login.php:106 actions/openidlogin.php:77 lib/util.php:326
+#: actions/facebooklogin.php:93 actions/login.php:186 actions/login.php:239
+#: actions/openidlogin.php:112 lib/action.php:335 lib/facebookaction.php:288
+#: lib/facebookaction.php:315 lib/logingroupnav.php:75
+#, php-format
+msgid "Login"
+msgstr "Innskráning"
+
+#: ../actions/openidlogin.php:44 actions/openidlogin.php:52
+#: actions/openidlogin.php:62
+#, php-format
+msgid "Login with an [OpenID](%%doc.openid%%) account."
+msgstr "Innskráning með [OpenID](%%doc.openid%%) aðgangi."
+
+#: ../actions/login.php:126
+#, php-format
+msgid ""
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account, or try [OpenID](%%action.openidlogin%"
+"%). "
+msgstr ""
+"Skráðu þig inn með notendanafninu þínu og lykilorði. Ertu ekki með "
+"notendanafn? [Nýskráðu þig](%%action.register%%) eða prófaðu "
+"[OpenID](%%action.openidlogin%%). "
+
+#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332
+msgid "Logout"
+msgstr "Útskráning"
+
+#: ../actions/register.php:166 actions/register.php:180
+#: actions/register.php:393
+msgid "Longer name, preferably your \"real\" name"
+msgstr "Lengra nafn, ákjósalegast að það sé \"rétta\" nafnið þitt"
+
+#: ../actions/login.php:110 actions/login.php:110 actions/login.php:245
+#: lib/facebookaction.php:320
+msgid "Lost or forgotten password?"
+msgstr "Tapað eða gleymt lykilorð?"
+
+#: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
+#: actions/emailsettings.php:81 actions/smssettings.php:89
+msgid "Make a new email address for posting to; cancels the old one."
+msgstr "Búa til nýtt tölvupóstfang til að senda til. Skrifar yfir það gamla."
+
+#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
+#: actions/emailsettings.php:71
+#, php-format
+msgid "Manage how you get email from %%site.name%%."
+msgstr "Stilla það hvernig þú færð tölvupóst frá %%site.name%%."
+
+#: ../actions/showstream.php:300 actions/showstream.php:315
+#: actions/showstream.php:480
+msgid "Member since"
+msgstr "Meðlimur síðan"
+
+#: ../actions/userrss.php:70 actions/userrss.php:67 actions/userrss.php:72
+#, php-format
+msgid "Microblog by %s"
+msgstr "Örblogg frá %s"
+
+#: ../actions/smssettings.php:304
+#, 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 ""
+"Farsímafélagið þitt. Ef þú veist um farsímafélag sem tekur á móti SMS í "
+"gegnum tölvupóst sem er ekki í þessum lista, sendu okkur tölvupóst í %s og "
+"láttu okkur vita."
+
+#: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
+#: actions/finishopenidlogin.php:85 actions/register.php:202
+#: actions/finishopenidlogin.php:107 actions/register.php:429
+msgid "My text and files are available under "
+msgstr "Textinn og skrárnar mínar eru aðgengilegar undir "
+
+#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
+#: actions/emailsettings.php:83 actions/smssettings.php:91
+#: actions/emailsettings.php:142 actions/smssettings.php:152
+msgid "New"
+msgstr "Nýtt"
+
+#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286
+#, php-format
+msgid "New email address for posting to %s"
+msgstr "Nýtt tölvupóstfang til að senda á %s"
+
+#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
+#: actions/emailsettings.php:465
+msgid "New incoming email address added."
+msgstr "Nýju móttökutölvupóstfangi bætt við."
+
+#: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
+#: actions/finishopenidlogin.php:99
+msgid "New nickname"
+msgstr "Nýtt stuttnefni"
+
+#: ../actions/newnotice.php:87 actions/newnotice.php:96
+#: actions/newnotice.php:68
+msgid "New notice"
+msgstr "Nýtt babl"
+
+#: ../actions/password.php:41 ../actions/recoverpassword.php:179
+#: actions/profilesettings.php:180 actions/recoverpassword.php:185
+#: actions/passwordsettings.php:101 actions/recoverpassword.php:219
+msgid "New password"
+msgstr "Nýtt lykilorð"
+
+#: ../actions/recoverpassword.php:314
+msgid "New password successfully saved. You are now logged in."
+msgstr "Tókst að vista nýtt lykilorð. Þú ert núna innskráð(ur)"
+
+#: ../actions/login.php:101 ../actions/profilesettings.php:41
+#: ../actions/register.php:151 actions/login.php:101
+#: actions/profilesettings.php:74 actions/register.php:165
+#: actions/login.php:228 actions/profilesettings.php:98
+#: actions/register.php:367 actions/showgroup.php:224
+#: actions/showstream.php:251 actions/tagother.php:95
+#: lib/facebookaction.php:308 lib/groupeditform.php:137
+msgid "Nickname"
+msgstr "Stuttnefni"
+
+#: ../actions/finishopenidlogin.php:175 ../actions/profilesettings.php:110
+#: ../actions/register.php:69 actions/finishopenidlogin.php:181
+#: actions/profilesettings.php:225 actions/register.php:76
+#: actions/editgroup.php:183 actions/finishopenidlogin.php:215
+#: actions/newgroup.php:134 actions/profilesettings.php:214
+#: actions/register.php:159
+msgid "Nickname already in use. Try another one."
+msgstr "Stuttnefni nú þegar í notkun. Prófaðu eitthvað annað."
+
+#: ../actions/finishopenidlogin.php:165 ../actions/profilesettings.php:88
+#: ../actions/register.php:67 ../actions/updateprofile.php:77
+#: actions/finishopenidlogin.php:171 actions/profilesettings.php:203
+#: actions/register.php:74 actions/updateprofile.php:78
+#: actions/finishopenidlogin.php:205 actions/profilesettings.php:192
+#: actions/updateprofile.php:81
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr "Stuttnefni geta bara verið lágstafir og tölustafir en engin bil."
+
+#: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
+#: actions/finishopenidlogin.php:210
+msgid "Nickname not allowed."
+msgstr "Stuttnefni ekki leyfilegt."
+
+#: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
+#: actions/remotesubscribe.php:106
+msgid "Nickname of the user you want to follow"
+msgstr "Stuttnefni notandans sem þú vilt fylgja"
+
+#: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
+#: actions/recoverpassword.php:186
+msgid "Nickname or email"
+msgstr "Stuttnefni eða tölvupóstur"
+
+#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
+#: actions/block.php:147 actions/deletenotice.php:118
+msgid "No"
+msgstr "Nei"
+
+#: ../actions/imsettings.php:156 actions/imsettings.php:164
+#: actions/imsettings.php:279
+msgid "No Jabber ID."
+msgstr "Ekkert Jabber-kenni"
+
+#: ../actions/userauthorization.php:129 actions/userauthorization.php:136
+#: actions/userauthorization.php:153
+msgid "No authorization request!"
+msgstr "Engin heimildarbeiðni!"
+
+#: ../actions/smssettings.php:181 actions/smssettings.php:189
+#: actions/smssettings.php:299
+msgid "No carrier selected."
+msgstr "Ekkert farsímafélag valið."
+
+#: ../actions/smssettings.php:316 actions/smssettings.php:324
+#: actions/smssettings.php:486
+msgid "No code entered"
+msgstr "Enginn lykill sleginn inn"
+
+#: ../actions/confirmaddress.php:33 actions/confirmaddress.php:33
+#: actions/confirmaddress.php:75
+msgid "No confirmation code."
+msgstr "Enginn staðfestingarlykill."
+
+#: ../actions/newnotice.php:44 actions/newmessage.php:53
+#: actions/newnotice.php:44 classes/Command.php:197 actions/newmessage.php:109
+#: actions/newnotice.php:126 classes/Command.php:223
+msgid "No content!"
+msgstr "Ekkert innihald!"
+
+#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
+#: actions/emailsettings.php:304
+msgid "No email address."
+msgstr "Ekkert tölvupóstfang."
+
+#: ../actions/userbyid.php:32 actions/userbyid.php:32 actions/userbyid.php:70
+msgid "No id."
+msgstr "Ekkert kenni."
+
+#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
+#: actions/emailsettings.php:430
+msgid "No incoming email address."
+msgstr "Ekkert móttökutölvupóstfang."
+
+#: ../actions/finishremotesubscribe.php:65
+#: actions/finishremotesubscribe.php:67 actions/finishremotesubscribe.php:68
+msgid "No nickname provided by remote server."
+msgstr "Ekkert stuttnefni uppgefið hjá hinum vefþjóninum."
+
+#: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
+#: actions/avatarbynickname.php:59 actions/leavegroup.php:81
+msgid "No nickname."
+msgstr "Ekkert stuttnefni."
+
+#: ../actions/emailsettings.php:222 ../actions/imsettings.php:206
+#: ../actions/smssettings.php:229 actions/emailsettings.php:240
+#: actions/imsettings.php:214 actions/smssettings.php:237
+#: actions/emailsettings.php:363 actions/imsettings.php:345
+#: actions/smssettings.php:358
+msgid "No pending confirmation to cancel."
+msgstr "Engin staðfesting í bið sem þarf að hætta við."
+
+#: ../actions/smssettings.php:176 actions/smssettings.php:184
+#: actions/smssettings.php:294
+msgid "No phone number."
+msgstr "Ekkert símanúmer."
+
+#: ../actions/finishremotesubscribe.php:72
+#: actions/finishremotesubscribe.php:74 actions/finishremotesubscribe.php:75
+msgid "No profile URL returned by server."
+msgstr "Ekkert veffang persónulegrar síðu skilað af vefþjóni."
+
+#: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
+#: actions/recoverpassword.php:266
+msgid "No registered email address for that user."
+msgstr "Ekkert tölvupóstfang á skrá fyrir þennan notanda."
+
+#: ../actions/userauthorization.php:49 actions/userauthorization.php:55
+#: actions/userauthorization.php:57
+msgid "No request found!"
+msgstr "Engin beiðni fundin!"
+
+#: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
+#: actions/noticesearch.php:69 actions/peoplesearch.php:69
+#: actions/groupsearch.php:81 actions/noticesearch.php:104
+#: actions/peoplesearch.php:85
+msgid "No results"
+msgstr "Engar niðurstöður"
+
+#: ../actions/avatarbynickname.php:32 actions/avatarbynickname.php:32
+#: actions/avatarbynickname.php:64
+msgid "No size."
+msgstr "Engin stærð."
+
+#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
+#: actions/twitapistatuses.php:520 actions/twitapifavorites.php:112
+#: actions/twitapistatuses.php:446
+msgid "No status found with that ID."
+msgstr "Engin staða fundin með þessu kenni."
+
+#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
+#: actions/twitapistatuses.php:418
+msgid "No status with that ID found."
+msgstr "Engin staða með þessu kenni fannst."
+
+#: ../actions/openidsettings.php:135 actions/openidsettings.php:144
+#: actions/openidsettings.php:222
+msgid "No such OpenID."
+msgstr "Ekkert svoleiðis OpenID."
+
+#: ../actions/doc.php:29 actions/doc.php:29 actions/doc.php:64
+msgid "No such document."
+msgstr "Ekkert svoleiðis skjal."
+
+#: ../actions/shownotice.php:32 ../actions/shownotice.php:83
+#: ../lib/deleteaction.php:30 actions/shownotice.php:32
+#: actions/shownotice.php:83 lib/deleteaction.php:30 actions/shownotice.php:87
+#: lib/deleteaction.php:51
+msgid "No such notice."
+msgstr "Ekkert svoleiðis babl."
+
+#: ../actions/recoverpassword.php:56 actions/recoverpassword.php:56
+#: actions/recoverpassword.php:62
+msgid "No such recovery code."
+msgstr "Enginn svoleiðis staðfestingarlykill."
+
+#: ../actions/postnotice.php:56 actions/postnotice.php:57
+#: actions/postnotice.php:60
+msgid "No such subscription"
+msgstr "Engin svoleiðis áskrift"
+
+#: ../actions/all.php:34 ../actions/allrss.php:35
+#: ../actions/avatarbynickname.php:43 ../actions/foaf.php:40
+#: ../actions/remotesubscribe.php:84 ../actions/remotesubscribe.php:91
+#: ../actions/replies.php:57 ../actions/repliesrss.php:35
+#: ../actions/showstream.php:110 ../actions/userbyid.php:36
+#: ../actions/userrss.php:35 ../actions/xrds.php:35 ../lib/gallery.php:57
+#: ../lib/subs.php:33 ../lib/subs.php:82 actions/all.php:34
+#: actions/allrss.php:35 actions/avatarbynickname.php:43
+#: actions/favoritesrss.php:35 actions/foaf.php:40 actions/ical.php:31
+#: actions/remotesubscribe.php:93 actions/remotesubscribe.php:100
+#: actions/replies.php:57 actions/repliesrss.php:35
+#: actions/showfavorites.php:34 actions/showstream.php:110
+#: actions/userbyid.php:36 actions/userrss.php:35 actions/xrds.php:35
+#: classes/Command.php:120 classes/Command.php:162 classes/Command.php:203
+#: classes/Command.php:237 lib/gallery.php:62 lib/mailbox.php:36
+#: lib/subs.php:33 lib/subs.php:95 actions/all.php:53 actions/allrss.php:66
+#: actions/avatarbynickname.php:75 actions/favoritesrss.php:64
+#: actions/foaf.php:41 actions/remotesubscribe.php:123
+#: actions/remotesubscribe.php:130 actions/replies.php:73
+#: actions/repliesrss.php:38 actions/showfavorites.php:105
+#: actions/showstream.php:100 actions/userbyid.php:74
+#: actions/usergroups.php:92 actions/userrss.php:38 actions/xrds.php:73
+#: classes/Command.php:140 classes/Command.php:185 classes/Command.php:234
+#: classes/Command.php:271 lib/galleryaction.php:60 lib/mailbox.php:82
+#: lib/subs.php:34 lib/subs.php:109
+msgid "No such user."
+msgstr "Enginn svoleiðis notandi."
+
+#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
+#: actions/recoverpassword.php:251
+msgid "No user with that email address or username."
+msgstr "Enginn notandi með þetta tölvupóstfang eða notendanafn"
+
+#: ../lib/gallery.php:80 lib/gallery.php:85
+msgid "Nobody to show!"
+msgstr "Enginn sem hægt er að sýna!"
+
+#: ../actions/recoverpassword.php:60 actions/recoverpassword.php:60
+#: actions/recoverpassword.php:66
+msgid "Not a recovery code."
+msgstr "Þetta er ekki staðfestingarlykill."
+
+#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
+#: scripts/maildaemon.php:53
+msgid "Not a registered user."
+msgstr "Ekki skráður notandi."
+
+#: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
+#: ../lib/twitterapi.php:332 lib/twitterapi.php:391 lib/twitterapi.php:418
+#: lib/twitterapi.php:502 lib/twitterapi.php:448 lib/twitterapi.php:476
+#: lib/twitterapi.php:566
+msgid "Not a supported data format."
+msgstr "Enginn stuðningur við gagnasnið."
+
+#: ../actions/imsettings.php:167 actions/imsettings.php:175
+#: actions/imsettings.php:290
+msgid "Not a valid Jabber ID"
+msgstr "Ekki tækt Jabber-kenni"
+
+#: ../lib/openid.php:131 lib/openid.php:131 lib/openid.php:140
+msgid "Not a valid OpenID."
+msgstr "Ekki tækt OpenID"
+
+#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
+#: actions/emailsettings.php:315
+msgid "Not a valid email address"
+msgstr "Ekki tækt tölvupóstfang"
+
+#: ../actions/register.php:63 actions/register.php:70 actions/register.php:152
+msgid "Not a valid email address."
+msgstr "Ekki tækt tölvupóstfang."
+
+#: ../actions/profilesettings.php:91 ../actions/register.php:71
+#: actions/profilesettings.php:206 actions/register.php:78
+#: actions/editgroup.php:186 actions/newgroup.php:137
+#: actions/profilesettings.php:195 actions/register.php:161
+msgid "Not a valid nickname."
+msgstr "Ekki tækt stuttnefni."
+
+#: ../actions/remotesubscribe.php:120 actions/remotesubscribe.php:129
+#: actions/remotesubscribe.php:159
+msgid "Not a valid profile URL (incorrect services)."
+msgstr "Ekki tækt veffang á persónulega síðu (röng þjónusta)."
+
+#: ../actions/remotesubscribe.php:113 actions/remotesubscribe.php:122
+#: actions/remotesubscribe.php:152
+msgid "Not a valid profile URL (no XRDS defined)."
+msgstr "Ekki tækt veffang á persónulega síðu (XRDS ekki skilgreint)."
+
+#: ../actions/remotesubscribe.php:104 actions/remotesubscribe.php:113
+#: actions/remotesubscribe.php:143
+msgid "Not a valid profile URL (no YADIS document)."
+msgstr "Ekki tækt veffang á persónulega síðu (ekkert YADIS skjal)."
+
+#: ../actions/avatar.php:95 actions/profilesettings.php:332
+#: lib/imagefile.php:87
+msgid "Not an image or corrupt file."
+msgstr "Annaðhvort ekki mynd eða þá að skráin er gölluð."
+
+#: ../actions/finishremotesubscribe.php:51
+#: actions/finishremotesubscribe.php:53 actions/finishremotesubscribe.php:54
+msgid "Not authorized."
+msgstr "Engin heimild."
+
+#: ../actions/finishremotesubscribe.php:38
+#: actions/finishremotesubscribe.php:38 actions/finishremotesubscribe.php:40
+msgid "Not expecting this response!"
+msgstr "Bjóst ekki við þessu svari!"
+
+#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
+#: actions/twitapistatuses.php:309
+msgid "Not found"
+msgstr "Fannst ekki"
+
+#: ../actions/finishaddopenid.php:29 ../actions/logout.php:33
+#: ../actions/newnotice.php:29 ../actions/subscribe.php:28
+#: ../actions/unsubscribe.php:25 ../lib/deleteaction.php:38
+#: ../lib/settingsaction.php:27 actions/disfavor.php:29 actions/favor.php:30
+#: actions/finishaddopenid.php:29 actions/logout.php:33
+#: actions/newmessage.php:28 actions/newnotice.php:29 actions/subscribe.php:28
+#: actions/unsubscribe.php:25 lib/deleteaction.php:38
+#: lib/settingsaction.php:27 actions/block.php:59 actions/disfavor.php:61
+#: actions/favor.php:64 actions/finishaddopenid.php:67 actions/logout.php:71
+#: actions/newmessage.php:83 actions/newnotice.php:90 actions/nudge.php:63
+#: actions/subedit.php:31 actions/subscribe.php:30 actions/unblock.php:60
+#: actions/unsubscribe.php:27 lib/deleteaction.php:66
+#: lib/settingsaction.php:72
+msgid "Not logged in."
+msgstr "Ekki innskráð(ur)."
+
+#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122
+msgid "Not subscribed!."
+msgstr "Ekki í áskrift!"
+
+#: ../actions/opensearch.php:35 actions/opensearch.php:35
+#: actions/opensearch.php:67
+msgid "Notice Search"
+msgstr "Leit í babli"
+
+#: ../actions/showstream.php:82 actions/showstream.php:82
+#: actions/showstream.php:180 actions/showstream.php:187
+#: actions/showstream.php:192
+#, php-format
+msgid "Notice feed for %s"
+msgstr "Bablveita fyrir %s"
+
+#: ../actions/shownotice.php:39 actions/shownotice.php:39
+#: actions/shownotice.php:94
+msgid "Notice has no profile"
+msgstr "Babl hefur enga persónulega síðu"
+
+#: ../actions/showstream.php:316 actions/showstream.php:331
+#: actions/showstream.php:504 lib/facebookaction.php:477 lib/mailbox.php:116
+#: lib/noticelist.php:87
+msgid "Notices"
+msgstr "Babl"
+
+#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
+#: actions/tag.php:81 actions/tag.php:41
+#, php-format
+msgid "Notices tagged with %s"
+msgstr "Babl merkt með %s"
+
+#: ../actions/password.php:39 actions/profilesettings.php:178
+#: actions/passwordsettings.php:97
+msgid "Old password"
+msgstr "Eldra lykilorð"
+
+#: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
+#: lib/util.php:330 lib/accountsettingsaction.php:116 lib/action.php:341
+#: lib/logingroupnav.php:81
+msgid "OpenID"
+msgstr "OpenID"
+
+#: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
+#: actions/finishopenidlogin.php:73
+msgid "OpenID Account Setup"
+msgstr "Uppsetning OpenID aðgangs"
+
+#: ../lib/openid.php:180 lib/openid.php:180 lib/openid.php:266
+msgid "OpenID Auto-Submit"
+msgstr "Sjálfvirk innsending OpenID"
+
+#: ../actions/finishaddopenid.php:99 ../actions/finishopenidlogin.php:140
+#: ../actions/openidlogin.php:60 actions/finishaddopenid.php:99
+#: actions/finishopenidlogin.php:146 actions/openidlogin.php:68
+#: actions/finishaddopenid.php:170 actions/openidlogin.php:80
+msgid "OpenID Login"
+msgstr "OpenID notendanafn"
+
+#: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
+#: actions/openidlogin.php:74 actions/openidsettings.php:50
+#: actions/openidlogin.php:102 actions/openidsettings.php:101
+msgid "OpenID URL"
+msgstr "Veffang OpenID"
+
+#: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
+#: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109
+#: actions/finishaddopenid.php:88 actions/finishopenidlogin.php:130
+msgid "OpenID authentication cancelled."
+msgstr "OpenID heimild afturkölluð."
+
+#: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
+#: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113
+#: actions/finishaddopenid.php:92 actions/finishopenidlogin.php:134
+#, php-format
+msgid "OpenID authentication failed: %s"
+msgstr "Tókst ekki að fá OpenID heimild: %s"
+
+#: ../lib/openid.php:133 lib/openid.php:133 lib/openid.php:142
+#, php-format
+msgid "OpenID failure: %s"
+msgstr "OpenID mistókst: %s"
+
+#: ../actions/openidsettings.php:144 actions/openidsettings.php:153
+#: actions/openidsettings.php:231
+msgid "OpenID removed."
+msgstr "OpenID fjarlægt."
+
+#: ../actions/openidsettings.php:37 actions/openidsettings.php:37
+#: actions/openidsettings.php:59
+msgid "OpenID settings"
+msgstr "Stillingar OpenID"
+
+#: ../actions/invite.php:135 actions/invite.php:143 actions/invite.php:180
+msgid "Optionally add a personal message to the invitation."
+msgstr "Bættu persónulegum skilaboðum við boðskortið ef þú vilt."
+
+#: ../actions/avatar.php:84 actions/profilesettings.php:321
+#: lib/imagefile.php:75
+msgid "Partial upload."
+msgstr "Upphal að hluta til."
+
+#: ../actions/finishopenidlogin.php:90 ../actions/login.php:102
+#: ../actions/register.php:153 ../lib/settingsaction.php:93
+#: actions/finishopenidlogin.php:96 actions/login.php:102
+#: actions/register.php:167 actions/finishopenidlogin.php:118
+#: actions/login.php:231 actions/register.php:372
+#: lib/accountsettingsaction.php:110 lib/facebookaction.php:311
+msgid "Password"
+msgstr "Lykilorð"
+
+#: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
+#: actions/recoverpassword.php:335
+msgid "Password and confirmation do not match."
+msgstr "Lykilorð og staðfesting passa ekki saman."
+
+#: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
+#: actions/recoverpassword.php:331
+msgid "Password must be 6 chars or more."
+msgstr "Lykilorð verður að vera 6 tákn eða fleiri."
+
+#: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
+#: actions/recoverpassword.php:267 actions/recoverpassword.php:269
+#: actions/recoverpassword.php:199 actions/recoverpassword.php:301
+msgid "Password recovery requested"
+msgstr "Beiðni um að endurheimta lykilorð hefur verið send inn"
+
+#: ../actions/password.php:89 ../actions/recoverpassword.php:313
+#: actions/profilesettings.php:408 actions/recoverpassword.php:326
+#: actions/passwordsettings.php:173 actions/recoverpassword.php:200
+msgid "Password saved."
+msgstr "Lykilorð vistað."
+
+#: ../actions/password.php:61 ../actions/register.php:88
+#: actions/profilesettings.php:380 actions/register.php:98
+#: actions/passwordsettings.php:145 actions/register.php:183
+msgid "Passwords don't match."
+msgstr "Lykilorðin passa ekki saman."
+
+#: ../lib/searchaction.php:100 lib/searchaction.php:100
+#: lib/searchgroupnav.php:80
+msgid "People"
+msgstr "Fólk"
+
+#: ../actions/opensearch.php:33 actions/opensearch.php:33
+#: actions/opensearch.php:64
+msgid "People Search"
+msgstr "Leit að fólki"
+
+#: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33
+#: actions/peoplesearch.php:58
+msgid "People search"
+msgstr "Leit að fólki"
+
+#: ../lib/stream.php:50 lib/personal.php:50 lib/personalgroupnav.php:98
+msgid "Personal"
+msgstr "Persónulegt"
+
+#: ../actions/invite.php:133 actions/invite.php:141 actions/invite.php:178
+msgid "Personal message"
+msgstr "Persónuleg skilaboð"
+
+#: ../actions/smssettings.php:69 actions/smssettings.php:69
+msgid "Phone number, no punctuation or spaces, with area code"
+msgstr "Símanúmer, með svæðisnúmeri ef við á, án greinarmerkja eða bila"
+
+#: ../actions/userauthorization.php:78
+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 \"Cancel\"."
+msgstr ""
+"Vinsamlegast athugaðu þessi atriði til þess að vera viss um að þú viljir "
+"gerast áskrifandi að babli þessa notanda. Ef þú baðst ekki um að gerast "
+"áskrifandi að babli, smelltu þá á \"Hætta við\"."
+
+#: ../actions/imsettings.php:73 actions/imsettings.php:74
+#: actions/imsettings.php:142
+msgid "Post a notice when my Jabber/GTalk status changes."
+msgstr "Senda inn babl þegar Jabber/GTalk staðan breytist."
+
+#: ../actions/emailsettings.php:85 ../actions/imsettings.php:67
+#: ../actions/smssettings.php:94 actions/emailsettings.php:86
+#: actions/imsettings.php:68 actions/smssettings.php:94
+#: actions/twittersettings.php:70 actions/emailsettings.php:147
+#: actions/imsettings.php:133 actions/smssettings.php:157
+#: actions/twittersettings.php:134
+msgid "Preferences"
+msgstr "Stillingar"
+
+#: ../actions/emailsettings.php:162 ../actions/imsettings.php:144
+#: ../actions/smssettings.php:163 actions/emailsettings.php:180
+#: actions/imsettings.php:152 actions/smssettings.php:171
+#: actions/emailsettings.php:286 actions/imsettings.php:258
+#: actions/othersettings.php:168 actions/smssettings.php:272
+msgid "Preferences saved."
+msgstr "Stillingar vistaðar."
+
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+#: actions/profilesettings.php:129
+msgid "Preferred language"
+msgstr "Tungumál (ákjósanlegt)"
+
+#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572
+msgid "Privacy"
+msgstr "Friðhelgi"
+
+#: ../classes/Notice.php:95 ../classes/Notice.php:106 classes/Notice.php:109
+#: classes/Notice.php:119 classes/Notice.php:145 classes/Notice.php:155
+msgid "Problem saving notice."
+msgstr "Vandamál komu upp við að vista babl."
+
+#: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
+#: lib/settingsaction.php:84 lib/accountsettingsaction.php:104
+#: lib/personalgroupnav.php:108
+msgid "Profile"
+msgstr "Persónuleg síða"
+
+#: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
+#: actions/remotesubscribe.php:109
+msgid "Profile URL"
+msgstr "Veffang persónulegrar síðu"
+
+#: ../actions/profilesettings.php:34 actions/profilesettings.php:32
+#: actions/profilesettings.php:58
+msgid "Profile settings"
+msgstr "Stillingar persónulegrar síðu"
+
+#: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
+#: actions/postnotice.php:52 actions/updateprofile.php:53
+#: actions/postnotice.php:55 actions/updateprofile.php:56
+msgid "Profile unknown"
+msgstr "Persónuleg síða þekkist ekki"
+
+#: ../actions/public.php:54 actions/public.php:54 actions/public.php:124
+msgid "Public Stream Feed"
+msgstr "Skilaboðaveita almenningsrásarinnar"
+
+#: ../actions/public.php:33 actions/public.php:33 actions/public.php:109
+#: lib/publicgroupnav.php:77
+msgid "Public timeline"
+msgstr "Almenningsrás"
+
+#: ../actions/imsettings.php:79 actions/imsettings.php:80
+#: actions/imsettings.php:153
+msgid "Publish a MicroID for my Jabber/GTalk address."
+msgstr "Birta MicroID fyrir Jabber/GTalk netfangið mitt."
+
+#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
+#: actions/emailsettings.php:178
+msgid "Publish a MicroID for my email address."
+msgstr "Birta MicroID fyrir tölvupóstfangið mitt."
+
+#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
+#: actions/tag.php:76
+msgid "Recent Tags"
+msgstr "Nýleg merki"
+
+#: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
+#: actions/recoverpassword.php:190
+msgid "Recover"
+msgstr "Endurheimta"
+
+#: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
+#: actions/recoverpassword.php:198
+msgid "Recover password"
+msgstr "Endurheimta lykilorð"
+
+#: ../actions/recoverpassword.php:67 actions/recoverpassword.php:67
+#: actions/recoverpassword.php:73
+msgid "Recovery code for unknown user."
+msgstr "Lykill fyrir endurheimtingu óþekkts notanda."
+
+#: ../actions/register.php:142 ../actions/register.php:193 ../lib/util.php:312
+#: actions/register.php:152 actions/register.php:207 lib/util.php:328
+#: actions/register.php:69 actions/register.php:436 lib/action.php:338
+#: lib/facebookaction.php:277 lib/logingroupnav.php:78
+msgid "Register"
+msgstr "Nýskrá"
+
+#: ../actions/register.php:28 actions/register.php:28
+#: actions/finishopenidlogin.php:196 actions/register.php:90
+msgid "Registration not allowed."
+msgstr "Nýskráning ekki leyfð."
+
+#: ../actions/register.php:200 actions/register.php:214
+#: actions/register.php:67
+msgid "Registration successful"
+msgstr "Nýskráning tókst"
+
+#: ../actions/userauthorization.php:120 actions/userauthorization.php:127
+#: actions/userauthorization.php:144
+msgid "Reject"
+msgstr "Hafna"
+
+#: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
+#: actions/register.php:190 actions/login.php:234 actions/openidlogin.php:107
+#: actions/register.php:414
+msgid "Remember me"
+msgstr "Muna eftir mér"
+
+#: ../actions/updateprofile.php:70 actions/updateprofile.php:71
+#: actions/updateprofile.php:74
+msgid "Remote profile with no matching profile"
+msgstr "Persónuleg fjarsíða með engri persónulegri síðu sem passar"
+
+#: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
+#: actions/remotesubscribe.php:88
+msgid "Remote subscribe"
+msgstr "Fara í fjaráskrift"
+
+#: ../actions/emailsettings.php:47 ../actions/emailsettings.php:75
+#: ../actions/imsettings.php:48 ../actions/openidsettings.php:106
+#: ../actions/smssettings.php:50 ../actions/smssettings.php:84
+#: actions/emailsettings.php:48 actions/emailsettings.php:76
+#: actions/imsettings.php:49 actions/openidsettings.php:108
+#: actions/smssettings.php:50 actions/smssettings.php:84
+#: actions/twittersettings.php:59 actions/emailsettings.php:101
+#: actions/emailsettings.php:134 actions/imsettings.php:102
+#: actions/openidsettings.php:166 actions/smssettings.php:103
+#: actions/smssettings.php:146 actions/twittersettings.php:115
+msgid "Remove"
+msgstr "Fjarlægja"
+
+#: ../actions/openidsettings.php:68 actions/openidsettings.php:69
+#: actions/openidsettings.php:123
+msgid "Remove OpenID"
+msgstr "Fjarlægja OpenID"
+
+#: ../actions/openidsettings.php:73
+msgid ""
+"Removing your only OpenID would make it impossible to log in! If you need to "
+"remove it, add another OpenID first."
+msgstr ""
+"Að fjarlægja þetta eina OpenID sem þú ert með gerir innskráningu ómögulega! "
+"Ef þú þarft að fjarlægja það, búðu þá til nýtt OpenID fyrst."
+
+#: ../lib/stream.php:55 lib/personal.php:55 lib/personalgroupnav.php:103
+msgid "Replies"
+msgstr "Svör"
+
+#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:56
+#: actions/replies.php:47 actions/repliesrss.php:62 lib/personal.php:56
+#: actions/replies.php:116 actions/repliesrss.php:67
+#: lib/personalgroupnav.php:104
+#, php-format
+msgid "Replies to %s"
+msgstr "Svör við %s"
+
+#: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
+#: actions/recoverpassword.php:223
+msgid "Reset"
+msgstr "Endurstilla"
+
+#: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
+#: actions/recoverpassword.php:197
+msgid "Reset password"
+msgstr "Endurstilla lykilorð"
+
+#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
+#: actions/subscriptions.php:123 lib/connectsettingsaction.php:107
+msgid "SMS"
+msgstr "SMS"
+
+#: ../actions/smssettings.php:67 actions/smssettings.php:67
+#: actions/smssettings.php:126
+msgid "SMS Phone number"
+msgstr "SMS símanúmer"
+
+#: ../actions/smssettings.php:33 actions/smssettings.php:33
+#: actions/smssettings.php:58
+msgid "SMS Settings"
+msgstr "SMS stillingar"
+
+#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437
+msgid "SMS confirmation"
+msgstr "SMS staðfesting"
+
+#: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
+#: actions/recoverpassword.php:222
+msgid "Same as password above"
+msgstr "Sama og lykilorðið hér fyrir ofan"
+
+#: ../actions/register.php:156 actions/register.php:170
+#: actions/register.php:377
+msgid "Same as password above. Required."
+msgstr "Sama og lykilorðið hér fyrir ofan. Nauðsynlegt."
+
+#: ../actions/emailsettings.php:97 ../actions/imsettings.php:81
+#: ../actions/profilesettings.php:67 ../actions/smssettings.php:100
+#: actions/emailsettings.php:104 actions/imsettings.php:82
+#: actions/profilesettings.php:101 actions/smssettings.php:100
+#: actions/twittersettings.php:83 actions/emailsettings.php:182
+#: actions/facebooksettings.php:114 actions/imsettings.php:157
+#: actions/othersettings.php:117 actions/profilesettings.php:150
+#: actions/smssettings.php:169 actions/subscriptions.php:124
+#: actions/tagother.php:152 actions/twittersettings.php:161
+#: lib/groupeditform.php:171
+msgid "Save"
+msgstr "Vista"
+
+#: ../lib/searchaction.php:84 ../lib/util.php:300 lib/searchaction.php:84
+#: lib/util.php:316 lib/action.php:325
+msgid "Search"
+msgstr "Leita"
+
+#: ../actions/noticesearch.php:80 actions/noticesearch.php:85
+#: actions/noticesearch.php:127
+msgid "Search Stream Feed"
+msgstr "Leita í bablveitu"
+
+#: ../actions/noticesearch.php:30 actions/noticesearch.php:30
+#: actions/noticesearch.php:57
+#, 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 ""
+"Leita í innihaldi babls á %%site.name%%. Leitarorð eru aðskilin með bili og "
+"verða að vera að minnsta kosti 3 tákn."
+
+#: ../actions/peoplesearch.php:28
+#, 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 ""
+"Leita að fólki á %%site.name%% eftir nafni, staðsetningu eða áhugamáli. "
+"Leitarorð eru aðskilin með bili og verða að vera að minnsta kosti 3 tákn."
+
+#: ../actions/smssettings.php:296 actions/smssettings.php:304
+#: actions/smssettings.php:457
+msgid "Select a carrier"
+msgstr "Veldu farsímafyrirtæki"
+
+#: ../actions/invite.php:137 ../lib/util.php:1172 actions/invite.php:145
+#: lib/util.php:1306 lib/util.php:1731 actions/invite.php:182
+#: lib/messageform.php:167 lib/noticeform.php:177
+msgid "Send"
+msgstr "Senda"
+
+#: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
+#: actions/emailsettings.php:74 actions/smssettings.php:82
+#: actions/emailsettings.php:132 actions/smssettings.php:145
+msgid "Send email to this address to post new notices."
+msgstr "Sendu tölvupóst á þetta póstfang til þess að senda inn nýtt babl."
+
+#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
+#: actions/emailsettings.php:152
+msgid "Send me notices of new subscriptions through email."
+msgstr "Sendu mér tilkynningu varðandi nýjar áskriftir í gegnum tölvupóst."
+
+#: ../actions/imsettings.php:70 actions/imsettings.php:71
+#: actions/imsettings.php:137
+msgid "Send me notices through Jabber/GTalk."
+msgstr "Sendur mér babl í gegnum Jabber/GTalk."
+
+#: ../actions/smssettings.php:97 actions/smssettings.php:97
+msgid ""
+"Send me notices through SMS; I understand I may incur exorbitant charges "
+"from my carrier."
+msgstr ""
+"Sendu mér babl í gegnum SMS. Ég veit að það er möguleiki að "
+"farsímafyrirtækið rukki fyrir móttöku á SMSunum."
+
+#: ../actions/imsettings.php:76 actions/imsettings.php:77
+msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+msgstr ""
+"Sendu mér svör í gegnum Jabber/GTalk frá fólki sem ég er ekki áskrifandi að."
+
+#: ../lib/util.php:304 lib/util.php:320 lib/facebookaction.php:215
+msgid "Settings"
+msgstr "Stillingar"
+
+#: ../actions/profilesettings.php:192 actions/profilesettings.php:307
+#: actions/profilesettings.php:319
+msgid "Settings saved."
+msgstr "Stillingar vistaðar."
+
+#: ../actions/tag.php:60 actions/tag.php:60
+msgid "Showing most popular tags from the last week"
+msgstr "Sýni vinsælustu merki síðustu viku"
+
+#: ../actions/finishaddopenid.php:66 actions/finishaddopenid.php:66
+#: actions/finishaddopenid.php:114
+msgid "Someone else already has this OpenID."
+msgstr "Einhver annar hefur þetta OpenID nú þegar."
+
+#: ../actions/finishopenidlogin.php:42 ../actions/openidsettings.php:126
+#: actions/finishopenidlogin.php:47 actions/openidsettings.php:135
+#: actions/finishopenidlogin.php:52 actions/openidsettings.php:202
+msgid "Something weird happened."
+msgstr "Eitthvað undarlegt gerðist."
+
+#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
+#: scripts/maildaemon.php:61
+msgid "Sorry, no incoming email allowed."
+msgstr "Því miður er móttökutölvupóstur ekki leyfður."
+
+#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
+#: scripts/maildaemon.php:57
+msgid "Sorry, that is not your incoming email address."
+msgstr "Afsakið en þetta er ekki móttökutölvupóstfangið þitt."
+
+#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574
+msgid "Source"
+msgstr "Frumþula"
+
+#: ../actions/showstream.php:296 actions/showstream.php:311
+#: actions/showstream.php:476
+msgid "Statistics"
+msgstr "Tölfræði"
+
+#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
+#: actions/finishopenidlogin.php:188 actions/finishopenidlogin.php:252
+#: actions/finishopenidlogin.php:222 actions/finishopenidlogin.php:290
+msgid "Stored OpenID not found."
+msgstr "Vista OpenID fannst ekki."
+
+#: ../actions/remotesubscribe.php:75 ../actions/showstream.php:188
+#: ../actions/showstream.php:197 actions/remotesubscribe.php:84
+#: actions/showstream.php:197 actions/showstream.php:206
+#: actions/remotesubscribe.php:113 actions/showstream.php:376
+#: lib/subscribeform.php:139
+msgid "Subscribe"
+msgstr "Gerast áskrifandi"
+
+#: ../actions/showstream.php:313 ../actions/subscribers.php:27
+#: actions/showstream.php:328 actions/subscribers.php:27
+#: actions/showstream.php:436 actions/showstream.php:498
+#: lib/subgroupnav.php:88
+msgid "Subscribers"
+msgstr "Ãskrifendur"
+
+#: ../actions/userauthorization.php:310 actions/userauthorization.php:322
+#: actions/userauthorization.php:338
+msgid "Subscription authorized"
+msgstr "Ãskrift heimiluð"
+
+#: ../actions/userauthorization.php:320 actions/userauthorization.php:332
+#: actions/userauthorization.php:349
+msgid "Subscription rejected"
+msgstr "Ãskrift hafnað"
+
+#: ../actions/showstream.php:230 ../actions/showstream.php:307
+#: ../actions/subscriptions.php:27 actions/showstream.php:240
+#: actions/showstream.php:322 actions/subscriptions.php:27
+#: actions/showstream.php:407 actions/showstream.php:489
+#: lib/subgroupnav.php:80
+msgid "Subscriptions"
+msgstr "Ãskriftir"
+
+#: ../actions/avatar.php:87 actions/profilesettings.php:324
+#: lib/imagefile.php:78
+msgid "System error uploading file."
+msgstr "Kerfisvilla kom upp við upphal skráar."
+
+#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
+#: lib/util.php:317 actions/profilesettings.php:122 actions/showstream.php:297
+#: actions/tagother.php:147 actions/tagother.php:207 lib/profilelist.php:162
+#: lib/profilelist.php:164
+msgid "Tags"
+msgstr "Merki"
+
+#: ../lib/searchaction.php:104 lib/searchaction.php:104
+msgid "Text"
+msgstr "Texti"
+
+#: ../actions/noticesearch.php:34 actions/noticesearch.php:34
+#: actions/noticesearch.php:67
+msgid "Text search"
+msgstr "Textaleit"
+
+#: ../actions/openidsettings.php:140 actions/openidsettings.php:149
+#: actions/openidsettings.php:227
+msgid "That OpenID does not belong to you."
+msgstr "Þetta OpenID tilheyrir þér ekki."
+
+#: ../actions/confirmaddress.php:52 actions/confirmaddress.php:52
+#: actions/confirmaddress.php:94
+msgid "That address has already been confirmed."
+msgstr "Þetta tölvupóstfang hefur nú þegar verið staðfest."
+
+#: ../actions/confirmaddress.php:43 actions/confirmaddress.php:43
+#: actions/confirmaddress.php:85
+msgid "That confirmation code is not for you!"
+msgstr "Þessi staðfestingarlykill er ekki fyrir þig!"
+
+#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
+msgid "That email address already belongs to another user."
+msgstr "Þetta tölvupóstfang tilheyrir öðrum notanda."
+
+#: ../actions/avatar.php:80 actions/profilesettings.php:317
+#: lib/imagefile.php:71
+msgid "That file is too big."
+msgstr "Þessi skrá er of stór."
+
+#: ../actions/imsettings.php:170 actions/imsettings.php:178
+#: actions/imsettings.php:293
+msgid "That is already your Jabber ID."
+msgstr "Þetta er nú þegar Jabber-kennið þitt."
+
+#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
+#: actions/emailsettings.php:318
+msgid "That is already your email address."
+msgstr "Þetta er nú þegar tölvupóstfangið þitt."
+
+#: ../actions/smssettings.php:188 actions/smssettings.php:196
+#: actions/smssettings.php:306
+msgid "That is already your phone number."
+msgstr "Þetta er nú þegar símanúmerið þitt."
+
+#: ../actions/imsettings.php:233 actions/imsettings.php:241
+#: actions/imsettings.php:381
+msgid "That is not your Jabber ID."
+msgstr "Þetta er ekki Jabber-kennið þitt."
+
+#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
+#: actions/emailsettings.php:397
+msgid "That is not your email address."
+msgstr "Þetta er ekki tölvupóstfangið þitt."
+
+#: ../actions/smssettings.php:257 actions/smssettings.php:265
+#: actions/smssettings.php:393
+msgid "That is not your phone number."
+msgstr "Þetta er ekki símanúmerið þitt."
+
+#: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
+#: actions/emailsettings.php:244 actions/imsettings.php:218
+#: actions/emailsettings.php:367 actions/imsettings.php:349
+msgid "That is the wrong IM address."
+msgstr "Þetta er rangt snarskilaboðafang."
+
+#: ../actions/smssettings.php:233 actions/smssettings.php:241
+#: actions/smssettings.php:362
+msgid "That is the wrong confirmation number."
+msgstr "Þetta er rangur staðfestingarlykill."
+
+#: ../actions/smssettings.php:191 actions/smssettings.php:199
+#: actions/smssettings.php:309
+msgid "That phone number already belongs to another user."
+msgstr "Þetta símanúmer tilheyri nú þegar öðrum notanda."
+
+#: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
+#: actions/newnotice.php:49 actions/twitapistatuses.php:330
+#: actions/facebookhome.php:243 actions/twitapistatuses.php:276
+msgid "That's too long. Max notice size is 140 chars."
+msgstr "Þetta er of langt. Hámarkslengd babls er 140 tákn."
+
+#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
+#: actions/twitapiaccount.php:62
+msgid "That's too long. Max notice size is 255 chars."
+msgstr "Þetta er of langt. Hámarkslengd babls er 255 tákn."
+
+#: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
+#, php-format
+msgid "The address \"%s\" has been confirmed for your account."
+msgstr "Þetta tölvupóstfang, \"%s\", hefur verið staðfest fyrir aðganginn þinn."
+
+#: ../actions/emailsettings.php:264 ../actions/imsettings.php:250
+#: ../actions/smssettings.php:274 actions/emailsettings.php:282
+#: actions/imsettings.php:258 actions/smssettings.php:282
+#: actions/emailsettings.php:416 actions/imsettings.php:402
+#: actions/smssettings.php:413
+msgid "The address was removed."
+msgstr "Tölvupóstfangið hefur verið fjarlægt."
+
+#: ../actions/userauthorization.php:312
+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 ""
+"Ãskriftin hefur verið heimiluð en afturkallsveffang var ekki sent. Athugaðu "
+"leiðbeiningar síðunnar um það hvernig á að heimila áskrift. Ãskriftartókinn "
+"þinn er;"
+
+#: ../actions/userauthorization.php:322
+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 ""
+"Ãskriftinni hefur verið hafnað en afturkallsveffang var ekki sent. Athugaðu "
+"leiðbeiningar síðunnar um það hvernig á að hafna áskrift alveg."
+
+#: ../actions/subscribers.php:35 actions/subscribers.php:35
+#, php-format
+msgid "These are the people who listen to %s's notices."
+msgstr "Þetta er fólkið sem hlustar á bablið í %s."
+
+#: ../actions/subscribers.php:33 actions/subscribers.php:33
+msgid "These are the people who listen to your notices."
+msgstr "Þetta er fólkið sem hlustar á bablið í þér."
+
+#: ../actions/subscriptions.php:35 actions/subscriptions.php:35
+#, php-format
+msgid "These are the people whose notices %s listens to."
+msgstr "Þetta er fólkið sem %s hlustar á bablið í."
+
+#: ../actions/subscriptions.php:33 actions/subscriptions.php:33
+msgid "These are the people whose notices you listen to."
+msgstr "Þetta er fólkið sem þú hlustar á bablið í."
+
+#: ../actions/invite.php:89 actions/invite.php:96 actions/invite.php:128
+msgid ""
+"These people are already users and you were automatically subscribed to them:"
+msgstr ""
+"Þetta fólk er nú þegar notendur og þú varðst sjálfkrafa áskrifandi að þeim:"
+
+#: ../actions/recoverpassword.php:88
+msgid "This confirmation code is too old. Please start again."
+msgstr ""
+"Þessi staðfestingarlykill er of gamall. Vinsamlegast byrjaðu aftur upp á "
+"nýtt."
+
+#: ../lib/openid.php:195
+msgid ""
+"This form should automatically submit itself. If not, click the submit "
+"button to go to your OpenID provider."
+msgstr ""
+"Þetta eyðublað ætti að sendast inn sjálfkrafa. Ef ekki smelltu þá á "
+"innsendingartakkann til að fara til OpenID þjónustuaðilans þíns."
+
+#: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
+#: actions/finishopenidlogin.php:67
+#, php-format
+msgid ""
+"This is the first time you've logged into %s so we must connect your OpenID "
+"to a local account. You can either create a new account, or connect with "
+"your existing account, if you have one."
+msgstr ""
+"Þetta er í fyrsta skipti sem þú skráir þig inn á %s þannig að við verðum að "
+"tengja OpenID aðganginn þinn við staðbundinn aðgang. Þú getur annaðhvort "
+"búið til nýjan aðgang eða tengst við aðgan sem þú hefur nú þegar búið til."
+
+#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
+#: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
+#: actions/twitapistatuses.php:511 actions/twitapifavorites.php:97
+#: actions/twitapifriendships.php:85 actions/twitapistatuses.php:436
+msgid "This method requires a POST or DELETE."
+msgstr "Þessi aðferð krefst POST eða DELETE."
+
+#: ../actions/twitapiaccount.php:65 ../actions/twitapifriendships.php:44
+#: ../actions/twitapistatuses.php:381 actions/twitapiaccount.php:63
+#: actions/twitapidirect_messages.php:114 actions/twitapifriendships.php:44
+#: actions/twitapistatuses.php:303 actions/twitapiaccount.php:53
+#: actions/twitapidirect_messages.php:122 actions/twitapifriendships.php:32
+#: actions/twitapistatuses.php:244
+msgid "This method requires a POST."
+msgstr "Þessi aðferð krefst POST."
+
+#: ../lib/util.php:164 lib/util.php:246
+msgid "This page is not available in a media type you accept"
+msgstr ""
+"Þessi síða er ekki aðgengileg í margmiðlunargerðinni sem þú tekur á móti"
+
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+#: actions/profilesettings.php:138
+msgid "Timezone"
+msgstr "Tímabelti"
+
+#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
+#: actions/profilesettings.php:211
+msgid "Timezone not selected."
+msgstr "Tímabelti ekki valið."
+
+#: ../actions/remotesubscribe.php:43
+#, 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 ""
+"Til þess að gerast áskrifandi getur þú [skráð þig inn](%%action.login%%) eða "
+"[nýskráð þig](%%action.register%%). Ef þú hefur nú þegar búið til aðgang á "
+"[samvirkandi örbloggsþjónustu](%%doc.openmublog%%), sláðu þá inn veffang "
+"persónulegu síðunnar þinnar hér fyrir neðan."
+
+#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
+#: actions/twitapifriendships.php:132
+msgid "Two user ids or screen_names must be supplied."
+msgstr "Tvo notendakenni eða skjáarnöfn verða að vera uppgefin."
+
+#: ../actions/profilesettings.php:48 ../actions/register.php:169
+#: actions/profilesettings.php:81 actions/register.php:183
+#: actions/profilesettings.php:109
+msgid "URL of your homepage, blog, or profile on another site"
+msgstr ""
+"Veffang heimasíðunnar þinnar, bloggsins þíns eða persónulegrar síðu á öðru "
+"vefsvæði"
+
+#: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
+#: actions/remotesubscribe.php:110
+msgid "URL of your profile on another compatible microblogging service"
+msgstr "Veffang persónulegrar síðu á samvirkandi örbloggsþjónustu"
+
+#: ../actions/emailsettings.php:130 ../actions/imsettings.php:110
+#: ../actions/recoverpassword.php:39 ../actions/smssettings.php:135
+#: actions/emailsettings.php:144 actions/imsettings.php:118
+#: actions/recoverpassword.php:39 actions/smssettings.php:143
+#: actions/twittersettings.php:108 actions/avatarsettings.php:258
+#: actions/emailsettings.php:242 actions/grouplogo.php:317
+#: actions/imsettings.php:214 actions/recoverpassword.php:44
+#: actions/smssettings.php:236 actions/twittersettings.php:302
+msgid "Unexpected form submission."
+msgstr "Bjóst ekki við innsendingu eyðublaðs."
+
+#: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
+#: actions/recoverpassword.php:323
+msgid "Unexpected password reset."
+msgstr "Bjóst ekki við endurstillingu lykilorðs."
+
+#: ../index.php:57 index.php:57 actions/recoverpassword.php:202
+msgid "Unknown action"
+msgstr "Óþekkt aðgerð"
+
+#: ../actions/finishremotesubscribe.php:58
+#: actions/finishremotesubscribe.php:60 actions/finishremotesubscribe.php:61
+msgid "Unknown version of OMB protocol."
+msgstr "Óþekkt útgáfa OMB samskiptamátans."
+
+#: ../lib/util.php:269 lib/util.php:285
+msgid ""
+"Unless otherwise specified, contents of this site are copyright by the "
+"contributors and available under the "
+msgstr ""
+"Nema að annað sé tekið fram þá er innihald þessarar síðu varið með "
+"höfundaréttarvernd og aðgengilegt undir "
+
+#: ../actions/confirmaddress.php:48 actions/confirmaddress.php:48
+#: actions/confirmaddress.php:90
+#, php-format
+msgid "Unrecognized address type %s"
+msgstr "Óþekkt gerð tölvupóstfangs %s"
+
+#: ../actions/showstream.php:209 actions/showstream.php:219
+#: lib/unsubscribeform.php:137
+msgid "Unsubscribe"
+msgstr "Fara úr áskrift"
+
+#: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
+#: actions/postnotice.php:45 actions/updateprofile.php:46
+#: actions/postnotice.php:48 actions/updateprofile.php:49
+msgid "Unsupported OMB version"
+msgstr "OMB útgáfa ekki studd"
+
+#: ../actions/avatar.php:105 actions/profilesettings.php:342
+#: lib/imagefile.php:102
+msgid "Unsupported image file format."
+msgstr "Skráarsnið myndar ekki stutt."
+
+#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
+#: lib/connectsettingsaction.php:108
+msgid "Updates by SMS"
+msgstr "Færslur sendar með SMS"
+
+#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
+#: lib/connectsettingsaction.php:105
+msgid "Updates by instant messenger (IM)"
+msgstr "Færslur sendar með snarskilaboðaþjónustu (instant messaging)"
+
+#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
+#: actions/twitapistatuses.php:129
+#, php-format
+msgid "Updates from %1$s and friends on %2$s!"
+msgstr "Færslur frá %1$s og vinum á %2$s!"
+
+#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
+#: actions/twitapistatuses.php:202
+#, php-format
+msgid "Updates from %1$s on %2$s!"
+msgstr "Færslur frá %1$s á %2$s!"
+
+#: ../actions/avatar.php:68 actions/profilesettings.php:161
+#: actions/avatarsettings.php:162 actions/grouplogo.php:232
+msgid "Upload"
+msgstr "Hlaða upp"
+
+#: ../actions/avatar.php:27
+msgid ""
+"Upload a new \"avatar\" (user image) here. You can't edit the picture after "
+"you upload it, so make sure it's more or less square. It must be under the "
+"site license, also. Use a picture that belongs to you and that you want to "
+"share."
+msgstr ""
+"Þú getur hlaðið upp nýrri mynd (notendamynd) hér. Þú getur ekki breytt "
+"myndinni eftir að þú hefur hlaðið henni upp þannig að vertu viss um að hún "
+"sé ferningur. Myndin verður líka að vera gefin út undir leyfi vefsvæðisins. "
+"Notaðu mynd sem tilheyrir þér og þú vilt deila með öðrum."
+
+#: ../lib/settingsaction.php:91
+msgid "Upload a new profile image"
+msgstr "Hlaða upp mynd á persónulega síðu"
+
+#: ../actions/invite.php:114 actions/invite.php:121 actions/invite.php:154
+msgid ""
+"Use this form to invite your friends and colleagues to use this service."
+msgstr ""
+"Notaðu þetta eyðublað til þess að bjóða vinum þínum og kunningjum að nota "
+"þessa örbloggsþjónustu."
+
+#: ../actions/register.php:159 ../actions/register.php:162
+#: actions/register.php:173 actions/register.php:176
+msgid "Used only for updates, announcements, and password recovery"
+msgstr ""
+"Aðeins notað fyrir uppfærslur, tilkynningar og endurheimtingu lykilorða."
+
+#: ../actions/finishremotesubscribe.php:86
+#: actions/finishremotesubscribe.php:88 actions/finishremotesubscribe.php:94
+msgid "User being listened to doesn't exist."
+msgstr "Notandi sem verið er að hlusta á er ekki til."
+
+#: ../actions/all.php:41 ../actions/avatarbynickname.php:48
+#: ../actions/foaf.php:47 ../actions/replies.php:41
+#: ../actions/showstream.php:44 ../actions/twitapiaccount.php:82
+#: ../actions/twitapistatuses.php:319 ../actions/twitapistatuses.php:685
+#: ../actions/twitapiusers.php:82 actions/all.php:41
+#: actions/avatarbynickname.php:48 actions/foaf.php:47 actions/replies.php:41
+#: actions/showfavorites.php:41 actions/showstream.php:44
+#: actions/twitapiaccount.php:80 actions/twitapifavorites.php:68
+#: actions/twitapistatuses.php:235 actions/twitapistatuses.php:609
+#: actions/twitapiusers.php:87 lib/mailbox.php:50
+#: actions/avatarbynickname.php:80 actions/foaf.php:48 actions/replies.php:80
+#: actions/showstream.php:107 actions/twitapiaccount.php:70
+#: actions/twitapifavorites.php:42 actions/twitapistatuses.php:167
+#: actions/twitapistatuses.php:503 actions/twitapiusers.php:55
+#: actions/usergroups.php:99 lib/galleryaction.php:67 lib/twitterapi.php:626
+msgid "User has no profile."
+msgstr "Notandi hefur enga persónulega síðu."
+
+#: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
+#: actions/remotesubscribe.php:105
+msgid "User nickname"
+msgstr "Stuttnefni notanda"
+
+#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
+msgid "User not found."
+msgstr "Notandi fannst ekki."
+
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+#: actions/profilesettings.php:139
+msgid "What timezone are you normally in?"
+msgstr "à hvaða tímabelti eru í rauninni?"
+
+#: ../lib/util.php:1159 lib/util.php:1293 lib/noticeform.php:141
+#, php-format
+msgid "What's up, %s?"
+msgstr "Hvað er að frétta %s?"
+
+#: ../actions/profilesettings.php:54 ../actions/register.php:175
+#: actions/profilesettings.php:87 actions/register.php:189
+#: actions/profilesettings.php:119
+msgid "Where you are, like \"City, State (or Region), Country\""
+msgstr "Staðsetning þín, eins og \"borg, sýsla, land\""
+
+#: ../actions/updateprofile.php:128 actions/updateprofile.php:129
+#: actions/updateprofile.php:132
+#, php-format
+msgid "Wrong image type for '%s'"
+msgstr "Röng gerð myndar fyrir '%s'"
+
+#: ../actions/updateprofile.php:123 actions/updateprofile.php:124
+#: actions/updateprofile.php:127
+#, php-format
+msgid "Wrong size image at '%s'"
+msgstr "Röng stærð myndar á '%s'"
+
+#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
+#: actions/deletenotice.php:64 actions/deletenotice.php:79
+#: actions/block.php:148 actions/deletenotice.php:122
+#: actions/deletenotice.php:141
+msgid "Yes"
+msgstr "Já"
+
+#: ../actions/finishaddopenid.php:64 actions/finishaddopenid.php:64
+#: actions/finishaddopenid.php:112
+msgid "You already have this OpenID!"
+msgstr "Þú ert nú þegar með þetta OpenID!"
+
+#: ../actions/deletenotice.php:37 actions/deletenotice.php:37
+msgid ""
+"You are about to permanently delete a notice. Once this is done, it cannot "
+"be undone."
+msgstr ""
+"Þú ert í þann mund að eyða babli alveg. Þessi aðgerð getur ekki verið "
+"afturkölluð."
+
+#: ../actions/recoverpassword.php:31 actions/recoverpassword.php:31
+#: actions/recoverpassword.php:36
+msgid "You are already logged in!"
+msgstr "Þú ert nú þegar innskráð(ur)!"
+
+#: ../actions/invite.php:81 actions/invite.php:88 actions/invite.php:120
+msgid "You are already subscribed to these users:"
+msgstr "Þú ert nú þegar í áskrift að þessum notendum:"
+
+#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
+#: actions/twitapifriendships.php:105
+msgid "You are not friends with the specified user."
+msgstr "Þú ert ekki vinur þessa notanda."
+
+#: ../actions/password.php:27
+msgid "You can change your password here. Choose a good one!"
+msgstr "Þú getur breytt lykilorðinu þínu hér. Veldu eitthvað gott lykilorð!"
+
+#: ../actions/register.php:135 actions/register.php:145
+msgid "You can create a new account to start posting notices."
+msgstr "Þú getur búið til nýjan aðgang og byrjað að babla."
+
+#: ../actions/smssettings.php:28 actions/smssettings.php:28
+#: actions/smssettings.php:69
+#, php-format
+msgid "You can receive SMS messages through email from %%site.name%%."
+msgstr "Þú getur fengið SMS í gegnum tölvupóst frá %%site.name%%."
+
+#: ../actions/openidsettings.php:86
+msgid ""
+"You can remove an OpenID from your account by clicking the button marked "
+"\"Remove\"."
+msgstr ""
+"Þú getur fjarlægt OpenID aðganginn frá þínum aðgangi með því að smella á "
+"hnappinn sem er merktur \"Fjarlægja\"."
+
+#: ../actions/imsettings.php:28 actions/imsettings.php:28
+#, php-format
+msgid ""
+"You can send and receive notices through Jabber/GTalk [instant messages](%%"
+"doc.im%%). Configure your address and settings below."
+msgstr ""
+"Þú getur sent og tekið á móti babli í gegnum Jabber/GTalk "
+"[snarskilaboðaþjónustuna](%%doc.im%%). Settu upp netfangið þitt hér fyrir "
+"neðan og stilltu notkunina."
+
+#: ../actions/profilesettings.php:27
+msgid ""
+"You can update your personal profile info here so people know more about you."
+msgstr ""
+"Þú getur uppfært persónulegu síðuna þína hér þannig að fólk geti lært meira "
+"um þig."
+
+#: ../actions/finishremotesubscribe.php:31 ../actions/remotesubscribe.php:31
+#: actions/finishremotesubscribe.php:31 actions/remotesubscribe.php:31
+#: actions/finishremotesubscribe.php:33 actions/finishremotesubscribe.php:85
+#: actions/finishremotesubscribe.php:101 actions/remotesubscribe.php:35
+msgid "You can use the local subscription!"
+msgstr "Þú getur notað staðbundna áskrift!"
+
+#: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
+#: actions/finishopenidlogin.php:38 actions/register.php:68
+#: actions/finishopenidlogin.php:43
+msgid "You can't register if you don't agree to the license."
+msgstr "Þú getur ekki nýskráð þig nema þú samþykkir leyfið."
+
+#: ../actions/updateprofile.php:63 actions/updateprofile.php:64
+#: actions/updateprofile.php:67
+msgid "You did not send us that profile"
+msgstr "Þú sendir okkur ekki þessa persónulegu síðu"
+
+#: ../lib/mail.php:147
+#, 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 ""
+"Þú hefur nýtt bablpóstfang á %1$s.\n"
+"\n"
+"Sendu tölvupóst á %2$s til að senda inn babl.\n"
+"\n"
+"Ãtarlegri tölvupóstleiðbeiningar eru á %3$s.\n"
+"\n"
+"Með kærri kveðju,\n"
+"%4$s"
+
+#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
+#: actions/twitapistatuses.php:463
+msgid "You may not delete another user's status."
+msgstr "Þú getur ekki eytt stöðu annars notanda."
+
+#: ../actions/invite.php:31 actions/invite.php:31 actions/invite.php:39
+#, php-format
+msgid "You must be logged in to invite other users to use %s"
+msgstr "Þú verður að vera innskráð(ur) til að geta boðið öðrum að nota %s"
+
+#: ../actions/invite.php:103 actions/invite.php:110 actions/invite.php:142
+msgid ""
+"You will be notified when your invitees accept the invitation and register "
+"on the site. Thanks for growing the community!"
+msgstr ""
+"Við sendum þér tilkynningu þegar þeir sem þú býður samþykkja boðskortið og "
+"skrá sig á síðuna. Takk fyrir að stækka samfélagið!"
+
+#: ../actions/recoverpassword.php:149
+msgid "You've been identified. Enter a new password below. "
+msgstr "Auðkenning á þér tókst. Sláðu inn nýtt lykilorð hér fyrir neðan."
+
+#: ../actions/openidlogin.php:67 actions/openidlogin.php:76
+#: actions/openidlogin.php:104
+msgid "Your OpenID URL"
+msgstr "OpenID veffangið þitt"
+
+#: ../actions/recoverpassword.php:164
+msgid "Your nickname on this server, or your registered email address."
+msgstr "Stuttnefnið þitt á þessum vefþjóni eða skráða tölvupóstfangið."
+
+#: ../actions/openidsettings.php:28
+#, php-format
+msgid ""
+"[OpenID](%%doc.openid%%) lets you log into many sites with the same user "
+"account. Manage your associated OpenIDs from here."
+msgstr ""
+"[OpenID](%%doc.openid%%) leyfir þér að skrá þig inn á mörg vefsvæði með sama "
+"notendaaðgangi. Stjórnaðu OpenID tengingunum þínum hér."
+
+#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945
+msgid "a few seconds ago"
+msgstr "fyrir nokkrum sekúndum"
+
+#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957
+#, php-format
+msgid "about %d days ago"
+msgstr "fyrir um %d dögum síðan"
+
+#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953
+#, php-format
+msgid "about %d hours ago"
+msgstr "fyrir um %d klukkutímum síðan"
+
+#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949
+#, php-format
+msgid "about %d minutes ago"
+msgstr "fyrir um %d mínútum síðan"
+
+#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961
+#, php-format
+msgid "about %d months ago"
+msgstr "fyrir um %d mánuðum síðan"
+
+#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955
+msgid "about a day ago"
+msgstr "fyrir um einum degi síðan"
+
+#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947
+msgid "about a minute ago"
+msgstr "fyrir um einni mínútu síðan"
+
+#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959
+msgid "about a month ago"
+msgstr "fyrir um einum mánuði síðan"
+
+#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963
+msgid "about a year ago"
+msgstr "fyrir um einu ári síðan"
+
+#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951
+msgid "about an hour ago"
+msgstr "fyrir um einum klukkutíma síðan"
+
+#: ../actions/showstream.php:423 ../lib/stream.php:132
+#: actions/showstream.php:441 lib/stream.php:99
+msgid "delete"
+msgstr "eyða"
+
+#: ../actions/noticesearch.php:130 ../actions/showstream.php:408
+#: ../lib/stream.php:117 actions/noticesearch.php:136
+#: actions/showstream.php:426 lib/stream.php:84 actions/noticesearch.php:187
+msgid "in reply to..."
+msgstr "svar við..."
+
+#: ../actions/noticesearch.php:137 ../actions/showstream.php:415
+#: ../lib/stream.php:124 actions/noticesearch.php:143
+#: actions/showstream.php:433 lib/stream.php:91 actions/noticesearch.php:194
+msgid "reply"
+msgstr "svara"
+
+#: ../actions/password.php:44 actions/profilesettings.php:183
+#: actions/passwordsettings.php:106
+msgid "same as password above"
+msgstr "sama og lykilorðið hér fyrir ofan"
+
+#: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
+#: actions/twitapistatuses.php:555
+msgid "unsupported file type"
+msgstr "skráargerð ekki studd"
+
+#: ../lib/util.php:1309 lib/util.php:1443
+msgid "« After"
+msgstr "« Fyrri"
+
+#: actions/deletenotice.php:74 actions/disfavor.php:43
+#: actions/emailsettings.php:127 actions/favor.php:45
+#: actions/finishopenidlogin.php:33 actions/imsettings.php:105
+#: actions/invite.php:46 actions/newmessage.php:45 actions/openidlogin.php:36
+#: actions/openidsettings.php:123 actions/profilesettings.php:47
+#: actions/recoverpassword.php:282 actions/register.php:42
+#: actions/remotesubscribe.php:40 actions/smssettings.php:124
+#: actions/subscribe.php:44 actions/twittersettings.php:97
+#: actions/unsubscribe.php:41 actions/userauthorization.php:35
+#: actions/block.php:64 actions/disfavor.php:74 actions/favor.php:77
+#: actions/finishopenidlogin.php:38 actions/invite.php:54 actions/nudge.php:80
+#: actions/openidlogin.php:37 actions/recoverpassword.php:316
+#: actions/subscribe.php:46 actions/unblock.php:65 actions/unsubscribe.php:43
+msgid "There was a problem with your session token. Try again, please."
+msgstr "Það kom upp vandamál með setutókann þinn. Vinsamlegast reyndu aftur."
+
+#: actions/disfavor.php:55 actions/disfavor.php:81
+msgid "This notice is not a favorite!"
+msgstr "Þetta babl er ekki í uppáhaldi!"
+
+#: actions/disfavor.php:63 actions/disfavor.php:87
+msgid "Could not delete favorite."
+msgstr "Gat ekki eytt uppáhaldi."
+
+#: actions/disfavor.php:72 lib/favorform.php:140
+msgid "Favor"
+msgstr "Uppáhald"
+
+#: actions/emailsettings.php:92
+msgid "Send me email when someone adds my notice as a favorite."
+msgstr "Senda mér tölvupóst þegar einhver setur babl í mér í uppáhald hjá sér."
+
+#: actions/emailsettings.php:95 actions/emailsettings.php:163
+msgid "Send me email when someone sends me a private message."
+msgstr "Senda mér tölvupóst þegar einhver sendir mér persónuleg skilaboð."
+
+#: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:81
+#: actions/twitapifavorites.php:118
+msgid "This notice is already a favorite!"
+msgstr "Þetta babl er nú þegar í uppáhaldi!"
+
+#: actions/favor.php:60 actions/twitapifavorites.php:151
+#: classes/Command.php:132 actions/favor.php:86
+#: actions/twitapifavorites.php:125 classes/Command.php:152
+msgid "Could not create favorite."
+msgstr "Gat ekki búið til uppáhald."
+
+#: actions/favor.php:70
+msgid "Disfavor"
+msgstr "Ekki uppáhald"
+
+#: actions/favoritesrss.php:60 actions/showfavorites.php:47
+#: actions/favoritesrss.php:100 actions/showfavorites.php:77
+#, php-format
+msgid "%s favorite notices"
+msgstr "Uppáhaldsbabl %s"
+
+#: actions/favoritesrss.php:64 actions/favoritesrss.php:104
+#, php-format
+msgid "Feed of favorite notices of %s"
+msgstr "Bablveita uppáhaldsbabls %s"
+
+#: actions/inbox.php:28 actions/inbox.php:59
+#, php-format
+msgid "Inbox for %s - page %d"
+msgstr "Innhólf %s - síða %d"
+
+#: actions/inbox.php:30 actions/inbox.php:62
+#, php-format
+msgid "Inbox for %s"
+msgstr "Innhólf %s"
+
+#: actions/inbox.php:53 actions/inbox.php:115
+msgid "This is your inbox, which lists your incoming private messages."
+msgstr ""
+"Þetta er innhólfið þitt sem sýnir persónuleg skilaboð sem voru send til þín."
+
+#: actions/invite.php:178 actions/invite.php:213
+#, php-format
+msgid ""
+"%1$s has invited you to join them on %2$s (%3$s).\n"
+"\n"
+msgstr ""
+"%1$s hefur boðið þér að vera með þeim á %2$s (%3$s).\n"
+"\n"
+
+#: actions/login.php:104 actions/login.php:235 actions/openidlogin.php:108
+#: actions/register.php:416
+msgid "Automatically login in the future; "
+msgstr "Skrá mig sjálfkrafa inn í framtíðinni."
+
+#: actions/login.php:122 actions/login.php:264
+msgid "For security reasons, please re-enter your "
+msgstr "Af öryggisástæðum, vinsamlegast sláðu aftur inn "
+
+#: actions/login.php:126 actions/login.php:268
+msgid "Login with your username and password. "
+msgstr "Skráðu þig inn með notendanafni og lykilorði. "
+
+#: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
+#: actions/twitapidirect_messages.php:141
+msgid "That's too long. Max message size is 140 chars."
+msgstr "Þetta er of langt. Hámarkslengd skilaboða er 140 tákn."
+
+#: actions/newmessage.php:65 actions/newmessage.php:128
+msgid "No recipient specified."
+msgstr "Enginn móttökuaðili tilgreindur."
+
+#: actions/newmessage.php:68 actions/newmessage.php:113
+#: classes/Command.php:206 actions/newmessage.php:131
+#: actions/newmessage.php:168 classes/Command.php:237
+msgid "You can't send a message to this user."
+msgstr "Þú getur ekki sent þessum notanda skilaboð."
+
+#: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
+#: classes/Command.php:209 actions/twitapidirect_messages.php:158
+#: classes/Command.php:240
+msgid ""
+"Don't send a message to yourself; just say it to yourself quietly instead."
+msgstr ""
+"Ekki senda þér skilaboð. Þú getur sagt þetta í hljóði við sjálfa(n) þig í "
+"staðinn."
+
+#: actions/newmessage.php:108 actions/microsummary.php:62
+#: actions/newmessage.php:163
+msgid "No such user"
+msgstr "Enginn þannig notandi"
+
+#: actions/newmessage.php:117 actions/newmessage.php:67
+msgid "New message"
+msgstr "Ný skilaboð"
+
+#: actions/noticesearch.php:95 actions/noticesearch.php:146
+msgid "Notice without matching profile"
+msgstr "Babl án persónulegrar síðu sem passar við"
+
+#: actions/openidsettings.php:28 actions/openidsettings.php:70
+#, php-format
+msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
+msgstr "[OpenID](%%doc.openid%%) leyfir þér að skrá þig inn á margar síður "
+
+#: actions/openidsettings.php:46 actions/openidsettings.php:96
+msgid "If you want to add an OpenID to your account, "
+msgstr "Ef þú vilt bæta OpenID við aðganginn þinn, "
+
+#: actions/openidsettings.php:74
+msgid "Removing your only OpenID would make it impossible to log in! "
+msgstr ""
+"Að fjarlægja eina OpenID aðganginn þinn gerir það ómögulegt fyrir þig að "
+"skrá þig inn!"
+
+#: actions/openidsettings.php:87 actions/openidsettings.php:143
+msgid "You can remove an OpenID from your account "
+msgstr "Þú getur fjarlægt OpenID frá aðganginum þínum "
+
+#: actions/outbox.php:28 actions/outbox.php:58
+#, php-format
+msgid "Outbox for %s - page %d"
+msgstr "Úthólf %s - síða %d"
+
+#: actions/outbox.php:30 actions/outbox.php:61
+#, php-format
+msgid "Outbox for %s"
+msgstr "Úthólf %s"
+
+#: actions/outbox.php:53 actions/outbox.php:116
+msgid "This is your outbox, which lists private messages you have sent."
+msgstr "Þetta er úthólfið þitt sem sýnir persónuleg skilaboð sem þú hefur sent."
+
+#: actions/peoplesearch.php:28 actions/peoplesearch.php:52
+#, php-format
+msgid ""
+"Search for people on %%site.name%% by their name, location, or interests. "
+msgstr ""
+"Leita að fólki á %%site.name%% eftir nafninu þeirra, staðsetningu eða "
+"áhugamáli. "
+
+#: actions/profilesettings.php:27 actions/profilesettings.php:69
+msgid "You can update your personal profile info here "
+msgstr "Þú getur uppfært persónulegar upplýsingar hérna "
+
+#: actions/profilesettings.php:115 actions/remotesubscribe.php:320
+#: actions/userauthorization.php:159 actions/userrss.php:76
+#: actions/avatarsettings.php:104 actions/avatarsettings.php:179
+#: actions/grouplogo.php:177 actions/remotesubscribe.php:367
+#: actions/userauthorization.php:176 actions/userrss.php:82
+msgid "User without matching profile"
+msgstr "Notandi með enga persónulega síðu sem passar við"
+
+#: actions/recoverpassword.php:91 actions/recoverpassword.php:97
+msgid "This confirmation code is too old. "
+msgstr "Þessi staðfestingarlykill er of gamall. "
+
+#: actions/recoverpassword.php:141 actions/recoverpassword.php:152
+msgid "If you've forgotten or lost your"
+msgstr "Ef þú hefur gleymt eða tapað "
+
+#: actions/recoverpassword.php:154 actions/recoverpassword.php:158
+msgid "You've been identified. Enter a "
+msgstr "Auðkenning á þér tókst. Sláðu inn "
+
+#: actions/recoverpassword.php:169 actions/recoverpassword.php:188
+msgid "Your nickname on this server, "
+msgstr "Stuttnefnið þitt á þessum vefþjóni, "
+
+#: actions/recoverpassword.php:271 actions/recoverpassword.php:304
+msgid "Instructions for recovering your password "
+msgstr "Leiðbeiningar um það hvernig á að endurheimta lykilorð "
+
+#: actions/recoverpassword.php:327 actions/recoverpassword.php:361
+msgid "New password successfully saved. "
+msgstr "Tókst að vista nýtt lykilorð. "
+
+#: actions/register.php:95 actions/register.php:180
+msgid "Password must be 6 or more characters."
+msgstr "Lykilorð verður að vera að minnsta kosti 6 tákn."
+
+#: actions/register.php:216
+#, php-format
+msgid ""
+"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
+"want to..."
+msgstr ""
+"Til hamingju, %s! Frábært að þú skráðir þig á %%%%site.name%%%%. Héðan vilt "
+"þú kannski..."
+
+#: actions/register.php:227
+msgid "(You should receive a message by email momentarily, with "
+msgstr "(Þú ættir að fá tölvupóst bráðlega með "
+
+#: actions/remotesubscribe.php:51 actions/remotesubscribe.php:74
+#, php-format
+msgid "To subscribe, you can [login](%%action.login%%),"
+msgstr ""
+"Til þess að gerast áskrifandi getur þú [skráð þig inn](%%action.login%%),"
+
+#: actions/showfavorites.php:61 actions/showfavorites.php:145
+#, php-format
+msgid "Feed for favorites of %s"
+msgstr "Bablveita uppáhaldsbabls %s"
+
+#: actions/showfavorites.php:84 actions/twitapifavorites.php:85
+#: actions/showfavorites.php:202 actions/twitapifavorites.php:59
+msgid "Could not retrieve favorite notices."
+msgstr "Gat ekki sótt uppáhaldsbabl."
+
+#: actions/showmessage.php:33 actions/showmessage.php:81
+msgid "No such message."
+msgstr "Engin þannig skilaboð."
+
+#: actions/showmessage.php:42
+msgid "Only the sender and recipient may read this message."
+msgstr "Aðeins sendandi og móttakandi geta lesið þessi skilaboð."
+
+#: actions/showmessage.php:61 actions/showmessage.php:108
+#, php-format
+msgid "Message to %1$s on %2$s"
+msgstr "Skilaboð til %1$s á %2$s"
+
+#: actions/showmessage.php:66 actions/showmessage.php:113
+#, php-format
+msgid "Message from %1$s on %2$s"
+msgstr "Skilaboð frá %1$s á %2$s"
+
+#: actions/showstream.php:154
+msgid "Send a message"
+msgstr "Senda skilaboð"
+
+#: actions/smssettings.php:312 actions/smssettings.php:464
+#, php-format
+msgid "Mobile carrier for your phone. "
+msgstr "Farsímafélagið þitt. "
+
+#: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:68
+#, php-format
+msgid "Direct messages to %s"
+msgstr "Bein skilaboð til %s"
+
+#: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
+#, php-format
+msgid "All the direct messages sent to %s"
+msgstr "Öll bein skilaboð til %s"
+
+#: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:73
+msgid "Direct Messages You've Sent"
+msgstr "Bein skilaboð sem þú hefur sent"
+
+#: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
+#, php-format
+msgid "All the direct messages sent from %s"
+msgstr "Öll bein skilaboð send frá %s"
+
+#: actions/twitapidirect_messages.php:128
+#: actions/twitapidirect_messages.php:137
+msgid "No message text!"
+msgstr "Enginn texti í skilaboðum!"
+
+#: actions/twitapidirect_messages.php:138
+#: actions/twitapidirect_messages.php:150
+msgid "Recipient user not found."
+msgstr "Móttakandi fannst ekki."
+
+#: actions/twitapidirect_messages.php:141
+#: actions/twitapidirect_messages.php:153
+msgid "Can't send direct messages to users who aren't your friend."
+msgstr "Gat ekki sent bein skilaboð til notenda sem eru ekki vinir þínir."
+
+#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:66
+#, php-format
+msgid "%s / Favorites from %s"
+msgstr "%s / Uppáhaldsbabl frá %s"
+
+#: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
+#, php-format
+msgid "%s updates favorited by %s / %s."
+msgstr "%s færslur gerðar að uppáhaldsbabli af %s / %s."
+
+#: actions/twitapifavorites.php:187 lib/mail.php:275
+#: actions/twitapifavorites.php:164 lib/mail.php:553
+#, php-format
+msgid "%s added your notice as a favorite"
+msgstr "%s heldur upp á babl frá þér"
+
+#: actions/twitapifavorites.php:188 lib/mail.php:276
+#: actions/twitapifavorites.php:165
+#, php-format
+msgid ""
+"%1$s just added your notice from %2$s as one of their favorites.\n"
+"\n"
+msgstr ""
+"%1$s gerði bablið þitt á %2$s sem eitt af sínu uppáhaldsbabli.\n"
+"\n"
+
+#: actions/twittersettings.php:27
+msgid ""
+"Add your Twitter account to automatically send your notices to Twitter, "
+msgstr ""
+"Bættu Twitter aðganginum þínum við til að senda sjálfkrafa babl til Twitter, "
+""
+
+#: actions/twittersettings.php:41 actions/twittersettings.php:60
+msgid "Twitter settings"
+msgstr "Twitter stillingar"
+
+#: actions/twittersettings.php:48 actions/twittersettings.php:105
+msgid "Twitter Account"
+msgstr "Twitter aðgangur"
+
+#: actions/twittersettings.php:56 actions/twittersettings.php:113
+msgid "Current verified Twitter account."
+msgstr "Núverandi staðfesti Twitter aðgangurinn."
+
+#: actions/twittersettings.php:63
+msgid "Twitter Username"
+msgstr "Twitter notendanafn"
+
+#: actions/twittersettings.php:65 actions/twittersettings.php:123
+msgid "No spaces, please."
+msgstr "Vinsamlegast engin bil."
+
+#: actions/twittersettings.php:67
+msgid "Twitter Password"
+msgstr "Twitter lykilorð"
+
+#: actions/twittersettings.php:72 actions/twittersettings.php:139
+msgid "Automatically send my notices to Twitter."
+msgstr "Sjálfkrafa senda bablið mitt á Twitter."
+
+#: actions/twittersettings.php:75 actions/twittersettings.php:146
+msgid "Send local \"@\" replies to Twitter."
+msgstr "Senda staðbundin \"@\" svör til Twitter."
+
+#: actions/twittersettings.php:78 actions/twittersettings.php:153
+msgid "Subscribe to my Twitter friends here."
+msgstr "Gerast áskrifandi að Twitter vinum mínum hérna"
+
+#: actions/twittersettings.php:122
+msgid ""
+"Username must have only numbers, upper- and lowercase letters, and "
+"underscore (_). 15 chars max."
+msgstr ""
+"Notendanafn má aðeins hafa númer, há- og lágstafi og undirstrik (_). "
+"Hámarkslengd er 15 tákn."
+
+#: actions/twittersettings.php:128 actions/twittersettings.php:334
+msgid "Could not verify your Twitter credentials!"
+msgstr "Gat ekki staðfest Twitter skilríkið!"
+
+#: actions/twittersettings.php:137
+#, php-format
+msgid "Unable to retrieve account information for \"%s\" from Twitter."
+msgstr "Gat ekki sótt aðgangsupplýsingar fyrir \"%s\" frá Twitter"
+
+#: actions/twittersettings.php:151 actions/twittersettings.php:170
+#: actions/twittersettings.php:348 actions/twittersettings.php:368
+msgid "Unable to save your Twitter settings!"
+msgstr "Gat ekki vistað Twitter stillingarnar þínar!"
+
+#: actions/twittersettings.php:174 actions/twittersettings.php:376
+msgid "Twitter settings saved."
+msgstr "Twitter stillingar vistaðar."
+
+#: actions/twittersettings.php:192 actions/twittersettings.php:395
+msgid "That is not your Twitter account."
+msgstr "Þetta er ekki Twitter aðgangurinn þinn."
+
+#: actions/twittersettings.php:200 actions/twittersettings.php:208
+#: actions/twittersettings.php:403
+msgid "Couldn't remove Twitter user."
+msgstr "Gat ekki fjarlægt Twitter notanda."
+
+#: actions/twittersettings.php:212 actions/twittersettings.php:407
+msgid "Twitter account removed."
+msgstr "Twitter aðgangur fjarlægður."
+
+#: actions/twittersettings.php:225 actions/twittersettings.php:239
+#: actions/twittersettings.php:428 actions/twittersettings.php:439
+#: actions/twittersettings.php:453
+msgid "Couldn't save Twitter preferences."
+msgstr "Gat ekki vistað Twitter stillingar."
+
+#: actions/twittersettings.php:245 actions/twittersettings.php:461
+msgid "Twitter preferences saved."
+msgstr "Twitter stillingar vistaðar."
+
+#: actions/userauthorization.php:84 actions/userauthorization.php:86
+msgid "Please check these details to make sure "
+msgstr "Vinsamlegast athugaðu eftirfarandi atriði til að vera viss "
+
+#: actions/userauthorization.php:324 actions/userauthorization.php:340
+msgid "The subscription has been authorized, but no "
+msgstr "Ãskriftin hefur verið heimiluð en ófullnægjandi"
+
+#: actions/userauthorization.php:334 actions/userauthorization.php:351
+msgid "The subscription has been rejected, but no "
+msgstr "Ãskriftinni hefur verið hafnað en ófullnægjandi "
+
+#: classes/Channel.php:113 classes/Channel.php:132 classes/Channel.php:151
+msgid "Command results"
+msgstr "Niðurstöður skipunar"
+
+#: classes/Channel.php:148 classes/Channel.php:204
+msgid "Command complete"
+msgstr "Fullkláruð skipun"
+
+#: classes/Channel.php:158 classes/Channel.php:215
+msgid "Command failed"
+msgstr "Misheppnuð skipun"
+
+#: classes/Command.php:39 classes/Command.php:44
+msgid "Sorry, this command is not yet implemented."
+msgstr "Fyrirgefðu en þessi skipun hefur ekki enn verið útbúin."
+
+#: classes/Command.php:96 classes/Command.php:113
+#, php-format
+msgid "Subscriptions: %1$s\n"
+msgstr "Ãskriftir: %1$s\n"
+
+#: classes/Command.php:125 classes/Command.php:242 classes/Command.php:145
+#: classes/Command.php:276
+msgid "User has no last notice"
+msgstr "Notandi hefur ekkert nýtt babl"
+
+#: classes/Command.php:146 classes/Command.php:166
+msgid "Notice marked as fave."
+msgstr "Babl gert að uppáhaldi."
+
+#: classes/Command.php:166 classes/Command.php:189
+#, php-format
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
+#: classes/Command.php:169 classes/Command.php:192
+#, php-format
+msgid "Fullname: %s"
+msgstr "Fullt nafn: %s"
+
+#: classes/Command.php:172 classes/Command.php:195
+#, php-format
+msgid "Location: %s"
+msgstr "Staðsetning: %s"
+
+#: classes/Command.php:175 classes/Command.php:198
+#, php-format
+msgid "Homepage: %s"
+msgstr "Heimasíða: %s"
+
+#: classes/Command.php:178 classes/Command.php:201
+#, php-format
+msgid "About: %s"
+msgstr "Um: %s"
+
+#: classes/Command.php:200 classes/Command.php:228
+#, php-format
+msgid "Message too long - maximum is 140 characters, you sent %d"
+msgstr "Skilaboð eru of löng - 140 tákn eru í mesta lagi leyfð en þú sendir %d"
+
+#: classes/Command.php:214 classes/Command.php:245
+#, php-format
+msgid "Direct message to %s sent"
+msgstr "Bein skilaboð send til %s"
+
+#: classes/Command.php:216 classes/Command.php:247
+msgid "Error sending direct message."
+msgstr "Villa kom upp við að senda bein skilaboð"
+
+#: classes/Command.php:263 classes/Command.php:300
+msgid "Specify the name of the user to subscribe to"
+msgstr "Tilgreindu nafn notandans sem þú vilt gerast áskrifandi að"
+
+#: classes/Command.php:270 classes/Command.php:307
+#, php-format
+msgid "Subscribed to %s"
+msgstr "Nú ert þú áskrifandi að %s"
+
+#: classes/Command.php:288 classes/Command.php:328
+msgid "Specify the name of the user to unsubscribe from"
+msgstr "Tilgreindu nafn notandans sem þú vilt hætta sem áskrifandi að"
+
+#: classes/Command.php:295 classes/Command.php:335
+#, php-format
+msgid "Unsubscribed from %s"
+msgstr "Nú ert þú ekki lengur áskrifandi að %s"
+
+#: classes/Command.php:310 classes/Command.php:330 classes/Command.php:353
+#: classes/Command.php:376
+msgid "Command not yet implemented."
+msgstr "Skipun hefur ekki verið fullbúin"
+
+#: classes/Command.php:313 classes/Command.php:356
+msgid "Notification off."
+msgstr "Tilkynningar af."
+
+#: classes/Command.php:315 classes/Command.php:358
+msgid "Can't turn off notification."
+msgstr "Get ekki slökkt á tilkynningum."
+
+#: classes/Command.php:333 classes/Command.php:379
+msgid "Notification on."
+msgstr "Tilkynningar á."
+
+#: classes/Command.php:335 classes/Command.php:381
+msgid "Can't turn on notification."
+msgstr "Get ekki kveikt á tilkynningum."
+
+#: classes/Command.php:344 classes/Command.php:392
+msgid "Commands:\n"
+msgstr "Skipanir:\n"
+
+#: classes/Message.php:53 classes/Message.php:56
+msgid "Could not insert message."
+msgstr "Gat ekki skeytt skilaboðum inn í."
+
+#: classes/Message.php:63 classes/Message.php:66
+msgid "Could not update message with new URI."
+msgstr "Gat ekki uppfært skilaboð með nýju veffangi."
+
+#: lib/gallery.php:46
+msgid "User without matching profile in system."
+msgstr "Notandi án samsvarandi persónulegrar síðu í kerfinu."
+
+#: lib/mail.php:147 lib/mail.php:289
+#, php-format
+msgid ""
+"You have a new posting address on %1$s.\n"
+"\n"
+msgstr ""
+"Þú hefur fengið nýtt sendingarfang á %1$s.\n"
+"\n"
+
+#: lib/mail.php:249 lib/mail.php:508
+#, php-format
+msgid "New private message from %s"
+msgstr "Ný persónuleg skilaboð frá %s"
+
+#: lib/mail.php:253 lib/mail.php:512
+#, php-format
+msgid ""
+"%1$s (%2$s) sent you a private message:\n"
+"\n"
+msgstr ""
+"%1$s (%2$s) sendi þér persónuleg skilaboð:\n"
+"\n"
+
+#: lib/mailbox.php:43 lib/mailbox.php:89
+msgid "Only the user can read their own mailboxes."
+msgstr "Aðeins notandinn getur lesið hans eigin pósthólf."
+
+#: lib/openid.php:195 lib/openid.php:203
+msgid "This form should automatically submit itself. "
+msgstr "Þetta eyðublað ætti sjálfkrafa að sendast inn. "
+
+#: lib/personal.php:65 lib/personalgroupnav.php:113
+msgid "Favorites"
+msgstr "Uppáhald"
+
+#: lib/personal.php:66 lib/personalgroupnav.php:114
+#, php-format
+msgid "%s's favorite notices"
+msgstr "Uppáhaldsbabl %s"
+
+#: lib/personal.php:66 lib/personalgroupnav.php:114
+msgid "User"
+msgstr "Notandi"
+
+#: lib/personal.php:75 lib/personalgroupnav.php:123
+msgid "Inbox"
+msgstr "Innhólf"
+
+#: lib/personal.php:76 lib/personalgroupnav.php:124
+msgid "Your incoming messages"
+msgstr "Mótteknu skilaboðin þín"
+
+#: lib/personal.php:80 lib/personalgroupnav.php:128
+msgid "Outbox"
+msgstr "Úthólf"
+
+#: lib/personal.php:81 lib/personalgroupnav.php:129
+msgid "Your sent messages"
+msgstr "Skilaboð sem þú hefur sent"
+
+#: lib/settingsaction.php:99 lib/connectsettingsaction.php:110
+msgid "Twitter"
+msgstr "Twitter"
+
+#: lib/settingsaction.php:100 lib/connectsettingsaction.php:111
+msgid "Twitter integration options"
+msgstr "Samhæfnisvalmöguleikar Twitter"
+
+#: lib/util.php:1718 lib/messageform.php:139 lib/noticelist.php:422
+msgid "To"
+msgstr "Til"
+
+#: scripts/maildaemon.php:45 scripts/maildaemon.php:48
+msgid "Could not parse message."
+msgstr "Gat ekki þáttað skilaboðin."
+
+#: actions/all.php:63 actions/facebookhome.php:162
+#, php-format
+msgid "%s and friends, page %d"
+msgstr "%s og vinirnir, síða %d"
+
+#: actions/avatarsettings.php:76
+msgid "You can upload your personal avatar."
+msgstr "Þú getur hlaðið upp þinni eigin sjálfsmynd."
+
+#: actions/avatarsettings.php:117 actions/avatarsettings.php:191
+#: actions/grouplogo.php:250
+msgid "Avatar settings"
+msgstr "Stillingar fyrir mynd"
+
+#: actions/avatarsettings.php:124 actions/avatarsettings.php:199
+#: actions/grouplogo.php:198 actions/grouplogo.php:258
+msgid "Original"
+msgstr "Upphafleg mynd"
+
+#: actions/avatarsettings.php:139 actions/avatarsettings.php:211
+#: actions/grouplogo.php:209 actions/grouplogo.php:270
+msgid "Preview"
+msgstr "Forsýn"
+
+#: actions/avatarsettings.php:225 actions/grouplogo.php:284
+msgid "Crop"
+msgstr "Skera af"
+
+#: actions/avatarsettings.php:248 actions/deletenotice.php:133
+#: actions/emailsettings.php:224 actions/grouplogo.php:307
+#: actions/imsettings.php:200 actions/login.php:102 actions/newmessage.php:100
+#: actions/newnotice.php:96 actions/openidsettings.php:188
+#: actions/othersettings.php:136 actions/passwordsettings.php:131
+#: actions/profilesettings.php:172 actions/register.php:113
+#: actions/remotesubscribe.php:53 actions/smssettings.php:216
+#: actions/subedit.php:38 actions/twittersettings.php:290
+#: actions/userauthorization.php:39
+msgid "There was a problem with your session token. "
+msgstr "Það kom upp vandamál með setutókann þinn. "
+
+#: actions/avatarsettings.php:303 actions/grouplogo.php:360
+msgid "Pick a square area of the image to be your avatar"
+msgstr ""
+"Veldu ferningslaga svæði á upphaflegu myndinni sem einkennismyndina þína"
+
+#: actions/avatarsettings.php:327 actions/grouplogo.php:384
+msgid "Lost our file data."
+msgstr "Týndum skráargögnunum okkar"
+
+#: actions/avatarsettings.php:334 actions/grouplogo.php:391
+#: classes/User_group.php:112
+msgid "Lost our file."
+msgstr "Týndum skránni okkar"
+
+#: actions/avatarsettings.php:349 actions/avatarsettings.php:383
+#: actions/grouplogo.php:406 actions/grouplogo.php:440
+#: classes/User_group.php:129 classes/User_group.php:161
+msgid "Unknown file type"
+msgstr "Óþekkt skráargerð"
+
+#: actions/block.php:69 actions/subedit.php:46 actions/unblock.php:70
+msgid "No profile specified."
+msgstr "Engin persónuleg síða tilgreind"
+
+#: actions/block.php:74 actions/subedit.php:53 actions/tagother.php:46
+#: actions/unblock.php:75
+msgid "No profile with that ID."
+msgstr "Engin persónulega síða með þessu einkenni"
+
+#: actions/block.php:111
+msgid "Block user"
+msgstr "Loka á notanda"
+
+#: actions/block.php:129
+msgid "Are you sure you want to block this user? "
+msgstr "Ertu viss um að þú viljir loka á þennan notanda? "
+
+#: actions/block.php:162
+msgid "You have already blocked this user."
+msgstr "Þú hefur nú þegar lokað á þennan notanda."
+
+#: actions/block.php:167
+msgid "Failed to save block information."
+msgstr "Mistókst að vista upplýsingar um notendalokun"
+
+#: actions/confirmaddress.php:159
+#, php-format
+msgid "The address \"%s\" has been "
+msgstr "Veffangið \"%s\" hefur verið "
+
+#: actions/deletenotice.php:73
+msgid "You are about to permanently delete a notice. "
+msgstr "Þú ert í þann mund að eyða þessu babli að eilífu. "
+
+#: actions/disfavor.php:94
+msgid "Add to favorites"
+msgstr "Bæta við sem uppáhaldsbabli"
+
+#: actions/editgroup.php:54
+#, php-format
+msgid "Edit %s group"
+msgstr "Breyta hópnum %s"
+
+#: actions/editgroup.php:66 actions/groupbyid.php:72 actions/grouplogo.php:66
+#: actions/joingroup.php:60 actions/newgroup.php:65 actions/showgroup.php:100
+msgid "Inboxes must be enabled for groups to work"
+msgstr "Innhólf verða að vera virk svo hópar virki"
+
+#: actions/editgroup.php:71 actions/grouplogo.php:71 actions/newgroup.php:70
+msgid "You must be logged in to create a group."
+msgstr "Þú verður að hafa skráð þig inn til að búa til hóp."
+
+#: actions/editgroup.php:87 actions/grouplogo.php:87
+#: actions/groupmembers.php:76 actions/joingroup.php:81
+#: actions/showgroup.php:121
+msgid "No nickname"
+msgstr "Ekkert stuttnefni"
+
+#: actions/editgroup.php:99 actions/groupbyid.php:88 actions/grouplogo.php:100
+#: actions/groupmembers.php:83 actions/joingroup.php:88
+#: actions/showgroup.php:128
+msgid "No such group"
+msgstr "Enginn þannig hópur"
+
+#: actions/editgroup.php:106 actions/editgroup.php:165
+#: actions/grouplogo.php:107
+msgid "You must be an admin to edit the group"
+msgstr "Þú verður að vera stjórnandi til að geta breytt hópnum"
+
+#: actions/editgroup.php:157
+msgid "Use this form to edit the group."
+msgstr "Notaðu þetta eyðublað til að breyta hópnum."
+
+#: actions/editgroup.php:179 actions/newgroup.php:130 actions/register.php:156
+msgid "Nickname must have only lowercase letters "
+msgstr "Stuttnefni getur aðeins verið lágstafir"
+
+#: actions/editgroup.php:198 actions/newgroup.php:149
+msgid "description is too long (max 140 chars)."
+msgstr "Lýsing er of löng (í mesta lagi 140 tákn)."
+
+#: actions/editgroup.php:218
+msgid "Could not update group."
+msgstr "Gat ekki uppfært hóp."
+
+#: actions/editgroup.php:226
+msgid "Options saved."
+msgstr "Valmöguleikar vistaðir."
+
+#: actions/emailsettings.php:107 actions/imsettings.php:108
+#, php-format
+msgid "Awaiting confirmation on this address. "
+msgstr "Býð eftir staðfestingu fyrir þetta veffang. "
+
+#: actions/emailsettings.php:139 actions/smssettings.php:150
+msgid "Make a new email address for posting to; "
+msgstr "Búa til nýtt póstfang til að senda á; "
+
+#: actions/emailsettings.php:157
+msgid "Send me email when someone "
+msgstr "Senda mér tölvupóst þegar einhver "
+
+#: actions/emailsettings.php:168
+msgid "Allow friends to nudge me and send me an email."
+msgstr "Leyfa vinum að ýta við mér og senda mér tölvupóst."
+
+#: actions/emailsettings.php:321
+msgid "That email address already belongs "
+msgstr "Þetta tölvupóstfang er nú þegar í eigu "
+
+#: actions/emailsettings.php:343
+msgid "A confirmation code was sent to the email address you added. "
+msgstr ""
+"Staðfestingarlykill var sendur til tölvupóstfangsins sem þú sendir inn. "
+
+#: actions/facebookhome.php:110
+msgid "Server error - couldn't get user!"
+msgstr "Kerfisvilla - gat ekki náð í notanda!"
+
+#: actions/facebookhome.php:196
+#, php-format
+msgid "If you would like the %s app to automatically update "
+msgstr "Ef þú vilt að %s forritið sjálfkrafa uppfæri "
+
+#: actions/facebookhome.php:213 actions/facebooksettings.php:137
+#, php-format
+msgid "Allow %s to update my Facebook status"
+msgstr "Leyfa %s að uppfæra stöðuna mína á Facebook"
+
+#: actions/facebookhome.php:218
+msgid "Skip"
+msgstr "Sleppa"
+
+#: actions/facebookhome.php:235
+msgid "No notice content!"
+msgstr "Innihaldslaust babl!"
+
+#: actions/facebookhome.php:295 lib/action.php:870 lib/facebookaction.php:399
+msgid "Pagination"
+msgstr "Uppröðun"
+
+#: actions/facebookhome.php:304 lib/action.php:879 lib/facebookaction.php:408
+msgid "After"
+msgstr "Eftir"
+
+#: actions/facebookhome.php:312 lib/action.php:887 lib/facebookaction.php:416
+msgid "Before"
+msgstr "Ãður"
+
+#: actions/facebookinvite.php:70
+#, php-format
+msgid "Thanks for inviting your friends to use %s"
+msgstr "Takk fyrir að bjóða vinum þínum að nota %s"
+
+#: actions/facebookinvite.php:72
+msgid "Invitations have been sent to the following users:"
+msgstr "Boðskort hafa verið send til eftirfarandi notenda:"
+
+#: actions/facebookinvite.php:96
+#, php-format
+msgid "You have been invited to %s"
+msgstr "Þér hefur verið boðið til %s"
+
+#: actions/facebookinvite.php:105
+#, php-format
+msgid "Invite your friends to use %s"
+msgstr "Bjóddu vinum þínum að nota %s"
+
+#: actions/facebookinvite.php:113
+#, php-format
+msgid "Friends already using %s:"
+msgstr "Vinir sem nú þegar nota %s:"
+
+#: actions/facebookinvite.php:130
+#, php-format
+msgid "Send invitations"
+msgstr "Senda boðskort"
+
+#: actions/facebookremove.php:56
+msgid "Couldn't remove Facebook user."
+msgstr "Gat ekki fjarlægt Facebook-notanda."
+
+#: actions/facebooksettings.php:65
+msgid "There was a problem saving your sync preferences!"
+msgstr "Það kom upp villa við að vista samstillingarnar þínar!"
+
+#: actions/facebooksettings.php:67
+msgid "Sync preferences saved."
+msgstr "Samstillingar vistaðar."
+
+#: actions/facebooksettings.php:90
+msgid "Automatically update my Facebook status with my notices."
+msgstr "Sjálfkrafa uppfærir stöðuna mína á Facebook með bablinu mínu."
+
+#: actions/facebooksettings.php:97
+msgid "Send \"@\" replies to Facebook."
+msgstr "Senda \"@\" svör til Facebook."
+
+#: actions/facebooksettings.php:106
+msgid "Prefix"
+msgstr "Forskeyti"
+
+#: actions/facebooksettings.php:108
+msgid "A string to prefix notices with."
+msgstr "Strengur til að skeyta fram fyrir babl."
+
+#: actions/facebooksettings.php:124
+#, php-format
+msgid "If you would like %s to automatically update "
+msgstr "Ef þú vilt að %s uppfærist sjálfkrafa "
+
+#: actions/facebooksettings.php:147
+msgid "Sync preferences"
+msgstr "Samstillingar"
+
+#: actions/favor.php:94 lib/disfavorform.php:140
+msgid "Disfavor favorite"
+msgstr "Ekki lengur í uppáhaldi"
+
+#: actions/favorited.php:65 lib/popularnoticesection.php:76
+#: lib/publicgroupnav.php:91
+msgid "Popular notices"
+msgstr "Vinsælt babl"
+
+#: actions/favorited.php:67
+#, php-format
+msgid "Popular notices, page %d"
+msgstr "Vinsælt babl, síða %d"
+
+#: actions/favorited.php:79
+msgid "The most popular notices on the site right now."
+msgstr "Vinsælasta bablið á síðunni um þessar mundir."
+
+#: actions/featured.php:69 lib/featureduserssection.php:82
+#: lib/publicgroupnav.php:87
+msgid "Featured users"
+msgstr "Notendur í sviðsljósinu"
+
+#: actions/featured.php:71
+#, php-format
+msgid "Featured users, page %d"
+msgstr "Notendur í sviðsljósinu, síða %d"
+
+#: actions/featured.php:99
+#, php-format
+msgid "A selection of some of the great users on %s"
+msgstr "Úrval nokkurra frábærra notenda á %s"
+
+#: actions/finishremotesubscribe.php:188
+msgid "That user has blocked you from subscribing."
+msgstr "Þessi notandi hefur bannað þér að gerast áskrifandi"
+
+#: actions/groupbyid.php:79
+msgid "No ID"
+msgstr "Ekkert einkenni"
+
+#: actions/grouplogo.php:138 actions/grouplogo.php:191
+msgid "Group logo"
+msgstr "Einkennismynd hópsins"
+
+#: actions/grouplogo.php:149
+msgid "You can upload a logo image for your group."
+msgstr "Þú getur hlaðið upp mynd fyrir hópinn þinn."
+
+#: actions/grouplogo.php:448
+msgid "Logo updated."
+msgstr "Einkennismynd uppfærð."
+
+#: actions/grouplogo.php:450
+msgid "Failed updating logo."
+msgstr "Tókst ekki að uppfæra einkennismynd"
+
+#: actions/groupmembers.php:93 lib/groupnav.php:91
+#, php-format
+msgid "%s group members"
+msgstr "Hópmeðlimir %s"
+
+#: actions/groupmembers.php:96
+#, php-format
+msgid "%s group members, page %d"
+msgstr "Hópmeðlimir %s, síða %d"
+
+#: actions/groupmembers.php:111
+msgid "A list of the users in this group."
+msgstr "Listi yfir notendur í þessum hóp."
+
+#: actions/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
+#: lib/subgroupnav.php:96
+msgid "Groups"
+msgstr "Hópar"
+
+#: actions/groups.php:64
+#, php-format
+msgid "Groups, page %d"
+msgstr "Hópar, síða %d"
+
+#: actions/groups.php:90
+#, php-format
+msgid "%%%%site.name%%%% groups let you find and talk with "
+msgstr "Hópar á %%%%site.name%%%% leyfa þér að finna og tala við "
+
+#: actions/groups.php:106 actions/usergroups.php:124 lib/groupeditform.php:123
+msgid "Create a new group"
+msgstr "Búa til nýjan hóp"
+
+#: actions/groupsearch.php:57
+#, php-format
+msgid ""
+"Search for groups on %%site.name%% by their name, location, or description. "
+msgstr "Leita að hópum á %%site.name%% eftir nafni, staðsetningu eða lýsingu. "
+
+#: actions/groupsearch.php:63
+msgid "Group search"
+msgstr "Hópleit"
+
+#: actions/imsettings.php:70
+msgid "You can send and receive notices through "
+msgstr "Þú getur sent og tekið á móti babli í gegnum "
+
+#: actions/imsettings.php:120
+#, php-format
+msgid "Jabber or GTalk address, "
+msgstr "Jabber eða GTalk vefföng, "
+
+#: actions/imsettings.php:147
+msgid "Send me replies through Jabber/GTalk "
+msgstr "Sendu mér svör í gegnum Jabber/GTalk "
+
+#: actions/imsettings.php:321
+#, php-format
+msgid "A confirmation code was sent "
+msgstr "Staðfestingarlykill var sendur "
+
+#: actions/joingroup.php:65
+msgid "You must be logged in to join a group."
+msgstr "Þú verður að hafa skráð þig inn til að bæta þér í hóp."
+
+#: actions/joingroup.php:95
+msgid "You are already a member of that group"
+msgstr "Þú ert nú þegar meðlimur í þessum hópi"
+
+#: actions/joingroup.php:128
+#, php-format
+msgid "Could not join user %s to group %s"
+msgstr "Gat ekki bætt notandanum %s í hópinn %s"
+
+#: actions/joingroup.php:135
+#, php-format
+msgid "%s joined group %s"
+msgstr "%s bætti sér í hópinn %s"
+
+#: actions/leavegroup.php:60
+msgid "Inboxes must be enabled for groups to work."
+msgstr "Innhólf verða að vera virk svo að hópar virki."
+
+#: actions/leavegroup.php:65
+msgid "You must be logged in to leave a group."
+msgstr "Þú verður aða hafa skráð þig inn til að ganga úr hóp."
+
+#: actions/leavegroup.php:88
+msgid "No such group."
+msgstr "Enginn þannig hópur."
+
+#: actions/leavegroup.php:95
+msgid "You are not a member of that group."
+msgstr "Þú ert ekki meðlimur í þessum hópi."
+
+#: actions/leavegroup.php:100
+msgid "You may not leave a group while you are its administrator."
+msgstr "Þú getur ekki gengið úr hóp á meðan þú ert stjórnandi hópsins."
+
+#: actions/leavegroup.php:130
+msgid "Could not find membership record."
+msgstr "Gat ekki fundið meðlimaskrá."
+
+#: actions/leavegroup.php:138
+#, php-format
+msgid "Could not remove user %s to group %s"
+msgstr "Gat ekki fjarlægt notandann %s úr hópnum %s"
+
+#: actions/leavegroup.php:145
+#, php-format
+msgid "%s left group %s"
+msgstr "%s gekk úr hópnum %s"
+
+#: actions/login.php:225 lib/facebookaction.php:304
+msgid "Login to site"
+msgstr "Skrá þig inn á síðuna"
+
+#: actions/microsummary.php:69
+msgid "No current status"
+msgstr "Engin núverandi staða"
+
+#: actions/newgroup.php:53
+msgid "New group"
+msgstr "Nýr hópur"
+
+#: actions/newgroup.php:115
+msgid "Use this form to create a new group."
+msgstr "Notaðu þetta eyðublað til að búa til nýjan hóp."
+
+#: actions/newgroup.php:177
+msgid "Could not create group."
+msgstr "Gat ekki búið til hóp."
+
+#: actions/newgroup.php:191
+msgid "Could not set group membership."
+msgstr "Gat ekki skráð hópmeðlimi."
+
+#: actions/newmessage.php:119 actions/newnotice.php:132
+msgid "That's too long. "
+msgstr "Þetta er of langt. "
+
+#: actions/newmessage.php:134
+msgid "Don't send a message to yourself; "
+msgstr "Ekki senda þér þín eigin skilaboð; "
+
+#: actions/newnotice.php:166
+msgid "Notice posted"
+msgstr "Babl sent inn"
+
+#: actions/newnotice.php:200 classes/Channel.php:163
+msgid "Ajax Error"
+msgstr "Ajax villa"
+
+#: actions/nudge.php:85
+msgid ""
+"This user doesn't allow nudges or hasn't confirmed or set his email yet."
+msgstr ""
+"Þessi notandi leyfir ekki að ýta við sér eða hefur ekki staðfest eða skráð "
+"tölvupóstinn sinn."
+
+#: actions/nudge.php:94
+msgid "Nudge sent"
+msgstr "Ãtt við notanda"
+
+#: actions/nudge.php:97
+msgid "Nudge sent!"
+msgstr "Ãtt við notanda!"
+
+#: actions/openidlogin.php:97
+msgid "OpenID login"
+msgstr "Innskráning með OpenID"
+
+#: actions/openidsettings.php:128
+msgid "Removing your only OpenID "
+msgstr "Fjarlægi eina OpenID einkennið þitt "
+
+#: actions/othersettings.php:60
+msgid "Other Settings"
+msgstr "Aðrar stillingar"
+
+#: actions/othersettings.php:71
+msgid "Manage various other options."
+msgstr "Sjá um ýmsar aðrar stillingar."
+
+#: actions/othersettings.php:93
+msgid "URL Auto-shortening"
+msgstr "Sjálfvirk stytting vefslóða"
+
+#: actions/othersettings.php:112
+msgid "Service"
+msgstr "Þjónusta"
+
+#: actions/othersettings.php:113
+msgid "Automatic shortening service to use."
+msgstr "Þjónusta sem sér um sjálfkrafa styttingu."
+
+#: actions/othersettings.php:144
+msgid "URL shortening service is too long (max 50 chars)."
+msgstr ""
+"Þjónusta sjálfvirkrar vefslóðastyttingar er of löng (í mesta lagi 50 "
+"stafir)."
+
+#: actions/passwordsettings.php:69
+msgid "Change your password."
+msgstr "Breyta lykilorðinu þínu."
+
+#: actions/passwordsettings.php:89
+msgid "Password change"
+msgstr "Lykilorðabreyting"
+
+#: actions/peopletag.php:35
+#, php-format
+msgid "Not a valid people tag: %s"
+msgstr "Ekki gilt persónumerki: %s"
+
+#: actions/peopletag.php:47
+#, php-format
+msgid "Users self-tagged with %s - page %d"
+msgstr "Notendur sjálfmerktir með %s - síða %d"
+
+#: actions/peopletag.php:91
+#, php-format
+msgid "These are users who have tagged themselves \"%s\" "
+msgstr "Þetta eru notendur sem hafa merkt sjálfa sig með \"%s\" "
+
+#: actions/profilesettings.php:91
+msgid "Profile information"
+msgstr "Upplýsingar á persónulegri síðu"
+
+#: actions/profilesettings.php:124
+msgid ""
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+msgstr ""
+"Merki fyrir þig (bókstafir, tölustafir, -, ., og _), aðskilin með kommu eða "
+"bili"
+
+#: actions/profilesettings.php:144
+msgid "Automatically subscribe to whoever "
+msgstr "Sjálfkrafa gerast áskrifandi að þeim "
+
+#: actions/profilesettings.php:229 actions/tagother.php:176
+#, php-format
+msgid "Invalid tag: \"%s\""
+msgstr "Ógilt merki: \"%s\""
+
+#: actions/profilesettings.php:311
+msgid "Couldn't save tags."
+msgstr "Gat ekki vistað merki."
+
+#: actions/public.php:107
+#, php-format
+msgid "Public timeline, page %d"
+msgstr "Almenningsrás, síða %d"
+
+#: actions/public.php:173
+msgid "Could not retrieve public stream."
+msgstr "Gat ekki sótt efni úr almenningsveitu."
+
+#: actions/public.php:220
+#, php-format
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service "
+msgstr ""
+"Þetta er [örbloggssþjónustan](http://en.wikipedia.org/wiki/Micro-blogging) "
+"%%site.name%% "
+
+#: actions/publictagcloud.php:57
+msgid "Public tag cloud"
+msgstr "Merkjaský almenningsins"
+
+#: actions/publictagcloud.php:63
+#, php-format
+msgid "These are most popular recent tags on %s "
+msgstr "Þetta eru vinsælustu nýlegu merkin á %s "
+
+#: actions/publictagcloud.php:119
+msgid "Tag cloud"
+msgstr "Merkjaský"
+
+#: actions/register.php:139 actions/register.php:349
+msgid "Sorry, only invited people can register."
+msgstr "Afsakið en aðeins fólki sem er boðið getur nýskráð sig."
+
+#: actions/register.php:149
+msgid "You can't register if you don't "
+msgstr "Þú getur ekki nýskráð þig ef þú hefur ekki "
+
+#: actions/register.php:286
+msgid "With this form you can create "
+msgstr "Með þessu eyðublaði getur þú búið til "
+
+#: actions/register.php:368
+msgid "1-64 lowercase letters or numbers, "
+msgstr "1-64 lágstafir og tölustafir, "
+
+#: actions/register.php:382 actions/register.php:386
+msgid "Used only for updates, announcements, "
+msgstr "Aðeins notað fyrir uppfærslur og tilkynningar, "
+
+#: actions/register.php:398
+msgid "URL of your homepage, blog, "
+msgstr "Vefslóð vefsíðunnar þinnar, blogg, "
+
+#: actions/register.php:404
+msgid "Describe yourself and your "
+msgstr "Lýstu þér og þínum "
+
+#: actions/register.php:410
+msgid "Where you are, like \"City, "
+msgstr "Hvar ertu, t.d. \"Borg, "
+
+#: actions/register.php:432
+msgid " except this private data: password, "
+msgstr " nema þessi persónulegu gögn: lykilorð, "
+
+#: actions/register.php:471
+#, php-format
+msgid "Congratulations, %s! And welcome to %%%%site.name%%%%. "
+msgstr "Til hamingju %s! Vertu velkomin(n) á %%%%site.name%%%%. "
+
+#: actions/register.php:495
+msgid "(You should receive a message by email "
+msgstr "(Þú ættir að fá tölvupóst "
+
+#: actions/remotesubscribe.php:166 actions/remotesubscribe.php:171
+msgid "That's a local profile! Login to subscribe."
+msgstr ""
+"Þetta er staðbundinn persónuaðgangur! Skráðu þig inn til að gerast "
+"áskrifandi."
+
+#: actions/replies.php:118
+#, php-format
+msgid "Replies to %s, page %d"
+msgstr "Svör við %s, síða %d"
+
+#: actions/showfavorites.php:79
+#, php-format
+msgid "%s favorite notices, page %d"
+msgstr "Uppáhaldsbabl %s, síða %d"
+
+#: actions/showgroup.php:77 lib/groupnav.php:85
+#, php-format
+msgid "%s group"
+msgstr "%s hópurinn"
+
+#: actions/showgroup.php:79
+#, php-format
+msgid "%s group, page %d"
+msgstr "%s hópurinn, síða %d"
+
+#: actions/showgroup.php:206
+msgid "Group profile"
+msgstr "Hópssíðan"
+
+#: actions/showgroup.php:251 actions/showstream.php:278
+#: actions/tagother.php:119 lib/grouplist.php:134 lib/profilelist.php:133
+msgid "URL"
+msgstr "Vefslóð"
+
+#: actions/showgroup.php:262 actions/showstream.php:289
+#: actions/tagother.php:129 lib/grouplist.php:145 lib/profilelist.php:144
+msgid "Note"
+msgstr "Athugasemd"
+
+#: actions/showgroup.php:270
+msgid "Group actions"
+msgstr "Hópsaðgerðir"
+
+#: actions/showgroup.php:323
+#, php-format
+msgid "Notice feed for %s group"
+msgstr "Bablveita fyrir hópinn %s"
+
+#: actions/showgroup.php:357 lib/groupnav.php:90
+msgid "Members"
+msgstr "Meðlimir"
+
+#: actions/showgroup.php:363 actions/showstream.php:413
+#: actions/showstream.php:442 actions/showstream.php:524 lib/section.php:95
+#: lib/tagcloudsection.php:71
+msgid "(None)"
+msgstr "(Ekkert)"
+
+#: actions/showgroup.php:370
+msgid "All members"
+msgstr "Allir meðlimir"
+
+#: actions/showgroup.php:378
+#, php-format
+msgid ""
+"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service "
+msgstr ""
+"**%s** er notendahópur á [örbloggsþjónustunni](http://en.wikipedia.org/wiki"
+"/Micro-blogging) %%%%site.name%%%% "
+
+#: actions/showmessage.php:98
+msgid "Only the sender and recipient "
+msgstr "Aðeins sendandinn og móttakandi "
+
+#: actions/showstream.php:73
+#, php-format
+msgid "%s, page %d"
+msgstr "%s, síða %d"
+
+#: actions/showstream.php:143
+msgid "'s profile"
+msgstr "- Persónuleg síða"
+
+#: actions/showstream.php:236 actions/tagother.php:77
+msgid "User profile"
+msgstr "Persónuleg síða notanda"
+
+#: actions/showstream.php:240 actions/tagother.php:81
+msgid "Photo"
+msgstr "Ljósmynd"
+
+#: actions/showstream.php:317
+msgid "User actions"
+msgstr "Notandaaðgerðir"
+
+#: actions/showstream.php:342
+msgid "Send a direct message to this user"
+msgstr "Senda bein skilaboð til þessa notanda"
+
+#: actions/showstream.php:343
+msgid "Message"
+msgstr "Skilaboð"
+
+#: actions/showstream.php:451
+msgid "All subscribers"
+msgstr "Allir áskrifendur"
+
+#: actions/showstream.php:533
+msgid "All groups"
+msgstr "Allir hópar"
+
+#: actions/showstream.php:542
+#, php-format
+msgid ""
+"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service "
+msgstr ""
+"**%s** hefur notendaaðgang á "
+"[örbloggsþjónustunni](http://en.wikipedia.org/wiki/Micro-blogging) "
+"%%%%site.name%%%% "
+
+#: actions/smssettings.php:128
+msgid "Phone number, no punctuation or spaces, "
+msgstr "Símanúmer, engin sértákn eða bil,"
+
+#: actions/smssettings.php:162
+msgid "Send me notices through SMS; "
+msgstr "Senda mér babl í gegnum SMS; "
+
+#: actions/smssettings.php:335
+msgid "A confirmation code was sent to the phone number you added. "
+msgstr "Staðfestingarlykill hefur verið sendur í símanúmerið sem þú slóst inn. "
+
+#: actions/smssettings.php:453
+msgid "Mobile carrier"
+msgstr "Farsímafyrirtæki"
+
+#: actions/subedit.php:70
+msgid "You are not subscribed to that profile."
+msgstr "Þú ert ekki áskrifandi."
+
+#: actions/subedit.php:83
+msgid "Could not save subscription."
+msgstr "Gat ekki vistað áskrift."
+
+#: actions/subscribe.php:55
+msgid "Not a local user."
+msgstr "Ekki staðbundinn notandi."
+
+#: actions/subscribe.php:69
+msgid "Subscribed"
+msgstr "Þú ert nú í áskrift"
+
+#: actions/subscribers.php:50
+#, php-format
+msgid "%s subscribers"
+msgstr "%s áskrifendur"
+
+#: actions/subscribers.php:52
+#, php-format
+msgid "%s subscribers, page %d"
+msgstr "%s áskrifendur, síða %d"
+
+#: actions/subscribers.php:63
+msgid "These are the people who listen to "
+msgstr "Þetta er fólkið sem hlustar á "
+
+#: actions/subscribers.php:67
+#, php-format
+msgid "These are the people who "
+msgstr "Þetta er fólkið sem "
+
+#: actions/subscriptions.php:52
+#, php-format
+msgid "%s subscriptions"
+msgstr "%s áskriftir"
+
+#: actions/subscriptions.php:54
+#, php-format
+msgid "%s subscriptions, page %d"
+msgstr "%s áskriftir, síða %d"
+
+#: actions/subscriptions.php:65
+msgid "These are the people whose notices "
+msgstr "Þetta er fólkið þar sem bablið "
+
+#: actions/subscriptions.php:69
+#, php-format
+msgid "These are the people whose "
+msgstr "Þetta er fólkið þar sem "
+
+#: actions/subscriptions.php:122
+msgid "Jabber"
+msgstr "Jabber snarskilaboðaþjónusta"
+
+#: actions/tag.php:43
+#, php-format
+msgid "Notices tagged with %s, page %d"
+msgstr "Babl merkt með %s, síða %d"
+
+#: actions/tag.php:66
+#, php-format
+msgid "Messages tagged \"%s\", most recent first"
+msgstr "Skilaboð merkt með \"%s\", nýlegustu skilaboðin fyrst"
+
+#: actions/tagother.php:33
+msgid "Not logged in"
+msgstr "Ekki innskráð(ur)"
+
+#: actions/tagother.php:39
+msgid "No id argument."
+msgstr "Ekkert einkenni gefið upp."
+
+#: actions/tagother.php:65
+#, php-format
+msgid "Tag %s"
+msgstr "Merki %s"
+
+#: actions/tagother.php:141
+msgid "Tag user"
+msgstr "Merkja notanda"
+
+#: actions/tagother.php:149
+msgid ""
+"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
+"separated"
+msgstr ""
+"Merki fyrir þennan notanda (bókstafir, tölustafir, -, ., og _), aðskilin með "
+"kommu eða bili"
+
+#: actions/tagother.php:164
+msgid "There was a problem with your session token."
+msgstr "Það komu upp vandamál varðandi setutókann þinn."
+
+#: actions/tagother.php:191
+msgid ""
+"You can only tag people you are subscribed to or who are subscribed to you."
+msgstr ""
+"Þú getur aðeins merkt fólk sem þú ert áskrifandi að eða þau sem eru "
+"áskrifendur að þér."
+
+#: actions/tagother.php:198
+msgid "Could not save tags."
+msgstr "Gat ekki vistað merki."
+
+#: actions/tagother.php:233
+msgid "Use this form to add tags to your subscribers or subscriptions."
+msgstr ""
+"Notaðu þetta eyðublað til að bæta við merkjum við áskrifendur þína eða þau "
+"sem þú ert áskrifandi að."
+
+#: actions/tagrss.php:35
+msgid "No such tag."
+msgstr "Ekkert þannig merki."
+
+#: actions/tagrss.php:66
+#, php-format
+msgid "Microblog tagged with %s"
+msgstr "Örblogg merkt með %s"
+
+#: actions/twitapiblocks.php:47
+msgid "Block user failed."
+msgstr "Mistókst að loka á notanda."
+
+#: actions/twitapiblocks.php:69
+msgid "Unblock user failed."
+msgstr "Mistókst að opna fyrir notanda."
+
+#: actions/twitapiusers.php:48
+msgid "Not found."
+msgstr "Fannst ekki."
+
+#: actions/twittersettings.php:71
+msgid "Add your Twitter account to automatically send "
+msgstr "Bættu við Twitter aðgangi þínum til að sjálfkrafa senda "
+
+#: actions/twittersettings.php:119
+msgid "Twitter user name"
+msgstr "Notendanafn á Twitter"
+
+#: actions/twittersettings.php:126
+msgid "Twitter password"
+msgstr "Lykilorð á Twitter"
+
+#: actions/twittersettings.php:228
+msgid "Twitter Friends"
+msgstr "Twitter vinir"
+
+#: actions/twittersettings.php:327
+msgid "Username must have only numbers, "
+msgstr "Notendanafn má aðeins innihalda tölustafi, "
+
+#: actions/twittersettings.php:341
+#, php-format
+msgid "Unable to retrieve account information "
+msgstr "Gat ekki náð í aðgangsupplýsingar "
+
+#: actions/unblock.php:108
+msgid "Error removing the block."
+msgstr "Vill kom upp við að aflétta notendalokun."
+
+#: actions/unsubscribe.php:50
+msgid "No profile id in request."
+msgstr "Ekkert einkenni persónulegrar síðu í beiðni."
+
+#: actions/unsubscribe.php:57
+msgid "No profile with that id."
+msgstr "Enginn persónuleg síða með þessu einkenni."
+
+#: actions/unsubscribe.php:71
+msgid "Unsubscribed"
+msgstr "Ekki lengur áskrifandi"
+
+#: actions/usergroups.php:63
+#, php-format
+msgid "%s groups"
+msgstr "Hópar %s"
+
+#: actions/usergroups.php:65
+#, php-format
+msgid "%s groups, page %d"
+msgstr "Hópar %s, síða %d"
+
+#: classes/Notice.php:104
+msgid "Problem saving notice. Unknown user."
+msgstr "Gat ekki vistað babl. Óþekktur notandi."
+
+#: classes/Notice.php:109
+msgid ""
+"Too many notices too fast; take a breather and post again in a few minutes."
+msgstr ""
+"Of mikið babl í einu; slakaðu aðeins á og haltu svo áfram eftir nokkrar "
+"mínútur."
+
+#: classes/Notice.php:116
+msgid "You are banned from posting notices on this site."
+msgstr "Það hefur verið lagt bann við babli frá þér á þessari síðu."
+
+#: lib/accountsettingsaction.php:108
+msgid "Upload an avatar"
+msgstr "Hlaða upp einkennismynd"
+
+#: lib/accountsettingsaction.php:119
+msgid "Other"
+msgstr "Annað"
+
+#: lib/accountsettingsaction.php:120
+msgid "Other options"
+msgstr "Aðrir valkostir"
+
+#: lib/action.php:130
+#, php-format
+msgid "%s - %s"
+msgstr "%s - %s"
+
+#: lib/action.php:145
+msgid "Untitled page"
+msgstr "Ónafngreind síða"
+
+#: lib/action.php:316
+msgid "Primary site navigation"
+msgstr "Stikl aðalsíðu"
+
+#: lib/action.php:322
+msgid "Personal profile and friends timeline"
+msgstr "Persónuleg síða og vinarás"
+
+#: lib/action.php:325
+msgid "Search for people or text"
+msgstr "Leita að fólki eða texta"
+
+#: lib/action.php:328
+msgid "Account"
+msgstr "Aðgangur"
+
+#: lib/action.php:328
+msgid "Change your email, avatar, password, profile"
+msgstr ""
+"Breyttu tölvupóstinum þínum, einkennismyndinni þinni, lykilorðinu þínu, "
+"persónulegu síðunni þinni"
+
+#: lib/action.php:330
+msgid "Connect to IM, SMS, Twitter"
+msgstr "Tengjast snarskilaboðaþjónustu, SMS, Twitter"
+
+#: lib/action.php:332
+msgid "Logout from the site"
+msgstr "Skrá þig út af síðunni"
+
+#: lib/action.php:335
+msgid "Login to the site"
+msgstr "Skrá þig inn á síðuna"
+
+#: lib/action.php:338
+msgid "Create an account"
+msgstr "Búa til aðgang"
+
+#: lib/action.php:341
+msgid "Login with OpenID"
+msgstr "Skrá þig inn með OpenID"
+
+#: lib/action.php:344
+msgid "Help me!"
+msgstr "Hjálp!"
+
+#: lib/action.php:362
+msgid "Site notice"
+msgstr "Babl vefsíðunnar"
+
+#: lib/action.php:417
+msgid "Local views"
+msgstr "Staðbundin sýn"
+
+#: lib/action.php:472
+msgid "Page notice"
+msgstr "Babl síðunnar"
+
+#: lib/action.php:562
+msgid "Secondary site navigation"
+msgstr "Stikl undirsíðu"
+
+#: lib/action.php:602 lib/action.php:623
+msgid "StatusNet software license"
+msgstr "Hugbúnaðarleyfi StatusNet"
+
+#: lib/action.php:630
+msgid "All "
+msgstr "Allt "
+
+#: lib/action.php:635
+msgid "license."
+msgstr "leyfi."
+
+#: lib/blockform.php:123 lib/blockform.php:153
+msgid "Block this user"
+msgstr "Loka á þennan notanda"
+
+#: lib/blockform.php:153
+msgid "Block"
+msgstr "Loka"
+
+#: lib/disfavorform.php:114 lib/disfavorform.php:140
+msgid "Disfavor this notice"
+msgstr "Taka þetta babl út sem uppáhald"
+
+#: lib/facebookaction.php:268
+#, php-format
+msgid "To use the %s Facebook Application you need to login "
+msgstr "Til að nota Facebook forritið %s verður þú að skrá þig inn "
+
+#: lib/facebookaction.php:271
+msgid " a new account."
+msgstr " nýr aðgangur."
+
+#: lib/facebookaction.php:557 lib/mailbox.php:214 lib/noticelist.php:354
+msgid "Published"
+msgstr "Útgefið"
+
+#: lib/favorform.php:114 lib/favorform.php:140
+msgid "Favor this notice"
+msgstr "Setja þetta babl í uppáhald"
+
+#: lib/feedlist.php:64
+msgid "Export data"
+msgstr "Flytja út gögn"
+
+#: lib/galleryaction.php:121
+msgid "Filter tags"
+msgstr "Sía merki"
+
+#: lib/galleryaction.php:131
+msgid "All"
+msgstr "Allt"
+
+#: lib/galleryaction.php:137
+msgid "Tag"
+msgstr "Merki"
+
+#: lib/galleryaction.php:138
+msgid "Choose a tag to narrow list"
+msgstr "Veldu merki til að þrengja lista"
+
+#: lib/galleryaction.php:139
+msgid "Go"
+msgstr "Ãfram"
+
+#: lib/groupeditform.php:148
+msgid "URL of the homepage or blog of the group or topic"
+msgstr "Vefslóð vefsíðu hópsins eða umfjöllunarefnisins"
+
+#: lib/groupeditform.php:151
+msgid "Description"
+msgstr "Lýsing"
+
+#: lib/groupeditform.php:153
+msgid "Describe the group or topic in 140 chars"
+msgstr "Lýstu hópnum eða umfjöllunarefninu með 140 táknum"
+
+#: lib/groupeditform.php:158
+msgid ""
+"Location for the group, if any, like \"City, State (or Region), Country\""
+msgstr "Staðsetning hópsins, ef einhver, eins og \"Borg, landshluti, land\""
+
+#: lib/groupnav.php:84 lib/searchgroupnav.php:84
+msgid "Group"
+msgstr "Hópur"
+
+#: lib/groupnav.php:100
+msgid "Admin"
+msgstr "Stjórnandi"
+
+#: lib/groupnav.php:101
+#, php-format
+msgid "Edit %s group properties"
+msgstr "Breyta hópstillingum %s"
+
+#: lib/groupnav.php:106
+msgid "Logo"
+msgstr "Einkennismerki"
+
+#: lib/groupnav.php:107
+#, php-format
+msgid "Add or edit %s logo"
+msgstr "Bæta við eða breyta einkennismerki %s"
+
+#: lib/groupsbymemberssection.php:71
+msgid "Groups with most members"
+msgstr "Hóparnir með flestu meðlimina"
+
+#: lib/groupsbypostssection.php:71
+msgid "Groups with most posts"
+msgstr "Hóparnir með mesta bablið"
+
+#: lib/grouptagcloudsection.php:56
+#, php-format
+msgid "Tags in %s group's notices"
+msgstr "Merki í babli %s hópsins"
+
+#: lib/htmloutputter.php:104
+msgid "This page is not available in a "
+msgstr "Þessi síða er ekki aðgengileg í "
+
+#: lib/joinform.php:114
+msgid "Join"
+msgstr "Gerast meðlimur"
+
+#: lib/leaveform.php:114
+msgid "Leave"
+msgstr "Hætta sem meðlimur"
+
+#: lib/logingroupnav.php:76
+msgid "Login with a username and password"
+msgstr "Skráðu þig inn með notendanafni og lykilorði"
+
+#: lib/logingroupnav.php:79
+msgid "Sign up for a new account"
+msgstr "Búðu til nýjan aðgang"
+
+#: lib/logingroupnav.php:82
+msgid "Login or register with OpenID"
+msgstr "Skráðu þig inn eða nýskráðu þig með OpenID"
+
+#: lib/mail.php:175
+#, php-format
+msgid ""
+"Hey, %s.\n"
+"\n"
+msgstr ""
+"Hey, %s.\n"
+"\n"
+
+#: lib/mail.php:236
+#, php-format
+msgid "%1$s is now listening to "
+msgstr "%1$s hlustar núna á "
+
+#: lib/mail.php:254
+#, php-format
+msgid "Location: %s\n"
+msgstr "Staðsetning: %s\n"
+
+#: lib/mail.php:256
+#, php-format
+msgid "Homepage: %s\n"
+msgstr "Vefsíða: %s\n"
+
+#: lib/mail.php:258
+#, php-format
+msgid ""
+"Bio: %s\n"
+"\n"
+msgstr ""
+"Lýsing: %s\n"
+"\n"
+
+#: lib/mail.php:461
+#, php-format
+msgid "You've been nudged by %s"
+msgstr "%s ýtti við þér"
+
+#: lib/mail.php:465
+#, php-format
+msgid "%1$s (%2$s) is wondering what you are up to "
+msgstr "%1$s (%2$s) er að spá hvað þú ert að gera "
+
+#: lib/mail.php:555
+#, php-format
+msgid "%1$s just added your notice from %2$s"
+msgstr "%1$s bætti við bablinu þínu af %2$s"
+
+#: lib/mailbox.php:229 lib/noticelist.php:380
+msgid "From"
+msgstr "Frá"
+
+#: lib/messageform.php:110
+msgid "Send a direct notice"
+msgstr "Senda bein skilaboð"
+
+#: lib/noticeform.php:125
+msgid "Send a notice"
+msgstr "Senda babl"
+
+#: lib/noticeform.php:152
+msgid "Available characters"
+msgstr "Leyfileg tákn"
+
+#: lib/noticelist.php:426
+msgid "in reply to"
+msgstr "sem svar við"
+
+#: lib/noticelist.php:447 lib/noticelist.php:450
+msgid "Reply to this notice"
+msgstr "Svara þessu babli"
+
+#: lib/noticelist.php:451
+msgid "Reply"
+msgstr "Svara"
+
+#: lib/noticelist.php:471 lib/noticelist.php:474
+msgid "Delete this notice"
+msgstr "Eyða þessu babli"
+
+#: lib/noticelist.php:474
+msgid "Delete"
+msgstr "Eyða"
+
+#: lib/nudgeform.php:116
+msgid "Nudge this user"
+msgstr "Ãta við þessum notanda"
+
+#: lib/nudgeform.php:128
+msgid "Nudge"
+msgstr "Pot"
+
+#: lib/nudgeform.php:128
+msgid "Send a nudge to this user"
+msgstr "Ãta við þessum notanda"
+
+#: lib/personaltagcloudsection.php:56
+#, php-format
+msgid "Tags in %s's notices"
+msgstr "Merki í babli %s"
+
+#: lib/profilelist.php:182
+msgid "(none)"
+msgstr "(ekkert)"
+
+#: lib/publicgroupnav.php:76
+msgid "Public"
+msgstr "Almenn"
+
+#: lib/publicgroupnav.php:80
+msgid "User groups"
+msgstr "Notendahópar"
+
+#: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
+msgid "Recent tags"
+msgstr "Nýleg merki"
+
+#: lib/publicgroupnav.php:86
+msgid "Featured"
+msgstr "à sviðsljósinu"
+
+#: lib/publicgroupnav.php:90
+msgid "Popular"
+msgstr "Vinsælt"
+
+#: lib/searchgroupnav.php:82
+msgid "Notice"
+msgstr "Babl"
+
+#: lib/searchgroupnav.php:85
+msgid "Find groups on this site"
+msgstr "Finna hópa á þessari síðu"
+
+#: lib/section.php:89
+msgid "Untitled section"
+msgstr "Ónafngreindur hluti"
+
+#: lib/subgroupnav.php:81
+#, php-format
+msgid "People %s subscribes to"
+msgstr "Fólk sem %s er áskrifandi að"
+
+#: lib/subgroupnav.php:89
+#, php-format
+msgid "People subscribed to %s"
+msgstr "Fólk sem eru áskrifendur að %s"
+
+#: lib/subgroupnav.php:97
+#, php-format
+msgid "Groups %s is a member of"
+msgstr "Hópar sem %s er meðlimur í"
+
+#: lib/subgroupnav.php:104
+#, php-format
+msgid "Invite friends and colleagues to join you on %s"
+msgstr "Bjóða vinum og vandamönnum að slást í hópinn á %s"
+
+#: lib/subs.php:53
+msgid "User has blocked you."
+msgstr "Notandinn hefur lokað á þig."
+
+#: lib/subscribeform.php:115 lib/subscribeform.php:139
+msgid "Subscribe to this user"
+msgstr "Gerast áskrifandi að þessum notanda"
+
+#: lib/tagcloudsection.php:56
+msgid "None"
+msgstr "Ekkert"
+
+#: lib/topposterssection.php:74
+msgid "Top posters"
+msgstr "Aðalbablararnir"
+
+#: lib/unblockform.php:120 lib/unblockform.php:150
+msgid "Unblock this user"
+msgstr "Opna á þennan notanda"
+
+#: lib/unblockform.php:150
+msgid "Unblock"
+msgstr "Opna"
+
+#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
+msgid "Unsubscribe from this user"
+msgstr "Hætta sem áskrifandi að þessum notanda"
diff --git a/locale/nb_NO/LC_MESSAGES/statusnet.mo b/locale/nb_NO/LC_MESSAGES/statusnet.mo
index 7e8a05579..ee3bad415 100644
--- a/locale/nb_NO/LC_MESSAGES/statusnet.mo
+++ b/locale/nb_NO/LC_MESSAGES/statusnet.mo
Binary files differ
diff --git a/locale/nb_NO/LC_MESSAGES/statusnet.po b/locale/nb_NO/LC_MESSAGES/statusnet.po
index 116513857..5e2d6613c 100644
--- a/locale/nb_NO/LC_MESSAGES/statusnet.po
+++ b/locale/nb_NO/LC_MESSAGES/statusnet.po
@@ -9,8 +9,8 @@ msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-01-25 16:24+0000\n"
-"PO-Revision-Date: 2009-04-09 22:44+0000\n"
-"Last-Translator: Charlie Ball <staselig@gmail.com>\n"
+"PO-Revision-Date: 2009-09-26 22:45+0000\n"
+"Last-Translator: Eivind Uggedal <eivind@uggedal.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -23,7 +23,7 @@ msgstr ""
#: actions/noticesearchrss.php:88
#, php-format
msgid " Search Stream for \"%s\""
-msgstr ""
+msgstr "Søkestrøm for «%s»"
#: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
#: actions/finishopenidlogin.php:88 actions/register.php:205
@@ -31,22 +31,24 @@ msgstr ""
msgid ""
" except this private data: password, email address, IM address, phone number."
msgstr ""
+"utenom disse private dataene: passord, epost, adresse, lynmeldingsadresse og "
+"telefonnummer."
#: ../actions/showstream.php:400 ../lib/stream.php:109
#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
msgid " from "
-msgstr ""
+msgstr "fra"
#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
#: actions/twitapistatuses.php:347
#, php-format
msgid "%1$s / Updates replying to %2$s"
-msgstr ""
+msgstr "%1$s / Oppdateringer som svarer til %2$s"
#: ../actions/invite.php:168 actions/invite.php:176 actions/invite.php:211
#, php-format
msgid "%1$s has invited you to join them on %2$s"
-msgstr ""
+msgstr "%1$s har invitert deg til %2$s"
#: ../actions/invite.php:170
#, php-format
@@ -78,6 +80,27 @@ msgid ""
"\n"
"Sincerely, %2$s\n"
msgstr ""
+"%$1s har invitert deg til %2$s (%3$s).\n"
+"\n"
+"%$2s er en mikrobloggingteneste som lar deg holde deg oppdatert på folk du "
+"kjenner og/eller som interesserer deg.\n"
+"\n"
+"Du kan også dele nyheter om deg sjelv, dine tanker eller livet ditt på "
+"nettet med folk som kjenner til deg. Det er supert for å møte nye folk med "
+"like interesser.\n"
+"\n"
+"%1$s sa:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Du kan se profilsiden til %1$s på %2$s her:\n"
+"\n"
+"%5$s\n"
+"\n"
+"Hvis du vil prøva tjenesten, klikk på lenken nedenfor for å akseptere "
+"invitasjonen.\n"
+"\n"
+"Vennlig hilsen, %2$s\n"
#: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:241
#, php-format
@@ -98,14 +121,14 @@ msgstr ""
"\n"
"\t%3$s\n"
"\n"
-"Mvh,\n"
+"Vennlig hilsen,\n"
"%4$s.\n"
#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
#: actions/twitapistatuses.php:350
#, php-format
msgid "%1$s updates that reply to updates from %2$s / %3$s."
-msgstr ""
+msgstr "%1$s oppdateringer som svarer på oppdateringer fra %2$s / %3$s."
#: ../actions/shownotice.php:45 actions/shownotice.php:45
#: actions/shownotice.php:161
@@ -123,7 +146,7 @@ msgstr "%s (%s)"
#: actions/publicrss.php:90
#, php-format
msgid "%s Public Stream"
-msgstr "%s Offentlig Strøm"
+msgstr "%s offentlig strøm"
#: ../actions/all.php:47 ../actions/allrss.php:60
#: ../actions/twitapistatuses.php:238 ../lib/stream.php:51 actions/all.php:47
@@ -138,7 +161,7 @@ msgstr "%s og venner"
#: actions/twitapistatuses.php:33
#, php-format
msgid "%s public timeline"
-msgstr "%s sin offentlige tidslinje"
+msgstr "%s offentlig tidslinje"
#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411
#, php-format
@@ -155,15 +178,15 @@ msgstr "%s tidslinje"
#: actions/twitapistatuses.php:36
#, php-format
msgid "%s updates from everyone!"
-msgstr "%s oppdateringer fra alle!"
+msgstr "%s oppdateringer fra alle sammen!"
#: ../actions/register.php:213
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
msgstr ""
-"(Du vil straks motta en e-post med instruksjoner om hvordan du kan bekrefte "
-"din e-postadresse.)"
+"(Du vil straks motta en epost med instruksjoner om hvordan du kan bekrefte "
+"din epostadresse)"
#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605
#, php-format
@@ -171,32 +194,29 @@ msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
"broughtby%%](%%site.broughtbyurl%%). "
msgstr ""
-"**%%site.name%%** er en mikroblogging-tjeneste av "
+"**%%site.name%%** er en mikrobloggingtjeneste av "
"[%%site.broughtby%%](%%site.broughtbyurl%%). "
#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
-msgstr "**%%site.name%%** er en mikroblogging-tjeneste. "
+msgstr "**%%site.name%%** er en mikrobloggingtjeneste. "
#: ../lib/util.php:274 lib/util.php:290
msgid ". Contributors should be attributed by full name or nickname."
-msgstr ". Bidragsytere burde være etterfulgt av fullt navn eller brukernavn."
+msgstr ". Bidragsytere burde være etterfulgt av fullt navn eller kallenavn."
#: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
#: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
#: actions/finishopenidlogin.php:101 actions/profilesettings.php:100
#: lib/groupeditform.php:139
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr ""
-"1-64 småbokstaver eller nummer, ingen punktum eller mellomrom (ei heller æøå "
-"og lign.)"
+msgstr "1-64 små bokstaver eller nummer, ingen punktum eller mellomrom"
#: ../actions/register.php:152 actions/register.php:166
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
-"1-64 småbokstaver eller nummer, ingen punktum eller mellomrom (ei heller æøå "
-"og lign.) PÃ¥krevd."
+"1-64 små bokstaver eller nummer, ingen punktum eller mellomrom. Påkrevd."
#: ../actions/password.php:42 actions/profilesettings.php:181
#: actions/passwordsettings.php:102
@@ -227,14 +247,16 @@ 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 ""
-"En bekreftelseskode ble sendt til lynmeldingsadressen du la til. Sjekk "
-"innboksen din (og søppel-posten!) for koden, og hvordan du skal bruke den."
+"En bekreftelseskode ble sendt til epostadressen du la til. Sjekk innboksen "
+"din (og søppelboksen) for koden, og hvordan du skal bruke den."
#: ../actions/smssettings.php:216 actions/smssettings.php:224
msgid ""
"A confirmation code was sent to the phone number you added. Check your inbox "
"(and spam box!) for the code and instructions on how to use it."
msgstr ""
+"En bekreftelseskode ble sendt til telefonnummeret du la til. Sjekk innboksen "
+"din for koden, og hvordan du skal bruke den."
#: ../actions/twitapiaccount.php:49 ../actions/twitapihelp.php:45
#: ../actions/twitapistatuses.php:88 ../actions/twitapistatuses.php:259
@@ -288,7 +310,7 @@ msgstr "Om"
#: ../actions/userauthorization.php:119 actions/userauthorization.php:126
#: actions/userauthorization.php:143
msgid "Accept"
-msgstr "Aksepter"
+msgstr "Godta"
#: ../actions/emailsettings.php:62 ../actions/imsettings.php:63
#: ../actions/openidsettings.php:57 ../actions/smssettings.php:71
@@ -308,7 +330,7 @@ msgstr "Legg til OpenID"
#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
#: lib/accountsettingsaction.php:117
msgid "Add or remove OpenIDs"
-msgstr "Legg til eller slett OpenID"
+msgstr "Legg til eller fjern OpenID-er"
#: ../actions/emailsettings.php:38 ../actions/imsettings.php:39
#: ../actions/smssettings.php:39 actions/emailsettings.php:39
@@ -337,7 +359,7 @@ msgstr "Alle oppdateringer for %s"
#: actions/noticesearchrss.php:90
#, php-format
msgid "All updates matching search term \"%s\""
-msgstr "Alle oppdateringer som passer søket: \"%s\""
+msgstr "Alle oppdateringer for søket: «%s»"
#: ../actions/finishopenidlogin.php:29 ../actions/login.php:31
#: ../actions/openidlogin.php:29 ../actions/register.php:30
@@ -390,19 +412,21 @@ 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 ""
+"Venter på godkjenning. Sjekk din Jabber/GTalk-konto for en melding med "
+"instruksjoner (la du %s til vennelisten din?)"
#: ../actions/emailsettings.php:54 actions/emailsettings.php:55
msgid ""
"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
"a message with further instructions."
msgstr ""
-"Venter på bekreftelse av adressen. Sjekk innboksen din (og søppel-post!) for "
+"Venter på bekreftelse av adressen. Sjekk innboksen din (og søppelboksen) for "
"melding med videre veiledning."
#: ../actions/smssettings.php:58 actions/smssettings.php:58
#: actions/smssettings.php:111
msgid "Awaiting confirmation on this phone number."
-msgstr "Venter på bekreftelse på dette telefonnummeret"
+msgstr "Venter på bekreftelse for dette telefonnummeret."
#: ../lib/util.php:1318 lib/util.php:1452
#, fuzzy
@@ -413,7 +437,7 @@ msgstr "Tidligere »"
#: actions/profilesettings.php:82 actions/register.php:184
#: actions/profilesettings.php:112 actions/register.php:402
msgid "Bio"
-msgstr "Bio"
+msgstr "Om meg"
#: ../actions/profilesettings.php:101 ../actions/register.php:82
#: ../actions/updateprofile.php:103 actions/profilesettings.php:216
@@ -421,7 +445,7 @@ msgstr "Bio"
#: actions/profilesettings.php:205 actions/register.php:174
#: actions/updateprofile.php:107
msgid "Bio is too long (max 140 chars)."
-msgstr "Bioen er for lang (maks 140 tegn)."
+msgstr "«Om meg» er for lang (maks 140 tegn)."
#: ../lib/deleteaction.php:41 lib/deleteaction.php:41 lib/deleteaction.php:69
msgid "Can't delete this notice."
@@ -431,13 +455,13 @@ msgstr "Kan ikke slette notisen."
#: actions/updateprofile.php:123
#, php-format
msgid "Can't read avatar URL '%s'"
-msgstr "Kan ikke lese brukerbilde URL '%s'"
+msgstr "Kan ikke lese brukerbilde-URL «%s»"
#: ../actions/password.php:85 ../actions/recoverpassword.php:300
#: actions/profilesettings.php:404 actions/recoverpassword.php:313
#: actions/passwordsettings.php:169 actions/recoverpassword.php:347
msgid "Can't save new password."
-msgstr "Klarer ikke å lagre det nye passordet"
+msgstr "Klarer ikke å lagre nytt passord."
#: ../actions/emailsettings.php:57 ../actions/imsettings.php:58
#: ../actions/smssettings.php:62 actions/emailsettings.php:58
@@ -449,17 +473,17 @@ msgstr "Avbryt"
#: ../lib/openid.php:121 lib/openid.php:121 lib/openid.php:130
msgid "Cannot instantiate OpenID consumer object."
-msgstr ""
+msgstr "Klarer ikke instansiere OpenID-objekt."
#: ../actions/imsettings.php:163 actions/imsettings.php:171
#: actions/imsettings.php:286
msgid "Cannot normalize that Jabber ID"
-msgstr ""
+msgstr "Klarer ikke normalisere Jabber-IDen"
#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
#: actions/emailsettings.php:311
msgid "Cannot normalize that email address"
-msgstr "Kan ikke normalisere den e-postadressen"
+msgstr "Klarer ikke normalisere epostadressen"
#: ../actions/password.php:45 actions/profilesettings.php:184
#: actions/passwordsettings.php:110
@@ -469,7 +493,7 @@ msgstr "Endre"
#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
#: lib/accountsettingsaction.php:114
msgid "Change email handling"
-msgstr "Endre e-post håndtering"
+msgstr "Endre eposthåndtering"
#: ../actions/password.php:32 actions/profilesettings.php:36
#: actions/passwordsettings.php:58
@@ -483,7 +507,7 @@ msgstr "Endre passordet ditt"
#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
#: lib/accountsettingsaction.php:105
msgid "Change your profile settings"
-msgstr "Endre profil instillingene dine"
+msgstr "Endre profilinnstillingene dine"
#: ../actions/password.php:43 ../actions/recoverpassword.php:181
#: ../actions/register.php:155 ../actions/smssettings.php:65
@@ -497,7 +521,7 @@ msgstr "Bekreft"
#: ../actions/confirmaddress.php:90 actions/confirmaddress.php:90
#: actions/confirmaddress.php:144
msgid "Confirm Address"
-msgstr "Bekreft Adresse"
+msgstr "Bekreft adresse"
#: ../actions/emailsettings.php:238 ../actions/imsettings.php:222
#: ../actions/smssettings.php:245 actions/emailsettings.php:256
@@ -515,7 +539,7 @@ msgstr "Bekreftelseskode"
#: ../actions/confirmaddress.php:38 actions/confirmaddress.php:38
#: actions/confirmaddress.php:80
msgid "Confirmation code not found."
-msgstr "Bekreftelseskode ikke funnet."
+msgstr "Fant ikke bekreftelseskode."
#: ../actions/register.php:202
#, php-format
diff --git a/locale/pl_PL/LC_MESSAGES/statusnet.mo b/locale/pl_PL/LC_MESSAGES/statusnet.mo
index 48e5fae7d..dba116252 100644
--- a/locale/pl_PL/LC_MESSAGES/statusnet.mo
+++ b/locale/pl_PL/LC_MESSAGES/statusnet.mo
Binary files differ
diff --git a/locale/pl_PL/LC_MESSAGES/statusnet.po b/locale/pl_PL/LC_MESSAGES/statusnet.po
index e866145b2..54c52e949 100644
--- a/locale/pl_PL/LC_MESSAGES/statusnet.po
+++ b/locale/pl_PL/LC_MESSAGES/statusnet.po
@@ -1,68 +1,61 @@
-# #-#-#-#-# statusnet.pot (PACKAGE VERSION) #-#-#-#-#
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
+# translation of pl.po to Polish
# Paweł Wilk <siefca@gnu.org>, 2008.
+# Piotr DrÄ…g <piotrdrag@gmail.com>, 2009.
#
-# #-#-#-#-# statusnet.new.pot (PACKAGE VERSION) #-#-#-#-#
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# Polish language has 3 plural forms.
+# Special case is used for one and some numbers ending in 2, 3, or 4.
+# Example:
+# 1 WINDOW -> 1 OKNO
+# x2 to x4 WINDOWS -> x2 do x4 OKNA (x != 1)
+# 5 or more WINDOWS -> 5 lub więcej OKIEN
#
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: pl\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-25 16:24+0000\n"
-"PO-Revision-Date: 2009-04-27 22:38+0000\n"
-"Last-Translator: Dawid Jan <dawidjan@gmail.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"POT-Creation-Date: 2009-07-14 10:32-0700\n"
+"PO-Revision-Date: 2009-09-09 15:47+0200\n"
+"Last-Translator: Piotr DrÄ…g <piotrdrag@gmail.com>\n"
+"Language-Team: Polish <pl@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"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: Pootle 1.1.0\n"
-
-# Polish language has 3 plural forms.
-# Special case is used for one and some numbers ending in 2, 3, or 4.
-# Example:
-# 1 WINDOW -> 1 OKNO
-# x2 to x4 WINDOWS -> x2 do x4 OKNA (x != 1)
-# 5 or more WINDOWS -> 5 lub więcej OKIEN
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%"
+"100<10 || n%100>=20) ? 1 : 2);\n"
+
#: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
-#: actions/noticesearchrss.php:88
+#: actions/noticesearchrss.php:88 actions/noticesearchrss.php:89
#, php-format
msgid " Search Stream for \"%s\""
-msgstr "Szukaj strumienia dla \"%s\""
+msgstr " Znajdź strumień dla \"%s\""
#: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
#: actions/finishopenidlogin.php:88 actions/register.php:205
-#: actions/finishopenidlogin.php:110
+#: actions/finishopenidlogin.php:110 actions/finishopenidlogin.php:109
msgid ""
" except this private data: password, email address, IM address, phone number."
msgstr ""
-"z wyłączeniem tych prywatnych danych: e-maila, identyfikatora IM, numeru "
+" poza tymi prywatnymi danymi: hasło, adres e-mail, adres komunikatora, numer "
"telefonu."
#: ../actions/showstream.php:400 ../lib/stream.php:109
#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
msgid " from "
-msgstr ""
+msgstr " z "
#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
-#: actions/twitapistatuses.php:347
+#: actions/twitapistatuses.php:347 actions/twitapistatuses.php:363
#, php-format
msgid "%1$s / Updates replying to %2$s"
-msgstr "%1$s / Wpisów w odpowiedzi na %2$s"
+msgstr "%1$s/aktualizacje odpowiadajÄ…ce na %2$s"
#: ../actions/invite.php:168 actions/invite.php:176 actions/invite.php:211
+#: actions/invite.php:218 actions/invite.php:220
#, php-format
msgid "%1$s has invited you to join them on %2$s"
-msgstr "%1$s zapraszają Cię byś dołączył do nich w %2$s"
+msgstr "%1$s zapraszają Cię, abyś dołączył do nich w %2$s"
-#: ../actions/invite.php:170
+#: ../actions/invite.php:170 actions/invite.php:220 actions/invite.php:222
#, php-format
msgid ""
"%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -92,11 +85,38 @@ msgid ""
"\n"
"Sincerely, %2$s\n"
msgstr ""
+"Użytkownik %1$s zapraszają Cię, abyś dołączył do nich w %2$s (%3$s).\n"
+"\n"
+"%2$s jest usługą mikroblogowania, która umożliwia pozostawanie w kontakcie z "
+"osobami, których znasz i z tymi, którzy Cię interesują.\n"
+"\n"
+"Możesz także dzielić się w sieci nowinkami o sobie, swoimi przemyśleniami, "
+"lub swoim życiem z osobami, którzy Cię znają. To także wspaniały sposób na "
+"poznawanie nowych osób, którzy dzielą Twoje zainteresowania.\n"
+"\n"
+"Użytkownik %1$s powiedział:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Możesz zobaczyć stronę profilu %1$s na %2$s tutaj:\n"
+"\n"
+"%5$s\n"
+"\n"
+"Jeśli chcesz wypróbować usługę, naciśnij na poniższy odnośnik, aby "
+"zaakceptować zaproszenie.\n"
+"\n"
+"%6$s\n"
+"\n"
+"Jeśli nie, możesz zignorować tę wiadomość. Dziękujemy za Twoją cierpliwość i "
+"czas.\n"
+"\n"
+"Z poważaniem, %2$s\n"
#: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:241
+#: lib/mail.php:236 lib/mail.php:235
#, php-format
msgid "%1$s is now listening to your notices on %2$s."
-msgstr "%1$s obserwuje teraz Twoje wpisy na %2$s."
+msgstr "Użytkownik %1$s obserwuje teraz Twoje wpisy na %2$s."
#: ../lib/mail.php:126
#, php-format
@@ -108,105 +128,122 @@ msgid ""
"Faithfully yours,\n"
"%4$s.\n"
msgstr ""
-"%1$s obserwuje teraz Twoje wpisy na %2$s.\n"
+"Użytkownik %1$s obserwuje teraz Twoje wpisy na %2$s.\n"
+"\n"
+"\t%3$s\n"
"\n"
-"KÅ‚aniam siÄ™,\n"
+"Z poważaniem,\n"
"%4$s.\n"
#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
-#: actions/twitapistatuses.php:350
+#: actions/twitapistatuses.php:350 actions/twitapistatuses.php:367
+#: actions/twitapistatuses.php:328
#, php-format
msgid "%1$s updates that reply to updates from %2$s / %3$s."
-msgstr "%1$s wpisów, które są odpowiedziami na wpisy od %2$s / %3$s."
+msgstr "%1$s aktualizuje tę odpowiedź na aktualizacje od %2$s/%3$s."
#: ../actions/shownotice.php:45 actions/shownotice.php:45
-#: actions/shownotice.php:161
+#: actions/shownotice.php:161 actions/shownotice.php:174
#, php-format
msgid "%1$s's status on %2$s"
msgstr "Status użytkownika %1$s na %2$s"
#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
#: actions/invite.php:99 actions/invite.php:123 actions/invite.php:131
+#: actions/invite.php:125 actions/invite.php:133
#, php-format
msgid "%s (%s)"
-msgstr ""
+msgstr "%s (%s)"
#: ../actions/publicrss.php:62 actions/publicrss.php:48
-#: actions/publicrss.php:90
+#: actions/publicrss.php:90 actions/publicrss.php:89
#, php-format
msgid "%s Public Stream"
-msgstr "Publiczny strumień %s"
+msgstr "Publiczny strumień użytkownika %s"
#: ../actions/all.php:47 ../actions/allrss.php:60
#: ../actions/twitapistatuses.php:238 ../lib/stream.php:51 actions/all.php:47
#: actions/allrss.php:60 actions/twitapistatuses.php:155 lib/personal.php:51
#: actions/all.php:65 actions/allrss.php:103 actions/facebookhome.php:164
#: actions/twitapistatuses.php:126 lib/personalgroupnav.php:99
+#: actions/all.php:68 actions/all.php:114 actions/allrss.php:106
+#: actions/facebookhome.php:163 actions/twitapistatuses.php:130
+#: actions/all.php:50 actions/all.php:127 actions/allrss.php:114
+#: actions/facebookhome.php:158 actions/twitapistatuses.php:89
+#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
-msgstr "%s i przyjaciele"
+msgstr "Użytkownik %s i przyjaciele"
#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
-#: actions/twitapistatuses.php:33
+#: actions/twitapistatuses.php:33 actions/twitapistatuses.php:32
+#: actions/twitapistatuses.php:37
#, php-format
msgid "%s public timeline"
-msgstr "Publiczna oÅ› czasu %s"
+msgstr "Publiczna oś czasu użytkownika %s"
-#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411
+#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411 lib/mail.php:412
#, php-format
msgid "%s status"
-msgstr "status %s"
+msgstr "Status użytkownika %s"
#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
-#: actions/twitapistatuses.php:199
+#: actions/twitapistatuses.php:199 actions/twitapistatuses.php:209
+#: actions/twitapigroups.php:69 actions/twitapistatuses.php:154
#, php-format
msgid "%s timeline"
-msgstr "oÅ› czasu %s"
+msgstr "Oś czasu użytkownika %s"
#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
-#: actions/twitapistatuses.php:36
+#: actions/twitapistatuses.php:36 actions/twitapistatuses.php:38
+#: actions/twitapistatuses.php:41
#, php-format
msgid "%s updates from everyone!"
-msgstr "%s wpisów od wszystkich!"
+msgstr "Użytkownik %s aktualizuje od każdego!"
-#: ../actions/register.php:213
+#: ../actions/register.php:213 actions/register.php:497
+#: actions/register.php:545
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
msgstr ""
-"(Wkrótce otrzymasz wiadomość na swoją skrzynkę e-mail, która będzie zawierać "
-"instrukcje, jak potwierdzić Twój adres e-mail.)"
+"(Powinieneś właśnie otrzymać wiadomość e-mail, zawierającą instrukcje "
+"potwierdzenia adresu e-mail)"
-#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605
+#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605 lib/action.php:702
+#: lib/action.php:752
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
"broughtby%%](%%site.broughtbyurl%%). "
msgstr ""
-"**%%site.name%%** to serwis z mikroblogami prowadzony przez [%%site.broughtby"
-"%%](%%site.broughtbyurl%%)."
+"**%%site.name%%** jest usługą mikroblogowania prowadzoną przez [%%site."
+"broughtby%%](%%site.broughtbyurl%%). "
-#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607
+#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607 lib/action.php:704
+#: lib/action.php:754
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
-msgstr "**%%site.name%%** to serwis do mikroblogowania."
+msgstr "**%%site.name%%** jest usługą mikroblogowania. "
#: ../lib/util.php:274 lib/util.php:290
msgid ". Contributors should be attributed by full name or nickname."
msgstr ""
-". Współpracownicy powinni być wymienieni z imienia i nazwiska lub pseudonimu."
+". Współtwórcy powinni być wymienieni z imienia i nazwiska lub pseudonimu."
#: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
#: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
#: actions/finishopenidlogin.php:101 actions/profilesettings.php:100
-#: lib/groupeditform.php:139
+#: lib/groupeditform.php:139 actions/finishopenidlogin.php:100
+#: lib/groupeditform.php:154
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "Max. 64 znaki alfanumeryczne, bez spacji i znaków przestankowych"
+msgstr "1-64 małe litery lub liczby, bez spacji i znaków przestankowych"
#: ../actions/register.php:152 actions/register.php:166
+#: actions/register.php:368 actions/register.php:414
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
-"Max. 64 znaki alfanumeryczne, bez spacji i znaków przestankowych. Wymagane."
+"1-64 małe litery lub liczby, bez spacji i znaków przestankowych. Wymagane."
#: ../actions/password.php:42 actions/profilesettings.php:181
#: actions/passwordsettings.php:102
@@ -214,41 +251,43 @@ msgid "6 or more characters"
msgstr "6 lub więcej znaków"
#: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
-#: actions/recoverpassword.php:220
+#: actions/recoverpassword.php:220 actions/recoverpassword.php:233
msgid "6 or more characters, and don't forget it!"
-msgstr "6 lub więcej znaków – nie zapomnij go!"
+msgstr "6 lub więcej znaków, i nie zapomnij go!"
#: ../actions/register.php:154 actions/register.php:168
-#: actions/register.php:373
+#: actions/register.php:373 actions/register.php:419
msgid "6 or more characters. Required."
msgstr "6 lub więcej znaków. Wymagane."
#: ../actions/imsettings.php:197 actions/imsettings.php:205
+#: actions/imsettings.php:321
#, php-format
msgid ""
"A confirmation code was sent to the IM address you added. You must approve %"
"s for sending messages to you."
msgstr ""
-"Na Twój adres komunikatora został wysłany kod potwierdzający. Musisz "
+"Kod potwierdzający został wysłany na dodany adres komunikatora. Musisz "
"zaakceptować otrzymywanie wiadomości od %s."
#: ../actions/emailsettings.php:213 actions/emailsettings.php:231
+#: actions/emailsettings.php:350
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 ""
-"Kod potwierdzający został wysłany na podany przez Ciebie adres e-mail. "
-"Sprawdź w swojej skrzynce odbiorczej (także w folderze SPAM) czy otrzymałeś "
-"kod i instrukcje dotyczące jego użycia. "
+"Kod potwierdzający został wysłany na dodany adres e-mail. Sprawdź w swojej "
+"skrzynce odbiorczej (także w wiadomościach niechcianych!), czy otrzymałeś "
+"kod i instrukcje dotyczące jego użycia."
#: ../actions/smssettings.php:216 actions/smssettings.php:224
msgid ""
"A confirmation code was sent to the phone number you added. Check your inbox "
"(and spam box!) for the code and instructions on how to use it."
msgstr ""
-"Kod potwierdzający został wysłany na podany przez Ciebie numer telefonu. "
-"Sprawdź w swojej skrzynce odbiorczej (także w folderze SPAM) czy otrzymałeś "
-"kod i instrukcje dotyczące jego użycia. "
+"Kod potwierdzający został wysłany na dodany numer telefonu. Sprawdź w swojej "
+"skrzynce odbiorczej (także w wiadomościach niechcianych!), czy otrzymałeś "
+"kod i instrukcje dotyczące jego użycia."
#: ../actions/twitapiaccount.php:49 ../actions/twitapihelp.php:45
#: ../actions/twitapistatuses.php:88 ../actions/twitapistatuses.php:259
@@ -268,9 +307,22 @@ msgstr ""
#: actions/twitapistatuses.php:147 actions/twitapistatuses.php:228
#: actions/twitapistatuses.php:239 actions/twitapistatuses.php:392
#: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429
-#: actions/twitapiusers.php:32
+#: actions/twitapiusers.php:32 actions/twitapidirect_messages.php:120
+#: actions/twitapifavorites.php:91 actions/twitapifavorites.php:108
+#: actions/twitapistatuses.php:82 actions/twitapistatuses.php:159
+#: actions/twitapistatuses.php:246 actions/twitapistatuses.php:257
+#: actions/twitapistatuses.php:416 actions/twitapistatuses.php:426
+#: actions/twitapistatuses.php:453 actions/twitapidirect_messages.php:113
+#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:109
+#: actions/twitapifavorites.php:160 actions/twitapifriendships.php:128
+#: actions/twitapifriendships.php:168 actions/twitapigroups.php:110
+#: actions/twitapistatuses.php:68 actions/twitapistatuses.php:134
+#: actions/twitapistatuses.php:201 actions/twitapistatuses.php:211
+#: actions/twitapistatuses.php:357 actions/twitapistatuses.php:372
+#: actions/twitapistatuses.php:409 actions/twitapitags.php:110
+#: actions/twitapiusers.php:34
msgid "API method not found!"
-msgstr "metoda API nie znaleziona!"
+msgstr "Nie znaleziono metody API!"
#: ../actions/twitapiaccount.php:57 ../actions/twitapiaccount.php:113
#: ../actions/twitapiaccount.php:119 ../actions/twitapiblocks.php:28
@@ -291,18 +343,24 @@ msgstr "metoda API nie znaleziona!"
#: actions/twitapidirect_messages.php:184 actions/twitapifavorites.php:143
#: actions/twitapihelp.php:52 actions/twitapistatusnet.php:172
#: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37
-#: actions/twitapistatuses.php:562
+#: actions/twitapistatuses.php:562 actions/twitapiaccount.php:46
+#: actions/twitapiaccount.php:98 actions/twitapiaccount.php:104
+#: actions/twitapidirect_messages.php:193 actions/twitapifavorites.php:149
+#: actions/twitapistatuses.php:625 actions/twitapitrends.php:87
+#: actions/twitapiaccount.php:48 actions/twitapidirect_messages.php:189
+#: actions/twitapihelp.php:54 actions/twitapistatuses.php:582
msgid "API method under construction."
-msgstr "metoda API w trakcie powstawania."
+msgstr "Metoda API jest w trakcie tworzenia."
-#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568
+#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568 lib/action.php:661
+#: lib/action.php:706
msgid "About"
-msgstr "O serwisie"
+msgstr "O usłudze"
#: ../actions/userauthorization.php:119 actions/userauthorization.php:126
-#: actions/userauthorization.php:143
+#: actions/userauthorization.php:143 actions/userauthorization.php:178
msgid "Accept"
-msgstr "Akceptuj"
+msgstr "Zaakceptuj"
#: ../actions/emailsettings.php:62 ../actions/imsettings.php:63
#: ../actions/openidsettings.php:57 ../actions/smssettings.php:71
@@ -311,6 +369,7 @@ msgstr "Akceptuj"
#: actions/twittersettings.php:85 actions/emailsettings.php:120
#: actions/imsettings.php:127 actions/openidsettings.php:111
#: actions/smssettings.php:133 actions/twittersettings.php:163
+#: actions/twittersettings.php:166 actions/twittersettings.php:182
msgid "Add"
msgstr "Dodaj"
@@ -333,105 +392,112 @@ msgid "Address"
msgstr "Adres"
#: ../actions/invite.php:131 actions/invite.php:139 actions/invite.php:176
+#: actions/invite.php:181 actions/invite.php:183
msgid "Addresses of friends to invite (one per line)"
-msgstr "Adresy subskrybentów, których zapraszasz (jeden w każdej linii)"
+msgstr "Adresy przyjaciół, których zapraszasz (jeden na wiersz)"
#: ../actions/showstream.php:273 actions/showstream.php:288
-#: actions/showstream.php:422
+#: actions/showstream.php:422 lib/profileaction.php:126
msgid "All subscriptions"
-msgstr "Wszyscy obserwowani"
+msgstr "Wszystkie subskrypcje"
#: ../actions/publicrss.php:64 actions/publicrss.php:50
-#: actions/publicrss.php:92
+#: actions/publicrss.php:92 actions/publicrss.php:91
#, php-format
msgid "All updates for %s"
msgstr "Wszystkie aktualizacje od %s"
#: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
-#: actions/noticesearchrss.php:90
+#: actions/noticesearchrss.php:90 actions/noticesearchrss.php:91
#, php-format
msgid "All updates matching search term \"%s\""
-msgstr "Wszystkie aktualizacje pasujÄ…ce do wzorca wyszukiwania \"%s\""
+msgstr "Wszystkie aktualizacje pasujÄ…ce do wyszukiwanego terminu \"%s\""
#: ../actions/finishopenidlogin.php:29 ../actions/login.php:31
#: ../actions/openidlogin.php:29 ../actions/register.php:30
#: actions/finishopenidlogin.php:29 actions/login.php:31
#: actions/openidlogin.php:29 actions/register.php:30
#: actions/finishopenidlogin.php:34 actions/login.php:77
-#: actions/openidlogin.php:30 actions/register.php:92
+#: actions/openidlogin.php:30 actions/register.php:92 actions/register.php:131
msgid "Already logged in."
msgstr "Jesteś już zalogowany."
-#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49
+#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49 lib/subs.php:48
msgid "Already subscribed!."
-msgstr "Już obserwujesz!"
+msgstr "Już subskrybowane!"
#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
-#: actions/deletenotice.php:113
+#: actions/deletenotice.php:113 actions/deletenotice.php:114
msgid "Are you sure you want to delete this notice?"
msgstr "Jesteś pewien, że chcesz usunąć ten wpis?"
#: ../actions/userauthorization.php:77 actions/userauthorization.php:83
-#: actions/userauthorization.php:81
+#: actions/userauthorization.php:81 actions/userauthorization.php:76
msgid "Authorize subscription"
-msgstr "Pozwól na obserwację"
+msgstr "Upoważnij subskrypcję"
#: ../actions/login.php:104 ../actions/register.php:178
-#: actions/register.php:192
+#: actions/register.php:192 actions/login.php:218 actions/openidlogin.php:117
+#: actions/register.php:416 actions/register.php:463
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
-"Automatycznie loguj mnie na konto. Nie używać w przypadku współdzielonych "
-"komputerów!"
+"Automatyczne logowanie. Nie użyj na komputerach używanych przez wiele osób!"
#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
+#: actions/profilesettings.php:144 actions/profilesettings.php:145
msgid ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
msgstr ""
-"Automatycznie zasubskrybuj każdego kto mnie zasubskrybuje (najlepsze dla "
+"Automatycznie zasubskrybuj każdego, kto mnie zasubskrybuje (najlepsze dla "
"botów)"
#: ../actions/avatar.php:32 ../lib/settingsaction.php:90
#: actions/profilesettings.php:34 actions/avatarsettings.php:65
#: actions/showgroup.php:209 lib/accountsettingsaction.php:107
+#: actions/avatarsettings.php:67 actions/showgroup.php:211
+#: actions/showgroup.php:216
msgid "Avatar"
msgstr "Awatar"
#: ../actions/avatar.php:113 actions/profilesettings.php:350
-#: actions/avatarsettings.php:395
+#: actions/avatarsettings.php:395 actions/avatarsettings.php:346
msgid "Avatar updated."
-msgstr "Awatar załadowany."
+msgstr "Zaktualizowano awatar."
#: ../actions/imsettings.php:55 actions/imsettings.php:56
+#: actions/imsettings.php:108
#, 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 ""
-"Oczekiwanie na potwierdzenie dla tego adresu. Sprawdź czy na Twoje konto "
-"Jabbera/GTalka przyszła wiadomość z dalszymi instrukcjami. (Nie zapomnij "
-"dodać %s do listy znajomych.)"
+"Oczekiwanie na potwierdzenie tego adresu. Sprawdź swoje konto Jabbera/GTalk, "
+"czy otrzymałeś wiadomość z dalszymi instrukcjami (dodałeś %s do listy "
+"znajomych?)."
#: ../actions/emailsettings.php:54 actions/emailsettings.php:55
+#: actions/emailsettings.php:107
msgid ""
"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
"a message with further instructions."
msgstr ""
-"Ten adres oczekuje potwierdzenia. Sprawdź swoją skrzynkę odbiorczą (także "
-"folder SPAM!) czy dostałeś wiadomość z dalszymi instrukcjami. "
+"Oczekiwanie na potwierdzenie tego adresu. Sprawdź swoją skrzynkę odbiorczą "
+"(także w wiadomościach niechcianych!), czy otrzymałeś wiadomość z dalszymi "
+"instrukcjami."
#: ../actions/smssettings.php:58 actions/smssettings.php:58
#: actions/smssettings.php:111
msgid "Awaiting confirmation on this phone number."
-msgstr "Oczekiwanie na potwierdzenie dla tego numeru telefonu."
+msgstr "Oczekiwanie na potwierdzenie tego numeru telefonu."
#: ../lib/util.php:1318 lib/util.php:1452
-#, fuzzy
msgid "Before »"
msgstr "Wcześniej »"
#: ../actions/profilesettings.php:49 ../actions/register.php:170
#: actions/profilesettings.php:82 actions/register.php:184
#: actions/profilesettings.php:112 actions/register.php:402
+#: actions/register.php:448
msgid "Bio"
msgstr "O mnie"
@@ -439,23 +505,25 @@ msgstr "O mnie"
#: ../actions/updateprofile.php:103 actions/profilesettings.php:216
#: actions/register.php:89 actions/updateprofile.php:104
#: actions/profilesettings.php:205 actions/register.php:174
-#: actions/updateprofile.php:107
+#: actions/updateprofile.php:107 actions/updateprofile.php:109
+#: actions/profilesettings.php:206 actions/register.php:211
msgid "Bio is too long (max 140 chars)."
-msgstr "Wpis \"O mnie\" jest za długi (maks. 140 znaków)"
+msgstr "Wpis \"O mnie\" jest za długi (maksymalnie 140 znaków)."
#: ../lib/deleteaction.php:41 lib/deleteaction.php:41 lib/deleteaction.php:69
msgid "Can't delete this notice."
-msgstr "Nie można usunąć tego wpisu. "
+msgstr "Nie można usunąć tego wpisu."
#: ../actions/updateprofile.php:119 actions/updateprofile.php:120
-#: actions/updateprofile.php:123
+#: actions/updateprofile.php:123 actions/updateprofile.php:125
#, php-format
msgid "Can't read avatar URL '%s'"
-msgstr "Nie można odczytać URL-a awatara '%s'"
+msgstr "Nie można odczytać adresu URL awatara \"%s\""
#: ../actions/password.php:85 ../actions/recoverpassword.php:300
#: actions/profilesettings.php:404 actions/recoverpassword.php:313
#: actions/passwordsettings.php:169 actions/recoverpassword.php:347
+#: actions/passwordsettings.php:174 actions/recoverpassword.php:365
msgid "Can't save new password."
msgstr "Nie można zapisać nowego hasła."
@@ -468,8 +536,9 @@ msgid "Cancel"
msgstr "Anuluj"
#: ../lib/openid.php:121 lib/openid.php:121 lib/openid.php:130
+#: lib/openid.php:133
msgid "Cannot instantiate OpenID consumer object."
-msgstr "Nie można stworzyć instancji obiektu OpenID."
+msgstr "Nie można utworzyć instancji obiektu klienta OpenID."
#: ../actions/imsettings.php:163 actions/imsettings.php:171
#: actions/imsettings.php:286
@@ -477,9 +546,9 @@ msgid "Cannot normalize that Jabber ID"
msgstr "Nie można znormalizować tego identyfikatora Jabbera"
#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
-#: actions/emailsettings.php:311
+#: actions/emailsettings.php:311 actions/emailsettings.php:318
msgid "Cannot normalize that email address"
-msgstr "Nie można znormalizować tego adresu email."
+msgstr "Nie można znormalizować tego adresu e-mail"
#: ../actions/password.php:45 actions/profilesettings.php:184
#: actions/passwordsettings.php:110
@@ -489,7 +558,7 @@ msgstr "Zmień"
#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
#: lib/accountsettingsaction.php:114
msgid "Change email handling"
-msgstr "Zmień ustawienia e-mail"
+msgstr "Zmień obsługę adresu e-mail"
#: ../actions/password.php:32 actions/profilesettings.php:36
#: actions/passwordsettings.php:58
@@ -498,12 +567,12 @@ msgstr "Zmień hasło"
#: ../lib/settingsaction.php:94 lib/accountsettingsaction.php:111
msgid "Change your password"
-msgstr "Zmień swoje hasło"
+msgstr "Zmień hasło"
#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
#: lib/accountsettingsaction.php:105
msgid "Change your profile settings"
-msgstr "Zmień ustawienia swojego profilu"
+msgstr "Zmień ustawienia profilu"
#: ../actions/password.php:43 ../actions/recoverpassword.php:181
#: ../actions/register.php:155 ../actions/smssettings.php:65
@@ -511,6 +580,7 @@ msgstr "Zmień ustawienia swojego profilu"
#: actions/register.php:169 actions/smssettings.php:65
#: actions/passwordsettings.php:105 actions/recoverpassword.php:221
#: actions/register.php:376 actions/smssettings.php:122
+#: actions/recoverpassword.php:236 actions/register.php:422
msgid "Confirm"
msgstr "Potwierdź"
@@ -523,7 +593,7 @@ msgstr "Potwierdź adres"
#: ../actions/smssettings.php:245 actions/emailsettings.php:256
#: actions/imsettings.php:230 actions/smssettings.php:253
#: actions/emailsettings.php:379 actions/imsettings.php:361
-#: actions/smssettings.php:374
+#: actions/smssettings.php:374 actions/emailsettings.php:386
msgid "Confirmation cancelled."
msgstr "Anulowano potwierdzenie."
@@ -537,7 +607,8 @@ msgstr "Kod potwierdzajÄ…cy"
msgid "Confirmation code not found."
msgstr "Nie znaleziono kodu potwierdzajÄ…cego."
-#: ../actions/register.php:202
+#: ../actions/register.php:202 actions/register.php:473
+#: actions/register.php:521
#, php-format
msgid ""
"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -555,22 +626,40 @@ msgid ""
"\n"
"Thanks for signing up and we hope you enjoy using this service."
msgstr ""
+"Gratulacje, %s! Witaj na %%%%site.name%%%%. Stąd możesz chcieć...\n"
+"\n"
+"* Przejść do [swojego profilu](%s) i wysłać swoją pierwszą wiadomość.\n"
+"* Dodać [adres Jabbera/GTalk](%%%%action.imsettings%%%%), abyś mógł wysyłać "
+"wpisy przez komunikatora.\n"
+"* [Poszukać osób](%%%%action.peoplesearch%%%%), których możesz znać lub "
+"którzy dzielą Twoje zainteresowania. \n"
+"* Zaktualizować swoje [ustawienia profilu](%%%%action.profilesettings%%%%), "
+"aby powiedzieć innym więcej o sobie. \n"
+"* Przeczytać [dokumentację w sieci](%%%%doc.help%%%%), aby dowiedzieć się o "
+"funkcjach, które mogłeś pominąć. \n"
+"\n"
+"Dziękujemy za zarejestrowanie się i mamy nadzieję, że używanie tej usługi "
+"sprawi Ci przyjemność."
#: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
-#: actions/finishopenidlogin.php:119 lib/action.php:330
+#: actions/finishopenidlogin.php:119 lib/action.php:330 lib/action.php:403
+#: lib/action.php:406 actions/finishopenidlogin.php:118 lib/action.php:422
+#: lib/action.php:425
msgid "Connect"
msgstr "Połącz"
#: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
-#: actions/finishopenidlogin.php:114
+#: actions/finishopenidlogin.php:114 actions/finishopenidlogin.php:113
msgid "Connect existing account"
msgstr "Połącz z istniejącym kontem"
-#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576
+#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576 lib/action.php:669
+#: lib/action.php:719
msgid "Contact"
msgstr "Kontakt"
#: ../lib/openid.php:178 lib/openid.php:178 lib/openid.php:187
+#: lib/openid.php:190
#, php-format
msgid "Could not create OpenID form: %s"
msgstr "Nie można utworzyć formularza OpenID: %s"
@@ -578,47 +667,49 @@ msgstr "Nie można utworzyć formularza OpenID: %s"
#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
#: actions/twitapifriendships.php:48 actions/twitapifriendships.php:64
+#: actions/twitapifriendships.php:51 actions/twitapifriendships.php:68
#, php-format
msgid "Could not follow user: %s is already on your list."
msgstr "Nie można obserwować użytkownika: %s jest już na Twojej liście."
#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
-#: actions/twitapifriendships.php:41
+#: actions/twitapifriendships.php:41 actions/twitapifriendships.php:43
msgid "Could not follow user: User not found."
msgstr "Nie można obserwować użytkownika: nie znaleziono użytkownika."
#: ../lib/openid.php:160 lib/openid.php:160 lib/openid.php:169
+#: lib/openid.php:172
#, php-format
msgid "Could not redirect to server: %s"
msgstr "Nie można przekierować do serwera: %s"
#: ../actions/updateprofile.php:162 actions/updateprofile.php:163
-#: actions/updateprofile.php:166
+#: actions/updateprofile.php:166 actions/updateprofile.php:176
msgid "Could not save avatar info"
msgstr "Nie można zapisać informacji o awatarze"
#: ../actions/updateprofile.php:155 actions/updateprofile.php:156
-#: actions/updateprofile.php:159
+#: actions/updateprofile.php:159 actions/updateprofile.php:163
msgid "Could not save new profile info"
msgstr "Nie można zapisać informacji o nowym profilu"
-#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72
+#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72 lib/subs.php:75
msgid "Could not subscribe other to you."
-msgstr ""
+msgstr "Nie można zasubskrybować innych do Ciebie."
-#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57
+#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57 lib/subs.php:56
msgid "Could not subscribe."
-msgstr "Nie można subskrybować."
+msgstr "Nie można zasubskrybować."
#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
#: actions/recoverpassword.php:111
msgid "Could not update user with confirmed email address."
-msgstr ""
+msgstr "Nie można zaktualizować użytkownika z potwierdzonym adresem e-mail."
#: ../actions/finishremotesubscribe.php:99
#: actions/finishremotesubscribe.php:101 actions/finishremotesubscribe.php:114
msgid "Couldn't convert request tokens to access tokens."
-msgstr "Nie można przekształcić tokenów z żądaniami na tokeny dostępu."
+msgstr "Nie można przekonwertować tokenów żądań na tokeny dostępu."
#: ../actions/confirmaddress.php:84 ../actions/emailsettings.php:234
#: ../actions/imsettings.php:218 ../actions/smssettings.php:241
@@ -626,53 +717,57 @@ msgstr "Nie można przekształcić tokenów z żądaniami na tokeny dostępu."
#: actions/imsettings.php:226 actions/smssettings.php:249
#: actions/confirmaddress.php:126 actions/emailsettings.php:375
#: actions/imsettings.php:357 actions/smssettings.php:370
+#: actions/emailsettings.php:382
msgid "Couldn't delete email confirmation."
-msgstr "Nie można skasować potwierdzenia adresu e-mail."
+msgstr "Nie można usunąć potwierdzenia adresu e-mail."
-#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134
+#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134 lib/subs.php:136
msgid "Couldn't delete subscription."
-msgstr "Nie można usunąć obserwacji."
+msgstr "Nie można usunąć subskrypcji."
#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-#: actions/twitapistatuses.php:84
+#: actions/twitapistatuses.php:84 actions/twitapistatuses.php:87
msgid "Couldn't find any statuses."
-msgstr ""
+msgstr "Nie można znaleźć żadnych statusów."
#: ../actions/remotesubscribe.php:127 actions/remotesubscribe.php:136
#: actions/remotesubscribe.php:178
msgid "Couldn't get a request token."
-msgstr "Nie można uzyskać tokena z żądaniem."
+msgstr "Nie można uzyskać tokenu żądana."
#: ../actions/emailsettings.php:205 ../actions/imsettings.php:187
#: ../actions/smssettings.php:206 actions/emailsettings.php:223
#: actions/imsettings.php:195 actions/smssettings.php:214
#: actions/emailsettings.php:337 actions/imsettings.php:311
-#: actions/smssettings.php:325
+#: actions/smssettings.php:325 actions/emailsettings.php:344
msgid "Couldn't insert confirmation code."
msgstr "Nie można wprowadzić kodu potwierdzającego."
#: ../actions/finishremotesubscribe.php:180
#: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:218
msgid "Couldn't insert new subscription."
-msgstr "Nie można wprowadzić nowej obserwacji."
+msgstr "Nie można wprowadzić nowej subskrypcji."
#: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
#: actions/profilesettings.php:299 actions/twitapiaccount.php:94
#: actions/profilesettings.php:302 actions/twitapiaccount.php:81
+#: actions/twitapiaccount.php:82
msgid "Couldn't save profile."
msgstr "Nie można zapisać profilu."
#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
#: actions/profilesettings.php:279
msgid "Couldn't update user for autosubscribe."
-msgstr ""
+msgstr "Nie można zaktualizować użytkownika do automatycznej subskrypcji."
#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
#: actions/emailsettings.php:298 actions/emailsettings.php:312
#: actions/emailsettings.php:440 actions/emailsettings.php:462
-#, fuzzy
+#: actions/emailsettings.php:447 actions/emailsettings.php:469
+#: actions/smssettings.php:515 actions/smssettings.php:539
+#: actions/smssettings.php:516 actions/smssettings.php:540
msgid "Couldn't update user record."
-msgstr "Nie można uaktualnić wpisu użytkownika."
+msgstr "Nie można zaktualizować wpisu użytkownika."
#: ../actions/confirmaddress.php:72 ../actions/emailsettings.php:156
#: ../actions/emailsettings.php:259 ../actions/imsettings.php:138
@@ -686,74 +781,82 @@ msgstr "Nie można uaktualnić wpisu użytkownika."
#: actions/emailsettings.php:411 actions/imsettings.php:252
#: actions/imsettings.php:395 actions/othersettings.php:162
#: actions/profilesettings.php:259 actions/smssettings.php:266
-#: actions/smssettings.php:408
+#: actions/smssettings.php:408 actions/emailsettings.php:287
+#: actions/emailsettings.php:418 actions/othersettings.php:167
+#: actions/profilesettings.php:260
msgid "Couldn't update user."
msgstr "Nie można zaktualizować użytkownika."
#: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
-#: actions/finishopenidlogin.php:112
+#: actions/finishopenidlogin.php:112 actions/finishopenidlogin.php:111
msgid "Create"
msgstr "Utwórz"
#: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
-#: actions/finishopenidlogin.php:98
+#: actions/finishopenidlogin.php:98 actions/finishopenidlogin.php:97
msgid "Create a new user with this nickname."
-msgstr "Załóż użytkownika o tym pseudonimie."
+msgstr "Utwórz nowego użytkownika o tym pseudonimie."
#: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
-#: actions/finishopenidlogin.php:96
+#: actions/finishopenidlogin.php:96 actions/finishopenidlogin.php:95
msgid "Create new account"
-msgstr "Załóż nowe konto"
+msgstr "Utwórz nowe konto"
#: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
-#: actions/finishopenidlogin.php:231
+#: actions/finishopenidlogin.php:231 actions/finishopenidlogin.php:247
msgid "Creating new account for OpenID that already has a user."
-msgstr "Tworzenie nowego konta użytkownika na podstawie identyfikatora OpenID."
+msgstr ""
+"Tworzenie nowego konta dla identyfikatora OpenID, który posiada już "
+"użytkownika."
#: ../actions/imsettings.php:45 actions/imsettings.php:46
#: actions/imsettings.php:100
msgid "Current confirmed Jabber/GTalk address."
-msgstr "Potwierdzone adresy Jabbera/GTalka"
+msgstr "Obecnie potwierdzone adresy Jabbera/GTalk."
#: ../actions/smssettings.php:46 actions/smssettings.php:46
#: actions/smssettings.php:100
msgid "Current confirmed SMS-enabled phone number."
-msgstr "Potwierdzony numer telefonu z włączoną usługą SMS."
+msgstr "Obecnie potwierdzone numery telefonów z włączoną usługą SMS."
#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
#: actions/emailsettings.php:99
msgid "Current confirmed email address."
-msgstr "Potwierdzony adres e-mail."
+msgstr "Obecnie potwierdzone adresy e-mail."
#: ../actions/showstream.php:356 actions/showstream.php:367
msgid "Currently"
msgstr "Obecnie"
#: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:91
+#: classes/Notice.php:114 classes/Notice.php:124
#, php-format
msgid "DB error inserting hashtag: %s"
-msgstr ""
+msgstr "BÅ‚Ä…d bazy danych podczas wprowadzania znacznika hasha: %s"
#: ../lib/util.php:1061 lib/util.php:1110 classes/Notice.php:698
+#: classes/Notice.php:757 classes/Notice.php:1042
#, php-format
msgid "DB error inserting reply: %s"
-msgstr "BÅ‚Ä…d przy dodawaniu do bazy danych: %s"
+msgstr "BÅ‚Ä…d bazy danych podczas wprowadzania odpowiedzi: %s"
#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-#: actions/deletenotice.php:79
+#: actions/deletenotice.php:79 actions/deletenotice.php:111
msgid "Delete notice"
msgstr "Usuń wpis"
#: ../actions/profilesettings.php:51 ../actions/register.php:172
#: actions/profilesettings.php:84 actions/register.php:186
-#: actions/profilesettings.php:114
+#: actions/profilesettings.php:114 actions/register.php:404
+#: actions/register.php:450
msgid "Describe yourself and your interests in 140 chars"
-msgstr "Opisz siÄ™ w 140 znakach"
+msgstr "Opisz siÄ™ i swoje zainteresowania w 140 znakach"
#: ../actions/register.php:158 ../actions/register.php:161
#: ../lib/settingsaction.php:87 actions/register.php:172
#: actions/register.php:175 lib/settingsaction.php:87 actions/register.php:381
#: actions/register.php:385 lib/accountsettingsaction.php:113
+#: actions/register.php:427 actions/register.php:431
msgid "Email"
msgstr "E-mail"
@@ -765,54 +868,57 @@ msgstr "Adres e-mail"
#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
#: actions/emailsettings.php:60
msgid "Email Settings"
-msgstr "Ustawienia e-mail"
+msgstr "Ustawienia adresu e-mail"
#: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
+#: actions/register.php:200
msgid "Email address already exists."
-msgstr "Taki e-mail już istnieje"
+msgstr "Adres e-mail już istnieje."
-#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173
+#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173 lib/mail.php:172
msgid "Email address confirmation"
-msgstr "Potwierdzenie adresu e-mailowego"
+msgstr "Potwierdzenie adresu e-mail"
#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
#: actions/emailsettings.php:117
msgid "Email address, like \"UserName@example.org\""
-msgstr "Adres e-mail, taki jak \"NazwaUzytkownika@example.org\""
+msgstr "Adres e-mail, taki jak \"NazwaUżytkownika@przykład.org\""
#: ../actions/invite.php:129 actions/invite.php:137 actions/invite.php:174
+#: actions/invite.php:179 actions/invite.php:181
msgid "Email addresses"
msgstr "Adresy e-mail"
#: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
-#: actions/recoverpassword.php:231
+#: actions/recoverpassword.php:231 actions/recoverpassword.php:249
msgid "Enter a nickname or email address."
-msgstr "Podaj pseudonim lub adres e-mailowy"
+msgstr "Podaj pseudonim lub adres e-mail."
#: ../actions/smssettings.php:64 actions/smssettings.php:64
#: actions/smssettings.php:119
msgid "Enter the code you received on your phone."
-msgstr "Wprowadź kod, który otrzymałeś na swój telefon."
+msgstr "Podaj kod, który otrzymałeś na telefonie."
#: ../actions/userauthorization.php:137 actions/userauthorization.php:144
-#: actions/userauthorization.php:161
+#: actions/userauthorization.php:161 actions/userauthorization.php:200
msgid "Error authorizing token"
-msgstr "BÅ‚Ä…d podczas autoryzacji tokena"
+msgstr "Błąd podczas upoważniania tokena"
#: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
-#: actions/finishopenidlogin.php:297
+#: actions/finishopenidlogin.php:297 actions/finishopenidlogin.php:302
+#: actions/finishopenidlogin.php:325
msgid "Error connecting user to OpenID."
-msgstr "Błąd w podłączaniu użytkownika do OpenID."
+msgstr "Błąd podczas łączenia użytkownika z OpenID."
#: ../actions/finishaddopenid.php:78 actions/finishaddopenid.php:78
#: actions/finishaddopenid.php:126
msgid "Error connecting user."
-msgstr "Błąd w podłączaniu użytkownika."
+msgstr "Błąd podczas łączenia użytkownika."
#: ../actions/finishremotesubscribe.php:151
#: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:166
msgid "Error inserting avatar"
-msgstr "BÅ‚Ä…d we wstawianiu awatara"
+msgstr "BÅ‚Ä…d podczas wprowadzania awatara"
#: ../actions/finishremotesubscribe.php:143
#: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:158
@@ -825,35 +931,39 @@ msgid "Error inserting remote profile"
msgstr "BÅ‚Ä…d podczas wprowadzania zdalnego profilu"
#: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
-#: actions/recoverpassword.php:280
+#: actions/recoverpassword.php:280 actions/recoverpassword.php:298
msgid "Error saving address confirmation."
-msgstr "BÅ‚Ä…d w zapisie potwierdzenia adresu."
+msgstr "BÅ‚Ä…d podczas zapisywania potwierdzenia adresu."
#: ../actions/userauthorization.php:140 actions/userauthorization.php:147
-#: actions/userauthorization.php:164
+#: actions/userauthorization.php:164 actions/userauthorization.php:203
msgid "Error saving remote profile"
-msgstr "BÅ‚Ä…d w zapisie zdalnego profilu."
+msgstr "BÅ‚Ä…d podczas zapisie zdalnego profilu"
#: ../lib/openid.php:226 lib/openid.php:226 lib/openid.php:235
+#: lib/openid.php:238
msgid "Error saving the profile."
-msgstr "BÅ‚Ä…d w zapisie profilu."
+msgstr "BÅ‚Ä…d podczas zapisywania profilu."
#: ../lib/openid.php:237 lib/openid.php:237 lib/openid.php:246
+#: lib/openid.php:249
msgid "Error saving the user."
-msgstr "Błąd w zapisie użytkownika."
+msgstr "Błąd podczas zapisywanie użytkownika."
#: ../actions/password.php:80 actions/profilesettings.php:399
-#: actions/passwordsettings.php:164
+#: actions/passwordsettings.php:164 actions/passwordsettings.php:169
msgid "Error saving user; invalid."
-msgstr "Błąd podczas zapisywania użytkownika; niepoprawne dane."
+msgstr "Błąd podczas zapisywania użytkownika; nieprawidłowy."
#: ../actions/login.php:47 ../actions/login.php:73
#: ../actions/recoverpassword.php:307 ../actions/register.php:98
#: actions/login.php:47 actions/login.php:73 actions/recoverpassword.php:320
#: actions/register.php:108 actions/login.php:112 actions/login.php:138
#: actions/recoverpassword.php:354 actions/register.php:198
+#: actions/login.php:120 actions/recoverpassword.php:372
+#: actions/register.php:235
msgid "Error setting user."
-msgstr "Błąd w ustawianiu danych użytkownika."
+msgstr "Błąd podczas ustawiania użytkownika."
#: ../actions/finishaddopenid.php:83 actions/finishaddopenid.php:83
#: actions/finishaddopenid.php:131
@@ -871,86 +981,96 @@ msgid "Error with confirmation code."
msgstr "BÅ‚Ä…d kodu potwierdzajÄ…cego."
#: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
-#: actions/finishopenidlogin.php:117
+#: actions/finishopenidlogin.php:117 actions/finishopenidlogin.php:116
msgid "Existing nickname"
-msgstr "Dotychczasowy pseudonim"
+msgstr "IstniejÄ…cy pseudonim"
-#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570
+#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570 lib/action.php:663
+#: lib/action.php:708
msgid "FAQ"
msgstr "FAQ"
#: ../actions/avatar.php:115 actions/profilesettings.php:352
-#: actions/avatarsettings.php:397
+#: actions/avatarsettings.php:397 actions/avatarsettings.php:349
msgid "Failed updating avatar."
-msgstr "Uaktualnianie awatara nie powiodło się."
+msgstr "Zaktualizowanie awatara nie powiodło się."
#: ../actions/all.php:61 ../actions/allrss.php:64 actions/all.php:61
#: actions/allrss.php:64 actions/all.php:75 actions/allrss.php:107
+#: actions/allrss.php:110 actions/allrss.php:118
#, php-format
msgid "Feed for friends of %s"
msgstr "Kanał dla znajomych użytkownika %s"
#: ../actions/replies.php:65 ../actions/repliesrss.php:80
#: actions/replies.php:65 actions/repliesrss.php:66 actions/replies.php:134
-#: actions/repliesrss.php:71
+#: actions/repliesrss.php:71 actions/replies.php:136 actions/replies.php:135
#, php-format
msgid "Feed for replies to %s"
msgstr "Kanał dla odpowiedzi do użytkownika %s"
#: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:61
+#: actions/tag.php:68
#, php-format
msgid "Feed for tag %s"
-msgstr ""
+msgstr "Kanał dla znaczników %s"
#: ../lib/searchaction.php:105 lib/searchaction.php:105
#: lib/searchgroupnav.php:83
msgid "Find content of notices"
-msgstr ""
+msgstr "Przeszukaj zawartość wpisów"
#: ../lib/searchaction.php:101 lib/searchaction.php:101
#: lib/searchgroupnav.php:81
-#, fuzzy
msgid "Find people on this site"
-msgstr "Szukaj ludzi na tej stronie"
+msgstr "Znajdź osoby na tej stronie"
-#: ../actions/login.php:122
+#: ../actions/login.php:122 actions/login.php:247
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
msgstr ""
-"Z powodów bezpieczeństwa wprowadź proszę ponownie nazwę użytkownika i hasło "
-"przed zmianą swoich ustawień."
+"Z powodów bezpieczeństwa ponownie podaj nazwę użytkownika i hasło przed "
+"zmienianiem ustawień."
#: ../actions/profilesettings.php:44 ../actions/register.php:164
#: actions/profilesettings.php:77 actions/register.php:178
#: actions/profilesettings.php:103 actions/register.php:391
#: actions/showgroup.php:235 actions/showstream.php:262
#: actions/tagother.php:105 lib/groupeditform.php:142
+#: actions/showgroup.php:237 actions/showstream.php:255
+#: actions/tagother.php:104 actions/register.php:437 actions/showgroup.php:242
+#: actions/showstream.php:220 lib/groupeditform.php:157
msgid "Full name"
-msgstr "Pełna nazwa"
+msgstr "ImiÄ™ i nazwisko"
#: ../actions/profilesettings.php:98 ../actions/register.php:79
#: ../actions/updateprofile.php:93 actions/profilesettings.php:213
#: actions/register.php:86 actions/updateprofile.php:94
#: actions/editgroup.php:195 actions/newgroup.php:146
#: actions/profilesettings.php:202 actions/register.php:171
-#: actions/updateprofile.php:97
+#: actions/updateprofile.php:97 actions/updateprofile.php:99
+#: actions/editgroup.php:197 actions/newgroup.php:147
+#: actions/profilesettings.php:203 actions/register.php:208
msgid "Full name is too long (max 255 chars)."
-msgstr "Pełna nazwa jest zbyt długa (max. 255 znaków)."
+msgstr "Imię i nazwisko jest za długie (maksymalnie 255 znaków)."
#: ../lib/util.php:322 lib/util.php:338 lib/action.php:344 lib/action.php:566
+#: lib/action.php:421 lib/action.php:659 lib/action.php:446 lib/action.php:704
msgid "Help"
msgstr "Pomoc"
#: ../lib/util.php:298 lib/util.php:314 lib/action.php:322
-#: lib/facebookaction.php:200
+#: lib/facebookaction.php:200 lib/action.php:393 lib/facebookaction.php:213
+#: lib/action.php:417
msgid "Home"
-msgstr "PoczÄ…tek"
+msgstr "Strona główna"
#: ../actions/profilesettings.php:46 ../actions/register.php:167
#: actions/profilesettings.php:79 actions/register.php:181
#: actions/profilesettings.php:107 actions/register.php:396
-#: lib/groupeditform.php:146
+#: lib/groupeditform.php:146 actions/register.php:442
+#: lib/groupeditform.php:161
msgid "Homepage"
msgstr "Strona domowa"
@@ -958,11 +1078,13 @@ msgstr "Strona domowa"
#: actions/profilesettings.php:210 actions/register.php:83
#: actions/editgroup.php:192 actions/newgroup.php:143
#: actions/profilesettings.php:199 actions/register.php:168
+#: actions/editgroup.php:194 actions/newgroup.php:144
+#: actions/profilesettings.php:200 actions/register.php:205
msgid "Homepage is not a valid URL."
-msgstr "Adres strony domowej nie jest poprawnym URL-em."
+msgstr "Strona domowa nie jest prawidłowym adresem URL."
#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-#: actions/emailsettings.php:173
+#: actions/emailsettings.php:173 actions/emailsettings.php:178
msgid "I want to post notices by email."
msgstr "Chcę wysyłać wpisy przez e-mail."
@@ -982,152 +1104,164 @@ msgid "IM Settings"
msgstr "Ustawienia komunikatora"
#: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
-#: actions/finishopenidlogin.php:116
+#: actions/finishopenidlogin.php:116 actions/finishopenidlogin.php:115
msgid ""
"If you already have an account, login with your username and password to "
"connect it to your OpenID."
msgstr ""
-"Jeśli już masz konto, zaloguj się używając nazwy użytkownika i hasła, aby "
+"Jeśli już masz konto, zaloguj się za pomocą nazwy użytkownika i hasła, aby "
"połączyć je ze swoim identyfikatorem OpenID."
-#: ../actions/openidsettings.php:45
+#: ../actions/openidsettings.php:45 actions/openidsettings.php:96
msgid ""
"If you want to add an OpenID to your account, enter it in the box below and "
"click \"Add\"."
msgstr ""
-"Jeśli chcesz skojarzyć konto OpenID ze swoim lokalnym kontem, wprowadź "
-"identyfikator w poniższe pole i kliknij \"Dodaj\"."
+"Jeśli chcesz dodać identyfikator OpenID do swojego konta, podaj go w "
+"poniższym polu i naciśnij \"Dodaj\"."
-#: ../actions/recoverpassword.php:137
+#: ../actions/recoverpassword.php:137 actions/recoverpassword.php:152
msgid ""
"If you've forgotten or lost your password, you can get a new one sent to the "
"email address you have stored in your account."
msgstr ""
+"Jeśli zapomniałeś lub zgubiłeś swoje hasło, możesz otrzymać nowe na adres e-"
+"mail, który podałeś."
#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
#: actions/emailsettings.php:68 actions/smssettings.php:76
#: actions/emailsettings.php:127 actions/smssettings.php:140
msgid "Incoming email"
-msgstr ""
+msgstr "Wiadomości przychodzące"
#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
-#: actions/emailsettings.php:443
+#: actions/emailsettings.php:443 actions/emailsettings.php:450
+#: actions/smssettings.php:518 actions/smssettings.php:519
msgid "Incoming email address removed."
-msgstr ""
+msgstr "Usunięto przychodzący adres e-mail."
#: ../actions/password.php:69 actions/profilesettings.php:388
-#: actions/passwordsettings.php:153
+#: actions/passwordsettings.php:153 actions/passwordsettings.php:158
msgid "Incorrect old password"
-msgstr "Stare hasło jest niepoprawne"
+msgstr "Niepoprawne stare hasło"
#: ../actions/login.php:67 actions/login.php:67 actions/facebookhome.php:131
-#: actions/login.php:132
+#: actions/login.php:132 actions/facebookhome.php:130 actions/login.php:114
+#: actions/facebookhome.php:129
msgid "Incorrect username or password."
-msgstr "Błędna nazwa użytkownika lub hasło."
+msgstr "Niepoprawna nazwa użytkownika lub hasło."
-#: ../actions/recoverpassword.php:265
+#: ../actions/recoverpassword.php:265 actions/recoverpassword.php:304
+#: actions/recoverpassword.php:322
msgid ""
"Instructions for recovering your password have been sent to the email "
"address registered to your account."
msgstr ""
-"Instrukcje dotyczące przywrócenia hasła zostały wysłane na adres e-mailowy "
-"skojarzony z Twoim kontem."
+"Instrukcje przywracania hasła zostały wysłane na adres e-mail zarejestrowany "
+"z Twoim kontem."
#: ../actions/updateprofile.php:114 actions/updateprofile.php:115
-#: actions/updateprofile.php:118
+#: actions/updateprofile.php:118 actions/updateprofile.php:120
#, php-format
msgid "Invalid avatar URL '%s'"
-msgstr "Błędny URL awatara '%s'"
+msgstr "Nieprawidłowy adres URL awatara \"%s\""
#: ../actions/invite.php:55 actions/invite.php:62 actions/invite.php:70
+#: actions/invite.php:72
#, php-format
msgid "Invalid email address: %s"
msgstr "Nieprawidłowy adres e-mail: %s"
#: ../actions/updateprofile.php:98 actions/updateprofile.php:99
-#: actions/updateprofile.php:102
+#: actions/updateprofile.php:102 actions/updateprofile.php:104
#, php-format
msgid "Invalid homepage '%s'"
-msgstr "Błędna strona domowa '%s'"
+msgstr "Nieprawidłowa strona domowa \"%s\""
#: ../actions/updateprofile.php:82 actions/updateprofile.php:83
-#: actions/updateprofile.php:86
+#: actions/updateprofile.php:86 actions/updateprofile.php:88
#, php-format
msgid "Invalid license URL '%s'"
-msgstr "Błędny URL licencji '%s'"
+msgstr "Nieprawidłowy adres URL licencji \"%s\""
#: ../actions/postnotice.php:61 actions/postnotice.php:62
#: actions/postnotice.php:66
msgid "Invalid notice content"
-msgstr "Błędna zawartość wpisu"
+msgstr "Nieprawidłowa zawartość wpisu"
#: ../actions/postnotice.php:67 actions/postnotice.php:68
#: actions/postnotice.php:72
msgid "Invalid notice uri"
-msgstr "Błędny URI wpisu"
+msgstr "Nieprawidłowy adres URI wpisu"
#: ../actions/postnotice.php:72 actions/postnotice.php:73
#: actions/postnotice.php:77
msgid "Invalid notice url"
-msgstr "Błędny URL wpisu"
+msgstr "Nieprawidłowy adres URL wpisu"
#: ../actions/updateprofile.php:87 actions/updateprofile.php:88
-#: actions/updateprofile.php:91
+#: actions/updateprofile.php:91 actions/updateprofile.php:93
#, php-format
msgid "Invalid profile URL '%s'."
-msgstr "Błędny URL profilu '%s'."
+msgstr "Nieprawidłowy adres URL profilu \"%s\"."
#: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
#: actions/remotesubscribe.php:135
msgid "Invalid profile URL (bad format)"
-msgstr "Błędny URL profilu (zły format)"
+msgstr "Nieprawidłowy adres URL profilu (błędny format)"
#: ../actions/finishremotesubscribe.php:77
#: actions/finishremotesubscribe.php:79 actions/finishremotesubscribe.php:80
msgid "Invalid profile URL returned by server."
-msgstr "Błędny URL profilu zwrócony przez serwer."
+msgstr "Nieprawidłowy adres URL profilu zwrócony przez serwer."
#: ../actions/avatarbynickname.php:37 actions/avatarbynickname.php:37
#: actions/avatarbynickname.php:69
msgid "Invalid size."
-msgstr "Niepoprawny rozmiar."
+msgstr "Nieprawidłowy rozmiar."
#: ../actions/finishopenidlogin.php:235 ../actions/register.php:93
#: ../actions/register.php:111 actions/finishopenidlogin.php:241
#: actions/register.php:103 actions/register.php:121
#: actions/finishopenidlogin.php:279 actions/register.php:193
-#: actions/register.php:211
+#: actions/register.php:211 actions/finishopenidlogin.php:284
+#: actions/finishopenidlogin.php:307 actions/register.php:230
+#: actions/register.php:251
msgid "Invalid username or password."
-msgstr "Błędna nazwa użytkownika lub hasło."
+msgstr "Nieprawidłowa nazwa użytkownika lub hasło."
#: ../actions/invite.php:79 actions/invite.php:86 actions/invite.php:102
-#, fuzzy
+#: actions/invite.php:104
msgid "Invitation(s) sent"
-msgstr "Zaproszenie(a) wysłane"
+msgstr "Wysłano zaproszenia"
#: ../actions/invite.php:97 actions/invite.php:104 actions/invite.php:136
+#: actions/invite.php:138
msgid "Invitation(s) sent to the following people:"
-msgstr "Zaproszenia zostały wysłane do następujących osób:"
+msgstr "Wysłano zaproszenia do następujących osób:"
#: ../lib/util.php:306 lib/util.php:322 lib/facebookaction.php:207
-#: lib/subgroupnav.php:103
+#: lib/subgroupnav.php:103 lib/facebookaction.php:220 lib/action.php:429
+#: lib/facebookaction.php:221 lib/subgroupnav.php:105
msgid "Invite"
msgstr "ZaproÅ›"
#: ../actions/invite.php:123 actions/invite.php:130 actions/invite.php:104
+#: actions/invite.php:106
msgid "Invite new users"
msgstr "Zaproś nowych użytkowników"
-#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609
+#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609 lib/action.php:706
+#: lib/action.php:756
#, 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 ""
-"Działa pod kontrolą oprogramowania [StatusNet](http://status.net/) służącego "
-"do prowadzenia mikroblogów, w wersji %s, dostępnego na licencji [GNU Affero "
-"General Public License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
+"Działa pod kontrolą oprogramowania do mikroblogowania [StatusNet](http://"
+"status.net/) w wersji %s, dostępnego na [Powszechnej Licencji Publicznej GNU "
+"Affero](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
#: ../actions/imsettings.php:173 actions/imsettings.php:181
#: actions/imsettings.php:296
@@ -1135,120 +1269,136 @@ msgid "Jabber ID already belongs to another user."
msgstr "Identyfikator Jabbera należy już do innego użytkownika."
#: ../actions/imsettings.php:62 actions/imsettings.php:63
+#: actions/imsettings.php:120
#, 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 ""
-"Adres Jabbera lub GTalka w postaci \"Użytkownik@przykladowadomena.org\". Nie "
-"zapomnij dodać %s do listy znajomych w swoim komunikatorze lub panelu GTalka."
+"Adres Jabbera lub GTalk, taki jak \"NazwaUżytkownika@przykład.org\". "
+"Najpierw upewnij się, że dodałeś %s do listy znajomych w komunikatorze lub "
+"na GTalk."
#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:128
+#: actions/profilesettings.php:128 actions/profilesettings.php:129
msgid "Language"
msgstr "Język"
#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
-#: actions/profilesettings.php:217
+#: actions/profilesettings.php:217 actions/profilesettings.php:218
msgid "Language is too long (max 50 chars)."
-msgstr ""
+msgstr "Język jest za długi (maksymalnie 50 znaków)."
#: ../actions/profilesettings.php:52 ../actions/register.php:173
#: actions/profilesettings.php:85 actions/register.php:187
#: actions/profilesettings.php:117 actions/register.php:408
#: actions/showgroup.php:244 actions/showstream.php:271
#: actions/tagother.php:113 lib/groupeditform.php:156 lib/grouplist.php:126
-#: lib/profilelist.php:125
+#: lib/profilelist.php:125 actions/showgroup.php:246
+#: actions/showstream.php:264 actions/tagother.php:112 lib/profilelist.php:123
+#: actions/register.php:454 actions/showgroup.php:251
+#: actions/showstream.php:229 actions/userauthorization.php:128
+#: lib/groupeditform.php:171 lib/profilelist.php:185
msgid "Location"
-msgstr "Lokalizacja"
+msgstr "Położenie"
#: ../actions/profilesettings.php:104 ../actions/register.php:85
#: ../actions/updateprofile.php:108 actions/profilesettings.php:219
#: actions/register.php:92 actions/updateprofile.php:109
#: actions/editgroup.php:201 actions/newgroup.php:152
#: actions/profilesettings.php:208 actions/register.php:177
-#: actions/updateprofile.php:112
+#: actions/updateprofile.php:112 actions/updateprofile.php:114
+#: actions/editgroup.php:203 actions/newgroup.php:153
+#: actions/profilesettings.php:209 actions/register.php:214
msgid "Location is too long (max 255 chars)."
-msgstr "Lokalizacja jest za długa (max. 255 znaków)."
+msgstr "Położenie jest za długie (maksymalnie 255 znaków)."
#: ../actions/login.php:97 ../actions/login.php:106
#: ../actions/openidlogin.php:68 ../lib/util.php:310 actions/login.php:97
#: actions/login.php:106 actions/openidlogin.php:77 lib/util.php:326
#: actions/facebooklogin.php:93 actions/login.php:186 actions/login.php:239
#: actions/openidlogin.php:112 lib/action.php:335 lib/facebookaction.php:288
-#: lib/facebookaction.php:315 lib/logingroupnav.php:75
+#: lib/facebookaction.php:315 lib/logingroupnav.php:75 actions/login.php:169
+#: actions/login.php:222 actions/openidlogin.php:121 lib/action.php:412
+#: lib/facebookaction.php:293 lib/facebookaction.php:319 lib/action.php:443
+#: lib/facebookaction.php:295 lib/facebookaction.php:321
#, php-format
msgid "Login"
-msgstr "Login"
+msgstr "Zaloguj siÄ™"
#: ../actions/openidlogin.php:44 actions/openidlogin.php:52
-#: actions/openidlogin.php:62
+#: actions/openidlogin.php:62 actions/openidlogin.php:70
#, php-format
msgid "Login with an [OpenID](%%doc.openid%%) account."
-msgstr "Zaloguj się używając konta [OpenID](%%doc.openid%%)."
+msgstr "Zaloguj siÄ™ za pomocÄ… konta [OpenID](%%doc.openid%%)."
-#: ../actions/login.php:126
+#: ../actions/login.php:126 actions/login.php:251
#, php-format
msgid ""
"Login with your username and password. Don't have a username yet? [Register]"
"(%%action.register%%) a new account, or try [OpenID](%%action.openidlogin%"
"%). "
msgstr ""
-"Zaloguj się używając nazwy użytkownika i hasła. Nie masz ich jeszcze? "
-"[Zarejestruj się](%%action.register%%) i utwórz konto, albo użyj swojego "
-"[OpenID](%%action.openidlogin%%)."
+"Zaloguj się za pomocą nazwy użytkownika i hasła. Nie masz ich jeszcze? "
+"[Zarejestruj](%%action.register%%) nowe konto lub wypróbuj [OpenID](%%action."
+"openidlogin%%). "
-#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332
+#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332 lib/action.php:409
+#: lib/action.php:435
msgid "Logout"
-msgstr "Wyloguj"
+msgstr "Wyloguj siÄ™"
#: ../actions/register.php:166 actions/register.php:180
-#: actions/register.php:393
+#: actions/register.php:393 actions/register.php:439
msgid "Longer name, preferably your \"real\" name"
-msgstr ""
+msgstr "Dłuższa nazwa, najlepiej twoje \"prawdziwe\" nazwisko"
#: ../actions/login.php:110 actions/login.php:110 actions/login.php:245
-#: lib/facebookaction.php:320
+#: lib/facebookaction.php:320 actions/login.php:228 lib/facebookaction.php:325
+#: lib/facebookaction.php:327
msgid "Lost or forgotten password?"
-msgstr "Zgubione hasło?"
+msgstr "Zgubione lub zapomniane hasło?"
#: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
#: actions/emailsettings.php:81 actions/smssettings.php:89
+#: actions/emailsettings.php:139 actions/smssettings.php:150
msgid "Make a new email address for posting to; cancels the old one."
-msgstr ""
+msgstr "Używaj nowego adresu e-mail do wysyłania; anuluj stary."
#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
#: actions/emailsettings.php:71
#, php-format
msgid "Manage how you get email from %%site.name%%."
-msgstr "Zarządzaj tym, jak dostajesz wiadomości e-mail od %%site.name%%."
+msgstr "Zarządzaj, jak otrzymywać wiadomości e-mail od %%site.name%%."
#: ../actions/showstream.php:300 actions/showstream.php:315
-#: actions/showstream.php:480
+#: actions/showstream.php:480 lib/profileaction.php:182
msgid "Member since"
-msgstr "W serwisie od"
+msgstr "Członek od"
#: ../actions/userrss.php:70 actions/userrss.php:67 actions/userrss.php:72
+#: actions/userrss.php:93
#, php-format
msgid "Microblog by %s"
-msgstr "%s – mikroblog"
+msgstr "Mikroblog użytkownika %s"
-#: ../actions/smssettings.php:304
+#: ../actions/smssettings.php:304 actions/smssettings.php:464
#, php-format
-#, fuzzy
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 ""
-"Operator komórkowy Twojego telefonu. Jeżeli znasz operatora, który akceptuje "
-"SMS za pośrednictwem e-mail ale nie jest tu wymieniony, poinformuj nas "
-"wysyłając e-mail na %s."
+"Operator komórkowy Twojego telefonu. Jeśli znasz operatora, który akceptuje "
+"wiadomości SMS przez e-mail, a nie znajduje się na liście, wyślij wiadomość "
+"e-mail na %s (w języku angielskim), aby nam o tym powiedzieć."
#: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
#: actions/finishopenidlogin.php:85 actions/register.php:202
#: actions/finishopenidlogin.php:107 actions/register.php:429
+#: actions/register.php:430 actions/finishopenidlogin.php:106
+#: actions/register.php:477
msgid "My text and files are available under "
-msgstr "Moje teksty i pliki sÄ… widoczne pod"
+msgstr "Moje teksty i pliki są dostępne na "
#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
#: actions/emailsettings.php:83 actions/smssettings.php:91
@@ -1256,19 +1406,19 @@ msgstr "Moje teksty i pliki sÄ… widoczne pod"
msgid "New"
msgstr "Nowe"
-#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286
+#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286 lib/mail.php:285
#, php-format
msgid "New email address for posting to %s"
msgstr "Nowy adres e-mail do wysyłania do %s"
#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
-#: actions/emailsettings.php:465
-#, fuzzy
+#: actions/emailsettings.php:465 actions/emailsettings.php:472
+#: actions/smssettings.php:542 actions/smssettings.php:543
msgid "New incoming email address added."
-msgstr "Nowy przychodzący adres e-mail został dodany."
+msgstr "Dodano nowy przychodzÄ…cy adres e-mail."
#: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
-#: actions/finishopenidlogin.php:99
+#: actions/finishopenidlogin.php:99 actions/finishopenidlogin.php:98
msgid "New nickname"
msgstr "Nowy pseudonim"
@@ -1280,12 +1430,14 @@ msgstr "Nowy wpis"
#: ../actions/password.php:41 ../actions/recoverpassword.php:179
#: actions/profilesettings.php:180 actions/recoverpassword.php:185
#: actions/passwordsettings.php:101 actions/recoverpassword.php:219
+#: actions/recoverpassword.php:232
msgid "New password"
msgstr "Nowe hasło"
-#: ../actions/recoverpassword.php:314
+#: ../actions/recoverpassword.php:314 actions/recoverpassword.php:361
+#: actions/recoverpassword.php:379
msgid "New password successfully saved. You are now logged in."
-msgstr "Nowe hasło zapisano pomyślnie. Możesz się zalogować."
+msgstr "Pomyślnie zapisano nowe hasło. Jesteś teraz zalogowany."
#: ../actions/login.php:101 ../actions/profilesettings.php:41
#: ../actions/register.php:151 actions/login.php:101
@@ -1293,7 +1445,11 @@ msgstr "Nowe hasło zapisano pomyślnie. Możesz się zalogować."
#: actions/login.php:228 actions/profilesettings.php:98
#: actions/register.php:367 actions/showgroup.php:224
#: actions/showstream.php:251 actions/tagother.php:95
-#: lib/facebookaction.php:308 lib/groupeditform.php:137
+#: lib/facebookaction.php:308 lib/groupeditform.php:137 actions/login.php:211
+#: actions/showgroup.php:226 actions/showstream.php:244
+#: actions/tagother.php:94 lib/facebookaction.php:312 actions/register.php:413
+#: actions/showgroup.php:231 actions/showstream.php:209
+#: lib/facebookaction.php:314 lib/groupeditform.php:152
msgid "Nickname"
msgstr "Pseudonim"
@@ -1302,23 +1458,29 @@ msgstr "Pseudonim"
#: actions/profilesettings.php:225 actions/register.php:76
#: actions/editgroup.php:183 actions/finishopenidlogin.php:215
#: actions/newgroup.php:134 actions/profilesettings.php:214
-#: actions/register.php:159
+#: actions/register.php:159 actions/editgroup.php:185
+#: actions/finishopenidlogin.php:231 actions/newgroup.php:135
+#: actions/profilesettings.php:215 actions/register.php:196
msgid "Nickname already in use. Try another one."
-msgstr "Ten pseudonim jest już w użyciu. Wybierz inny."
+msgstr "Pseudonim jest już używany. Spróbuj innego."
#: ../actions/finishopenidlogin.php:165 ../actions/profilesettings.php:88
#: ../actions/register.php:67 ../actions/updateprofile.php:77
#: actions/finishopenidlogin.php:171 actions/profilesettings.php:203
#: actions/register.php:74 actions/updateprofile.php:78
#: actions/finishopenidlogin.php:205 actions/profilesettings.php:192
-#: actions/updateprofile.php:81
+#: actions/updateprofile.php:81 actions/editgroup.php:179
+#: actions/newgroup.php:130 actions/register.php:156
+#: actions/updateprofile.php:83 actions/editgroup.php:181
+#: actions/finishopenidlogin.php:221 actions/newgroup.php:131
+#: actions/profilesettings.php:193 actions/register.php:193
msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr "Pseudonim musi zawierać tylko małe litery i cyfry, bez znaków spacji."
+msgstr "Pseudonim może zawierać tylko małe litery i cyfry, bez spacji."
#: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
-#: actions/finishopenidlogin.php:210
+#: actions/finishopenidlogin.php:210 actions/finishopenidlogin.php:226
msgid "Nickname not allowed."
-msgstr "Pseudonim niedozwolony."
+msgstr "Niedozwolony pseudonim."
#: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
#: actions/remotesubscribe.php:106
@@ -1326,13 +1488,14 @@ msgid "Nickname of the user you want to follow"
msgstr "Pseudonim użytkownika którego chcesz obserwować"
#: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
-#: actions/recoverpassword.php:186
+#: actions/recoverpassword.php:186 actions/recoverpassword.php:191
msgid "Nickname or email"
-msgstr "Pseudonim lub e-mail"
+msgstr "Pseudonim lub adres e-mail"
#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
#: actions/block.php:147 actions/deletenotice.php:118
-#, fuzzy
+#: actions/deletenotice.php:116 actions/block.php:149
+#: actions/deletenotice.php:115 actions/groupblock.php:176
msgid "No"
msgstr "Nie"
@@ -1342,11 +1505,10 @@ msgid "No Jabber ID."
msgstr "Brak identyfikatora Jabbera."
#: ../actions/userauthorization.php:129 actions/userauthorization.php:136
-#: actions/userauthorization.php:153
+#: actions/userauthorization.php:153 actions/userauthorization.php:192
msgid "No authorization request!"
-msgstr "Brak żądania autoryzacji!"
+msgstr "Brak żądania upoważnienia!"
-# If it's regarding mobile carrier, then translation is relevant. Skip it otherwise.
#: ../actions/smssettings.php:181 actions/smssettings.php:189
#: actions/smssettings.php:299
msgid "No carrier selected."
@@ -1355,7 +1517,7 @@ msgstr "Nie wybrano operatora."
#: ../actions/smssettings.php:316 actions/smssettings.php:324
#: actions/smssettings.php:486
msgid "No code entered"
-msgstr "Nie wprowadzono kodu"
+msgstr "Nie podano kodu"
#: ../actions/confirmaddress.php:33 actions/confirmaddress.php:33
#: actions/confirmaddress.php:75
@@ -1365,11 +1527,13 @@ msgstr "Brak kodu potwierdzajÄ…cego."
#: ../actions/newnotice.php:44 actions/newmessage.php:53
#: actions/newnotice.php:44 classes/Command.php:197 actions/newmessage.php:109
#: actions/newnotice.php:126 classes/Command.php:223
+#: actions/newmessage.php:142 actions/newnotice.php:131 lib/command.php:223
+#: actions/newnotice.php:162 lib/command.php:216
msgid "No content!"
msgstr "Brak zawartości!"
#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
-#: actions/emailsettings.php:304
+#: actions/emailsettings.php:304 actions/emailsettings.php:311
msgid "No email address."
msgstr "Brak adresu e-mail."
@@ -1378,15 +1542,15 @@ msgid "No id."
msgstr "Brak identyfikatora."
#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
-#: actions/emailsettings.php:430
-#, fuzzy
+#: actions/emailsettings.php:430 actions/emailsettings.php:437
+#: actions/smssettings.php:505 actions/smssettings.php:506
msgid "No incoming email address."
msgstr "Brak przychodzÄ…cego adresu e-mail."
#: ../actions/finishremotesubscribe.php:65
#: actions/finishremotesubscribe.php:67 actions/finishremotesubscribe.php:68
msgid "No nickname provided by remote server."
-msgstr "Zdalny serwer nie wysłał pseudonimu."
+msgstr "Zdalny serwer nie dostarczył pseudonimu."
#: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
#: actions/avatarbynickname.php:59 actions/leavegroup.php:81
@@ -1397,7 +1561,7 @@ msgstr "Brak pseudonimu."
#: ../actions/smssettings.php:229 actions/emailsettings.php:240
#: actions/imsettings.php:214 actions/smssettings.php:237
#: actions/emailsettings.php:363 actions/imsettings.php:345
-#: actions/smssettings.php:358
+#: actions/smssettings.php:358 actions/emailsettings.php:370
msgid "No pending confirmation to cancel."
msgstr "Brak oczekujących potwierdzeń do anulowania."
@@ -1409,12 +1573,12 @@ msgstr "Brak numeru telefonu."
#: ../actions/finishremotesubscribe.php:72
#: actions/finishremotesubscribe.php:74 actions/finishremotesubscribe.php:75
msgid "No profile URL returned by server."
-msgstr "Serwer nie zwrócił żadnego URL-a."
+msgstr "Serwer nie zwrócił adresu URL profilu."
#: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
-#: actions/recoverpassword.php:266
+#: actions/recoverpassword.php:266 actions/recoverpassword.php:284
msgid "No registered email address for that user."
-msgstr "Brak zarejestrowanych adresów e-mailowych dla tego użytkownika."
+msgstr "Brak zarejestrowanych adresów e-mail dla tego użytkownika."
#: ../actions/userauthorization.php:49 actions/userauthorization.php:55
#: actions/userauthorization.php:57
@@ -1424,51 +1588,54 @@ msgstr "Nie znaleziono żądania!"
#: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
#: actions/noticesearch.php:69 actions/peoplesearch.php:69
#: actions/groupsearch.php:81 actions/noticesearch.php:104
-#: actions/peoplesearch.php:85
+#: actions/peoplesearch.php:85 actions/noticesearch.php:117
msgid "No results"
msgstr "Brak wyników"
#: ../actions/avatarbynickname.php:32 actions/avatarbynickname.php:32
#: actions/avatarbynickname.php:64
msgid "No size."
-msgstr "Zerowy rozmiar."
+msgstr "Brak rozmiaru."
#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
#: actions/twitapistatuses.php:520 actions/twitapifavorites.php:112
-#: actions/twitapistatuses.php:446
+#: actions/twitapistatuses.php:446 actions/twitapifavorites.php:118
+#: actions/twitapistatuses.php:470 actions/twitapifavorites.php:169
+#: actions/twitapistatuses.php:426
msgid "No status found with that ID."
-msgstr ""
+msgstr "Nie znaleziono statusów z tym identyfikatorem."
#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-#: actions/twitapistatuses.php:418
+#: actions/twitapistatuses.php:418 actions/twitapistatuses.php:442
+#: actions/twitapistatuses.php:399
msgid "No status with that ID found."
-msgstr ""
+msgstr "Nie znaleziono statusów z tym identyfikatorem."
#: ../actions/openidsettings.php:135 actions/openidsettings.php:144
#: actions/openidsettings.php:222
msgid "No such OpenID."
-msgstr "Brak takiego identyfikatora OpenID."
+msgstr "Nie ma takiego identyfikatora OpenID."
#: ../actions/doc.php:29 actions/doc.php:29 actions/doc.php:64
msgid "No such document."
-msgstr "Brak takiego dokumentu."
+msgstr "Nie ma takiego dokumentu."
#: ../actions/shownotice.php:32 ../actions/shownotice.php:83
#: ../lib/deleteaction.php:30 actions/shownotice.php:32
#: actions/shownotice.php:83 lib/deleteaction.php:30 actions/shownotice.php:87
#: lib/deleteaction.php:51
msgid "No such notice."
-msgstr "Brak takiego wpisu."
+msgstr "Nie ma takiego wpisu."
#: ../actions/recoverpassword.php:56 actions/recoverpassword.php:56
#: actions/recoverpassword.php:62
msgid "No such recovery code."
-msgstr "Brak takiego kodu przywracania."
+msgstr "Nie ma takiego kodu przywracania."
#: ../actions/postnotice.php:56 actions/postnotice.php:57
#: actions/postnotice.php:60
msgid "No such subscription"
-msgstr "Nie ma takiej obserwacji"
+msgstr "Nie ma takiej subskrypcji"
#: ../actions/all.php:34 ../actions/allrss.php:35
#: ../actions/avatarbynickname.php:43 ../actions/foaf.php:40
@@ -1494,15 +1661,20 @@ msgstr "Nie ma takiej obserwacji"
#: actions/usergroups.php:92 actions/userrss.php:38 actions/xrds.php:73
#: classes/Command.php:140 classes/Command.php:185 classes/Command.php:234
#: classes/Command.php:271 lib/galleryaction.php:60 lib/mailbox.php:82
-#: lib/subs.php:34 lib/subs.php:109
+#: lib/subs.php:34 lib/subs.php:109 actions/all.php:56 actions/allrss.php:68
+#: actions/favoritesrss.php:74 lib/command.php:140 lib/command.php:185
+#: lib/command.php:234 lib/command.php:271 lib/mailbox.php:84
+#: actions/all.php:38 actions/foaf.php:58 actions/replies.php:72
+#: actions/usergroups.php:91 actions/userrss.php:39 lib/command.php:133
+#: lib/command.php:178 lib/command.php:227 lib/command.php:264
+#: lib/galleryaction.php:59 lib/profileaction.php:77 lib/subs.php:112
msgid "No such user."
msgstr "Brak takiego użytkownika."
#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-#: actions/recoverpassword.php:251
-#, fuzzy
+#: actions/recoverpassword.php:251 actions/recoverpassword.php:269
msgid "No user with that email address or username."
-msgstr "Brak użytkownika z takim adresem e-mail lub nazwą."
+msgstr "Brak użytkownika z tym adresem e-mail lub nazwą użytkownika."
#: ../lib/gallery.php:80 lib/gallery.php:85
msgid "Nobody to show!"
@@ -1514,66 +1686,72 @@ msgid "Not a recovery code."
msgstr "To nie jest kod przywracania."
#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-#: scripts/maildaemon.php:53
+#: scripts/maildaemon.php:53 scripts/maildaemon.php:52
msgid "Not a registered user."
-msgstr ""
+msgstr "To nie jest zarejestrowany użytkownik."
#: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
#: ../lib/twitterapi.php:332 lib/twitterapi.php:391 lib/twitterapi.php:418
#: lib/twitterapi.php:502 lib/twitterapi.php:448 lib/twitterapi.php:476
-#: lib/twitterapi.php:566
+#: lib/twitterapi.php:566 lib/twitterapi.php:483 lib/twitterapi.php:511
+#: lib/twitterapi.php:601 lib/twitterapi.php:620 lib/twitterapi.php:648
+#: lib/twitterapi.php:741
msgid "Not a supported data format."
-msgstr "Niewspierany format daty."
+msgstr "To nie jest obsługiwany format danych."
#: ../actions/imsettings.php:167 actions/imsettings.php:175
#: actions/imsettings.php:290
msgid "Not a valid Jabber ID"
-msgstr "Niepoprawny identyfikator Jabbera"
+msgstr "To nie jest prawidłowy identyfikator Jabbera"
#: ../lib/openid.php:131 lib/openid.php:131 lib/openid.php:140
+#: lib/openid.php:143
msgid "Not a valid OpenID."
-msgstr "Niepoprawny identyfikator OpenID."
+msgstr "To nie jest prawidłowy identyfikator OpenID."
#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
-#: actions/emailsettings.php:315
+#: actions/emailsettings.php:315 actions/emailsettings.php:322
msgid "Not a valid email address"
-msgstr "Niepoprawny adres e-mail."
+msgstr "To nie jest prawidłowy adres e-mail"
#: ../actions/register.php:63 actions/register.php:70 actions/register.php:152
+#: actions/register.php:189
msgid "Not a valid email address."
-msgstr "Niewłaściwy adres e-mailowy."
+msgstr "To nie jest prawidłowy adres e-mail."
#: ../actions/profilesettings.php:91 ../actions/register.php:71
#: actions/profilesettings.php:206 actions/register.php:78
#: actions/editgroup.php:186 actions/newgroup.php:137
#: actions/profilesettings.php:195 actions/register.php:161
+#: actions/editgroup.php:188 actions/newgroup.php:138
+#: actions/profilesettings.php:196 actions/register.php:198
msgid "Not a valid nickname."
-msgstr "Niewłaściwy pseudonim."
+msgstr "To nie jest prawidłowy pseudonim."
#: ../actions/remotesubscribe.php:120 actions/remotesubscribe.php:129
#: actions/remotesubscribe.php:159
msgid "Not a valid profile URL (incorrect services)."
-msgstr "Błędny URL profilu (niepoprawne usługi)"
+msgstr "To nie jest prawidłowy adres URL profilu (niepoprawne usługi)."
#: ../actions/remotesubscribe.php:113 actions/remotesubscribe.php:122
#: actions/remotesubscribe.php:152
msgid "Not a valid profile URL (no XRDS defined)."
-msgstr "Błędny URL profilu (nie zdefiniowany XRDS)"
+msgstr "To nie jest prawidłowy adres URL profilu (nie podano XRDS)."
#: ../actions/remotesubscribe.php:104 actions/remotesubscribe.php:113
#: actions/remotesubscribe.php:143
msgid "Not a valid profile URL (no YADIS document)."
-msgstr "Błędny URL profilu (brak dokumentu YADIS)"
+msgstr "To nie jest prawidłowy adres URL profilu (brak dokumentu YADIS)."
#: ../actions/avatar.php:95 actions/profilesettings.php:332
-#: lib/imagefile.php:87
+#: lib/imagefile.php:87 lib/imagefile.php:90 lib/imagefile.php:91
msgid "Not an image or corrupt file."
-msgstr "Brak obrazka lub plik uszkodzony."
+msgstr "To nie jest obraz lub lub plik jest uszkodzony."
#: ../actions/finishremotesubscribe.php:51
#: actions/finishremotesubscribe.php:53 actions/finishremotesubscribe.php:54
msgid "Not authorized."
-msgstr "Brak autoryzacji."
+msgstr "Brak upoważnienia."
#: ../actions/finishremotesubscribe.php:38
#: actions/finishremotesubscribe.php:38 actions/finishremotesubscribe.php:40
@@ -1581,7 +1759,8 @@ msgid "Not expecting this response!"
msgstr "Nieoczekiwana odpowiedź!"
#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-#: actions/twitapistatuses.php:309
+#: actions/twitapistatuses.php:309 actions/twitapistatuses.php:327
+#: actions/twitapistatuses.php:284
msgid "Not found"
msgstr "Nie znaleziono"
@@ -1597,19 +1776,20 @@ msgstr "Nie znaleziono"
#: actions/newmessage.php:83 actions/newnotice.php:90 actions/nudge.php:63
#: actions/subedit.php:31 actions/subscribe.php:30 actions/unblock.php:60
#: actions/unsubscribe.php:27 lib/deleteaction.php:66
-#: lib/settingsaction.php:72
+#: lib/settingsaction.php:72 actions/newmessage.php:87 actions/favor.php:62
+#: actions/groupblock.php:61 actions/groupunblock.php:61
+#: actions/makeadmin.php:61 actions/newnotice.php:88
msgid "Not logged in."
msgstr "Niezalogowany."
-#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122
+#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122 lib/subs.php:124
msgid "Not subscribed!."
-msgstr "Nie obserwujesz!."
+msgstr "Nie zasubskrybowane!"
#: ../actions/opensearch.php:35 actions/opensearch.php:35
#: actions/opensearch.php:67
-#, fuzzy
msgid "Notice Search"
-msgstr "Przeszukuj wpisy"
+msgstr "Wyszukiwanie wpisów"
#: ../actions/showstream.php:82 actions/showstream.php:82
#: actions/showstream.php:180 actions/showstream.php:187
@@ -1621,19 +1801,22 @@ msgstr "Kanał wpisów dla %s"
#: ../actions/shownotice.php:39 actions/shownotice.php:39
#: actions/shownotice.php:94
msgid "Notice has no profile"
-msgstr "Wpis nie ma przypisanego profilu"
+msgstr "Wpis nie posiada profilu"
#: ../actions/showstream.php:316 actions/showstream.php:331
#: actions/showstream.php:504 lib/facebookaction.php:477 lib/mailbox.php:116
-#: lib/noticelist.php:87
+#: lib/noticelist.php:87 lib/facebookaction.php:581 lib/mailbox.php:118
+#: actions/conversation.php:149 lib/facebookaction.php:572
+#: lib/profileaction.php:206
msgid "Notices"
msgstr "Wpisy"
#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81 actions/tag.php:41
+#: actions/tag.php:81 actions/tag.php:41 actions/tag.php:49 actions/tag.php:57
+#: actions/twitapitags.php:69
#, php-format
msgid "Notices tagged with %s"
-msgstr "Wpisy otagowane %s"
+msgstr "Wpisy ze znacznikiem %s"
#: ../actions/password.php:39 actions/profilesettings.php:178
#: actions/passwordsettings.php:97
@@ -1642,49 +1825,55 @@ msgstr "Stare hasło"
#: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
#: lib/util.php:330 lib/accountsettingsaction.php:116 lib/action.php:341
-#: lib/logingroupnav.php:81
+#: lib/logingroupnav.php:81 lib/action.php:418
msgid "OpenID"
msgstr "OpenID"
#: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
-#: actions/finishopenidlogin.php:73
+#: actions/finishopenidlogin.php:73 actions/finishopenidlogin.php:72
msgid "OpenID Account Setup"
msgstr "Ustawienia konta OpenID"
#: ../lib/openid.php:180 lib/openid.php:180 lib/openid.php:266
+#: lib/openid.php:269
msgid "OpenID Auto-Submit"
-msgstr "Automatyczne zatwierdzanie OpenID"
+msgstr "Automatyczne wysłanie OpenID"
#: ../actions/finishaddopenid.php:99 ../actions/finishopenidlogin.php:140
#: ../actions/openidlogin.php:60 actions/finishaddopenid.php:99
#: actions/finishopenidlogin.php:146 actions/openidlogin.php:68
#: actions/finishaddopenid.php:170 actions/openidlogin.php:80
+#: actions/openidlogin.php:89
msgid "OpenID Login"
-msgstr "Użytkownik OpenID"
+msgstr "Login OpenID"
#: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
#: actions/openidlogin.php:74 actions/openidsettings.php:50
#: actions/openidlogin.php:102 actions/openidsettings.php:101
+#: actions/openidlogin.php:111
msgid "OpenID URL"
-msgstr "URL usługi OpenID"
+msgstr "Adres URL identyfikatora OpenID"
#: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
#: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109
#: actions/finishaddopenid.php:88 actions/finishopenidlogin.php:130
+#: actions/finishopenidlogin.php:129
msgid "OpenID authentication cancelled."
-msgstr "Uwiarygadnianie OpenID przerwane."
+msgstr "Anulowano uwierzytelnienie OpenID."
#: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
#: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113
#: actions/finishaddopenid.php:92 actions/finishopenidlogin.php:134
+#: actions/finishopenidlogin.php:133
#, php-format
msgid "OpenID authentication failed: %s"
-msgstr "Uwiarygadnianie OpenID nie powiodło się: %s"
+msgstr "Uwierzytelnienie OpenID nie powiodło się: %s"
#: ../lib/openid.php:133 lib/openid.php:133 lib/openid.php:142
+#: lib/openid.php:145
#, php-format
msgid "OpenID failure: %s"
-msgstr "Awaria OpenID: %s"
+msgstr "Niepowodzenie OpenID: %s"
#: ../actions/openidsettings.php:144 actions/openidsettings.php:153
#: actions/openidsettings.php:231
@@ -1697,13 +1886,14 @@ msgid "OpenID settings"
msgstr "Ustawienia OpenID"
#: ../actions/invite.php:135 actions/invite.php:143 actions/invite.php:180
+#: actions/invite.php:186 actions/invite.php:188
msgid "Optionally add a personal message to the invitation."
-msgstr "Opcjonalnie do zaproszenia możesz dodać wiadomość od siebie."
+msgstr "Opcjonalnie dodaj osobistą wiadomość do zaproszenia."
#: ../actions/avatar.php:84 actions/profilesettings.php:321
-#: lib/imagefile.php:75
+#: lib/imagefile.php:75 lib/imagefile.php:79 lib/imagefile.php:80
msgid "Partial upload."
-msgstr "Częściowa wysyłka."
+msgstr "Częściowo wysłano."
#: ../actions/finishopenidlogin.php:90 ../actions/login.php:102
#: ../actions/register.php:153 ../lib/settingsaction.php:93
@@ -1711,64 +1901,72 @@ msgstr "Częściowa wysyłka."
#: actions/register.php:167 actions/finishopenidlogin.php:118
#: actions/login.php:231 actions/register.php:372
#: lib/accountsettingsaction.php:110 lib/facebookaction.php:311
+#: actions/login.php:214 lib/facebookaction.php:315
+#: actions/finishopenidlogin.php:117 actions/register.php:418
+#: lib/facebookaction.php:317
msgid "Password"
msgstr "Hasło"
#: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
-#: actions/recoverpassword.php:335
+#: actions/recoverpassword.php:335 actions/recoverpassword.php:353
msgid "Password and confirmation do not match."
-msgstr "Hasło i jego potwierdzenie nie pasują do siebie."
+msgstr "Hasło i potwierdzenie nie pasują do siebie."
#: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
-#: actions/recoverpassword.php:331
+#: actions/recoverpassword.php:331 actions/recoverpassword.php:349
msgid "Password must be 6 chars or more."
-msgstr "Hasło musi mieć 6 lub więcej znaków."
+msgstr "Hasło musi mieć sześć lub więcej znaków."
#: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
#: actions/recoverpassword.php:267 actions/recoverpassword.php:269
#: actions/recoverpassword.php:199 actions/recoverpassword.php:301
+#: actions/recoverpassword.php:207 actions/recoverpassword.php:319
msgid "Password recovery requested"
-msgstr "Zażądano odzyskania hasła"
+msgstr "Zażądano przywracania hasła"
#: ../actions/password.php:89 ../actions/recoverpassword.php:313
#: actions/profilesettings.php:408 actions/recoverpassword.php:326
#: actions/passwordsettings.php:173 actions/recoverpassword.php:200
+#: actions/passwordsettings.php:178 actions/recoverpassword.php:208
msgid "Password saved."
-msgstr "Hasło zostało zapisane."
+msgstr "Zapisano hasło."
#: ../actions/password.php:61 ../actions/register.php:88
#: actions/profilesettings.php:380 actions/register.php:98
#: actions/passwordsettings.php:145 actions/register.php:183
+#: actions/passwordsettings.php:150 actions/register.php:220
msgid "Passwords don't match."
-msgstr "Podane hasła nie pasują do siebie."
+msgstr "Hasła nie pasują do siebie."
#: ../lib/searchaction.php:100 lib/searchaction.php:100
#: lib/searchgroupnav.php:80
msgid "People"
-msgstr "Ludzie"
+msgstr "Osoby"
#: ../actions/opensearch.php:33 actions/opensearch.php:33
#: actions/opensearch.php:64
msgid "People Search"
-msgstr "Szukaj ludzi"
+msgstr "Wyszukiwanie osób"
#: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33
#: actions/peoplesearch.php:58
msgid "People search"
-msgstr "Szukaj ludzi"
+msgstr "Wyszukiwanie osób"
#: ../lib/stream.php:50 lib/personal.php:50 lib/personalgroupnav.php:98
+#: lib/personalgroupnav.php:99
msgid "Personal"
msgstr "Osobiste"
#: ../actions/invite.php:133 actions/invite.php:141 actions/invite.php:178
+#: actions/invite.php:184 actions/invite.php:186
msgid "Personal message"
-msgstr "Wiadomość osobista"
+msgstr "Osobista wiadomość"
#: ../actions/smssettings.php:69 actions/smssettings.php:69
+#: actions/smssettings.php:128
msgid "Phone number, no punctuation or spaces, with area code"
-msgstr ""
-"Numer telefonu z numerem kierunkowym, bez znaków przestankowych i spacji."
+msgstr "Numer telefonu, bez znaków przestankowych i spacji, z kodem państwa"
#: ../actions/userauthorization.php:78
msgid ""
@@ -1776,21 +1974,20 @@ msgid ""
"user's notices. If you didn't just ask to subscribe to someone's notices, "
"click \"Cancel\"."
msgstr ""
-"Sprawdź proszę poniższe informacje, aby upewnić się czy na pewno chcesz "
-"obserwować wpisy tego użytkownika. Jeżeli to pomyłka lub chodziło o kogoś "
-"innego kliknij \"Anuluj\"."
+"Sprawdź te szczegóły, aby upewnić się, czy chcesz subskrybować wpisy tego "
+"użytkownika. Jeśli nie chcesz, po prostu naciśnij \"Anuluj\"."
#: ../actions/imsettings.php:73 actions/imsettings.php:74
#: actions/imsettings.php:142
msgid "Post a notice when my Jabber/GTalk status changes."
-msgstr "Utwórz wpis kiedy zmieni się status na komunikatorze."
+msgstr "Wyślij wpis, kiedy zmieni się mój status na Jabberze/GTalk."
#: ../actions/emailsettings.php:85 ../actions/imsettings.php:67
#: ../actions/smssettings.php:94 actions/emailsettings.php:86
#: actions/imsettings.php:68 actions/smssettings.php:94
#: actions/twittersettings.php:70 actions/emailsettings.php:147
#: actions/imsettings.php:133 actions/smssettings.php:157
-#: actions/twittersettings.php:134
+#: actions/twittersettings.php:134 actions/twittersettings.php:137
msgid "Preferences"
msgstr "Preferencje"
@@ -1799,33 +1996,37 @@ msgstr "Preferencje"
#: actions/imsettings.php:152 actions/smssettings.php:171
#: actions/emailsettings.php:286 actions/imsettings.php:258
#: actions/othersettings.php:168 actions/smssettings.php:272
+#: actions/emailsettings.php:293 actions/othersettings.php:173
msgid "Preferences saved."
-msgstr "Preferencje zostały zapisane."
+msgstr "Zapisano preferencje."
#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:129
+#: actions/profilesettings.php:129 actions/profilesettings.php:130
msgid "Preferred language"
msgstr "Preferowany język"
-#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572
+#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572 lib/action.php:665
+#: lib/action.php:715
msgid "Privacy"
msgstr "Prywatność"
#: ../classes/Notice.php:95 ../classes/Notice.php:106 classes/Notice.php:109
#: classes/Notice.php:119 classes/Notice.php:145 classes/Notice.php:155
+#: classes/Notice.php:178 classes/Notice.php:188 classes/Notice.php:206
+#: classes/Notice.php:216 classes/Notice.php:232
msgid "Problem saving notice."
-msgstr "Problem z zachowywaniem wpisu."
+msgstr "Problem podczas zapisywania wpisu."
#: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
#: lib/settingsaction.php:84 lib/accountsettingsaction.php:104
-#: lib/personalgroupnav.php:108
+#: lib/personalgroupnav.php:108 lib/personalgroupnav.php:109
msgid "Profile"
msgstr "Profil"
#: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
#: actions/remotesubscribe.php:109
msgid "Profile URL"
-msgstr "URL profilu"
+msgstr "Adres URL profilu"
#: ../actions/profilesettings.php:34 actions/profilesettings.php:32
#: actions/profilesettings.php:58
@@ -1835,86 +2036,93 @@ msgstr "Ustawienia profilu"
#: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
#: actions/postnotice.php:52 actions/updateprofile.php:53
#: actions/postnotice.php:55 actions/updateprofile.php:56
+#: actions/updateprofile.php:58
msgid "Profile unknown"
msgstr "Nieznany profil"
#: ../actions/public.php:54 actions/public.php:54 actions/public.php:124
msgid "Public Stream Feed"
-msgstr "Publiczny Kanał Strumieni"
+msgstr "Kanał publicznego strumienia"
#: ../actions/public.php:33 actions/public.php:33 actions/public.php:109
-#: lib/publicgroupnav.php:77
+#: lib/publicgroupnav.php:77 actions/public.php:112 lib/publicgroupnav.php:79
+#: actions/public.php:120
msgid "Public timeline"
msgstr "Publiczna oÅ› czasu"
#: ../actions/imsettings.php:79 actions/imsettings.php:80
#: actions/imsettings.php:153
msgid "Publish a MicroID for my Jabber/GTalk address."
-msgstr "Publikuj MicroID dla mojego adresu Jabber/GTalk."
+msgstr "Opublikuj MicroID adresu Jabbera/GTalk."
#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
-#: actions/emailsettings.php:178
+#: actions/emailsettings.php:178 actions/emailsettings.php:183
msgid "Publish a MicroID for my email address."
-msgstr "Opublikuj MicroID dla mojego adresu e-mail."
+msgstr "Opublikuj MicroID adresu e-mail."
#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
#: actions/tag.php:76
msgid "Recent Tags"
-msgstr "Najnowsze tagi"
+msgstr "Ostatnie znaczniki"
#: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
-#: actions/recoverpassword.php:190
+#: actions/recoverpassword.php:190 actions/recoverpassword.php:197
msgid "Recover"
msgstr "Przywróć"
#: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
-#: actions/recoverpassword.php:198
+#: actions/recoverpassword.php:198 actions/recoverpassword.php:206
msgid "Recover password"
-msgstr "Odzyskiwanie hasła"
+msgstr "Przywróć hasło"
#: ../actions/recoverpassword.php:67 actions/recoverpassword.php:67
#: actions/recoverpassword.php:73
msgid "Recovery code for unknown user."
-msgstr "Kod przywracający dla nieznanego użytkownika."
+msgstr "Kod przywracania dla nieznanego użytkownika."
#: ../actions/register.php:142 ../actions/register.php:193 ../lib/util.php:312
#: actions/register.php:152 actions/register.php:207 lib/util.php:328
#: actions/register.php:69 actions/register.php:436 lib/action.php:338
#: lib/facebookaction.php:277 lib/logingroupnav.php:78
+#: actions/register.php:438 lib/action.php:415 lib/facebookaction.php:279
+#: actions/register.php:108 actions/register.php:486 lib/action.php:440
+#: lib/facebookaction.php:281
msgid "Register"
-msgstr "Zarejestruj"
+msgstr "Zarejestruj siÄ™"
#: ../actions/register.php:28 actions/register.php:28
#: actions/finishopenidlogin.php:196 actions/register.php:90
-#, fuzzy
+#: actions/finishopenidlogin.php:195 actions/finishopenidlogin.php:204
+#: actions/register.php:129
msgid "Registration not allowed."
-msgstr "Rejestracja niedozwolona. "
+msgstr "Rejestracja nie jest dozwolona."
#: ../actions/register.php:200 actions/register.php:214
-#: actions/register.php:67
+#: actions/register.php:67 actions/register.php:106
msgid "Registration successful"
-msgstr "Rejestracja zakończona powodzeniem"
+msgstr "Rejestracja powiodła się"
#: ../actions/userauthorization.php:120 actions/userauthorization.php:127
-#: actions/userauthorization.php:144
+#: actions/userauthorization.php:144 actions/userauthorization.php:179
msgid "Reject"
msgstr "Odrzuć"
#: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
#: actions/register.php:190 actions/login.php:234 actions/openidlogin.php:107
-#: actions/register.php:414
+#: actions/register.php:414 actions/login.php:217 actions/openidlogin.php:116
+#: actions/register.php:461
msgid "Remember me"
-msgstr "Pamiętaj mnie"
+msgstr "Zapamiętaj mnie"
#: ../actions/updateprofile.php:70 actions/updateprofile.php:71
-#: actions/updateprofile.php:74
+#: actions/updateprofile.php:74 actions/updateprofile.php:76
msgid "Remote profile with no matching profile"
-msgstr "Zdalny profil bez odpowiadajÄ…cego profilu lokalnego"
+msgstr "Zdalny profil bez odpowiadajÄ…cego profilu"
#: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
#: actions/remotesubscribe.php:88
msgid "Remote subscribe"
-msgstr "Zdalna subskrypcja"
+msgstr "Zasubskrybuj zdalnie"
#: ../actions/emailsettings.php:47 ../actions/emailsettings.php:75
#: ../actions/imsettings.php:48 ../actions/openidsettings.php:106
@@ -1926,46 +2134,50 @@ msgstr "Zdalna subskrypcja"
#: actions/emailsettings.php:134 actions/imsettings.php:102
#: actions/openidsettings.php:166 actions/smssettings.php:103
#: actions/smssettings.php:146 actions/twittersettings.php:115
+#: actions/twittersettings.php:118
msgid "Remove"
msgstr "Usuń"
#: ../actions/openidsettings.php:68 actions/openidsettings.php:69
#: actions/openidsettings.php:123
msgid "Remove OpenID"
-msgstr "Usuń konto OpenID"
+msgstr "Usuń identyfikator OpenID"
-#: ../actions/openidsettings.php:73
+#: ../actions/openidsettings.php:73 actions/openidsettings.php:128
msgid ""
"Removing your only OpenID would make it impossible to log in! If you need to "
"remove it, add another OpenID first."
msgstr ""
-"Usunięcie jedynego konta OpenID uniemożliwi dalsze logowanie! Jeśli musisz "
-"je usunąć dodaj wcześniej jakieś inne."
+"Usunięcie jedynego identyfikatora OpenID uniemożliwi zalogowanie się! Jeśli "
+"musisz je usunąć, dodaj najpierw inne."
#: ../lib/stream.php:55 lib/personal.php:55 lib/personalgroupnav.php:103
+#: lib/personalgroupnav.php:104
msgid "Replies"
msgstr "Odpowiedzi"
#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:56
#: actions/replies.php:47 actions/repliesrss.php:62 lib/personal.php:56
#: actions/replies.php:116 actions/repliesrss.php:67
-#: lib/personalgroupnav.php:104
+#: lib/personalgroupnav.php:104 actions/replies.php:118
+#: actions/replies.php:117 lib/personalgroupnav.php:105
#, php-format
msgid "Replies to %s"
msgstr "Odpowiedzi na %s"
#: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
-#: actions/recoverpassword.php:223
+#: actions/recoverpassword.php:223 actions/recoverpassword.php:240
msgid "Reset"
-msgstr "Wyzeruj"
+msgstr "Przywróć"
#: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
-#: actions/recoverpassword.php:197
+#: actions/recoverpassword.php:197 actions/recoverpassword.php:205
msgid "Reset password"
-msgstr "Ustaw ponownie hasło"
+msgstr "Przywróć hasło"
#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
#: actions/subscriptions.php:123 lib/connectsettingsaction.php:107
+#: actions/subscriptions.php:125 actions/subscriptions.php:184
msgid "SMS"
msgstr "SMS"
@@ -1979,19 +2191,19 @@ msgstr "Numer telefonu SMS"
msgid "SMS Settings"
msgstr "Ustawienia SMS"
-#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437
+#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437 lib/mail.php:438
msgid "SMS confirmation"
msgstr "Potwierdzenie SMS"
#: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
-#: actions/recoverpassword.php:222
+#: actions/recoverpassword.php:222 actions/recoverpassword.php:237
msgid "Same as password above"
-msgstr "Takie samo jak hasło wprowadzone powyżej"
+msgstr "Takie samo jak powyższe hasło"
#: ../actions/register.php:156 actions/register.php:170
-#: actions/register.php:377
+#: actions/register.php:377 actions/register.php:423
msgid "Same as password above. Required."
-msgstr "Takie samo jak hasło powyżej. Wymagane."
+msgstr "Takie samo jak powyższe hasło. Wymagane."
#: ../actions/emailsettings.php:97 ../actions/imsettings.php:81
#: ../actions/profilesettings.php:67 ../actions/smssettings.php:100
@@ -2002,39 +2214,44 @@ msgstr "Takie samo jak hasło powyżej. Wymagane."
#: actions/othersettings.php:117 actions/profilesettings.php:150
#: actions/smssettings.php:169 actions/subscriptions.php:124
#: actions/tagother.php:152 actions/twittersettings.php:161
-#: lib/groupeditform.php:171
+#: lib/groupeditform.php:171 actions/emailsettings.php:187
+#: actions/subscriptions.php:126 actions/tagother.php:154
+#: actions/twittersettings.php:164 actions/othersettings.php:119
+#: actions/profilesettings.php:152 actions/subscriptions.php:185
+#: actions/twittersettings.php:180 lib/designsettings.php:256
+#: lib/groupeditform.php:196
msgid "Save"
msgstr "Zapisz"
#: ../lib/searchaction.php:84 ../lib/util.php:300 lib/searchaction.php:84
-#: lib/util.php:316 lib/action.php:325
+#: lib/util.php:316 lib/action.php:325 lib/action.php:396 lib/action.php:448
msgid "Search"
-msgstr "Szukaj"
+msgstr "Znajdź"
#: ../actions/noticesearch.php:80 actions/noticesearch.php:85
#: actions/noticesearch.php:127
msgid "Search Stream Feed"
-msgstr "Szukaj Kanału Strumieni"
+msgstr "Znajdź kanał strumienia"
#: ../actions/noticesearch.php:30 actions/noticesearch.php:30
-#: actions/noticesearch.php:57
+#: actions/noticesearch.php:57 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 ""
-"Wyszukiwanie w treści wpisów w serwisie %%site.name%%. Użyj spacji aby "
-"oddzielić elementy wyszukiwania. Słowa muszą mieć minimum 3 znaki."
+"Znajdź wpisy na %%site.name%% według ich zawartości. Oddziel wyszukiwane "
+"terminy spacjami. Terminy muszą mieć trzy znaki lub więcej."
-#: ../actions/peoplesearch.php:28
+#: ../actions/peoplesearch.php:28 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 ""
-"Szukaj ludzi w serwisie %%site.name%%. Kryteriami mogą być imiona i "
-"nazwiska, miejscowości lub zainteresowania. Użyj spacji aby oddzielić "
-"elementy wyszukiwania. Słowa muszą mieć minimum 3 znaki."
+"Znajdź osoby na %%site.name%% według ich nazwiska, położenia lub "
+"zainteresowań. Oddziel wyszukiwane terminy spacjami. Terminy muszą mieć trzy "
+"znaki lub więcej."
#: ../actions/smssettings.php:296 actions/smssettings.php:304
#: actions/smssettings.php:457
@@ -2043,7 +2260,9 @@ msgstr "Wybierz operatora"
#: ../actions/invite.php:137 ../lib/util.php:1172 actions/invite.php:145
#: lib/util.php:1306 lib/util.php:1731 actions/invite.php:182
-#: lib/messageform.php:167 lib/noticeform.php:177
+#: lib/messageform.php:167 lib/noticeform.php:177 actions/invite.php:189
+#: lib/messageform.php:165 actions/invite.php:191 lib/messageform.php:157
+#: lib/noticeform.php:179
msgid "Send"
msgstr "Wyślij"
@@ -2051,45 +2270,51 @@ msgstr "Wyślij"
#: actions/emailsettings.php:74 actions/smssettings.php:82
#: actions/emailsettings.php:132 actions/smssettings.php:145
msgid "Send email to this address to post new notices."
-msgstr "Wyślij wiadomość e-mail na ten adres by wysłać nowy wpis."
+msgstr "Wyślij wiadomość e-mail na ten adres, aby wysyłać nowe wpisy."
#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
#: actions/emailsettings.php:152
msgid "Send me notices of new subscriptions through email."
-msgstr "Wyślij mi powiadomienia o nowych subskrypcjach za pośrednictwem e-mail."
+msgstr "Wyślij mi wpisy nowych subskrypcji przez e-mail."
#: ../actions/imsettings.php:70 actions/imsettings.php:71
#: actions/imsettings.php:137
msgid "Send me notices through Jabber/GTalk."
-msgstr "Wysyłaj mi wpisy przez Jabbera/GTalka"
+msgstr "Wyślij mi wpisy przez Jabbera/GTalk."
#: ../actions/smssettings.php:97 actions/smssettings.php:97
+#: actions/smssettings.php:162
msgid ""
"Send me notices through SMS; I understand I may incur exorbitant charges "
"from my carrier."
msgstr ""
+"Wyślij mi wpisy przez SMS. Rozumiem, że mogę otrzymywać większe rachunki od "
+"swojego operatora."
#: ../actions/imsettings.php:76 actions/imsettings.php:77
+#: actions/imsettings.php:147
msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
msgstr ""
+"Wyślij mi odpowiedzi przez Jabbera/GTalk od osób, których nie subskrybuję."
#: ../lib/util.php:304 lib/util.php:320 lib/facebookaction.php:215
+#: lib/facebookaction.php:228 lib/facebookaction.php:230
msgid "Settings"
msgstr "Ustawienia"
#: ../actions/profilesettings.php:192 actions/profilesettings.php:307
-#: actions/profilesettings.php:319
+#: actions/profilesettings.php:319 actions/profilesettings.php:318
msgid "Settings saved."
-msgstr "Ustawienia zostały zapisane."
+msgstr "Zapisano ustawienia."
#: ../actions/tag.php:60 actions/tag.php:60
msgid "Showing most popular tags from the last week"
-msgstr ""
+msgstr "Wyświetlanie najpopularniejszych znaczników od ostatniego tygodnia"
#: ../actions/finishaddopenid.php:66 actions/finishaddopenid.php:66
#: actions/finishaddopenid.php:114
msgid "Someone else already has this OpenID."
-msgstr "Ktoś inny posługuje się już tym identyfikatorem OpenID."
+msgstr "Ktoś inny już posiada ten identyfikator OpenID."
#: ../actions/finishopenidlogin.php:42 ../actions/openidsettings.php:126
#: actions/finishopenidlogin.php:47 actions/openidsettings.php:135
@@ -2098,83 +2323,95 @@ msgid "Something weird happened."
msgstr "Stało się coś dziwnego."
#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-#: scripts/maildaemon.php:61
+#: scripts/maildaemon.php:61 scripts/maildaemon.php:60
msgid "Sorry, no incoming email allowed."
-msgstr ""
+msgstr "Przepraszamy, przychodzÄ…cy e-mail nie jest dozwolony."
#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-#: scripts/maildaemon.php:57
+#: scripts/maildaemon.php:57 scripts/maildaemon.php:56
msgid "Sorry, that is not your incoming email address."
-msgstr ""
+msgstr "Przepraszamy, to nie jest twój przychodzący adres e-mail."
-#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574
+#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574 lib/action.php:667
+#: lib/action.php:717
msgid "Source"
msgstr "Kod źródłowy"
#: ../actions/showstream.php:296 actions/showstream.php:311
-#: actions/showstream.php:476
+#: actions/showstream.php:476 actions/showgroup.php:375
+#: actions/showgroup.php:421 lib/profileaction.php:173
msgid "Statistics"
msgstr "Statystyki"
#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
#: actions/finishopenidlogin.php:188 actions/finishopenidlogin.php:252
#: actions/finishopenidlogin.php:222 actions/finishopenidlogin.php:290
+#: actions/finishopenidlogin.php:295 actions/finishopenidlogin.php:238
+#: actions/finishopenidlogin.php:318
msgid "Stored OpenID not found."
-msgstr "Nie znaleziono zapisanego konta OpenID."
+msgstr "Nie znaleziono przechowywanego identyfikatora OpenID."
#: ../actions/remotesubscribe.php:75 ../actions/showstream.php:188
#: ../actions/showstream.php:197 actions/remotesubscribe.php:84
#: actions/showstream.php:197 actions/showstream.php:206
#: actions/remotesubscribe.php:113 actions/showstream.php:376
-#: lib/subscribeform.php:139
+#: lib/subscribeform.php:139 actions/showstream.php:345
msgid "Subscribe"
-msgstr "Subskrybuj"
+msgstr "Zasubskrybuj"
#: ../actions/showstream.php:313 ../actions/subscribers.php:27
#: actions/showstream.php:328 actions/subscribers.php:27
#: actions/showstream.php:436 actions/showstream.php:498
-#: lib/subgroupnav.php:88
+#: lib/subgroupnav.php:88 lib/profileaction.php:140 lib/profileaction.php:200
+#: lib/subgroupnav.php:90
msgid "Subscribers"
msgstr "Subskrybenci"
#: ../actions/userauthorization.php:310 actions/userauthorization.php:322
-#: actions/userauthorization.php:338
+#: actions/userauthorization.php:338 actions/userauthorization.php:344
+#: actions/userauthorization.php:378
msgid "Subscription authorized"
-msgstr "Subskrypcja uwierzytelniona"
+msgstr "Upoważniono subskrypcję"
#: ../actions/userauthorization.php:320 actions/userauthorization.php:332
-#: actions/userauthorization.php:349
+#: actions/userauthorization.php:349 actions/userauthorization.php:355
+#: actions/userauthorization.php:389
msgid "Subscription rejected"
-msgstr "Subskrypcja odrzucona"
+msgstr "Odrzucono subskrypcjÄ™"
#: ../actions/showstream.php:230 ../actions/showstream.php:307
#: ../actions/subscriptions.php:27 actions/showstream.php:240
#: actions/showstream.php:322 actions/subscriptions.php:27
#: actions/showstream.php:407 actions/showstream.php:489
-#: lib/subgroupnav.php:80
+#: lib/subgroupnav.php:80 lib/profileaction.php:109 lib/profileaction.php:191
+#: lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr "Subskrypcje"
#: ../actions/avatar.php:87 actions/profilesettings.php:324
-#: lib/imagefile.php:78
+#: lib/imagefile.php:78 lib/imagefile.php:82 lib/imagefile.php:83
msgid "System error uploading file."
-msgstr "Błąd systemowy podczas wysyłania pliku."
+msgstr "Błąd systemu podczas wysyłania pliku."
#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
#: lib/util.php:317 actions/profilesettings.php:122 actions/showstream.php:297
#: actions/tagother.php:147 actions/tagother.php:207 lib/profilelist.php:162
-#: lib/profilelist.php:164
+#: lib/profilelist.php:164 actions/showstream.php:290 actions/tagother.php:149
+#: actions/tagother.php:209 lib/profilelist.php:160
+#: actions/profilesettings.php:123 actions/showstream.php:255
+#: lib/subscriptionlist.php:106 lib/subscriptionlist.php:108
msgid "Tags"
-msgstr ""
+msgstr "Znaczniki"
#: ../lib/searchaction.php:104 lib/searchaction.php:104
+#: lib/designsettings.php:217
msgid "Text"
-msgstr ""
+msgstr "Tekst"
#: ../actions/noticesearch.php:34 actions/noticesearch.php:34
-#: actions/noticesearch.php:67
+#: actions/noticesearch.php:67 actions/noticesearch.php:78
msgid "Text search"
-msgstr "Szukaj tekstu"
+msgstr "Znajdź tekst"
#: ../actions/openidsettings.php:140 actions/openidsettings.php:149
#: actions/openidsettings.php:227
@@ -2184,7 +2421,7 @@ msgstr "Ten identyfikator OpenID nie należy do Ciebie."
#: ../actions/confirmaddress.php:52 actions/confirmaddress.php:52
#: actions/confirmaddress.php:94
msgid "That address has already been confirmed."
-msgstr "Ten adres został już potwierdzony"
+msgstr "Ten adres został już potwierdzony."
#: ../actions/confirmaddress.php:43 actions/confirmaddress.php:43
#: actions/confirmaddress.php:85
@@ -2192,8 +2429,9 @@ msgid "That confirmation code is not for you!"
msgstr "Ten kod potwierdzajÄ…cy nie jest przeznaczony dla Ciebie!"
#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
+#: actions/emailsettings.php:328
msgid "That email address already belongs to another user."
-msgstr ""
+msgstr "Ten adres e-mail należy już do innego użytkownika."
#: ../actions/avatar.php:80 actions/profilesettings.php:317
#: lib/imagefile.php:71
@@ -2203,17 +2441,17 @@ msgstr "Ten plik jest za duży."
#: ../actions/imsettings.php:170 actions/imsettings.php:178
#: actions/imsettings.php:293
msgid "That is already your Jabber ID."
-msgstr "Ten identyfikator Jabbera jest już do Ciebie przypisany."
+msgstr "Ten identyfikator Jabbera jest już Twój."
#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
-#: actions/emailsettings.php:318
+#: actions/emailsettings.php:318 actions/emailsettings.php:325
msgid "That is already your email address."
-msgstr ""
+msgstr "Ten adres e-mail jest już Twój."
#: ../actions/smssettings.php:188 actions/smssettings.php:196
#: actions/smssettings.php:306
msgid "That is already your phone number."
-msgstr ""
+msgstr "Ten numer telefonu jest już Twój."
#: ../actions/imsettings.php:233 actions/imsettings.php:241
#: actions/imsettings.php:381
@@ -2221,178 +2459,200 @@ msgid "That is not your Jabber ID."
msgstr "To nie jest Twój identyfikator Jabbera."
#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
-#: actions/emailsettings.php:397
+#: actions/emailsettings.php:397 actions/emailsettings.php:404
msgid "That is not your email address."
-msgstr ""
+msgstr "To nie jest Twój adres e-mail."
#: ../actions/smssettings.php:257 actions/smssettings.php:265
#: actions/smssettings.php:393
msgid "That is not your phone number."
-msgstr ""
+msgstr "To nie jest Twój numer telefonu."
#: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
#: actions/emailsettings.php:244 actions/imsettings.php:218
#: actions/emailsettings.php:367 actions/imsettings.php:349
+#: actions/emailsettings.php:374
msgid "That is the wrong IM address."
msgstr "To jest błędny adres komunikatora."
#: ../actions/smssettings.php:233 actions/smssettings.php:241
#: actions/smssettings.php:362
msgid "That is the wrong confirmation number."
-msgstr ""
+msgstr "To jest błędny numer potwierdzenia."
#: ../actions/smssettings.php:191 actions/smssettings.php:199
#: actions/smssettings.php:309
msgid "That phone number already belongs to another user."
-msgstr ""
+msgstr "Ten numer telefonu należy już do innego użytkownika."
#: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
#: actions/newnotice.php:49 actions/twitapistatuses.php:330
#: actions/facebookhome.php:243 actions/twitapistatuses.php:276
+#: actions/newnotice.php:136 actions/twitapistatuses.php:294
+#: lib/facebookaction.php:485 actions/newnotice.php:166
+#: actions/twitapistatuses.php:251 lib/facebookaction.php:477
+#: scripts/maildaemon.php:70
msgid "That's too long. Max notice size is 140 chars."
-msgstr "Wpis za długi. Maksymalna długość to 140 znaków."
+msgstr "Wpis jest za długi. Maksymalna długość to 140 znaków."
#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
-#: actions/twitapiaccount.php:62
+#: actions/twitapiaccount.php:62 actions/twitapiaccount.php:63
+#: actions/twitapiaccount.php:66
msgid "That's too long. Max notice size is 255 chars."
-msgstr ""
+msgstr "Wpis jest za długi. Maksymalna długość to 255 znaków."
#: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
+#: actions/confirmaddress.php:159
#, php-format
msgid "The address \"%s\" has been confirmed for your account."
-msgstr "Skojarzony z Twoim kontem adres \"%s\" został potwierdzony."
+msgstr "Adres \"%s\" został potwierdzony dla Twojego konta."
#: ../actions/emailsettings.php:264 ../actions/imsettings.php:250
#: ../actions/smssettings.php:274 actions/emailsettings.php:282
#: actions/imsettings.php:258 actions/smssettings.php:282
#: actions/emailsettings.php:416 actions/imsettings.php:402
-#: actions/smssettings.php:413
+#: actions/smssettings.php:413 actions/emailsettings.php:423
msgid "The address was removed."
msgstr "Adres został usunięty."
-#: ../actions/userauthorization.php:312
+#: ../actions/userauthorization.php:312 actions/userauthorization.php:346
+#: actions/userauthorization.php:380
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 ""
-"Twoje żądanie obserwacji zostało odrzucone, ale nie przekazano żadnego URL-a "
-"do zwrotnego komunikatu. Sprawdź w instrukcjach serwisu w jaki sposób "
-"dokładnie odbywa się odrzucanie subskrypcji. Twój token subskrypcji to:"
+"Subskrypcja została upoważniona, ale nie przekazano zwrotnego adresu URL. "
+"Sprawdź w instrukcjach strony, jak upoważnić subskrypcję. Token subskrypcji:"
-#: ../actions/userauthorization.php:322
+#: ../actions/userauthorization.php:322 actions/userauthorization.php:357
+#: actions/userauthorization.php:391
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 ""
-"Twoje żądanie obserwacji zostało odrzucone, ale nie przekazano żadnego URL-a "
-"do zwrotnego komunikatu. Sprawdź w instrukcjach serwisu w jaki sposób "
-"dokładnie odbywa się odrzucanie subskrypcji."
+"Subskrypcja została odrzucona, ale nie przekazano zwrotnego adresu URL. "
+"Sprawdź w instrukcjach strony, jak w pełni odrzucić subskrypcję."
#: ../actions/subscribers.php:35 actions/subscribers.php:35
+#: actions/subscribers.php:67
#, php-format
msgid "These are the people who listen to %s's notices."
-msgstr "Ludzie obserwujący wpisy użytkownika %s."
+msgstr "Osoby obserwujące wpisy użytkownika %s."
#: ../actions/subscribers.php:33 actions/subscribers.php:33
+#: actions/subscribers.php:63
msgid "These are the people who listen to your notices."
-msgstr "Ludzie obserwujÄ…cy Twoje wpisy."
+msgstr "Osoby obserwujÄ…cy Twoje wpisy."
#: ../actions/subscriptions.php:35 actions/subscriptions.php:35
+#: actions/subscriptions.php:69
#, php-format
msgid "These are the people whose notices %s listens to."
-msgstr "Ludzie, których wpisy obserwuje użytkownik %s."
+msgstr "Osoby, których wpisy obserwuje użytkownik %s."
#: ../actions/subscriptions.php:33 actions/subscriptions.php:33
+#: actions/subscriptions.php:65
msgid "These are the people whose notices you listen to."
-msgstr "Ludzie których wpisy obserwujesz."
+msgstr "Osoby, których wpisy obserwujesz."
#: ../actions/invite.php:89 actions/invite.php:96 actions/invite.php:128
+#: actions/invite.php:130
msgid ""
"These people are already users and you were automatically subscribed to them:"
msgstr ""
+"Te osoby są już użytkownikami i zostałeś do nich automatycznie "
+"zasubskrybowany:"
-#: ../actions/recoverpassword.php:88
+#: ../actions/recoverpassword.php:88 actions/recoverpassword.php:97
msgid "This confirmation code is too old. Please start again."
-msgstr "Kod potwierdzajÄ…cy jest przeterminowany. Zacznij jeszcze raz."
+msgstr "Kod potwierdzajÄ…cy jest za stary. Rozpocznij ponownie."
-#: ../lib/openid.php:195
+#: ../lib/openid.php:195 lib/openid.php:206
msgid ""
"This form should automatically submit itself. If not, click the submit "
"button to go to your OpenID provider."
msgstr ""
-"Ten formularz powinien wysłać się automatycznie. Jeśli tak się nie stanie "
-"kliknij Wyślij, aby przejść do Twojego dostawcy OpenID."
+"Ten formularz powinien wysłać się automatycznie. Jeśli tak się nie stanie, "
+"naciśnij przycisk Wyślij, aby przejść do dostawcy OpenID."
#: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
-#: actions/finishopenidlogin.php:67
+#: actions/finishopenidlogin.php:67 actions/finishopenidlogin.php:66
#, php-format
msgid ""
"This is the first time you've logged into %s so we must connect your OpenID "
"to a local account. You can either create a new account, or connect with "
"your existing account, if you have one."
msgstr ""
-"Jeżeli logujesz się po raz pierwszy do %s to twoje konto OpenID musi zostać "
-"skojarzone z kontem lokalnym. Możesz więc albo utworzyć nowe konto, albo "
-"połączyć je z posiadanym istniejącym."
+"Jeżeli logujesz się do %s po raz pierwszy, musimy połączyć identyfikator "
+"OpenID z lokalnym kontem. Można utworzyć nowe konto lub połączyć z "
+"istniejącym, jeśli je posiadasz."
#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
#: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
#: actions/twitapistatuses.php:511 actions/twitapifavorites.php:97
#: actions/twitapifriendships.php:85 actions/twitapistatuses.php:436
+#: actions/twitapifavorites.php:103 actions/twitapistatuses.php:460
+#: actions/twitapifavorites.php:154 actions/twitapifriendships.php:90
+#: actions/twitapistatuses.php:416
msgid "This method requires a POST or DELETE."
-msgstr ""
+msgstr "Ta metoda wymaga POST lub DELETE."
#: ../actions/twitapiaccount.php:65 ../actions/twitapifriendships.php:44
#: ../actions/twitapistatuses.php:381 actions/twitapiaccount.php:63
#: actions/twitapidirect_messages.php:114 actions/twitapifriendships.php:44
#: actions/twitapistatuses.php:303 actions/twitapiaccount.php:53
#: actions/twitapidirect_messages.php:122 actions/twitapifriendships.php:32
-#: actions/twitapistatuses.php:244
+#: actions/twitapistatuses.php:244 actions/twitapiaccount.php:54
+#: actions/twitapidirect_messages.php:131 actions/twitapistatuses.php:262
+#: actions/twitapiaccount.php:56 actions/twitapidirect_messages.php:124
+#: actions/twitapifriendships.php:34 actions/twitapistatuses.php:216
msgid "This method requires a POST."
-msgstr ""
+msgstr "Ta metoda wymaga POST."
-#: ../lib/util.php:164 lib/util.php:246
+#: ../lib/util.php:164 lib/util.php:246 lib/htmloutputter.php:104
msgid "This page is not available in a media type you accept"
-msgstr "Ta strona nie jest dostępna dla medium, którego typ akceptujesz"
+msgstr "Ta strona jest niedostępna dla akceptowanego typu medium"
#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:138
+#: actions/profilesettings.php:138 actions/profilesettings.php:139
msgid "Timezone"
-msgstr ""
+msgstr "Strefa czasowa"
#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
-#: actions/profilesettings.php:211
+#: actions/profilesettings.php:211 actions/profilesettings.php:212
msgid "Timezone not selected."
-msgstr ""
+msgstr "Nie wybrano strefy czasowej."
-#: ../actions/remotesubscribe.php:43
+#: ../actions/remotesubscribe.php:43 actions/remotesubscribe.php:74
#, 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 ""
-"Aby się zapisać możesz się [zalogować](%%action.login%%) lub [zarejestrować]"
-"(%%action.register%%). Jeśli już posiadasz konto w [kompatybilnym serwisie](%"
-"%doc.openmublog%%) wprowadź poniżej identyfikator URL."
+"Aby zasubskrybować, można [zalogować się](%%action.login%%) lub "
+"[zarejestrować](%%action.register%%) nowe konto. Jeśli już posiadasz konto "
+"na [zgodnej stronie mikroblogowania](%%doc.openmublog%%), podaj poniżej "
+"adres URL profilu."
#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
-#: actions/twitapifriendships.php:132
+#: actions/twitapifriendships.php:132 actions/twitapifriendships.php:139
msgid "Two user ids or screen_names must be supplied."
-msgstr ""
+msgstr "Należy dostarczyć dwa identyfikatory lub nazwy użytkowników."
#: ../actions/profilesettings.php:48 ../actions/register.php:169
#: actions/profilesettings.php:81 actions/register.php:183
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:398
+#: actions/register.php:444
msgid "URL of your homepage, blog, or profile on another site"
-msgstr "URL Twojej strony domowej, bloga, lub profilu na innej stronie"
+msgstr "Adres URL strony domowej, bloga lub profilu na innej stronie"
#: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
#: actions/remotesubscribe.php:110
msgid "URL of your profile on another compatible microblogging service"
-msgstr "URL Twojego profilu na kompatybilnym serwisie do mikroblogów"
+msgstr "Adres URL profilu na innej, zgodnej usłudze mikroblogowania"
#: ../actions/emailsettings.php:130 ../actions/imsettings.php:110
#: ../actions/recoverpassword.php:39 ../actions/smssettings.php:135
@@ -2402,17 +2662,21 @@ msgstr "URL Twojego profilu na kompatybilnym serwisie do mikroblogów"
#: actions/emailsettings.php:242 actions/grouplogo.php:317
#: actions/imsettings.php:214 actions/recoverpassword.php:44
#: actions/smssettings.php:236 actions/twittersettings.php:302
+#: actions/avatarsettings.php:263 actions/emailsettings.php:247
+#: actions/grouplogo.php:324 actions/twittersettings.php:306
+#: actions/twittersettings.php:322 lib/designsettings.php:301
msgid "Unexpected form submission."
-msgstr "Nieoczekiwane przesłanie formularza."
+msgstr "Nieoczekiwane wysłanie formularza."
#: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
-#: actions/recoverpassword.php:323
+#: actions/recoverpassword.php:323 actions/recoverpassword.php:341
msgid "Unexpected password reset."
-msgstr "Nieoczekiwane wyzerowanie hasła."
+msgstr "Nieoczekiwane przywrócenie hasła."
#: ../index.php:57 index.php:57 actions/recoverpassword.php:202
+#: actions/recoverpassword.php:210
msgid "Unknown action"
-msgstr ""
+msgstr "Nieznane działanie"
#: ../actions/finishremotesubscribe.php:58
#: actions/finishremotesubscribe.php:60 actions/finishremotesubscribe.php:61
@@ -2424,8 +2688,8 @@ msgid ""
"Unless otherwise specified, contents of this site are copyright by the "
"contributors and available under the "
msgstr ""
-"Prawo do kopiowania zawartości tej strony, chyba że zaznaczono inaczej, "
-"należy do tworzących jej treści i uwarunkowane zasadami"
+"Jeśli nie podano inaczej, prawa autorskie do zawartości tej strony należy do "
+"współtwórców i jest dostępna na warunkach licencji "
#: ../actions/confirmaddress.php:48 actions/confirmaddress.php:48
#: actions/confirmaddress.php:90
@@ -2441,38 +2705,42 @@ msgstr "Zrezygnuj z subskrypcji"
#: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
#: actions/postnotice.php:45 actions/updateprofile.php:46
#: actions/postnotice.php:48 actions/updateprofile.php:49
+#: actions/updateprofile.php:51
msgid "Unsupported OMB version"
msgstr "Nieobsługiwana wersja OMB"
#: ../actions/avatar.php:105 actions/profilesettings.php:342
-#: lib/imagefile.php:102
+#: lib/imagefile.php:102 lib/imagefile.php:99 lib/imagefile.php:100
msgid "Unsupported image file format."
msgstr "Nieobsługiwany format pliku obrazu."
#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
#: lib/connectsettingsaction.php:108
msgid "Updates by SMS"
-msgstr ""
+msgstr "Aktualizacje przez wiadomości SMS"
#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
#: lib/connectsettingsaction.php:105
msgid "Updates by instant messenger (IM)"
-msgstr ""
+msgstr "Aktualizacje przez komunikator"
#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
-#: actions/twitapistatuses.php:129
+#: actions/twitapistatuses.php:129 actions/twitapistatuses.php:134
+#: actions/twitapistatuses.php:94
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
-msgstr ""
+msgstr "Aktualizacje od %1$s i przyjaciół na %2$s!"
#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
-#: actions/twitapistatuses.php:202
+#: actions/twitapistatuses.php:202 actions/twitapistatuses.php:213
+#: actions/twitapigroups.php:74 actions/twitapistatuses.php:159
#, php-format
msgid "Updates from %1$s on %2$s!"
-msgstr ""
+msgstr "Aktualizacje od %1$s na %2$s!"
#: ../actions/avatar.php:68 actions/profilesettings.php:161
#: actions/avatarsettings.php:162 actions/grouplogo.php:232
+#: actions/avatarsettings.php:165 actions/grouplogo.php:238
msgid "Upload"
msgstr "Wyślij"
@@ -2483,23 +2751,26 @@ msgid ""
"site license, also. Use a picture that belongs to you and that you want to "
"share."
msgstr ""
-"Tu możesz wysłać nowego \"awatara\" (wizerunek użytkownika). Nie da się "
-"edytować obrazu po jego umieszczeniu w serwisie, więc upewnij się, że jest w "
-"miarę kwadratowy. Wysyłając go zgadzasz się na jego publikację na warunkach "
-"podanych w licencji strony. Użyj grafiki, która należy do Ciebie i którą "
-"możesz dzielić się z innymi."
+"Tu można wysłać nowego \"awatara\" (obraz użytkownika). Nie można "
+"modyfikować obrazu po jego wysłaniu, więc upewnij się, że jest w miarę "
+"kwadratowy. Musi być także na licencji strony. Użyj obrazu, który należy do "
+"Ciebie, i którym chcesz się dzielić."
#: ../lib/settingsaction.php:91
msgid "Upload a new profile image"
-msgstr ""
+msgstr "Wyślij nowy obraz profilu"
#: ../actions/invite.php:114 actions/invite.php:121 actions/invite.php:154
+#: actions/invite.php:156
msgid ""
"Use this form to invite your friends and colleagues to use this service."
msgstr ""
+"Użyj tego formularza, aby zaprosić przyjaciół i kolegów do używania tej "
+"usługi."
#: ../actions/register.php:159 ../actions/register.php:162
-#: actions/register.php:173 actions/register.php:176
+#: actions/register.php:173 actions/register.php:176 actions/register.php:382
+#: actions/register.php:386 actions/register.php:428 actions/register.php:432
msgid "Used only for updates, announcements, and password recovery"
msgstr "Używane tylko do aktualizacji, ogłoszeń i przywracania hasła"
@@ -2523,8 +2794,12 @@ msgstr "Obserwowany użytkownik nie istnieje."
#: actions/twitapifavorites.php:42 actions/twitapistatuses.php:167
#: actions/twitapistatuses.php:503 actions/twitapiusers.php:55
#: actions/usergroups.php:99 lib/galleryaction.php:67 lib/twitterapi.php:626
+#: actions/twitapiaccount.php:71 actions/twitapistatuses.php:179
+#: actions/twitapistatuses.php:535 actions/twitapiusers.php:59
+#: actions/foaf.php:65 actions/replies.php:79 actions/twitapiusers.php:57
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
msgid "User has no profile."
-msgstr "Użytkownik nie ma profilu."
+msgstr "Użytkownik nie posiada profilu."
#: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
#: actions/remotesubscribe.php:105
@@ -2533,12 +2808,12 @@ msgstr "Pseudonim użytkownika"
#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
msgid "User not found."
-msgstr ""
+msgstr "Nie znaleziono użytkownika."
#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:139
+#: actions/profilesettings.php:139 actions/profilesettings.php:140
msgid "What timezone are you normally in?"
-msgstr ""
+msgstr "W jakiej strefie czasowej zwykle siÄ™ znajdujesz?"
#: ../lib/util.php:1159 lib/util.php:1293 lib/noticeform.php:141
#, php-format
@@ -2547,111 +2822,120 @@ msgstr "Co słychać, %s?"
#: ../actions/profilesettings.php:54 ../actions/register.php:175
#: actions/profilesettings.php:87 actions/register.php:189
-#: actions/profilesettings.php:119
+#: actions/profilesettings.php:119 actions/register.php:410
+#: actions/register.php:456
msgid "Where you are, like \"City, State (or Region), Country\""
-msgstr "Gdzie jesteÅ›? (np. \"miasto, region, kraj\")"
+msgstr "Gdzie jesteś, np. \"miasto, województwo (lub region), kraj\""
#: ../actions/updateprofile.php:128 actions/updateprofile.php:129
-#: actions/updateprofile.php:132
+#: actions/updateprofile.php:132 actions/updateprofile.php:134
#, php-format
msgid "Wrong image type for '%s'"
-msgstr "Nieprawidłowy typ obrazu dla '%s'"
+msgstr "Błędny typ obrazu dla \"%s\""
#: ../actions/updateprofile.php:123 actions/updateprofile.php:124
-#: actions/updateprofile.php:127
+#: actions/updateprofile.php:127 actions/updateprofile.php:129
#, php-format
msgid "Wrong size image at '%s'"
-msgstr "Nieprawidłowy rozmiar obrazu dla '%s'"
+msgstr "Błędny rozmiar obrazu \"%s\""
#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
#: actions/deletenotice.php:64 actions/deletenotice.php:79
#: actions/block.php:148 actions/deletenotice.php:122
-#: actions/deletenotice.php:141
+#: actions/deletenotice.php:141 actions/deletenotice.php:115
+#: actions/block.php:150 actions/deletenotice.php:116
+#: actions/groupblock.php:177
msgid "Yes"
-msgstr ""
+msgstr "Tak"
#: ../actions/finishaddopenid.php:64 actions/finishaddopenid.php:64
#: actions/finishaddopenid.php:112
msgid "You already have this OpenID!"
-msgstr "Już masz ten identyfikator OpenID!"
+msgstr "Już posiadasz ten identyfikator OpenID!"
#: ../actions/deletenotice.php:37 actions/deletenotice.php:37
msgid ""
"You are about to permanently delete a notice. Once this is done, it cannot "
"be undone."
msgstr ""
+"Wpis zostanie za chwilę trwale usunięty. Kiedy to się stanie, to już się nie "
+"odstanie."
#: ../actions/recoverpassword.php:31 actions/recoverpassword.php:31
#: actions/recoverpassword.php:36
msgid "You are already logged in!"
-msgstr "Nie musisz ponownie się logować!"
+msgstr "Jesteś już zalogowany!"
#: ../actions/invite.php:81 actions/invite.php:88 actions/invite.php:120
+#: actions/invite.php:122
msgid "You are already subscribed to these users:"
-msgstr ""
+msgstr "Jesteś już zasubskrybowany do tych użytkowników:"
#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
-#: actions/twitapifriendships.php:105
+#: actions/twitapifriendships.php:105 actions/twitapifriendships.php:111
msgid "You are not friends with the specified user."
-msgstr ""
+msgstr "Nie jesteś przyjacielem podanego użytkownika."
#: ../actions/password.php:27
msgid "You can change your password here. Choose a good one!"
-msgstr "Tu możesz zmienić hasło. Wybierz porządne!"
+msgstr "Tutaj można zmienić hasło. Wybierz dobre!"
#: ../actions/register.php:135 actions/register.php:145
msgid "You can create a new account to start posting notices."
-msgstr "Możesz utworzyć nowe konto, aby rozpocząć wysyłanie wpisów."
+msgstr "Można utworzyć nowe konto, aby rozpocząć wysyłanie wpisów."
#: ../actions/smssettings.php:28 actions/smssettings.php:28
#: actions/smssettings.php:69
#, php-format
msgid "You can receive SMS messages through email from %%site.name%%."
-msgstr ""
+msgstr "Można otrzymywać wiadomości SMS przez e-mail od %%site.name%%."
-#: ../actions/openidsettings.php:86
+#: ../actions/openidsettings.php:86 actions/openidsettings.php:143
msgid ""
"You can remove an OpenID from your account by clicking the button marked "
"\"Remove\"."
msgstr ""
-"Możesz usunąć łączność z serwerem OpenID ze swojego konta klikając \"Usuń\"."
+"Można usunąć identyfikator OpenID ze swojego konta naciskając przycisk \"Usuń"
+"\"."
#: ../actions/imsettings.php:28 actions/imsettings.php:28
+#: actions/imsettings.php:70
#, php-format
msgid ""
"You can send and receive notices through Jabber/GTalk [instant messages](%%"
"doc.im%%). Configure your address and settings below."
msgstr ""
-"Możesz wysyłać i odbierać wpisy przez komunikator Jabber/GTalk (%%doc.im%%). "
-"Poniżej możesz skonfigurować swój adres i ustawienia IM."
+"Można wysyłać i odbierać wpisy przez [komunikator](%%doc.im%%) Jabber/GTalk. "
+"Skonfiguruj adres i ustawienia poniżej."
-#: ../actions/profilesettings.php:27
+#: ../actions/profilesettings.php:27 actions/profilesettings.php:69
msgid ""
"You can update your personal profile info here so people know more about you."
msgstr ""
-"W tym miejscu możesz zaktualizować informacje zawarte w Twoim osobistym "
-"profilu, aby inni mogli lepiej Cię poznać."
+"Tutaj można zaktualizować osobiste informacje w profilu, aby inni mogli "
+"lepiej Cię poznać."
#: ../actions/finishremotesubscribe.php:31 ../actions/remotesubscribe.php:31
#: actions/finishremotesubscribe.php:31 actions/remotesubscribe.php:31
#: actions/finishremotesubscribe.php:33 actions/finishremotesubscribe.php:85
#: actions/finishremotesubscribe.php:101 actions/remotesubscribe.php:35
msgid "You can use the local subscription!"
-msgstr "Możesz skorzystać z lokalnej subskrypcji!"
+msgstr "Można używać lokalnej subskrypcji!"
#: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
#: actions/finishopenidlogin.php:38 actions/register.php:68
-#: actions/finishopenidlogin.php:43
+#: actions/finishopenidlogin.php:43 actions/register.php:149
+#: actions/register.php:186
msgid "You can't register if you don't agree to the license."
msgstr ""
"Nie możesz się zarejestrować, jeśli nie zgadzasz się z warunkami licencji."
#: ../actions/updateprofile.php:63 actions/updateprofile.php:64
-#: actions/updateprofile.php:67
+#: actions/updateprofile.php:67 actions/updateprofile.php:69
msgid "You did not send us that profile"
-msgstr "Ten profil nie był wysłany przez Ciebie"
+msgstr "Nie wysłałeś nam tego profilu"
-#: ../lib/mail.php:147
+#: ../lib/mail.php:147 lib/mail.php:289 lib/mail.php:288
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -2663,122 +2947,147 @@ msgid ""
"Faithfully yours,\n"
"%4$s"
msgstr ""
+"Posiadasz nowy adres wysyłania na %1$s.\n"
+"\n"
+"Wyślij wiadomość e-mail na %2$s, aby wysłać nowe wpisy.\n"
+"\n"
+"Więcej instrukcji dotyczących poczty e-mail można znaleźć na %3$s.\n"
+"\n"
+"Z poważaniem,\n"
+"%4$s"
#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
-#: actions/twitapistatuses.php:463
+#: actions/twitapistatuses.php:463 actions/twitapistatuses.php:486
+#: actions/twitapistatuses.php:443
msgid "You may not delete another user's status."
-msgstr ""
+msgstr "Nie można usuwać statusów innych użytkowników."
#: ../actions/invite.php:31 actions/invite.php:31 actions/invite.php:39
+#: actions/invite.php:41
#, php-format
msgid "You must be logged in to invite other users to use %s"
msgstr ""
+"Należy być zalogowanym, aby zapraszać innych użytkowników do używania %s"
#: ../actions/invite.php:103 actions/invite.php:110 actions/invite.php:142
+#: actions/invite.php:144
msgid ""
"You will be notified when your invitees accept the invitation and register "
"on the site. Thanks for growing the community!"
msgstr ""
+"Zostaniesz powiadomiony, kiedy ktoÅ› zaakceptuje zaproszenie i zarejestruje "
+"się na stronie. Dziękujemy za pomoc w zwiększaniu społeczności!"
-#: ../actions/recoverpassword.php:149
+#: ../actions/recoverpassword.php:149 actions/recoverpassword.php:158
msgid "You've been identified. Enter a new password below. "
-msgstr "Identyfikacja pomyślna. Wprowadź poniżej nowe hasło."
+msgstr "Zostałeś zidentyfikowany. Podaj poniżej nowe hasło. "
#: ../actions/openidlogin.php:67 actions/openidlogin.php:76
-#: actions/openidlogin.php:104
+#: actions/openidlogin.php:104 actions/openidlogin.php:113
msgid "Your OpenID URL"
-msgstr "URL Twojej usługi OpenID"
+msgstr "Twój adres URL OpenID"
-#: ../actions/recoverpassword.php:164
+#: ../actions/recoverpassword.php:164 actions/recoverpassword.php:188
+#: actions/recoverpassword.php:193
msgid "Your nickname on this server, or your registered email address."
-msgstr ""
-"Twój pseudonim na tym serwerze lub adres e-mailowy użyty podczas rejestracji."
+msgstr "Twój pseudonim na tym serwerze lub zarejestrowany adres e-mail."
-#: ../actions/openidsettings.php:28
+#: ../actions/openidsettings.php:28 actions/openidsettings.php:70
#, php-format
msgid ""
"[OpenID](%%doc.openid%%) lets you log into many sites with the same user "
"account. Manage your associated OpenIDs from here."
msgstr ""
-"[OpenID](%%doc.openid%%) pozwala logować Ci się do wielu serwisów z "
-"wykorzystaniem jednego konta użytkownika. Tu możesz zarządzać swoimi "
+"[OpenID](%%doc.openid%%) umożliwia logowanie się do wielu stron za pomocą "
+"tego samego konta użytkownika. Tu można zarządzać powiązanymi "
"identyfikatorami OpenID."
-#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945
+#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945 lib/util.php:756
+#: lib/util.php:770
msgid "a few seconds ago"
msgstr "kilka sekund temu"
-#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957
+#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957 lib/util.php:768
+#: lib/util.php:782
#, php-format
msgid "about %d days ago"
msgstr "około %d dni temu"
-#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953
+#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953 lib/util.php:764
+#: lib/util.php:778
#, php-format
msgid "about %d hours ago"
msgstr "około %d godzin temu"
-#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949
+#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949 lib/util.php:760
+#: lib/util.php:774
#, php-format
msgid "about %d minutes ago"
msgstr "około %d minut temu"
-#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961
+#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961 lib/util.php:772
+#: lib/util.php:786
#, php-format
msgid "about %d months ago"
msgstr "około %d miesięcy temu"
-#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955
+#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955 lib/util.php:766
+#: lib/util.php:780
msgid "about a day ago"
msgstr "blisko dzień temu"
-#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947
+#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947 lib/util.php:758
+#: lib/util.php:772
msgid "about a minute ago"
-msgstr "blisko minutÄ™ temu"
+msgstr "około minutę temu"
-#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959
+#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959 lib/util.php:770
+#: lib/util.php:784
msgid "about a month ago"
-msgstr "blisko miesiÄ…c temu"
+msgstr "około miesiąc temu"
-#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963
+#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963 lib/util.php:774
+#: lib/util.php:788
msgid "about a year ago"
-msgstr "blisko rok temu"
+msgstr "około rok temu"
-#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951
+#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951 lib/util.php:762
+#: lib/util.php:776
msgid "about an hour ago"
-msgstr "blisko godzinÄ™ temu"
+msgstr "około godzinę temu"
#: ../actions/showstream.php:423 ../lib/stream.php:132
#: actions/showstream.php:441 lib/stream.php:99
msgid "delete"
-msgstr ""
+msgstr "usuń"
#: ../actions/noticesearch.php:130 ../actions/showstream.php:408
#: ../lib/stream.php:117 actions/noticesearch.php:136
#: actions/showstream.php:426 lib/stream.php:84 actions/noticesearch.php:187
msgid "in reply to..."
-msgstr "w odpowiedzi na…"
+msgstr "w odpowiedzi na..."
#: ../actions/noticesearch.php:137 ../actions/showstream.php:415
#: ../lib/stream.php:124 actions/noticesearch.php:143
#: actions/showstream.php:433 lib/stream.php:91 actions/noticesearch.php:194
msgid "reply"
-msgstr "odpowiedź"
+msgstr "odpowiedz"
#: ../actions/password.php:44 actions/profilesettings.php:183
#: actions/passwordsettings.php:106
msgid "same as password above"
-msgstr "takie samo hasło jak powyżej"
+msgstr "takie samo jak hasło powyżej"
#: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
-#: actions/twitapistatuses.php:555
+#: actions/twitapistatuses.php:555 actions/twitapistatuses.php:596
+#: actions/twitapistatuses.php:618 actions/twitapistatuses.php:553
+#: actions/twitapistatuses.php:575
msgid "unsupported file type"
-msgstr ""
+msgstr "nieobsługiwany typ pliku"
#: ../lib/util.php:1309 lib/util.php:1443
-#, fuzzy
msgid "« After"
-msgstr "« następne"
+msgstr "« Następne"
#: actions/deletenotice.php:74 actions/disfavor.php:43
#: actions/emailsettings.php:127 actions/favor.php:45
@@ -2793,68 +3102,88 @@ msgstr "« następne"
#: actions/finishopenidlogin.php:38 actions/invite.php:54 actions/nudge.php:80
#: actions/openidlogin.php:37 actions/recoverpassword.php:316
#: actions/subscribe.php:46 actions/unblock.php:65 actions/unsubscribe.php:43
+#: actions/avatarsettings.php:251 actions/emailsettings.php:229
+#: actions/grouplogo.php:314 actions/imsettings.php:200 actions/login.php:103
+#: actions/newmessage.php:133 actions/newnotice.php:96
+#: actions/openidsettings.php:188 actions/othersettings.php:136
+#: actions/passwordsettings.php:131 actions/profilesettings.php:172
+#: actions/register.php:113 actions/remotesubscribe.php:53
+#: actions/smssettings.php:216 actions/subedit.php:38 actions/tagother.php:166
+#: actions/twittersettings.php:294 actions/userauthorization.php:39
+#: actions/favor.php:75 actions/groupblock.php:66 actions/groupunblock.php:66
+#: actions/invite.php:56 actions/makeadmin.php:66 actions/newnotice.php:102
+#: actions/othersettings.php:138 actions/recoverpassword.php:334
+#: actions/register.php:153 actions/twittersettings.php:310
+#: lib/designsettings.php:291
msgid "There was a problem with your session token. Try again, please."
-msgstr ""
+msgstr "Wystąpił problem z tokenem sesji. Spróbuj ponownie."
#: actions/disfavor.php:55 actions/disfavor.php:81
msgid "This notice is not a favorite!"
-msgstr ""
+msgstr "Ten wpis nie jest ulubiony!"
#: actions/disfavor.php:63 actions/disfavor.php:87
+#: actions/twitapifavorites.php:188
msgid "Could not delete favorite."
-msgstr ""
+msgstr "Nie można usunąć ulubionego wpisu."
#: actions/disfavor.php:72 lib/favorform.php:140
msgid "Favor"
-msgstr ""
+msgstr "Dodaj do ulubionych"
-#: actions/emailsettings.php:92
+#: actions/emailsettings.php:92 actions/emailsettings.php:157
msgid "Send me email when someone adds my notice as a favorite."
-msgstr ""
+msgstr "Wyślij mi wiadomość e-mail, kiedy ktoś doda mój wpis jako ulubiony."
#: actions/emailsettings.php:95 actions/emailsettings.php:163
msgid "Send me email when someone sends me a private message."
-msgstr ""
+msgstr "Wyślij mi wiadomość e-mail, kiedy ktoś wyśle mi prywatną wiadomość."
#: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:81
-#: actions/twitapifavorites.php:118
+#: actions/twitapifavorites.php:118 actions/twitapifavorites.php:124
+#: actions/favor.php:79
msgid "This notice is already a favorite!"
-msgstr ""
+msgstr "Ten wpis jest już ulubiony!"
#: actions/favor.php:60 actions/twitapifavorites.php:151
#: classes/Command.php:132 actions/favor.php:86
#: actions/twitapifavorites.php:125 classes/Command.php:152
+#: actions/twitapifavorites.php:131 lib/command.php:152 actions/favor.php:84
+#: actions/twitapifavorites.php:133 lib/command.php:145
msgid "Could not create favorite."
-msgstr ""
+msgstr "Nie można utworzyć ulubionego wpisu."
#: actions/favor.php:70
msgid "Disfavor"
-msgstr ""
+msgstr "Usuń wpis z ulubionych"
#: actions/favoritesrss.php:60 actions/showfavorites.php:47
#: actions/favoritesrss.php:100 actions/showfavorites.php:77
+#: actions/favoritesrss.php:110
#, php-format
msgid "%s favorite notices"
-msgstr ""
+msgstr "Ulubione wpisy użytkownika %s"
#: actions/favoritesrss.php:64 actions/favoritesrss.php:104
+#: actions/favoritesrss.php:114
#, php-format
msgid "Feed of favorite notices of %s"
-msgstr ""
+msgstr "Kanał ulubionych wpisów użytkownika %s"
#: actions/inbox.php:28 actions/inbox.php:59
#, php-format
msgid "Inbox for %s - page %d"
-msgstr ""
+msgstr "Odebrane wiadomości użytkownika %s - strona %d"
#: actions/inbox.php:30 actions/inbox.php:62
#, php-format
msgid "Inbox for %s"
-msgstr ""
+msgstr "Odebrane wiadomości użytkownika %s"
#: actions/inbox.php:53 actions/inbox.php:115
msgid "This is your inbox, which lists your incoming private messages."
msgstr ""
+"To jest skrzynka odbiorcza, która wyświetla przychodzące wiadomości prywatne."
#: actions/invite.php:178 actions/invite.php:213
#, php-format
@@ -2862,234 +3191,269 @@ msgid ""
"%1$s has invited you to join them on %2$s (%3$s).\n"
"\n"
msgstr ""
+"%1$s zaprosił się do dołączenia do %2$s (%3$s).\n"
+"\n"
#: actions/login.php:104 actions/login.php:235 actions/openidlogin.php:108
#: actions/register.php:416
msgid "Automatically login in the future; "
-msgstr ""
+msgstr "Automatyczne logowanie; "
#: actions/login.php:122 actions/login.php:264
msgid "For security reasons, please re-enter your "
-msgstr ""
+msgstr "Z powodów bezpieczeństwa ponownie podaj "
#: actions/login.php:126 actions/login.php:268
msgid "Login with your username and password. "
-msgstr ""
+msgstr "Zaloguj się za pomocą nazwy użytkownika i hasła. "
#: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
-#: actions/twitapidirect_messages.php:141
+#: actions/twitapidirect_messages.php:141 actions/newmessage.php:148
+#: actions/twitapidirect_messages.php:150
+#: actions/twitapidirect_messages.php:145
msgid "That's too long. Max message size is 140 chars."
-msgstr ""
+msgstr "Wiadomość jest za długa. Maksymalna długość to 140 znaków."
#: actions/newmessage.php:65 actions/newmessage.php:128
+#: actions/newmessage.php:155
msgid "No recipient specified."
-msgstr ""
+msgstr "Nie podano odbiorcy."
#: actions/newmessage.php:68 actions/newmessage.php:113
#: classes/Command.php:206 actions/newmessage.php:131
#: actions/newmessage.php:168 classes/Command.php:237
+#: actions/newmessage.php:119 actions/newmessage.php:158 lib/command.php:237
+#: lib/command.php:230
msgid "You can't send a message to this user."
-msgstr ""
+msgstr "Nie można wysłać wiadomości do tego użytkownika."
#: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
#: classes/Command.php:209 actions/twitapidirect_messages.php:158
-#: classes/Command.php:240
+#: classes/Command.php:240 actions/newmessage.php:161
+#: actions/twitapidirect_messages.php:167 lib/command.php:240
+#: actions/twitapidirect_messages.php:163 lib/command.php:233
msgid ""
"Don't send a message to yourself; just say it to yourself quietly instead."
-msgstr ""
+msgstr "Nie wysyłaj wiadomości do siebie, po prostu powiedz to sobie po cichu."
#: actions/newmessage.php:108 actions/microsummary.php:62
-#: actions/newmessage.php:163
+#: actions/newmessage.php:163 actions/newmessage.php:114
msgid "No such user"
-msgstr ""
+msgstr "Nie ma takiego użytkownika"
#: actions/newmessage.php:117 actions/newmessage.php:67
+#: actions/newmessage.php:71
msgid "New message"
-msgstr ""
+msgstr "Nowa wiadomość"
#: actions/noticesearch.php:95 actions/noticesearch.php:146
msgid "Notice without matching profile"
-msgstr ""
+msgstr "Wpis bez odpowiadajÄ…cego profilu"
#: actions/openidsettings.php:28 actions/openidsettings.php:70
#, php-format
msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
-msgstr ""
+msgstr "[OpenID](%%doc.openid%%) umożliwia logowanie się na wiele stron "
#: actions/openidsettings.php:46 actions/openidsettings.php:96
msgid "If you want to add an OpenID to your account, "
-msgstr ""
+msgstr "Jeśli chcesz dodać identyfikator OpenID do konta, "
#: actions/openidsettings.php:74
msgid "Removing your only OpenID would make it impossible to log in! "
-msgstr ""
+msgstr "Usunięcie jedynego identyfikatora OpenID uniemożliwi zalogowanie się! "
#: actions/openidsettings.php:87 actions/openidsettings.php:143
msgid "You can remove an OpenID from your account "
-msgstr ""
+msgstr "Można usunąć identyfikator OpenID z konta "
#: actions/outbox.php:28 actions/outbox.php:58
#, php-format
msgid "Outbox for %s - page %d"
-msgstr ""
+msgstr "Wysłane wiadomości użytkownika %s - strona %d"
#: actions/outbox.php:30 actions/outbox.php:61
#, php-format
msgid "Outbox for %s"
-msgstr ""
+msgstr "Wysłane wiadomości użytkownika %s"
#: actions/outbox.php:53 actions/outbox.php:116
msgid "This is your outbox, which lists private messages you have sent."
-msgstr ""
+msgstr "To są wiadomości wysłane, czyli prywatne wiadomości, które wysłałeś."
#: actions/peoplesearch.php:28 actions/peoplesearch.php:52
#, php-format
msgid ""
"Search for people on %%site.name%% by their name, location, or interests. "
msgstr ""
+"Znajdź osoby na %%site.name%% według ich nazwiska, położenia lub "
+"zainteresowań. "
#: actions/profilesettings.php:27 actions/profilesettings.php:69
msgid "You can update your personal profile info here "
-msgstr ""
+msgstr "Można tutaj zaktualizować osobiste informacje profilu "
#: actions/profilesettings.php:115 actions/remotesubscribe.php:320
#: actions/userauthorization.php:159 actions/userrss.php:76
#: actions/avatarsettings.php:104 actions/avatarsettings.php:179
#: actions/grouplogo.php:177 actions/remotesubscribe.php:367
#: actions/userauthorization.php:176 actions/userrss.php:82
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
+#: actions/grouplogo.php:183 actions/remotesubscribe.php:366
+#: actions/remotesubscribe.php:364 actions/userauthorization.php:215
+#: actions/userrss.php:103
msgid "User without matching profile"
-msgstr ""
+msgstr "Użytkownik bez odpowiadającego profilu"
#: actions/recoverpassword.php:91 actions/recoverpassword.php:97
msgid "This confirmation code is too old. "
-msgstr ""
+msgstr "Ten kod potwierdzajÄ…cy jest za stary. "
#: actions/recoverpassword.php:141 actions/recoverpassword.php:152
msgid "If you've forgotten or lost your"
-msgstr ""
+msgstr "Jeśli zapomniałeś lub zgubiłeś"
#: actions/recoverpassword.php:154 actions/recoverpassword.php:158
msgid "You've been identified. Enter a "
-msgstr ""
+msgstr "Zostałeś zidentyfikowany. Podaj "
#: actions/recoverpassword.php:169 actions/recoverpassword.php:188
msgid "Your nickname on this server, "
-msgstr ""
+msgstr "Pseudonim na tym serwerze, "
#: actions/recoverpassword.php:271 actions/recoverpassword.php:304
msgid "Instructions for recovering your password "
-msgstr ""
+msgstr "Instrukcje przywracania hasła "
#: actions/recoverpassword.php:327 actions/recoverpassword.php:361
msgid "New password successfully saved. "
-msgstr ""
+msgstr "Pomyślnie zapisano nowe hasło. "
#: actions/register.php:95 actions/register.php:180
+#: actions/passwordsettings.php:147 actions/register.php:217
msgid "Password must be 6 or more characters."
-msgstr ""
+msgstr "Hasło musi mieć sześć lub więcej znaków."
#: actions/register.php:216
#, php-format
msgid ""
"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
"want to..."
-msgstr ""
+msgstr "Gratulacje, %s! Witaj na %%%%site.name%%%%. Stąd możesz chcieć..."
#: actions/register.php:227
msgid "(You should receive a message by email momentarily, with "
-msgstr ""
+msgstr "(Powinieneś właśnie otrzymać wiadomość przez e-mail z "
#: actions/remotesubscribe.php:51 actions/remotesubscribe.php:74
#, php-format
msgid "To subscribe, you can [login](%%action.login%%),"
-msgstr ""
+msgstr "Aby zasubskrybować, można [zalogować się](%%action.login%%),"
#: actions/showfavorites.php:61 actions/showfavorites.php:145
+#: actions/showfavorites.php:147
#, php-format
msgid "Feed for favorites of %s"
-msgstr ""
+msgstr "Kanał ulubionych wpisów użytkownika %s"
#: actions/showfavorites.php:84 actions/twitapifavorites.php:85
#: actions/showfavorites.php:202 actions/twitapifavorites.php:59
+#: actions/showfavorites.php:179 actions/showfavorites.php:209
msgid "Could not retrieve favorite notices."
-msgstr ""
+msgstr "Nie można odebrać ulubionych wpisów."
#: actions/showmessage.php:33 actions/showmessage.php:81
msgid "No such message."
-msgstr ""
+msgstr "Nie ma takiej wiadomości."
-#: actions/showmessage.php:42
+#: actions/showmessage.php:42 actions/showmessage.php:98
msgid "Only the sender and recipient may read this message."
-msgstr ""
+msgstr "Tylko nadawca i odbiorca mogą przeczytać tę wiadomość."
#: actions/showmessage.php:61 actions/showmessage.php:108
#, php-format
msgid "Message to %1$s on %2$s"
-msgstr ""
+msgstr "Wiadomość do użytkownika %1$s na %2$s"
#: actions/showmessage.php:66 actions/showmessage.php:113
#, php-format
msgid "Message from %1$s on %2$s"
-msgstr ""
+msgstr "Wiadomość od użytkownika %1$s na %2$s"
#: actions/showstream.php:154
msgid "Send a message"
-msgstr ""
+msgstr "Wyślij wiadomość"
#: actions/smssettings.php:312 actions/smssettings.php:464
#, php-format
msgid "Mobile carrier for your phone. "
-msgstr ""
+msgstr "Operator komórkowy Twojego telefonu. "
#: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:68
+#: actions/twitapidirect_messages.php:67 actions/twitapidirect_messages.php:53
#, php-format
msgid "Direct messages to %s"
-msgstr ""
+msgstr "Bezpośrednia wiadomość do użytkownika %s"
#: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
+#: actions/twitapidirect_messages.php:68 actions/twitapidirect_messages.php:54
#, php-format
msgid "All the direct messages sent to %s"
-msgstr ""
+msgstr "Wszystkie bezpośrednie wiadomości wysłane do użytkownika %s"
#: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:73
+#: actions/twitapidirect_messages.php:72 actions/twitapidirect_messages.php:59
msgid "Direct Messages You've Sent"
-msgstr ""
+msgstr "Wysłane bezpośrednie wiadomości"
#: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
+#: actions/twitapidirect_messages.php:73 actions/twitapidirect_messages.php:60
#, php-format
msgid "All the direct messages sent from %s"
-msgstr ""
+msgstr "Wszystkie bezpośrednie wiadomości wysłane od użytkownika %s"
#: actions/twitapidirect_messages.php:128
#: actions/twitapidirect_messages.php:137
+#: actions/twitapidirect_messages.php:146
+#: actions/twitapidirect_messages.php:140
msgid "No message text!"
-msgstr ""
+msgstr "Brak tekstu wiadomości!"
#: actions/twitapidirect_messages.php:138
#: actions/twitapidirect_messages.php:150
+#: actions/twitapidirect_messages.php:159
+#: actions/twitapidirect_messages.php:154
msgid "Recipient user not found."
-msgstr ""
+msgstr "Nie znaleziono odbiorcy."
#: actions/twitapidirect_messages.php:141
#: actions/twitapidirect_messages.php:153
+#: actions/twitapidirect_messages.php:162
+#: actions/twitapidirect_messages.php:158
msgid "Can't send direct messages to users who aren't your friend."
msgstr ""
+"Nie można wysłać bezpośredniej wiadomości do użytkowników, którzy nie są "
+"Twoimi przyjaciółmi."
#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:66
+#: actions/twitapifavorites.php:64 actions/twitapifavorites.php:49
#, php-format
msgid "%s / Favorites from %s"
-msgstr ""
+msgstr "%s/ulubione wpisy od %s"
#: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
+#: actions/twitapifavorites.php:68 actions/twitapifavorites.php:55
#, php-format
msgid "%s updates favorited by %s / %s."
-msgstr ""
+msgstr "Użytkownik %s aktualizuje ulubione według %s/%s."
#: actions/twitapifavorites.php:187 lib/mail.php:275
#: actions/twitapifavorites.php:164 lib/mail.php:553
+#: actions/twitapifavorites.php:170 lib/mail.php:554
+#: actions/twitapifavorites.php:221
#, php-format
msgid "%s added your notice as a favorite"
-msgstr ""
+msgstr "Użytkownik %s dodał Twój wpis jako ulubiony"
#: actions/twitapifavorites.php:188 lib/mail.php:276
#: actions/twitapifavorites.php:165
@@ -3098,230 +3462,275 @@ msgid ""
"%1$s just added your notice from %2$s as one of their favorites.\n"
"\n"
msgstr ""
+"Użytkownik %1$s właśnie dodał Twój wpis od %2$s jako jeden z jego "
+"ulubionych.\n"
+"\n"
#: actions/twittersettings.php:27
msgid ""
"Add your Twitter account to automatically send your notices to Twitter, "
msgstr ""
+"Dodaj swoje konto Twittera, aby automatycznie wysyłać wpisy na Twittera, "
#: actions/twittersettings.php:41 actions/twittersettings.php:60
+#: actions/twittersettings.php:61
msgid "Twitter settings"
-msgstr ""
+msgstr "Ustawienia Twittera"
#: actions/twittersettings.php:48 actions/twittersettings.php:105
+#: actions/twittersettings.php:106
msgid "Twitter Account"
-msgstr ""
+msgstr "Konto Twittera"
#: actions/twittersettings.php:56 actions/twittersettings.php:113
+#: actions/twittersettings.php:114
msgid "Current verified Twitter account."
-msgstr ""
+msgstr "Obecnie sprawdzone konto Twittera."
#: actions/twittersettings.php:63
msgid "Twitter Username"
-msgstr ""
+msgstr "Nazwa użytkownika Twitter"
#: actions/twittersettings.php:65 actions/twittersettings.php:123
+#: actions/twittersettings.php:126
msgid "No spaces, please."
-msgstr ""
+msgstr "Bez spacji."
#: actions/twittersettings.php:67
msgid "Twitter Password"
-msgstr ""
+msgstr "Hasło Twittera"
#: actions/twittersettings.php:72 actions/twittersettings.php:139
+#: actions/twittersettings.php:142
msgid "Automatically send my notices to Twitter."
-msgstr ""
+msgstr "Automatycznie wyślij moje wpisy na Twittera."
#: actions/twittersettings.php:75 actions/twittersettings.php:146
+#: actions/twittersettings.php:149
msgid "Send local \"@\" replies to Twitter."
-msgstr ""
+msgstr "Wyślij lokalne odpowiedzi \"@\" na Twittera."
#: actions/twittersettings.php:78 actions/twittersettings.php:153
+#: actions/twittersettings.php:156
msgid "Subscribe to my Twitter friends here."
-msgstr ""
+msgstr "Zasubskrybuj tutaj moich przyjaciół z Twittera."
-#: actions/twittersettings.php:122
+#: actions/twittersettings.php:122 actions/twittersettings.php:331
+#: actions/twittersettings.php:348
msgid ""
"Username must have only numbers, upper- and lowercase letters, and "
"underscore (_). 15 chars max."
msgstr ""
+"Nazwa użytkownika może zawierać tylko liczby, małe i wielkie litery oraz "
+"podkreślnik (_). Maksymalnie 15 znaków."
#: actions/twittersettings.php:128 actions/twittersettings.php:334
+#: actions/twittersettings.php:338 actions/twittersettings.php:355
msgid "Could not verify your Twitter credentials!"
-msgstr ""
+msgstr "Nie można sprawdzić danych uwierzytelniających Twittera!"
#: actions/twittersettings.php:137
#, php-format
msgid "Unable to retrieve account information for \"%s\" from Twitter."
-msgstr ""
+msgstr "Nie można pobrać informacji o koncie \"%s\" z Twittera."
#: actions/twittersettings.php:151 actions/twittersettings.php:170
#: actions/twittersettings.php:348 actions/twittersettings.php:368
+#: actions/twittersettings.php:352 actions/twittersettings.php:372
+#: actions/twittersettings.php:369 actions/twittersettings.php:389
msgid "Unable to save your Twitter settings!"
-msgstr ""
+msgstr "Nie można zapisać ustawień Twittera!"
#: actions/twittersettings.php:174 actions/twittersettings.php:376
+#: actions/twittersettings.php:380 actions/twittersettings.php:399
msgid "Twitter settings saved."
-msgstr ""
+msgstr "Zapisano ustawienia Twittera."
#: actions/twittersettings.php:192 actions/twittersettings.php:395
+#: actions/twittersettings.php:399 actions/twittersettings.php:418
msgid "That is not your Twitter account."
-msgstr ""
+msgstr "To nie jest Twoje konto Twittera."
#: actions/twittersettings.php:200 actions/twittersettings.php:208
-#: actions/twittersettings.php:403
+#: actions/twittersettings.php:403 actions/twittersettings.php:407
+#: actions/twittersettings.php:426
msgid "Couldn't remove Twitter user."
-msgstr ""
+msgstr "Nie można usunąć użytkownika Twittera."
#: actions/twittersettings.php:212 actions/twittersettings.php:407
+#: actions/twittersettings.php:411 actions/twittersettings.php:430
msgid "Twitter account removed."
-msgstr ""
+msgstr "Usunięto użytkownika Twittera."
#: actions/twittersettings.php:225 actions/twittersettings.php:239
#: actions/twittersettings.php:428 actions/twittersettings.php:439
-#: actions/twittersettings.php:453
+#: actions/twittersettings.php:453 actions/twittersettings.php:432
+#: actions/twittersettings.php:443 actions/twittersettings.php:457
+#: actions/twittersettings.php:452 actions/twittersettings.php:463
+#: actions/twittersettings.php:477
msgid "Couldn't save Twitter preferences."
-msgstr ""
+msgstr "Nie można zapisać preferencji Twittera."
#: actions/twittersettings.php:245 actions/twittersettings.php:461
+#: actions/twittersettings.php:465 actions/twittersettings.php:485
msgid "Twitter preferences saved."
-msgstr ""
+msgstr "Zapisano preferencje Twittera."
#: actions/userauthorization.php:84 actions/userauthorization.php:86
msgid "Please check these details to make sure "
-msgstr ""
+msgstr "Sprawdź te szczegóły, aby upewnić się "
#: actions/userauthorization.php:324 actions/userauthorization.php:340
msgid "The subscription has been authorized, but no "
-msgstr ""
+msgstr "Subskrypcja została upoważniona, ale nie "
#: actions/userauthorization.php:334 actions/userauthorization.php:351
msgid "The subscription has been rejected, but no "
-msgstr ""
+msgstr "Subskrypcja została odrzucona, ale nie "
#: classes/Channel.php:113 classes/Channel.php:132 classes/Channel.php:151
+#: lib/channel.php:138 lib/channel.php:158
msgid "Command results"
-msgstr ""
+msgstr "Wyniki polecenia"
-#: classes/Channel.php:148 classes/Channel.php:204
+#: classes/Channel.php:148 classes/Channel.php:204 lib/channel.php:210
msgid "Command complete"
-msgstr ""
+msgstr "Zakończono polecenie"
-#: classes/Channel.php:158 classes/Channel.php:215
+#: classes/Channel.php:158 classes/Channel.php:215 lib/channel.php:221
msgid "Command failed"
-msgstr ""
+msgstr "Polecenie nie powiodło się"
-#: classes/Command.php:39 classes/Command.php:44
+#: classes/Command.php:39 classes/Command.php:44 lib/command.php:44
msgid "Sorry, this command is not yet implemented."
-msgstr ""
+msgstr "Przepraszamy, te polecenie nie zostało jeszcze zaimplementowane."
#: classes/Command.php:96 classes/Command.php:113
#, php-format
msgid "Subscriptions: %1$s\n"
-msgstr ""
+msgstr "Subskrypcje: %1$s\n"
#: classes/Command.php:125 classes/Command.php:242 classes/Command.php:145
-#: classes/Command.php:276
+#: classes/Command.php:276 lib/command.php:145 lib/command.php:276
+#: lib/command.php:138 lib/command.php:269
msgid "User has no last notice"
-msgstr ""
+msgstr "Użytkownik nie posiada ostatniego wpisu"
-#: classes/Command.php:146 classes/Command.php:166
+#: classes/Command.php:146 classes/Command.php:166 lib/command.php:166
+#: lib/command.php:159
msgid "Notice marked as fave."
-msgstr ""
+msgstr "Zaznaczono wpis jako ulubiony."
-#: classes/Command.php:166 classes/Command.php:189
+#: classes/Command.php:166 classes/Command.php:189 lib/command.php:189
+#: lib/command.php:182
#, php-format
msgid "%1$s (%2$s)"
-msgstr ""
+msgstr "%1$s (%2$s)"
-#: classes/Command.php:169 classes/Command.php:192
+#: classes/Command.php:169 classes/Command.php:192 lib/command.php:192
+#: lib/command.php:185
#, php-format
msgid "Fullname: %s"
-msgstr ""
+msgstr "ImiÄ™ i nazwisko: %s"
-#: classes/Command.php:172 classes/Command.php:195
+#: classes/Command.php:172 classes/Command.php:195 lib/command.php:195
+#: lib/command.php:188
#, php-format
msgid "Location: %s"
-msgstr ""
+msgstr "Położenie: %s"
-#: classes/Command.php:175 classes/Command.php:198
+#: classes/Command.php:175 classes/Command.php:198 lib/command.php:198
+#: lib/command.php:191
#, php-format
msgid "Homepage: %s"
-msgstr ""
+msgstr "Strona domowa: %s"
-#: classes/Command.php:178 classes/Command.php:201
+#: classes/Command.php:178 classes/Command.php:201 lib/command.php:201
+#: lib/command.php:194
#, php-format
msgid "About: %s"
-msgstr ""
+msgstr "O mnie: %s"
-#: classes/Command.php:200 classes/Command.php:228
+#: classes/Command.php:200 classes/Command.php:228 lib/command.php:228
+#: lib/command.php:221
#, php-format
msgid "Message too long - maximum is 140 characters, you sent %d"
-msgstr ""
+msgstr "Wiadomość jest za długa - maksymalnie 140 znaków, wysłano %d"
-#: classes/Command.php:214 classes/Command.php:245
+#: classes/Command.php:214 classes/Command.php:245 lib/command.php:245
+#: actions/newmessage.php:182 lib/command.php:238
#, php-format
msgid "Direct message to %s sent"
-msgstr ""
+msgstr "Wysłano bezpośrednią wiadomość do użytkownika %s"
-#: classes/Command.php:216 classes/Command.php:247
+#: classes/Command.php:216 classes/Command.php:247 lib/command.php:247
+#: lib/command.php:240
msgid "Error sending direct message."
-msgstr ""
+msgstr "Błąd podczas wysyłania bezpośredniej wiadomości."
-#: classes/Command.php:263 classes/Command.php:300
+#: classes/Command.php:263 classes/Command.php:300 lib/command.php:300
+#: lib/command.php:293
msgid "Specify the name of the user to subscribe to"
-msgstr ""
+msgstr "Podaj nazwę użytkownika do zasubskrybowania"
-#: classes/Command.php:270 classes/Command.php:307
+#: classes/Command.php:270 classes/Command.php:307 lib/command.php:307
+#: lib/command.php:300
#, php-format
msgid "Subscribed to %s"
-msgstr ""
+msgstr "Zasubskrybowano użytkownika %s"
-#: classes/Command.php:288 classes/Command.php:328
+#: classes/Command.php:288 classes/Command.php:328 lib/command.php:328
+#: lib/command.php:321
msgid "Specify the name of the user to unsubscribe from"
-msgstr ""
+msgstr "Podaj nazwę użytkownika do usunięcia subskrypcji"
-#: classes/Command.php:295 classes/Command.php:335
+#: classes/Command.php:295 classes/Command.php:335 lib/command.php:335
+#: lib/command.php:328
#, php-format
msgid "Unsubscribed from %s"
-msgstr ""
+msgstr "Usunięto subskrypcję użytkownika %s"
#: classes/Command.php:310 classes/Command.php:330 classes/Command.php:353
-#: classes/Command.php:376
+#: classes/Command.php:376 lib/command.php:353 lib/command.php:376
+#: lib/command.php:346 lib/command.php:369
msgid "Command not yet implemented."
-msgstr ""
+msgstr "Nie zaimplementowano polecenia."
-#: classes/Command.php:313 classes/Command.php:356
+#: classes/Command.php:313 classes/Command.php:356 lib/command.php:356
+#: lib/command.php:349
msgid "Notification off."
-msgstr ""
+msgstr "Wyłączono powiadomienia."
-#: classes/Command.php:315 classes/Command.php:358
+#: classes/Command.php:315 classes/Command.php:358 lib/command.php:358
+#: lib/command.php:351
msgid "Can't turn off notification."
-msgstr ""
+msgstr "Nie można wyłączyć powiadomień."
-#: classes/Command.php:333 classes/Command.php:379
+#: classes/Command.php:333 classes/Command.php:379 lib/command.php:379
+#: lib/command.php:372
msgid "Notification on."
-msgstr ""
+msgstr "WÅ‚Ä…czono powiadomienia."
-#: classes/Command.php:335 classes/Command.php:381
+#: classes/Command.php:335 classes/Command.php:381 lib/command.php:381
+#: lib/command.php:374
msgid "Can't turn on notification."
-msgstr ""
+msgstr "Nie można włączyć powiadomień."
#: classes/Command.php:344 classes/Command.php:392
msgid "Commands:\n"
-msgstr ""
+msgstr "Polecenia:\n"
#: classes/Message.php:53 classes/Message.php:56
msgid "Could not insert message."
-msgstr ""
+msgstr "Nie można wprowadzić wiadomości."
#: classes/Message.php:63 classes/Message.php:66
msgid "Could not update message with new URI."
-msgstr ""
+msgstr "Nie można zaktualizować wiadomości za pomocą nowego adresu URL."
#: lib/gallery.php:46
msgid "User without matching profile in system."
-msgstr ""
+msgstr "Użytkownik bez odpowiadającego profilu w systemie."
#: lib/mail.php:147 lib/mail.php:289
#, php-format
@@ -3329,11 +3738,13 @@ msgid ""
"You have a new posting address on %1$s.\n"
"\n"
msgstr ""
+"Posiadasz nowy adres wysyłania na %1$s.\n"
+"\n"
-#: lib/mail.php:249 lib/mail.php:508
+#: lib/mail.php:249 lib/mail.php:508 lib/mail.php:509
#, php-format
msgid "New private message from %s"
-msgstr ""
+msgstr "Nowa prywatna wiadomość od użytkownika %s"
#: lib/mail.php:253 lib/mail.php:512
#, php-format
@@ -3341,88 +3752,108 @@ msgid ""
"%1$s (%2$s) sent you a private message:\n"
"\n"
msgstr ""
+"Użytkownik %1$s (%2$s) wysłał Ci prywatną wiadomość:\n"
+"\n"
-#: lib/mailbox.php:43 lib/mailbox.php:89
+#: lib/mailbox.php:43 lib/mailbox.php:89 lib/mailbox.php:91
msgid "Only the user can read their own mailboxes."
-msgstr ""
+msgstr "Tylko użytkownik może czytać swoje skrzynki pocztowe."
#: lib/openid.php:195 lib/openid.php:203
msgid "This form should automatically submit itself. "
-msgstr ""
+msgstr "Ten formularz powinien automatycznie się wysłać. "
#: lib/personal.php:65 lib/personalgroupnav.php:113
+#: lib/personalgroupnav.php:114
msgid "Favorites"
-msgstr ""
+msgstr "Ulubione"
#: lib/personal.php:66 lib/personalgroupnav.php:114
+#: actions/favoritesrss.php:110 actions/showfavorites.php:77
+#: lib/personalgroupnav.php:115
#, php-format
msgid "%s's favorite notices"
-msgstr ""
+msgstr "Ulubione wpisy użytkownika %s"
#: lib/personal.php:66 lib/personalgroupnav.php:114
+#: lib/personalgroupnav.php:115
msgid "User"
-msgstr ""
+msgstr "Użytkownik"
#: lib/personal.php:75 lib/personalgroupnav.php:123
+#: lib/personalgroupnav.php:124
msgid "Inbox"
-msgstr ""
+msgstr "Odebrane"
#: lib/personal.php:76 lib/personalgroupnav.php:124
+#: lib/personalgroupnav.php:125
msgid "Your incoming messages"
-msgstr ""
+msgstr "Wiadomości przychodzące"
#: lib/personal.php:80 lib/personalgroupnav.php:128
+#: lib/personalgroupnav.php:129
msgid "Outbox"
-msgstr ""
+msgstr "Wysłane"
#: lib/personal.php:81 lib/personalgroupnav.php:129
+#: lib/personalgroupnav.php:130
msgid "Your sent messages"
-msgstr ""
+msgstr "Wysłane wiadomości"
#: lib/settingsaction.php:99 lib/connectsettingsaction.php:110
msgid "Twitter"
-msgstr ""
+msgstr "Twitter"
#: lib/settingsaction.php:100 lib/connectsettingsaction.php:111
msgid "Twitter integration options"
-msgstr ""
+msgstr "Opcje integracji z Twitterem"
#: lib/util.php:1718 lib/messageform.php:139 lib/noticelist.php:422
+#: lib/messageform.php:137 lib/noticelist.php:425 lib/messageform.php:135
+#: lib/noticelist.php:433
msgid "To"
-msgstr ""
+msgstr "Do"
#: scripts/maildaemon.php:45 scripts/maildaemon.php:48
+#: scripts/maildaemon.php:47
msgid "Could not parse message."
-msgstr ""
+msgstr "Nie można przeanalizować wiadomości."
-#: actions/all.php:63 actions/facebookhome.php:162
-#, fuzzy, php-format
+#: actions/all.php:63 actions/facebookhome.php:162 actions/all.php:66
+#: actions/facebookhome.php:161 actions/all.php:48
+#: actions/facebookhome.php:156
+#, php-format
msgid "%s and friends, page %d"
-msgstr "%s i przyjaciele"
+msgstr "Użytkownik %s i przyjaciele, strona %d"
#: actions/avatarsettings.php:76
msgid "You can upload your personal avatar."
-msgstr ""
+msgstr "Można wysłać osobisty awatar."
#: actions/avatarsettings.php:117 actions/avatarsettings.php:191
-#: actions/grouplogo.php:250
-#, fuzzy
+#: actions/grouplogo.php:250 actions/avatarsettings.php:119
+#: actions/avatarsettings.php:194 actions/grouplogo.php:256
msgid "Avatar settings"
-msgstr "Ustawienia"
+msgstr "Ustawienia awatara"
#: actions/avatarsettings.php:124 actions/avatarsettings.php:199
#: actions/grouplogo.php:198 actions/grouplogo.php:258
+#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/grouplogo.php:204 actions/grouplogo.php:264
msgid "Original"
-msgstr ""
+msgstr "Oryginał"
#: actions/avatarsettings.php:139 actions/avatarsettings.php:211
#: actions/grouplogo.php:209 actions/grouplogo.php:270
+#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/grouplogo.php:215 actions/grouplogo.php:276
msgid "Preview"
-msgstr ""
+msgstr "PodglÄ…d"
#: actions/avatarsettings.php:225 actions/grouplogo.php:284
+#: actions/avatarsettings.php:228 actions/grouplogo.php:291
msgid "Crop"
-msgstr ""
+msgstr "Przytnij"
#: actions/avatarsettings.php:248 actions/deletenotice.php:133
#: actions/emailsettings.php:224 actions/grouplogo.php:307
@@ -3434,594 +3865,591 @@ msgstr ""
#: actions/subedit.php:38 actions/twittersettings.php:290
#: actions/userauthorization.php:39
msgid "There was a problem with your session token. "
-msgstr ""
+msgstr "Wystąpił problem z tokenem sesji. "
#: actions/avatarsettings.php:303 actions/grouplogo.php:360
+#: actions/avatarsettings.php:308
msgid "Pick a square area of the image to be your avatar"
-msgstr ""
+msgstr "Wybierz kwadratowy obszar obrazu do awatara"
#: actions/avatarsettings.php:327 actions/grouplogo.php:384
+#: actions/avatarsettings.php:323 actions/grouplogo.php:382
msgid "Lost our file data."
-msgstr ""
+msgstr "Utracono dane pliku."
#: actions/avatarsettings.php:334 actions/grouplogo.php:391
-#: classes/User_group.php:112
-#, fuzzy
+#: classes/User_group.php:112 lib/imagefile.php:112 lib/imagefile.php:113
msgid "Lost our file."
-msgstr "Brak takiego wpisu."
+msgstr "Utracono plik."
#: actions/avatarsettings.php:349 actions/avatarsettings.php:383
#: actions/grouplogo.php:406 actions/grouplogo.php:440
-#: classes/User_group.php:129 classes/User_group.php:161
+#: classes/User_group.php:129 classes/User_group.php:161 lib/imagefile.php:144
+#: lib/imagefile.php:191 lib/imagefile.php:145 lib/imagefile.php:192
msgid "Unknown file type"
-msgstr ""
+msgstr "Nieznany typ pliku"
#: actions/block.php:69 actions/subedit.php:46 actions/unblock.php:70
+#: actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71
msgid "No profile specified."
-msgstr ""
+msgstr "Nie podano profilu."
#: actions/block.php:74 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unblock.php:75
+#: actions/unblock.php:75 actions/groupblock.php:76
+#: actions/groupunblock.php:76 actions/makeadmin.php:76
msgid "No profile with that ID."
-msgstr ""
+msgstr "Brak profilu o tym identyfikatorze."
-#: actions/block.php:111
-#, fuzzy
+#: actions/block.php:111 actions/block.php:134
msgid "Block user"
-msgstr "Brak takiego użytkownika."
+msgstr "Zablokuj użytkownika"
#: actions/block.php:129
msgid "Are you sure you want to block this user? "
-msgstr ""
+msgstr "Na pewno chcesz zablokować tego użytkownika? "
-#: actions/block.php:162
-#, fuzzy
+#: actions/block.php:162 actions/block.php:165
msgid "You have already blocked this user."
-msgstr "Nie musisz ponownie się logować!"
+msgstr "Ten użytkownik został już zablokowany."
-#: actions/block.php:167
+#: actions/block.php:167 actions/block.php:170
msgid "Failed to save block information."
-msgstr ""
+msgstr "Zapisanie informacji o blokadzie nie powiodło się."
#: actions/confirmaddress.php:159
-#, fuzzy, php-format
+#, php-format
msgid "The address \"%s\" has been "
-msgstr "Adres został usunięty."
+msgstr "Adres \"%s\" został "
#: actions/deletenotice.php:73
msgid "You are about to permanently delete a notice. "
-msgstr ""
+msgstr "Za chwilę wpis zostanie trwale usunięty. "
#: actions/disfavor.php:94
msgid "Add to favorites"
-msgstr ""
+msgstr "Dodaj do ulubionych"
-#: actions/editgroup.php:54
+#: actions/editgroup.php:54 actions/editgroup.php:56
#, php-format
msgid "Edit %s group"
-msgstr ""
+msgstr "Edytuj grupÄ™ %s"
#: actions/editgroup.php:66 actions/groupbyid.php:72 actions/grouplogo.php:66
#: actions/joingroup.php:60 actions/newgroup.php:65 actions/showgroup.php:100
+#: actions/grouplogo.php:70 actions/grouprss.php:80 actions/editgroup.php:68
+#: actions/groupdesignsettings.php:68 actions/showgroup.php:105
msgid "Inboxes must be enabled for groups to work"
-msgstr ""
+msgstr "Skrzynki odbiorcze grup muszą być włączone, aby działały"
#: actions/editgroup.php:71 actions/grouplogo.php:71 actions/newgroup.php:70
+#: actions/grouplogo.php:75 actions/editgroup.php:73
msgid "You must be logged in to create a group."
-msgstr ""
+msgstr "Musisz być zalogowany, aby utworzyć grupę."
#: actions/editgroup.php:87 actions/grouplogo.php:87
#: actions/groupmembers.php:76 actions/joingroup.php:81
-#: actions/showgroup.php:121
-#, fuzzy
+#: actions/showgroup.php:121 actions/grouplogo.php:91 actions/grouprss.php:96
+#: actions/blockedfromgroup.php:73 actions/editgroup.php:89
+#: actions/groupdesignsettings.php:89 actions/showgroup.php:126
msgid "No nickname"
-msgstr "Brak pseudonimu."
+msgstr "Brak pseudonimu"
#: actions/editgroup.php:99 actions/groupbyid.php:88 actions/grouplogo.php:100
#: actions/groupmembers.php:83 actions/joingroup.php:88
-#: actions/showgroup.php:128
-#, fuzzy
+#: actions/showgroup.php:128 actions/grouplogo.php:104
+#: actions/grouprss.php:103 actions/blockedfromgroup.php:80
+#: actions/editgroup.php:101 actions/groupdesignsettings.php:102
+#: actions/showgroup.php:133
msgid "No such group"
-msgstr "Brak takiego wpisu."
+msgstr "Nie ma takiej grupy"
#: actions/editgroup.php:106 actions/editgroup.php:165
-#: actions/grouplogo.php:107
+#: actions/grouplogo.php:107 actions/grouplogo.php:111
+#: actions/editgroup.php:108 actions/editgroup.php:167
+#: actions/groupdesignsettings.php:109
msgid "You must be an admin to edit the group"
-msgstr ""
+msgstr "Musisz być administratorem, aby zmodyfikować grupę"
-#: actions/editgroup.php:157
+#: actions/editgroup.php:157 actions/editgroup.php:159
msgid "Use this form to edit the group."
-msgstr ""
+msgstr "Użyj tego formularza, aby zmodyfikować grupę."
#: actions/editgroup.php:179 actions/newgroup.php:130 actions/register.php:156
-#, fuzzy
msgid "Nickname must have only lowercase letters "
-msgstr "Pseudonim musi zawierać tylko małe litery i cyfry, bez znaków spacji."
+msgstr "Pseudonim może zawierać tylko małe litery "
#: actions/editgroup.php:198 actions/newgroup.php:149
-#, fuzzy
+#: actions/editgroup.php:200 actions/newgroup.php:150
msgid "description is too long (max 140 chars)."
-msgstr "Wpis \"O mnie\" jest za długi (maks. 140 znaków)"
+msgstr "opis jest za długi (maksymalnie 140 znaków)."
-#: actions/editgroup.php:218
-#, fuzzy
+#: actions/editgroup.php:218 actions/editgroup.php:253
msgid "Could not update group."
-msgstr "Nie można zaktualizować użytkownika."
+msgstr "Nie można zaktualizować grupy."
-#: actions/editgroup.php:226
-#, fuzzy
+#: actions/editgroup.php:226 actions/editgroup.php:269
msgid "Options saved."
-msgstr "Ustawienia zostały zapisane."
+msgstr "Zapisano opcje."
#: actions/emailsettings.php:107 actions/imsettings.php:108
-#, fuzzy, php-format
+#, php-format
msgid "Awaiting confirmation on this address. "
-msgstr "BÅ‚Ä…d kodu potwierdzajÄ…cego."
+msgstr "Oczekiwanie na potwierdzenie tego adresu. "
#: actions/emailsettings.php:139 actions/smssettings.php:150
msgid "Make a new email address for posting to; "
-msgstr ""
+msgstr "Utwórz nowy adres e-mail do wysyłania; "
#: actions/emailsettings.php:157
msgid "Send me email when someone "
-msgstr ""
+msgstr "Wyślij mi wiadomość e-mail, kiedy ktoś "
-#: actions/emailsettings.php:168
+#: actions/emailsettings.php:168 actions/emailsettings.php:173
msgid "Allow friends to nudge me and send me an email."
-msgstr ""
+msgstr "Pozwól przyjaciołom na szturchanie mnie i wyślij mi wiadomość e-mail."
#: actions/emailsettings.php:321
-#, fuzzy
msgid "That email address already belongs "
-msgstr "Taki e-mail już istnieje"
+msgstr "Ten adres e-mail już należy "
#: actions/emailsettings.php:343
-#, fuzzy
msgid "A confirmation code was sent to the email address you added. "
-msgstr ""
-"Na Twój adres komunikatora został wysłany kod potwierdzający. Musisz "
-"zaakceptować otrzymywanie wiadomości od %s."
+msgstr "Kod potwierdzający został wysłany na dodany adres e-mail. "
-#: actions/facebookhome.php:110
+#: actions/facebookhome.php:110 actions/facebookhome.php:109
msgid "Server error - couldn't get user!"
-msgstr ""
+msgstr "Błąd serwera - nie można uzyskać użytkownika!"
#: actions/facebookhome.php:196
#, php-format
msgid "If you would like the %s app to automatically update "
-msgstr ""
+msgstr "Jeśli chcesz, aby aplikacja %s automatycznie aktualizowała "
#: actions/facebookhome.php:213 actions/facebooksettings.php:137
#, php-format
msgid "Allow %s to update my Facebook status"
-msgstr ""
+msgstr "Pozwól %s na aktualizowanie mojego statusu na Facebook"
-#: actions/facebookhome.php:218
+#: actions/facebookhome.php:218 actions/facebookhome.php:223
+#: actions/facebookhome.php:217
msgid "Skip"
-msgstr ""
+msgstr "Pomiń"
-#: actions/facebookhome.php:235
-#, fuzzy
+#: actions/facebookhome.php:235 lib/facebookaction.php:479
+#: lib/facebookaction.php:471
msgid "No notice content!"
-msgstr "Brak zawartości!"
+msgstr "Brak zawartości wpisu!"
#: actions/facebookhome.php:295 lib/action.php:870 lib/facebookaction.php:399
+#: actions/facebookhome.php:253 lib/action.php:973 lib/facebookaction.php:433
+#: actions/facebookhome.php:247 lib/action.php:1037 lib/facebookaction.php:435
msgid "Pagination"
-msgstr ""
+msgstr "Paginacja"
#: actions/facebookhome.php:304 lib/action.php:879 lib/facebookaction.php:408
-#, fuzzy
+#: actions/facebookhome.php:262 lib/action.php:982 lib/facebookaction.php:442
+#: actions/facebookhome.php:256 lib/action.php:1046 lib/facebookaction.php:444
msgid "After"
-msgstr "« następne"
+msgstr "Następne"
#: actions/facebookhome.php:312 lib/action.php:887 lib/facebookaction.php:416
-#, fuzzy
+#: actions/facebookhome.php:270 lib/action.php:990 lib/facebookaction.php:450
+#: actions/facebookhome.php:264 lib/action.php:1054 lib/facebookaction.php:452
msgid "Before"
-msgstr "Wcześniej »"
+msgstr "Wcześniej"
-#: actions/facebookinvite.php:70
+#: actions/facebookinvite.php:70 actions/facebookinvite.php:72
#, php-format
msgid "Thanks for inviting your friends to use %s"
-msgstr ""
+msgstr "Dziękujemy za zaproszenie przyjaciół do używania %s"
-#: actions/facebookinvite.php:72
+#: actions/facebookinvite.php:72 actions/facebookinvite.php:74
msgid "Invitations have been sent to the following users:"
-msgstr ""
+msgstr "Zaproszenia zostały wysłane do następujących użytkowników:"
-#: actions/facebookinvite.php:96
+#: actions/facebookinvite.php:96 actions/facebookinvite.php:102
+#: actions/facebookinvite.php:94
#, php-format
msgid "You have been invited to %s"
-msgstr ""
+msgstr "Zostałeś zaproszony do %s"
-#: actions/facebookinvite.php:105
-#, fuzzy, php-format
+#: actions/facebookinvite.php:105 actions/facebookinvite.php:111
+#: actions/facebookinvite.php:103
+#, php-format
msgid "Invite your friends to use %s"
-msgstr "Kanał dla znajomych użytkownika %s"
+msgstr "Zaproś przyjaciół do używania %s"
-#: actions/facebookinvite.php:113
+#: actions/facebookinvite.php:113 actions/facebookinvite.php:126
+#: actions/facebookinvite.php:124
#, php-format
msgid "Friends already using %s:"
-msgstr ""
+msgstr "Przyjaciele już używający %s:"
-#: actions/facebookinvite.php:130
+#: actions/facebookinvite.php:130 actions/facebookinvite.php:143
+#: actions/facebookinvite.php:142
#, php-format
msgid "Send invitations"
-msgstr ""
+msgstr "Wyślij zaproszenia"
#: actions/facebookremove.php:56
-#, fuzzy
msgid "Couldn't remove Facebook user."
-msgstr "Nie można zaktualizować użytkownika."
+msgstr "Nie można usunąć użytkownika Facebook."
#: actions/facebooksettings.php:65
msgid "There was a problem saving your sync preferences!"
-msgstr ""
+msgstr "Wystąpił problem podczas zapisywania preferencji synchronizacji!"
#: actions/facebooksettings.php:67
-#, fuzzy
msgid "Sync preferences saved."
-msgstr "Preferencje zostały zapisane."
+msgstr "Zapisano preferencje synchronizacji."
#: actions/facebooksettings.php:90
msgid "Automatically update my Facebook status with my notices."
-msgstr ""
+msgstr "Automatycznie aktualizuj status na Facebook moimi wpisami."
#: actions/facebooksettings.php:97
msgid "Send \"@\" replies to Facebook."
-msgstr ""
+msgstr "Wyślij odpowiedzi \"@\" do Facebook."
#: actions/facebooksettings.php:106
-#, fuzzy
msgid "Prefix"
-msgstr "Profil"
+msgstr "Przedrostek"
#: actions/facebooksettings.php:108
msgid "A string to prefix notices with."
-msgstr ""
+msgstr "Tekst do poprzedzenia wpisów."
#: actions/facebooksettings.php:124
#, php-format
msgid "If you would like %s to automatically update "
-msgstr ""
+msgstr "Jeśli chcesz, aby %s automatycznie aktualizowało "
#: actions/facebooksettings.php:147
-#, fuzzy
msgid "Sync preferences"
-msgstr "Preferencje"
+msgstr "Zsynchronizuj preferencje"
-#: actions/favor.php:94 lib/disfavorform.php:140
+#: actions/favor.php:94 lib/disfavorform.php:140 actions/favor.php:92
msgid "Disfavor favorite"
-msgstr ""
+msgstr "Usuń wpis z ulubionych"
#: actions/favorited.php:65 lib/popularnoticesection.php:76
-#: lib/publicgroupnav.php:91
-#, fuzzy
+#: lib/publicgroupnav.php:91 lib/popularnoticesection.php:82
+#: lib/publicgroupnav.php:93 lib/popularnoticesection.php:91
msgid "Popular notices"
-msgstr "Brak takiego wpisu."
+msgstr "Popularne wpisy"
#: actions/favorited.php:67
-#, fuzzy, php-format
+#, php-format
msgid "Popular notices, page %d"
-msgstr "Popularne ogłoszenia"
+msgstr "Popularne wpisy, strona %d"
#: actions/favorited.php:79
msgid "The most popular notices on the site right now."
-msgstr "Najbardziej popularne ogłoszeńa na stronie w tej chwili."
+msgstr "Najpopularniejsze wpisy na stronie w te chwili."
#: actions/featured.php:69 lib/featureduserssection.php:82
-#: lib/publicgroupnav.php:87
+#: lib/publicgroupnav.php:87 lib/publicgroupnav.php:89
+#: lib/featureduserssection.php:87
msgid "Featured users"
-msgstr ""
+msgstr "Znani użytkownicy"
#: actions/featured.php:71
#, php-format
msgid "Featured users, page %d"
-msgstr ""
+msgstr "Znani użytkownicy, strona %d"
#: actions/featured.php:99
#, php-format
msgid "A selection of some of the great users on %s"
-msgstr ""
+msgstr "Wybór znanych użytkowników na %s"
#: actions/finishremotesubscribe.php:188
msgid "That user has blocked you from subscribing."
-msgstr ""
+msgstr "Ten użytkownik zablokował Cię z subskrypcji."
#: actions/groupbyid.php:79
msgid "No ID"
-msgstr ""
+msgstr "Brak identyfikatora"
#: actions/grouplogo.php:138 actions/grouplogo.php:191
+#: actions/grouplogo.php:144 actions/grouplogo.php:197
msgid "Group logo"
-msgstr ""
+msgstr "Logo grupy"
#: actions/grouplogo.php:149
msgid "You can upload a logo image for your group."
-msgstr ""
+msgstr "Można wysłać obraz logo dla grupy."
-#: actions/grouplogo.php:448
-#, fuzzy
+#: actions/grouplogo.php:448 actions/grouplogo.php:401
msgid "Logo updated."
-msgstr "Awatar załadowany."
+msgstr "Zaktualizowano logo."
-#: actions/grouplogo.php:450
-#, fuzzy
+#: actions/grouplogo.php:450 actions/grouplogo.php:403
msgid "Failed updating logo."
-msgstr "Uaktualnianie awatara nie powiodło się."
+msgstr "Zaktualizowanie logo nie powiodło się."
#: actions/groupmembers.php:93 lib/groupnav.php:91
#, php-format
msgid "%s group members"
-msgstr ""
+msgstr "Członkowie grupy %s"
#: actions/groupmembers.php:96
#, php-format
msgid "%s group members, page %d"
-msgstr ""
+msgstr "Członkowie grupy %s, strona %d"
#: actions/groupmembers.php:111
msgid "A list of the users in this group."
-msgstr ""
+msgstr "Lista użytkowników znajdujących się w tej grupie."
#: actions/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
-#: lib/subgroupnav.php:96
+#: lib/subgroupnav.php:96 lib/publicgroupnav.php:81 lib/profileaction.php:220
+#: lib/subgroupnav.php:98
msgid "Groups"
-msgstr ""
+msgstr "Grupy"
#: actions/groups.php:64
#, php-format
msgid "Groups, page %d"
-msgstr ""
+msgstr "Grupy, strona %d"
#: actions/groups.php:90
#, php-format
msgid "%%%%site.name%%%% groups let you find and talk with "
-msgstr ""
+msgstr "Grupy %%%%site.name%%%% pozwalajÄ… na szukanie i rozmawianie z "
#: actions/groups.php:106 actions/usergroups.php:124 lib/groupeditform.php:123
-#, fuzzy
+#: actions/usergroups.php:125 actions/groups.php:107 lib/groupeditform.php:122
msgid "Create a new group"
-msgstr "Załóż nowe konto"
+msgstr "Utwórz nową grupę"
#: actions/groupsearch.php:57
-#, fuzzy, php-format
+#, php-format
msgid ""
"Search for groups on %%site.name%% by their name, location, or description. "
-msgstr ""
-"Szukaj ludzi w serwisie %%site.name%%. Kryteriami mogą być imiona i "
-"nazwiska, miejscowości lub zainteresowania. Użyj spacji aby oddzielić "
-"elementy wyszukiwania. Słowa muszą mieć minimum 3 znaki."
+msgstr "Znajdź grupy na %%site.name%% według ich nazw, położenia lub opisu. "
-#: actions/groupsearch.php:63
-#, fuzzy
+#: actions/groupsearch.php:63 actions/groupsearch.php:58
msgid "Group search"
-msgstr "Szukaj ludzi"
+msgstr "Znajdź grupę"
#: actions/imsettings.php:70
msgid "You can send and receive notices through "
-msgstr ""
+msgstr "Można wysyłać i otrzymywać wpisy przez "
#: actions/imsettings.php:120
#, php-format
msgid "Jabber or GTalk address, "
-msgstr ""
+msgstr "adres Jabbera lub GTalk, "
#: actions/imsettings.php:147
-#, fuzzy
msgid "Send me replies through Jabber/GTalk "
-msgstr "Wysyłaj mi wpisy przez Jabbera/GTalka"
+msgstr "Wyślij mi odpowiedzi przez Jabbera/GTalk "
#: actions/imsettings.php:321
-#, fuzzy, php-format
+#, php-format
msgid "A confirmation code was sent "
-msgstr "Brak kodu potwierdzajÄ…cego."
+msgstr "Kod potwierdzający został wysłany "
#: actions/joingroup.php:65
msgid "You must be logged in to join a group."
-msgstr ""
+msgstr "Musisz być zalogowany, aby dołączyć do grupy."
#: actions/joingroup.php:95
-#, fuzzy
msgid "You are already a member of that group"
-msgstr "Nie musisz ponownie się logować!"
+msgstr "Jesteś już członkiem tej grupy"
-#: actions/joingroup.php:128
-#, fuzzy, php-format
+#: actions/joingroup.php:128 actions/joingroup.php:133
+#, php-format
msgid "Could not join user %s to group %s"
-msgstr "Nie można przekierować do serwera: %s"
+msgstr "Nie można dołączyć użytkownika %s do grupy %s"
-#: actions/joingroup.php:135
+#: actions/joingroup.php:135 actions/joingroup.php:140
#, php-format
msgid "%s joined group %s"
-msgstr ""
+msgstr "Użytkownik %s dołączył do grupy %s"
#: actions/leavegroup.php:60
msgid "Inboxes must be enabled for groups to work."
-msgstr ""
+msgstr "Skrzynki odbiorcze dla grup muszą być włączone, aby działały."
#: actions/leavegroup.php:65
msgid "You must be logged in to leave a group."
-msgstr ""
+msgstr "Musisz być zalogowany, aby opuścić grupę."
-#: actions/leavegroup.php:88
-#, fuzzy
+#: actions/leavegroup.php:88 actions/groupblock.php:86
+#: actions/groupunblock.php:86 actions/makeadmin.php:86
msgid "No such group."
-msgstr "Brak takiego wpisu."
+msgstr "Nie ma takiej grupy."
#: actions/leavegroup.php:95
-#, fuzzy
msgid "You are not a member of that group."
-msgstr "Ten profil nie był wysłany przez Ciebie"
+msgstr "Nie jesteś członkiem tej grupy."
#: actions/leavegroup.php:100
msgid "You may not leave a group while you are its administrator."
-msgstr ""
+msgstr "Nie możesz opuścić grupy, kiedy jesteś jej administratorem."
-#: actions/leavegroup.php:130
+#: actions/leavegroup.php:130 actions/leavegroup.php:124
msgid "Could not find membership record."
-msgstr ""
+msgstr "Nie można znaleźć wpisu członkostwa."
-#: actions/leavegroup.php:138
-#, fuzzy, php-format
+#: actions/leavegroup.php:138 actions/leavegroup.php:132
+#, php-format
msgid "Could not remove user %s to group %s"
-msgstr "Nie można utworzyć formularza OpenID: %s"
+msgstr "Nie można usunąć użytkownika %s z grupy %s"
-#: actions/leavegroup.php:145
+#: actions/leavegroup.php:145 actions/leavegroup.php:139
#, php-format
msgid "%s left group %s"
-msgstr ""
+msgstr "Użytkownik %s opuścił grupę %s"
-#: actions/login.php:225 lib/facebookaction.php:304
+#: actions/login.php:225 lib/facebookaction.php:304 actions/login.php:208
msgid "Login to site"
-msgstr ""
+msgstr "Zaloguj siÄ™ na stronie"
#: actions/microsummary.php:69
msgid "No current status"
-msgstr ""
+msgstr "Brak obecnego statusu"
#: actions/newgroup.php:53
msgid "New group"
-msgstr ""
+msgstr "Nowa grupa"
#: actions/newgroup.php:115
msgid "Use this form to create a new group."
-msgstr ""
+msgstr "Użyj tego formularza, aby utworzyć nową grupę."
-#: actions/newgroup.php:177
-#, fuzzy
+#: actions/newgroup.php:177 actions/newgroup.php:209
msgid "Could not create group."
-msgstr "Nie można zapisać informacji o awatarze"
+msgstr "Nie można utworzyć grupy."
-#: actions/newgroup.php:191
-#, fuzzy
+#: actions/newgroup.php:191 actions/newgroup.php:229
msgid "Could not set group membership."
-msgstr "Nie można obserwować."
+msgstr "Nie można ustawić członkostwa w grupie."
#: actions/newmessage.php:119 actions/newnotice.php:132
-#, fuzzy
msgid "That's too long. "
-msgstr "Ten plik jest za duży."
+msgstr "Wiadomość jest za długa. "
#: actions/newmessage.php:134
msgid "Don't send a message to yourself; "
-msgstr ""
+msgstr "Nie wysyłaj wiadomości do siebie; "
-#: actions/newnotice.php:166
-#, fuzzy
+#: actions/newnotice.php:166 actions/newnotice.php:174
+#: actions/newnotice.php:272
msgid "Notice posted"
-msgstr "Wpisy"
+msgstr "Wysłano wpis"
-#: actions/newnotice.php:200 classes/Channel.php:163
+#: actions/newnotice.php:200 classes/Channel.php:163 actions/newnotice.php:208
+#: lib/channel.php:170 actions/newmessage.php:207 actions/newnotice.php:387
msgid "Ajax Error"
-msgstr ""
+msgstr "BÅ‚Ä…d AJAX"
#: actions/nudge.php:85
msgid ""
"This user doesn't allow nudges or hasn't confirmed or set his email yet."
msgstr ""
+"Ten użytkownik nie pozwala na szturchnięcia lub nie potwierdził lub nie "
+"ustawił jeszcze swojego adresu e-mail."
#: actions/nudge.php:94
msgid "Nudge sent"
-msgstr ""
+msgstr "Wysłano szturchnięcie"
#: actions/nudge.php:97
msgid "Nudge sent!"
-msgstr ""
+msgstr "Wysłano szturchnięcie!"
-#: actions/openidlogin.php:97
-#, fuzzy
+#: actions/openidlogin.php:97 actions/openidlogin.php:106
msgid "OpenID login"
-msgstr "Użytkownik OpenID"
+msgstr "Login OpenID"
#: actions/openidsettings.php:128
-#, fuzzy
msgid "Removing your only OpenID "
-msgstr "Usuń konto OpenID"
+msgstr "Usuwanie jedynego identyfikatora OpenID "
#: actions/othersettings.php:60
-#, fuzzy
msgid "Other Settings"
-msgstr "Ustawienia"
+msgstr "Inne ustawienia"
#: actions/othersettings.php:71
msgid "Manage various other options."
-msgstr ""
+msgstr "Zarządzaj różnymi innymi opcjami."
#: actions/othersettings.php:93
msgid "URL Auto-shortening"
-msgstr ""
+msgstr "Automatyczne skracanie adresów URL"
#: actions/othersettings.php:112
-#, fuzzy
msgid "Service"
-msgstr "Szukaj"
+msgstr "Usługa"
-#: actions/othersettings.php:113
+#: actions/othersettings.php:113 actions/othersettings.php:111
msgid "Automatic shortening service to use."
-msgstr ""
+msgstr "Używana automatyczna usługa skracania."
-#: actions/othersettings.php:144
-#, fuzzy
+#: actions/othersettings.php:144 actions/othersettings.php:146
msgid "URL shortening service is too long (max 50 chars)."
-msgstr "Lokalizacja jest za długa (max. 255 znaków)."
+msgstr "Adres URL usługi skracania jest za długi (maksymalnie 50 znaków)."
#: actions/passwordsettings.php:69
-#, fuzzy
msgid "Change your password."
-msgstr "Zmień hasło"
+msgstr "Zmień hasło."
-#: actions/passwordsettings.php:89
-#, fuzzy
+#: actions/passwordsettings.php:89 actions/recoverpassword.php:228
msgid "Password change"
-msgstr "Hasło zostało zapisane."
+msgstr "Zmiana hasła"
-#: actions/peopletag.php:35
-#, fuzzy, php-format
+#: actions/peopletag.php:35 actions/peopletag.php:70
+#, php-format
msgid "Not a valid people tag: %s"
-msgstr "Niewłaściwy adres e-mailowy."
+msgstr "Nieprawidłowy znacznik osób: %s"
-#: actions/peopletag.php:47
+#: actions/peopletag.php:47 actions/peopletag.php:144
#, php-format
msgid "Users self-tagged with %s - page %d"
-msgstr ""
+msgstr "Użytkownicy używający znacznika %s - strona %d"
#: actions/peopletag.php:91
#, php-format
msgid "These are users who have tagged themselves \"%s\" "
-msgstr ""
+msgstr "To są użytkownicy którzy nadali sobie znacznik \"%s\" "
#: actions/profilesettings.php:91
-#, fuzzy
msgid "Profile information"
-msgstr "Nieznany profil"
+msgstr "Informacje o profilu"
-#: actions/profilesettings.php:124
+#: actions/profilesettings.php:124 actions/profilesettings.php:125
msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
+"Znaczniki dla siebie (litery, liczby, -, . i _), oddzielone przecinkami lub "
+"spacjami"
#: actions/profilesettings.php:144
msgid "Automatically subscribe to whoever "
-msgstr ""
+msgstr "Automatycznie zasubskrybuj do każdego "
#: actions/profilesettings.php:229 actions/tagother.php:176
-#, fuzzy, php-format
+#: actions/tagother.php:178 actions/profilesettings.php:230
+#, php-format
msgid "Invalid tag: \"%s\""
-msgstr "Błędna strona domowa '%s'"
+msgstr "Nieprawidłowy znacznik: \"%s\""
-#: actions/profilesettings.php:311
-#, fuzzy
+#: actions/profilesettings.php:311 actions/profilesettings.php:310
msgid "Couldn't save tags."
-msgstr "Nie można zapisać profilu."
+msgstr "Nie można zapisać znaczników."
-#: actions/public.php:107
-#, fuzzy, php-format
+#: actions/public.php:107 actions/public.php:110 actions/public.php:118
+#, php-format
msgid "Public timeline, page %d"
-msgstr "Publiczna oÅ› czasu"
+msgstr "Publiczna oÅ› czasu, strona %d"
-#: actions/public.php:173
+#: actions/public.php:173 actions/public.php:184 actions/public.php:210
msgid "Could not retrieve public stream."
-msgstr ""
+msgstr "Nie można pobrać publicznego strumienia."
#: actions/public.php:220
#, php-format
@@ -4029,139 +4457,143 @@ msgid ""
"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
"blogging) service "
msgstr ""
+"To jest %%site.name%%, usługa [mikroblogowania](http://pl.wikipedia.org/wiki/"
+"Mikroblog) "
#: actions/publictagcloud.php:57
-#, fuzzy
msgid "Public tag cloud"
-msgstr "Publiczny Kanał Strumieni"
+msgstr "Publiczna chmura znaczników"
#: actions/publictagcloud.php:63
#, php-format
msgid "These are most popular recent tags on %s "
-msgstr ""
+msgstr "To sÄ… najpopularniejsze ostatnie znaczniki na %s "
-#: actions/publictagcloud.php:119
+#: actions/publictagcloud.php:119 actions/publictagcloud.php:135
msgid "Tag cloud"
-msgstr ""
+msgstr "Chmura znaczników"
-#: actions/register.php:139 actions/register.php:349
+#: actions/register.php:139 actions/register.php:349 actions/register.php:79
+#: actions/register.php:177 actions/register.php:394
msgid "Sorry, only invited people can register."
-msgstr ""
+msgstr "Przepraszamy, tylko zaproszone osoby mogą się rejestrować."
#: actions/register.php:149
-#, fuzzy
msgid "You can't register if you don't "
-msgstr ""
-"Nie możesz się zarejestrować, jeśli nie zgadzasz się z warunkami licencji."
+msgstr "Nie możesz się zarejestrować, jeśli nie "
#: actions/register.php:286
msgid "With this form you can create "
-msgstr ""
+msgstr "Za pomocą tego formularza można utworzyć "
#: actions/register.php:368
-#, fuzzy
msgid "1-64 lowercase letters or numbers, "
-msgstr "Max. 64 znaki alfanumeryczne, bez spacji i znaków przestankowych"
+msgstr "1-64 małe litery lub liczby, "
#: actions/register.php:382 actions/register.php:386
-#, fuzzy
msgid "Used only for updates, announcements, "
-msgstr "Używane tylko do aktualizacji, ogłoszeń i przywracania hasła"
+msgstr "Używane tylko do aktualizacji, ogłoszeń, "
#: actions/register.php:398
-#, fuzzy
msgid "URL of your homepage, blog, "
-msgstr "URL Twojej strony domowej, bloga, lub profilu na innej stronie"
+msgstr "Adres URL strony domowej, bloga, "
#: actions/register.php:404
-#, fuzzy
msgid "Describe yourself and your "
-msgstr "Opisz siÄ™ w 140 znakach"
+msgstr "Opisz siÄ™ i swoje "
#: actions/register.php:410
-#, fuzzy
msgid "Where you are, like \"City, "
-msgstr "Gdzie jesteÅ›? (np. \"miasto, region, kraj\")"
+msgstr "Gdzie jesteÅ›, np. \"miasto, "
#: actions/register.php:432
-#, fuzzy
msgid " except this private data: password, "
-msgstr ""
-"z wyłączeniem tych prywatnych danych: e-maila, identyfikatora IM, numeru "
-"telefonu."
+msgstr " poza tymi prywatnymi danymi: hasło, "
#: actions/register.php:471
#, php-format
msgid "Congratulations, %s! And welcome to %%%%site.name%%%%. "
-msgstr ""
+msgstr "Gratulacje, %s! Witaj na %%%%site.name%%%%. "
#: actions/register.php:495
msgid "(You should receive a message by email "
-msgstr ""
+msgstr "(Powinieneś otrzymać wiadomość przez e-mail "
#: actions/remotesubscribe.php:166 actions/remotesubscribe.php:171
msgid "That's a local profile! Login to subscribe."
-msgstr ""
+msgstr "To jest profil lokalny! Zaloguj się, aby zasubskrybować."
-#: actions/replies.php:118
-#, fuzzy, php-format
+#: actions/replies.php:118 actions/replies.php:120 actions/replies.php:119
+#, php-format
msgid "Replies to %s, page %d"
-msgstr "Odpowiedzi na %s"
+msgstr "Odpowiedzi na %s, strona %d"
#: actions/showfavorites.php:79
#, php-format
msgid "%s favorite notices, page %d"
-msgstr ""
+msgstr "Ulubione wpisy użytkownika %s, strona %d"
-#: actions/showgroup.php:77 lib/groupnav.php:85
+#: actions/showgroup.php:77 lib/groupnav.php:85 actions/showgroup.php:82
#, php-format
msgid "%s group"
-msgstr ""
+msgstr "Grupa %s"
-#: actions/showgroup.php:79
+#: actions/showgroup.php:79 actions/showgroup.php:84
#, php-format
msgid "%s group, page %d"
-msgstr ""
+msgstr "Grupa %s, strona %d"
-#: actions/showgroup.php:206
-#, fuzzy
+#: actions/showgroup.php:206 actions/showgroup.php:208
+#: actions/showgroup.php:213
msgid "Group profile"
-msgstr "Brak takiego wpisu."
+msgstr "Profil grupy"
#: actions/showgroup.php:251 actions/showstream.php:278
#: actions/tagother.php:119 lib/grouplist.php:134 lib/profilelist.php:133
+#: actions/showgroup.php:253 actions/showstream.php:271
+#: actions/tagother.php:118 lib/profilelist.php:131 actions/showgroup.php:258
+#: actions/showstream.php:236 actions/userauthorization.php:137
+#: lib/profilelist.php:197
msgid "URL"
-msgstr ""
+msgstr "Adres URL"
#: actions/showgroup.php:262 actions/showstream.php:289
#: actions/tagother.php:129 lib/grouplist.php:145 lib/profilelist.php:144
-#, fuzzy
+#: actions/showgroup.php:264 actions/showstream.php:282
+#: actions/tagother.php:128 lib/profilelist.php:142 actions/showgroup.php:269
+#: actions/showstream.php:247 actions/userauthorization.php:149
+#: lib/profilelist.php:212
msgid "Note"
-msgstr "Wpisy"
+msgstr "Wpis"
-#: actions/showgroup.php:270
+#: actions/showgroup.php:270 actions/showgroup.php:272
+#: actions/showgroup.php:288
msgid "Group actions"
-msgstr ""
+msgstr "Działania grupy"
-#: actions/showgroup.php:323
-#, fuzzy, php-format
+#: actions/showgroup.php:323 actions/showgroup.php:304
+#, php-format
msgid "Notice feed for %s group"
-msgstr "Kanał wpisów dla %s"
+msgstr "Kanał wpisów dla grupy %s"
-#: actions/showgroup.php:357 lib/groupnav.php:90
-#, fuzzy
+#: actions/showgroup.php:357 lib/groupnav.php:90 actions/showgroup.php:339
+#: actions/showgroup.php:384 actions/showgroup.php:373
+#: actions/showgroup.php:430
msgid "Members"
-msgstr "W serwisie od"
+msgstr "Członkowie"
#: actions/showgroup.php:363 actions/showstream.php:413
#: actions/showstream.php:442 actions/showstream.php:524 lib/section.php:95
-#: lib/tagcloudsection.php:71
+#: lib/tagcloudsection.php:71 actions/showgroup.php:344
+#: actions/showgroup.php:378 lib/profileaction.php:117
+#: lib/profileaction.php:148 lib/profileaction.php:226
msgid "(None)"
-msgstr ""
+msgstr "(Brak)"
-#: actions/showgroup.php:370
+#: actions/showgroup.php:370 actions/showgroup.php:350
+#: actions/showgroup.php:384
msgid "All members"
-msgstr ""
+msgstr "Wszyscy członkowie"
#: actions/showgroup.php:378
#, php-format
@@ -4169,50 +4601,52 @@ msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
"wikipedia.org/wiki/Micro-blogging) service "
msgstr ""
+"**%s** jest grupą użytkowników na %%%%site.name%%%%, usłudze "
+"[mikroblogowania](http://pl.wikipedia.org/wiki/Mikroblog) "
#: actions/showmessage.php:98
msgid "Only the sender and recipient "
-msgstr ""
+msgstr "Tylko nadawca i odbiorca "
-#: actions/showstream.php:73
+#: actions/showstream.php:73 actions/showstream.php:78
#, php-format
msgid "%s, page %d"
-msgstr ""
+msgstr "%s, strona %d"
#: actions/showstream.php:143
-#, fuzzy
msgid "'s profile"
-msgstr "Profil"
+msgstr " - profil"
#: actions/showstream.php:236 actions/tagother.php:77
-#, fuzzy
+#: actions/showstream.php:220 actions/showstream.php:185
msgid "User profile"
-msgstr "Użytkownik nie ma profilu."
+msgstr "Profil użytkownika"
#: actions/showstream.php:240 actions/tagother.php:81
+#: actions/showstream.php:224 actions/showstream.php:189
msgid "Photo"
-msgstr ""
+msgstr "Zdjęcie"
-#: actions/showstream.php:317
+#: actions/showstream.php:317 actions/showstream.php:309
+#: actions/showstream.php:274
msgid "User actions"
-msgstr ""
+msgstr "Działania użytkownika"
-#: actions/showstream.php:342
+#: actions/showstream.php:342 actions/showstream.php:307
msgid "Send a direct message to this user"
-msgstr ""
+msgstr "Wyślij bezpośrednią wiadomość do tego użytkownika"
-#: actions/showstream.php:343
+#: actions/showstream.php:343 actions/showstream.php:308
msgid "Message"
-msgstr ""
+msgstr "Wiadomość"
-#: actions/showstream.php:451
-#, fuzzy
+#: actions/showstream.php:451 lib/profileaction.php:157
msgid "All subscribers"
-msgstr "Subskrybenci"
+msgstr "Wszyscy subskrybenci"
-#: actions/showstream.php:533
+#: actions/showstream.php:533 lib/profileaction.php:235
msgid "All groups"
-msgstr ""
+msgstr "Wszystkie grupy"
#: actions/showstream.php:542
#, php-format
@@ -4220,442 +4654,422 @@ msgid ""
"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
"wikipedia.org/wiki/Micro-blogging) service "
msgstr ""
+"**%s** posiada konto na %%%%site.name%%%%, usłudze [mikroblogowania](http://"
+"pl.wikipedia.org/wiki/Mikroblog) "
#: actions/smssettings.php:128
-#, fuzzy
msgid "Phone number, no punctuation or spaces, "
-msgstr "Max. 64 znaki alfanumeryczne, bez spacji i znaków przestankowych"
+msgstr "Numer telefonu, bez znaków przestankowych i spacji, "
#: actions/smssettings.php:162
-#, fuzzy
msgid "Send me notices through SMS; "
-msgstr "Wysyłaj mi wpisy przez Jabbera/GTalka"
+msgstr "Wyślij mi wpisy przez SMS; "
#: actions/smssettings.php:335
-#, fuzzy
msgid "A confirmation code was sent to the phone number you added. "
-msgstr "Ten kod potwierdzajÄ…cy nie jest przeznaczony dla Ciebie!"
+msgstr "Kod potwierdzający został wysłany na dodany numer telefonu. "
#: actions/smssettings.php:453
msgid "Mobile carrier"
-msgstr ""
+msgstr "Operator komórkowy"
#: actions/subedit.php:70
-#, fuzzy
msgid "You are not subscribed to that profile."
-msgstr "Ten profil nie był wysłany przez Ciebie"
+msgstr "Nie jesteÅ› zasubskrybowany do tego profilu."
#: actions/subedit.php:83
-#, fuzzy
msgid "Could not save subscription."
-msgstr "Nie można obserwować."
+msgstr "Nie można zapisać subskrypcji."
#: actions/subscribe.php:55
-#, fuzzy
msgid "Not a local user."
-msgstr "Brak takiego użytkownika."
+msgstr "Nie jest lokalnym użytkownikiem."
#: actions/subscribe.php:69
-#, fuzzy
msgid "Subscribed"
-msgstr "Subskrybuj"
+msgstr "Zasubskrybowano"
#: actions/subscribers.php:50
-#, fuzzy, php-format
+#, php-format
msgid "%s subscribers"
-msgstr "Subskrybenci"
+msgstr "Subskrybenci użytkownika %s"
#: actions/subscribers.php:52
#, php-format
msgid "%s subscribers, page %d"
-msgstr ""
+msgstr "Subskrybenci użytkownika %s, strona %d"
#: actions/subscribers.php:63
-#, fuzzy
msgid "These are the people who listen to "
-msgstr "Ludzie obserwujący wpisy użytkownika %s."
+msgstr "Osoby obserwujÄ…ce "
#: actions/subscribers.php:67
-#, fuzzy, php-format
+#, php-format
msgid "These are the people who "
-msgstr "Ludzie obserwujący wpisy użytkownika %s."
+msgstr "Osoby, które "
#: actions/subscriptions.php:52
-#, fuzzy, php-format
+#, php-format
msgid "%s subscriptions"
-msgstr "Wszyscy obserwowani"
+msgstr "Subskrypcje użytkownika %s"
#: actions/subscriptions.php:54
-#, fuzzy, php-format
+#, php-format
msgid "%s subscriptions, page %d"
-msgstr "Wszyscy obserwowani"
+msgstr "Subskrypcje użytkownika %s, strona %d"
#: actions/subscriptions.php:65
-#, fuzzy
msgid "These are the people whose notices "
-msgstr "Ludzie, których wpisy obserwuje użytkownik %s."
+msgstr "Osoby, których wpisy "
#: actions/subscriptions.php:69
-#, fuzzy, php-format
+#, php-format
msgid "These are the people whose "
-msgstr "Ludzie obserwujący wpisy użytkownika %s."
+msgstr "Osoby, których "
-#: actions/subscriptions.php:122
-#, fuzzy
+#: actions/subscriptions.php:122 actions/subscriptions.php:124
+#: actions/subscriptions.php:183
msgid "Jabber"
-msgstr "Brak identyfikatora Jabbera."
+msgstr "Jabber"
-#: actions/tag.php:43
-#, fuzzy, php-format
+#: actions/tag.php:43 actions/tag.php:51 actions/tag.php:59
+#, php-format
msgid "Notices tagged with %s, page %d"
-msgstr "%s – mikroblog"
+msgstr "Wpisy ze znacznikiem %s, strona %d"
-#: actions/tag.php:66
+#: actions/tag.php:66 actions/tag.php:73
#, php-format
msgid "Messages tagged \"%s\", most recent first"
-msgstr ""
+msgstr "Wiadomości ze znacznikiem \"%s\", najpierw najnowsze"
#: actions/tagother.php:33
-#, fuzzy
msgid "Not logged in"
-msgstr "Niezalogowany."
+msgstr "Nie zalogowano"
#: actions/tagother.php:39
-#, fuzzy
msgid "No id argument."
-msgstr "Brak takiego dokumentu."
+msgstr "Brak parametru identyfikatora."
#: actions/tagother.php:65
#, php-format
msgid "Tag %s"
-msgstr ""
+msgstr "Znacznik %s"
#: actions/tagother.php:141
msgid "Tag user"
-msgstr ""
+msgstr "Znacznik użytkownika"
-#: actions/tagother.php:149
+#: actions/tagother.php:149 actions/tagother.php:151
msgid ""
"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
"separated"
msgstr ""
+"Znaczniki dla tego użytkownika (litery, liczby, -, . i _), oddzielone "
+"przecinkami lub spacjami"
#: actions/tagother.php:164
msgid "There was a problem with your session token."
-msgstr ""
+msgstr "Wystąpił problem z tokenem sesji."
-#: actions/tagother.php:191
+#: actions/tagother.php:191 actions/tagother.php:193
msgid ""
"You can only tag people you are subscribed to or who are subscribed to you."
msgstr ""
+"Można nadawać znaczniki tylko osobom, których subskrybujesz lub którzy "
+"subskrybujÄ… Ciebie."
-#: actions/tagother.php:198
-#, fuzzy
+#: actions/tagother.php:198 actions/tagother.php:200
msgid "Could not save tags."
-msgstr "Nie można zapisać informacji o awatarze"
+msgstr "Nie można zapisać znaczników."
-#: actions/tagother.php:233
+#: actions/tagother.php:233 actions/tagother.php:235 actions/tagother.php:236
msgid "Use this form to add tags to your subscribers or subscriptions."
msgstr ""
+"Użyj tego formularza, aby dodać znaczniki subskrybentom lub subskrypcjom."
#: actions/tagrss.php:35
-#, fuzzy
msgid "No such tag."
-msgstr "Brak takiego wpisu."
+msgstr "Nie ma takiego znacznika."
-#: actions/tagrss.php:66
-#, fuzzy, php-format
+#: actions/tagrss.php:66 actions/tagrss.php:64
+#, php-format
msgid "Microblog tagged with %s"
-msgstr "%s – mikroblog"
+msgstr "Mikroblogi ze znacznikiem %s"
-#: actions/twitapiblocks.php:47
+#: actions/twitapiblocks.php:47 actions/twitapiblocks.php:49
msgid "Block user failed."
-msgstr ""
+msgstr "Zablokowanie użytkownika nie powiodło się."
-#: actions/twitapiblocks.php:69
+#: actions/twitapiblocks.php:69 actions/twitapiblocks.php:71
msgid "Unblock user failed."
-msgstr ""
+msgstr "Odblokowanie użytkownika nie powiodło się."
-#: actions/twitapiusers.php:48
-#, fuzzy
+#: actions/twitapiusers.php:48 actions/twitapiusers.php:52
+#: actions/twitapiusers.php:50
msgid "Not found."
-msgstr "Nie znaleziono żądania!"
+msgstr "Nie znaleziono."
#: actions/twittersettings.php:71
msgid "Add your Twitter account to automatically send "
-msgstr ""
+msgstr "Dodaj konto Twittera, aby automatycznie wysyłać "
-#: actions/twittersettings.php:119
+#: actions/twittersettings.php:119 actions/twittersettings.php:122
msgid "Twitter user name"
-msgstr ""
+msgstr "Nazwa użytkownika Twittera"
-#: actions/twittersettings.php:126
-#, fuzzy
+#: actions/twittersettings.php:126 actions/twittersettings.php:129
msgid "Twitter password"
-msgstr "Nowe hasło"
+msgstr "Hasło Twittera"
-#: actions/twittersettings.php:228
+#: actions/twittersettings.php:228 actions/twittersettings.php:232
+#: actions/twittersettings.php:248
msgid "Twitter Friends"
-msgstr ""
+msgstr "Przyjaciele z Twittera"
#: actions/twittersettings.php:327
msgid "Username must have only numbers, "
-msgstr ""
+msgstr "Nazwa użytkownika może zawierać tylko liczby, "
#: actions/twittersettings.php:341
-#, fuzzy, php-format
+#, php-format
msgid "Unable to retrieve account information "
-msgstr "Nie można skasować potwierdzenia adresu e-mail."
+msgstr "Nie można pobrać informacji o koncie "
-#: actions/unblock.php:108
-#, fuzzy
+#: actions/unblock.php:108 actions/groupunblock.php:128
msgid "Error removing the block."
-msgstr "Błąd w zapisie użytkownika."
+msgstr "BÅ‚Ä…d podczas usuwania blokady."
#: actions/unsubscribe.php:50
-#, fuzzy
msgid "No profile id in request."
-msgstr "Serwer nie zwrócił żadnego URL-a."
+msgstr "Brak identyfikatora profilu w żądaniu."
#: actions/unsubscribe.php:57
-#, fuzzy
msgid "No profile with that id."
-msgstr "Zdalny profil bez odpowiadajÄ…cego profilu lokalnego"
+msgstr "Brak profilu z tym identyfikatorem."
#: actions/unsubscribe.php:71
-#, fuzzy
msgid "Unsubscribed"
-msgstr "Zrezygnuj z subskrypcji"
+msgstr "Zrezygnowano z subskrypcji"
-#: actions/usergroups.php:63
+#: actions/usergroups.php:63 actions/usergroups.php:62
#, php-format
msgid "%s groups"
-msgstr ""
+msgstr "Grupy %s"
-#: actions/usergroups.php:65
+#: actions/usergroups.php:65 actions/usergroups.php:64
#, php-format
msgid "%s groups, page %d"
-msgstr ""
+msgstr "Grupy %s, strona %d"
-#: classes/Notice.php:104
-#, fuzzy
+#: classes/Notice.php:104 classes/Notice.php:128 classes/Notice.php:144
msgid "Problem saving notice. Unknown user."
-msgstr "Problem z zachowywaniem wpisu."
+msgstr "Problem podczas zapisywania wpisu. Nieznany użytkownik."
-#: classes/Notice.php:109
+#: classes/Notice.php:109 classes/Notice.php:133 classes/Notice.php:149
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
+"Za dużo wpisów w za krótkim czasie, weź głęboki oddech i wyślij ponownie za "
+"kilka minut."
-#: classes/Notice.php:116
+#: classes/Notice.php:116 classes/Notice.php:145 classes/Notice.php:161
msgid "You are banned from posting notices on this site."
-msgstr ""
+msgstr "Zabroniono Ci wysyłania wpisów na tej stronie."
#: lib/accountsettingsaction.php:108
-#, fuzzy
msgid "Upload an avatar"
-msgstr "Uaktualnianie awatara nie powiodło się."
+msgstr "Wyślij awatar"
-#: lib/accountsettingsaction.php:119
+#: lib/accountsettingsaction.php:119 lib/accountsettingsaction.php:122
msgid "Other"
-msgstr ""
+msgstr "Inne"
-#: lib/accountsettingsaction.php:120
+#: lib/accountsettingsaction.php:120 lib/accountsettingsaction.php:123
msgid "Other options"
-msgstr ""
+msgstr "Inne opcje"
-#: lib/action.php:130
+#: lib/action.php:130 lib/action.php:132 lib/action.php:142
#, php-format
msgid "%s - %s"
-msgstr ""
+msgstr "%s - %s"
-#: lib/action.php:145
+#: lib/action.php:145 lib/action.php:147 lib/action.php:157
msgid "Untitled page"
-msgstr ""
+msgstr "Strona bez nazwy"
-#: lib/action.php:316
+#: lib/action.php:316 lib/action.php:387 lib/action.php:411
msgid "Primary site navigation"
-msgstr ""
+msgstr "Główna nawigacja strony"
-#: lib/action.php:322
+#: lib/action.php:322 lib/action.php:393 lib/action.php:417
msgid "Personal profile and friends timeline"
-msgstr ""
+msgstr "Profil osobisty i oś czasu przyjaciół"
-#: lib/action.php:325
+#: lib/action.php:325 lib/action.php:396 lib/action.php:448
msgid "Search for people or text"
-msgstr ""
+msgstr "Znajdź osoby lub tekst"
-#: lib/action.php:328
-#, fuzzy
+#: lib/action.php:328 lib/action.php:399 lib/action.php:419
msgid "Account"
-msgstr "O serwisie"
+msgstr "Konto"
-#: lib/action.php:328
+#: lib/action.php:328 lib/action.php:399 lib/action.php:419
msgid "Change your email, avatar, password, profile"
-msgstr ""
+msgstr "Zmień adres e-mail, awatar, hasło, profil"
-#: lib/action.php:330
+#: lib/action.php:330 lib/action.php:403 lib/action.php:422
msgid "Connect to IM, SMS, Twitter"
-msgstr ""
+msgstr "Połącz z komunikatorem, SMS, Twitterem"
-#: lib/action.php:332
+#: lib/action.php:332 lib/action.php:409 lib/action.php:435
msgid "Logout from the site"
-msgstr ""
+msgstr "Wyloguj siÄ™ ze strony"
-#: lib/action.php:335
+#: lib/action.php:335 lib/action.php:412 lib/action.php:443
msgid "Login to the site"
-msgstr ""
+msgstr "Zaloguj siÄ™ na stronÄ™"
-#: lib/action.php:338
-#, fuzzy
+#: lib/action.php:338 lib/action.php:415 lib/action.php:440
msgid "Create an account"
-msgstr "Załóż nowe konto"
+msgstr "Utwórz konto"
-#: lib/action.php:341
-#, fuzzy
+#: lib/action.php:341 lib/action.php:418
msgid "Login with OpenID"
-msgstr "Brak takiego identyfikatora OpenID."
+msgstr "Zaloguj siÄ™ za pomocÄ… OpenID"
-#: lib/action.php:344
-#, fuzzy
+#: lib/action.php:344 lib/action.php:421 lib/action.php:446
msgid "Help me!"
-msgstr "Pomoc"
+msgstr "Pomóż mi!"
-#: lib/action.php:362
-#, fuzzy
+#: lib/action.php:362 lib/action.php:441 lib/action.php:468
msgid "Site notice"
-msgstr "Nowy wpis"
+msgstr "Wpis strony"
-#: lib/action.php:417
+#: lib/action.php:417 lib/action.php:504 lib/action.php:531
msgid "Local views"
-msgstr ""
+msgstr "Lokalne widoki"
-#: lib/action.php:472
-#, fuzzy
+#: lib/action.php:472 lib/action.php:559 lib/action.php:597
msgid "Page notice"
-msgstr "Nowy wpis"
+msgstr "Wpis strony"
-#: lib/action.php:562
-#, fuzzy
+#: lib/action.php:562 lib/action.php:654 lib/action.php:699
msgid "Secondary site navigation"
-msgstr "Subskrypcje"
+msgstr "Druga nawigacja strony"
-#: lib/action.php:602 lib/action.php:623
+#: lib/action.php:602 lib/action.php:623 lib/action.php:699 lib/action.php:720
+#: lib/action.php:749 lib/action.php:770
msgid "StatusNet software license"
-msgstr ""
+msgstr "Licencja oprogramowania StatusNet"
-#: lib/action.php:630
+#: lib/action.php:630 lib/action.php:727 lib/action.php:779
msgid "All "
-msgstr ""
+msgstr "Wszystko "
-#: lib/action.php:635
+#: lib/action.php:635 lib/action.php:732 lib/action.php:784
msgid "license."
-msgstr ""
+msgstr "licencja."
-#: lib/blockform.php:123 lib/blockform.php:153
-#, fuzzy
+#: lib/blockform.php:123 lib/blockform.php:153 actions/groupmembers.php:343
msgid "Block this user"
-msgstr "Brak takiego użytkownika."
+msgstr "Zablokuj tego użytkownika"
-#: lib/blockform.php:153
+#: lib/blockform.php:153 actions/groupmembers.php:343
msgid "Block"
-msgstr ""
+msgstr "Zablokuj"
#: lib/disfavorform.php:114 lib/disfavorform.php:140
msgid "Disfavor this notice"
-msgstr ""
+msgstr "Usuń ten wpis z ulubionych"
#: lib/facebookaction.php:268
#, php-format
msgid "To use the %s Facebook Application you need to login "
-msgstr ""
+msgstr "Aby używać aplikacji Facebook %s, musisz się zalogować "
-#: lib/facebookaction.php:271
-#, fuzzy
+#: lib/facebookaction.php:271 lib/facebookaction.php:273
+#: lib/facebookaction.php:275
msgid " a new account."
-msgstr "Załóż nowe konto"
+msgstr " nowe konto."
#: lib/facebookaction.php:557 lib/mailbox.php:214 lib/noticelist.php:354
-#, fuzzy
+#: lib/facebookaction.php:675 lib/mailbox.php:216 lib/noticelist.php:357
+#: lib/mailbox.php:217 lib/noticelist.php:361
msgid "Published"
-msgstr "Publiczny"
+msgstr "Opublikowano"
#: lib/favorform.php:114 lib/favorform.php:140
-#, fuzzy
msgid "Favor this notice"
-msgstr "Brak takiego wpisu."
+msgstr "Dodaj ten wpis do ulubionych"
#: lib/feedlist.php:64
msgid "Export data"
-msgstr "Dane do exportowania"
+msgstr "Wyeksportuj dane"
#: lib/galleryaction.php:121
msgid "Filter tags"
-msgstr ""
+msgstr "Filtruj znaczniki"
#: lib/galleryaction.php:131
msgid "All"
-msgstr ""
+msgstr "Wszystko"
-#: lib/galleryaction.php:137
+#: lib/galleryaction.php:137 lib/galleryaction.php:138
msgid "Tag"
-msgstr ""
+msgstr "Znacznik"
-#: lib/galleryaction.php:138
+#: lib/galleryaction.php:138 lib/galleryaction.php:139
msgid "Choose a tag to narrow list"
-msgstr ""
+msgstr "Wybierz znacznik do ograniczonej listy"
-#: lib/galleryaction.php:139
+#: lib/galleryaction.php:139 lib/galleryaction.php:141
msgid "Go"
-msgstr ""
+msgstr "Przejdź"
-#: lib/groupeditform.php:148
-#, fuzzy
+#: lib/groupeditform.php:148 lib/groupeditform.php:163
msgid "URL of the homepage or blog of the group or topic"
-msgstr "URL Twojej strony domowej, bloga, lub profilu na innej stronie"
+msgstr "Adres URL strony domowej lub bloga grupy, albo temat"
-#: lib/groupeditform.php:151
-#, fuzzy
+#: lib/groupeditform.php:151 lib/groupeditform.php:166
msgid "Description"
-msgstr "Subskrypcje"
+msgstr "Opis"
-#: lib/groupeditform.php:153
-#, fuzzy
+#: lib/groupeditform.php:153 lib/groupeditform.php:168
msgid "Describe the group or topic in 140 chars"
-msgstr "Opisz siÄ™ w 140 znakach"
+msgstr "Opisz grupÄ™ lub temat w 140 znakach"
-#: lib/groupeditform.php:158
-#, fuzzy
+#: lib/groupeditform.php:158 lib/groupeditform.php:173
msgid ""
"Location for the group, if any, like \"City, State (or Region), Country\""
-msgstr "Gdzie jesteÅ›? (np. \"miasto, region, kraj\")"
+msgstr ""
+"Położenie grupy, jeśli istnieje, np. \"miasto, województwo (lub region), kraj"
+"\""
#: lib/groupnav.php:84 lib/searchgroupnav.php:84
msgid "Group"
-msgstr ""
+msgstr "Grupa"
-#: lib/groupnav.php:100
+#: lib/groupnav.php:100 actions/groupmembers.php:175 lib/groupnav.php:106
msgid "Admin"
-msgstr ""
+msgstr "Administrator"
-#: lib/groupnav.php:101
+#: lib/groupnav.php:101 lib/groupnav.php:107
#, php-format
msgid "Edit %s group properties"
-msgstr ""
+msgstr "Edytuj właściwości grupy %s"
-#: lib/groupnav.php:106
-#, fuzzy
+#: lib/groupnav.php:106 lib/groupnav.php:112
msgid "Logo"
-msgstr "Wyloguj"
+msgstr "Logo"
-#: lib/groupnav.php:107
+#: lib/groupnav.php:107 lib/groupnav.php:113
#, php-format
msgid "Add or edit %s logo"
-msgstr ""
+msgstr "Dodaj lub edytuj logo grupy %s"
#: lib/groupsbymemberssection.php:71
msgid "Groups with most members"
-msgstr "Grupy z największą ilością członków"
+msgstr "Grupy z największą liczbą członków"
#: lib/groupsbypostssection.php:71
msgid "Groups with most posts"
@@ -4664,37 +5078,31 @@ msgstr "Grupy z największą ilością wpisów"
#: lib/grouptagcloudsection.php:56
#, php-format
msgid "Tags in %s group's notices"
-msgstr "Tagi we wpisach grupy %s"
+msgstr "Znaczniki we wpisach grupy %s"
#: lib/htmloutputter.php:104
-#, fuzzy
msgid "This page is not available in a "
-msgstr "Ta strona nie jest dostępna dla medium, którego typ akceptujesz"
+msgstr "Ta strona nie jest dostępna w "
-# aaa
#: lib/joinform.php:114
-#, fuzzy
msgid "Join"
-msgstr "Dołacz"
+msgstr "Dołącz"
#: lib/leaveform.php:114
-#, fuzzy
msgid "Leave"
-msgstr "Zapisz"
+msgstr "Opuść"
#: lib/logingroupnav.php:76
-#, fuzzy
msgid "Login with a username and password"
-msgstr "Błędna nazwa użytkownika lub hasło."
+msgstr "Zaloguj się za pomocą nazwy użytkownika i hasła"
#: lib/logingroupnav.php:79
-#, fuzzy
msgid "Sign up for a new account"
msgstr "Załóż nowe konto"
#: lib/logingroupnav.php:82
msgid "Login or register with OpenID"
-msgstr "Zaloguj lub zarejestruj się z użyciem OpenID"
+msgstr "Zaloguj siÄ™ lub zarejestruj za pomocÄ… OpenID"
#: lib/mail.php:175
#, php-format
@@ -4702,124 +5110,129 @@ msgid ""
"Hey, %s.\n"
"\n"
msgstr ""
-"Hej, %s,\n"
+"Cześć, %s.\n"
"\n"
#: lib/mail.php:236
-#, fuzzy, php-format
+#, php-format
msgid "%1$s is now listening to "
-msgstr "%1$s obserwuje teraz Twoje wpisy na %2$s."
+msgstr "%1$s obserwuje teraz "
-#: lib/mail.php:254
-#, fuzzy, php-format
+#: lib/mail.php:254 lib/mail.php:253
+#, php-format
msgid "Location: %s\n"
-msgstr "Lokalizacja: %s\n"
+msgstr "Położenie: %s\n"
-#: lib/mail.php:256
-#, fuzzy, php-format
+#: lib/mail.php:256 lib/mail.php:255
+#, php-format
msgid "Homepage: %s\n"
msgstr "Strona domowa: %s\n"
-#: lib/mail.php:258
+#: lib/mail.php:258 lib/mail.php:257
#, php-format
msgid ""
"Bio: %s\n"
"\n"
msgstr ""
+"O mnie: %s\n"
+"\n"
-#: lib/mail.php:461
+#: lib/mail.php:461 lib/mail.php:462
#, php-format
msgid "You've been nudged by %s"
-msgstr ""
+msgstr "Zostałeś szturchnięty przez %s"
#: lib/mail.php:465
#, php-format
msgid "%1$s (%2$s) is wondering what you are up to "
-msgstr ""
+msgstr "%1$s (%2$s) zastanawia siÄ™, co zamierzasz "
#: lib/mail.php:555
-#, fuzzy, php-format
+#, php-format
msgid "%1$s just added your notice from %2$s"
-msgstr "%1$s obserwuje teraz Twoje wpisy na %2$s."
+msgstr "%1$s właśnie dodał Twój wpis z %2$s"
-#: lib/mailbox.php:229 lib/noticelist.php:380
+#: lib/mailbox.php:229 lib/noticelist.php:380 lib/mailbox.php:231
+#: lib/noticelist.php:383 lib/mailbox.php:232 lib/noticelist.php:388
msgid "From"
msgstr "Od"
-#: lib/messageform.php:110
+#: lib/messageform.php:110 lib/messageform.php:109
msgid "Send a direct notice"
msgstr "Wyślij bezpośredni wpis"
-#: lib/noticeform.php:125
-#, fuzzy
+#: lib/noticeform.php:125 lib/noticeform.php:128
msgid "Send a notice"
-msgstr "Nowy wpis"
+msgstr "Wyślij wpis"
-#: lib/noticeform.php:152
-#, fuzzy
+#: lib/noticeform.php:152 lib/noticeform.php:149
msgid "Available characters"
-msgstr "6 lub więcej znaków"
+msgstr "Dostępne znaki"
-#: lib/noticelist.php:426
-#, fuzzy
+#: lib/noticelist.php:426 lib/noticelist.php:429
msgid "in reply to"
-msgstr "w odpowiedzi na…"
+msgstr "w odpowiedzi na"
-#: lib/noticelist.php:447 lib/noticelist.php:450
+#: lib/noticelist.php:447 lib/noticelist.php:450 lib/noticelist.php:451
+#: lib/noticelist.php:454 lib/noticelist.php:458 lib/noticelist.php:461
msgid "Reply to this notice"
msgstr "Odpowiedz na ten wpis"
-#: lib/noticelist.php:451
-#, fuzzy
+#: lib/noticelist.php:451 lib/noticelist.php:455 lib/noticelist.php:462
msgid "Reply"
-msgstr "Odpowiedź"
+msgstr "Odpowiedz"
-#: lib/noticelist.php:471 lib/noticelist.php:474
+#: lib/noticelist.php:471 lib/noticelist.php:474 lib/noticelist.php:476
+#: lib/noticelist.php:479 actions/deletenotice.php:116 lib/noticelist.php:483
+#: lib/noticelist.php:486
msgid "Delete this notice"
msgstr "Usuń ten wpis"
-#: lib/noticelist.php:474
+#: lib/noticelist.php:474 actions/avatarsettings.php:148
+#: lib/noticelist.php:479 lib/noticelist.php:486
msgid "Delete"
msgstr "Usuń"
#: lib/nudgeform.php:116
msgid "Nudge this user"
-msgstr ""
+msgstr "Szturchnij tego użytkownika"
#: lib/nudgeform.php:128
msgid "Nudge"
-msgstr ""
+msgstr "Szturchnij"
#: lib/nudgeform.php:128
msgid "Send a nudge to this user"
-msgstr ""
+msgstr "Wyślij szturchnięcie do tego użytkownika"
#: lib/personaltagcloudsection.php:56
#, php-format
msgid "Tags in %s's notices"
-msgstr ""
+msgstr "Znaczniki we wpisach użytkownika %s"
-#: lib/profilelist.php:182
+#: lib/profilelist.php:182 lib/profilelist.php:180
+#: lib/subscriptionlist.php:126
msgid "(none)"
-msgstr ""
+msgstr "(brak)"
-#: lib/publicgroupnav.php:76
+#: lib/publicgroupnav.php:76 lib/publicgroupnav.php:78
msgid "Public"
msgstr "Publiczny"
-#: lib/publicgroupnav.php:80
+#: lib/publicgroupnav.php:80 lib/publicgroupnav.php:82
msgid "User groups"
-msgstr ""
+msgstr "Grupy użytkowników"
#: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
+#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
msgid "Recent tags"
-msgstr ""
+msgstr "Ostatnie znaczniki"
-#: lib/publicgroupnav.php:86
+#: lib/publicgroupnav.php:86 lib/publicgroupnav.php:88
msgid "Featured"
-msgstr "Wyróżnione"
+msgstr "Znane"
-#: lib/publicgroupnav.php:90
+#: lib/publicgroupnav.php:90 lib/publicgroupnav.php:92
msgid "Popular"
msgstr "Popularne"
@@ -4833,74 +5246,1721 @@ msgstr "Znajdź grupy na tej stronie"
#: lib/section.php:89
msgid "Untitled section"
-msgstr ""
+msgstr "Sekcja bez nazwy"
-#: lib/subgroupnav.php:81
-#, fuzzy, php-format
+#: lib/subgroupnav.php:81 lib/subgroupnav.php:83
+#, php-format
msgid "People %s subscribes to"
-msgstr "Zdalna subskrypcja"
+msgstr "Osoby %s zasubskrybowane do"
-#: lib/subgroupnav.php:89
-#, fuzzy, php-format
+#: lib/subgroupnav.php:89 lib/subgroupnav.php:91
+#, php-format
msgid "People subscribed to %s"
-msgstr "Zdalna subskrypcja"
+msgstr "Osoby zasubskrybowane do %s"
-#: lib/subgroupnav.php:97
+#: lib/subgroupnav.php:97 lib/subgroupnav.php:99
#, php-format
msgid "Groups %s is a member of"
-msgstr ""
+msgstr "Grupy %s są członkiem"
-#: lib/subgroupnav.php:104
+#: lib/subgroupnav.php:104 lib/action.php:430 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
-msgstr "Zaproś przyjaciół i kolegów, by dołączyli do Ciebie na %s"
+msgstr "Zaproś przyjaciół i kolegów do dołączenia do Ciebie na %s"
-#: lib/subs.php:53
+#: lib/subs.php:53 lib/subs.php:52
msgid "User has blocked you."
msgstr "Użytkownik zablokował Cię."
#: lib/subscribeform.php:115 lib/subscribeform.php:139
-#, fuzzy
+#: actions/userauthorization.php:178
msgid "Subscribe to this user"
-msgstr "Subskrypcja uwierzytelniona"
+msgstr "Zasubskrybuj tego użytkownika"
#: lib/tagcloudsection.php:56
msgid "None"
-msgstr ""
+msgstr "Brak"
#: lib/topposterssection.php:74
msgid "Top posters"
-msgstr ""
+msgstr "Najczęściej wysyłający wpisy"
#: lib/unblockform.php:120 lib/unblockform.php:150
+#: actions/blockedfromgroup.php:313
msgid "Unblock this user"
msgstr "Odblokuj tego użytkownika"
-#: lib/unblockform.php:150
+#: lib/unblockform.php:150 actions/blockedfromgroup.php:313
msgid "Unblock"
msgstr "Odblokuj"
#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
msgid "Unsubscribe from this user"
+msgstr "Zrezygnuj z subskrypcji tego użytkownika"
+
+#: actions/all.php:77 actions/all.php:59
+#, php-format
+msgid "Feed for friends of %s (RSS 1.0)"
+msgstr "Kanał dla znajomych użytkownika %s (RSS 1.0)"
+
+#: actions/all.php:82 actions/all.php:64
+#, php-format
+msgid "Feed for friends of %s (RSS 2.0)"
+msgstr "Kanał dla znajomych użytkownika %s (RSS 2.0)"
+
+#: actions/all.php:87 actions/all.php:69
+#, php-format
+msgid "Feed for friends of %s (Atom)"
+msgstr "Kanał dla znajomych użytkownika %s (Atom)"
+
+#: actions/all.php:112 actions/all.php:125
+msgid "You and friends"
+msgstr "Ty i przyjaciele"
+
+#: actions/avatarsettings.php:78
+#, php-format
+msgid "You can upload your personal avatar. The maximum file size is %s."
+msgstr "Można wysłać swój osobisty awatar. Maksymalny rozmiar pliku to %s."
+
+#: actions/avatarsettings.php:373
+msgid "Avatar deleted."
+msgstr "Usunięto awatar."
+
+#: actions/block.php:129 actions/block.php:136
+msgid ""
+"Are you sure you want to block this user? Afterwards, they will be "
+"unsubscribed from you, unable to subscribe to you in the future, and you "
+"will not be notified of any @-replies from them."
+msgstr ""
+"Jesteś pewny, że chcesz zablokować tego użytkownika. Po tym jego subskrypcja "
+"do Ciebie zostanie usunięta, nie będzie mógł Cię zasubskrybować w "
+"przyszłości i nie będziesz powiadamiany o żadnych odpowiedziach @ od niego."
+
+#: actions/deletenotice.php:73
+msgid ""
+"You are about to permanently delete a notice. Once this is done, it cannot "
+"be undone."
+msgstr ""
+"Za chwilę wpis zostanie trwale usunięty. Kiedy to się stanie, to już się nie "
+"odstanie."
+
+#: actions/deletenotice.php:127
+msgid "There was a problem with your session token. Try again, please."
+msgstr "Wystąpił problem z tokenem sesji. Spróbuj ponownie."
+
+#: actions/emailsettings.php:168
+msgid "Send me email when someone sends me an \"@-reply\"."
+msgstr "Wyślij mi wiadomość e-mail, kiedy ktoś wyśle mi odpowiedź \"@\"."
+
+#: actions/facebookhome.php:193 actions/facebookhome.php:187
+#, php-format
+msgid ""
+"If you would like the %s app to automatically update your Facebook status "
+"with your latest notice, you need to give it permission."
+msgstr ""
+"Jeśli chcesz, aby aplikacja %s automatycznie aktualizowała status na "
+"Facebook najnowszym wpisem, musisz dać jej pozwolenie."
+
+#: actions/facebookhome.php:217 actions/facebookhome.php:211
+#, php-format
+msgid "Okay, do it!"
+msgstr "OK, zrób to!"
+
+#: actions/facebooksettings.php:124
+#, php-format
+msgid ""
+"If you would like %s to automatically update your Facebook status with your "
+"latest notice, you need to give it permission."
+msgstr ""
+"Jeśli chcesz, aby %s automatycznie aktualizowało status na Facebook "
+"najnowszym wpisem, musisz dać mu pozwolenie."
+
+#: actions/grouplogo.php:155
+#, php-format
+msgid ""
+"You can upload a logo image for your group. The maximum file size is %s."
+msgstr "Można wysłać obraz logo grupy. Maksymalny rozmiar pliku to %s."
+
+#: actions/grouplogo.php:367
+msgid "Pick a square area of the image to be the logo."
+msgstr "Wybierz kwadratowy obszar obrazu, który będzie logo."
+
+#: actions/grouprss.php:136 actions/grouprss.php:137
+#, php-format
+msgid "Microblog by %s group"
+msgstr "Mikroblog grupy %s"
+
+#: actions/groupsearch.php:57 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 ""
+"Znajdź grupy na %%site.name%% według ich nazwy, położenia lub opisu. Oddziel "
+"terminy spacjami; muszą mieć trzy znaki lub więcej."
+
+#: 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 ""
+"Grupy %%%%site.name%%%% umożliwiają znalezienie i rozmawianie z osobami o "
+"podobnych zainteresowaniach. Po dołączeniu do grupy można wysyłać wiadomości "
+"do wszystkich członków używając składni \"!nazwagrupy\". Nie widzisz grupy, "
+"która Cię interesuje? Spróbuj ją [znaleźć](%%%%action.groupsearch%%%%) lub "
+"[założyć własną!](%%%%action.newgroup%%%%)"
+
+#: actions/newmessage.php:102
+msgid "Only logged-in users can send direct messages."
+msgstr "Tylko zalogowani użytkownicy mogą wysyłać bezpośrednie wiadomości."
+
+#: actions/noticesearch.php:91
+#, php-format
+msgid "Search results for \"%s\" on %s"
+msgstr "Wyniki wyszukiwania dla \"%s\" na %s"
+
+#: actions/openidlogin.php:66
+#, php-format
+msgid ""
+"For security reasons, please re-login with your [OpenID](%%doc.openid%%) "
+"before changing your settings."
+msgstr ""
+"Z powodów bezpieczeństwa przed zmienianiem ustawień zaloguj się ponownie za "
+"pomocÄ… identyfikatora [OpenID](%%doc.openid%%)."
+
+#: actions/public.php:125 actions/public.php:133
+msgid "Public Stream Feed (RSS 1.0)"
+msgstr "Kanał publicznego strumienia (RSS 1.0)"
+
+#: actions/public.php:130 actions/public.php:138
+msgid "Public Stream Feed (RSS 2.0)"
+msgstr "Kanał publicznego strumienia (RSS 2.0)"
+
+#: actions/public.php:135 actions/public.php:143
+msgid "Public Stream Feed (Atom)"
+msgstr "Kanał publicznego strumienia (Atom)"
+
+#: actions/public.php:210 actions/public.php:241
+#, 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 ""
+"To jest %%site.name%%, usługa [mikroblogowania](http://pl.wikipedia.org/wiki/"
+"Mikroblog) oparta na wolnym narzędziu [StatusNet](http://status.net/). "
+"[Dołącz teraz](%%action.register%%), aby dzielić się wpisami o sobie z "
+"przyjaciółmi, rodziną i kolegami! ([Przeczytaj więcej](%%doc.help%%))"
-#, fuzzy
-#~ msgid "Delete my account"
-#~ msgstr "Załóż nowe konto"
+#: actions/register.php:286 actions/register.php:329
+#, php-format
+msgid ""
+"With this form you can create a new account. You can then post notices and "
+"link up to friends and colleagues. (Have an [OpenID](http://openid.net/)? "
+"Try our [OpenID registration](%%action.openidlogin%%)!)"
+msgstr ""
+"Za pomocą tego formularza można utworzyć nowe konto. Można wtedy wysyłać "
+"wpisy i połączyć się z przyjaciółmi i kolegami. (Posiadasz identyfikator "
+"[OpenID](http://openid.net/)? Wypróbuj [rejestracji OpenID](%%action."
+"openidlogin%%)!)"
+
+#: actions/register.php:432 actions/register.php:479
+msgid "Creative Commons Attribution 3.0"
+msgstr "Creative Commons Uznanie Autorstwa 3.0"
-#~ msgid "Couldn't confirm email."
-#~ msgstr "Nie można potwierdzić e-maila."
+#: actions/register.php:433 actions/register.php:480
+msgid ""
+" except this private data: password, email address, IM address, and phone "
+"number."
+msgstr ""
+" poza tymi prywatnymi danymi: hasło, adres e-mail, adres komunikatora i "
+"numer telefonu."
-#~ msgid "Email address"
-#~ msgstr "Adres e-mailowy"
+#: actions/showgroup.php:378 actions/showgroup.php:424
+msgid "Created"
+msgstr "Utworzono"
-#~ msgid "Error inserting notice"
-#~ msgstr "BÅ‚Ä…d przy wprowadzaniu wpisu"
+#: actions/showgroup.php:393 actions/showgroup.php:440
+#, php-format
+msgid ""
+"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. Its members share short messages about "
+"their life and interests. [Join now](%%%%action.register%%%%) to become part "
+"of this group and many more! ([Read more](%%%%doc.help%%%%))"
+msgstr ""
+"**%s** jest grupą użytkowników na %%%%site.name%%%%, usłudze "
+"[mikroblogowania](http://pl.wikipedia.org/wiki/Mikroblog) opartej na wolnym "
+"narzędziu [StatusNet](http://status.net/). Jej członkowie dzielą się "
+"krótkimi wiadomościami o swoim życiu i zainteresowaniach. [Dołącz teraz](%%%%"
+"action.register%%%%), aby stać się częścią tej grupy i wiele więcej! "
+"([Przeczytaj więcej](%%%%doc.help%%%%))"
-#~ msgid ""
-#~ "If you've forgotten or lost your password, you can get a new one sent "
-#~ "the email address you have stored in your account."
-#~ msgstr ""
-#~ "Jeśli Twoje hasło gdzieś się zapodziało lub zostało zapomniane to możesz "
-#~ "wygenerować nowe. Zostanie ono wysłane na adres e-mailowy skojarzony z "
-#~ "Twoim kontem."
+#: actions/showstream.php:147
+msgid "Your profile"
+msgstr "Twój profil"
+
+#: actions/showstream.php:149
+#, php-format
+msgid "%s's profile"
+msgstr "Profil użytkownika %s"
+
+#: actions/showstream.php:163 actions/showstream.php:128
+#, php-format
+msgid "Notice feed for %s (RSS 1.0)"
+msgstr "Kanał wpisów dla %s (RSS 1.0)"
+
+#: actions/showstream.php:170 actions/showstream.php:135
+#, php-format
+msgid "Notice feed for %s (RSS 2.0)"
+msgstr "Kanał wpisów dla %s (RSS 2.0)"
+
+#: actions/showstream.php:177 actions/showstream.php:142
+#, php-format
+msgid "Notice feed for %s (Atom)"
+msgstr "Kanał wpisów dla %s (Atom)"
+
+#: actions/showstream.php:182 actions/showstream.php:147
+#, php-format
+msgid "FOAF for %s"
+msgstr "FOAF dla %s"
+
+#: actions/showstream.php:237 actions/showstream.php:202
+msgid "Edit Avatar"
+msgstr "Edytuj awatar"
+
+#: actions/showstream.php:316 actions/showstream.php:281
+msgid "Edit profile settings"
+msgstr "Edytuj ustawienia profilu"
+
+#: actions/showstream.php:317 actions/showstream.php:282
+msgid "Edit"
+msgstr "Edytuj"
+
+#: actions/showstream.php:542 actions/showstream.php:388
+#, php-format
+msgid ""
+"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to "
+"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
+msgstr ""
+"**%s** posiada konto na %%%%site.name%%%%, usłudze [mikroblogowania](http://"
+"pl.wikipedia.org/wiki/Mikroblog) opartej na wolnym narzędziu [StatusNet]"
+"(http://status.net/). [Dołącz teraz](%%%%action.register%%%%), aby "
+"obserwować wpisy użytkownika **%s** i wiele więcej! ([Przeczytaj więcej](%%%%"
+"doc.help%%%%))"
+
+#: actions/smssettings.php:335
+msgid ""
+"A confirmation code was sent to the phone number you added. Check your phone "
+"for the code and instructions on how to use it."
+msgstr ""
+"Kod potwierdzający został wysłany na dodany numer telefonu. Sprawdź telefon, "
+"czy otrzymałeś kod i instrukcje jak go użyć."
+
+#: actions/twitapifavorites.php:171 lib/mail.php:556
+#: actions/twitapifavorites.php:222
+#, php-format
+msgid ""
+"%1$s just added your notice from %2$s as one of their favorites.\n"
+"\n"
+"In case you forgot, you can see the text of your notice here:\n"
+"\n"
+"%3$s\n"
+"\n"
+"You can see the list of %1$s's favorites here:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Faithfully yours,\n"
+"%5$s\n"
+msgstr ""
+"%1$s właśnie dodał Twój wpis z %2$s jako jeden ze swoich ulubionych.\n"
+"\n"
+"Jeśli go zapomniałeś, tutaj możesz zobaczyć tekst wpisu:\n"
+"\n"
+"%3$s\n"
+"\n"
+"Tutaj możesz zobaczyć listę ulubionych wpisów użytkownika %1$s:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Z poważaniem,\n"
+"%5$s\n"
+
+#: actions/twitapistatuses.php:124 actions/twitapistatuses.php:82
+#: actions/twitapistatuses.php:314
+msgid "No such user!"
+msgstr "Nie ma takiego użytkownika!"
+
+#: actions/twittersettings.php:72
+msgid ""
+"Add your Twitter account to automatically send your notices to Twitter, and "
+"subscribe to Twitter friends already here."
+msgstr ""
+"Dodaj konto Twittera, aby automatycznie wysyłać wpisy do Twittera i "
+"zasubskrybować przyjaciół z Twittera, którzy już tu są."
+
+#: actions/twittersettings.php:345 actions/twittersettings.php:362
+#, php-format
+msgid "Unable to retrieve account information For \"%s\" from Twitter."
+msgstr "Nie można pobrać informacji o koncie dla \"%s\" z Twittera."
+
+#: actions/userauthorization.php:86 actions/userauthorization.php:81
+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 ""
+"Sprawdź te szczegóły, aby upewnić się, czy na pewno chcesz zasubskrybować "
+"wpisy tego użytkownika. Jeżeli nie prosiłeś o subskrypcję czyichś wpisów, "
+"naciśnij \"Odrzuć\"."
+
+#: actions/usergroups.php:131 actions/usergroups.php:130
+msgid "Search for more groups"
+msgstr "Znajdź więcej grup"
+
+#: classes/Notice.php:138 classes/Notice.php:154
+msgid ""
+"Too many duplicate messages too quickly; take a breather and post again in a "
+"few minutes."
+msgstr ""
+"Za dużo takich samych wiadomości w za krótkim czasie, weź głęboki oddech i "
+"wyślij ponownie za kilka minut."
+
+#: lib/action.php:406 lib/action.php:425
+msgid "Connect to SMS, Twitter"
+msgstr "Połącz z SMS, Twitterem"
+
+#: lib/action.php:671 lib/action.php:721
+msgid "Badge"
+msgstr "Odznaka"
+
+#: lib/command.php:113 lib/command.php:106
+#, php-format
+msgid ""
+"Subscriptions: %1$s\n"
+"Subscribers: %2$s\n"
+"Notices: %3$s"
+msgstr ""
+"Subskrypcje: %1$s\n"
+"Subskrybenci: %2$s\n"
+"Wpisy: %3$s"
+
+#: lib/command.php:392 lib/command.php:385
+msgid ""
+"Commands:\n"
+"on - turn on notifications\n"
+"off - turn off notifications\n"
+"help - show this help\n"
+"follow <nickname> - subscribe to user\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"
+"fav <nickname> - add user's last notice as a 'fave'\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> - not yet implemented.\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 ""
+"Polecenia:\n"
+"on - włącza powiadomienia\n"
+"off - wyłącza powiadomienia\n"
+"help - wyświetla tę pomoc\n"
+"follow <pseudonim> - subskrybuje użytkownika\n"
+"leave <pseudonim> - rezygnuje z subskrypcji użytkownika\n"
+"d <pseudonim> <tekst> - bezpośrednia wiadomość do użytkownika\n"
+"get <pseudonim> - uzyskuje ostatni wpis użytkownika\n"
+"whois <pseudonim> - uzyskuje informacje o profilu użytkownika\n"
+"fav <pseudonim> - dodaje ostatni wpis użytkownika jako \"ulubiony\"\n"
+"stats - uzyskuje Twoje statystyki\n"
+"stop - to samo co \"off\"\n"
+"quit - to samo co \"off\"\n"
+"sub <pseudonim> - to samo co \"follow\"\n"
+"unsub <pseudonim> - to samo co \"leave\"\n"
+"last <pseudonim> - to samo co \"get\"\n"
+"on <pseudonim> - jeszcze nie zaimplementowano.\n"
+"off <pseudonim> - jeszcze nie zaimplementowano.\n"
+"nudge <pseudonim> - jeszcze nie zaimplementowano.\n"
+"invite <numer telefonu> - jeszcze nie zaimplementowano.\n"
+"track <słowo> - jeszcze nie zaimplementowano.\n"
+"untrack <słowo> - jeszcze nie zaimplementowano.\n"
+"track off - jeszcze nie zaimplementowano.\n"
+"untrack all - jeszcze nie zaimplementowano.\n"
+"tracks - jeszcze nie zaimplementowano.\n"
+"tracking - jeszcze nie zaimplementowano.\n"
+
+#: lib/dberroraction.php:60
+msgid "Database error"
+msgstr "BÅ‚Ä…d bazy danych"
+
+#: lib/facebookaction.php:271 lib/facebookaction.php:273
+#, php-format
+msgid ""
+"To use the %s Facebook Application you need to login with your username and "
+"password. Don't have a username yet? "
+msgstr ""
+"Aby użyć aplikacji Facebook %s, musisz się zalogować za pomocą nazwy "
+"użytkownika i hasła. Nie masz jeszcze nazwy użytkownika? "
+
+#: lib/feed.php:85
+msgid "RSS 1.0"
+msgstr "RSS 1.0"
+
+#: lib/feed.php:87
+msgid "RSS 2.0"
+msgstr "RSS 2.0"
+
+#: lib/feed.php:89
+msgid "Atom"
+msgstr "Atom"
+
+#: lib/feed.php:91
+msgid "FOAF"
+msgstr "FOAF"
+
+#: lib/imagefile.php:75
+#, php-format
+msgid "That file is too big. The maximum file size is %d."
+msgstr "Ten plik jest za duży. Maksymalny rozmiar pliku to %d."
+
+#: lib/mail.php:175 lib/mail.php:174
+#, 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 ""
+"Cześć, %s.\n"
+"\n"
+"Ktoś właśnie podał ten adres e-mail na %s.\n"
+"\n"
+"Jeśli to byłeś Ty, i chcesz potwierdzić swoje wejście, użyj poniższego "
+"adresu URL:\n"
+"\n"
+"\t%s\n"
+"\n"
+"Jeśli to nie ty, po prostu zignoruj tę wiadomość.\n"
+"\n"
+"Dziękujemy za Twój czas, \n"
+"%s\n"
+
+#: lib/mail.php:241 lib/mail.php:240
+#, 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 ""
+"Użytkownik %1$s obserwuje teraz Twoje wpisy na %2$s.\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"%4$s%5$s%6$s\n"
+"Z poważaniem,\n"
+"%7$s.\n"
+"\n"
+"----\n"
+"Zmień adres e-mail lub opcje powiadamiania na %8$s\n"
+
+#: lib/mail.php:466
+#, 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 ""
+"Użytkownik %1$s (%2$s) zastanawia się, co się z Tobą dzieje w ostatnich "
+"dniach i zaprasza Cię do wysłania jakichś aktualności.\n"
+"\n"
+"Tak więc do usłyszenia. :)\n"
+"\n"
+"%3$s\n"
+"\n"
+"Nie odpowiadaj na tę wiadomość e-mail, nie dotrze ona do nich.\n"
+"\n"
+"Z poważaniem,\n"
+"%4$s\n"
+
+#: lib/mail.php:513
+#, 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 ""
+"Użytkownik %1$s (%2$s) wysłał Ci prywatną wiadomość:\n"
+"\n"
+"------------------------------------------------------\n"
+"%3$s\n"
+"------------------------------------------------------\n"
+"\n"
+"Tutaj możesz na nią odpowiedzieć:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Nie odpowiadaj na tę wiadomość e-mail, nie dotrze ona do nich.\n"
+"\n"
+"Z poważaniem,\n"
+"%5$s\n"
+
+#: lib/mail.php:598 lib/mail.php:600
+#, php-format
+msgid "%s sent a notice to your attention"
+msgstr "Użytkownik %s wysłał wpis wymagający Twojej uwagi"
+
+#: lib/mail.php:600 lib/mail.php:602
+#, php-format
+msgid ""
+"%1$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"
+"You can reply back here:\n"
+"\n"
+"\t%5$s\n"
+"\n"
+"The list of all @-replies for you here:\n"
+"\n"
+"%6$s\n"
+"\n"
+"Faithfully yours,\n"
+"%2$s\n"
+"\n"
+"P.S. You can turn off these email notifications here: %7$s\n"
+msgstr ""
+"Użytkownik %1$s właśnie wysłał wpis wymagający Twojej uwagi (odpowiedź \"@"
+"\") na %2$s.\n"
+"\n"
+"Twój wpis znajduje się tutaj:\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"Zawiera tekst:\n"
+"\n"
+"\t%4$s\n"
+"\n"
+"Tutaj możesz odpowiedzieć:\n"
+"\n"
+"\t%5$s\n"
+"\n"
+"Lista wszystkich odpowiedzi \"@\" do Ciebie znajduje siÄ™ tutaj:\n"
+"\n"
+"%6$s\n"
+"\n"
+"Z poważaniem,\n"
+"%2$s\n"
+"\n"
+"PS Tutaj możesz wyłączyć te powiadomienia przez e-mail: %7$s\n"
+
+#: lib/searchaction.php:122 lib/searchaction.php:120
+msgid "Search site"
+msgstr "Znajdź stronę"
+
+#: lib/section.php:106
+msgid "More..."
+msgstr "Więcej..."
+
+#: actions/all.php:80
+#, php-format
+msgid ""
+"This is the timeline for %s and friends but no one has posted anything yet."
+msgstr ""
+"To jest oś czasu użytkownika %s i przyjaciół, ale nikt jeszcze nic nie "
+"wysłał."
+
+#: actions/all.php:85
+#, php-format
+msgid ""
+"Try subscribing to more people, [join a group](%%action.groups%%) or post "
+"something yourself."
+msgstr ""
+"Spróbuj zasubskrybować więcej osób, [dołączyć do grupy](%%action.groups%%) "
+"lub wysłać coś samemu."
+
+#: actions/all.php:87
+#, php-format
+msgid ""
+"You can try to [nudge %s](../%s) from his profile or [post something to his "
+"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+"Możesz spróbować [szturchnąć użytkownika %s](../%s) z jego profilu lub "
+"[wysłać coś wymagającego jego uwagi](%%%%action.newnotice%%%%?"
+"status_textarea=%s)."
+
+#: actions/all.php:91 actions/replies.php:190 actions/showstream.php:361
+#, php-format
+msgid ""
+"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
+"post a notice to his or her attention."
+msgstr ""
+"Dlaczego nie [zarejestrujesz konta](%%%%action.register%%%%) i wtedy "
+"szturchniesz użytkownika %s lub wyślesz wpis wymagającego jego uwagi."
+
+#: actions/attachment.php:73
+msgid "No such attachment."
+msgstr "Nie ma takiego załącznika."
+
+#: actions/block.php:149
+msgid "Do not block this user from this group"
+msgstr "Nie blokuj tego użytkownika w tej grupie"
+
+#: actions/block.php:150
+msgid "Block this user from this group"
+msgstr "Zablokuj tego użytkownika w tej grupie"
+
+#: actions/blockedfromgroup.php:90
+#, php-format
+msgid "%s blocked profiles"
+msgstr "%s zablokowane profile"
+
+#: actions/blockedfromgroup.php:93
+#, php-format
+msgid "%s blocked profiles, page %d"
+msgstr "%s zablokowane profile, strona %d"
+
+#: actions/blockedfromgroup.php:108
+msgid "A list of the users blocked from joining this group."
+msgstr "Lista użytkowników zablokowanych w tej grupie."
+
+#: actions/blockedfromgroup.php:281
+msgid "Unblock user from group"
+msgstr "Odblokuj użytkownika w tej grupie"
+
+#: actions/conversation.php:99
+msgid "Conversation"
+msgstr "Rozmowa"
+
+#: actions/deletenotice.php:115
+msgid "Do not delete this notice"
+msgstr "Nie usuwaj tego wpisu"
+
+#: actions/editgroup.php:214 actions/newgroup.php:164
+#, php-format
+msgid "Too many aliases! Maximum %d."
+msgstr "Za dużo aliasów! Maksymalnie %d."
+
+#: actions/editgroup.php:223 actions/newgroup.php:173
+#, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "Nieprawidłowy alias: \"%s\""
+
+#: actions/editgroup.php:227 actions/newgroup.php:177
+#, php-format
+msgid "Alias \"%s\" already in use. Try another one."
+msgstr "Alias \"%s\" jest już używany. Spróbuj innego."
+
+#: actions/editgroup.php:233 actions/newgroup.php:183
+msgid "Alias can't be the same as nickname."
+msgstr "Alias nie może być taki sam jak pseudonim."
+
+#: actions/editgroup.php:259 actions/newgroup.php:215
+msgid "Could not create aliases."
+msgstr "Nie można utworzyć aliasów."
+
+#: actions/favorited.php:150
+msgid "Favorite notices appear on this page but no one has favorited one yet."
+msgstr ""
+"Ulubione wpisy są widoczne na tej stronie, ale nikt nie oznaczył jeszcze "
+"żadnego jako ulubiony."
+
+#: 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 ""
+"Bądź pierwszym, który doda wpis do ulubionych naciskając przycisk ulubionego "
+"obok wpisu, który Ci się podoba."
+
+#: 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 ""
+"Dlaczego nie [zarejestrujesz konta](%%action.register%%) i zostaniesz "
+"pierwszym, który doda wpis do ulubionych!"
+
+#: actions/file.php:34
+msgid "No notice id"
+msgstr "Brak identyfikatora wpisu"
+
+#: actions/file.php:38
+msgid "No notice"
+msgstr "Brak wpisu"
+
+#: actions/file.php:42
+msgid "No attachments"
+msgstr "Brak załączników"
+
+#: actions/file.php:51
+msgid "No uploaded attachments"
+msgstr "Nie wysłano załączników"
+
+#: actions/finishopenidlogin.php:211
+msgid "Not a valid invitation code."
+msgstr "To nie jest prawidłowy kod zaproszenia."
+
+#: actions/groupblock.php:81 actions/groupunblock.php:81
+#: actions/makeadmin.php:81
+msgid "No group specified."
+msgstr "Nie podano grupy."
+
+#: actions/groupblock.php:91
+msgid "Only an admin can block group members."
+msgstr "Tylko administrator może blokować członków grupy."
+
+#: actions/groupblock.php:95
+msgid "User is already blocked from group."
+msgstr "Użytkownik został już zablokował w grupie."
+
+#: actions/groupblock.php:100
+msgid "User is not a member of group."
+msgstr "Użytkownik nie jest członkiem grupy."
+
+#: actions/groupblock.php:136 actions/groupmembers.php:311
+msgid "Block user from group"
+msgstr "Zablokuj użytkownika w grupie"
+
+#: actions/groupblock.php:155
+#, php-format
+msgid ""
+"Are you sure you want to block user \"%s\" from the group \"%s\"? They will "
+"be removed from the group, unable to post, and unable to subscribe to the "
+"group in the future."
+msgstr ""
+"Jesteś pewny, że chcesz zablokować użytkownika \"%s\" w grupie \"%s\"? "
+"Zostanie usunięty z grupy, nie będzie mógł wysyłać wpisów i zasubskrybować "
+"grupy w przyszłości."
+
+#: actions/groupblock.php:193
+msgid "Database error blocking user from group."
+msgstr "Błąd bazy danych podczas blokowania użytkownika w grupie."
+
+#: actions/groupdesignsettings.php:73
+msgid "You must be logged in to edit a group."
+msgstr "Musisz być zalogowany, aby zmodyfikować grupę."
+
+#: actions/groupdesignsettings.php:146
+msgid "Group design"
+msgstr "WyglÄ…d grupy"
+
+#: actions/groupdesignsettings.php:157
+msgid ""
+"Customize the way your group looks with a background image and a colour "
+"palette of your choice."
+msgstr "Dostosuj wygląd grupy za pomocą wybranego obrazu tła i palety kolorów."
+
+#: actions/groupdesignsettings.php:267 actions/userdesignsettings.php:186
+#: lib/designsettings.php:440 lib/designsettings.php:470
+msgid "Couldn't update your design."
+msgstr "Nie można zaktualizować wyglądu."
+
+#: actions/groupdesignsettings.php:291 actions/groupdesignsettings.php:301
+#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
+#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+msgid "Unable to save your design settings!"
+msgstr "Nie można zapisać ustawień wyglądu!"
+
+#: actions/groupdesignsettings.php:312 actions/userdesignsettings.php:231
+msgid "Design preferences saved."
+msgstr "Zapisano preferencje wyglÄ…du."
+
+#: actions/groupmembers.php:438
+msgid "Make user an admin of the group"
+msgstr "Uczyń użytkownika administratorem grupy"
+
+#: actions/groupmembers.php:470
+msgid "Make Admin"
+msgstr "Uczyń administratorem"
+
+#: actions/groupmembers.php:470
+msgid "Make this user an admin"
+msgstr "Uczyń tego użytkownika administratorem"
+
+#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
+msgid "No results."
+msgstr "Brak wyników."
+
+#: 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 ""
+"Jeśli nie możesz znaleźć grupy, której szukasz, możesz sam [ją utworzyć](%%"
+"action.newgroup%%)."
+
+#: actions/groupsearch.php:85
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and [create the group](%%"
+"action.newgroup%%) yourself!"
+msgstr ""
+"Dlaczego nie [zarejestrujesz konta](%%action.register%%) i sam [utworzysz "
+"grupÄ™](%%action.newgroup%%)!"
+
+#: actions/groupunblock.php:91
+msgid "Only an admin can unblock group members."
+msgstr "Tylko administrator może odblokowywać członków grupy."
+
+#: actions/groupunblock.php:95
+msgid "User is not blocked from group."
+msgstr "Użytkownik nie został zablokowany w grupie."
+
+#: actions/invite.php:39
+msgid "Invites have been disabled."
+msgstr "Zaproszenia zostały wyłączone."
+
+#: actions/joingroup.php:100
+msgid "You have been blocked from that group by the admin."
+msgstr "Zostałeś zablokowany w tej grupie przez administratora."
+
+#: actions/makeadmin.php:91
+msgid "Only an admin can make another user an admin."
+msgstr "Tylko administrator może uczynić innego użytkownika administratorem."
+
+#: actions/makeadmin.php:95
+#, php-format
+msgid "%s is already an admin for group \"%s\"."
+msgstr "Użytkownika %s jest już administratorem grupy \"%s\"."
+
+#: actions/makeadmin.php:132
+#, php-format
+msgid "Can't get membership record for %s in group %s"
+msgstr "Nie można uzyskać wpisu członkostwa użytkownika %s w grupie %s"
+
+#: actions/makeadmin.php:145
+#, php-format
+msgid "Can't make %s an admin for group %s"
+msgstr "Nie można uczynić %s administratorem grupy %s"
+
+#: actions/newmessage.php:178
+msgid "Message sent"
+msgstr "Wysłano wiadomość"
+
+#: actions/newnotice.php:93 lib/designsettings.php:281
+#, php-format
+msgid ""
+"The server was unable to handle that much POST data (%s bytes) due to its "
+"current configuration."
+msgstr ""
+"Serwer nie może obsłużyć aż tyle danych POST (%s bajty) z powodu bieżącej "
+"konfiguracji."
+
+#: actions/newnotice.php:128 scripts/maildaemon.php:185
+#, php-format
+msgid " Try using another %s format."
+msgstr " Spróbuj innego formatu %s."
+
+#: actions/newnotice.php:133 scripts/maildaemon.php:190
+#, php-format
+msgid "%s is not a supported filetype on this server."
+msgstr "%s nie jest obsługiwanym typem pliku na tym serwerze."
+
+#: actions/newnotice.php:205
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
+msgstr "Wysłany plik przekracza dyrektywę upload_max_filesize w php.ini."
+
+#: actions/newnotice.php:208
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form."
+msgstr ""
+"Wysłany plik przekracza dyrektywę MAX_FILE_SIZE podaną w formularzu HTML."
+
+#: actions/newnotice.php:211
+msgid "The uploaded file was only partially uploaded."
+msgstr "Plik został tylko częściowo wysłany."
+
+#: actions/newnotice.php:214
+msgid "Missing a temporary folder."
+msgstr "Brak folderu tymczasowego."
+
+#: actions/newnotice.php:217
+msgid "Failed to write file to disk."
+msgstr "Zapisanie pliku na dysku nie powiodło się."
+
+#: actions/newnotice.php:220
+msgid "File upload stopped by extension."
+msgstr "Wysłanie pliku zostało zatrzymane przez rozszerzenie."
+
+#: actions/newnotice.php:230 scripts/maildaemon.php:85
+msgid "Couldn't save file."
+msgstr "Nie można zapisać pliku."
+
+#: actions/newnotice.php:246 scripts/maildaemon.php:101
+msgid "Max notice size is 140 chars, including attachment URL."
+msgstr "Maksymalny rozmiar wpisu to 140 znaków, w tym adres URL załącznika."
+
+#: actions/newnotice.php:297
+msgid "Somehow lost the login in saveFile"
+msgstr "W jakiś sposób zgubiono login w saveFile"
+
+#: actions/newnotice.php:309 scripts/maildaemon.php:127
+msgid "File could not be moved to destination directory."
+msgstr "Nie można przenieść pliku do katalogu docelowego."
+
+#: actions/newnotice.php:336 actions/newnotice.php:360
+#: scripts/maildaemon.php:148 scripts/maildaemon.php:167
+msgid "There was a database error while saving your file. Please try again."
+msgstr "Wystąpił błąd bazy danych podczas zapisywania pliku. Spróbuj ponownie."
+
+#: actions/noticesearch.php:121
+#, php-format
+msgid ""
+"Be the first to [post on this topic](%%%%action.newnotice%%%%?"
+"status_textarea=%s)!"
+msgstr ""
+"Zostań pierwszym, który [wyśle coś na ten temat](%%%%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 ""
+"Dlaczego nie [zarejestrujesz konta](%%%%action.register%%%%) i zostaniesz "
+"pierwszym, który [wyśle coś na ten temat](%%%%action.newnotice%%%%?"
+"status_textarea=%s)!"
+
+#: actions/openidsettings.php:70
+#, php-format
+msgid ""
+"[OpenID](%%doc.openid%%) lets you log into many sites with the same user "
+"account. Manage your associated OpenIDs from here."
+msgstr ""
+"[OpenID](%%doc.openid%%) umożliwia logowanie się do wielu stron za pomocą "
+"tego samego konta użytkownika. Tu można zarządzać powiązanymi "
+"identyfikatorami OpenID."
+
+#: actions/othersettings.php:110
+msgid "Shorten URLs with"
+msgstr "Skracaj adresy URL za pomocÄ…"
+
+#: actions/othersettings.php:115
+msgid "View profile designs"
+msgstr "Wyświetl ustawienia wyglądu profilu"
+
+#: actions/othersettings.php:116
+msgid "Show or hide profile designs."
+msgstr "Wyświetl lub ukryj ustawienia wyglądu profilu."
+
+#: actions/public.php:82
+#, php-format
+msgid "Beyond the page limit (%s)"
+msgstr "Poza ograniczeniem strony (%s)"
+
+#: actions/public.php:179
+#, php-format
+msgid ""
+"This is the public timeline for %%site.name%% but no one has posted anything "
+"yet."
+msgstr ""
+"To jest publiczna oÅ› czasu dla %%site.name%%, ale nikt jeszcze nic nie "
+"wysłał."
+
+#: actions/public.php:182
+msgid "Be the first to post!"
+msgstr "Zostań pierwszym, który coś wyśle!"
+
+#: actions/public.php:186
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post!"
+msgstr ""
+"Dlaczego nie [zarejestrujesz konta](%%action.register%%) i zostaniesz "
+"pierwszym, który coś wyśle!"
+
+#: actions/public.php:245
+#, 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 ""
+"To jest %%site.name%%, usługa [mikroblogowania](http://pl.wikipedia.org/wiki/"
+"Mikroblog) oparta na wolnym narzędziu [StatusNet](http://status.net/)."
+
+#: actions/publictagcloud.php:69
+#, php-format
+msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
+msgstr ""
+"Nikt jeszcze nie wysłał wpisu za pomocą [znacznika hasha](%%doc.tags%%)."
+
+#: actions/publictagcloud.php:72
+msgid "Be the first to post one!"
+msgstr "Zostań pierwszym, który go wyśle!"
+
+#: actions/publictagcloud.php:75
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post "
+"one!"
+msgstr ""
+"Dlaczego nie [zarejestrujesz konta](%%action.register%%) i zostaniesz "
+"pierwszym, który go wyśle!"
+
+#: actions/recoverpassword.php:152
+msgid ""
+"If you've forgotten or lost your password, you can get a new one sent to the "
+"email address you have stored in your account."
+msgstr ""
+"Jeśli zapomniałeś lub zgubiłeś swoje hasło, możesz otrzymać nowe, wysłane na "
+"adres e-mail, który podałeś."
+
+#: actions/recoverpassword.php:158
+msgid "You've been identified. Enter a new password below. "
+msgstr "Zostałeś zidentyfikowany. Podaj poniżej nowe hasło. "
+
+#: actions/recoverpassword.php:188
+msgid "Password recover"
+msgstr "Przywrócenie hasła"
+
+#: actions/register.php:86
+msgid "Sorry, invalid invitation code."
+msgstr "Przepraszamy, nieprawidłowy kod zaproszenia."
+
+#: actions/remotesubscribe.php:100
+msgid "Subscribe to a remote user"
+msgstr "Zasubskrybuj zdalnego użytkownika"
+
+#: actions/replies.php:179
+#, php-format
+msgid ""
+"This is the timeline showing replies to %s but %s hasn't received a notice "
+"to his attention yet."
+msgstr ""
+"To jest oś czasu wyświetlająca odpowiedzi na wpisy użytkownika %s, ale %s "
+"nie otrzymał jeszcze wpisów wymagających jego uwagi."
+
+#: actions/replies.php:184
+#, php-format
+msgid ""
+"You can engage other users in a conversation, subscribe to more people or "
+"[join groups](%%action.groups%%)."
+msgstr ""
+"Możesz nawiązać rozmowę z innymi użytkownikami, zasubskrybować więcej osób "
+"lub [dołączyć do grup](%%action.groups%%)."
+
+#: actions/replies.php:186
+#, php-format
+msgid ""
+"You can try to [nudge %s](../%s) or [post something to his or her attention]"
+"(%%%%action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+"Możesz spróbować [szturchnąć użytkownika %s](../%s) lub [wysłać coś "
+"wymagajÄ…cego jego uwagi](%%%%action.newnotice%%%%?status_textarea=%s)."
+
+#: actions/showfavorites.php:79
+#, php-format
+msgid "%s's favorite notices, page %d"
+msgstr "Ulubione wpisy użytkownika %s, strona %d"
+
+#: actions/showfavorites.php:170
+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 ""
+"Nie wybrałeś jeszcze żadnych ulubionych wpisów. Naciśnij przycisk ulubionego "
+"na wpisach, które chciałbyś dodać do zakładek na później lub rzucić na nie "
+"trochę światła."
+
+#: actions/showfavorites.php:172
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Post something interesting "
+"they would add to their favorites :)"
+msgstr ""
+"Użytkownik %s nie dodał jeszcze żadnych wpisów do ulubionych. Wyślij coś "
+"interesującego, aby chcieli dodać to do swoich ulubionych. :)"
+
+#: actions/showfavorites.php:176
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Why not [register an "
+"account](%%%%action.register%%%%) and then post something interesting they "
+"would add to thier favorites :)"
+msgstr ""
+"Użytkownik %s nie dodał jeszcze żadnych wpisów do ulubionych. Dlaczego nie "
+"[zarejestrujesz konta](%%%%action.register%%%%) i wyślesz coś "
+"interesującego, aby chcieli dodać to do swoich ulubionych. :)"
+
+#: actions/showfavorites.php:226
+msgid "This is a way to share what you like."
+msgstr "To jest sposób na współdzielenie tego, co chcesz."
+
+#: actions/showgroup.php:279 lib/groupeditform.php:178
+msgid "Aliases"
+msgstr "Aliasy"
+
+#: actions/showgroup.php:323
+#, php-format
+msgid "Notice feed for %s group (RSS 1.0)"
+msgstr "Kanał wpisów dla grupy %s (RSS 1.0)"
+
+#: actions/showgroup.php:330 actions/tag.php:84
+#, php-format
+msgid "Notice feed for %s group (RSS 2.0)"
+msgstr "Kanał wpisów dla grupy %s (RSS 2.0)"
+
+#: actions/showgroup.php:337
+#, php-format
+msgid "Notice feed for %s group (Atom)"
+msgstr "Kanał wpisów dla grupy %s (Atom)"
+
+#: actions/showgroup.php:446
+#, php-format
+msgid ""
+"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. Its members share short messages about "
+"their life and interests. "
+msgstr ""
+"**%s** jest grupą użytkowników na %%%%site.name%%%%, usłudze "
+"[mikroblogowania](http://pl.wikipedia.org/wiki/Mikroblog) opartej na wolnym "
+"narzędziu [StatusNet](http://status.net/). Jej członkowie dzielą się "
+"krótkimi wiadomościami o swoim życiu i zainteresowaniach. "
+
+#: actions/showgroup.php:474
+msgid "Admins"
+msgstr "Administratorzy"
+
+#: actions/shownotice.php:101
+msgid "Not a local notice"
+msgstr "Nie jest lokalnym wpisem"
+
+#: actions/showstream.php:72
+#, php-format
+msgid " tagged %s"
+msgstr " ze znacznikiem %s"
+
+#: actions/showstream.php:121
+#, php-format
+msgid "Notice feed for %s tagged %s (RSS 1.0)"
+msgstr "Kanał wpisów dla %s ze znacznikiem %s (RSS 1.0)"
+
+#: actions/showstream.php:350
+#, php-format
+msgid "This is the timeline for %s but %s hasn't posted anything yet."
+msgstr ""
+"To jest oś czasu dla użytkownika %s, ale %s nie nic jeszcze nie wysłał."
+
+#: actions/showstream.php:355
+msgid ""
+"Seen anything interesting recently? You haven't posted any notices yet, now "
+"would be a good time to start :)"
+msgstr ""
+"Widziałeś ostatnio coś interesującego? Nie wysłałeś jeszcze żadnych wpisów, "
+"teraz jest dobry czas, aby zacząć. :)"
+
+#: actions/showstream.php:357
+#, php-format
+msgid ""
+"You can try to nudge %s or [post something to his or her attention](%%%%"
+"action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+"Możesz spróbować szturchnąć użytkownika %s lub [wysłać coś, co wymaga jego "
+"uwagi](%%%%action.newnotice%%%%?status_textarea=%s)."
+
+#: actions/showstream.php:393
+#, php-format
+msgid ""
+"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. "
+msgstr ""
+"**%s** posiada konto na %%%%site.name%%%%, usłudze [mikroblogowania](http://"
+"pl.wikipedia.org/wiki/Mikroblog) opartej na wolnym narzędziu [StatusNet]"
+"(http://status.net/). "
+
+#: actions/subscribers.php:108
+msgid ""
+"You have no subscribers. Try subscribing to people you know and they might "
+"return the favor"
+msgstr ""
+"Nie masz żadnych subskrybentów. Spróbuj zasubskrybować osoby, które znasz, a "
+"oni mogą się odwdzięczyć"
+
+#: actions/subscribers.php:110
+#, php-format
+msgid "%s has no subscribers. Want to be the first?"
+msgstr "Użytkownik %s nie posiada subskrybentów. Chcesz być pierwszym?"
+
+#: actions/subscribers.php:114
+#, php-format
+msgid ""
+"%s has no subscribers. Why not [register an account](%%%%action.register%%%"
+"%) and be the first?"
+msgstr ""
+"Użytkownik %s nie posiada subskrybentów. Dlaczego nie [zarejestrujesz konta]"
+"(%%%%action.register%%%%) i zostaniesz pierwszym?"
+
+#: actions/subscriptions.php:115
+#, 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 ""
+"Nie obserwujesz teraz wpisów innych użytkowników. Spróbuj zasubskrybować "
+"osoby, które znasz. Spróbuj [znaleźć kogoś](%%action.peoplesearch%%), "
+"poszukać członków grup, które Cię interesują, a także [znanych użytkowników]"
+"(%%action.featured%%). Jeśli jesteś [użytkownikiem Twittera](%%action."
+"twittersettings%%), możesz automatycznie zasubskrybowć osoby, które tam już "
+"obserwujesz."
+
+#: actions/subscriptions.php:117 actions/subscriptions.php:121
+#, php-format
+msgid "%s is not listening to anyone."
+msgstr "Użytkownik %s nie obserwuje nikogo."
+
+#: actions/tag.php:77
+#, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr "Kanał wpisów dla znacznika %s (RSS 1.0)"
+
+#: actions/tag.php:91
+#, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr "Kanał wpisów dla znacznika %s (Atom)"
+
+#: actions/twitapifavorites.php:125
+msgid "This status is already a favorite!"
+msgstr "Ten status jest już ulubiony!"
+
+#: actions/twitapifavorites.php:179
+msgid "That status is not a favorite!"
+msgstr "Ten status nie jest ulubiony!"
+
+#: actions/twitapifriendships.php:180 actions/twitapifriendships.php:200
+msgid "Could not determine source user."
+msgstr "Nie można określić użytkownika źródłowego."
+
+#: actions/twitapifriendships.php:215
+msgid "Target user not specified."
+msgstr "Nie podano użytkownika docelowego."
+
+#: actions/twitapifriendships.php:221
+msgid "Could not find target user."
+msgstr "Nie można znaleźć użytkownika docelowego."
+
+#: actions/twitapistatuses.php:322
+#, php-format
+msgid "%1$s / Updates mentioning %2$s"
+msgstr "%1$s/aktualizacje wspominajÄ…ce %2$s"
+
+#: actions/twitapitags.php:74
+#, php-format
+msgid "Updates tagged with %1$s on %2$s!"
+msgstr "Aktualizacje ze znacznikiem %1$s na %2$s!"
+
+#: actions/twittersettings.php:165
+msgid "Import my Friends Timeline."
+msgstr "Zaimportuj oś czasu przyjaciół."
+
+#: actions/userauthorization.php:158
+msgid "License"
+msgstr "Licencja"
+
+#: actions/userauthorization.php:179
+msgid "Reject this subscription"
+msgstr "Odrzuć tę subskrypcję"
+
+#: actions/userdesignsettings.php:76 lib/designsettings.php:65
+msgid "Profile design"
+msgstr "WyglÄ…d profilu"
+
+#: actions/userdesignsettings.php:87 lib/designsettings.php:76
+msgid ""
+"Customize the way your profile looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
+"Dostosuj wygląd profilu za pomocą wybranego obrazu tła i palety kolorów."
+
+#: actions/userdesignsettings.php:282
+msgid "Enjoy your hotdog!"
+msgstr "Smacznego hot-doga!"
+
+#: actions/usergroups.php:153
+#, php-format
+msgid "%s is not a member of any group."
+msgstr "Użytkownik %s nie jest członkiem żadnej grupy."
+
+#: actions/usergroups.php:158
+#, php-format
+msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
+msgstr "Spróbuj [wyszukać grupy](%%action.groupsearch%%) i dołączyć do nich."
+
+#: classes/File.php:127
+#, php-format
+msgid ""
+"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
+"to upload a smaller version."
+msgstr ""
+"Żaden plik nie może być większy niż %d bajty, a wysłany plik miał %d bajty. "
+"Spróbuj wysłać mniejszą wersję."
+
+#: classes/File.php:137
+#, php-format
+msgid "A file this large would exceed your user quota of %d bytes."
+msgstr ""
+"Plik tej wielkości przekroczyłby przydział użytkownika wynoszący %d bajty."
+
+#: classes/File.php:145
+#, php-format
+msgid "A file this large would exceed your monthly quota of %d bytes."
+msgstr ""
+"Plik tej wielkości przekroczyłby miesięczny przydział użytkownika wynoszący %"
+"d bajty."
+
+#: classes/Notice.php:139
+msgid "Problem saving notice. Too long."
+msgstr "Problem podczas zapisywania wpisu. Za długi."
+
+#: classes/User.php:319
+#, php-format
+msgid "Welcome to %1$s, @%2$s!"
+msgstr "Witaj w %1$s, @%2$s!"
+
+#: lib/accountsettingsaction.php:119 lib/groupnav.php:118
+msgid "Design"
+msgstr "WyglÄ…d"
+
+#: lib/accountsettingsaction.php:120
+msgid "Design your profile"
+msgstr "WyglÄ…d profilu"
+
+#: lib/action.php:712
+msgid "TOS"
+msgstr "TOS"
+
+#: lib/attachmentlist.php:87
+msgid "Attachments"
+msgstr "Załączniki"
+
+#: lib/attachmentlist.php:265
+msgid "Author"
+msgstr "Autor"
+
+#: lib/attachmentlist.php:278
+msgid "Provider"
+msgstr "Dostawca"
+
+#: lib/attachmentnoticesection.php:67
+msgid "Notices where this attachment appears"
+msgstr "Powiadamia, kiedy pojawia się ten załącznik"
+
+#: lib/attachmenttagcloudsection.php:48
+msgid "Tags for this attachment"
+msgstr "Znaczniki dla tego załącznika"
+
+#: lib/designsettings.php:101
+msgid "Change background image"
+msgstr "Zmień obraz tłas"
+
+#: lib/designsettings.php:105
+msgid "Upload file"
+msgstr "Wyślij plik"
+
+#: lib/designsettings.php:109
+msgid ""
+"You can upload your personal background image. The maximum file size is 2Mb."
+msgstr "Można wysłać swój osobisty obraz. Maksymalny rozmiar pliku to 2 MB."
+
+#: lib/designsettings.php:139
+msgid "On"
+msgstr "WÅ‚Ä…czone"
+
+#: lib/designsettings.php:155
+msgid "Off"
+msgstr "Wyłączone"
+
+#: lib/designsettings.php:156
+msgid "Turn background image on or off."
+msgstr "Włącz lub wyłącz obraz tła."
+
+#: lib/designsettings.php:161
+msgid "Tile background image"
+msgstr "Kafelkowy obraz tła"
+
+#: lib/designsettings.php:170
+msgid "Change colours"
+msgstr "Zmień kolory"
+
+#: lib/designsettings.php:178
+msgid "Background"
+msgstr "TÅ‚o"
+
+#: lib/designsettings.php:191
+msgid "Content"
+msgstr "Zawartość"
+
+#: lib/designsettings.php:204
+msgid "Sidebar"
+msgstr "Panel boczny"
+
+#: lib/designsettings.php:230
+msgid "Links"
+msgstr "Odnośniki"
+
+#: lib/designsettings.php:247
+msgid "Use defaults"
+msgstr "Użyj domyślnych"
+
+#: lib/designsettings.php:248
+msgid "Restore default designs"
+msgstr "Przywróć domyślny wygląd"
+
+#: lib/designsettings.php:254
+msgid "Reset back to default"
+msgstr "Przywróć domyślne ustawienia"
+
+#: lib/designsettings.php:257
+msgid "Save design"
+msgstr "Zapisz wyglÄ…d"
+
+#: lib/designsettings.php:378
+msgid "Bad default color settings: "
+msgstr "Błędne domyślne ustawienia koloru: "
+
+#: lib/designsettings.php:474
+msgid "Design defaults restored."
+msgstr "Przywrócono domyślny wygląd."
+
+#: lib/groupeditform.php:181
+#, php-format
+msgid "Extra nicknames for the group, comma- or space- separated, max %d"
+msgstr ""
+"Dodatkowe pseudonimy grupy, oddzielone przecinkami lub spacjami, maksymalnie "
+"%d"
+
+#: lib/groupnav.php:100
+msgid "Blocked"
+msgstr "Zablokowano"
+
+#: lib/groupnav.php:101
+#, php-format
+msgid "%s blocked users"
+msgstr "%s zablokowani użytkownicy"
+
+#: lib/groupnav.php:119
+#, php-format
+msgid "Add or edit %s design"
+msgstr "Dodaj lub edytuj wyglÄ…d %s"
+
+#: lib/mail.php:556
+#, php-format
+msgid ""
+"%1$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 ""
+"%1$s właśnie dodał Twój wpis z %2$s jako jeden ze swoich ulubionych.\n"
+"\n"
+"Adres URL Twojego wpisu:\n"
+"\n"
+"%3$s\n"
+"\n"
+"Tekst Twojego wpisu:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Tutaj możesz zobaczyć listę ulubionych wpisów użytkownika %1$s:\n"
+"\n"
+"%5$s\n"
+"\n"
+"Z poważaniem,\n"
+"%6$s\n"
+
+#: lib/mail.php:646
+#, php-format
+msgid "Your Twitter bridge has been disabled."
+msgstr "Mostek Twittera został wyłączony."
+
+#: lib/mail.php:648
+#, php-format
+msgid ""
+"Hi, %1$s. We're sorry to inform you that your link to Twitter has been "
+"disabled. Your Twitter credentials have either changed (did you recently "
+"change your Twitter password?) or you have otherwise revoked our access to "
+"your Twitter account.\n"
+"\n"
+"You can re-enable your Twitter bridge by visiting your Twitter settings "
+"page:\n"
+"\n"
+"\t%2$s\n"
+"\n"
+"Regards,\n"
+"%3$s\n"
+msgstr ""
+"Witaj, %1$s. Przykro nam poinformować, że Twój odnośnik do Twittera został "
+"wyłączony. Albo zmieniłeś dane uwierzytelniające Twittera (zmieniałeś "
+"ostatnio hasło?), albo w inny sposób zablokowałeś nam dostęp do swojego "
+"konta.\n"
+"\n"
+"Można ponownie włączyć mostek Twittera odwiedzając stronę ustawień "
+"Twittera:\n"
+"\n"
+"\t%2$s\n"
+"\n"
+"Z poważaniem,\n"
+"%3$s\n"
+
+#: lib/mail.php:682
+#, php-format
+msgid "Your %s Facebook application access has been disabled."
+msgstr "Dostęp do aplikacji Facebooka %s został wyłączony."
+
+#: lib/mail.php:685
+#, php-format
+msgid ""
+"Hi, %1$s. We're sorry to inform you that we are unable to update your "
+"Facebook status from %s, and have disabled the Facebook application for your "
+"account. This may be because you have removed the Facebook application's "
+"authorization, or have deleted your Facebook account. You can re-enable the "
+"Facebook application and automatic status updating by re-installing the %1$s "
+"Facebook application.\n"
+"\n"
+"Regards,\n"
+"\n"
+"%1$s"
+msgstr ""
+"Witaj, %1$s. Przykro nam poinformować, że nie możemy zaktualizować Twojego "
+"statusu Facebook z %s i wyłączyliśmy aplikację Facebooka dla Twojego konta. "
+"Mogło to być spowodowane usunięciem przez Ciebie upoważnienia aplikacji "
+"Facebook lub usunięciem Twojego konta Facebook. Można ponownie włączyć "
+"aplikacjÄ™ Facebook i automatyczne aktualizowanie statusu przez ponowne "
+"zainstalowanie aplikacji Facebooka %1$s.\n"
+"\n"
+"Z poważaniem,\n"
+"\n"
+"%1$s"
+
+#: 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 ""
+"Brak prywatnych wiadomości. Można wysłać prywatną wiadomość, aby nawiązać "
+"rozmowę z innymi użytkownikami. Inni mogą wysyłać Ci wiadomości tylko dla "
+"Twoich oczu."
+
+#: lib/noticeform.php:154
+msgid "Attach"
+msgstr "Załącz"
+
+#: lib/noticeform.php:158
+msgid "Attach a file"
+msgstr "Załącz plik"
+
+#: lib/noticelist.php:436
+msgid "in context"
+msgstr "w rozmowie"
+
+#: lib/profileaction.php:177
+msgid "User ID"
+msgstr "Identyfikator użytkownika"
+
+#: lib/searchaction.php:156
+msgid "Search help"
+msgstr "Znajdź w pomocy"
+
+#: lib/subscriberspeopleselftagcloudsection.php:48
+#: lib/subscriptionspeopleselftagcloudsection.php:48
+msgid "People Tagcloud as self-tagged"
+msgstr "Chmura znaczników osób, które same sobie nadały znaczniki"
+
+#: lib/subscriberspeopletagcloudsection.php:48
+#: lib/subscriptionspeopletagcloudsection.php:48
+msgid "People Tagcloud as tagged"
+msgstr "Chmura znaczników osób ze znacznikami"
+
+#: lib/webcolor.php:82
+#, php-format
+msgid "%s is not a valid color!"
+msgstr "%s nie jest prawidłowym kolorem!"
+
+#: lib/webcolor.php:123
+#, php-format
+msgid "%s is not a valid color! Use 3 or 6 hex chars."
+msgstr ""
+"%s nie jest prawidłowym kolorem! Użyj trzech lub sześciu znaków "
+"szesnastkowych."
diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.mo b/locale/zh_CN/LC_MESSAGES/statusnet.mo
index a7a79f40c..7984ab714 100644
--- a/locale/zh_CN/LC_MESSAGES/statusnet.mo
+++ b/locale/zh_CN/LC_MESSAGES/statusnet.mo
Binary files differ
diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po
index 529d2f4f8..5c2eced4e 100644
--- a/locale/zh_CN/LC_MESSAGES/statusnet.po
+++ b/locale/zh_CN/LC_MESSAGES/statusnet.po
@@ -8,8 +8,8 @@ msgstr ""
"Project-Id-Version: identi.ca\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-01-25 16:24+0000\n"
-"PO-Revision-Date: 2009-04-28 22:31+0000\n"
-"Last-Translator: doubliu <doubliu@gmail.com>\n"
+"PO-Revision-Date: 2009-07-28 14:03+0000\n"
+"Last-Translator: offacer <offacer@gmail.com>\n"
"Language-Team: i18n-zh <i18n-zh@googlegroups.com>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,7 +20,7 @@ msgstr ""
#: actions/noticesearchrss.php:88
#, php-format
msgid " Search Stream for \"%s\""
-msgstr "æœç´¢æœ‰å…³\"%s\"çš„èšåˆ"
+msgstr "æœç´¢æœ‰å…³\"%s\"的消æ¯"
#: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
#: actions/finishopenidlogin.php:88 actions/register.php:205
@@ -364,7 +364,7 @@ msgstr "已订阅ï¼"
#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
#: actions/deletenotice.php:113
msgid "Are you sure you want to delete this notice?"
-msgstr "确定è¦åˆ é™¤è¿™æ¡é€šå‘Šå—?"
+msgstr "确定è¦åˆ é™¤è¿™æ¡æ¶ˆæ¯å—?"
#: ../actions/userauthorization.php:77 actions/userauthorization.php:83
#: actions/userauthorization.php:81
@@ -415,13 +415,13 @@ msgstr "等待确认此电è¯å·ç ã€‚"
#: ../lib/util.php:1318 lib/util.php:1452
#, fuzzy
msgid "Before »"
-msgstr "ä¹‹å‰ Â»"
+msgstr "下一页 »"
#: ../actions/profilesettings.php:49 ../actions/register.php:170
#: actions/profilesettings.php:82 actions/register.php:184
#: actions/profilesettings.php:112 actions/register.php:402
msgid "Bio"
-msgstr "个人å°ä¼ "
+msgstr "自述"
#: ../actions/profilesettings.php:101 ../actions/register.php:82
#: ../actions/updateprofile.php:103 actions/profilesettings.php:216
@@ -429,7 +429,7 @@ msgstr "个人å°ä¼ "
#: actions/profilesettings.php:205 actions/register.php:174
#: actions/updateprofile.php:107
msgid "Bio is too long (max 140 chars)."
-msgstr "个人å°ä¼ è¿‡é•¿(ä¸èƒ½è¶…过140字符)。"
+msgstr "自述过长(ä¸èƒ½è¶…过140字符)。"
#: ../lib/deleteaction.php:41 lib/deleteaction.php:41 lib/deleteaction.php:69
msgid "Can't delete this notice."
@@ -3367,15 +3367,13 @@ msgid "%s and friends, page %d"
msgstr "%s åŠå¥½å‹"
#: actions/avatarsettings.php:76
-#, fuzzy
msgid "You can upload your personal avatar."
-msgstr "您å¯ä»¥åœ¨è¿™é‡Œæ›´æ–°ä¸ªäººä¿¡æ¯ã€‚"
+msgstr "您å¯ä»¥åœ¨è¿™é‡Œä¸Šä¼ ä¸ªäººå¤´åƒã€‚"
#: actions/avatarsettings.php:117 actions/avatarsettings.php:191
#: actions/grouplogo.php:250
-#, fuzzy
msgid "Avatar settings"
-msgstr "Twitter 设置"
+msgstr "头åƒè®¾ç½®"
#: actions/avatarsettings.php:124 actions/avatarsettings.php:199
#: actions/grouplogo.php:198 actions/grouplogo.php:258
@@ -3421,9 +3419,8 @@ msgstr "没有这份通告。"
#: actions/avatarsettings.php:349 actions/avatarsettings.php:383
#: actions/grouplogo.php:406 actions/grouplogo.php:440
#: classes/User_group.php:129 classes/User_group.php:161
-#, fuzzy
msgid "Unknown file type"
-msgstr "ä¸æ”¯æŒè¿™ç§ç±»åž‹çš„文件"
+msgstr "未知文件类型"
#: actions/block.php:69 actions/subedit.php:46 actions/unblock.php:70
#, fuzzy
@@ -3481,9 +3478,8 @@ msgstr "使用组功能å‰å¿…须使能邮箱"
# before login, the user don't even see any Chinese translation. Anyway. This may be good for the future.
#: actions/editgroup.php:71 actions/grouplogo.php:71 actions/newgroup.php:70
-#, fuzzy
msgid "You must be logged in to create a group."
-msgstr "您必须登录æ‰èƒ½åˆ›å»ºç»„ %s"
+msgstr "您必须登录æ‰èƒ½åˆ›å»ºå°ç»„。"
#: actions/editgroup.php:87 actions/grouplogo.php:87
#: actions/groupmembers.php:76 actions/joingroup.php:81
diff --git a/plugins/Autocomplete/Autocomplete.js b/plugins/Autocomplete/Autocomplete.js
index dfadea004..3eff685a8 100644
--- a/plugins/Autocomplete/Autocomplete.js
+++ b/plugins/Autocomplete/Autocomplete.js
@@ -1,38 +1,37 @@
$(document).ready(function(){
- $.getJSON($('address .url')[0].href+'/api/statuses/friends.json?user_id=' + current_user['id'] + '&lite=true&callback=?',
- function(friends){
- $('#notice_data-text').autocomplete(friends, {
+ $('#notice_data-text').autocomplete($('address .url')[0].href+'/plugins/Autocomplete/autocomplete.json', {
multiple: true,
multipleSeparator: " ",
minChars: 1,
formatItem: function(row, i, max){
- return '@' + row.screen_name + ' (' + row.name + ')';
+ row = eval("(" + row + ")");
+ switch(row.type)
+ {
+ case 'user':
+ return row.nickname + ' (' + row.fullname + ')';
+ case 'group':
+ return row.nickname + ' (' + row.fullname + ')';
+ }
},
formatMatch: function(row, i, max){
- return '@' + row.screen_name;
+ row = eval("(" + row + ")");
+ switch(row.type)
+ {
+ case 'user':
+ return row.nickname;
+ case 'group':
+ return row.nickname;
+ }
},
formatResult: function(row){
- return '@' + row.screen_name;
+ row = eval("(" + row + ")");
+ switch(row.type)
+ {
+ case 'user':
+ return '@' + row.nickname;
+ case 'group':
+ return '!' + row.nickname;
+ }
}
});
- }
- );
- $.getJSON($('address .url')[0].href+'/api/statusnet/groups/list.json?user_id=' + current_user['id'] + '&callback=?',
- function(groups){
- $('#notice_data-text').autocomplete(groups, {
- multiple: true,
- multipleSeparator: " ",
- minChars: 1,
- formatItem: function(row, i, max){
- return '!' + row.nickname + ' (' + row.fullname + ')';
- },
- formatMatch: function(row, i, max){
- return '!' + row.nickname;
- },
- formatResult: function(row){
- return '!' + row.nickname;
- }
- });
- }
- );
});
diff --git a/plugins/Autocomplete/AutocompletePlugin.php b/plugins/Autocomplete/AutocompletePlugin.php
index b75397270..baaec73c1 100644
--- a/plugins/Autocomplete/AutocompletePlugin.php
+++ b/plugins/Autocomplete/AutocompletePlugin.php
@@ -31,6 +31,8 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
exit(1);
}
+require_once(INSTALLDIR.'/plugins/Autocomplete/autocomplete.php');
+
class AutocompletePlugin extends Plugin
{
function __construct()
@@ -40,13 +42,6 @@ class AutocompletePlugin extends Plugin
function onEndShowScripts($action){
if (common_logged_in()) {
- $current_user = common_current_user();
- $js_string = <<<EOT
-<script type="text/javascript">
-var current_user = { id: '$current_user->id' };
-</script>
-EOT;
- $action->raw($js_string);
$action->script('plugins/Autocomplete/jquery-autocomplete/jquery.autocomplete.pack.js');
$action->script('plugins/Autocomplete/Autocomplete.js');
}
@@ -59,5 +54,12 @@ EOT;
}
}
+ function onRouterInitialized($m)
+ {
+ if (common_logged_in()) {
+ $m->connect('plugins/Autocomplete/autocomplete.json', array('action'=>'autocomplete'));
+ }
+ }
+
}
?>
diff --git a/plugins/Autocomplete/autocomplete.php b/plugins/Autocomplete/autocomplete.php
new file mode 100644
index 000000000..aa57b3915
--- /dev/null
+++ b/plugins/Autocomplete/autocomplete.php
@@ -0,0 +1,136 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * List users for autocompletion
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category Plugin
+ * @package StatusNet
+ * @author Craig Andrews <candrews@integralblue.com>
+ * @copyright 2008-2009 StatusNet, Inc.
+ * @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);
+}
+
+/**
+ * List users for autocompletion
+ *
+ * This is the form for adding a new g
+ *
+ * @category Plugin
+ * @package StatusNet
+ * @author Craig Andrews <candrews@integralblue.com>
+ * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link http://status.net/
+ */
+
+class AutocompleteAction extends Action
+{
+ private $result;
+
+ /**
+ * Last-modified date for page
+ *
+ * When was the content of this page last modified? Based on notice,
+ * profile, avatar.
+ *
+ * @return int last-modified date as unix timestamp
+ */
+ function lastModified()
+ {
+ $max=0;
+ foreach($this->users as $user){
+ $max = max($max,strtotime($user->modified),strtotime($user->profile->modified));
+ }
+ foreach($this->groups as $group){
+ $max = max($max,strtotime($group->modified));
+ }
+ return $max;
+ }
+
+ /**
+ * An entity tag for this page
+ *
+ * Shows the ETag for the page, based on the notice ID and timestamps
+ * for the notice, profile, and avatar. It's weak, since we change
+ * the date text "one hour ago", etc.
+ *
+ * @return string etag
+ */
+ function etag()
+ {
+ return '"' . implode(':', array($this->arg('action'),
+ crc32($this->arg('q')), //the actual string can have funny characters in we don't want showing up in the etag
+ $this->arg('limit'),
+ $this->lastModified())) . '"';
+ }
+
+ function prepare($args)
+ {
+ parent::prepare($args);
+ $this->groups=array();
+ $this->users=array();
+ $q = $this->arg('q');
+ $limit = $this->arg('limit');
+ if($limit > 200) $limit=200; //prevent DOS attacks
+ if(substr($q,0,1)=='@'){
+ //user search
+ $q=substr($q,1);
+ $user = new User();
+ $user->limit($limit);
+ $user->whereAdd('nickname like \'' . trim($user->escape($q), '\'') . '%\'');
+ $user->find();
+ while($user->fetch()) {
+ $profile = Profile::staticGet($user->id);
+ $user->profile=$profile;
+ $this->users[]=$user;
+ }
+ }
+ if(substr($q,0,1)=='!'){
+ //group search
+ $q=substr($q,1);
+ $group = new User_group();
+ $group->limit($limit);
+ $group->whereAdd('nickname like \'' . trim($group->escape($q), '\'') . '%\'');
+ $group->find();
+ while($group->fetch()) {
+ $this->groups[]=$group;
+ }
+ }
+ return true;
+ }
+
+ function handle($args)
+ {
+ parent::handle($args);
+ $results = array();
+ foreach($this->users as $user){
+ $results[]=array('nickname' => $user->nickname, 'fullname'=> $user->profile->fullname, 'type'=>'user');
+ }
+ foreach($this->groups as $group){
+ $results[]=array('nickname' => $group->nickname, 'fullname'=> $group->fullname, 'type'=>'group');
+ }
+ foreach($results as $result) {
+ print json_encode($result) . "\n";
+ }
+ }
+}
diff --git a/plugins/Autocomplete/readme.txt b/plugins/Autocomplete/readme.txt
index 3272aa1ee..1db4c6565 100644
--- a/plugins/Autocomplete/readme.txt
+++ b/plugins/Autocomplete/readme.txt
@@ -1,5 +1,7 @@
Autocomplete allows users to autocomplete screen names in @ replies. When an "@" is typed into the notice text area, an autocomplete box is displayed populated with the user's friends' screen names.
+Note: This plugin doesn't work if the site is in Private mode, i.e. when $config['site']['private'] is set to true.
+
Installation
============
Add "addPlugin('Autocomplete');" to the bottom of your config.php
diff --git a/plugins/FBConnect/FBCLoginGroupNav.php b/plugins/FBConnect/FBCLoginGroupNav.php
index 6e12c2040..81b2520a4 100644
--- a/plugins/FBConnect/FBCLoginGroupNav.php
+++ b/plugins/FBConnect/FBCLoginGroupNav.php
@@ -78,16 +78,20 @@ class FBCLoginGroupNav extends Widget
// action => array('prompt', 'title')
$menu = array();
- $menu['login'] = array(_('Login'),
- _('Login with a username and password'));
-
- if (!(common_config('site','closed') || common_config('site','inviteonly'))) {
- $menu['register'] = array(_('Register'),
- _('Sign up for a new account'));
+ if (!common_config('site','openidonly')) {
+ $menu['login'] = array(_('Login'),
+ _('Login with a username and password'));
+
+ if (!(common_config('site','closed') || common_config('site','inviteonly'))) {
+ $menu['register'] = array(_('Register'),
+ _('Sign up for a new account'));
+ }
}
- $menu['openidlogin'] = array(_('OpenID'),
- _('Login or register with OpenID'));
+ if (common_config('openid', 'enabled')) {
+ $menu['openidlogin'] = array(_('OpenID'),
+ _('Login or register with OpenID'));
+ }
$menu['FBConnectLogin'] = array(_('Facebook'),
_('Login or register using Facebook'));
diff --git a/plugins/FBConnect/FBCSettingsNav.php b/plugins/FBConnect/FBCSettingsNav.php
index 29724d6bd..ed02371e2 100644
--- a/plugins/FBConnect/FBCSettingsNav.php
+++ b/plugins/FBConnect/FBCSettingsNav.php
@@ -77,32 +77,34 @@ class FBCSettingsNav extends Widget
$this->action->elementStart('dd');
# action => array('prompt', 'title')
- $menu =
- array('imsettings' =>
- array(_('IM'),
- _('Updates by instant messenger (IM)')),
- 'smssettings' =>
- array(_('SMS'),
- _('Updates by SMS')),
- 'twittersettings' =>
- array(_('Twitter'),
- _('Twitter integration options')),
- 'FBConnectSettings' =>
- array(_('Facebook'),
- _('Facebook Connect settings')));
+ $menu = array();
+ if (common_config('xmpp', 'enabled')) {
+ $menu['imsettings'] =
+ array(_('IM'),
+ _('Updates by instant messenger (IM)'));
+ }
+ if (common_config('sms', 'enabled')) {
+ $menu['smssettings'] =
+ array(_('SMS'),
+ _('Updates by SMS'));
+ }
+ if (common_config('twitter', 'enabled')) {
+ $menu['twittersettings'] =
+ array(_('Twitter'),
+ _('Twitter integration options'));
+ }
+ $menu['FBConnectSettings'] =
+ array(_('Facebook'),
+ _('Facebook Connect settings'));
$action_name = $this->action->trimmed('action');
$this->action->elementStart('ul', array('class' => 'nav'));
foreach ($menu as $menuaction => $menudesc) {
- if ($menuaction == 'imsettings' &&
- !common_config('xmpp', 'enabled')) {
- continue;
- }
$this->action->menuItem(common_local_url($menuaction),
- $menudesc[0],
- $menudesc[1],
- $action_name === $menuaction);
+ $menudesc[0],
+ $menudesc[1],
+ $action_name === $menuaction);
}
$this->action->elementEnd('ul');
diff --git a/plugins/FBConnect/FBConnectPlugin.php b/plugins/FBConnect/FBConnectPlugin.php
index 593b49b4e..ff74aade4 100644
--- a/plugins/FBConnect/FBConnectPlugin.php
+++ b/plugins/FBConnect/FBConnectPlugin.php
@@ -232,6 +232,14 @@ class FBConnectPlugin extends Plugin
{
$user = common_current_user();
+ $connect = 'FBConnectSettings';
+ if (common_config('xmpp', 'enabled')) {
+ $connect = 'imsettings';
+ } else if (common_config('sms', 'enabled')) {
+ $connect = 'smssettings';
+ } else if (common_config('twitter', 'enabled')) {
+ $connect = 'twittersettings';
+ }
if (!empty($user)) {
@@ -266,13 +274,8 @@ class FBConnectPlugin extends Plugin
_('Home'), _('Personal profile and friends timeline'), false, 'nav_home');
$action->menuItem(common_local_url('profilesettings'),
_('Account'), _('Change your email, avatar, password, profile'), false, 'nav_account');
- if (common_config('xmpp', 'enabled')) {
- $action->menuItem(common_local_url('imsettings'),
- _('Connect'), _('Connect to IM, SMS, Twitter'), false, 'nav_connect');
- } else {
- $action->menuItem(common_local_url('smssettings'),
- _('Connect'), _('Connect to SMS, Twitter'), false, 'nav_connect');
- }
+ $action->menuItem(common_local_url($connect),
+ _('Connect'), _('Connect to services'), false, 'nav_connect');
if (common_config('invite', 'enabled')) {
$action->menuItem(common_local_url('invite'),
_('Invite'),
@@ -300,18 +303,30 @@ class FBConnectPlugin extends Plugin
}
}
else {
- if (!common_config('site', 'closed')) {
- $action->menuItem(common_local_url('register'),
- _('Register'), _('Create an account'), false, 'nav_register');
+ if (!common_config('site', 'openidonly')) {
+ if (!common_config('site', 'closed')) {
+ $action->menuItem(common_local_url('register'),
+ _('Register'), _('Create an account'), false, 'nav_register');
+ }
+ $action->menuItem(common_local_url('login'),
+ _('Login'), _('Login to the site'), false, 'nav_login');
+ } else {
+ $this->menuItem(common_local_url('openidlogin'),
+ _('OpenID'), _('Login with OpenID'), false, 'nav_openid');
}
- $action->menuItem(common_local_url('login'),
- _('Login'), _('Login to the site'), false, 'nav_login');
}
$action->menuItem(common_local_url('doc', array('title' => 'help')),
_('Help'), _('Help me!'), false, 'nav_help');
- $action->menuItem(common_local_url('peoplesearch'),
- _('Search'), _('Search for people or text'), false, 'nav_search');
+ if ($user || !common_config('site', 'private')) {
+ $action->menuItem(common_local_url('peoplesearch'),
+ _('Search'), _('Search for people or text'), false, 'nav_search');
+ }
+
+ // We are replacing the primary nav entirely; give other
+ // plugins a chance to handle it here.
+
+ Event::handle('EndPrimaryNav', array($action));
return false;
}
diff --git a/plugins/InfiniteScroll/InfiniteScrollPlugin.php b/plugins/InfiniteScroll/InfiniteScrollPlugin.php
index c955298cb..5928c007f 100644
--- a/plugins/InfiniteScroll/InfiniteScrollPlugin.php
+++ b/plugins/InfiniteScroll/InfiniteScrollPlugin.php
@@ -40,7 +40,7 @@ class InfiniteScrollPlugin extends Plugin
function onEndShowScripts($action)
{
- $action->script('plugins/InfiniteScroll/jquery.infinitescroll.min.js');
+ $action->script('plugins/InfiniteScroll/jquery.infinitescroll.js');
$action->script('plugins/InfiniteScroll/infinitescroll.js');
}
}
diff --git a/plugins/InfiniteScroll/infinitescroll.js b/plugins/InfiniteScroll/infinitescroll.js
index 6513072d0..ae4d53d09 100644
--- a/plugins/InfiniteScroll/infinitescroll.js
+++ b/plugins/InfiniteScroll/infinitescroll.js
@@ -1,6 +1,7 @@
jQuery(document).ready(function($){
$('notices_primary').infinitescroll({
debug: true,
+ infiniteScroll : false,
nextSelector : "li.nav_next a",
loadingImg : $('address .url')[0].href+'plugins/InfiniteScroll/ajax-loader.gif',
text : "<em>Loading the next set of posts...</em>",
@@ -12,4 +13,3 @@ jQuery(document).ready(function($){
NoticeAttachments();
});
});
-
diff --git a/plugins/InfiniteScroll/jquery.infinitescroll.js b/plugins/InfiniteScroll/jquery.infinitescroll.js
index 670686b0e..ec31bb086 100644
--- a/plugins/InfiniteScroll/jquery.infinitescroll.js
+++ b/plugins/InfiniteScroll/jquery.infinitescroll.js
@@ -92,14 +92,14 @@
if (props.isDuringAjax || props.isInvalidPage || props.isDone) return;
- if ( !isNearBottom(opts,props) ) return;
+ if ( opts.infiniteScroll && !isNearBottom(opts,props) ) return;
// we dont want to fire the ajax multiple times
props.isDuringAjax = true;
// show the loading message and hide the previous/next links
props.loadingMsg.appendTo( opts.contentSelector ).show();
- $( opts.navSelector ).hide();
+ if(opts.infiniteScroll) $( opts.navSelector ).hide();
// increment the URL bit. e.g. /page/3/
props.currPage++;
@@ -205,10 +205,19 @@
}
});
- // bind scroll handler to element (if its a local scroll) or window
- $(opts.localMode ? this : window)
- .bind('scroll.infscr', function(){ infscrSetup(path,opts,props,callback); } )
- .trigger('scroll.infscr'); // trigger the event, in case it's a short page
+ if(opts.infiniteScroll){
+ // bind scroll handler to element (if its a local scroll) or window
+ $(opts.localMode ? this : window)
+ .bind('scroll.infscr', function(){ infscrSetup(path,opts,props,callback); } )
+ .trigger('scroll.infscr'); // trigger the event, in case it's a short page
+ }else{
+ $(opts.nextSelector).click(
+ function(){
+ infscrSetup(path,opts,props,callback);
+ return false;
+ }
+ );
+ }
return this;
@@ -222,6 +231,7 @@
$.infinitescroll = {
defaults : {
debug : false,
+ infiniteScroll : true,
preload : false,
nextSelector : "div.navigation a:first",
loadingImg : "http://www.infinite-scroll.com/loading.gif",
diff --git a/plugins/LinkbackPlugin.php b/plugins/LinkbackPlugin.php
index c49f70de0..60f7a60c7 100644
--- a/plugins/LinkbackPlugin.php
+++ b/plugins/LinkbackPlugin.php
@@ -75,6 +75,8 @@ class LinkbackPlugin extends Plugin
function linkbackUrl($url)
{
+ common_log(LOG_DEBUG,"Attempting linkback for " . $url);
+
$orig = $url;
$url = htmlspecialchars_decode($orig);
$scheme = parse_url($url, PHP_URL_SCHEME);
@@ -134,15 +136,20 @@ class LinkbackPlugin extends Plugin
"User-Agent: " . $this->userAgent(),
'content' => $request)));
$file = file_get_contents($endpoint, false, $context);
- $response = xmlrpc_decode($file);
- if (xmlrpc_is_fault($response)) {
+ if (!$file) {
common_log(LOG_WARNING,
+ "Pingback request failed for '$url' ($endpoint)");
+ } else {
+ $response = xmlrpc_decode($file);
+ if (xmlrpc_is_fault($response)) {
+ common_log(LOG_WARNING,
"Pingback error for '$url' ($endpoint): ".
"$response[faultString] ($response[faultCode])");
- } else {
- common_log(LOG_INFO,
+ } else {
+ common_log(LOG_INFO,
"Pingback success for '$url' ($endpoint): ".
"'$response'");
+ }
}
}
diff --git a/plugins/Meteor/meteorupdater.js b/plugins/Meteor/meteorupdater.js
index 2e688336f..9ce68775b 100644
--- a/plugins/Meteor/meteorupdater.js
+++ b/plugins/Meteor/meteorupdater.js
@@ -1,5 +1,6 @@
-// update the local timeline from a Meteor server
-//
+// Update the local timeline from a Meteor server
+// XXX: If @a is subscribed to @b, @a should get @b's notices in @a's Personal timeline.
+// Do Replies timeline.
var MeteorUpdater = function()
{
diff --git a/plugins/PiwikAnalyticsPlugin.php b/plugins/PiwikAnalyticsPlugin.php
index 85a24c132..54faa0bdb 100644
--- a/plugins/PiwikAnalyticsPlugin.php
+++ b/plugins/PiwikAnalyticsPlugin.php
@@ -38,30 +38,24 @@ if (!defined('STATUSNET')) {
* This plugin will spoot out the correct JavaScript spell to invoke
* Piwik Analytics on a page.
*
- * To use this plugin please add the following three lines to your config.php
+ * To use this plugin add the following to your config.php
*
- * require_once('plugins/PiwikAnalyticsPlugin.php');
- * $pa = new PiwikAnalyticsPlugin("example.com/piwik/","id");
+ * addPlugin('PiwikAnalytics', array('piwikroot' => 'example.com/piwik/',
+ * 'piwikId' => 'id'));
*
- * exchange example.com/piwik/ with the url to your piwik installation and
- * make sure you don't forget the final /
- * exchange id with the ID your statusnet installation has in your Piwik analytics
+ * Replace 'example.com/piwik/' with the URL to your Piwik installation and
+ * make sure you don't forget the final /.
+ * Replace 'id' with the ID your statusnet installation has in your Piwik
+ * analytics setup - for example '8'.
*
- * @category Plugin
- * @package StatusNet
- * @author Tobias Diekershoff <tobias.diekershoff@gmx.net>
- * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link http://status.net/
- *
- * @see Event
*/
class PiwikAnalyticsPlugin extends Plugin
{
/** the base of your Piwik installation */
- var $piwikroot = null;
+ public $piwikroot = null;
/** the Piwik Id of your statusnet installation */
- var $piwikId = null;
+ public $piwikId = null;
/**
* constructor
@@ -73,7 +67,7 @@ class PiwikAnalyticsPlugin extends Plugin
function __construct($root=null, $id=null)
{
$this->piwikroot = $root;
- $this->piwikid = $id;
+ $this->piwikId = $id;
parent::__construct();
}
@@ -96,7 +90,7 @@ document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/ja
</script>
<script type="text/javascript">
try {
- var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 4);
+ var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", {$this->piwikId});
piwikTracker.trackPageView();
piwikTracker.enableLinkTracking();
} catch( err ) {}
@@ -108,4 +102,4 @@ ENDOFPIWIK;
$action->raw($piwikCode);
return true;
}
-} \ No newline at end of file
+}
diff --git a/plugins/Realtime/RealtimePlugin.php b/plugins/Realtime/RealtimePlugin.php
index 82eca3d08..0f0d0f9f4 100644
--- a/plugins/Realtime/RealtimePlugin.php
+++ b/plugins/Realtime/RealtimePlugin.php
@@ -50,6 +50,11 @@ class RealtimePlugin extends Plugin
protected $favorurl = null;
protected $deleteurl = null;
+ /**
+ * When it's time to initialize the plugin, calculate and
+ * pass the URLs we need.
+ */
+
function onInitializePlugin()
{
$this->replyurl = common_local_url('newnotice');
@@ -57,29 +62,26 @@ class RealtimePlugin extends Plugin
// FIXME: need to find a better way to pass this pattern in
$this->deleteurl = common_local_url('deletenotice',
array('notice' => '0000000000'));
+ return true;
}
function onEndShowScripts($action)
{
- $path = null;
+ $timeline = $this->_getTimeline($action);
- switch ($action->trimmed('action')) {
- case 'public':
- $path = array('public');
- break;
- case 'tag':
- $tag = $action->trimmed('tag');
- if (!empty($tag)) {
- $path = array('tag', $tag);
- } else {
- return true;
- }
- break;
- default:
+ // If there's not a timeline on this page,
+ // just return true
+
+ if (empty($timeline)) {
return true;
}
- $timeline = $this->_pathToChannel($path);
+ $base = $action->selfUrl();
+ if (mb_strstr($base, '?')) {
+ $url = $base . '&realtime=1';
+ } else {
+ $url = $base . '?realtime=1';
+ }
$scripts = $this->_getScripts();
@@ -95,10 +97,22 @@ class RealtimePlugin extends Plugin
$user_id = 0;
}
+ if ($action->boolean('realtime')) {
+ $realtimeUI = ' RealtimeUpdate.initPopupWindow();';
+ }
+ else {
+ $iconurl = common_path('plugins/Realtime/icon_external.gif');
+ $realtimeUI = ' RealtimeUpdate.addPopup("'.$url.'", "'.$timeline.'", "'. $iconurl .'");';
+ }
+
$action->elementStart('script', array('type' => 'text/javascript'));
- $action->raw("$(document).ready(function() { ");
- $action->raw($this->_updateInitialize($timeline, $user_id));
- $action->raw(" });");
+
+ $script = ' $(document).ready(function() { '.
+ $realtimeUI.
+ $this->_updateInitialize($timeline, $user_id).
+ '}); ';
+ $action->raw($script);
+
$action->elementEnd('script');
return true;
@@ -108,13 +122,23 @@ class RealtimePlugin extends Plugin
{
$paths = array();
- // XXX: Add other timelines; this is just for the public one
+ // Add to the author's timeline
+
+ $user = User::staticGet('id', $notice->profile_id);
+
+ if (!empty($user)) {
+ $paths[] = array('showstream', $user->nickname);
+ }
+
+ // Add to the public timeline
if ($notice->is_local ||
($notice->is_local == 0 && !common_config('public', 'localonly'))) {
$paths[] = array('public');
}
+ // Add to the tags timeline
+
$tags = $this->getNoticeTags($notice);
if (!empty($tags)) {
@@ -123,6 +147,46 @@ class RealtimePlugin extends Plugin
}
}
+ // Add to inbox timelines
+ // XXX: do a join
+
+ $inbox = new Notice_inbox();
+ $inbox->notice_id = $notice->id;
+
+ if ($inbox->find()) {
+ while ($inbox->fetch()) {
+ $user = User::staticGet('id', $inbox->user_id);
+ $paths[] = array('all', $user->nickname);
+ }
+ }
+
+ // Add to the replies timeline
+
+ $reply = new Reply();
+ $reply->notice_id = $notice->id;
+
+ if ($reply->find()) {
+ while ($reply->fetch()) {
+ $user = User::staticGet('id', $reply->profile_id);
+ if (!empty($user)) {
+ $paths[] = array('replies', $user->nickname);
+ }
+ }
+ }
+
+ // Add to the group timeline
+ // XXX: join
+
+ $gi = new Group_inbox();
+ $gi->notice_id = $notice->id;
+
+ if ($gi->find()) {
+ while ($gi->fetch()) {
+ $ug = User_group::staticGet('id', $gi->group_id);
+ $paths[] = array('showgroup', $ug->nickname);
+ }
+ }
+
if (count($paths) > 0) {
$json = $this->noticeAsJson($notice);
@@ -140,6 +204,36 @@ class RealtimePlugin extends Plugin
return true;
}
+ function onStartShowBody($action)
+ {
+ $realtime = $action->boolean('realtime');
+ if (!$realtime) {
+ return true;
+ }
+
+ $action->elementStart('body',
+ (common_current_user()) ? array('id' => $action->trimmed('action'),
+ 'class' => 'user_in')
+ : array('id' => $action->trimmed('action')));
+
+ // XXX hack to deal with JS that tries to get the
+ // root url from page output
+
+ $action->elementStart('address');
+ $action->element('a', array('class' => 'url',
+ 'href' => common_local_url('public')),
+ '');
+ $action->elementEnd('address');
+
+ if (common_logged_in()) {
+ $action->showNoticeForm();
+ }
+
+ $action->showContentBlock();
+ $action->elementEnd('body');
+ return false; // No default processing
+ }
+
function noticeAsJson($notice)
{
// FIXME: this code should be abstracted to a neutral third
@@ -224,4 +318,41 @@ class RealtimePlugin extends Plugin
{
return '';
}
+
+ function _getTimeline($action)
+ {
+ $path = null;
+ $timeline = null;
+
+ $action_name = $action->trimmed('action');
+
+ switch ($action_name) {
+ case 'public':
+ $path = array('public');
+ break;
+ case 'tag':
+ $tag = $action->trimmed('tag');
+ if (!empty($tag)) {
+ $path = array('tag', $tag);
+ }
+ break;
+ case 'showstream':
+ case 'all':
+ case 'replies':
+ case 'showgroup':
+ $nickname = common_canonical_nickname($action->trimmed('nickname'));
+ if (!empty($nickname)) {
+ $path = array($action_name, $nickname);
+ }
+ break;
+ default:
+ break;
+ }
+
+ if (!empty($path)) {
+ $timeline = $this->_pathToChannel($path);
+ }
+
+ return $timeline;
+ }
}
diff --git a/plugins/Realtime/icon_external.gif b/plugins/Realtime/icon_external.gif
new file mode 100644
index 000000000..c4118d53b
--- /dev/null
+++ b/plugins/Realtime/icon_external.gif
Binary files differ
diff --git a/plugins/Realtime/jquery.getUrlParam.js b/plugins/Realtime/jquery.getUrlParam.js
new file mode 100644
index 000000000..e8f73eb47
--- /dev/null
+++ b/plugins/Realtime/jquery.getUrlParam.js
@@ -0,0 +1,72 @@
+/* Copyright (c) 2006-2007 Mathias Bank (http://www.mathias-bank.de)
+ * Dual licensed under the MIT (http://www.opensource.org/licenses/mit-license.php)
+ * and GPL (http://www.opensource.org/licenses/gpl-license.php) licenses.
+ *
+ * Version 2.1
+ *
+ * Thanks to
+ * Hinnerk Ruemenapf - http://hinnerk.ruemenapf.de/ for bug reporting and fixing.
+ * Tom Leonard for some improvements
+ *
+ */
+jQuery.fn.extend({
+/**
+* Returns get parameters.
+*
+* If the desired param does not exist, null will be returned
+*
+* To get the document params:
+* @example value = $(document).getUrlParam("paramName");
+*
+* To get the params of a html-attribut (uses src attribute)
+* @example value = $('#imgLink').getUrlParam("paramName");
+*/
+ getUrlParam: function(strParamName){
+ strParamName = escape(unescape(strParamName));
+
+ var returnVal = new Array();
+ var qString = null;
+
+ if ($(this).attr("nodeName")=="#document") {
+ //document-handler
+
+ if (window.location.search.search(strParamName) > -1 ){
+
+ qString = window.location.search.substr(1,window.location.search.length).split("&");
+ }
+
+ } else if ($(this).attr("src")!="undefined") {
+
+ var strHref = $(this).attr("src")
+ if ( strHref.indexOf("?") > -1 ){
+ var strQueryString = strHref.substr(strHref.indexOf("?")+1);
+ qString = strQueryString.split("&");
+ }
+ } else if ($(this).attr("href")!="undefined") {
+
+ var strHref = $(this).attr("href")
+ if ( strHref.indexOf("?") > -1 ){
+ var strQueryString = strHref.substr(strHref.indexOf("?")+1);
+ qString = strQueryString.split("&");
+ }
+ } else {
+ return null;
+ }
+
+
+ if (qString==null) return null;
+
+
+ for (var i=0;i<qString.length; i++){
+ if (escape(unescape(qString[i].split("=")[0])) == strParamName){
+ returnVal.push(qString[i].split("=")[1]);
+ }
+
+ }
+
+
+ if (returnVal.length==0) return null;
+ else if (returnVal.length==1) return returnVal[0];
+ else return returnVal;
+ }
+}); \ No newline at end of file
diff --git a/plugins/Realtime/realtimeupdate.js b/plugins/Realtime/realtimeupdate.js
index d55db5859..4cd68a816 100644
--- a/plugins/Realtime/realtimeupdate.js
+++ b/plugins/Realtime/realtimeupdate.js
@@ -1,8 +1,8 @@
// add a notice encoded as JSON into the current timeline
//
+// TODO: i18n
RealtimeUpdate = {
-
_userid: 0,
_replyurl: '',
_favorurl: '',
@@ -10,10 +10,22 @@ RealtimeUpdate = {
init: function(userid, replyurl, favorurl, deleteurl)
{
- RealtimeUpdate._userid = userid;
- RealtimeUpdate._replyurl = replyurl;
- RealtimeUpdate._favorurl = favorurl;
- RealtimeUpdate._deleteurl = deleteurl;
+ RealtimeUpdate._userid = userid;
+ RealtimeUpdate._replyurl = replyurl;
+ RealtimeUpdate._favorurl = favorurl;
+ RealtimeUpdate._deleteurl = deleteurl;
+
+ $(window).blur(function() {
+ $('#notices_primary .notice').css({
+ 'border-top-color':$('#notices_primary .notice:last').css('border-top-color'),
+ 'border-top-style':'dotted'
+ });
+
+ $('#notices_primary .notice:first').css({
+ 'border-top-color':'#AAAAAA',
+ 'border-top-style':'solid'
+ });
+ });
},
receive: function(data)
@@ -21,13 +33,13 @@ RealtimeUpdate = {
id = data.id;
// Don't add it if it already exists
-
+ //
if ($("#notice-"+id).length > 0) {
return;
}
var noticeItem = RealtimeUpdate.makeNoticeItem(data);
- $("#notices_primary .notices").prepend(noticeItem, true);
+ $("#notices_primary .notices").prepend(noticeItem);
$("#notices_primary .notice:first").css({display:"none"});
$("#notices_primary .notice:first").fadeIn(1000);
NoticeReply();
@@ -50,30 +62,19 @@ RealtimeUpdate = {
"<p class=\"entry-content\">"+html+"</p>"+
"</div>"+
"<div class=\"entry-content\">"+
- "<dl class=\"timestamp\">"+
- "<dt>Published</dt>"+
- "<dd>"+
- "<a rel=\"bookmark\" href=\""+data['url']+"\" >"+
+ "<a class=\"timestamp\" rel=\"bookmark\" href=\""+data['url']+"\" >"+
"<abbr class=\"published\" title=\""+data['created_at']+"\">a few seconds ago</abbr>"+
"</a> "+
- "</dd>"+
- "</dl>"+
- "<dl class=\"device\">"+
- "<dt>From</dt> "+
- "<dd>"+source+"</dd>"+ // may have a link, I think
- "</dl>";
-
+ "<span class=\"source\">"+
+ "from "+
+ "<span class=\"device\">"+source+"</span>"+ // may have a link
+ "</span>";
if (data['in_reply_to_status_id']) {
- ni = ni+" <dl class=\"response\">"+
- "<dt>To</dt>"+
- "<dd>"+
- "<a href=\""+data['in_reply_to_status_url']+"\" rel=\"in-reply-to\">in reply to</a>"+
- "</dd>"+
- "</dl>";
+ ni = ni+" <a class=\"response\" href=\""+data['in_reply_to_status_url']+"\">in context</a>";
}
ni = ni+"</div>"+
- "<div class=\"notice-options\">";
+ "<div class=\"notice-options\">";
if (RealtimeUpdate._userid != 0) {
var input = $("form#form_notice fieldset input#token");
@@ -95,12 +96,12 @@ RealtimeUpdate = {
var ff;
ff = "<form id=\"favor-"+id+"\" class=\"form_favor\" method=\"post\" action=\""+RealtimeUpdate._favorurl+"\">"+
- "<fieldset>"+
- "<legend>Favor this notice</legend>"+ // XXX: i18n
+ "<fieldset>"+
+ "<legend>Favor this notice</legend>"+
"<input name=\"token-"+id+"\" type=\"hidden\" id=\"token-"+id+"\" value=\""+session_key+"\"/>"+
"<input name=\"notice\" type=\"hidden\" id=\"notice-n"+id+"\" value=\""+id+"\"/>"+
"<input type=\"submit\" id=\"favor-submit-"+id+"\" name=\"favor-submit-"+id+"\" class=\"submit\" value=\"Favor\" title=\"Favor this notice\"/>"+
- "</fieldset>"+
+ "</fieldset>"+
"</form>";
return ff;
},
@@ -108,28 +109,68 @@ RealtimeUpdate = {
makeReplyLink: function(id, nickname)
{
var rl;
- rl = "<dl class=\"notice_reply\">"+
- "<dt>Reply to this notice</dt>"+
- "<dd>"+
- "<a href=\""+RealtimeUpdate._replyurl+"?replyto="+nickname+"\" title=\"Reply to this notice\">Reply <span class=\"notice_id\">"+id+"</span>"+
- "</a>"+
- "</dd>"+
- "</dl>";
+ rl = "<a class=\"notice_reply\" href=\""+RealtimeUpdate._replyurl+"?replyto="+nickname+"\" title=\"Reply to this notice\">Reply <span class=\"notice_id\">"+id+"</span></a>";
return rl;
- },
+ },
makeDeleteLink: function(id)
{
var dl, delurl;
delurl = RealtimeUpdate._deleteurl.replace("0000000000", id);
- dl = "<dl class=\"notice_delete\">"+
- "<dt>Delete this notice</dt>"+
- "<dd>"+
- "<a href=\""+delurl+"\" title=\"Delete this notice\">Delete</a>"+
- "</dd>"+
- "</dl>";
+ dl = "<a class=\"notice_delete\" href=\""+delurl+"\" title=\"Delete this notice\">Delete</a>";
return dl;
},
+
+ addPopup: function(url, timeline, iconurl)
+ {
+ $('#content').prepend('<button id="realtime_timeline" title="Pop up in a window">Pop up</button>');
+
+ $('#realtime_timeline').css({
+ 'margin':'0 0 18px 0',
+ 'background':'transparent url('+ iconurl + ') no-repeat 0% 30%',
+ 'padding':'0 0 0 20px',
+ 'display':'block',
+ 'float':'right',
+ 'border':'none',
+ 'cursor':'pointer',
+ 'color':$("a").css("color"),
+ 'font-weight':'bold',
+ 'font-size':'1em'
+ });
+
+ $('#realtime_timeline').click(function() {
+ window.open(url,
+ timeline,
+ 'toolbar=no,resizable=yes,scrollbars=yes,status=yes');
+
+ return false;
+ });
+ },
+
+ initPopupWindow: function()
+ {
+ window.resizeTo(500, 550);
+ $('address').hide();
+ $('#content').css({'width':'93.5%'});
+
+ $('#form_notice').css({
+ 'margin':'18px 0 18px 1.795%',
+ 'width':'93%',
+ 'max-width':'451px'
+ });
+
+ $('#form_notice label[for=notice_data-text], h1').css({'display': 'none'});
+
+ $('.notices li:first-child').css({'border-top-color':'transparent'});
+
+ $('#form_notice label[for="notice_data-attach"], #form_notice #notice_data-attach').css({'top':'0'});
+
+ $('#form_notice #notice_data-attach').css({
+ 'left':'auto',
+ 'right':'0'
+ });
+ }
}
+
diff --git a/plugins/recaptcha/README b/plugins/recaptcha/README
index ce23a2695..b996f96cc 100644
--- a/plugins/recaptcha/README
+++ b/plugins/recaptcha/README
@@ -6,7 +6,7 @@ Use:
1. Get an API key from http://recaptcha.net
2. In config.php add:
-include_once('plugins/recaptcha.php');
+include_once('plugins/recaptcha/recaptcha.php');
$captcha = new recaptcha(publickey, privatekey, showErrors);
Changelog
diff --git a/scripts/commandline.inc b/scripts/commandline.inc
index 1573b569d..9029bb19d 100644
--- a/scripts/commandline.inc
+++ b/scripts/commandline.inc
@@ -27,6 +27,7 @@ if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
}
define('STATUSNET', true);
+define('LACONICA', true); // compatibility
// Set various flags so we don't time out on long-running processes
diff --git a/scripts/deleteuser.php b/scripts/deleteuser.php
new file mode 100644
index 000000000..52389123c
--- /dev/null
+++ b/scripts/deleteuser.php
@@ -0,0 +1,68 @@
+#!/usr/bin/env php
+<?php
+/*
+ * StatusNet - a distributed open-source microblogging tool
+ * Copyright (C) 2008, 2009, StatusNet, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+
+$shortoptions = 'i::n::y';
+$longoptions = array('id::nickname::yes');
+
+$helptext = <<<END_OF_DELETEUSER_HELP
+deleteuser.php [options]
+deletes a user from the database
+
+ -i --id ID of the user
+ -n --nickname nickname of the user
+ -y --yes do not wait for confirmation
+
+END_OF_DELETEUSER_HELP;
+
+require_once INSTALLDIR.'/scripts/commandline.inc';
+
+if (have_option('i', 'id')) {
+ $id = get_option_value('i', 'id');
+ $user = User::staticGet('id', $id);
+ if (empty($user)) {
+ print "Can't find user with ID $id\n";
+ exit(1);
+ }
+} else if (have_option('n', 'nickname')) {
+ $nickname = get_option_value('n', 'nickname');
+ $user = User::staticGet('nickname', $nickname);
+ if (empty($user)) {
+ print "Can't find user with nickname '$nickname'\n";
+ exit(1);
+ }
+} else {
+ print "You must provide either an ID or a nickname.\n";
+ exit(1);
+}
+
+if (!have_option('y', 'yes')) {
+ print "About to PERMANENTLY delete user '{$user->nickname}' ({$user->id}). Are you sure? [y/N] ";
+ $response = fgets(STDIN);
+ if (strtolower(trim($response)) != 'y') {
+ print "Aborting.\n";
+ exit(0);
+ }
+}
+
+print "Deleting...";
+$user->delete();
+print "DONE.\n";
diff --git a/scripts/fixup_conversations.php b/scripts/fixup_conversations.php
index 8a9f7bb57..80890fe98 100755
--- a/scripts/fixup_conversations.php
+++ b/scripts/fixup_conversations.php
@@ -24,17 +24,17 @@ require_once INSTALLDIR.'/scripts/commandline.inc';
common_log(LOG_INFO, 'Fixing up conversations.');
-$nid = new Notice();
-$nid->query('select id, reply_to from notice where conversation is null');
+$notice = new Notice();
+$notice->query('select id, reply_to from notice where conversation is null');
-while ($nid->fetch()) {
+while ($notice->fetch()) {
$cid = null;
- $notice = new Notice();
+ $orig = clone($notice);
- if (empty($nid->reply_to)) {
- $cid = $nid->id;
+ if (empty($notice->reply_to)) {
+ $notice->conversation = $notice->id;
} else {
$reply = Notice::staticGet('id', $notice->reply_to);
@@ -61,9 +61,7 @@ while ($nid->fetch()) {
continue;
}
- $notice = null;
$orig = null;
- unset($notice);
unset($orig);
print ".\n";
diff --git a/scripts/maildaemon.php b/scripts/maildaemon.php
index 11911dcbd..678ca24c3 100755
--- a/scripts/maildaemon.php
+++ b/scripts/maildaemon.php
@@ -362,6 +362,10 @@ class MailerDaemon
if (preg_match('/^\s*Sent via/', $line)) {
continue;
}
+ if (preg_match('/^\s*Sent from my/', $line)) {
+ continue;
+ }
+
// skip everything after a sig
if (preg_match('/^\s*--+\s*$/', $line) ||
preg_match('/^\s*__+\s*$/', $line))
diff --git a/scripts/synctwitterfriends.php b/scripts/synctwitterfriends.php
index 2cb7525ea..b30e700a1 100755
--- a/scripts/synctwitterfriends.php
+++ b/scripts/synctwitterfriends.php
@@ -19,8 +19,6 @@
*/
define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
-define('STATUSNET', true);
-define('LACONICA', true); // compatibility
$shortoptions = 'di::';
$longoptions = array('id::', 'debug');
diff --git a/scripts/twitterqueuehandler.php b/scripts/twitterqueuehandler.php
index 992141f9d..ce4d824d0 100755
--- a/scripts/twitterqueuehandler.php
+++ b/scripts/twitterqueuehandler.php
@@ -19,8 +19,6 @@
*/
define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
-define('STATUSNET', true);
-define('LACONICA', true); // compatibility
$shortoptions = 'i::';
$longoptions = array('id::');
diff --git a/scripts/twitterstatusfetcher.php b/scripts/twitterstatusfetcher.php
index 6dca6f75b..3cdf1867a 100755
--- a/scripts/twitterstatusfetcher.php
+++ b/scripts/twitterstatusfetcher.php
@@ -19,8 +19,6 @@
*/
define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
-define('STATUSNET', true);
-define('LACONICA', true); // compatibility
// Tune number of processes and how often to poll Twitter
// XXX: Should these things be in config.php?
diff --git a/tests/URLDetectionTest.php b/tests/URLDetectionTest.php
index 767f895bb..1c3f7cd96 100644
--- a/tests/URLDetectionTest.php
+++ b/tests/URLDetectionTest.php
@@ -25,14 +25,38 @@ class URLDetectionTest extends PHPUnit_Framework_TestCase
static public function provider()
{
return array(
+ array('not a link :: no way',
+ 'not a link :: no way'),
+ array('link http://www.somesite.com/xyz/35637563@N00/52803365/ link',
+ 'link <a href="http://www.somesite.com/xyz/35637563@N00/52803365/" rel="external">http://www.somesite.com/xyz/35637563@N00/52803365/</a> link'),
array('http://127.0.0.1',
'<a href="http://127.0.0.1/" rel="external">http://127.0.0.1</a>'),
array('127.0.0.1',
'<a href="http://127.0.0.1/" rel="external">127.0.0.1</a>'),
array('127.0.0.1:99',
'<a href="http://127.0.0.1:99/" rel="external">127.0.0.1:99</a>'),
- array('127.0.0.1/test.php',
- '<a href="http://127.0.0.1/test.php" rel="external">127.0.0.1/test.php</a>'),
+ array('127.0.0.1/Name:test.php',
+ '<a href="http://127.0.0.1/Name:test.php" rel="external">127.0.0.1/Name:test.php</a>'),
+ array('127.0.0.1/~test',
+ '<a href="http://127.0.0.1/~test" rel="external">127.0.0.1/~test</a>'),
+ array('127.0.0.1/+test',
+ '<a href="http://127.0.0.1/+test" rel="external">127.0.0.1/+test</a>'),
+ array('127.0.0.1/$test',
+ '<a href="http://127.0.0.1/$test" rel="external">127.0.0.1/$test</a>'),
+ array('127.0.0.1/\'test',
+ '<a href="http://127.0.0.1/\'test" rel="external">127.0.0.1/\'test</a>'),
+ array('127.0.0.1/"test',
+ '<a href="http://127.0.0.1/&quot;test" rel="external">127.0.0.1/&quot;test</a>'),
+ array('127.0.0.1/-test',
+ '<a href="http://127.0.0.1/-test" rel="external">127.0.0.1/-test</a>'),
+ array('127.0.0.1/_test',
+ '<a href="http://127.0.0.1/_test" rel="external">127.0.0.1/_test</a>'),
+ array('127.0.0.1/!test',
+ '<a href="http://127.0.0.1/!test" rel="external">127.0.0.1/!test</a>'),
+ array('127.0.0.1/*test',
+ '<a href="http://127.0.0.1/*test" rel="external">127.0.0.1/*test</a>'),
+ array('127.0.0.1/test%20stuff',
+ '<a href="http://127.0.0.1/test%20stuff" rel="external">127.0.0.1/test%20stuff</a>'),
array('http://[::1]:99/test.php',
'<a href="http://[::1]:99/test.php" rel="external">http://[::1]:99/test.php</a>'),
array('http://::1/test.php',
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 6f1a29f4a..7706fba48 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -156,7 +156,8 @@ font-weight:bold;
#form_notice_delete legend,
#form_password_recover legend,
#form_password_change legend,
-.form_entity_block legend {
+.form_entity_block legend,
+#form_filter_bytag legend {
display:none;
}
@@ -483,7 +484,7 @@ height:16px;
#form_notice .form_note {
position:absolute;
bottom:2px;
-right:98px;
+right:21.715%;
z-index:9;
}
#form_notice .form_note dt {
@@ -510,6 +511,7 @@ margin-top:7px;
margin-bottom:7px;
margin-left:18px;
float:left;
+max-width:322px;
}
#form_notice .error,
#form_notice .success {
@@ -1049,36 +1051,37 @@ display:none;
#filter_tags ul {
list-style-type:none;
}
-#filter_tags ul li {
+#filter_tags li {
float:left;
margin-left:7px;
padding-left:7px;
border-left-width:1px;
border-left-style:solid;
}
-#filter_tags ul li.child_1 {
+#filter_tags #filter_tags_all {
margin-left:0;
border-left:0;
padding-left:0;
}
-#filter_tags ul li#filter_tags_all a {
+#filter_tags_all a {
font-weight:bold;
margin-top:7px;
float:left;
}
-#filter_tags ul li#filter_tags_item label {
+#filter_tags_item label {
margin-right:7px;
}
-#filter_tags ul li#filter_tags_item label,
-#filter_tags ul li#filter_tags_item select {
-display:inline;
+#filter_tags_item label,
+#filter_tags_item select {
+float:left;
}
-#filter_tags ul li#filter_tags_item p {
+#filter_tags_item p {
float:left;
+clear:both;
margin-left:38px;
}
-#filter_tags ul li#filter_tags_item input {
+#filter_tags_item .submit {
position:relative;
top:3px;
left:3px;
diff --git a/theme/biz/css/base.css b/theme/biz/css/base.css
index 5245ea5d2..6357e55b4 100644
--- a/theme/biz/css/base.css
+++ b/theme/biz/css/base.css
@@ -849,6 +849,10 @@ float:left;
font-size:1.025em;
}
+.notice div.entry-content .timestamp {
+display:inline-block;
+}
+
.notice div.entry-content dl,
.notice div.entry-content dt,
.notice div.entry-content dd {
@@ -866,15 +870,12 @@ display:inline-block;
text-transform:lowercase;
}
-
.notice-options {
-padding-left:2%;
-float:left;
-width:50%;
position:relative;
font-size:0.95em;
-width:12.5%;
+width:90px;
float:right;
+margin-right:11px;
}
.notice-options a {
@@ -897,38 +898,28 @@ left:29px;
.notice-options .notice_delete {
right:0;
}
-.notice-options .notice_reply dt {
-display:none;
-}
-
.notice-options input,
.notice-options a {
text-indent:-9999px;
outline:none;
}
-
-.notice-options .notice_reply a,
.notice-options input.submit {
display:block;
border:0;
}
-.notice-options .notice_reply a,
-.notice-options .notice_delete a {
+.notice-options .notice_reply,
+.notice-options .notice_delete {
text-decoration:none;
padding-left:16px;
}
-
.notice-options form input.submit {
width:16px;
padding:2px 0;
}
-
-.notice-options .notice_delete dt,
.notice-options .form_favor legend,
.notice-options .form_disfavor legend {
display:none;
}
-.notice-options .notice_delete fieldset,
.notice-options .form_favor fieldset,
.notice-options .form_disfavor fieldset {
border:0;
diff --git a/theme/biz/css/display.css b/theme/biz/css/display.css
index 240060b10..7ea451576 100644
--- a/theme/biz/css/display.css
+++ b/theme/biz/css/display.css
@@ -30,10 +30,10 @@ font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
}
input, textarea, select,
.entity_remote_subscribe {
-border-color:#aaa;
+border-color:#AAAAAA;
}
#filter_tags ul li {
-border-color:#ddd;
+border-color:#DDDDDD;
}
.form_settings input.form_action-primary {
@@ -50,11 +50,14 @@ background-color:#9BB43E;
input:focus, textarea:focus, select:focus,
#form_notice.warning #notice_data-text {
border-color:#9BB43E;
+box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
+-moz-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
+-webkit-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
}
input.submit,
.entity_remote_subscribe,
#site_nav_local_views a {
-color:#fff;
+color:#FFFFFF;
}
a,
@@ -62,10 +65,13 @@ a,
div.notice-options input,
.form_user_block input.submit,
.form_user_unblock input.submit,
+.form_group_block input.submit,
+.form_group_unblock input.submit,
.entity_send-a-message a,
.form_user_nudge input.submit,
.entity_nudge p,
-.form_settings input.form_action-primary {
+.form_settings input.form_action-primary,
+.form_make_admin input.submit {
color:#002E6E;
}
@@ -82,13 +88,6 @@ border-top-color:#CEE1E9;
border-top-color:#87B4C8;
}
-#content .notice p.entry-content a:visited {
-background-color:#fcfcfc;
-}
-#content .notice p.entry-content .vcard a {
-background-color:#fcfffc;
-}
-
.aside .section {
background-color:#F1F5F8;
background-position:100% 0;
@@ -97,10 +96,10 @@ background-repeat:no-repeat;
}
#notice_text-count {
-color:#333;
+color:#333333;
}
#form_notice.warning #notice_text-count {
-color:#000;
+color:#000000;
}
#form_notice label[for=notice_data-attach] {
background:transparent url(../../base/images/icons/twotone/green/clip-01.gif) no-repeat 0 45%;
@@ -109,28 +108,43 @@ background:transparent url(../../base/images/icons/twotone/green/clip-01.gif) no
opacity:0;
}
-#form_notice.processing #notice_action-submit {
-background:#fff url(../../base/images/icons/icon_processing.gif) no-repeat 47% 47%;
+#wrap form.processing input.submit {
+background:#FFFFFF url(../../base/images/icons/icon_processing.gif) no-repeat 47% 47%;
cursor:wait;
text-indent:-9999px;
+outline:none;
}
+#content {
+box-shadow:5px 7px 7px rgba(194, 194, 194, 0.3);
+-moz-box-shadow:5px 7px 7px rgba(194, 194, 194, 0.3);
+-webkit-box-shadow:5px 7px 7px rgba(194, 194, 194, 0.3);
+}
#content,
#site_nav_local_views a,
.aside .section {
-border-color:#fff;
+border-color:#FFFFFF;
}
#content,
#site_nav_local_views .current a {
-background-color:#fff;
+background-color:#FFFFFF;
}
+#site_nav_local_views li {
+box-shadow:3px 7px 5px rgba(194, 194, 194, 0.5);
+-moz-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.5);
+-webkit-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.5);
+}
#site_nav_local_views a {
-background-color:rgba(135, 180, 200, 0.3);
+background-color:rgba(194, 194, 194, 0.5);
}
#site_nav_local_views a:hover {
background-color:rgba(255, 255, 255, 0.7);
}
+#site_nav_local_views .current a {
+text-shadow: rgba(194,194,194,0.5) 1px 1px 1px;
+}
+
.error {
background-color:#F7E8E8;
@@ -140,10 +154,7 @@ background-color:#EFF3DC;
}
#anon_notice {
-color:#fff;
-}
-
-#showstream #anon_notice {
+color:#FFFFFF;
}
#export_data li a {
@@ -165,7 +176,10 @@ background-image:url(../../base/images/icons/icon_foaf.gif);
.form_user_nudge input.submit,
.form_user_block input.submit,
.form_user_unblock input.submit,
-.entity_nudge p {
+.form_group_block input.submit,
+.form_group_unblock input.submit,
+.entity_nudge p,
+.form_make_admin input.submit {
background-position: 0 40%;
background-repeat: no-repeat;
background-color:transparent;
@@ -175,7 +189,7 @@ background-color:transparent;
.form_user_subscribe input.submit,
.form_user_unsubscribe input.submit {
background-color:#9BB43E;
-color:#fff;
+color:#FFFFFF;
}
.form_user_unsubscribe input.submit,
.form_group_leave input.submit,
@@ -194,20 +208,23 @@ background-image:url(../../base/images/icons/twotone/green/quote.gif);
background-image:url(../../base/images/icons/twotone/green/mail.gif);
}
.form_user_block input.submit,
-.form_user_unblock input.submit {
+.form_user_unblock input.submit,
+.form_group_block input.submit,
+.form_group_unblock input.submit {
background-image:url(../../base/images/icons/twotone/green/shield.gif);
}
+.form_make_admin input.submit {
+background-image:url(../../base/images/icons/twotone/green/admin.gif);
+}
/* NOTICES */
-.notices li.over {
-background-color:#fcfcfc;
+.notice .attachment {
+background:transparent url(../../base/images/icons/twotone/green/clip-02.gif) no-repeat 0 45%;
}
-
-.notice-options .notice_reply a,
-.notice-options form input.submit {
-background-color:transparent;
+#attachments .attachment {
+background:none;
}
-.notice-options .notice_reply a {
+.notice-options .notice_reply {
background:transparent url(../../base/images/icons/twotone/green/reply.gif) no-repeat 0 45%;
}
.notice-options form.form_favor input.submit {
@@ -216,7 +233,7 @@ background:transparent url(../../base/images/icons/twotone/green/favourite.gif)
.notice-options form.form_disfavor input.submit {
background:transparent url(../../base/images/icons/twotone/green/disfavourite.gif) no-repeat 0 45%;
}
-.notice-options .notice_delete a {
+.notice-options .notice_delete {
background:transparent url(../../base/images/icons/twotone/green/trash.gif) no-repeat 0 45%;
}
@@ -224,19 +241,32 @@ background:transparent url(../../base/images/icons/twotone/green/trash.gif) no-r
.notices div.notice-options {
opacity:0.4;
}
-.notices li.hover div.entry-content,
-.notices li.hover div.notice-options {
+.notices li:hover div.entry-content,
+.notices li:hover div.notice-options {
opacity:1;
}
-div.entry-content {
-color:#333;
-}
div.notice-options a,
div.notice-options input {
font-family:sans-serif;
}
-.notices li.hover {
-background-color:#fcfcfc;
+#content .notices li:hover {
+background-color:rgba(240, 240, 240, 0.2);
+}
+#conversation .notices li:hover {
+background-color:transparent;
+}
+
+.notices .notices {
+background-color:rgba(200, 200, 200, 0.050);
+}
+.notices .notices .notices {
+background-color:rgba(200, 200, 200, 0.100);
+}
+.notices .notices .notices .notices {
+background-color:rgba(200, 200, 200, 0.150);
+}
+.notices .notices .notices .notices .notices {
+background-color:rgba(200, 200, 200, 0.300);
}
/*END: NOTICES */
diff --git a/theme/biz/logo.png b/theme/biz/logo.png
index fdead6c4a..550d373fe 100644
--- a/theme/biz/logo.png
+++ b/theme/biz/logo.png
Binary files differ
diff --git a/theme/cloudy/css/display.css b/theme/cloudy/css/display.css
index 3851bc057..3fe05eb3d 100644
--- a/theme/cloudy/css/display.css
+++ b/theme/cloudy/css/display.css
@@ -120,6 +120,10 @@ float:left;
margin-left:11px;
float:left;
}
+.form_settings .form_data textarea {
+width:325px;
+}
+
.form_settings .form_data input.submit {
margin-left:0;
}
@@ -968,9 +972,6 @@ right:7px;
top:47px;
right:7px;
}
-.notice-options .notice_reply dt {
-display:none;
-}
.notice-options input,
.notice-options a {
@@ -978,13 +979,13 @@ text-indent:-9999px;
outline:none;
}
-.notice-options .notice_reply a,
+.notice-options .notice_reply,
.notice-options input.submit {
display:block;
border:0;
}
-.notice-options .notice_reply a,
-.notice-options .notice_delete a {
+.notice-options .notice_reply,
+.notice-options .notice_delete {
text-decoration:none;
padding-left:16px;
}
@@ -1375,6 +1376,12 @@ padding-top:160px;
#smssettings #form_notice,
#twittersettings #form_notice,
#imsettings #form_notice,
+#userdesignsettings #form_notice,
+#groupdesignsettings #form_notice,
+#grouplogo #form_notice,
+#editgroup #form_notice,
+#blockedfromgroup #form_notice,
+#groupmembers #form_notice,
#doc #form_notice,
#usergroups #form_notice,
#invite #form_notice,
@@ -1584,11 +1591,11 @@ background:transparent url(../../base/images/icons/twotone/green/clip-02.gif) no
background:none;
}
-.notice-options .notice_reply a,
+.notice-options .notice_reply,
.notice-options form input.submit {
background-color:transparent;
}
-.notice-options .notice_reply a {
+.notice-options .notice_reply {
background:transparent url(../images/icons/icon_reply.gif) no-repeat 0 45%;
}
.notice-options form.form_favor input.submit {
@@ -1597,7 +1604,7 @@ background:transparent url(../images/icons/icon_favourite.gif) no-repeat 0 45%;
.notice-options form.form_disfavor input.submit {
background:transparent url(../images/icons/icon_disfavourite.gif) no-repeat 0 45%;
}
-.notice-options .notice_delete a {
+.notice-options .notice_delete {
background:transparent url(../images/icons/icon_trash.gif) no-repeat 0 45%;
}
diff --git a/theme/cloudy/logo.png b/theme/cloudy/logo.png
index fdead6c4a..550d373fe 100644
--- a/theme/cloudy/logo.png
+++ b/theme/cloudy/logo.png
Binary files differ
diff --git a/theme/default/css/display.css b/theme/default/css/display.css
index a1c4a2171..86369cb99 100644
--- a/theme/default/css/display.css
+++ b/theme/default/css/display.css
@@ -94,10 +94,11 @@ background:transparent url(../../base/images/icons/twotone/green/clip-01.gif) no
opacity:0;
}
-#form_notice.processing #notice_action-submit {
+#wrap form.processing input.submit {
background:#FFFFFF url(../../base/images/icons/icon_processing.gif) no-repeat 47% 47%;
cursor:wait;
text-indent:-9999px;
+outline:none;
}
#content {
@@ -223,10 +224,6 @@ background:transparent url(../../base/images/icons/twotone/green/favourite.gif)
.notice-options form.form_disfavor input.submit {
background:transparent url(../../base/images/icons/twotone/green/disfavourite.gif) no-repeat 0 45%;
}
-.notice-options form.form_favor.processing input.submit,
-.notice-options form.form_disfavor.processing input.submit {
-background:transparent url(../../base/images/icons/icon_processing.gif) no-repeat 0 45%;
-}
.notice-options .notice_delete {
background:transparent url(../../base/images/icons/twotone/green/trash.gif) no-repeat 0 45%;
}
diff --git a/theme/h4ck3r/logo.png b/theme/h4ck3r/logo.png
index fdead6c4a..550d373fe 100644
--- a/theme/h4ck3r/logo.png
+++ b/theme/h4ck3r/logo.png
Binary files differ
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index 51286657e..9fc97180d 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -94,10 +94,11 @@ background:transparent url(../../base/images/icons/twotone/green/clip-01.gif) no
opacity:0;
}
-#form_notice.processing #notice_action-submit {
+#wrap form.processing input.submit {
background:#FFFFFF url(../../base/images/icons/icon_processing.gif) no-repeat 47% 47%;
cursor:wait;
text-indent:-9999px;
+outline:none;
}
#content {
diff --git a/theme/pigeonthoughts/logo.png b/theme/pigeonthoughts/logo.png
index fdead6c4a..550d373fe 100644
--- a/theme/pigeonthoughts/logo.png
+++ b/theme/pigeonthoughts/logo.png
Binary files differ