summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README2
-rw-r--r--actions/apidirectmessagenew.php2
-rw-r--r--actions/passwordsettings.php2
-rw-r--r--actions/pathsadminpanel.php2
-rw-r--r--actions/remotesubscribe.php2
-rw-r--r--actions/siteadminpanel.php10
-rw-r--r--db/08to09_pg.sql13
-rw-r--r--db/notice_source.sql1
-rw-r--r--db/statusnet_pg.sql10
-rw-r--r--install.php2
-rw-r--r--js/geometa.js31
-rw-r--r--js/jquery.joverlay.js203
-rw-r--r--js/jquery.joverlay.min.js4
-rw-r--r--js/util.js87
-rw-r--r--lib/designsettings.php2
-rw-r--r--lib/imagefile.php4
-rw-r--r--lib/language.php1
-rw-r--r--lib/noticelist.php28
-rw-r--r--lib/popularnoticesection.php5
-rw-r--r--lib/profileaction.php10
-rw-r--r--lib/rssaction.php12
-rw-r--r--lib/searchaction.php4
-rw-r--r--lib/searchgroupnav.php4
-rw-r--r--lib/userprofile.php57
-rw-r--r--locale/ar/LC_MESSAGES/statusnet.po96
-rw-r--r--locale/bg/LC_MESSAGES/statusnet.po101
-rw-r--r--locale/ca/LC_MESSAGES/statusnet.po137
-rw-r--r--locale/cs/LC_MESSAGES/statusnet.po95
-rw-r--r--locale/de/LC_MESSAGES/statusnet.po92
-rw-r--r--locale/el/LC_MESSAGES/statusnet.po92
-rw-r--r--locale/en_GB/LC_MESSAGES/statusnet.po92
-rw-r--r--locale/es/LC_MESSAGES/statusnet.po92
-rw-r--r--locale/fi/LC_MESSAGES/statusnet.po92
-rw-r--r--locale/fr/LC_MESSAGES/statusnet.po97
-rw-r--r--locale/ga/LC_MESSAGES/statusnet.po92
-rw-r--r--locale/he/LC_MESSAGES/statusnet.po92
-rw-r--r--locale/hsb/LC_MESSAGES/statusnet.po2191
-rw-r--r--locale/is/LC_MESSAGES/statusnet.po92
-rw-r--r--locale/it/LC_MESSAGES/statusnet.po92
-rw-r--r--locale/ja/LC_MESSAGES/statusnet.po92
-rw-r--r--locale/ko/LC_MESSAGES/statusnet.po92
-rw-r--r--locale/mk/LC_MESSAGES/statusnet.po92
-rw-r--r--locale/nb/LC_MESSAGES/statusnet.po92
-rw-r--r--locale/nl/LC_MESSAGES/statusnet.po98
-rw-r--r--locale/nn/LC_MESSAGES/statusnet.po92
-rw-r--r--locale/pl/LC_MESSAGES/statusnet.po96
-rw-r--r--locale/pt/LC_MESSAGES/statusnet.po240
-rw-r--r--locale/pt_BR/LC_MESSAGES/statusnet.po92
-rw-r--r--locale/ru/LC_MESSAGES/statusnet.po145
-rw-r--r--locale/statusnet.po88
-rw-r--r--locale/sv/LC_MESSAGES/statusnet.po92
-rw-r--r--locale/te/LC_MESSAGES/statusnet.po178
-rw-r--r--locale/tr/LC_MESSAGES/statusnet.po92
-rw-r--r--locale/uk/LC_MESSAGES/statusnet.po129
-rw-r--r--locale/vi/LC_MESSAGES/statusnet.po92
-rw-r--r--locale/zh_CN/LC_MESSAGES/statusnet.po92
-rw-r--r--locale/zh_TW/LC_MESSAGES/statusnet.po92
-rw-r--r--plugins/LilUrl/LilUrlPlugin.php2
-rw-r--r--plugins/Mapstraction/usermap.js77
-rw-r--r--plugins/MobileProfile/mp-screen.css45
-rw-r--r--plugins/PtitUrl/PtitUrlPlugin.php9
-rw-r--r--plugins/Realtime/RealtimePlugin.php5
-rw-r--r--plugins/Realtime/realtimeupdate.css37
-rw-r--r--plugins/Realtime/realtimeupdate.js28
-rw-r--r--plugins/TightUrl/TightUrlPlugin.php9
-rwxr-xr-xplugins/TwitterBridge/daemons/twitterstatusfetcher.php1
-rw-r--r--plugins/UrlShortener/UrlShortenerPlugin.php8
-rw-r--r--plugins/UserFlag/UserFlagPlugin.php10
-rw-r--r--plugins/UserFlag/adminprofileflag.php5
-rw-r--r--plugins/UserFlag/icon_flag.gif (renamed from plugins/UserFlag/flag.gif)bin80 -> 80 bytes
-rw-r--r--plugins/UserFlag/userflag.css4
-rwxr-xr-x[-rw-r--r--]scripts/checkschema.php0
-rwxr-xr-xscripts/stopdaemons.sh2
-rwxr-xr-xscripts/update_translations.php5
-rw-r--r--theme/README (renamed from theme/readme.txt)8
-rw-r--r--theme/base/css/display.css42
-rw-r--r--theme/base/images/icons/icons-01.gifbin2913 -> 3097 bytes
-rw-r--r--theme/base/images/icons/twotone/green/badge.gifbin0 -> 105 bytes
-rw-r--r--theme/base/images/icons/twotone/green/sandbox.gifbin0 -> 104 bytes
-rw-r--r--theme/base/images/icons/twotone/green/silence.gifbin0 -> 103 bytes
-rw-r--r--theme/base/images/icons/twotone/green/skull.gifbin0 -> 85 bytes
-rw-r--r--theme/default/css/display.css48
-rw-r--r--theme/default/css/ie.css8
-rw-r--r--theme/identica/css/display.css48
-rw-r--r--theme/identica/css/ie.css2
85 files changed, 4270 insertions, 2162 deletions
diff --git a/README b/README
index eb1fb8cd7..51a8e91cc 100644
--- a/README
+++ b/README
@@ -98,7 +98,6 @@ released Aug 26 2009. Notable changes this version:
- Better error handling in Twitter posting.
- Show oEmbed data for XHTML files as well as plain HTML.
- Updated bug database link in README.
-- require HTML tidy extension.
- add support for HTTP Basic Auth in PHP CGI or FastCGI (e.g. GoDaddy).
- autofocus input to selected entry elements depending on page.
- updated layout for filter-by-tag form.
@@ -179,7 +178,6 @@ 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/apidirectmessagenew.php b/actions/apidirectmessagenew.php
index fed6acc30..e6c39ce4a 100644
--- a/actions/apidirectmessagenew.php
+++ b/actions/apidirectmessagenew.php
@@ -79,7 +79,7 @@ class ApiDirectMessageNewAction extends ApiAuthAction
$this->source = $this->trimmed('source'); // Not supported by Twitter.
$reserved_sources = array('web', 'omb', 'mail', 'xmpp', 'api');
- if (empty($thtis->source) || in_array($this->source, $reserved_sources)) {
+ if (empty($this->source) || in_array($this->source, $reserved_sources)) {
$source = 'api';
}
diff --git a/actions/passwordsettings.php b/actions/passwordsettings.php
index 46ed1df7e..3bb8e3bb9 100644
--- a/actions/passwordsettings.php
+++ b/actions/passwordsettings.php
@@ -110,7 +110,7 @@ class PasswordsettingsAction extends AccountSettingsAction
$this->elementEnd('li');
$this->elementStart('li');
$this->password('confirm', _('Confirm'),
- _('same as password above'));
+ _('Same as password above'));
$this->elementEnd('li');
$this->elementEnd('ul');
diff --git a/actions/pathsadminpanel.php b/actions/pathsadminpanel.php
index c4ab18c00..f1a2b1b8a 100644
--- a/actions/pathsadminpanel.php
+++ b/actions/pathsadminpanel.php
@@ -293,7 +293,7 @@ class PathsAdminPanelForm extends AdminForm
function formActions()
{
- $this->out->submit('save', _('Save'), 'submit form_action-secondary',
+ $this->out->submit('save', _('Save'), 'submit',
'save', _('Save paths'));
}
diff --git a/actions/remotesubscribe.php b/actions/remotesubscribe.php
index 74025cf80..c723d53a1 100644
--- a/actions/remotesubscribe.php
+++ b/actions/remotesubscribe.php
@@ -166,7 +166,7 @@ class RemotesubscribeAction extends Action
omb_oauth_datastore());
} catch (OMB_InvalidYadisException $e) {
$this->showForm(_('Not a valid profile URL (no YADIS document or ' .
- 'no or invalid XRDS defined).'));
+ 'invalid XRDS defined).'));
return;
}
diff --git a/actions/siteadminpanel.php b/actions/siteadminpanel.php
index 40197d6e2..b963336e6 100644
--- a/actions/siteadminpanel.php
+++ b/actions/siteadminpanel.php
@@ -196,18 +196,18 @@ class SiteadminpanelAction extends AdminPanelAction
if (in_array($values['site']['ssl'], array('sometimes', 'always'))) {
if (empty($values['site']['sslserver'])) {
- $this->clientError(_("You must set an SSL sever when enabling SSL."));
+ $this->clientError(_("You must set an SSL server when enabling SSL."));
}
}
if (mb_strlen($values['site']['sslserver']) > 255) {
- $this->clientError(_("Invalid SSL server. Max length is 255 characters."));
+ $this->clientError(_("Invalid SSL server. The maximum length is 255 characters."));
}
// Validate text limit
if (!Validate::number($values['site']['textlimit'], array('min' => 140))) {
- $this->clientError(_("Minimum text limit is 140c."));
+ $this->clientError(_("Minimum text limit is 140 characters."));
}
// Validate dupe limit
@@ -281,7 +281,7 @@ class SiteAdminPanelForm extends AdminForm
$this->unli();
$this->li();
$this->input('email', _('Email'),
- _('contact email address for your site'));
+ _('Contact email address for your site'));
$this->unli();
$this->out->elementEnd('ul');
$this->out->elementEnd('fieldset');
@@ -364,7 +364,7 @@ class SiteAdminPanelForm extends AdminForm
$this->li();
$this->input('frequency', _('Frequency'),
- _('Snapshots will be sent once every N Web hits'),
+ _('Snapshots will be sent once every N web hits'),
'snapshot');
$this->unli();
diff --git a/db/08to09_pg.sql b/db/08to09_pg.sql
index de6a82209..b312d47dd 100644
--- a/db/08to09_pg.sql
+++ b/db/08to09_pg.sql
@@ -49,4 +49,15 @@ DROP index subscription_subscribed_idx;
CREATE index subscription_subscribed_idx ON subscription (subscribed,created);
DROP index notice_profile_id_idx;
-CREATE index notice_profile_id_idx ON notice (profile_id,created,id); \ No newline at end of file
+CREATE index notice_profile_id_idx ON notice (profile_id,created,id);
+
+ALTER TABLE notice ADD COLUMN lat decimal(10, 7) /* comment 'latitude'*/;
+ALTER TABLE notice ADD COLUMN lon decimal(10,7) /* comment 'longitude'*/;
+ALTER TABLE notice ADD COLUMN location_id integer /* comment 'location id if possible'*/ ;
+ALTER TABLE notice ADD COLUMN location_ns integer /* comment 'namespace for location'*/;
+
+ALTER TABLE profile ADD COLUMN lat decimal(10,7) /*comment 'latitude'*/ ;
+ALTER TABLE profile ADD COLUMN lon decimal(10,7) /*comment 'longitude'*/;
+ALTER TABLE profile ADD COLUMN location_id integer /* comment 'location id if possible'*/;
+ALTER TABLE profile ADD COLUMN location_ns integer /* comment 'namespace for location'*/;
+ \ No newline at end of file
diff --git a/db/notice_source.sql b/db/notice_source.sql
index 10ff0d55a..50660e948 100644
--- a/db/notice_source.sql
+++ b/db/notice_source.sql
@@ -11,6 +11,7 @@ VALUES
('cliqset', 'Cliqset', 'http://www.cliqset.com/', now()),
('deskbar','Deskbar-Applet','http://www.gnome.org/projects/deskbar-applet/', now()),
('Do','Gnome Do','http://do.davebsd.com/wiki/index.php?title=Microblog_Plugin', now()),
+ ('drupal','Drupal','http://drupal.org/', now()),
('eventbox','EventBox','http://thecosmicmachine.com/eventbox/ ', now()),
('Facebook','Facebook','http://apps.facebook.com/identica/', now()),
('feed2omb','feed2omb','http://projects.ciarang.com/p/feed2omb/', now()),
diff --git a/db/statusnet_pg.sql b/db/statusnet_pg.sql
index 27b189e28..cd72d66ea 100644
--- a/db/statusnet_pg.sql
+++ b/db/statusnet_pg.sql
@@ -1,5 +1,4 @@
/* local and remote users have profiles */
-
create sequence profile_seq;
create table profile (
id bigint default nextval('profile_seq') primary key /* comment 'unique identifier' */,
@@ -132,11 +131,14 @@ create table notice (
reply_to integer /* comment 'notice replied to (usually a guess)' */ references notice (id) ,
is_local integer default 0 /* comment 'notice was generated by a user' */,
source varchar(32) /* comment 'source of comment, like "web", "im", or "clientname"' */,
- conversation integer /*id of root notice in this conversation' */ references notice (id)
-
-
+ conversation integer /*id of root notice in this conversation' */ references notice (id),
+ lat decimal(10,7) /* comment 'latitude'*/ ,
+ lon decimal(10,7) /* comment 'longitude'*/ ,
+ location_id integer /* comment 'location id if possible'*/ ,
+ location_ns integer /* comment 'namespace for location'*/
/* FULLTEXT(content) */
);
+
create index notice_profile_id_idx on notice using btree(profile_id,created,id);
create index notice_created_idx on notice using btree(created);
diff --git a/install.php b/install.php
index e7f7cf318..1c62bb2b2 100644
--- a/install.php
+++ b/install.php
@@ -301,7 +301,7 @@ function checkPrereqs()
}
$reqs = array('gd', 'curl',
- 'xmlwriter', 'mbstring','tidy');
+ 'xmlwriter', 'mbstring', 'xml', 'dom', 'simplexml');
foreach ($reqs as $req) {
if (!checkExtension($req)) {
diff --git a/js/geometa.js b/js/geometa.js
index ced5be060..21deb1885 100644
--- a/js/geometa.js
+++ b/js/geometa.js
@@ -1,5 +1,5 @@
// A shim to implement the W3C Geolocation API Specification using Gears or the Ajax API
-if ( typeof navigator.geolocation == "undefined" || navigator.geolocation.shim ) (function(){
+if (typeof navigator.geolocation == "undefined" || navigator.geolocation.shim ) (function(){
// -- BEGIN GEARS_INIT
(function() {
@@ -94,7 +94,7 @@ var GearsGeoLocation = (function() {
}
};
-})();
+});
var AjaxGeoLocation = (function() {
// -- PRIVATE
@@ -103,7 +103,7 @@ var AjaxGeoLocation = (function() {
if (!hasGoogleLoader() && !loading) {
loading = true;
var s = document.createElement('script');
- s.src = 'http://www.google.com/jsapi?callback=_google_loader_apiLoaded';
+ s.src = (document.location.protocol == "https:"?"https://":"http://") + 'www.google.com/jsapi?callback=_google_loader_apiLoaded';
s.type = "text/javascript";
document.getElementsByTagName('body')[0].appendChild(s);
}
@@ -161,22 +161,23 @@ var AjaxGeoLocation = (function() {
var cl = google.loader.ClientLocation;
var position = {
- latitude: cl.latitude,
- longitude: cl.longitude,
- altitude: null,
- accuracy: 43000, // same as Gears accuracy over wifi?
- altitudeAccuracy: null,
- heading: null,
- velocity: null,
- timestamp: new Date(),
-
+ coords: {
+ latitude: cl.latitude,
+ longitude: cl.longitude,
+ altitude: null,
+ accuracy: 43000, // same as Gears accuracy over wifi?
+ altitudeAccuracy: null,
+ heading: null,
+ speed: null,
+ },
// extra info that is outside of the bounds of the core API
address: {
city: cl.address.city,
country: cl.address.country,
country_code: cl.address.country_code,
region: cl.address.region
- }
+ },
+ timestamp: new Date()
};
successCallback(position);
@@ -208,9 +209,9 @@ var AjaxGeoLocation = (function() {
}
};
-})();
+});
// If you have Gears installed use that, else use Ajax ClientLocation
-navigator.geolocation = (window.google && google.gears) ? GearsGeoLocation : AjaxGeoLocation;
+navigator.geolocation = (window.google && google.gears) ? GearsGeoLocation() : AjaxGeoLocation();
})();
diff --git a/js/jquery.joverlay.js b/js/jquery.joverlay.js
index e4effec8e..cf4e15998 100644
--- a/js/jquery.joverlay.js
+++ b/js/jquery.joverlay.js
@@ -1,6 +1,6 @@
/* Copyright (c) 2009 Alvaro A. Lima Jr http://alvarojunior.com/jquery/joverlay.html
* Licensed under the MIT (http://www.opensource.org/licenses/mit-license.php)
- * Version: 0.7.1 (JUN 15, 2009)
+ * Version: 0.8 (OUT 19, 2009)
* Requires: jQuery 1.3+
*/
@@ -9,43 +9,54 @@
// Global vars
var isIE6 = $.browser.msie && $.browser.version == 6.0; // =(
var JOVERLAY_TIMER = null;
- var JOVERLAY_ELEMENT_PREV = null;
$.fn.jOverlay = function(options) {
// Element exist?
if ( $('#jOverlay').length ) {$.closeOverlay();}
- // Clear Element Prev
- JOVERLAY_ELEMENT_PREV = null;
-
// Clear Timer
if (JOVERLAY_TIMER !== null) {
clearTimeout( JOVERLAY_TIMER );
}
// Set Options
- var options = $.extend({}, $.fn.jOverlay.options, options);
+ var options = $.extend({}, $.fn.jOverlay.options, options || {});
- // private function
- function center(id) {
- if (options.center) {
- $.center(id);
- }
- }
+ // success deprecated !!! Use onSuccess
+ var onSuccess = options.onSuccess || options.success;
var element = this.is('*') ? this : '#jOverlayContent';
+
var position = isIE6 ? 'absolute' : 'fixed';
+
var isImage = /([^\/\\]+)\.(png|gif|jpeg|jpg|bmp)$/i.test( options.url );
var imgLoading = options.imgLoading ? "<img id='jOverlayLoading' src='"+options.imgLoading+"' style='position:"+position+"; z-index:"+(options.zIndex + 9)+";'/>" : '';
+ // private function
+ function center(id) {
+ if (options.center) {
+ $.center(id);
+ } else if( isIE6 ) {
+ $.center('#jOverlayContent',{
+ 'top' : $(window).scrollTop() + 'px',
+ 'marginLeft' : '',
+ 'marginTop' : '',
+ 'left' : ''
+ });
+ }
+ }
+
$('body').prepend(imgLoading + "<div id='jOverlay' />"
+ "<div id='jOverlayContent' style='position:"+position+"; z-index:"+(options.zIndex + 5)+"; display:none;'/>"
);
+ // Cache options
+ $('#jOverlayContent').data('options', options);
+
// Loading Centered
- $('#jOverlayLoading').load(function(){
+ $('#jOverlayLoading').load(function() {
center(this);
});
@@ -57,35 +68,42 @@
// Overlay Style
$('#jOverlay').css({
- backgroundColor : options.color,
- position : position,
- top : '0px',
- left : '0px',
- filter : 'alpha(opacity='+ (options.opacity * 100) +')', // IE =(
- opacity : options.opacity, // Good Browser =D
- zIndex : options.zIndex,
- width : !isIE6 ? '100%' : $(window).width() + 'px',
- height : !isIE6 ? '100%' : $(document).height() + 'px'
+ 'backgroundColor' : options.color,
+ 'position' : position,
+ 'top' : '0px',
+ 'left' : '0px',
+ 'filter' : 'alpha(opacity='+ (options.opacity * 100) +')', // IE =(
+ 'opacity' : options.opacity, // Good Browser =D
+ '-khtml-opacity' : options.opacity,
+ '-moz-opacity' : options.opacity,
+ 'zIndex' : options.zIndex,
+ 'width' : !isIE6 ? '100%' : $(window).width() + 'px',
+ 'height' : !isIE6 ? '100%' : $(document).height() + 'px'
}).show();
+ // INNER HTML
+ if ( $.trim(options.html) ) {
+ $(element).html(options.html);
+ }
+
// ELEMENT
if ( this.is('*') ) {
- JOVERLAY_ELEMENT_PREV = this.prev();
+ $('#jOverlayContent').data('jOverlayElementPrev', this.prev() );
$('#jOverlayContent').html(
- this.show().attr('display', options.autoHide ? 'none' : this.css('display') )
+ this.show().data('display', options.autoHide ? 'none' : this.css('display') )
);
-
+
if ( !isImage ) {
center('#jOverlayContent');
$('#jOverlayContent').show();
-
+
// Execute callback
- if ( !options.url && $.isFunction( options.success ) ) {
- options.success( this );
+ if ( !options.url && $.isFunction( onSuccess ) ) {
+ onSuccess( this );
}
}
@@ -106,13 +124,14 @@
$( element ).html(this);
center('#jOverlayContent');
+ center('#jOverlayLoading');
$('#jOverlayLoading').fadeOut(500);
$('#jOverlayContent').show();
// Execute callback
- if ( $.isFunction( options.success ) ) {
- options.success( this );
+ if ( $.isFunction( onSuccess ) ) {
+ onSuccess( $(element) );
}
}).error(function(){
@@ -138,8 +157,8 @@
center('#jOverlayContent');
// Execute callback
- if ($.isFunction( options.success )) {
- options.success(responseText);
+ if ( $.isFunction( onSuccess ) ) {
+ onSuccess( responseText );
}
},
@@ -163,8 +182,8 @@
$(window).resize(function(){
$('#jOverlay').css({
- width: $(window).width() + 'px',
- height: $(document).height() + 'px'
+ 'width' : $(window).width() + 'px',
+ 'height' : $(document).height() + 'px'
});
center('#jOverlayContent');
@@ -174,11 +193,15 @@
}
// Press ESC to close
- $(document).keydown(function(event){
- if (event.keyCode == 27) {
- $.closeOverlay();
- }
- });
+ if ( options.closeOnEsc ) {
+ $(document).keydown(function(event){
+ if ( event.keyCode == 27 ) {
+ $.closeOverlay();
+ }
+ });
+ } else {
+ $(document).unbind('keydown');
+ }
// Click to close
if ( options.bgClickToClose ) {
@@ -188,12 +211,13 @@
// Timeout (auto-close)
// time in millis to wait before auto-close
// set to 0 to disable
- if ( Number(options.timeout) > 0 ) {
- jOverlayTimer = setTimeout( $.closeOverlay, Number(options.timeout) );
+ if ( options.timeout && Number(options.timeout) > 0 ) {
+ JOVERLAY_TIMER = window.setTimeout( $.closeOverlay, Number(options.timeout) );
}
// ADD CSS
$('#jOverlayContent').css(options.css || {});
+
};
// Resizing large images - orginal by Christian Montoya.
@@ -202,68 +226,87 @@
var x = $(window).width() - 150;
var y = $(window).height() - 150;
if (imageWidth > x) {
- imageHeight = imageHeight * (x / imageWidth);
- imageWidth = x;
- if (imageHeight > y) {
- imageWidth = imageWidth * (y / imageHeight);
- imageHeight = y;
+ imageHeight = imageHeight * (x / imageWidth);
+ imageWidth = x;
+ if (imageHeight > y) {
+ imageWidth = imageWidth * (y / imageHeight);
+ imageHeight = y;
}
- } else if (imageHeight > y) {
- imageWidth = imageWidth * (y / imageHeight);
- imageHeight = y;
- if (imageWidth > x) {
- imageHeight = imageHeight * (x / imageWidth);
+ } else if (imageHeight > y) {
+ imageWidth = imageWidth * (y / imageHeight);
+ imageHeight = y;
+ if (imageWidth > x) {
+ imageHeight = imageHeight * (x / imageWidth);
imageWidth = x;
}
}
- return {width:imageWidth, height:imageHeight};
+ return {'width':imageWidth, 'height':imageHeight};
};
// Centered Element
- $.center = function(element) {
+ $.center = function(element, css) {
var element = $(element);
var elemWidth = element.width();
- element.css({
- width : elemWidth + 'px',
- marginLeft : '-' + (elemWidth / 2) + 'px',
- marginTop : '-' + element.height() / 2 + 'px',
- height : 'auto',
- top : !isIE6 ? '50%' : $(window).scrollTop() + ($(window).height() / 2) + 'px',
- left : '50%'
- });
+ element.css($.extend({},{
+ 'width' : elemWidth + 'px',
+ 'marginLeft' : '-' + (elemWidth / 2) + 'px',
+ 'marginTop' : '-' + element.height() / 2 + 'px',
+ 'height' : 'auto',
+ 'top' : !isIE6 ? '50%' : $(window).scrollTop() + ($(window).height() / 2) + 'px',
+ 'left' : '50%'
+ }, css || {}));
};
// Options default
$.fn.jOverlay.options = {
- method : 'GET',
- data : '',
- url : '',
- color : '#000',
- opacity : '0.6',
- zIndex : 9999,
- center : true,
- imgLoading : '',
- bgClickToClose : true,
- success : null,
- timeout : 0,
- autoHide : true,
- css : {}
+ 'method' : 'GET',
+ 'data' : '',
+ 'url' : '',
+ 'color' : '#000',
+ 'opacity' : '0.6',
+ 'zIndex' : 9999,
+ 'center' : true,
+ 'imgLoading' : '',
+ 'bgClickToClose' : true,
+ 'success' : null, // Deprecated : use onSuccess
+ 'onSuccess' : null,
+ 'timeout' : 0,
+ 'autoHide' : true,
+ 'css' : {},
+ 'html' : '',
+ 'closeOnEsc' : true
+ };
+
+ // Set default options (GLOBAL)
+ // Overiding the default values.
+ $.fn.jOverlay.setDefaults = function(options) {
+ $.fn.jOverlay.options = $.extend({}, $.fn.jOverlay.options, options || {});
};
// Close
$.closeOverlay = function() {
+ var content = $('#jOverlayContent');
+ var options = content.data('options');
+ var elementPrev = content.data('jOverlayElementPrev');
+
+ // Fix IE6 (SELECT)
if (isIE6) { $("select").show(); }
- if ( JOVERLAY_ELEMENT_PREV !== null ) {
- if ( JOVERLAY_ELEMENT_PREV !== null ) {
- var element = $('#jOverlayContent').children();
- JOVERLAY_ELEMENT_PREV.after( element.css('display', element.attr('display') ) );
- element.removeAttr('display');
- }
+ // Restore position
+ if ( elementPrev ) {
+ var contentChildren = content.children();
+ elementPrev.after( contentChildren.css('display', contentChildren.data('display') ) );
+ // Clear cache
+ contentChildren.removeData('display');
+ content.removeData('jOverlayElementPrev');
}
+ // Clear options cache
+ content.removeData('options');
+
+ // Remove joverlay elements
$('#jOverlayLoading, #jOverlayContent, #jOverlay').remove();
};
diff --git a/js/jquery.joverlay.min.js b/js/jquery.joverlay.min.js
index 44cd46043..fa1ceb7b6 100644
--- a/js/jquery.joverlay.min.js
+++ b/js/jquery.joverlay.min.js
@@ -1,7 +1,7 @@
/* Copyright (c) 2009 Alvaro A. Lima Jr http://alvarojunior.com/jquery/joverlay.html
* Licensed under the MIT (http://www.opensource.org/licenses/mit-license.php)
- * Version: 0.7.1 (JUN 15, 2009
+ * Version: 0.8 (OUT 19, 2009)
* Requires: jQuery 1.3+
* Packer from http://dean.edwards.name/packer/
*/
-(function($){var g=$.browser.msie&&$.browser.version==6.0;var h=null;var i=null;$.fn.jOverlay=function(b){if($('#jOverlay').length){$.closeOverlay()}i=null;if(h!==null){clearTimeout(h)}var b=$.extend({},$.fn.jOverlay.options,b);function center(a){if(b.center){$.center(a)}}var c=this.is('*')?this:'#jOverlayContent';var d=g?'absolute':'fixed';var e=/([^\/\\]+)\.(png|gif|jpeg|jpg|bmp)$/i.test(b.url);var f=b.imgLoading?"<img id='jOverlayLoading' src='"+b.imgLoading+"' style='position:"+d+"; z-index:"+(b.zIndex+9)+";'/>":'';$('body').prepend(f+"<div id='jOverlay' />"+"<div id='jOverlayContent' style='position:"+d+"; z-index:"+(b.zIndex+5)+"; display:none;'/>");$('#jOverlayLoading').load(function(){center(this)});if(g){$('select').hide();$('#jOverlayContent select').show()}$('#jOverlay').css({backgroundColor:b.color,position:d,top:'0px',left:'0px',filter:'alpha(opacity='+(b.opacity*100)+')',opacity:b.opacity,zIndex:b.zIndex,width:!g?'100%':$(window).width()+'px',height:!g?'100%':$(document).height()+'px'}).show();if(this.is('*')){i=this.prev();$('#jOverlayContent').html(this.show().attr('display',b.autoHide?'none':this.css('display')));if(!e){center('#jOverlayContent');$('#jOverlayContent').show();if(!b.url&&$.isFunction(b.success)){b.success(this)}}}if(e){$('<img/>').load(function(){var a=$.resize(this.width,this.height);$(this).css({width:a.width,height:a.height});$(c).html(this);center('#jOverlayContent');$('#jOverlayLoading').fadeOut(500);$('#jOverlayContent').show();if($.isFunction(b.success)){b.success(this)}}).error(function(){alert('Image ('+b.url+') not found.');$.closeOverlay()}).attr({'src':b.url,'alt':b.url})}if(b.url&&!e){$.ajax({type:b.method,data:b.data,url:b.url,success:function(a){$('#jOverlayLoading').fadeOut(500);$(c).html(a).show();center('#jOverlayContent');if($.isFunction(b.success)){b.success(a)}},error:function(){alert('URL ('+b.url+') not found.');$.closeOverlay()}})}if(g){$(window).scroll(function(){center('#jOverlayContent')});$(window).resize(function(){$('#jOverlay').css({width:$(window).width()+'px',height:$(document).height()+'px'});center('#jOverlayContent')})}$(document).keydown(function(a){if(a.keyCode==27){$.closeOverlay()}});if(b.bgClickToClose){$('#jOverlay').click($.closeOverlay)}if(Number(b.timeout)>0){jOverlayTimer=setTimeout($.closeOverlay,Number(b.timeout))}$('#jOverlayContent').css(b.css||{})};$.resize=function(a,b){var x=$(window).width()-150;var y=$(window).height()-150;if(a>x){b=b*(x/a);a=x;if(b>y){a=a*(y/b);b=y}}else if(b>y){a=a*(y/b);b=y;if(a>x){b=b*(x/a);a=x}}return{width:a,height:b}};$.center=function(a){var a=$(a);var b=a.width();a.css({width:b+'px',marginLeft:'-'+(b/2)+'px',marginTop:'-'+a.height()/2+'px',height:'auto',top:!g?'50%':$(window).scrollTop()+($(window).height()/2)+'px',left:'50%'})};$.fn.jOverlay.options={method:'GET',data:'',url:'',color:'#000',opacity:'0.6',zIndex:9999,center:true,imgLoading:'',bgClickToClose:true,success:null,timeout:0,autoHide:true,css:{}};$.closeOverlay=function(){if(g){$("select").show()}if(i!==null){if(i!==null){var a=$('#jOverlayContent').children();i.after(a.css('display',a.attr('display')));a.removeAttr('display')}}$('#jOverlayLoading, #jOverlayContent, #jOverlay').remove()}})(jQuery);
+(function($){var isIE6=$.browser.msie&&$.browser.version==6.0;var JOVERLAY_TIMER=null;$.fn.jOverlay=function(options){if($('#jOverlay').length){$.closeOverlay()}if(JOVERLAY_TIMER!==null){clearTimeout(JOVERLAY_TIMER)}var options=$.extend({},$.fn.jOverlay.options,options||{});var onSuccess=options.onSuccess||options.success;var element=this.is('*')?this:'#jOverlayContent';var position=isIE6?'absolute':'fixed';var isImage=/([^\/\\]+)\.(png|gif|jpeg|jpg|bmp)$/i.test(options.url);var imgLoading=options.imgLoading?"<img id='jOverlayLoading' src='"+options.imgLoading+"' style='position:"+position+"; z-index:"+(options.zIndex+9)+";'/>":'';function center(id){if(options.center){$.center(id)}else if(isIE6){$.center('#jOverlayContent',{'top':$(window).scrollTop()+'px','marginLeft':'','marginTop':'','left':''})}}$('body').prepend(imgLoading+"<div id='jOverlay' />"+"<div id='jOverlayContent' style='position:"+position+"; z-index:"+(options.zIndex+5)+"; display:none;'/>");$('#jOverlayContent').data('options',options);$('#jOverlayLoading').load(function(){center(this)});if(isIE6){$('select').hide();$('#jOverlayContent select').show()}$('#jOverlay').css({'backgroundColor':options.color,'position':position,'top':'0px','left':'0px','filter':'alpha(opacity='+(options.opacity*100)+')','opacity':options.opacity,'-khtml-opacity':options.opacity,'-moz-opacity':options.opacity,'zIndex':options.zIndex,'width':!isIE6?'100%':$(window).width()+'px','height':!isIE6?'100%':$(document).height()+'px'}).show();if($.trim(options.html)){$(element).html(options.html)}if(this.is('*')){$('#jOverlayContent').data('jOverlayElementPrev',this.prev());$('#jOverlayContent').html(this.show().data('display',options.autoHide?'none':this.css('display')));if(!isImage){center('#jOverlayContent');$('#jOverlayContent').show();if(!options.url&&$.isFunction(onSuccess)){onSuccess(this)}}}if(isImage){$('<img/>').load(function(){var resize=$.resize(this.width,this.height);$(this).css({width:resize.width,height:resize.height});$(element).html(this);center('#jOverlayContent');center('#jOverlayLoading');$('#jOverlayLoading').fadeOut(500);$('#jOverlayContent').show();if($.isFunction(onSuccess)){onSuccess($(element))}}).error(function(){alert('Image ('+options.url+') not found.');$.closeOverlay()}).attr({'src':options.url,'alt':options.url})}if(options.url&&!isImage){$.ajax({type:options.method,data:options.data,url:options.url,success:function(responseText){$('#jOverlayLoading').fadeOut(500);$(element).html(responseText).show();center('#jOverlayContent');if($.isFunction(onSuccess)){onSuccess(responseText)}},error:function(){alert('URL ('+options.url+') not found.');$.closeOverlay()}})}if(isIE6){$(window).scroll(function(){center('#jOverlayContent')});$(window).resize(function(){$('#jOverlay').css({'width':$(window).width()+'px','height':$(document).height()+'px'});center('#jOverlayContent')})}if(options.closeOnEsc){$(document).keydown(function(event){if(event.keyCode==27){$.closeOverlay()}})}else{$(document).unbind('keydown')}if(options.bgClickToClose){$('#jOverlay').click($.closeOverlay)}if(options.timeout&&Number(options.timeout)>0){JOVERLAY_TIMER=window.setTimeout($.closeOverlay,Number(options.timeout))}$('#jOverlayContent').css(options.css||{})};$.resize=function(imageWidth,imageHeight){var x=$(window).width()-150;var y=$(window).height()-150;if(imageWidth>x){imageHeight=imageHeight*(x/imageWidth);imageWidth=x;if(imageHeight>y){imageWidth=imageWidth*(y/imageHeight);imageHeight=y}}else if(imageHeight>y){imageWidth=imageWidth*(y/imageHeight);imageHeight=y;if(imageWidth>x){imageHeight=imageHeight*(x/imageWidth);imageWidth=x}}return{'width':imageWidth,'height':imageHeight}};$.center=function(element,css){var element=$(element);var elemWidth=element.width();element.css($.extend({},{'width':elemWidth+'px','marginLeft':'-'+(elemWidth/2)+'px','marginTop':'-'+element.height()/2+'px','height':'auto','top':!isIE6?'50%':$(window).scrollTop()+($(window).height()/2)+'px','left':'50%'},css||{}))};$.fn.jOverlay.options={'method':'GET','data':'','url':'','color':'#000','opacity':'0.6','zIndex':9999,'center':true,'imgLoading':'','bgClickToClose':true,'success':null,'onSuccess':null,'timeout':0,'autoHide':true,'css':{},'html':'','closeOnEsc':true};$.fn.jOverlay.setDefaults=function(options){$.fn.jOverlay.options=$.extend({},$.fn.jOverlay.options,options||{})};$.closeOverlay=function(){var content=$('#jOverlayContent');var options=content.data('options');var elementPrev=content.data('jOverlayElementPrev');if(isIE6){$("select").show()}if(elementPrev){var contentChildren=content.children();elementPrev.after(contentChildren.css('display',contentChildren.data('display')));contentChildren.removeData('display');content.removeData('jOverlayElementPrev')}content.removeData('options');$('#jOverlayLoading, #jOverlayContent, #jOverlay').remove()}})(jQuery); \ No newline at end of file
diff --git a/js/util.js b/js/util.js
index 5c581afb9..73fcf37be 100644
--- a/js/util.js
+++ b/js/util.js
@@ -185,7 +185,7 @@ var SN = { // StatusNet
$('#'+form_id+' #'+SN.C.S.NoticeActionSubmit).removeClass(SN.C.S.Disabled);
$('#'+form_id+' #'+SN.C.S.NoticeActionSubmit).removeAttr(SN.C.S.Disabled, SN.C.S.Disabled);
if (textStatus == 'timeout') {
- alert ('Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists');
+ form.append('<p class="error>Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.</p>');
}
else {
if ($('.'+SN.C.S.Error, xhr.responseXML).length > 0) {
@@ -193,7 +193,7 @@ var SN = { // StatusNet
}
else {
if(jQuery.inArray(parseInt(xhr.status), SN.C.I.HTTP20x30x) < 0) {
- alert('Sorry! We had trouble sending your notice ('+xhr.status+' '+xhr.statusText+'). Please report the problem to the site administrator if this happens again.');
+ form.append('<p class="error>(Sorry! We had trouble sending your notice ('+xhr.status+' '+xhr.statusText+'). Please report the problem to the site administrator if this happens again.</p>');
}
else {
$('#'+form_id+' #'+SN.C.S.NoticeDataText).val('');
@@ -205,8 +205,9 @@ var SN = { // StatusNet
success: function(data, textStatus) {
var result;
if ($('#'+SN.C.S.Error, data).length > 0) {
- result = document._importNode($('p', data)[0], true);
- alert(result.textContent || result.innerHTML);
+ result = document._importNode($('p', data)[0], true);
+ result = result.textContent || result.innerHTML;
+ form.append('<p class="error">'+result+'</p>');
}
else {
if($('body')[0].id == 'bookmarklet') {
@@ -215,28 +216,37 @@ var SN = { // StatusNet
if ($('#'+SN.C.S.CommandResult, data).length > 0) {
result = document._importNode($('p', data)[0], true);
- alert(result.textContent || result.innerHTML);
+ result = result.textContent || result.innerHTML;
+ form.append('<p class="success">'+result+'</p>');
}
else {
- notice = document._importNode($('li', data)[0], true);
- if ($('#'+notice.id).length === 0) {
- var notice_irt_value = $('#'+SN.C.S.NoticeInReplyTo).val();
- var notice_irt = '#notices_primary #notice-'+notice_irt_value;
- if($('body')[0].id == 'conversation') {
- if(notice_irt_value.length > 0 && $(notice_irt+' .notices').length < 1) {
- $(notice_irt).append('<ul class="notices"></ul>');
+ var notices = $('#notices_primary .notices');
+ if (notices.length > 0) {
+ var notice = document._importNode($('li', data)[0], true);
+ if ($('#'+notice.id).length === 0) {
+ var notice_irt_value = $('#'+SN.C.S.NoticeInReplyTo).val();
+ var notice_irt = '#notices_primary #notice-'+notice_irt_value;
+ if($('body')[0].id == 'conversation') {
+ if(notice_irt_value.length > 0 && $(notice_irt+' .notices').length < 1) {
+ $(notice_irt).append('<ul class="notices"></ul>');
+ }
+ $($(notice_irt+' .notices')[0]).append(notice);
}
- $($(notice_irt+' .notices')[0]).append(notice);
- }
- else {
- $("#notices_primary .notices").prepend(notice);
+ else {
+ notices.prepend(notice);
+ }
+ $('#'+notice.id).css({display:'none'});
+ $('#'+notice.id).fadeIn(2500);
+ SN.U.NoticeWithAttachment($('#'+notice.id));
+ SN.U.NoticeReplyTo($('#'+notice.id));
+ SN.U.FormXHR($('#'+notice.id+' .form_favor'));
}
- $('#'+notice.id).css({display:'none'});
- $('#'+notice.id).fadeIn(2500);
- SN.U.NoticeAttachments();
- SN.U.NoticeReplyTo($('#'+notice.id));
- SN.U.FormXHR($('#'+notice.id+' .form_favor'));
- }
+ }
+ else {
+ result = document._importNode($('title', data)[0], true);
+ result_title = result.textContent || result.innerHTML;
+ form.append('<p class="success">'+result_title+'</p>');
+ }
}
$('#'+form_id+' #'+SN.C.S.NoticeDataText).val('');
$('#'+form_id+' #'+SN.C.S.NoticeDataAttach).val('');
@@ -262,7 +272,7 @@ var SN = { // StatusNet
NoticeReplyTo: function(notice_item) {
var notice = notice_item[0];
var notice_reply = $('.notice_reply', notice)[0];
-
+
if (jQuery.data(notice_reply, "ElementData") === undefined) {
jQuery.data(notice_reply, "ElementData", {Bind:'submit'});
$(notice_reply).bind('click', function() {
@@ -276,19 +286,18 @@ var SN = { // StatusNet
NoticeReplySet: function(nick,id) {
if (nick.match(SN.C.I.PatternUsername)) {
var text = $('#'+SN.C.S.NoticeDataText);
- if (text.length) {
+ if (text.length > 0) {
replyto = '@' + nick + ' ';
text.val(replyto + text.val().replace(RegExp(replyto, 'i'), ''));
- $('#'+SN.C.S.FormNotice+' input#'+SN.C.S.NoticeInReplyTo).val(id);
+ $('#'+SN.C.S.FormNotice+' #'+SN.C.S.NoticeInReplyTo).val(id);
+
+ text[0].focus();
if (text[0].setSelectionRange) {
var len = text.val().length;
text[0].setSelectionRange(len,len);
- text[0].focus();
}
- return false;
}
}
- return true;
},
NoticeFavor: function() {
@@ -297,13 +306,25 @@ var SN = { // StatusNet
},
NoticeAttachments: function() {
+ $('.notice a.attachment').each(function() {
+ SN.U.NoticeWithAttachment($(this).closest('.notice'));
+ });
+ },
+
+ NoticeWithAttachment: function(notice) {
+ if ($('.attachment', notice).length === 0) {
+ return;
+ }
+
+ var notice_id = notice.attr('id');
+
$.fn.jOverlay.options = {
method : 'GET',
data : '',
url : '',
color : '#000',
opacity : '0.6',
- zIndex : 99,
+ zIndex : 9999,
center : false,
imgLoading : $('address .url')[0].href+'theme/base/images/illustrations/illu_progress_loading-01.gif',
bgClickToClose : true,
@@ -316,13 +337,13 @@ var SN = { // StatusNet
css : {'max-width':'542px', 'top':'5%', 'left':'32.5%'}
};
- $('#content .notice a.attachment').click(function() {
+ $('#'+notice_id+' a.attachment').click(function() {
$().jOverlay({url: $('address .url')[0].href+'attachment/' + ($(this).attr('id').substring('attachment'.length + 1)) + '/ajax'});
return false;
});
var t;
- $("body:not(#shownotice) #content .notice a.thumbnail").hover(
+ $("body:not(#shownotice) #"+notice_id+" a.thumbnail").hover(
function() {
var anchor = $(this);
$("a.thumbnail").children('img').hide();
@@ -375,9 +396,10 @@ var SN = { // StatusNet
NewDirectMessage: function() {
NDM = $('.entity_send-a-message a');
NDM.attr({'href':NDM.attr('href')+'&ajax=1'});
- NDM.click(function() {
+ NDM.bind('click', function() {
var NDMF = $('.entity_send-a-message form');
if (NDMF.length === 0) {
+ $(this).addClass('processing');
$.get(NDM.attr('href'), null, function(data) {
$('.entity_send-a-message').append(document._importNode($('form', data)[0], true));
NDMF = $('.entity_send-a-message .form_notice');
@@ -388,6 +410,7 @@ var SN = { // StatusNet
NDMF.hide();
return false;
});
+ NDM.removeClass('processing');
});
}
else {
diff --git a/lib/designsettings.php b/lib/designsettings.php
index 7b8c78c30..b70ba0dfc 100644
--- a/lib/designsettings.php
+++ b/lib/designsettings.php
@@ -107,7 +107,7 @@ class DesignSettingsAction extends AccountSettingsAction
'type' => 'file',
'id' => 'design_background-image_file'));
$this->element('p', 'form_guide', _('You can upload your personal ' .
- 'background image. The maximum file size is 2Mb.'));
+ 'background image. The maximum file size is 2MB.'));
$this->element('input', array('name' => 'MAX_FILE_SIZE',
'type' => 'hidden',
'id' => 'MAX_FILE_SIZE',
diff --git a/lib/imagefile.php b/lib/imagefile.php
index cf1668f20..6bc8e599b 100644
--- a/lib/imagefile.php
+++ b/lib/imagefile.php
@@ -214,9 +214,9 @@ class ImageFile
$value = ImageFile::maxFileSizeInt();
if ($value > 1024 * 1024) {
- return ($value/(1024*1024)).'Mb';
+ return ($value/(1024*1024)) . _('MB');
} else if ($value > 1024) {
- return ($value/(1024)).'kB';
+ return ($value/(1024)) . _('kB');
} else {
return $value;
}
diff --git a/lib/language.php b/lib/language.php
index a99bf89e3..4fc45bafe 100644
--- a/lib/language.php
+++ b/lib/language.php
@@ -172,6 +172,7 @@ function get_all_languages() {
'fr-fr' => array('q' => 1, 'lang' => 'fr', 'name' => 'French', 'direction' => 'ltr'),
'ga' => array('q' => 0.5, 'lang' => 'ga', 'name' => 'Galician', 'direction' => 'ltr'),
'he' => array('q' => 0.5, 'lang' => 'he', 'name' => 'Hebrew', 'direction' => 'rtl'),
+ 'hsb' => array('q' => 0.8, 'lang' => 'hsb', 'name' => 'Upper Sorbian', 'direction' => 'ltr'),
'is' => array('q' => 0.1, 'lang' => 'is', 'name' => 'Icelandic', 'direction' => 'ltr'),
'it' => array('q' => 1, 'lang' => 'it', 'name' => 'Italian', 'direction' => 'ltr'),
'jp' => array('q' => 0.5, 'lang' => 'ja', 'name' => 'Japanese', 'direction' => 'ltr'),
diff --git a/lib/noticelist.php b/lib/noticelist.php
index 5877827ff..21cec528f 100644
--- a/lib/noticelist.php
+++ b/lib/noticelist.php
@@ -392,15 +392,19 @@ class NoticeListItem extends Widget
$name = $location->getName();
- if (empty($name)) {
- // XXX: Could be a translation issue. Fall back to... something?
- return;
- }
-
$lat = $this->notice->lat;
$lon = $this->notice->lon;
$latlon = (!empty($lat) && !empty($lon)) ? $lat.';'.$lon : '';
+ if (empty($name)) {
+ $latdms = $this->decimalDegreesToDMS(abs($lat));
+ $londms = $this->decimalDegreesToDMS(abs($lon));
+ $name = sprintf(
+ _('%1$u°%2$u\'%3$u"%4$s %5$u°%6$u\'%7$u"%8$s'),
+ $latdms['deg'],$latdms['min'], $latdms['sec'],($lat>0?_('N'):_('S')),
+ $londms['deg'],$londms['min'], $londms['sec'],($lon>0?_('E'):_('W')));
+ }
+
$url = $location->getUrl();
$this->out->elementStart('span', array('class' => 'location'));
@@ -418,6 +422,20 @@ class NoticeListItem extends Widget
$this->out->elementEnd('span');
}
+ function decimalDegreesToDMS($dec)
+ {
+
+ $vars = explode(".",$dec);
+ $deg = $vars[0];
+ $tempma = "0.".$vars[1];
+
+ $tempma = $tempma * 3600;
+ $min = floor($tempma / 60);
+ $sec = $tempma - ($min*60);
+
+ return array("deg"=>$deg,"min"=>$min,"sec"=>$sec);
+ }
+
/**
* Show the source of the notice
*
diff --git a/lib/popularnoticesection.php b/lib/popularnoticesection.php
index 35b914a50..9fbc9d2dd 100644
--- a/lib/popularnoticesection.php
+++ b/lib/popularnoticesection.php
@@ -68,8 +68,9 @@ class PopularNoticeSection extends NoticeSection
}
$qry .= ' GROUP BY notice.id,notice.profile_id,notice.content,notice.uri,' .
'notice.rendered,notice.url,notice.created,notice.modified,' .
- 'notice.reply_to,notice.is_local,notice.source,notice.conversation ' .
- 'ORDER BY weight DESC';
+ 'notice.reply_to,notice.is_local,notice.source,notice.conversation, ' .
+ 'notice.lat,notice.lon,location_id,location_ns' .
+ ' ORDER BY weight DESC';
$offset = 0;
$limit = NOTICES_PER_SECTION + 1;
diff --git a/lib/profileaction.php b/lib/profileaction.php
index e3a39ad8b..2d4d23265 100644
--- a/lib/profileaction.php
+++ b/lib/profileaction.php
@@ -166,6 +166,7 @@ class ProfileAction extends OwnerDesignAction
$subs_count = $this->profile->subscriptionCount();
$subbed_count = $this->profile->subscriberCount();
$notice_count = $this->profile->noticeCount();
+ $group_count = $this->user->getGroups()->N;
$this->elementStart('div', array('id' => 'entity_statistics',
'class' => 'section'));
@@ -202,6 +203,15 @@ class ProfileAction extends OwnerDesignAction
$this->element('dd', 'subscribers', $subbed_count);
$this->elementEnd('dl');
+ $this->elementStart('dl', 'entity_groups');
+ $this->elementStart('dt');
+ $this->element('a', array('href' => common_local_url('usergroups',
+ array('nickname' => $this->profile->nickname))),
+ _('Groups'));
+ $this->elementEnd('dt');
+ $this->element('dd', 'groups', $group_count);
+ $this->elementEnd('dl');
+
$this->elementStart('dl', 'entity_notices');
$this->element('dt', null, _('Notices'));
$this->element('dd', null, $notice_count);
diff --git a/lib/rssaction.php b/lib/rssaction.php
index 3b303f73e..d591c99ed 100644
--- a/lib/rssaction.php
+++ b/lib/rssaction.php
@@ -176,8 +176,10 @@ class Rss10Action extends Action
$this->showChannel();
$this->showImage();
- foreach ($this->notices as $n) {
- $this->showItem($n);
+ if (count($this->notices)) {
+ foreach ($this->notices as $n) {
+ $this->showItem($n);
+ }
}
$this->showCreators();
@@ -203,8 +205,10 @@ class Rss10Action extends Action
$this->elementStart('items');
$this->elementStart('rdf:Seq');
- foreach ($this->notices as $notice) {
- $this->element('rdf:li', array('rdf:resource' => $notice->uri));
+ if (count($this->notices)) {
+ foreach ($this->notices as $notice) {
+ $this->element('rdf:li', array('rdf:resource' => $notice->uri));
+ }
}
$this->elementEnd('rdf:Seq');
diff --git a/lib/searchaction.php b/lib/searchaction.php
index 130b28ff5..bb71a2ba1 100644
--- a/lib/searchaction.php
+++ b/lib/searchaction.php
@@ -123,8 +123,8 @@ class SearchAction extends Action
if (!common_config('site', 'fancy')) {
$this->hidden('action', $this->trimmed('action'));
}
- $this->input('q', 'Keyword(s)', $q);
- $this->submit('search', 'Search');
+ $this->input('q', _('Keyword(s)'), $q);
+ $this->submit('search', _('Search'));
$this->elementEnd('li');
$this->elementEnd('ul');
$this->elementEnd('fieldset');
diff --git a/lib/searchgroupnav.php b/lib/searchgroupnav.php
index 677365ea9..e843dc096 100644
--- a/lib/searchgroupnav.php
+++ b/lib/searchgroupnav.php
@@ -79,9 +79,9 @@ class SearchGroupNav extends Widget
}
$this->out->menuItem(common_local_url('peoplesearch', $args), _('People'),
_('Find people on this site'), $action_name == 'peoplesearch', 'nav_search_people');
- $this->out->menuItem(common_local_url('noticesearch', $args), _('Notice'),
+ $this->out->menuItem(common_local_url('noticesearch', $args), _('Notices'),
_('Find content of notices'), $action_name == 'noticesearch', 'nav_search_notice');
- $this->out->menuItem(common_local_url('groupsearch', $args), _('Group'),
+ $this->out->menuItem(common_local_url('groupsearch', $args), _('Groups'),
_('Find groups on this site'), $action_name == 'groupsearch', 'nav_search_group');
$this->action->elementEnd('ul');
}
diff --git a/lib/userprofile.php b/lib/userprofile.php
index ee205af85..07e575085 100644
--- a/lib/userprofile.php
+++ b/lib/userprofile.php
@@ -304,34 +304,43 @@ class UserProfile extends Widget
}
$this->out->elementEnd('li');
- if ($cur->hasRight(Right::SANDBOXUSER)) {
- $this->out->elementStart('li', 'entity_sandbox');
- if ($this->user->isSandboxed()) {
- $usf = new UnSandboxForm($this->out, $this->profile, $r2args);
- $usf->show();
- } else {
- $sf = new SandboxForm($this->out, $this->profile, $r2args);
- $sf->show();
+ if ($cur->hasRight(Right::SANDBOXUSER) ||
+ $cur->hasRight(Right::SILENCEUSER) ||
+ $cur->hasRight(Right::DELETEUSER)) {
+ $this->out->elementStart('li', 'entity_moderation');
+ $this->out->element('p', null, _('Moderate'));
+ $this->out->elementStart('ul');
+ if ($cur->hasRight(Right::SANDBOXUSER)) {
+ $this->out->elementStart('li', 'entity_sandbox');
+ if ($this->user->isSandboxed()) {
+ $usf = new UnSandboxForm($this->out, $this->profile, $r2args);
+ $usf->show();
+ } else {
+ $sf = new SandboxForm($this->out, $this->profile, $r2args);
+ $sf->show();
+ }
+ $this->out->elementEnd('li');
}
- $this->out->elementEnd('li');
- }
- if ($cur->hasRight(Right::SILENCEUSER)) {
- $this->out->elementStart('li', 'entity_silence');
- if ($this->user->isSilenced()) {
- $usf = new UnSilenceForm($this->out, $this->profile, $r2args);
- $usf->show();
- } else {
- $sf = new SilenceForm($this->out, $this->profile, $r2args);
- $sf->show();
+ if ($cur->hasRight(Right::SILENCEUSER)) {
+ $this->out->elementStart('li', 'entity_silence');
+ if ($this->user->isSilenced()) {
+ $usf = new UnSilenceForm($this->out, $this->profile, $r2args);
+ $usf->show();
+ } else {
+ $sf = new SilenceForm($this->out, $this->profile, $r2args);
+ $sf->show();
+ }
+ $this->out->elementEnd('li');
}
- $this->out->elementEnd('li');
- }
- if ($cur->hasRight(Right::DELETEUSER)) {
- $this->out->elementStart('li', 'entity_delete');
- $df = new DeleteUserForm($this->out, $this->profile, $r2args);
- $df->show();
+ if ($cur->hasRight(Right::DELETEUSER)) {
+ $this->out->elementStart('li', 'entity_delete');
+ $df = new DeleteUserForm($this->out, $this->profile, $r2args);
+ $df->show();
+ $this->out->elementEnd('li');
+ }
+ $this->out->elementEnd('ul');
$this->out->elementEnd('li');
}
}
diff --git a/locale/ar/LC_MESSAGES/statusnet.po b/locale/ar/LC_MESSAGES/statusnet.po
index ce25dcdb9..2b8f80bdc 100644
--- a/locale/ar/LC_MESSAGES/statusnet.po
+++ b/locale/ar/LC_MESSAGES/statusnet.po
@@ -8,12 +8,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-27 23:50+0000\n"
-"PO-Revision-Date: 2009-11-28 19:49:49+0000\n"
+"POT-Creation-Date: 2009-12-02 23:18+0000\n"
+"PO-Revision-Date: 2009-12-02 23:19:01+0000\n"
"Language-Team: Arabic\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59523); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59683); Translate extension (2009-11-29)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ar\n"
"X-Message-Group: out-statusnet\n"
@@ -560,7 +560,7 @@ msgstr ""
#: actions/emailsettings.php:238 actions/favor.php:75
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
@@ -727,7 +727,7 @@ msgid "Conversation"
msgstr "محادثة"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:206 lib/searchgroupnav.php:82
+#: lib/profileaction.php:216 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "الإشعارات"
@@ -836,7 +836,7 @@ msgstr "سمة الموقع."
#: actions/designadminpanel.php:412 lib/designsettings.php:101
msgid "Change background image"
-msgstr "غيّر صورة الخلفية"
+msgstr "تغيير صورة الخلفية"
#: actions/designadminpanel.php:417 actions/designadminpanel.php:492
#: lib/designsettings.php:178
@@ -868,7 +868,7 @@ msgstr ""
#: actions/designadminpanel.php:483 lib/designsettings.php:170
msgid "Change colours"
-msgstr "غيّر الألوان"
+msgstr "تغيير الألوان"
#: actions/designadminpanel.php:505 lib/designsettings.php:191
msgid "Content"
@@ -1225,23 +1225,23 @@ msgstr "المستخدم الذي تستمع إليه غير موجود."
msgid "You can use the local subscription!"
msgstr ""
-#: actions/finishremotesubscribe.php:96
+#: actions/finishremotesubscribe.php:99
msgid "That user has blocked you from subscribing."
msgstr ""
-#: actions/finishremotesubscribe.php:106
+#: actions/finishremotesubscribe.php:110
msgid "You are not authorized."
msgstr "لا تملك تصريحًا."
-#: actions/finishremotesubscribe.php:109
+#: actions/finishremotesubscribe.php:113
msgid "Could not convert request token to access token."
msgstr ""
-#: actions/finishremotesubscribe.php:114
+#: actions/finishremotesubscribe.php:118
msgid "Remote service uses unknown version of OMB protocol."
msgstr ""
-#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
msgid "Error updating remote profile"
msgstr "خطأ أثناء تحديث الملف الشخصي البعيد"
@@ -1436,8 +1436,8 @@ msgid ""
"action.newgroup%%) yourself!"
msgstr ""
-#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
-#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr "مجموعات"
@@ -1721,57 +1721,57 @@ msgstr ""
msgid "Already logged in."
msgstr "والج بالفعل."
-#: actions/login.php:110 actions/login.php:120
+#: actions/login.php:108 actions/login.php:118
msgid "Invalid or expired token."
msgstr ""
-#: actions/login.php:143
+#: actions/login.php:146
msgid "Incorrect username or password."
msgstr "اسم المستخدم أو كلمة السر غير صحيحان."
-#: actions/login.php:149
+#: actions/login.php:152
msgid "Error setting user. You are probably not authorized."
msgstr "خطأ أثناء ضبط المستخدم. لست مُصرحًا على الأرجح."
-#: actions/login.php:204 actions/login.php:257 lib/action.php:458
+#: actions/login.php:207 actions/login.php:260 lib/action.php:458
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "لُج"
-#: actions/login.php:243
+#: actions/login.php:246
msgid "Login to site"
msgstr "لُج إلى الموقع"
-#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/login.php:249 actions/profilesettings.php:106
#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
#: lib/groupeditform.php:152 lib/userprofile.php:131
msgid "Nickname"
msgstr "الاسم المستعار"
-#: actions/login.php:249 actions/register.php:428
+#: actions/login.php:252 actions/register.php:428
#: lib/accountsettingsaction.php:116
msgid "Password"
msgstr "كلمة السر"
-#: actions/login.php:252 actions/register.php:477
+#: actions/login.php:255 actions/register.php:477
msgid "Remember me"
msgstr "تذكّرني"
-#: actions/login.php:253 actions/register.php:479
+#: actions/login.php:256 actions/register.php:479
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
-#: actions/login.php:263
+#: actions/login.php:266
msgid "Lost or forgotten password?"
msgstr "أنسيت كلمة السر؟"
-#: actions/login.php:282
+#: actions/login.php:285
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
msgstr ""
-#: actions/login.php:286
+#: actions/login.php:289
#, php-format
msgid ""
"Login with your username and password. Don't have a username yet? [Register]"
@@ -2663,8 +2663,7 @@ msgid "Invalid profile URL (bad format)"
msgstr ""
#: actions/remotesubscribe.php:168
-msgid ""
-"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
msgstr ""
#: actions/remotesubscribe.php:176
@@ -2845,7 +2844,7 @@ msgid "Members"
msgstr "الأعضاء"
#: actions/showgroup.php:386 lib/profileaction.php:117
-#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
+#: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95
#: lib/tagcloudsection.php:71
msgid "(None)"
msgstr "(لا شيء)"
@@ -2854,7 +2853,7 @@ msgstr "(لا شيء)"
msgid "All members"
msgstr "جميع الأعضاء"
-#: actions/showgroup.php:429 lib/profileaction.php:173
+#: actions/showgroup.php:429 lib/profileaction.php:174
msgid "Statistics"
msgstr "إحصاءات"
@@ -4204,21 +4203,11 @@ msgstr ""
msgid "Can't turn on notification."
msgstr ""
-#: lib/command.php:597
-#, php-format
-msgid "Could not create login token for %s"
-msgstr ""
-
-#: lib/command.php:602
-#, php-format
-msgid "This link is useable only once, and is good for only 2 minutes: %s"
-msgstr ""
-
-#: lib/command.php:618
+#: lib/command.php:592
msgid "You are not subscribed to anyone."
msgstr "لست مُشتركًا بأي أحد."
-#: lib/command.php:620
+#: lib/command.php:594
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "لست مشتركًا بأحد."
@@ -4228,11 +4217,11 @@ msgstr[3] "أنت مشترك بهؤلاء الأشخاص:"
msgstr[4] ""
msgstr[5] ""
-#: lib/command.php:640
+#: lib/command.php:614
msgid "No one is subscribed to you."
msgstr "لا أحد مشترك بك."
-#: lib/command.php:642
+#: lib/command.php:616
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "لا أحد مشترك بك."
@@ -4242,11 +4231,11 @@ msgstr[3] "هؤلاء الأشخاص مشتركون بك:"
msgstr[4] ""
msgstr[5] ""
-#: lib/command.php:662
+#: lib/command.php:636
msgid "You are not a member of any groups."
msgstr "لست عضوًا في أي مجموعة."
-#: lib/command.php:664
+#: lib/command.php:638
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "لست عضوًا في أي مجموعة."
@@ -4256,7 +4245,7 @@ msgstr[3] "أنت عضو في هذه المجموعات:"
msgstr[4] ""
msgstr[5] ""
-#: lib/command.php:678
+#: lib/command.php:652
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4275,7 +4264,6 @@ msgid ""
"reply #<notice_id> - reply to notice with a given id\n"
"reply <nickname> - reply to the last notice from user\n"
"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
"drop <group> - leave group\n"
"stats - get your stats\n"
"stop - same as 'off'\n"
@@ -4514,7 +4502,7 @@ msgstr ""
msgid "kB"
msgstr ""
-#: lib/jabber.php:192
+#: lib/jabber.php:191
#, php-format
msgid "[%s]"
msgstr "[%s]"
@@ -4912,7 +4900,7 @@ msgstr "رسائلك المُرسلة"
msgid "Tags in %s's notices"
msgstr ""
-#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr "الاشتراكات"
@@ -4920,7 +4908,7 @@ msgstr "الاشتراكات"
msgid "All subscriptions"
msgstr "جميع الاشتراكات"
-#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+#: lib/profileaction.php:140 lib/profileaction.php:201 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr "المشتركون"
@@ -4928,15 +4916,15 @@ msgstr "المشتركون"
msgid "All subscribers"
msgstr "جميع المشتركين"
-#: lib/profileaction.php:177
+#: lib/profileaction.php:178
msgid "User ID"
msgstr "هوية المستخدم"
-#: lib/profileaction.php:182
+#: lib/profileaction.php:183
msgid "Member since"
msgstr "عضو منذ"
-#: lib/profileaction.php:235
+#: lib/profileaction.php:245
msgid "All groups"
msgstr "كل المجموعات"
diff --git a/locale/bg/LC_MESSAGES/statusnet.po b/locale/bg/LC_MESSAGES/statusnet.po
index f4a52d114..8d020e084 100644
--- a/locale/bg/LC_MESSAGES/statusnet.po
+++ b/locale/bg/LC_MESSAGES/statusnet.po
@@ -8,12 +8,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-27 23:50+0000\n"
-"PO-Revision-Date: 2009-11-28 19:49:52+0000\n"
+"POT-Creation-Date: 2009-12-02 23:18+0000\n"
+"PO-Revision-Date: 2009-12-02 23:19:07+0000\n"
"Language-Team: Bulgarian\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59523); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59683); Translate extension (2009-11-29)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: bg\n"
"X-Message-Group: out-statusnet\n"
@@ -275,13 +275,12 @@ msgid "Could not follow user: %s is already on your list."
msgstr "Грешка при проследяване на потребител: %s вече е в списъка ви."
#: actions/apifriendshipsdestroy.php:109
-#, fuzzy
msgid "Could not unfollow user: User not found."
-msgstr "Грешка при проследяване — потребителят не е намерен."
+msgstr "Грешка при спиране на проследяването — потребителят не е намерен."
#: actions/apifriendshipsdestroy.php:120
msgid "You cannot unfollow yourself!"
-msgstr ""
+msgstr "Не можете да спрете да следите себе си!"
#: actions/apifriendshipsexists.php:94
msgid "Two user ids or screen_names must be supplied."
@@ -567,7 +566,7 @@ msgstr "Изрязване"
#: actions/emailsettings.php:238 actions/favor.php:75
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
@@ -739,7 +738,7 @@ msgid "Conversation"
msgstr "Разговор"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:206 lib/searchgroupnav.php:82
+#: lib/profileaction.php:216 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "Бележки"
@@ -963,9 +962,9 @@ msgid "Use this form to edit the group."
msgstr ""
#: actions/editgroup.php:201 actions/newgroup.php:145
-#, fuzzy, php-format
+#, php-format
msgid "description is too long (max %d chars)."
-msgstr "Автобиографията е твърде дълга (до 140 символа)."
+msgstr "Описанието е твърде дълго (до %d символа)."
#: actions/editgroup.php:253
msgid "Could not update group."
@@ -1256,26 +1255,26 @@ msgstr "Потребителят, когото проследявате, не с
msgid "You can use the local subscription!"
msgstr "Можете да ползвате локален абонамент!"
-#: actions/finishremotesubscribe.php:96
+#: actions/finishremotesubscribe.php:99
msgid "That user has blocked you from subscribing."
msgstr "Потребителят е забранил да се абонирате за него."
-#: actions/finishremotesubscribe.php:106
+#: actions/finishremotesubscribe.php:110
#, fuzzy
msgid "You are not authorized."
msgstr "Забранено."
-#: actions/finishremotesubscribe.php:109
+#: actions/finishremotesubscribe.php:113
#, fuzzy
msgid "Could not convert request token to access token."
msgstr "Грешка при преобразуване на tokens за одобрение в tokens за достъп."
-#: actions/finishremotesubscribe.php:114
+#: actions/finishremotesubscribe.php:118
#, fuzzy
msgid "Remote service uses unknown version of OMB protocol."
msgstr "Непозната версия на протокола OMB."
-#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
msgid "Error updating remote profile"
msgstr "Грешка при обновяване на отдалечен профил"
@@ -1484,8 +1483,8 @@ msgid ""
"action.newgroup%%) yourself!"
msgstr ""
-#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
-#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr "Групи"
@@ -1811,53 +1810,53 @@ msgstr "%s напусна групата %s"
msgid "Already logged in."
msgstr "Вече сте влезли."
-#: actions/login.php:110 actions/login.php:120
+#: actions/login.php:108 actions/login.php:118
#, fuzzy
msgid "Invalid or expired token."
msgstr "Невалидно съдържание на бележка"
-#: actions/login.php:143
+#: actions/login.php:146
msgid "Incorrect username or password."
msgstr "Грешно име или парола."
-#: actions/login.php:149
+#: actions/login.php:152
#, fuzzy
msgid "Error setting user. You are probably not authorized."
msgstr "Забранено."
-#: actions/login.php:204 actions/login.php:257 lib/action.php:458
+#: actions/login.php:207 actions/login.php:260 lib/action.php:458
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Вход"
-#: actions/login.php:243
+#: actions/login.php:246
msgid "Login to site"
msgstr ""
-#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/login.php:249 actions/profilesettings.php:106
#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
#: lib/groupeditform.php:152 lib/userprofile.php:131
msgid "Nickname"
msgstr "Псевдоним"
-#: actions/login.php:249 actions/register.php:428
+#: actions/login.php:252 actions/register.php:428
#: lib/accountsettingsaction.php:116
msgid "Password"
msgstr "Парола"
-#: actions/login.php:252 actions/register.php:477
+#: actions/login.php:255 actions/register.php:477
msgid "Remember me"
msgstr "Запомни ме"
-#: actions/login.php:253 actions/register.php:479
+#: actions/login.php:256 actions/register.php:479
msgid "Automatically login in the future; not for shared computers!"
msgstr "Автоматично влизане занапред. Да не се ползва на общи компютри!"
-#: actions/login.php:263
+#: actions/login.php:266
msgid "Lost or forgotten password?"
msgstr "Загубена или забравена парола"
-#: actions/login.php:282
+#: actions/login.php:285
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -1865,7 +1864,7 @@ msgstr ""
"За по-голяма сигурност, моля въведете отново потребителското си име и парола "
"при промяна на настройките."
-#: actions/login.php:286
+#: actions/login.php:289
#, fuzzy, php-format
msgid ""
"Login with your username and password. Don't have a username yet? [Register]"
@@ -2799,8 +2798,7 @@ msgstr "Неправилен адрес на профил (грешен форм
#: actions/remotesubscribe.php:168
#, fuzzy
-msgid ""
-"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
msgstr "Неправилен адрес на профил (няма YADIS документ)."
#: actions/remotesubscribe.php:176
@@ -2980,7 +2978,7 @@ msgid "Members"
msgstr "Членове"
#: actions/showgroup.php:386 lib/profileaction.php:117
-#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
+#: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95
#: lib/tagcloudsection.php:71
msgid "(None)"
msgstr ""
@@ -2989,7 +2987,7 @@ msgstr ""
msgid "All members"
msgstr "Всички членове"
-#: actions/showgroup.php:429 lib/profileaction.php:173
+#: actions/showgroup.php:429 lib/profileaction.php:174
msgid "Statistics"
msgstr "Статистики"
@@ -4405,49 +4403,39 @@ msgstr "Уведомлението е включено."
msgid "Can't turn on notification."
msgstr "Грешка при включване на уведомлението."
-#: lib/command.php:597
-#, fuzzy, php-format
-msgid "Could not create login token for %s"
-msgstr "Грешка при създаване на OpenID форма: %s"
-
-#: lib/command.php:602
-#, php-format
-msgid "This link is useable only once, and is good for only 2 minutes: %s"
-msgstr ""
-
-#: lib/command.php:618
+#: lib/command.php:592
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "Не сте абонирани за този профил"
-#: lib/command.php:620
+#: lib/command.php:594
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Вече сте абонирани за следните потребители:"
msgstr[1] "Вече сте абонирани за следните потребители:"
-#: lib/command.php:640
+#: lib/command.php:614
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Грешка при абониране на друг потребител за вас."
-#: lib/command.php:642
+#: lib/command.php:616
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Грешка при абониране на друг потребител за вас."
msgstr[1] "Грешка при абониране на друг потребител за вас."
-#: lib/command.php:662
+#: lib/command.php:636
msgid "You are not a member of any groups."
msgstr "Не членувате в нито една група."
-#: lib/command.php:664
+#: lib/command.php:638
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Не членувате в тази група."
msgstr[1] "Не членувате в тази група."
-#: lib/command.php:678
+#: lib/command.php:652
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4466,7 +4454,6 @@ msgid ""
"reply #<notice_id> - reply to notice with a given id\n"
"reply <nickname> - reply to the last notice from user\n"
"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
"drop <group> - leave group\n"
"stats - get your stats\n"
"stop - same as 'off'\n"
@@ -4712,7 +4699,7 @@ msgstr ""
msgid "kB"
msgstr ""
-#: lib/jabber.php:192
+#: lib/jabber.php:191
#, php-format
msgid "[%s]"
msgstr ""
@@ -5121,7 +5108,7 @@ msgstr "Изпратените от вас съобщения"
msgid "Tags in %s's notices"
msgstr "Етикети в бележките на %s"
-#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr "Абонаменти"
@@ -5129,7 +5116,7 @@ msgstr "Абонаменти"
msgid "All subscriptions"
msgstr "Всички абонаменти"
-#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+#: lib/profileaction.php:140 lib/profileaction.php:201 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr "Абонати"
@@ -5137,16 +5124,16 @@ msgstr "Абонати"
msgid "All subscribers"
msgstr "Всички абонати"
-#: lib/profileaction.php:177
+#: lib/profileaction.php:178
#, fuzzy
msgid "User ID"
msgstr "Потребител"
-#: lib/profileaction.php:182
+#: lib/profileaction.php:183
msgid "Member since"
msgstr "Участник от"
-#: lib/profileaction.php:235
+#: lib/profileaction.php:245
msgid "All groups"
msgstr "Всички групи"
diff --git a/locale/ca/LC_MESSAGES/statusnet.po b/locale/ca/LC_MESSAGES/statusnet.po
index 8f517c055..23102cfb1 100644
--- a/locale/ca/LC_MESSAGES/statusnet.po
+++ b/locale/ca/LC_MESSAGES/statusnet.po
@@ -8,12 +8,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-27 23:50+0000\n"
-"PO-Revision-Date: 2009-11-28 19:49:54+0000\n"
+"POT-Creation-Date: 2009-12-02 23:18+0000\n"
+"PO-Revision-Date: 2009-12-02 23:19:11+0000\n"
"Language-Team: Catalan\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59523); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59683); Translate extension (2009-11-29)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ca\n"
"X-Message-Group: out-statusnet\n"
@@ -573,7 +573,7 @@ msgstr "Crop"
#: actions/emailsettings.php:238 actions/favor.php:75
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
@@ -748,7 +748,7 @@ msgid "Conversation"
msgstr "Conversa"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:206 lib/searchgroupnav.php:82
+#: lib/profileaction.php:216 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "Avisos"
@@ -1270,25 +1270,25 @@ msgstr "L'usuari que vols seguir no existeix."
msgid "You can use the local subscription!"
msgstr "Pots utilitzar la subscripció local!"
-#: actions/finishremotesubscribe.php:96
+#: actions/finishremotesubscribe.php:99
msgid "That user has blocked you from subscribing."
msgstr "Aquest usuari t'ha bloquejat com a subscriptor."
-#: actions/finishremotesubscribe.php:106
+#: actions/finishremotesubscribe.php:110
msgid "You are not authorized."
msgstr "No esteu autoritzat."
-#: actions/finishremotesubscribe.php:109
+#: actions/finishremotesubscribe.php:113
#, fuzzy
msgid "Could not convert request token to access token."
msgstr "No s'han pogut convertir els senyals de petició a senyals d'accés."
-#: actions/finishremotesubscribe.php:114
+#: actions/finishremotesubscribe.php:118
#, fuzzy
msgid "Remote service uses unknown version of OMB protocol."
msgstr "Versió desconeguda del protocol OMB."
-#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
msgid "Error updating remote profile"
msgstr "Error en actualitzar el perfil remot"
@@ -1461,7 +1461,7 @@ msgstr "Admin"
#: actions/groupmembers.php:473
msgid "Make this user an admin"
-msgstr ""
+msgstr "Fes l'usuari administrador"
#: actions/grouprss.php:133
#, fuzzy, php-format
@@ -1500,8 +1500,8 @@ msgid ""
"action.newgroup%%) yourself!"
msgstr ""
-#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
-#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr "Grups"
@@ -1526,7 +1526,7 @@ msgstr "Crear nou grup"
#: actions/groupunblock.php:91
msgid "Only an admin can unblock group members."
-msgstr ""
+msgstr "Només un administrador pot desblocar els membres del grup."
#: actions/groupunblock.php:95
#, fuzzy
@@ -1834,55 +1834,55 @@ msgstr "%s ha abandonat el grup %s"
msgid "Already logged in."
msgstr "Ja estàs connectat."
-#: actions/login.php:110 actions/login.php:120
+#: actions/login.php:108 actions/login.php:118
#, fuzzy
msgid "Invalid or expired token."
msgstr "El contingut de l'avís és invàlid"
-#: actions/login.php:143
+#: actions/login.php:146
msgid "Incorrect username or password."
msgstr "Nom d'usuari o contrasenya incorrectes."
-#: actions/login.php:149
+#: actions/login.php:152
#, fuzzy
msgid "Error setting user. You are probably not authorized."
msgstr "No autoritzat."
-#: actions/login.php:204 actions/login.php:257 lib/action.php:458
+#: actions/login.php:207 actions/login.php:260 lib/action.php:458
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Inici de sessió"
-#: actions/login.php:243
+#: actions/login.php:246
msgid "Login to site"
msgstr "Accedir al lloc"
-#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/login.php:249 actions/profilesettings.php:106
#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
#: lib/groupeditform.php:152 lib/userprofile.php:131
msgid "Nickname"
msgstr "Sobrenom"
-#: actions/login.php:249 actions/register.php:428
+#: actions/login.php:252 actions/register.php:428
#: lib/accountsettingsaction.php:116
msgid "Password"
msgstr "Contrasenya"
-#: actions/login.php:252 actions/register.php:477
+#: actions/login.php:255 actions/register.php:477
msgid "Remember me"
msgstr "Recorda'm"
-#: actions/login.php:253 actions/register.php:479
+#: actions/login.php:256 actions/register.php:479
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
"Iniciar sessió automàticament en el futur; no utilitzar en ordinadors "
"compartits!"
-#: actions/login.php:263
+#: actions/login.php:266
msgid "Lost or forgotten password?"
msgstr "Contrasenya oblidada o perduda?"
-#: actions/login.php:282
+#: actions/login.php:285
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -1890,7 +1890,7 @@ msgstr ""
"Per raons de seguretat, si us plau torna a escriure el teu nom d'usuari i "
"contrasenya abans de canviar la teva configuració."
-#: actions/login.php:286
+#: actions/login.php:289
#, fuzzy, php-format
msgid ""
"Login with your username and password. Don't have a username yet? [Register]"
@@ -2838,8 +2838,7 @@ msgstr "L'URL del perfil és invàlid (format incorrecte)"
#: actions/remotesubscribe.php:168
#, fuzzy
-msgid ""
-"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
msgstr "URL de perfil no vàlid (cap document YADIS)."
#: actions/remotesubscribe.php:176
@@ -3020,7 +3019,7 @@ msgid "Members"
msgstr "Membres"
#: actions/showgroup.php:386 lib/profileaction.php:117
-#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
+#: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95
#: lib/tagcloudsection.php:71
msgid "(None)"
msgstr "(Cap)"
@@ -3029,7 +3028,7 @@ msgstr "(Cap)"
msgid "All members"
msgstr "Tots els membres"
-#: actions/showgroup.php:429 lib/profileaction.php:173
+#: actions/showgroup.php:429 lib/profileaction.php:174
msgid "Statistics"
msgstr "Estadístiques"
@@ -3264,14 +3263,12 @@ msgid "Default site language"
msgstr "Preferència d'idioma"
#: actions/siteadminpanel.php:316
-#, fuzzy
msgid "URLs"
msgstr "URL"
#: actions/siteadminpanel.php:319
-#, fuzzy
msgid "Server"
-msgstr "Recuperar"
+msgstr "Servidor"
#: actions/siteadminpanel.php:319
msgid "Site's server hostname."
@@ -3313,7 +3310,7 @@ msgstr "Bloquejar"
#: actions/siteadminpanel.php:348
msgid "Disable new registrations."
-msgstr ""
+msgstr "Inhabilita els nous registres."
#: actions/siteadminpanel.php:354
msgid "Snapshots"
@@ -3328,9 +3325,8 @@ msgid "In a scheduled job"
msgstr ""
#: actions/siteadminpanel.php:359 actions/siteadminpanel.php:383
-#, fuzzy
msgid "Never"
-msgstr "Recuperar"
+msgstr "Mai"
#: actions/siteadminpanel.php:360
msgid "Data snapshots"
@@ -3342,7 +3338,7 @@ msgstr ""
#: actions/siteadminpanel.php:366
msgid "Frequency"
-msgstr ""
+msgstr "Freqüència"
#: actions/siteadminpanel.php:367
msgid "Snapshots will be sent once every N web hits"
@@ -3357,22 +3353,20 @@ msgid "Snapshots will be sent to this URL"
msgstr ""
#: actions/siteadminpanel.php:380
-#, fuzzy
msgid "SSL"
-msgstr "SMS"
+msgstr "SSL"
#: actions/siteadminpanel.php:384
-#, fuzzy
msgid "Sometimes"
-msgstr "Avisos"
+msgstr "A vegades"
#: actions/siteadminpanel.php:385
msgid "Always"
-msgstr ""
+msgstr "Sempre"
#: actions/siteadminpanel.php:387
msgid "Use SSL"
-msgstr ""
+msgstr "Utilitza l'SSL"
#: actions/siteadminpanel.php:388
msgid "When to use SSL"
@@ -3380,7 +3374,7 @@ msgstr ""
#: actions/siteadminpanel.php:393
msgid "SSL Server"
-msgstr ""
+msgstr "Servidor SSL"
#: actions/siteadminpanel.php:394
msgid "Server to direct SSL requests to"
@@ -3388,11 +3382,11 @@ msgstr ""
#: actions/siteadminpanel.php:400
msgid "Limits"
-msgstr ""
+msgstr "Límits"
#: actions/siteadminpanel.php:403
msgid "Text limit"
-msgstr ""
+msgstr "Límits del text"
#: actions/siteadminpanel.php:403
msgid "Maximum number of characters for notices."
@@ -4279,19 +4273,16 @@ msgid "Unable to delete design setting."
msgstr "No s'ha pogut guardar la teva configuració de Twitter!"
#: lib/adminpanelaction.php:300
-#, fuzzy
msgid "Basic site configuration"
-msgstr "Confirmació de l'adreça de correu electrònic"
+msgstr "Configuració bàsica del lloc"
#: lib/adminpanelaction.php:303
-#, fuzzy
msgid "Design configuration"
-msgstr "Confirmació SMS"
+msgstr "Configuració del disseny"
#: lib/adminpanelaction.php:306 lib/adminpanelaction.php:309
-#, fuzzy
msgid "Paths configuration"
-msgstr "Confirmació SMS"
+msgstr "Configuració dels camins"
#: lib/attachmentlist.php:87
msgid "Attachments"
@@ -4299,7 +4290,7 @@ msgstr "Adjuncions"
#: lib/attachmentlist.php:265
msgid "Author"
-msgstr ""
+msgstr "Autoria"
#: lib/attachmentlist.php:278
#, fuzzy
@@ -4451,50 +4442,40 @@ msgstr "Notificacions on."
msgid "Can't turn on notification."
msgstr "No es poden posar en on les notificacions."
-#: lib/command.php:597
-#, fuzzy, php-format
-msgid "Could not create login token for %s"
-msgstr "No s'ha pogut crear el formulari OpenID: %s"
-
-#: lib/command.php:602
-#, php-format
-msgid "This link is useable only once, and is good for only 2 minutes: %s"
-msgstr ""
-
-#: lib/command.php:618
+#: lib/command.php:592
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "No estàs subscrit a aquest perfil."
-#: lib/command.php:620
+#: lib/command.php:594
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Ja estàs subscrit a aquests usuaris:"
msgstr[1] "Ja estàs subscrit a aquests usuaris:"
-#: lib/command.php:640
+#: lib/command.php:614
#, fuzzy
msgid "No one is subscribed to you."
msgstr "No pots subscriure a un altre a tu mateix."
-#: lib/command.php:642
+#: lib/command.php:616
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "No pots subscriure a un altre a tu mateix."
msgstr[1] "No pots subscriure a un altre a tu mateix."
-#: lib/command.php:662
+#: lib/command.php:636
#, fuzzy
msgid "You are not a member of any groups."
msgstr "No ets membre d'aquest grup."
-#: lib/command.php:664
+#: lib/command.php:638
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "No sou un membre del grup."
msgstr[1] "No sou un membre del grup."
-#: lib/command.php:678
+#: lib/command.php:652
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4513,7 +4494,6 @@ msgid ""
"reply #<notice_id> - reply to notice with a given id\n"
"reply <nickname> - reply to the last notice from user\n"
"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
"drop <group> - leave group\n"
"stats - get your stats\n"
"stop - same as 'off'\n"
@@ -4759,7 +4739,7 @@ msgstr ""
msgid "kB"
msgstr ""
-#: lib/jabber.php:192
+#: lib/jabber.php:191
#, php-format
msgid "[%s]"
msgstr ""
@@ -5178,7 +5158,7 @@ msgstr "Els teus missatges enviats"
msgid "Tags in %s's notices"
msgstr "Etiquetes en les notificacions de %s's"
-#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr "Subscripcions"
@@ -5186,7 +5166,7 @@ msgstr "Subscripcions"
msgid "All subscriptions"
msgstr "Totes les subscripcions"
-#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+#: lib/profileaction.php:140 lib/profileaction.php:201 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr "Subscriptors"
@@ -5194,16 +5174,16 @@ msgstr "Subscriptors"
msgid "All subscribers"
msgstr "Tots els subscriptors"
-#: lib/profileaction.php:177
+#: lib/profileaction.php:178
#, fuzzy
msgid "User ID"
msgstr "Usuari"
-#: lib/profileaction.php:182
+#: lib/profileaction.php:183
msgid "Member since"
msgstr "Membre des de"
-#: lib/profileaction.php:235
+#: lib/profileaction.php:245
msgid "All groups"
msgstr "Tots els grups"
@@ -5255,9 +5235,8 @@ msgid "Keyword(s)"
msgstr "Paraules clau"
#: lib/searchaction.php:162
-#, fuzzy
msgid "Search help"
-msgstr "Cercar"
+msgstr "Ajuda de la cerca"
#: lib/searchgroupnav.php:80
msgid "People"
diff --git a/locale/cs/LC_MESSAGES/statusnet.po b/locale/cs/LC_MESSAGES/statusnet.po
index 674761170..f1e002a9d 100644
--- a/locale/cs/LC_MESSAGES/statusnet.po
+++ b/locale/cs/LC_MESSAGES/statusnet.po
@@ -1,5 +1,6 @@
# Translation of StatusNet to Czech
#
+# Author@translatewiki.net: Kuvaly
# --
# This file is distributed under the same license as the StatusNet package.
#
@@ -7,12 +8,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-27 23:50+0000\n"
-"PO-Revision-Date: 2009-11-28 19:49:57+0000\n"
+"POT-Creation-Date: 2009-12-02 23:18+0000\n"
+"PO-Revision-Date: 2009-12-02 23:19:14+0000\n"
"Language-Team: Czech\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59523); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59683); Translate extension (2009-11-29)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: cs\n"
"X-Message-Group: out-statusnet\n"
@@ -559,7 +560,7 @@ msgstr ""
#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
#: lib/noticelist.php:550
msgid "Delete"
-msgstr ""
+msgstr "Odstranit"
#: actions/avatarsettings.php:165 actions/grouplogo.php:233
msgid "Upload"
@@ -573,7 +574,7 @@ msgstr ""
#: actions/emailsettings.php:238 actions/favor.php:75
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
@@ -750,7 +751,7 @@ msgid "Conversation"
msgstr "Umístění"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:206 lib/searchgroupnav.php:82
+#: lib/profileaction.php:216 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "Sdělení"
@@ -1268,26 +1269,26 @@ msgstr "Úživatel, kterému nasloucháte neexistuje."
msgid "You can use the local subscription!"
msgstr "Můžete použít místní odebírání."
-#: actions/finishremotesubscribe.php:96
+#: actions/finishremotesubscribe.php:99
msgid "That user has blocked you from subscribing."
msgstr ""
-#: actions/finishremotesubscribe.php:106
+#: actions/finishremotesubscribe.php:110
#, fuzzy
msgid "You are not authorized."
msgstr "Neautorizován."
-#: actions/finishremotesubscribe.php:109
+#: actions/finishremotesubscribe.php:113
#, fuzzy
msgid "Could not convert request token to access token."
msgstr "Nelze konvertovat řetězec požadavku na přístupový řetězec."
-#: actions/finishremotesubscribe.php:114
+#: actions/finishremotesubscribe.php:118
#, fuzzy
msgid "Remote service uses unknown version of OMB protocol."
msgstr "Neznámá verze OMB protokolu."
-#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
msgid "Error updating remote profile"
msgstr "Chyba při aktualizaci vzdáleného profilu"
@@ -1498,8 +1499,8 @@ msgid ""
"action.newgroup%%) yourself!"
msgstr ""
-#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
-#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr ""
@@ -1797,59 +1798,59 @@ msgstr ""
msgid "Already logged in."
msgstr "Již přihlášen"
-#: actions/login.php:110 actions/login.php:120
+#: actions/login.php:108 actions/login.php:118
#, fuzzy
msgid "Invalid or expired token."
msgstr "Neplatný obsah sdělení"
-#: actions/login.php:143
+#: actions/login.php:146
msgid "Incorrect username or password."
msgstr "Neplatné jméno nebo heslo"
-#: actions/login.php:149
+#: actions/login.php:152
#, fuzzy
msgid "Error setting user. You are probably not authorized."
msgstr "Neautorizován."
-#: actions/login.php:204 actions/login.php:257 lib/action.php:458
+#: actions/login.php:207 actions/login.php:260 lib/action.php:458
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Přihlásit"
-#: actions/login.php:243
+#: actions/login.php:246
msgid "Login to site"
msgstr ""
-#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/login.php:249 actions/profilesettings.php:106
#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
#: lib/groupeditform.php:152 lib/userprofile.php:131
msgid "Nickname"
msgstr "Přezdívka"
-#: actions/login.php:249 actions/register.php:428
+#: actions/login.php:252 actions/register.php:428
#: lib/accountsettingsaction.php:116
msgid "Password"
msgstr "Heslo"
-#: actions/login.php:252 actions/register.php:477
+#: actions/login.php:255 actions/register.php:477
msgid "Remember me"
msgstr "Zapamatuj si mě"
-#: actions/login.php:253 actions/register.php:479
+#: actions/login.php:256 actions/register.php:479
msgid "Automatically login in the future; not for shared computers!"
msgstr "Příště automaticky přihlásit; ne pro počítače, které používá "
-#: actions/login.php:263
+#: actions/login.php:266
msgid "Lost or forgotten password?"
msgstr "Ztracené nebo zapomenuté heslo?"
-#: actions/login.php:282
+#: actions/login.php:285
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
msgstr "Z bezpečnostních důvodů, prosím zadejte znovu své jméno a heslo."
-#: actions/login.php:286
+#: actions/login.php:289
#, fuzzy, php-format
msgid ""
"Login with your username and password. Don't have a username yet? [Register]"
@@ -2775,8 +2776,7 @@ msgstr "Neplatná adresa profilu (špatný formát)"
#: actions/remotesubscribe.php:168
#, fuzzy
-msgid ""
-"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
msgstr "Není platnou adresou profilu (není YADIS dokumentem)."
#: actions/remotesubscribe.php:176
@@ -2959,7 +2959,7 @@ msgid "Members"
msgstr "Členem od"
#: actions/showgroup.php:386 lib/profileaction.php:117
-#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
+#: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95
#: lib/tagcloudsection.php:71
msgid "(None)"
msgstr ""
@@ -2968,7 +2968,7 @@ msgstr ""
msgid "All members"
msgstr ""
-#: actions/showgroup.php:429 lib/profileaction.php:173
+#: actions/showgroup.php:429 lib/profileaction.php:174
msgid "Statistics"
msgstr "Statistiky"
@@ -4382,53 +4382,43 @@ msgstr ""
msgid "Can't turn on notification."
msgstr ""
-#: lib/command.php:597
-#, fuzzy, php-format
-msgid "Could not create login token for %s"
-msgstr "Nelze vytvořit OpenID z: %s"
-
-#: lib/command.php:602
-#, php-format
-msgid "This link is useable only once, and is good for only 2 minutes: %s"
-msgstr ""
-
-#: lib/command.php:618
+#: lib/command.php:592
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "Neodeslal jste nám profil"
-#: lib/command.php:620
+#: lib/command.php:594
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Neodeslal jste nám profil"
msgstr[1] "Neodeslal jste nám profil"
msgstr[2] ""
-#: lib/command.php:640
+#: lib/command.php:614
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Vzdálený odběr"
-#: lib/command.php:642
+#: lib/command.php:616
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Vzdálený odběr"
msgstr[1] "Vzdálený odběr"
msgstr[2] ""
-#: lib/command.php:662
+#: lib/command.php:636
#, fuzzy
msgid "You are not a member of any groups."
msgstr "Neodeslal jste nám profil"
-#: lib/command.php:664
+#: lib/command.php:638
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Neodeslal jste nám profil"
msgstr[1] "Neodeslal jste nám profil"
msgstr[2] ""
-#: lib/command.php:678
+#: lib/command.php:652
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4447,7 +4437,6 @@ msgid ""
"reply #<notice_id> - reply to notice with a given id\n"
"reply <nickname> - reply to the last notice from user\n"
"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
"drop <group> - leave group\n"
"stats - get your stats\n"
"stop - same as 'off'\n"
@@ -4696,7 +4685,7 @@ msgstr ""
msgid "kB"
msgstr ""
-#: lib/jabber.php:192
+#: lib/jabber.php:191
#, php-format
msgid "[%s]"
msgstr ""
@@ -5111,7 +5100,7 @@ msgstr ""
msgid "Tags in %s's notices"
msgstr ""
-#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr "Odběry"
@@ -5119,7 +5108,7 @@ msgstr "Odběry"
msgid "All subscriptions"
msgstr "Všechny odběry"
-#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+#: lib/profileaction.php:140 lib/profileaction.php:201 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr "Odběratelé"
@@ -5128,15 +5117,15 @@ msgstr "Odběratelé"
msgid "All subscribers"
msgstr "Odběratelé"
-#: lib/profileaction.php:177
+#: lib/profileaction.php:178
msgid "User ID"
msgstr ""
-#: lib/profileaction.php:182
+#: lib/profileaction.php:183
msgid "Member since"
msgstr "Členem od"
-#: lib/profileaction.php:235
+#: lib/profileaction.php:245
msgid "All groups"
msgstr ""
diff --git a/locale/de/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po
index 06b1650ee..e68bc1fd4 100644
--- a/locale/de/LC_MESSAGES/statusnet.po
+++ b/locale/de/LC_MESSAGES/statusnet.po
@@ -10,12 +10,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-27 23:50+0000\n"
-"PO-Revision-Date: 2009-11-28 19:50:00+0000\n"
+"POT-Creation-Date: 2009-12-02 23:18+0000\n"
+"PO-Revision-Date: 2009-12-02 23:19:18+0000\n"
"Language-Team: German\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59523); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59683); Translate extension (2009-11-29)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: de\n"
"X-Message-Group: out-statusnet\n"
@@ -569,7 +569,7 @@ msgstr "Zuschneiden"
#: actions/emailsettings.php:238 actions/favor.php:75
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
@@ -738,7 +738,7 @@ msgid "Conversation"
msgstr "Unterhaltung"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:206 lib/searchgroupnav.php:82
+#: lib/profileaction.php:216 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "Nachrichten"
@@ -1253,26 +1253,26 @@ msgstr "Aufgeführte Nutzer existiert nicht."
msgid "You can use the local subscription!"
msgstr "Du kannst ein lokales Abonnement erstellen!"
-#: actions/finishremotesubscribe.php:96
+#: actions/finishremotesubscribe.php:99
msgid "That user has blocked you from subscribing."
msgstr "Dieser Benutzer erlaubt dir nicht ihn zu abonnieren."
-#: actions/finishremotesubscribe.php:106
+#: actions/finishremotesubscribe.php:110
#, fuzzy
msgid "You are not authorized."
msgstr "Nicht autorisiert."
-#: actions/finishremotesubscribe.php:109
+#: actions/finishremotesubscribe.php:113
#, fuzzy
msgid "Could not convert request token to access token."
msgstr "Konnte Anfrage-Token nicht in Zugriffs-Token umwandeln."
-#: actions/finishremotesubscribe.php:114
+#: actions/finishremotesubscribe.php:118
#, fuzzy
msgid "Remote service uses unknown version of OMB protocol."
msgstr "Unbekannte OMB-Protokollversion."
-#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
msgid "Error updating remote profile"
msgstr "Fehler beim Aktualisieren des entfernten Profils"
@@ -1477,8 +1477,8 @@ msgid ""
"action.newgroup%%) yourself!"
msgstr ""
-#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
-#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr "Gruppen"
@@ -1811,53 +1811,53 @@ msgstr "%s hat die Gruppe %s verlassen"
msgid "Already logged in."
msgstr "Bereits angemeldet."
-#: actions/login.php:110 actions/login.php:120
+#: actions/login.php:108 actions/login.php:118
#, fuzzy
msgid "Invalid or expired token."
msgstr "Ungültiger Nachrichteninhalt"
-#: actions/login.php:143
+#: actions/login.php:146
msgid "Incorrect username or password."
msgstr "Falscher Benutzername oder Passwort."
-#: actions/login.php:149
+#: actions/login.php:152
#, fuzzy
msgid "Error setting user. You are probably not authorized."
msgstr "Nicht autorisiert."
-#: actions/login.php:204 actions/login.php:257 lib/action.php:458
+#: actions/login.php:207 actions/login.php:260 lib/action.php:458
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Einloggen"
-#: actions/login.php:243
+#: actions/login.php:246
msgid "Login to site"
msgstr "An Seite anmelden"
-#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/login.php:249 actions/profilesettings.php:106
#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
#: lib/groupeditform.php:152 lib/userprofile.php:131
msgid "Nickname"
msgstr "Nutzername"
-#: actions/login.php:249 actions/register.php:428
+#: actions/login.php:252 actions/register.php:428
#: lib/accountsettingsaction.php:116
msgid "Password"
msgstr "Passwort"
-#: actions/login.php:252 actions/register.php:477
+#: actions/login.php:255 actions/register.php:477
msgid "Remember me"
msgstr "Anmeldedaten merken"
-#: actions/login.php:253 actions/register.php:479
+#: actions/login.php:256 actions/register.php:479
msgid "Automatically login in the future; not for shared computers!"
msgstr "Automatisch anmelden; nicht bei gemeinsam genutzten PCs einsetzen!"
-#: actions/login.php:263
+#: actions/login.php:266
msgid "Lost or forgotten password?"
msgstr "Passwort vergessen?"
-#: actions/login.php:282
+#: actions/login.php:285
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -1865,7 +1865,7 @@ msgstr ""
"Bitte geben Sie aus Sicherheitsgründen ihren Benutzernamen und ihr Passwort "
"ein, bevor die Änderungen an ihren Einstellungen übernommen werden."
-#: actions/login.php:286
+#: actions/login.php:289
#, fuzzy, php-format
msgid ""
"Login with your username and password. Don't have a username yet? [Register]"
@@ -2819,8 +2819,7 @@ msgstr "Ungültige Profil-URL (falsches Format)"
#: actions/remotesubscribe.php:168
#, fuzzy
-msgid ""
-"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
msgstr "Ungültige Profil-URL (kein YADIS-Dokument)."
#: actions/remotesubscribe.php:176
@@ -3000,7 +2999,7 @@ msgid "Members"
msgstr "Mitglieder"
#: actions/showgroup.php:386 lib/profileaction.php:117
-#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
+#: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95
#: lib/tagcloudsection.php:71
msgid "(None)"
msgstr "(Kein)"
@@ -3009,7 +3008,7 @@ msgstr "(Kein)"
msgid "All members"
msgstr "Alle Mitglieder"
-#: actions/showgroup.php:429 lib/profileaction.php:173
+#: actions/showgroup.php:429 lib/profileaction.php:174
msgid "Statistics"
msgstr "Statistiken"
@@ -4429,50 +4428,40 @@ msgstr "Benachrichtigung aktiviert."
msgid "Can't turn on notification."
msgstr "Konnte Benachrichtigung nicht aktivieren."
-#: lib/command.php:597
-#, fuzzy, php-format
-msgid "Could not create login token for %s"
-msgstr "Konnte OpenID-Formular nicht erstellen: %s"
-
-#: lib/command.php:602
-#, php-format
-msgid "This link is useable only once, and is good for only 2 minutes: %s"
-msgstr ""
-
-#: lib/command.php:618
+#: lib/command.php:592
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "Du hast dieses Profil nicht abonniert."
-#: lib/command.php:620
+#: lib/command.php:594
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Du hast diese Benutzer bereits abonniert:"
msgstr[1] "Du hast diese Benutzer bereits abonniert:"
-#: lib/command.php:640
+#: lib/command.php:614
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Die Gegenseite konnte Dich nicht abonnieren."
-#: lib/command.php:642
+#: lib/command.php:616
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Die Gegenseite konnte Dich nicht abonnieren."
msgstr[1] "Die Gegenseite konnte Dich nicht abonnieren."
-#: lib/command.php:662
+#: lib/command.php:636
#, fuzzy
msgid "You are not a member of any groups."
msgstr "Du bist kein Mitglied dieser Gruppe."
-#: lib/command.php:664
+#: lib/command.php:638
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Du bist kein Mitglied dieser Gruppe."
msgstr[1] "Du bist kein Mitglied dieser Gruppe."
-#: lib/command.php:678
+#: lib/command.php:652
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4491,7 +4480,6 @@ msgid ""
"reply #<notice_id> - reply to notice with a given id\n"
"reply <nickname> - reply to the last notice from user\n"
"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
"drop <group> - leave group\n"
"stats - get your stats\n"
"stop - same as 'off'\n"
@@ -4745,7 +4733,7 @@ msgstr ""
msgid "kB"
msgstr ""
-#: lib/jabber.php:192
+#: lib/jabber.php:191
#, php-format
msgid "[%s]"
msgstr ""
@@ -5173,7 +5161,7 @@ msgstr "Deine gesendeten Nachrichten"
msgid "Tags in %s's notices"
msgstr "Tags in %ss Nachrichten"
-#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr "Abonnements"
@@ -5181,7 +5169,7 @@ msgstr "Abonnements"
msgid "All subscriptions"
msgstr "Alle Abonnements"
-#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+#: lib/profileaction.php:140 lib/profileaction.php:201 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr "Abonnenten"
@@ -5189,15 +5177,15 @@ msgstr "Abonnenten"
msgid "All subscribers"
msgstr "Alle Abonnenten"
-#: lib/profileaction.php:177
+#: lib/profileaction.php:178
msgid "User ID"
msgstr "Nutzer ID"
-#: lib/profileaction.php:182
+#: lib/profileaction.php:183
msgid "Member since"
msgstr "Mitglied seit"
-#: lib/profileaction.php:235
+#: lib/profileaction.php:245
msgid "All groups"
msgstr "Alle Gruppen"
diff --git a/locale/el/LC_MESSAGES/statusnet.po b/locale/el/LC_MESSAGES/statusnet.po
index 2ab5cf7d1..6ab4721c2 100644
--- a/locale/el/LC_MESSAGES/statusnet.po
+++ b/locale/el/LC_MESSAGES/statusnet.po
@@ -7,12 +7,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-27 23:50+0000\n"
-"PO-Revision-Date: 2009-11-28 19:50:04+0000\n"
+"POT-Creation-Date: 2009-12-02 23:18+0000\n"
+"PO-Revision-Date: 2009-12-02 23:19:21+0000\n"
"Language-Team: Greek\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59523); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59683); Translate extension (2009-11-29)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: el\n"
"X-Message-Group: out-statusnet\n"
@@ -569,7 +569,7 @@ msgstr ""
#: actions/emailsettings.php:238 actions/favor.php:75
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
@@ -742,7 +742,7 @@ msgid "Conversation"
msgstr "Τοποθεσία"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:206 lib/searchgroupnav.php:82
+#: lib/profileaction.php:216 lib/searchgroupnav.php:82
msgid "Notices"
msgstr ""
@@ -1261,24 +1261,24 @@ msgstr ""
msgid "You can use the local subscription!"
msgstr ""
-#: actions/finishremotesubscribe.php:96
+#: actions/finishremotesubscribe.php:99
msgid "That user has blocked you from subscribing."
msgstr ""
-#: actions/finishremotesubscribe.php:106
+#: actions/finishremotesubscribe.php:110
msgid "You are not authorized."
msgstr ""
-#: actions/finishremotesubscribe.php:109
+#: actions/finishremotesubscribe.php:113
#, fuzzy
msgid "Could not convert request token to access token."
msgstr "Απέτυχε η μετατροπή αιτούμενων tokens σε tokens πρόσβασης."
-#: actions/finishremotesubscribe.php:114
+#: actions/finishremotesubscribe.php:118
msgid "Remote service uses unknown version of OMB protocol."
msgstr ""
-#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
msgid "Error updating remote profile"
msgstr ""
@@ -1480,8 +1480,8 @@ msgid ""
"action.newgroup%%) yourself!"
msgstr ""
-#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
-#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr ""
@@ -1772,51 +1772,51 @@ msgstr ""
msgid "Already logged in."
msgstr "Ήδη συνδεδεμένος."
-#: actions/login.php:110 actions/login.php:120
+#: actions/login.php:108 actions/login.php:118
msgid "Invalid or expired token."
msgstr ""
-#: actions/login.php:143
+#: actions/login.php:146
msgid "Incorrect username or password."
msgstr "Λάθος όνομα χρήστη ή κωδικός"
-#: actions/login.php:149
+#: actions/login.php:152
msgid "Error setting user. You are probably not authorized."
msgstr ""
-#: actions/login.php:204 actions/login.php:257 lib/action.php:458
+#: actions/login.php:207 actions/login.php:260 lib/action.php:458
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Σύνδεση"
-#: actions/login.php:243
+#: actions/login.php:246
msgid "Login to site"
msgstr ""
-#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/login.php:249 actions/profilesettings.php:106
#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
#: lib/groupeditform.php:152 lib/userprofile.php:131
msgid "Nickname"
msgstr "Ψευδώνυμο"
-#: actions/login.php:249 actions/register.php:428
+#: actions/login.php:252 actions/register.php:428
#: lib/accountsettingsaction.php:116
msgid "Password"
msgstr "Κωδικός"
-#: actions/login.php:252 actions/register.php:477
+#: actions/login.php:255 actions/register.php:477
msgid "Remember me"
msgstr ""
-#: actions/login.php:253 actions/register.php:479
+#: actions/login.php:256 actions/register.php:479
msgid "Automatically login in the future; not for shared computers!"
msgstr "Αυτόματη σύνδεση στο μέλλον. ΟΧΙ για κοινόχρηστους υπολογιστές!"
-#: actions/login.php:263
+#: actions/login.php:266
msgid "Lost or forgotten password?"
msgstr "Χάσατε ή ξεχάσατε τον κωδικό σας;"
-#: actions/login.php:282
+#: actions/login.php:285
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -1824,7 +1824,7 @@ msgstr ""
"Για λόγους ασφαλείας, παρακαλώ εισάγετε ξανά το όνομα χρήστη και τον κωδικό "
"σας, πριν αλλάξετε τις ρυθμίσεις σας."
-#: actions/login.php:286
+#: actions/login.php:289
#, fuzzy, php-format
msgid ""
"Login with your username and password. Don't have a username yet? [Register]"
@@ -2751,8 +2751,7 @@ msgid "Invalid profile URL (bad format)"
msgstr ""
#: actions/remotesubscribe.php:168
-msgid ""
-"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
msgstr ""
#: actions/remotesubscribe.php:176
@@ -2932,7 +2931,7 @@ msgid "Members"
msgstr "Μέλος από"
#: actions/showgroup.php:386 lib/profileaction.php:117
-#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
+#: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95
#: lib/tagcloudsection.php:71
msgid "(None)"
msgstr ""
@@ -2941,7 +2940,7 @@ msgstr ""
msgid "All members"
msgstr ""
-#: actions/showgroup.php:429 lib/profileaction.php:173
+#: actions/showgroup.php:429 lib/profileaction.php:174
msgid "Statistics"
msgstr ""
@@ -4318,50 +4317,40 @@ msgstr ""
msgid "Can't turn on notification."
msgstr ""
-#: lib/command.php:597
-#, fuzzy, php-format
-msgid "Could not create login token for %s"
-msgstr "Αδυναμία δημιουργίας φόρμας OpenID: %s "
-
-#: lib/command.php:602
-#, php-format
-msgid "This link is useable only once, and is good for only 2 minutes: %s"
-msgstr ""
-
-#: lib/command.php:618
+#: lib/command.php:592
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους."
-#: lib/command.php:620
+#: lib/command.php:594
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους."
msgstr[1] "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους."
-#: lib/command.php:640
+#: lib/command.php:614
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους."
-#: lib/command.php:642
+#: lib/command.php:616
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους."
msgstr[1] "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους."
-#: lib/command.php:662
+#: lib/command.php:636
#, fuzzy
msgid "You are not a member of any groups."
msgstr "Ομάδες με τα περισσότερα μέλη"
-#: lib/command.php:664
+#: lib/command.php:638
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Ομάδες με τα περισσότερα μέλη"
msgstr[1] "Ομάδες με τα περισσότερα μέλη"
-#: lib/command.php:678
+#: lib/command.php:652
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4380,7 +4369,6 @@ msgid ""
"reply #<notice_id> - reply to notice with a given id\n"
"reply <nickname> - reply to the last notice from user\n"
"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
"drop <group> - leave group\n"
"stats - get your stats\n"
"stop - same as 'off'\n"
@@ -4622,7 +4610,7 @@ msgstr ""
msgid "kB"
msgstr ""
-#: lib/jabber.php:192
+#: lib/jabber.php:191
#, php-format
msgid "[%s]"
msgstr ""
@@ -5028,7 +5016,7 @@ msgstr ""
msgid "Tags in %s's notices"
msgstr ""
-#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr ""
@@ -5036,7 +5024,7 @@ msgstr ""
msgid "All subscriptions"
msgstr "Όλες οι συνδρομές"
-#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+#: lib/profileaction.php:140 lib/profileaction.php:201 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr ""
@@ -5044,15 +5032,15 @@ msgstr ""
msgid "All subscribers"
msgstr ""
-#: lib/profileaction.php:177
+#: lib/profileaction.php:178
msgid "User ID"
msgstr ""
-#: lib/profileaction.php:182
+#: lib/profileaction.php:183
msgid "Member since"
msgstr "Μέλος από"
-#: lib/profileaction.php:235
+#: lib/profileaction.php:245
msgid "All groups"
msgstr ""
diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po
index ba1d10345..fb598943c 100644
--- a/locale/en_GB/LC_MESSAGES/statusnet.po
+++ b/locale/en_GB/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-27 23:50+0000\n"
-"PO-Revision-Date: 2009-11-28 19:50:06+0000\n"
+"POT-Creation-Date: 2009-12-02 23:18+0000\n"
+"PO-Revision-Date: 2009-12-02 23:19:24+0000\n"
"Language-Team: British English\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59523); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59683); Translate extension (2009-11-29)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: en-gb\n"
"X-Message-Group: out-statusnet\n"
@@ -563,7 +563,7 @@ msgstr "Crop"
#: actions/emailsettings.php:238 actions/favor.php:75
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
@@ -733,7 +733,7 @@ msgid "Conversation"
msgstr "Conversation"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:206 lib/searchgroupnav.php:82
+#: lib/profileaction.php:216 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "Notices"
@@ -1253,24 +1253,24 @@ msgstr "User being listened to doesn't exist."
msgid "You can use the local subscription!"
msgstr "You can use the local subscription!"
-#: actions/finishremotesubscribe.php:96
+#: actions/finishremotesubscribe.php:99
msgid "That user has blocked you from subscribing."
msgstr "That user has blocked you from subscribing."
-#: actions/finishremotesubscribe.php:106
+#: actions/finishremotesubscribe.php:110
msgid "You are not authorized."
msgstr "You are not authorised."
-#: actions/finishremotesubscribe.php:109
+#: actions/finishremotesubscribe.php:113
msgid "Could not convert request token to access token."
msgstr "Couldn't convert request tokens to access tokens."
-#: actions/finishremotesubscribe.php:114
+#: actions/finishremotesubscribe.php:118
#, fuzzy
msgid "Remote service uses unknown version of OMB protocol."
msgstr "Unknown version of OMB protocol."
-#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
msgid "Error updating remote profile"
msgstr "Error updating remote profile."
@@ -1480,8 +1480,8 @@ msgid ""
"action.newgroup%%) yourself!"
msgstr ""
-#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
-#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr "Groups"
@@ -1804,53 +1804,53 @@ msgstr "%s left group %s"
msgid "Already logged in."
msgstr "Already logged in."
-#: actions/login.php:110 actions/login.php:120
+#: actions/login.php:108 actions/login.php:118
#, fuzzy
msgid "Invalid or expired token."
msgstr "Invalid notice content"
-#: actions/login.php:143
+#: actions/login.php:146
msgid "Incorrect username or password."
msgstr "Incorrect username or password."
-#: actions/login.php:149
+#: actions/login.php:152
#, fuzzy
msgid "Error setting user. You are probably not authorized."
msgstr "You are not authorised."
-#: actions/login.php:204 actions/login.php:257 lib/action.php:458
+#: actions/login.php:207 actions/login.php:260 lib/action.php:458
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Login"
-#: actions/login.php:243
+#: actions/login.php:246
msgid "Login to site"
msgstr "Login to site"
-#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/login.php:249 actions/profilesettings.php:106
#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
#: lib/groupeditform.php:152 lib/userprofile.php:131
msgid "Nickname"
msgstr "Nickname"
-#: actions/login.php:249 actions/register.php:428
+#: actions/login.php:252 actions/register.php:428
#: lib/accountsettingsaction.php:116
msgid "Password"
msgstr "Password"
-#: actions/login.php:252 actions/register.php:477
+#: actions/login.php:255 actions/register.php:477
msgid "Remember me"
msgstr "Remember me"
-#: actions/login.php:253 actions/register.php:479
+#: actions/login.php:256 actions/register.php:479
msgid "Automatically login in the future; not for shared computers!"
msgstr "Automatically login in the future; not for shared computers!"
-#: actions/login.php:263
+#: actions/login.php:266
msgid "Lost or forgotten password?"
msgstr "Lost or forgotten password?"
-#: actions/login.php:282
+#: actions/login.php:285
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -1858,7 +1858,7 @@ msgstr ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
-#: actions/login.php:286
+#: actions/login.php:289
#, php-format
msgid ""
"Login with your username and password. Don't have a username yet? [Register]"
@@ -2795,8 +2795,7 @@ msgstr "Invalid profile URL (bad format)"
#: actions/remotesubscribe.php:168
#, fuzzy
-msgid ""
-"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
msgstr "Not a valid profile URL (no YADIS document)."
#: actions/remotesubscribe.php:176
@@ -2975,7 +2974,7 @@ msgid "Members"
msgstr "Members"
#: actions/showgroup.php:386 lib/profileaction.php:117
-#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
+#: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95
#: lib/tagcloudsection.php:71
msgid "(None)"
msgstr "(None)"
@@ -2984,7 +2983,7 @@ msgstr "(None)"
msgid "All members"
msgstr "All members"
-#: actions/showgroup.php:429 lib/profileaction.php:173
+#: actions/showgroup.php:429 lib/profileaction.php:174
msgid "Statistics"
msgstr "Statistics"
@@ -4388,50 +4387,40 @@ msgstr "Notification on."
msgid "Can't turn on notification."
msgstr "Can't turn on notification."
-#: lib/command.php:597
-#, fuzzy, php-format
-msgid "Could not create login token for %s"
-msgstr "Could not create OpenID from: %s"
-
-#: lib/command.php:602
-#, php-format
-msgid "This link is useable only once, and is good for only 2 minutes: %s"
-msgstr ""
-
-#: lib/command.php:618
+#: lib/command.php:592
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "You are not subscribed to that profile."
-#: lib/command.php:620
+#: lib/command.php:594
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "You are already subscribed to these users:"
msgstr[1] "You are already subscribed to these users:"
-#: lib/command.php:640
+#: lib/command.php:614
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Could not subscribe other to you."
-#: lib/command.php:642
+#: lib/command.php:616
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Could not subscribe other to you."
msgstr[1] "Could not subscribe other to you."
-#: lib/command.php:662
+#: lib/command.php:636
#, fuzzy
msgid "You are not a member of any groups."
msgstr "You are not a member of that group."
-#: lib/command.php:664
+#: lib/command.php:638
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "You are not a member of that group."
msgstr[1] "You are not a member of that group."
-#: lib/command.php:678
+#: lib/command.php:652
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4450,7 +4439,6 @@ msgid ""
"reply #<notice_id> - reply to notice with a given id\n"
"reply <nickname> - reply to the last notice from user\n"
"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
"drop <group> - leave group\n"
"stats - get your stats\n"
"stop - same as 'off'\n"
@@ -4691,7 +4679,7 @@ msgstr ""
msgid "kB"
msgstr ""
-#: lib/jabber.php:192
+#: lib/jabber.php:191
#, php-format
msgid "[%s]"
msgstr ""
@@ -5111,7 +5099,7 @@ msgstr "Your sent messages"
msgid "Tags in %s's notices"
msgstr "Tags in %s's notices"
-#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr "Subscriptions"
@@ -5119,7 +5107,7 @@ msgstr "Subscriptions"
msgid "All subscriptions"
msgstr "All subscriptions"
-#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+#: lib/profileaction.php:140 lib/profileaction.php:201 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr "Subscribers"
@@ -5127,15 +5115,15 @@ msgstr "Subscribers"
msgid "All subscribers"
msgstr "All subscribers"
-#: lib/profileaction.php:177
+#: lib/profileaction.php:178
msgid "User ID"
msgstr "User ID"
-#: lib/profileaction.php:182
+#: lib/profileaction.php:183
msgid "Member since"
msgstr "Member since"
-#: lib/profileaction.php:235
+#: lib/profileaction.php:245
msgid "All groups"
msgstr "All groups"
diff --git a/locale/es/LC_MESSAGES/statusnet.po b/locale/es/LC_MESSAGES/statusnet.po
index eeeeeb3d6..393a3c602 100644
--- a/locale/es/LC_MESSAGES/statusnet.po
+++ b/locale/es/LC_MESSAGES/statusnet.po
@@ -11,12 +11,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-27 23:50+0000\n"
-"PO-Revision-Date: 2009-11-28 19:50:09+0000\n"
+"POT-Creation-Date: 2009-12-02 23:18+0000\n"
+"PO-Revision-Date: 2009-12-02 23:19:28+0000\n"
"Language-Team: Spanish\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59523); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59683); Translate extension (2009-11-29)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: es\n"
"X-Message-Group: out-statusnet\n"
@@ -577,7 +577,7 @@ msgstr "Cortar"
#: actions/emailsettings.php:238 actions/favor.php:75
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
@@ -752,7 +752,7 @@ msgid "Conversation"
msgstr "Código de confirmación"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:206 lib/searchgroupnav.php:82
+#: lib/profileaction.php:216 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "Avisos"
@@ -1282,26 +1282,26 @@ msgstr "El usuario al que quieres seguir no existe."
msgid "You can use the local subscription!"
msgstr "¡Puedes usar la suscripción local!"
-#: actions/finishremotesubscribe.php:96
+#: actions/finishremotesubscribe.php:99
msgid "That user has blocked you from subscribing."
msgstr "Ese usuario te ha bloqueado la suscripción."
-#: actions/finishremotesubscribe.php:106
+#: actions/finishremotesubscribe.php:110
#, fuzzy
msgid "You are not authorized."
msgstr "No autorizado."
-#: actions/finishremotesubscribe.php:109
+#: actions/finishremotesubscribe.php:113
#, fuzzy
msgid "Could not convert request token to access token."
msgstr "No se pudieron convertir las clavesde petición a claves de acceso."
-#: actions/finishremotesubscribe.php:114
+#: actions/finishremotesubscribe.php:118
#, fuzzy
msgid "Remote service uses unknown version of OMB protocol."
msgstr "Versión desconocida del protocolo OMB."
-#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
msgid "Error updating remote profile"
msgstr "Error al actualizar el perfil remoto"
@@ -1519,8 +1519,8 @@ msgid ""
"action.newgroup%%) yourself!"
msgstr ""
-#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
-#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr "Grupos"
@@ -1853,55 +1853,55 @@ msgstr "%s dejó grupo %s"
msgid "Already logged in."
msgstr "Ya estás conectado."
-#: actions/login.php:110 actions/login.php:120
+#: actions/login.php:108 actions/login.php:118
#, fuzzy
msgid "Invalid or expired token."
msgstr "El contenido del aviso es inválido"
-#: actions/login.php:143
+#: actions/login.php:146
msgid "Incorrect username or password."
msgstr "Nombre de usuario o contraseña incorrectos."
-#: actions/login.php:149
+#: actions/login.php:152
#, fuzzy
msgid "Error setting user. You are probably not authorized."
msgstr "No autorizado."
-#: actions/login.php:204 actions/login.php:257 lib/action.php:458
+#: actions/login.php:207 actions/login.php:260 lib/action.php:458
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Inicio de sesión"
-#: actions/login.php:243
+#: actions/login.php:246
msgid "Login to site"
msgstr "Ingresar a sitio"
-#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/login.php:249 actions/profilesettings.php:106
#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
#: lib/groupeditform.php:152 lib/userprofile.php:131
msgid "Nickname"
msgstr "Apodo"
-#: actions/login.php:249 actions/register.php:428
+#: actions/login.php:252 actions/register.php:428
#: lib/accountsettingsaction.php:116
msgid "Password"
msgstr "Contraseña"
-#: actions/login.php:252 actions/register.php:477
+#: actions/login.php:255 actions/register.php:477
msgid "Remember me"
msgstr "Recordarme"
-#: actions/login.php:253 actions/register.php:479
+#: actions/login.php:256 actions/register.php:479
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
"Iniciar sesión automáticamente en el futuro. ¡No usar en ordenadores "
"compartidos! "
-#: actions/login.php:263
+#: actions/login.php:266
msgid "Lost or forgotten password?"
msgstr "¿Contraseña olvidada o perdida?"
-#: actions/login.php:282
+#: actions/login.php:285
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -1909,7 +1909,7 @@ msgstr ""
"Por razones de seguridad, por favor vuelve a escribir tu nombre de usuario y "
"contraseña antes de cambiar tu configuración."
-#: actions/login.php:286
+#: actions/login.php:289
#, fuzzy, php-format
msgid ""
"Login with your username and password. Don't have a username yet? [Register]"
@@ -2870,8 +2870,7 @@ msgstr "El URL del perfil es inválido (formato incorrecto)"
#: actions/remotesubscribe.php:168
#, fuzzy
-msgid ""
-"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
msgstr "URL de perfil no válido (ningún documento YADIS)."
#: actions/remotesubscribe.php:176
@@ -3055,7 +3054,7 @@ msgid "Members"
msgstr "Miembros"
#: actions/showgroup.php:386 lib/profileaction.php:117
-#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
+#: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95
#: lib/tagcloudsection.php:71
msgid "(None)"
msgstr "(Ninguno)"
@@ -3064,7 +3063,7 @@ msgstr "(Ninguno)"
msgid "All members"
msgstr "Todos los miembros"
-#: actions/showgroup.php:429 lib/profileaction.php:173
+#: actions/showgroup.php:429 lib/profileaction.php:174
msgid "Statistics"
msgstr "Estadísticas"
@@ -4508,50 +4507,40 @@ msgstr "Notificación activada."
msgid "Can't turn on notification."
msgstr "No se puede activar notificación."
-#: lib/command.php:597
-#, fuzzy, php-format
-msgid "Could not create login token for %s"
-msgstr "No se pudo crear el formulario OpenID: %s"
-
-#: lib/command.php:602
-#, php-format
-msgid "This link is useable only once, and is good for only 2 minutes: %s"
-msgstr ""
-
-#: lib/command.php:618
+#: lib/command.php:592
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "No estás suscrito a ese perfil."
-#: lib/command.php:620
+#: lib/command.php:594
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Ya estás suscrito a estos usuarios:"
msgstr[1] "Ya estás suscrito a estos usuarios:"
-#: lib/command.php:640
+#: lib/command.php:614
#, fuzzy
msgid "No one is subscribed to you."
msgstr "No se pudo suscribir otro a ti."
-#: lib/command.php:642
+#: lib/command.php:616
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "No se pudo suscribir otro a ti."
msgstr[1] "No se pudo suscribir otro a ti."
-#: lib/command.php:662
+#: lib/command.php:636
#, fuzzy
msgid "You are not a member of any groups."
msgstr "No eres miembro de ese grupo"
-#: lib/command.php:664
+#: lib/command.php:638
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "No eres miembro de este grupo."
msgstr[1] "No eres miembro de este grupo."
-#: lib/command.php:678
+#: lib/command.php:652
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4570,7 +4559,6 @@ msgid ""
"reply #<notice_id> - reply to notice with a given id\n"
"reply <nickname> - reply to the last notice from user\n"
"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
"drop <group> - leave group\n"
"stats - get your stats\n"
"stop - same as 'off'\n"
@@ -4813,7 +4801,7 @@ msgstr ""
msgid "kB"
msgstr ""
-#: lib/jabber.php:192
+#: lib/jabber.php:191
#, php-format
msgid "[%s]"
msgstr ""
@@ -5235,7 +5223,7 @@ msgstr "Mensajes enviados"
msgid "Tags in %s's notices"
msgstr "Tags en avisos de %s"
-#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr "Suscripciones"
@@ -5243,7 +5231,7 @@ msgstr "Suscripciones"
msgid "All subscriptions"
msgstr "Todas las suscripciones"
-#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+#: lib/profileaction.php:140 lib/profileaction.php:201 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr "Suscriptores"
@@ -5252,15 +5240,15 @@ msgstr "Suscriptores"
msgid "All subscribers"
msgstr "Todos los suscriptores"
-#: lib/profileaction.php:177
+#: lib/profileaction.php:178
msgid "User ID"
msgstr "ID de usuario"
-#: lib/profileaction.php:182
+#: lib/profileaction.php:183
msgid "Member since"
msgstr "Miembro desde"
-#: lib/profileaction.php:235
+#: lib/profileaction.php:245
msgid "All groups"
msgstr "Todos los grupos"
diff --git a/locale/fi/LC_MESSAGES/statusnet.po b/locale/fi/LC_MESSAGES/statusnet.po
index 9d3833616..e5e8af795 100644
--- a/locale/fi/LC_MESSAGES/statusnet.po
+++ b/locale/fi/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-27 23:50+0000\n"
-"PO-Revision-Date: 2009-11-28 19:50:12+0000\n"
+"POT-Creation-Date: 2009-12-02 23:18+0000\n"
+"PO-Revision-Date: 2009-12-02 23:19:32+0000\n"
"Language-Team: Finnish\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59523); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59683); Translate extension (2009-11-29)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: fi\n"
"X-Message-Group: out-statusnet\n"
@@ -573,7 +573,7 @@ msgstr "Rajaa"
#: actions/emailsettings.php:238 actions/favor.php:75
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
@@ -744,7 +744,7 @@ msgid "Conversation"
msgstr "Keskustelu"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:206 lib/searchgroupnav.php:82
+#: lib/profileaction.php:216 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "Päivitykset"
@@ -1264,25 +1264,25 @@ msgstr "Käyttäjää jota seurataan ei ole olemassa."
msgid "You can use the local subscription!"
msgstr "Voit käyttää paikallista tilausta!"
-#: actions/finishremotesubscribe.php:96
+#: actions/finishremotesubscribe.php:99
msgid "That user has blocked you from subscribing."
msgstr "Käyttäjä on estänyt sinua tilaamasta päivityksiä."
-#: actions/finishremotesubscribe.php:106
+#: actions/finishremotesubscribe.php:110
msgid "You are not authorized."
msgstr "Sinulla ei ole valtuutusta tähän."
-#: actions/finishremotesubscribe.php:109
+#: actions/finishremotesubscribe.php:113
#, fuzzy
msgid "Could not convert request token to access token."
msgstr "Ei voitu muuttaa request tokeneita access tokeneiksi."
-#: actions/finishremotesubscribe.php:114
+#: actions/finishremotesubscribe.php:118
#, fuzzy
msgid "Remote service uses unknown version of OMB protocol."
msgstr "Tuntematon OMB-protokollan versio."
-#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
msgid "Error updating remote profile"
msgstr "Virhe tapahtui etäprofiilin päivittämisessä"
@@ -1482,8 +1482,8 @@ msgid ""
"action.newgroup%%) yourself!"
msgstr ""
-#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
-#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr "Ryhmät"
@@ -1812,55 +1812,55 @@ msgstr "%s erosi ryhmästä %s"
msgid "Already logged in."
msgstr "Olet jo kirjautunut sisään."
-#: actions/login.php:110 actions/login.php:120
+#: actions/login.php:108 actions/login.php:118
#, fuzzy
msgid "Invalid or expired token."
msgstr "Päivityksen sisältö ei kelpaa"
-#: actions/login.php:143
+#: actions/login.php:146
msgid "Incorrect username or password."
msgstr "Väärä käyttäjätunnus tai salasana"
-#: actions/login.php:149
+#: actions/login.php:152
#, fuzzy
msgid "Error setting user. You are probably not authorized."
msgstr "Sinulla ei ole valtuutusta tähän."
-#: actions/login.php:204 actions/login.php:257 lib/action.php:458
+#: actions/login.php:207 actions/login.php:260 lib/action.php:458
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Kirjaudu sisään"
-#: actions/login.php:243
+#: actions/login.php:246
msgid "Login to site"
msgstr "Kirjaudu sisään"
-#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/login.php:249 actions/profilesettings.php:106
#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
#: lib/groupeditform.php:152 lib/userprofile.php:131
msgid "Nickname"
msgstr "Tunnus"
-#: actions/login.php:249 actions/register.php:428
+#: actions/login.php:252 actions/register.php:428
#: lib/accountsettingsaction.php:116
msgid "Password"
msgstr "Salasana"
-#: actions/login.php:252 actions/register.php:477
+#: actions/login.php:255 actions/register.php:477
msgid "Remember me"
msgstr "Muista minut"
-#: actions/login.php:253 actions/register.php:479
+#: actions/login.php:256 actions/register.php:479
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
"Kirjaudu sisään automaattisesti tulevaisuudessa; ei tietokoneille joilla "
"useampi käyttäjä!"
-#: actions/login.php:263
+#: actions/login.php:266
msgid "Lost or forgotten password?"
msgstr "Oletko hukannut tai unohtanut salasanasi?"
-#: actions/login.php:282
+#: actions/login.php:285
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -1868,7 +1868,7 @@ msgstr ""
"Syötä turvallisuussyistä käyttäjätunnuksesi ja salasanasi uudelleen ennen "
"asetuksiesi muuttamista."
-#: actions/login.php:286
+#: actions/login.php:289
#, fuzzy, php-format
msgid ""
"Login with your username and password. Don't have a username yet? [Register]"
@@ -2820,8 +2820,7 @@ msgstr "Profiilin URL-osoite '%s' ei kelpaa (virheellinen muoto)."
#: actions/remotesubscribe.php:168
#, fuzzy
-msgid ""
-"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
msgstr ""
"Tuo ei ole kelvollinen profiilin verkko-osoite (YADIS dokumenttia ei "
"löytynyt)."
@@ -3003,7 +3002,7 @@ msgid "Members"
msgstr "Jäsenet"
#: actions/showgroup.php:386 lib/profileaction.php:117
-#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
+#: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95
#: lib/tagcloudsection.php:71
msgid "(None)"
msgstr "(Tyhjä)"
@@ -3012,7 +3011,7 @@ msgstr "(Tyhjä)"
msgid "All members"
msgstr "Kaikki jäsenet"
-#: actions/showgroup.php:429 lib/profileaction.php:173
+#: actions/showgroup.php:429 lib/profileaction.php:174
msgid "Statistics"
msgstr "Tilastot"
@@ -4436,50 +4435,40 @@ msgstr "Ilmoitukset päällä."
msgid "Can't turn on notification."
msgstr "Ilmoituksia ei voi pistää päälle."
-#: lib/command.php:597
-#, fuzzy, php-format
-msgid "Could not create login token for %s"
-msgstr "Ei voitu luoda OpenID lomaketta: %s"
-
-#: lib/command.php:602
-#, php-format
-msgid "This link is useable only once, and is good for only 2 minutes: %s"
-msgstr ""
-
-#: lib/command.php:618
+#: lib/command.php:592
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "Et ole tilannut tämän käyttäjän päivityksiä."
-#: lib/command.php:620
+#: lib/command.php:594
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Olet jos tilannut seuraavien käyttäjien päivitykset:"
msgstr[1] "Olet jos tilannut seuraavien käyttäjien päivitykset:"
-#: lib/command.php:640
+#: lib/command.php:614
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Toista ei voitu asettaa tilaamaan sinua."
-#: lib/command.php:642
+#: lib/command.php:616
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Toista ei voitu asettaa tilaamaan sinua."
msgstr[1] "Toista ei voitu asettaa tilaamaan sinua."
-#: lib/command.php:662
+#: lib/command.php:636
#, fuzzy
msgid "You are not a member of any groups."
msgstr "Sinä et kuulu tähän ryhmään."
-#: lib/command.php:664
+#: lib/command.php:638
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Sinä et kuulu tähän ryhmään."
msgstr[1] "Sinä et kuulu tähän ryhmään."
-#: lib/command.php:678
+#: lib/command.php:652
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4498,7 +4487,6 @@ msgid ""
"reply #<notice_id> - reply to notice with a given id\n"
"reply <nickname> - reply to the last notice from user\n"
"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
"drop <group> - leave group\n"
"stats - get your stats\n"
"stop - same as 'off'\n"
@@ -4745,7 +4733,7 @@ msgstr ""
msgid "kB"
msgstr ""
-#: lib/jabber.php:192
+#: lib/jabber.php:191
#, php-format
msgid "[%s]"
msgstr ""
@@ -5168,7 +5156,7 @@ msgstr "Lähettämäsi viestit"
msgid "Tags in %s's notices"
msgstr "Tagit käyttäjän %s päivityksissä"
-#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr "Tilaukset"
@@ -5176,7 +5164,7 @@ msgstr "Tilaukset"
msgid "All subscriptions"
msgstr "Kaikki tilaukset"
-#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+#: lib/profileaction.php:140 lib/profileaction.php:201 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr "Tilaajat"
@@ -5184,16 +5172,16 @@ msgstr "Tilaajat"
msgid "All subscribers"
msgstr "Kaikki tilaajat"
-#: lib/profileaction.php:177
+#: lib/profileaction.php:178
#, fuzzy
msgid "User ID"
msgstr "Käyttäjä"
-#: lib/profileaction.php:182
+#: lib/profileaction.php:183
msgid "Member since"
msgstr "Käyttäjänä alkaen"
-#: lib/profileaction.php:235
+#: lib/profileaction.php:245
msgid "All groups"
msgstr "Kaikki ryhmät"
diff --git a/locale/fr/LC_MESSAGES/statusnet.po b/locale/fr/LC_MESSAGES/statusnet.po
index 7d9301836..cb3c85af5 100644
--- a/locale/fr/LC_MESSAGES/statusnet.po
+++ b/locale/fr/LC_MESSAGES/statusnet.po
@@ -1,5 +1,6 @@
# Translation of StatusNet to French
#
+# Author@translatewiki.net: Brion
# Author@translatewiki.net: IAlex
# Author@translatewiki.net: Isoph
# Author@translatewiki.net: Jean-Frédéric
@@ -13,12 +14,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-27 23:50+0000\n"
-"PO-Revision-Date: 2009-11-28 19:50:14+0000\n"
+"POT-Creation-Date: 2009-12-02 23:18+0000\n"
+"PO-Revision-Date: 2009-12-02 23:19:36+0000\n"
"Language-Team: French\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59523); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59683); Translate extension (2009-11-29)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: fr\n"
"X-Message-Group: out-statusnet\n"
@@ -583,7 +584,7 @@ msgstr "Recadrer"
#: actions/emailsettings.php:238 actions/favor.php:75
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
@@ -755,7 +756,7 @@ msgid "Conversation"
msgstr "Conversation"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:206 lib/searchgroupnav.php:82
+#: lib/profileaction.php:216 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "Statuts"
@@ -1273,23 +1274,23 @@ msgstr "L’utilisateur suivi n’existe pas."
msgid "You can use the local subscription!"
msgstr "Vous pouvez utiliser l’abonnement local."
-#: actions/finishremotesubscribe.php:96
+#: actions/finishremotesubscribe.php:99
msgid "That user has blocked you from subscribing."
msgstr "Cet utilisateur vous a empêché de vous inscrire."
-#: actions/finishremotesubscribe.php:106
+#: actions/finishremotesubscribe.php:110
msgid "You are not authorized."
msgstr "Vous n'êtes pas autorisé."
-#: actions/finishremotesubscribe.php:109
+#: actions/finishremotesubscribe.php:113
msgid "Could not convert request token to access token."
msgstr "Impossible de convertir le jeton de requête en jeton d’accès."
-#: actions/finishremotesubscribe.php:114
+#: actions/finishremotesubscribe.php:118
msgid "Remote service uses unknown version of OMB protocol."
msgstr "Le service distant utilise une version inconnue du protocole OMB."
-#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
msgid "Error updating remote profile"
msgstr "Erreur lors de la mise à jour du profil distant"
@@ -1499,8 +1500,8 @@ msgstr ""
"Pourquoi ne pas [créer un compte](%%action.register%%) et [créer le groupe](%"
"%action.newgroup%%) vous-même !"
-#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
-#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr "Groupes"
@@ -1840,53 +1841,53 @@ msgstr "%s a quitté le groupe %s"
msgid "Already logged in."
msgstr "Déjà connecté."
-#: actions/login.php:110 actions/login.php:120
+#: actions/login.php:108 actions/login.php:118
msgid "Invalid or expired token."
msgstr "Jeton invalide ou expiré."
-#: actions/login.php:143
+#: actions/login.php:146
msgid "Incorrect username or password."
msgstr "Identifiant ou mot de passe incorrect."
-#: actions/login.php:149
+#: actions/login.php:152
msgid "Error setting user. You are probably not authorized."
msgstr "Abonnements par défaut"
-#: actions/login.php:204 actions/login.php:257 lib/action.php:458
+#: actions/login.php:207 actions/login.php:260 lib/action.php:458
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Ouvrir une session"
-#: actions/login.php:243
+#: actions/login.php:246
msgid "Login to site"
msgstr "Ouverture de session"
-#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/login.php:249 actions/profilesettings.php:106
#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
#: lib/groupeditform.php:152 lib/userprofile.php:131
msgid "Nickname"
msgstr "Pseudo"
-#: actions/login.php:249 actions/register.php:428
+#: actions/login.php:252 actions/register.php:428
#: lib/accountsettingsaction.php:116
msgid "Password"
msgstr "Mot de passe"
-#: actions/login.php:252 actions/register.php:477
+#: actions/login.php:255 actions/register.php:477
msgid "Remember me"
msgstr "Se souvenir de moi"
-#: actions/login.php:253 actions/register.php:479
+#: actions/login.php:256 actions/register.php:479
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
"Ouvrir automatiquement ma session à l’avenir (déconseillé pour les "
"ordinateurs publics ou partagés)"
-#: actions/login.php:263
+#: actions/login.php:266
msgid "Lost or forgotten password?"
msgstr "Mot de passe perdu ?"
-#: actions/login.php:282
+#: actions/login.php:285
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -1894,7 +1895,7 @@ msgstr ""
"Pour des raisons de sécurité, veuillez entrer à nouveau votre identifiant et "
"votre mot de passe afin d’enregistrer vos préférences."
-#: actions/login.php:286
+#: actions/login.php:289
#, php-format
msgid ""
"Login with your username and password. Don't have a username yet? [Register]"
@@ -2857,8 +2858,8 @@ msgid "Invalid profile URL (bad format)"
msgstr "URL du profil invalide (mauvais format)"
#: actions/remotesubscribe.php:168
-msgid ""
-"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+#, fuzzy
+msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
msgstr ""
"URL de profil invalide (aucun document YADIS ou définition XRDS invalide)."
@@ -3051,7 +3052,7 @@ msgid "Members"
msgstr "Membres"
#: actions/showgroup.php:386 lib/profileaction.php:117
-#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
+#: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95
#: lib/tagcloudsection.php:71
msgid "(None)"
msgstr "(aucun)"
@@ -3060,7 +3061,7 @@ msgstr "(aucun)"
msgid "All members"
msgstr "Tous les membres"
-#: actions/showgroup.php:429 lib/profileaction.php:173
+#: actions/showgroup.php:429 lib/profileaction.php:174
msgid "Statistics"
msgstr "Statistiques"
@@ -4483,49 +4484,38 @@ msgstr "Avertissements activés."
msgid "Can't turn on notification."
msgstr "Impossible d’activer les avertissements."
-#: lib/command.php:597
-#, php-format
-msgid "Could not create login token for %s"
-msgstr "Impossible de créer le jeton de connexion pour %s"
-
-#: lib/command.php:602
-#, php-format
-msgid "This link is useable only once, and is good for only 2 minutes: %s"
-msgstr ""
-"Ce lien n’est utilisable qu’une seule fois, et est valable uniquement "
-"pendant 2 minutes : %s"
-
-#: lib/command.php:618
+#: lib/command.php:592
msgid "You are not subscribed to anyone."
msgstr "Vous n'êtes pas abonné(e) à personne."
-#: lib/command.php:620
+#: lib/command.php:594
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Vous êtes abonné à cette personne :"
msgstr[1] "Vous êtes abonné à ces personnes :"
-#: lib/command.php:640
+#: lib/command.php:614
msgid "No one is subscribed to you."
msgstr "Personne ne s'est abonné à vous."
-#: lib/command.php:642
+#: lib/command.php:616
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Cette personne est abonnée à vous :"
msgstr[1] "Ces personnes sont abonnées à vous :"
-#: lib/command.php:662
+#: lib/command.php:636
msgid "You are not a member of any groups."
msgstr "Vous n'êtes pas membre d'aucun groupe."
-#: lib/command.php:664
+#: lib/command.php:638
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Vous êtes membre de ce groupe :"
msgstr[1] "Vous êtes membre de ces groupes :"
-#: lib/command.php:678
+#: lib/command.php:652
+#, fuzzy
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4544,7 +4534,6 @@ msgid ""
"reply #<notice_id> - reply to notice with a given id\n"
"reply <nickname> - reply to the last notice from user\n"
"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
"drop <group> - leave group\n"
"stats - get your stats\n"
"stop - same as 'off'\n"
@@ -4825,7 +4814,7 @@ msgstr "Mo"
msgid "kB"
msgstr "Ko"
-#: lib/jabber.php:192
+#: lib/jabber.php:191
#, php-format
msgid "[%s]"
msgstr "[%s]"
@@ -5316,7 +5305,7 @@ msgstr "Vos messages envoyés"
msgid "Tags in %s's notices"
msgstr "Marquages des statuts de %s"
-#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr "Abonnements"
@@ -5324,7 +5313,7 @@ msgstr "Abonnements"
msgid "All subscriptions"
msgstr "Tous les abonnements"
-#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+#: lib/profileaction.php:140 lib/profileaction.php:201 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr "Abonnés"
@@ -5332,15 +5321,15 @@ msgstr "Abonnés"
msgid "All subscribers"
msgstr "Tous les abonnés"
-#: lib/profileaction.php:177
+#: lib/profileaction.php:178
msgid "User ID"
msgstr "ID de l’utilisateur"
-#: lib/profileaction.php:182
+#: lib/profileaction.php:183
msgid "Member since"
msgstr "Membre depuis"
-#: lib/profileaction.php:235
+#: lib/profileaction.php:245
msgid "All groups"
msgstr "Tous les groupes"
diff --git a/locale/ga/LC_MESSAGES/statusnet.po b/locale/ga/LC_MESSAGES/statusnet.po
index f8e21bfe3..445e580bb 100644
--- a/locale/ga/LC_MESSAGES/statusnet.po
+++ b/locale/ga/LC_MESSAGES/statusnet.po
@@ -7,12 +7,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-27 23:50+0000\n"
-"PO-Revision-Date: 2009-11-28 19:50:17+0000\n"
+"POT-Creation-Date: 2009-12-02 23:18+0000\n"
+"PO-Revision-Date: 2009-12-02 23:19:42+0000\n"
"Language-Team: Irish\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59523); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59683); Translate extension (2009-11-29)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ga\n"
"X-Message-Group: out-statusnet\n"
@@ -580,7 +580,7 @@ msgstr ""
#: actions/emailsettings.php:238 actions/favor.php:75
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
@@ -760,7 +760,7 @@ msgid "Conversation"
msgstr "Código de confirmación."
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:206 lib/searchgroupnav.php:82
+#: lib/profileaction.php:216 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "Chíos"
@@ -1293,26 +1293,26 @@ msgstr "O usuario que está sendo escoitado non existe."
msgid "You can use the local subscription!"
msgstr "¡Podes empregar a túa subscrición local!"
-#: actions/finishremotesubscribe.php:96
+#: actions/finishremotesubscribe.php:99
msgid "That user has blocked you from subscribing."
msgstr "Este usuario non che permite suscribirte a el."
-#: actions/finishremotesubscribe.php:106
+#: actions/finishremotesubscribe.php:110
#, fuzzy
msgid "You are not authorized."
msgstr "Non está autorizado."
-#: actions/finishremotesubscribe.php:109
+#: actions/finishremotesubscribe.php:113
#, fuzzy
msgid "Could not convert request token to access token."
msgstr "Non se pode convertir o token da petición a tokens de acceso."
-#: actions/finishremotesubscribe.php:114
+#: actions/finishremotesubscribe.php:118
#, fuzzy
msgid "Remote service uses unknown version of OMB protocol."
msgstr "Versión de protocolo OMB descoñecida."
-#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
msgid "Error updating remote profile"
msgstr "Acounteceu un erro actualizando o perfil remoto"
@@ -1525,8 +1525,8 @@ msgid ""
"action.newgroup%%) yourself!"
msgstr ""
-#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
-#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr ""
@@ -1856,53 +1856,53 @@ msgstr ""
msgid "Already logged in."
msgstr "Sesión xa iniciada"
-#: actions/login.php:110 actions/login.php:120
+#: actions/login.php:108 actions/login.php:118
#, fuzzy
msgid "Invalid or expired token."
msgstr "Contido do chío inválido"
-#: actions/login.php:143
+#: actions/login.php:146
msgid "Incorrect username or password."
msgstr "Usuario ou contrasinal incorrectos."
-#: actions/login.php:149
+#: actions/login.php:152
#, fuzzy
msgid "Error setting user. You are probably not authorized."
msgstr "Non está autorizado."
-#: actions/login.php:204 actions/login.php:257 lib/action.php:458
+#: actions/login.php:207 actions/login.php:260 lib/action.php:458
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Inicio de sesión"
-#: actions/login.php:243
+#: actions/login.php:246
msgid "Login to site"
msgstr ""
-#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/login.php:249 actions/profilesettings.php:106
#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
#: lib/groupeditform.php:152 lib/userprofile.php:131
msgid "Nickname"
msgstr "Alcume"
-#: actions/login.php:249 actions/register.php:428
+#: actions/login.php:252 actions/register.php:428
#: lib/accountsettingsaction.php:116
msgid "Password"
msgstr "Contrasinal"
-#: actions/login.php:252 actions/register.php:477
+#: actions/login.php:255 actions/register.php:477
msgid "Remember me"
msgstr "Lembrarme"
-#: actions/login.php:253 actions/register.php:479
+#: actions/login.php:256 actions/register.php:479
msgid "Automatically login in the future; not for shared computers!"
msgstr "Endiante acceder automáticamente, coidado en equipos compartidos!"
-#: actions/login.php:263
+#: actions/login.php:266
msgid "Lost or forgotten password?"
msgstr "¿Perdeches a contrasinal?"
-#: actions/login.php:282
+#: actions/login.php:285
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -1910,7 +1910,7 @@ msgstr ""
"Por razóns de seguranza, por favor re-insire o teu nome de usuario e "
"contrasinal antes de cambiar as túas preferenzas."
-#: actions/login.php:286
+#: actions/login.php:289
#, fuzzy, php-format
msgid ""
"Login with your username and password. Don't have a username yet? [Register]"
@@ -2875,8 +2875,7 @@ msgstr "Enderezo de perfil inválido (formato incorrecto)"
#: actions/remotesubscribe.php:168
#, fuzzy
-msgid ""
-"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
msgstr "Non é un enderezo de perfil válido (non ten documento YADIS)."
#: actions/remotesubscribe.php:176
@@ -3061,7 +3060,7 @@ msgid "Members"
msgstr "Membro dende"
#: actions/showgroup.php:386 lib/profileaction.php:117
-#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
+#: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95
#: lib/tagcloudsection.php:71
#, fuzzy
msgid "(None)"
@@ -3071,7 +3070,7 @@ msgstr "(nada)"
msgid "All members"
msgstr ""
-#: actions/showgroup.php:429 lib/profileaction.php:173
+#: actions/showgroup.php:429 lib/profileaction.php:174
msgid "Statistics"
msgstr "Estatísticas"
@@ -4529,22 +4528,12 @@ msgstr "Notificación habilitada."
msgid "Can't turn on notification."
msgstr "Non se pode activar a notificación."
-#: lib/command.php:597
-#, fuzzy, php-format
-msgid "Could not create login token for %s"
-msgstr "Non se pode crear o formulario OpenID: %s"
-
-#: lib/command.php:602
-#, php-format
-msgid "This link is useable only once, and is good for only 2 minutes: %s"
-msgstr ""
-
-#: lib/command.php:618
+#: lib/command.php:592
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "Non estás suscrito a ese perfil"
-#: lib/command.php:620
+#: lib/command.php:594
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Xa estas suscrito a estes usuarios:"
@@ -4553,12 +4542,12 @@ msgstr[2] ""
msgstr[3] ""
msgstr[4] ""
-#: lib/command.php:640
+#: lib/command.php:614
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Outro usuario non se puido suscribir a ti."
-#: lib/command.php:642
+#: lib/command.php:616
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Outro usuario non se puido suscribir a ti."
@@ -4567,12 +4556,12 @@ msgstr[2] ""
msgstr[3] ""
msgstr[4] ""
-#: lib/command.php:662
+#: lib/command.php:636
#, fuzzy
msgid "You are not a member of any groups."
msgstr "Non estás suscrito a ese perfil"
-#: lib/command.php:664
+#: lib/command.php:638
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Non estás suscrito a ese perfil"
@@ -4581,7 +4570,7 @@ msgstr[2] ""
msgstr[3] ""
msgstr[4] ""
-#: lib/command.php:678
+#: lib/command.php:652
#, fuzzy
msgid ""
"Commands:\n"
@@ -4601,7 +4590,6 @@ msgid ""
"reply #<notice_id> - reply to notice with a given id\n"
"reply <nickname> - reply to the last notice from user\n"
"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
"drop <group> - leave group\n"
"stats - get your stats\n"
"stop - same as 'off'\n"
@@ -4879,7 +4867,7 @@ msgstr ""
msgid "kB"
msgstr ""
-#: lib/jabber.php:192
+#: lib/jabber.php:191
#, php-format
msgid "[%s]"
msgstr ""
@@ -5356,7 +5344,7 @@ msgstr "As túas mensaxes enviadas"
msgid "Tags in %s's notices"
msgstr "O usuario non ten último chio."
-#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr "Subscricións"
@@ -5364,7 +5352,7 @@ msgstr "Subscricións"
msgid "All subscriptions"
msgstr "Tódalas subscricións"
-#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+#: lib/profileaction.php:140 lib/profileaction.php:201 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr "Subscritores"
@@ -5373,16 +5361,16 @@ msgstr "Subscritores"
msgid "All subscribers"
msgstr "Subscritores"
-#: lib/profileaction.php:177
+#: lib/profileaction.php:178
#, fuzzy
msgid "User ID"
msgstr "Usuario"
-#: lib/profileaction.php:182
+#: lib/profileaction.php:183
msgid "Member since"
msgstr "Membro dende"
-#: lib/profileaction.php:235
+#: lib/profileaction.php:245
#, fuzzy
msgid "All groups"
msgstr "Tódalas etiquetas"
diff --git a/locale/he/LC_MESSAGES/statusnet.po b/locale/he/LC_MESSAGES/statusnet.po
index 1d5e22a5b..c48131307 100644
--- a/locale/he/LC_MESSAGES/statusnet.po
+++ b/locale/he/LC_MESSAGES/statusnet.po
@@ -7,12 +7,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-27 23:50+0000\n"
-"PO-Revision-Date: 2009-11-28 19:50:20+0000\n"
+"POT-Creation-Date: 2009-12-02 23:18+0000\n"
+"PO-Revision-Date: 2009-12-02 23:19:46+0000\n"
"Language-Team: Hebrew\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59523); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59683); Translate extension (2009-11-29)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: he\n"
"X-Message-Group: out-statusnet\n"
@@ -574,7 +574,7 @@ msgstr ""
#: actions/emailsettings.php:238 actions/favor.php:75
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
@@ -751,7 +751,7 @@ msgid "Conversation"
msgstr "מיקום"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:206 lib/searchgroupnav.php:82
+#: lib/profileaction.php:216 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "הודעות"
@@ -1271,26 +1271,26 @@ msgstr "המשתמש אליו אתה מאזין אינו קיים."
msgid "You can use the local subscription!"
msgstr "ניתן להשתמש במנוי המקומי!"
-#: actions/finishremotesubscribe.php:96
+#: actions/finishremotesubscribe.php:99
msgid "That user has blocked you from subscribing."
msgstr ""
-#: actions/finishremotesubscribe.php:106
+#: actions/finishremotesubscribe.php:110
#, fuzzy
msgid "You are not authorized."
msgstr "לא מורשה."
-#: actions/finishremotesubscribe.php:109
+#: actions/finishremotesubscribe.php:113
#, fuzzy
msgid "Could not convert request token to access token."
msgstr "המרת אסימון הבקשה לאסימון גישה לא הצליחה."
-#: actions/finishremotesubscribe.php:114
+#: actions/finishremotesubscribe.php:118
#, fuzzy
msgid "Remote service uses unknown version of OMB protocol."
msgstr "גירסה לא מוכרת של פרוטוקול OMB"
-#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
msgid "Error updating remote profile"
msgstr "שגיאה בעדכון פרופיל מרוחק"
@@ -1502,8 +1502,8 @@ msgid ""
"action.newgroup%%) yourself!"
msgstr ""
-#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
-#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr "קבוצות"
@@ -1801,59 +1801,59 @@ msgstr ""
msgid "Already logged in."
msgstr "כבר מחובר."
-#: actions/login.php:110 actions/login.php:120
+#: actions/login.php:108 actions/login.php:118
#, fuzzy
msgid "Invalid or expired token."
msgstr "תוכן ההודעה לא חוקי"
-#: actions/login.php:143
+#: actions/login.php:146
msgid "Incorrect username or password."
msgstr "שם משתמש או סיסמה לא נכונים."
-#: actions/login.php:149
+#: actions/login.php:152
#, fuzzy
msgid "Error setting user. You are probably not authorized."
msgstr "לא מורשה."
-#: actions/login.php:204 actions/login.php:257 lib/action.php:458
+#: actions/login.php:207 actions/login.php:260 lib/action.php:458
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "היכנס"
-#: actions/login.php:243
+#: actions/login.php:246
msgid "Login to site"
msgstr ""
-#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/login.php:249 actions/profilesettings.php:106
#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
#: lib/groupeditform.php:152 lib/userprofile.php:131
msgid "Nickname"
msgstr "כינוי"
-#: actions/login.php:249 actions/register.php:428
+#: actions/login.php:252 actions/register.php:428
#: lib/accountsettingsaction.php:116
msgid "Password"
msgstr "סיסמה"
-#: actions/login.php:252 actions/register.php:477
+#: actions/login.php:255 actions/register.php:477
msgid "Remember me"
msgstr "זכור אותי"
-#: actions/login.php:253 actions/register.php:479
+#: actions/login.php:256 actions/register.php:479
msgid "Automatically login in the future; not for shared computers!"
msgstr "בעתיד התחבר אוטומטית; לא לשימוש במחשבים ציבוריים!"
-#: actions/login.php:263
+#: actions/login.php:266
msgid "Lost or forgotten password?"
msgstr "שכחת או איבדת את הסיסמה?"
-#: actions/login.php:282
+#: actions/login.php:285
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
msgstr "לצרכי אבטחה, הכנס מחדש את שם המשתמש והסיסמה לפני שתשנה את ההגדרות."
-#: actions/login.php:286
+#: actions/login.php:289
#, fuzzy, php-format
msgid ""
"Login with your username and password. Don't have a username yet? [Register]"
@@ -2772,8 +2772,7 @@ msgstr "כתובת פרופיל לא חוקית (פורמט לא תקין)"
#: actions/remotesubscribe.php:168
#, fuzzy
-msgid ""
-"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
msgstr "Not a valid profile URL (no YADIS document)."
#: actions/remotesubscribe.php:176
@@ -2956,7 +2955,7 @@ msgid "Members"
msgstr "חבר מאז"
#: actions/showgroup.php:386 lib/profileaction.php:117
-#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
+#: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95
#: lib/tagcloudsection.php:71
msgid "(None)"
msgstr ""
@@ -2965,7 +2964,7 @@ msgstr ""
msgid "All members"
msgstr ""
-#: actions/showgroup.php:429 lib/profileaction.php:173
+#: actions/showgroup.php:429 lib/profileaction.php:174
msgid "Statistics"
msgstr "סטטיסטיקה"
@@ -4376,50 +4375,40 @@ msgstr ""
msgid "Can't turn on notification."
msgstr ""
-#: lib/command.php:597
-#, fuzzy, php-format
-msgid "Could not create login token for %s"
-msgstr "נכשלה יצירת OpenID מתוך: %s"
-
-#: lib/command.php:602
-#, php-format
-msgid "This link is useable only once, and is good for only 2 minutes: %s"
-msgstr ""
-
-#: lib/command.php:618
+#: lib/command.php:592
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "לא שלחנו אלינו את הפרופיל הזה"
-#: lib/command.php:620
+#: lib/command.php:594
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "לא שלחנו אלינו את הפרופיל הזה"
msgstr[1] "לא שלחנו אלינו את הפרופיל הזה"
-#: lib/command.php:640
+#: lib/command.php:614
#, fuzzy
msgid "No one is subscribed to you."
msgstr "הרשמה מרוחקת"
-#: lib/command.php:642
+#: lib/command.php:616
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "הרשמה מרוחקת"
msgstr[1] "הרשמה מרוחקת"
-#: lib/command.php:662
+#: lib/command.php:636
#, fuzzy
msgid "You are not a member of any groups."
msgstr "לא שלחנו אלינו את הפרופיל הזה"
-#: lib/command.php:664
+#: lib/command.php:638
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "לא שלחנו אלינו את הפרופיל הזה"
msgstr[1] "לא שלחנו אלינו את הפרופיל הזה"
-#: lib/command.php:678
+#: lib/command.php:652
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4438,7 +4427,6 @@ msgid ""
"reply #<notice_id> - reply to notice with a given id\n"
"reply <nickname> - reply to the last notice from user\n"
"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
"drop <group> - leave group\n"
"stats - get your stats\n"
"stop - same as 'off'\n"
@@ -4687,7 +4675,7 @@ msgstr ""
msgid "kB"
msgstr ""
-#: lib/jabber.php:192
+#: lib/jabber.php:191
#, php-format
msgid "[%s]"
msgstr ""
@@ -5101,7 +5089,7 @@ msgstr ""
msgid "Tags in %s's notices"
msgstr ""
-#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr "הרשמות"
@@ -5109,7 +5097,7 @@ msgstr "הרשמות"
msgid "All subscriptions"
msgstr "כל המנויים"
-#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+#: lib/profileaction.php:140 lib/profileaction.php:201 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr "מנויים"
@@ -5118,16 +5106,16 @@ msgstr "מנויים"
msgid "All subscribers"
msgstr "מנויים"
-#: lib/profileaction.php:177
+#: lib/profileaction.php:178
#, fuzzy
msgid "User ID"
msgstr "מתשמש"
-#: lib/profileaction.php:182
+#: lib/profileaction.php:183
msgid "Member since"
msgstr "חבר מאז"
-#: lib/profileaction.php:235
+#: lib/profileaction.php:245
msgid "All groups"
msgstr ""
diff --git a/locale/hsb/LC_MESSAGES/statusnet.po b/locale/hsb/LC_MESSAGES/statusnet.po
new file mode 100644
index 000000000..c22ee263d
--- /dev/null
+++ b/locale/hsb/LC_MESSAGES/statusnet.po
@@ -0,0 +1,2191 @@
+# Translation of StatusNet to Upper Sorbian
+#
+# Author@translatewiki.net: Michawiki
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+""
+"Project-Id-Version: StatusNet\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-11-27 23:50+0000\n"
+"PO-Revision-Date: 2009-12-02 23:32:10+0000\n"
+"Language-Team: Dutch\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: MediaWiki 1.16alpha(r59683); Translate extension (2009-11-29)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: hsb\n"
+"X-Message-Group: out-statusnet\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : (n%100==3 || n%100==4) ? 2 : 3)\n"
+
+#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
+#: actions/showfavorites.php:137 actions/tag.php:51
+msgid "No such page"
+msgstr "Strona njeeksistuje"
+
+#: actions/all.php:74 actions/allrss.php:68
+#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:116
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
+#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
+#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
+#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74
+#: actions/foaf.php:40 actions/foaf.php:58 actions/microsummary.php:62
+#: actions/newmessage.php:116 actions/remotesubscribe.php:145
+#: actions/remotesubscribe.php:154 actions/replies.php:73
+#: actions/repliesrss.php:38 actions/showfavorites.php:105
+#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38
+#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
+#: lib/command.php:364 lib/command.php:411 lib/command.php:466
+#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
+#: lib/subs.php:34 lib/subs.php:116
+msgid "No such user."
+msgstr "Wužiwar njeeksistuje"
+
+#: actions/all.php:84
+#, php-format
+msgid "%s and friends, page %d"
+msgstr "%s a přećeljo, bok %d"
+
+#: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
+#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100
+#, php-format
+msgid "%s and friends"
+msgstr "%s a přećeljo"
+
+#: actions/all.php:99
+#, php-format
+msgid "Feed for friends of %s (RSS 1.0)"
+msgstr "Kanal za přećelow wužiwarja %s (RSS 1.0)"
+
+#: actions/all.php:107
+#, php-format
+msgid "Feed for friends of %s (RSS 2.0)"
+msgstr "Kanal za přećelow wužiwarja %s (RSS 2.0)"
+
+#: actions/all.php:115
+#, php-format
+msgid "Feed for friends of %s (Atom)"
+msgstr "Kanal za přećelow wužiwarja %s (Atom)"
+
+#: actions/all.php:165
+msgid "You and friends"
+msgstr "Ty a přećeljo"
+
+#: actions/apiaccountratelimitstatus.php:70
+#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofilebackgroundimage.php:94
+#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdateprofile.php:97
+msgid "API method not found."
+msgstr "API-metoda njenamakana."
+
+#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofilebackgroundimage.php:86
+#: actions/apiaccountupdateprofilecolors.php:110
+#: actions/apiaccountupdateprofileimage.php:84
+#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
+#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
+#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
+#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
+#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
+#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114
+msgid "This method requires a POST."
+msgstr "Tuta metoda wužaduje sej POST."
+
+#: actions/apiaccountupdatedeliverydevice.php:132
+msgid "Could not update user."
+msgstr "Wužiwar njeje so dał aktualizować."
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:187
+#: actions/apiaccountupdateprofilecolors.php:142
+msgid "Could not update your design."
+msgstr "Design njeda so aktualizować."
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
+#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+msgid "User has no profile."
+msgstr "Wužiwar nima profil."
+
+#: actions/apiaccountupdateprofile.php:147
+msgid "Could not save profile."
+msgstr "Profil njeje so składować dał."
+
+#: actions/apidirectmessagenew.php:126
+msgid "No message text!"
+msgstr "Žadyn powěsćowy tekst!"
+
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "To je předołho. Maksimalna powěsćowa wulkosć je %d znamješkow."
+
+#: actions/apidirectmessagenew.php:146
+msgid "Recipient user not found."
+msgstr "Přijimowar njenamakany."
+
+#: actions/apidirectmessage.php:89
+#, php-format
+msgid "Direct messages from %s"
+msgstr "Direktne powěsće z %s"
+
+#: actions/apidirectmessage.php:93
+#, php-format
+msgid "All the direct messages sent from %s"
+msgstr "Wšě z %s pósłane direktne powěsće"
+
+#: actions/apidirectmessage.php:101
+#, php-format
+msgid "Direct messages to %s"
+msgstr "Direktne powěsće do %s"
+
+#: actions/apidirectmessage.php:105
+#, php-format
+msgid "All the direct messages sent to %s"
+msgstr "Wšě do %s pósłane direktne powěsće"
+
+#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
+#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
+#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
+#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
+#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+msgid "API method not found!"
+msgstr "API-metoda njenamakana!"
+
+#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
+#: actions/apistatusesdestroy.php:113
+msgid "No status found with that ID."
+msgstr "Status z tym ID njenamakany."
+
+#: actions/apifavoritecreate.php:119
+msgid "This status is already a favorite!"
+msgstr "Tutón status je hižo faworit!"
+
+#: actions/apifavoritedestroy.php:122
+msgid "That status is not a favorite!"
+msgstr "Tón status faworit njeje!"
+
+#: actions/apigroupcreate.php:173 actions/editgroup.php:186
+#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/register.php:208
+msgid "Nickname already in use. Try another one."
+msgstr "Přimjeno so hižo wužiwa. Spytaj druhe."
+
+#: actions/apigroupcreate.php:180 actions/editgroup.php:189
+#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/register.php:210
+msgid "Not a valid nickname."
+msgstr "Žane płaćiwe přimjeno."
+
+#: actions/apigroupcreate.php:196 actions/editgroup.php:195
+#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/register.php:217
+msgid "Homepage is not a valid URL."
+msgstr "Startowa strona njeje płaćiwy URL."
+
+#: actions/apigroupcreate.php:205 actions/editgroup.php:198
+#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/register.php:220
+msgid "Full name is too long (max 255 chars)."
+msgstr "Dospołne mjeno je předołho (maks. 255 znamješkow)."
+
+#: actions/apigroupcreate.php:213
+#, php-format
+msgid "Description is too long (max %d chars)."
+msgstr "Wopisanje je předołho (maks. %d znamješkow)."
+
+#: actions/apigroupcreate.php:224 actions/editgroup.php:204
+#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/register.php:227
+msgid "Location is too long (max 255 chars)."
+msgstr "Městno je předołho (maks. 255 znamješkow)."
+
+#: actions/apigroupcreate.php:243 actions/editgroup.php:215
+#: actions/newgroup.php:159
+#, php-format
+msgid "Too many aliases! Maximum %d."
+msgstr "Přewjele aliasow! Maksimum: %d."
+
+#: actions/apigroupcreate.php:264 actions/editgroup.php:224
+#: actions/newgroup.php:168
+#, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "Njepłaćiwy alias: \"%s\""
+
+#: actions/apigroupcreate.php:273 actions/editgroup.php:228
+#: actions/newgroup.php:172
+#, php-format
+msgid "Alias \"%s\" already in use. Try another one."
+msgstr "Alias \"%s\" so hižo wužiwa. Spytaj druhi."
+
+#: actions/apigroupcreate.php:286 actions/editgroup.php:234
+#: actions/newgroup.php:178
+msgid "Alias can't be the same as nickname."
+msgstr "Alias njemóže samsny kaž přimjeno być."
+
+#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
+#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
+#: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91
+msgid "Group not found!"
+msgstr "Skupina njenamakana!"
+
+#: actions/apigroupjoin.php:110
+msgid "You are already a member of that group."
+msgstr "Sy hižo čłon teje skupiny."
+
+#: actions/apigroupleave.php:114
+msgid "You are not a member of this group."
+msgstr "Njejsy čłon tuteje skupiny."
+
+#: actions/apigrouplistall.php:94
+#, php-format
+msgid "groups on %s"
+msgstr "skupiny na %s"
+
+#: actions/apistatusesdestroy.php:107
+msgid "This method requires a POST or DELETE."
+msgstr "Tuta metoda wužaduje sej POST abo DELETE."
+
+#: actions/apistatusesdestroy.php:130
+msgid "You may not delete another user's status."
+msgstr "Njemóžeš status druheho wužiwarja zničić."
+
+#: actions/apistatusesshow.php:138
+msgid "Status deleted."
+msgstr "Status zničeny."
+
+#: actions/apistatusesshow.php:144
+msgid "No status with that ID found."
+msgstr "Žadyn status z tym ID namakany."
+
+#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
+#: scripts/maildaemon.php:71
+#, php-format
+msgid "That's too long. Max notice size is %d chars."
+msgstr "To je předołho. Maksimalna wulkosć zdźělenki je %d znamješkow."
+
+#: actions/apistatusesupdate.php:198
+msgid "Not found"
+msgstr "Njenamakany"
+
+#: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261
+msgid "Unsupported format."
+msgstr "Njepodpěrany format."
+
+#: actions/apiusershow.php:96
+msgid "Not found."
+msgstr "Njenamakany."
+
+#: actions/attachment.php:73
+msgid "No such attachment."
+msgstr "Přiwěšk njeeksistuje."
+
+#: actions/avatarbynickname.php:59 actions/leavegroup.php:76
+msgid "No nickname."
+msgstr "Žane přimjeno."
+
+#: actions/avatarbynickname.php:64
+msgid "No size."
+msgstr "Žana wulkosć."
+
+#: actions/avatarbynickname.php:69
+msgid "Invalid size."
+msgstr "Njepłaćiwa wulkosć."
+
+#: actions/avatarsettings.php:67 actions/showgroup.php:221
+#: lib/accountsettingsaction.php:112
+msgid "Avatar"
+msgstr "Awatar"
+
+#: actions/avatarsettings.php:78
+#, php-format
+msgid "You can upload your personal avatar. The maximum file size is %s."
+msgstr "Móžeš swój wosobinski awatar nahrać. Maksimalna datajowa wulkosć je %s."
+
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
+#: actions/grouplogo.php:178 actions/remotesubscribe.php:191
+#: actions/userauthorization.php:72 actions/userrss.php:103
+msgid "User without matching profile"
+msgstr "Wužiwar bjez hodźaceho so profila"
+
+#: actions/avatarsettings.php:119 actions/avatarsettings.php:194
+#: actions/grouplogo.php:251
+msgid "Avatar settings"
+msgstr "Nastajenja awatara"
+
+#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/grouplogo.php:199 actions/grouplogo.php:259
+msgid "Original"
+msgstr "Original"
+
+#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/grouplogo.php:210 actions/grouplogo.php:271
+msgid "Preview"
+msgstr "Přehlad"
+
+#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
+#: lib/noticelist.php:550
+msgid "Delete"
+msgstr "Zničić"
+
+#: actions/avatarsettings.php:165 actions/grouplogo.php:233
+msgid "Upload"
+msgstr "Nahrać"
+
+#: actions/avatarsettings.php:360
+msgid "Avatar updated."
+msgstr "Awatar zaktualizowany."
+
+#: actions/avatarsettings.php:387
+msgid "Avatar deleted."
+msgstr "Awatar zničeny."
+
+#: actions/blockedfromgroup.php:73 actions/editgroup.php:84
+#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86
+#: actions/groupmembers.php:76 actions/grouprss.php:91
+#: actions/joingroup.php:76 actions/showgroup.php:121
+msgid "No nickname"
+msgstr "Žane přimjeno"
+
+#: actions/blockedfromgroup.php:80 actions/editgroup.php:96
+#: actions/groupbyid.php:83 actions/groupdesignsettings.php:97
+#: actions/grouplogo.php:99 actions/groupmembers.php:83
+#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137
+msgid "No such group"
+msgstr "Skupina njeeksistuje"
+
+#: actions/block.php:69
+msgid "You already blocked that user."
+msgstr "Sy tutoho wužiwarja hižo zablokował."
+
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
+msgid "Block user"
+msgstr "Wužiwarja blokować"
+
+#: actions/block.php:143 actions/deletenotice.php:145
+#: actions/deleteuser.php:147 actions/groupblock.php:178
+msgid "No"
+msgstr "Ně"
+
+#: actions/block.php:143 actions/deleteuser.php:147
+msgid "Do not block this user"
+msgstr "Tutoho wužiwarja njeblokować"
+
+#: actions/block.php:144 actions/deletenotice.php:146
+#: actions/deleteuser.php:148 actions/groupblock.php:179
+msgid "Yes"
+msgstr "Haj"
+
+#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
+msgid "Block this user"
+msgstr "Tutoho wužiwarja blokować"
+
+#: actions/confirmaddress.php:75
+msgid "No confirmation code."
+msgstr "Žadyn wobkrućenski kod."
+
+#: actions/confirmaddress.php:80
+msgid "Confirmation code not found."
+msgstr "Wobkrućenski kod njenamakany."
+
+#: actions/confirmaddress.php:85
+msgid "That confirmation code is not for you!"
+msgstr "Tutón wobkrućenski kod njeje za tebje!"
+
+#: actions/confirmaddress.php:90
+#, php-format
+msgid "Unrecognized address type %s"
+msgstr "Njespóznany adresowy typ %s"
+
+#: actions/confirmaddress.php:94
+msgid "That address has already been confirmed."
+msgstr "Tuta adresa bu hižo wobkrućena."
+
+#: actions/confirmaddress.php:144
+msgid "Confirm Address"
+msgstr "Adresu wobkrućić"
+
+#: actions/confirmaddress.php:159
+#, php-format
+msgid "The address \"%s\" has been confirmed for your account."
+msgstr "Adresa \"%s\" bu za twoje konto wobkrućena."
+
+#: actions/conversation.php:99
+msgid "Conversation"
+msgstr "Konwersacija"
+
+#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
+#: lib/profileaction.php:206 lib/searchgroupnav.php:82
+msgid "Notices"
+msgstr "Zdźělenki"
+
+#: actions/deletenotice.php:52 actions/shownotice.php:92
+msgid "No such notice."
+msgstr "Zdźělenka njeeksistuje."
+
+#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
+#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
+#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/unsubscribe.php:52 lib/adminpanelaction.php:72
+#: lib/profileformaction.php:63 lib/settingsaction.php:72
+msgid "Not logged in."
+msgstr "Njepřizjewjeny."
+
+#: actions/deletenotice.php:71
+msgid "Can't delete this notice."
+msgstr "Tuta zdźělenka njeda so zničić."
+
+#: actions/deletenotice.php:109 actions/deletenotice.php:141
+msgid "Delete notice"
+msgstr "Zdźělenku wušmórnyć"
+
+#: actions/deletenotice.php:144
+msgid "Are you sure you want to delete this notice?"
+msgstr "Chceš woprawdźe tutu zdźělenku wušmórnyć?"
+
+#: actions/deletenotice.php:145
+msgid "Do not delete this notice"
+msgstr "Tutu zdźělenku njewušmórnyć"
+
+#: actions/deletenotice.php:146 lib/noticelist.php:550
+msgid "Delete this notice"
+msgstr "Tutu zdźělenku wušmórnyć"
+
+#: actions/deleteuser.php:67
+msgid "You cannot delete users."
+msgstr "Njemóžeš wužiwarjow wušmórnyć."
+
+#: actions/deleteuser.php:74
+msgid "You can only delete local users."
+msgstr "Móžeš jenož lokalnych wužiwarjow wušmórnyć."
+
+#: actions/deleteuser.php:110 actions/deleteuser.php:133
+msgid "Delete user"
+msgstr "Wužiwarja wušmórnyć"
+
+#: actions/deleteuser.php:148 lib/deleteuserform.php:77
+msgid "Delete this user"
+msgstr "Tutoho wužiwarja wušmórnyć"
+
+#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124
+#: lib/adminpanelaction.php:302 lib/groupnav.php:119
+msgid "Design"
+msgstr "Design"
+
+#: actions/designadminpanel.php:73
+msgid "Design settings for this StatusNet site."
+msgstr "Designowe nastajenja za tute sydło StatusNet."
+
+#: actions/designadminpanel.php:270
+msgid "Invalid logo URL."
+msgstr "Njepłaćiwy logowy URL."
+
+#: actions/designadminpanel.php:274
+#, php-format
+msgid "Theme not available: %s"
+msgstr "Šat njesteji k dispoziciji: %s"
+
+#: actions/designadminpanel.php:370
+msgid "Change logo"
+msgstr "Logo změnić"
+
+#: actions/designadminpanel.php:375
+msgid "Site logo"
+msgstr "Logo sydła"
+
+#: actions/designadminpanel.php:382
+msgid "Change theme"
+msgstr "Šat změnić"
+
+#: actions/designadminpanel.php:399
+msgid "Site theme"
+msgstr "Šat sydła"
+
+#: actions/designadminpanel.php:400
+msgid "Theme for the site."
+msgstr "Šat za sydło."
+
+#: actions/designadminpanel.php:412 lib/designsettings.php:101
+msgid "Change background image"
+msgstr "Pozadkowy wobraz změnić"
+
+#: actions/designadminpanel.php:417 actions/designadminpanel.php:492
+#: lib/designsettings.php:178
+msgid "Background"
+msgstr "Pozadk"
+
+#: actions/designadminpanel.php:422
+#, php-format
+msgid "You can upload a background image for the site. The maximum file size is %1$s."
+msgstr "Móžeš pozadkowy wobraz za sydło nahrać. Maksimalna datajowa wulkosć je %1$s."
+
+#: actions/designadminpanel.php:452 lib/designsettings.php:139
+msgid "On"
+msgstr "Zapinjeny"
+
+#: actions/designadminpanel.php:468 lib/designsettings.php:155
+msgid "Off"
+msgstr "Wupinjeny"
+
+#: actions/designadminpanel.php:483 lib/designsettings.php:170
+msgid "Change colours"
+msgstr "Barby změnić"
+
+#: actions/designadminpanel.php:505 lib/designsettings.php:191
+msgid "Content"
+msgstr "Wobsah"
+
+#: actions/designadminpanel.php:518 lib/designsettings.php:204
+msgid "Sidebar"
+msgstr "Bóčnica"
+
+#: actions/designadminpanel.php:531 lib/designsettings.php:217
+msgid "Text"
+msgstr "Tekst"
+
+#: actions/designadminpanel.php:544 lib/designsettings.php:230
+msgid "Links"
+msgstr "Wotkazy"
+
+#: actions/designadminpanel.php:572 lib/designsettings.php:247
+msgid "Use defaults"
+msgstr "Standardne hódnoty wužiwać"
+
+#: actions/designadminpanel.php:573 lib/designsettings.php:248
+msgid "Restore default designs"
+msgstr "Standardne designy wobnowić"
+
+#: actions/designadminpanel.php:579 lib/designsettings.php:254
+msgid "Reset back to default"
+msgstr "Na standard wróćo stajić"
+
+#: actions/designadminpanel.php:581 actions/emailsettings.php:195
+#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/pathsadminpanel.php:296 actions/profilesettings.php:167
+#: actions/siteadminpanel.php:421 actions/smssettings.php:181
+#: actions/subscriptions.php:203 actions/tagother.php:154
+#: actions/useradminpanel.php:313 lib/designsettings.php:256
+#: lib/groupeditform.php:202
+msgid "Save"
+msgstr "Składować"
+
+#: actions/designadminpanel.php:582 lib/designsettings.php:257
+msgid "Save design"
+msgstr "Design składować"
+
+#: actions/disfavor.php:81
+msgid "This notice is not a favorite!"
+msgstr "Tuta zdźělenka faworit njeje!"
+
+#: actions/disfavor.php:94
+msgid "Add to favorites"
+msgstr "K faworitam přidać"
+
+#: actions/doc.php:69
+msgid "No such document."
+msgstr "Dokument njeeksistuje."
+
+#: actions/editgroup.php:68 actions/grouplogo.php:70 actions/newgroup.php:65
+msgid "You must be logged in to create a group."
+msgstr "Dyrbiš přizjewjeny być, zo by skupinu wutworił."
+
+#: actions/editgroup.php:103 actions/editgroup.php:168
+#: actions/groupdesignsettings.php:104 actions/grouplogo.php:106
+msgid "You must be an admin to edit the group"
+msgstr "Dyrbiš administrator być, zo by skupinu wobdźěłał."
+
+#: actions/editgroup.php:154
+msgid "Use this form to edit the group."
+msgstr "Wuž tutón formular, zo by skupinu wobdźěłał."
+
+#: actions/editgroup.php:201 actions/newgroup.php:145
+#, php-format
+msgid "description is too long (max %d chars)."
+msgstr "wopisanje je předołho (maks. %d znamješkow)."
+
+#: actions/editgroup.php:253
+msgid "Could not update group."
+msgstr "Skupina njeje so dała aktualizować."
+
+#: actions/editgroup.php:259 classes/User_group.php:390
+msgid "Could not create aliases."
+msgstr "Aliasy njejsu so dali wutworić."
+
+#: actions/editgroup.php:269
+msgid "Options saved."
+msgstr "Opcije składowane."
+
+#: actions/emailsettings.php:60
+msgid "Email Settings"
+msgstr "E-mejlowe nastajenja"
+
+#: actions/emailsettings.php:100 actions/imsettings.php:100
+#: actions/smssettings.php:104
+msgid "Address"
+msgstr "Adresa"
+
+#: actions/emailsettings.php:105
+msgid "Current confirmed email address."
+msgstr "Aktualna wobkrućena e-mejlowa adresa."
+
+#: actions/emailsettings.php:107 actions/emailsettings.php:140
+#: actions/imsettings.php:108 actions/smssettings.php:115
+#: actions/smssettings.php:158
+msgid "Remove"
+msgstr "Wotstronić"
+
+#: actions/emailsettings.php:117 actions/imsettings.php:120
+#: actions/smssettings.php:126
+msgid "Cancel"
+msgstr "Přetorhnyć"
+
+#: actions/emailsettings.php:121
+msgid "Email Address"
+msgstr "E-mejlowa adresa"
+
+#: actions/emailsettings.php:123
+msgid "Email address, like \"UserName@example.org\""
+msgstr "E-mejlowa adresa, kaž na př. \"WužiwarskeMjeno@přikład.org\""
+
+#: actions/emailsettings.php:126 actions/imsettings.php:133
+#: actions/smssettings.php:145
+msgid "Add"
+msgstr "Přidać"
+
+#: actions/emailsettings.php:133 actions/smssettings.php:152
+msgid "Incoming email"
+msgstr "Dochadźaca e-mejl"
+
+#: actions/emailsettings.php:148 actions/smssettings.php:164
+msgid "New"
+msgstr "Nowy"
+
+#: actions/emailsettings.php:153 actions/imsettings.php:139
+#: actions/smssettings.php:169
+msgid "Preferences"
+msgstr "Nastajenja"
+
+#: actions/emailsettings.php:185
+msgid "I want to post notices by email."
+msgstr "Chcu zdźělenki přez e-mejl pósłać."
+
+#: actions/emailsettings.php:191
+msgid "Publish a MicroID for my email address."
+msgstr "MicroID za moju e-mejlowu adresu publikować"
+
+#: actions/emailsettings.php:302 actions/imsettings.php:264
+#: actions/othersettings.php:180 actions/smssettings.php:284
+msgid "Preferences saved."
+msgstr "Nastajenja składowane."
+
+#: actions/emailsettings.php:320
+msgid "No email address."
+msgstr "Žana e-mejlowa adresa."
+
+#: actions/emailsettings.php:331 actions/siteadminpanel.php:158
+msgid "Not a valid email address"
+msgstr "Njeje płaćiwa e-mejlowa adresa"
+
+#: actions/emailsettings.php:334
+msgid "That is already your email address."
+msgstr "To je hižo twoja e-mejlowa adresa."
+
+#: actions/emailsettings.php:337
+msgid "That email address already belongs to another user."
+msgstr "Ta e-mejlowa adresa hižo słuša k druhemu wužiwarjej."
+
+#: actions/emailsettings.php:383 actions/imsettings.php:355
+msgid "That is the wrong IM address."
+msgstr "to je wopačna IM-adresa."
+
+#: actions/emailsettings.php:395 actions/imsettings.php:367
+#: actions/smssettings.php:386
+msgid "Confirmation cancelled."
+msgstr "Wobkrućenje přetorhnjene."
+
+#: actions/emailsettings.php:413
+msgid "That is not your email address."
+msgstr "To njeje twoja e-mejlowa adresa."
+
+#: actions/emailsettings.php:432 actions/imsettings.php:408
+#: actions/smssettings.php:425
+msgid "The address was removed."
+msgstr "Adresa bu wotstronjena."
+
+#: actions/emailsettings.php:446 actions/smssettings.php:518
+msgid "No incoming email address."
+msgstr "Žana adresa za dochadźace e-mejle."
+
+#: actions/emailsettings.php:459 actions/smssettings.php:531
+msgid "Incoming email address removed."
+msgstr "Adresa za dochadźaće e-mejle wotstronjena."
+
+#: actions/emailsettings.php:481 actions/smssettings.php:555
+msgid "New incoming email address added."
+msgstr "Nowa adresa za dochadźace e-mejle přidata."
+
+#: actions/favorited.php:65 lib/popularnoticesection.php:88
+#: lib/publicgroupnav.php:93
+msgid "Popular notices"
+msgstr "Woblubowane zdźělenki"
+
+#: actions/favorited.php:67
+#, php-format
+msgid "Popular notices, page %d"
+msgstr "Woblubowane zdźělenki, strona %d"
+
+#: actions/favor.php:79
+msgid "This notice is already a favorite!"
+msgstr "Tuta zdźělenka je hižo faworit!"
+
+#: actions/file.php:34
+msgid "No notice id"
+msgstr "Žadyn ID zdźělenki"
+
+#: actions/file.php:38
+msgid "No notice"
+msgstr "Žana zdźělenka"
+
+#: actions/file.php:42
+msgid "No attachments"
+msgstr "Žane přiwěški"
+
+#: actions/file.php:51
+msgid "No uploaded attachments"
+msgstr "Žane nahrate přiwěški"
+
+#: actions/finishremotesubscribe.php:69
+msgid "Not expecting this response!"
+msgstr "Njewočakowana wotmołwa!"
+
+#: actions/finishremotesubscribe.php:106
+msgid "You are not authorized."
+msgstr "Njejsy awtorizowany."
+
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86
+#: actions/groupunblock.php:86 actions/leavegroup.php:83
+#: actions/makeadmin.php:86 lib/command.php:212 lib/command.php:263
+msgid "No such group."
+msgstr "Skupina njeeksistuje."
+
+#: actions/getfile.php:75
+msgid "No such file."
+msgstr "Dataja njeeksistuje."
+
+#: actions/getfile.php:79
+msgid "Cannot read file."
+msgstr "Dataja njeda so čitać."
+
+#: actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71 actions/subedit.php:46
+#: lib/profileformaction.php:70
+msgid "No profile specified."
+msgstr "Žadyn profil podaty."
+
+#: actions/groupblock.php:76 actions/groupunblock.php:76
+#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
+#: lib/profileformaction.php:77
+msgid "No profile with that ID."
+msgstr "Žadyn profil z tym ID."
+
+#: actions/groupblock.php:81 actions/groupunblock.php:81
+#: actions/makeadmin.php:81
+msgid "No group specified."
+msgstr "Žana skupina podata."
+
+#: actions/groupblock.php:91
+msgid "Only an admin can block group members."
+msgstr "Jenož administrator móže skupinskich čłonow blokować."
+
+#: actions/groupblock.php:95
+msgid "User is already blocked from group."
+msgstr "Wužiwar je hižo za skupinu zablokowany."
+
+#: actions/groupblock.php:100
+msgid "User is not a member of group."
+msgstr "Wužiwar njeje čłon skupiny."
+
+#: actions/groupblock.php:136 actions/groupmembers.php:314
+msgid "Block user from group"
+msgstr "Wužiwarja za skupinu blokować"
+
+#: actions/groupblock.php:178
+msgid "Do not block this user from this group"
+msgstr "Tutoho wužiwarja za tutu skupinu blokować"
+
+#: actions/groupblock.php:179
+msgid "Block this user from this group"
+msgstr "Tutoho wužiwarja za tutu skupinu blokować"
+
+#: actions/groupbyid.php:74
+msgid "No ID"
+msgstr "Žadyn ID"
+
+#: actions/groupdesignsettings.php:68
+msgid "You must be logged in to edit a group."
+msgstr "Dyrbiš přizjewjeny być, zo by skupinu wobdźěłał."
+
+#: actions/groupdesignsettings.php:141
+msgid "Group design"
+msgstr "Skupinski design"
+
+#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:231
+msgid "Design preferences saved."
+msgstr "Designowe nastajenja składowane."
+
+#: actions/grouplogo.php:139 actions/grouplogo.php:192
+msgid "Group logo"
+msgstr "Skupinske logo"
+
+#: actions/grouplogo.php:150
+#, php-format
+msgid "You can upload a logo image for your group. The maximum file size is %s."
+msgstr "Móžeš logowy wobraz za swoju skupinu nahrać. Maksimalna datajowa wulkosć je %s."
+
+#: actions/grouplogo.php:396
+msgid "Logo updated."
+msgstr "Logo zaktualizowane."
+
+#: actions/groupmembers.php:111
+msgid "A list of the users in this group."
+msgstr "Lisćina wužiwarjow w tutej skupinje."
+
+#: actions/groupmembers.php:175 lib/action.php:440 lib/groupnav.php:107
+msgid "Admin"
+msgstr "Administrator"
+
+#: actions/groupmembers.php:346 lib/blockform.php:69
+msgid "Block"
+msgstr "Blokować"
+
+#: actions/groupmembers.php:473
+msgid "Make this user an admin"
+msgstr "Tutoho wužiwarja k administratorej činić"
+
+#: actions/groupsearch.php:58
+msgid "Group search"
+msgstr "Skupinske pytanje"
+
+#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
+msgid "No results."
+msgstr "Žane wuslědki."
+
+#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
+#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+msgid "Groups"
+msgstr "Skupiny"
+
+#: actions/groups.php:64
+#, php-format
+msgid "Groups, page %d"
+msgstr "Skupiny, strona %d"
+
+#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
+msgid "Create a new group"
+msgstr "Nowu skupinu wutworić"
+
+#: actions/imsettings.php:59
+msgid "IM Settings"
+msgstr "IM-nastajenja"
+
+#: actions/imsettings.php:89
+msgid "IM is not available."
+msgstr "IM k dispoziciji njesteji."
+
+#: actions/imsettings.php:124
+msgid "IM Address"
+msgstr "IM-adresa"
+
+#: actions/imsettings.php:285
+msgid "No Jabber ID."
+msgstr "Žadyn ID Jabber."
+
+#: actions/imsettings.php:296
+msgid "Not a valid Jabber ID"
+msgstr "Njepłaćiwy ID Jabber"
+
+#: actions/imsettings.php:299
+msgid "That is already your Jabber ID."
+msgstr "To je hižo twój ID Jabber."
+
+#: actions/imsettings.php:387
+msgid "That is not your Jabber ID."
+msgstr "To njeje twój ID Jabber."
+
+#: actions/invite.php:39
+msgid "Invites have been disabled."
+msgstr "Přeprošenja buchu znjemóžnjene."
+
+#: actions/invite.php:72
+#, php-format
+msgid "Invalid email address: %s"
+msgstr "Njepłaćiwa e-mejlowa adresa: %s"
+
+#: actions/invite.php:110
+msgid "Invitation(s) sent"
+msgstr "Přeprošenja pósłane"
+
+#: actions/invite.php:112
+msgid "Invite new users"
+msgstr "Nowych wužiwarjow přeprosyć"
+
+#: actions/invite.php:128
+msgid "You are already subscribed to these users:"
+msgstr "Sy tutych wužiwarjow hižo abonował:"
+
+#: actions/invite.php:131 actions/invite.php:139
+#, php-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: actions/invite.php:162
+msgid "Use this form to invite your friends and colleagues to use this service."
+msgstr "Wužij tutón formular, zo by swojich přećelow a kolegow přeprosył, zo bychu tutu słužbu wužiwali."
+
+#: actions/invite.php:187
+msgid "Email addresses"
+msgstr "E-mejlowe adresy"
+
+#: actions/invite.php:189
+msgid "Addresses of friends to invite (one per line)"
+msgstr "Adresy přećelow, kotřiž maja so přeprosyć (jedna na linku)"
+
+#: actions/invite.php:192
+msgid "Personal message"
+msgstr "Wosobinska powěsć"
+
+#: actions/invite.php:194
+msgid "Optionally add a personal message to the invitation."
+msgstr "Wosobinsku powěsć po dobrozdaću přeprošenju přidać."
+
+#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:225
+msgid "Send"
+msgstr "Pósłać"
+
+#: actions/leavegroup.php:60
+msgid "You must be logged in to leave a group."
+msgstr "Dyrbiš přizjewjeny być, zo by skupinu wopušćił."
+
+#: actions/leavegroup.php:90 lib/command.php:268
+msgid "You are not a member of that group."
+msgstr "Njejsy čłon teje skupiny."
+
+#: actions/login.php:79 actions/register.php:137
+msgid "Already logged in."
+msgstr "Hižo přizjewjeny."
+
+#: actions/login.php:143
+msgid "Incorrect username or password."
+msgstr "Wopačne wužiwarske mjeno abo hesło."
+
+#: actions/login.php:149
+msgid "Error setting user. You are probably not authorized."
+msgstr "Zmylk při nastajenju wužiwarja. Snano njejsy awtorizowany."
+
+#: actions/login.php:204 actions/login.php:257 lib/action.php:458
+#: lib/logingroupnav.php:79
+msgid "Login"
+msgstr "Přizjewić"
+
+#: actions/login.php:243
+msgid "Login to site"
+msgstr "Při sydle přizjewić"
+
+#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
+#: lib/groupeditform.php:152 lib/userprofile.php:131
+msgid "Nickname"
+msgstr "Přimjeno"
+
+#: actions/login.php:249 actions/register.php:428
+#: lib/accountsettingsaction.php:116
+msgid "Password"
+msgstr "Hesło"
+
+#: actions/login.php:252 actions/register.php:477
+msgid "Remember me"
+msgstr "Składować"
+
+#: actions/login.php:263
+msgid "Lost or forgotten password?"
+msgstr "Hesło zhubjene abo zabyte?"
+
+#: actions/makeadmin.php:91
+msgid "Only an admin can make another user an admin."
+msgstr "Jenož administrator móže druheho wužiwarja k administratorej činić."
+
+#: actions/makeadmin.php:95
+#, php-format
+msgid "%s is already an admin for group \"%s\"."
+msgstr "%s je hižo administrator za skupinu \"%s\"."
+
+#: actions/microsummary.php:69
+msgid "No current status"
+msgstr "Žadyn aktualny status"
+
+#: actions/newgroup.php:53
+msgid "New group"
+msgstr "Nowa skupina"
+
+#: actions/newgroup.php:110
+msgid "Use this form to create a new group."
+msgstr "Wužij tutón formular, zo by nowu skupinu wutworił."
+
+#: actions/newmessage.php:71 actions/newmessage.php:231
+msgid "New message"
+msgstr "Nowa powěsć"
+
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367
+msgid "You can't send a message to this user."
+msgstr "Njemóžeš tutomu wužiwarju powěsć pósłać."
+
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351
+#: lib/command.php:424
+msgid "No content!"
+msgstr "Žadyn wobsah!"
+
+#: actions/newmessage.php:158
+msgid "No recipient specified."
+msgstr "Žadyn přijimowar podaty."
+
+#: actions/newmessage.php:181
+msgid "Message sent"
+msgstr "Powěsć pósłana"
+
+#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170
+msgid "Ajax Error"
+msgstr "Zmylk Ajax"
+
+#: actions/newnotice.php:69
+msgid "New notice"
+msgstr "Nowa zdźělenka"
+
+#: actions/newnotice.php:206
+msgid "Notice posted"
+msgstr "Zdźělenka wotpósłana"
+
+#: actions/noticesearch.php:78
+msgid "Text search"
+msgstr "Tekstowe pytanje"
+
+#: actions/oembed.php:79 actions/shownotice.php:100
+msgid "Notice has no profile"
+msgstr "Zdźělenka nima profil"
+
+#: actions/oembed.php:160
+msgid "Only "
+msgstr "Jenož "
+
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999
+#: lib/api.php:1027 lib/api.php:1137
+msgid "Not a supported data format."
+msgstr "Njeje podpěrany datowy format."
+
+#: actions/opensearch.php:64
+msgid "People Search"
+msgstr "Ludźi pytać"
+
+#: actions/opensearch.php:67
+msgid "Notice Search"
+msgstr "Zdźělenku pytać"
+
+#: actions/othersettings.php:60
+msgid "Other Settings"
+msgstr "Druhe nastajenja"
+
+#: actions/othersettings.php:71
+msgid "Manage various other options."
+msgstr "Wšelake druhe opcije zrjadować."
+
+#: actions/othersettings.php:108
+msgid " (free service)"
+msgstr " (swobodna słužba)"
+
+#: actions/passwordsettings.php:58
+msgid "Change password"
+msgstr "Hesło změnić"
+
+#: actions/passwordsettings.php:69
+msgid "Change your password."
+msgstr "Změń swoje hesło."
+
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+msgid "Password change"
+msgstr "Hesło změnjene"
+
+#: actions/passwordsettings.php:104
+msgid "Old password"
+msgstr "Stare hesło"
+
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+msgid "New password"
+msgstr "Nowe hesło"
+
+#: actions/passwordsettings.php:109
+msgid "6 or more characters"
+msgstr "6 abo wjace znamješkow"
+
+#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
+#: actions/register.php:432 actions/smssettings.php:134
+msgid "Confirm"
+msgstr "Wobkrućić"
+
+#: actions/passwordsettings.php:117
+msgid "Change"
+msgstr "Změnić"
+
+#: actions/passwordsettings.php:154 actions/register.php:230
+msgid "Password must be 6 or more characters."
+msgstr "Hesło dyrbi 6 abo wjace znamješkow měć."
+
+#: actions/passwordsettings.php:157 actions/register.php:233
+msgid "Passwords don't match."
+msgstr "Hesle so njekryjetej."
+
+#: actions/passwordsettings.php:165
+msgid "Incorrect old password"
+msgstr "Wopačne stare hesło"
+
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+msgid "Password saved."
+msgstr "Hesło składowane."
+
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:308
+msgid "Paths"
+msgstr "Šćežki"
+
+#: actions/pathsadminpanel.php:70
+msgid "Path and server settings for this StatusNet site."
+msgstr "Šćežka a serwerowe nastajenja za tute sydło StatusNet."
+
+#: actions/pathsadminpanel.php:212 actions/siteadminpanel.php:58
+#: lib/adminpanelaction.php:299
+msgid "Site"
+msgstr "Sydło"
+
+#: actions/pathsadminpanel.php:216
+msgid "Path"
+msgstr "Šćežka"
+
+#: actions/pathsadminpanel.php:216
+msgid "Site path"
+msgstr "Sydłowa šćežka"
+
+#: actions/pathsadminpanel.php:220
+msgid "Path to locales"
+msgstr "Šćežka k lokalam"
+
+#: actions/pathsadminpanel.php:220
+msgid "Directory path to locales"
+msgstr "Zapisowa šćežka k lokalam"
+
+#: actions/pathsadminpanel.php:227
+msgid "Theme"
+msgstr "Šat"
+
+#: actions/pathsadminpanel.php:232
+msgid "Theme server"
+msgstr "Šatowy serwer"
+
+#: actions/pathsadminpanel.php:236
+msgid "Theme path"
+msgstr "Šatowa šćežka"
+
+#: actions/pathsadminpanel.php:240
+msgid "Theme directory"
+msgstr "Šatowy zapis"
+
+#: actions/pathsadminpanel.php:247
+msgid "Avatars"
+msgstr "Awatary"
+
+#: actions/pathsadminpanel.php:252
+msgid "Avatar server"
+msgstr "Awatarowy serwer"
+
+#: actions/pathsadminpanel.php:256
+msgid "Avatar path"
+msgstr "Awatarowa šćežka"
+
+#: actions/pathsadminpanel.php:260
+msgid "Avatar directory"
+msgstr "Awatarowy zapis"
+
+#: actions/pathsadminpanel.php:269
+msgid "Backgrounds"
+msgstr "Pozadki"
+
+#: actions/pathsadminpanel.php:273
+msgid "Background server"
+msgstr "Pozadkowy serwer"
+
+#: actions/pathsadminpanel.php:277
+msgid "Background path"
+msgstr "Pozadkowa šćežka"
+
+#: actions/pathsadminpanel.php:281
+msgid "Background directory"
+msgstr "Pozadkowy zapis"
+
+#: actions/pathsadminpanel.php:297
+msgid "Save paths"
+msgstr "Šćežki składować"
+
+#: actions/peoplesearch.php:58
+msgid "People search"
+msgstr "Za ludźimi pytać"
+
+#: actions/postnotice.php:84
+msgid "Invalid notice content"
+msgstr "Njepłaćiwy wobsah zdźělenki"
+
+#: actions/profilesettings.php:60
+msgid "Profile settings"
+msgstr "Profilowe nastajenja"
+
+#: actions/profilesettings.php:99
+msgid "Profile information"
+msgstr "Profilowe informacije"
+
+#: actions/profilesettings.php:111 actions/register.php:447
+#: actions/showgroup.php:247 actions/tagother.php:104
+#: lib/groupeditform.php:157 lib/userprofile.php:149
+msgid "Full name"
+msgstr "Dospołne mjeno"
+
+#: actions/profilesettings.php:115 actions/register.php:452
+#: lib/groupeditform.php:161
+msgid "Homepage"
+msgstr "Startowa strona"
+
+#: actions/profilesettings.php:127 actions/register.php:465
+msgid "Bio"
+msgstr "Biografija"
+
+#: actions/profilesettings.php:132 actions/register.php:470
+#: actions/showgroup.php:256 actions/tagother.php:112
+#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: lib/userprofile.php:164
+msgid "Location"
+msgstr "Městno"
+
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:307
+msgid "Language"
+msgstr "Rěč"
+
+#: actions/profilesettings.php:145
+msgid "Preferred language"
+msgstr "Preferowana rěč"
+
+#: actions/profilesettings.php:154
+msgid "Timezone"
+msgstr "Časowe pasmo"
+
+#: actions/profilesettings.php:221 actions/register.php:223
+#, php-format
+msgid "Bio is too long (max %d chars)."
+msgstr "Biografija je předołha (maks. %d znamješkow)."
+
+#: actions/profilesettings.php:228 actions/siteadminpanel.php:165
+msgid "Timezone not selected."
+msgstr "Časowe pasmo njeje wubrane."
+
+#: actions/profilesettings.php:234
+msgid "Language is too long (max 50 chars)."
+msgstr "Mjeno rěče je předołhe (maks. 50 znamješkow)."
+
+#: actions/profilesettings.php:344 lib/adminpanelaction.php:126
+msgid "Settings saved."
+msgstr "Nastajenja składowane."
+
+#: actions/recoverpassword.php:36
+msgid "You are already logged in!"
+msgstr "Sy hižo přizjewjeny!"
+
+#: actions/recoverpassword.php:158
+msgid "You have been identified. Enter a new password below. "
+msgstr "Sy so identifikował. Zapodaj deleka nowe hesło. "
+
+#: actions/recoverpassword.php:208
+msgid "Reset password"
+msgstr "Hesło wróćo stajić"
+
+#: actions/recoverpassword.php:213
+msgid "Unknown action"
+msgstr "Njeznata akcija"
+
+#: actions/recoverpassword.php:236
+msgid "6 or more characters, and don't forget it!"
+msgstr "6 abo wjace znamješkow, a njezabudź jo!"
+
+#: actions/recoverpassword.php:243
+msgid "Reset"
+msgstr "Wróćo stajić"
+
+#: actions/recoverpassword.php:252
+msgid "Enter a nickname or email address."
+msgstr "Zapodaj přimjeno abo e-mejlowu adresu."
+
+#: actions/recoverpassword.php:272
+msgid "No user with that email address or username."
+msgstr "Wužiwar z tej e-mejlowej adresu abo tym wužiwarskim mjenom njeeksistuje."
+
+#: actions/recoverpassword.php:287
+msgid "No registered email address for that user."
+msgstr "Wužiwar nima žanu zregistrowanu e-mejlowu adresu."
+
+#: actions/recoverpassword.php:352
+msgid "Password must be 6 chars or more."
+msgstr "Hesło dyrbi 6 znamješkow abo wjace měć."
+
+#: actions/register.php:85 actions/register.php:189 actions/register.php:404
+msgid "Sorry, only invited people can register."
+msgstr "Wodaj, jenož přeprošeni ludźo móžeja so registrować."
+
+#: actions/register.php:92
+msgid "Sorry, invalid invitation code."
+msgstr "Wodaj, njepłaćiwy přeprošenski kod."
+
+#: actions/register.php:112
+msgid "Registration successful"
+msgstr "Registrowanje wuspěšne"
+
+#: actions/register.php:114 actions/register.php:502 lib/action.php:455
+#: lib/logingroupnav.php:85
+msgid "Register"
+msgstr "Registrować"
+
+#: actions/register.php:135
+msgid "Registration not allowed."
+msgstr "Registracija njedowolena."
+
+#: actions/register.php:201
+msgid "Not a valid email address."
+msgstr "Njepłaćiwa e-mejlowa adresa."
+
+#: actions/register.php:212
+msgid "Email address already exists."
+msgstr "E-mejlowa adresa hižo eksistuje."
+
+#: actions/register.php:243 actions/register.php:264
+msgid "Invalid username or password."
+msgstr "Njepłaćiwe wužiwarske mjeno abo hesło."
+
+#: actions/register.php:429
+msgid "6 or more characters. Required."
+msgstr "6 abo wjace znamješkow. Trěbne."
+
+#: actions/register.php:433
+msgid "Same as password above. Required."
+msgstr "Jenake kaž hesło horjeka. Trěbne."
+
+#: actions/register.php:437 actions/register.php:441
+#: actions/siteadminpanel.php:283 lib/accountsettingsaction.php:120
+msgid "Email"
+msgstr "E-mejl"
+
+#: actions/register.php:449
+msgid "Longer name, preferably your \"real\" name"
+msgstr "Dlěše mjeno, wosebje twoje \"woprawdźite\" mjeno"
+
+#: actions/register.php:493
+msgid "My text and files are available under "
+msgstr "Mój tekst a moje dataje steja k dispoziciji pod "
+
+#: actions/register.php:495
+msgid "Creative Commons Attribution 3.0"
+msgstr "Creative Commons Attribution 3.0"
+
+#: actions/remotesubscribe.php:129
+msgid "User nickname"
+msgstr "Wužiwarske přimjeno"
+
+#: actions/remotesubscribe.php:133
+msgid "Profile URL"
+msgstr "URL profila"
+
+#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
+#: lib/userprofile.php:365
+msgid "Subscribe"
+msgstr "Abonować"
+
+#: actions/remotesubscribe.php:159
+msgid "Invalid profile URL (bad format)"
+msgstr "Njepłaćiwy profilowy URL (wopačny format)"
+
+#: actions/showgroup.php:218
+msgid "Group profile"
+msgstr "Skupinski profil"
+
+#: actions/showgroup.php:263 actions/tagother.php:118
+#: actions/userauthorization.php:167 lib/userprofile.php:177
+msgid "URL"
+msgstr "URL"
+
+#: actions/showgroup.php:284 lib/groupeditform.php:184
+msgid "Aliases"
+msgstr "Aliasy"
+
+#: actions/showgroup.php:293
+msgid "Group actions"
+msgstr "Skupinske akcije"
+
+#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91
+msgid "Members"
+msgstr "Čłonojo"
+
+#: actions/showgroup.php:386 lib/profileaction.php:117
+#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
+#: lib/tagcloudsection.php:71
+msgid "(None)"
+msgstr "(Žadyn)"
+
+#: actions/showgroup.php:392
+msgid "All members"
+msgstr "Wšitcy čłonojo"
+
+#: actions/showgroup.php:429 lib/profileaction.php:173
+msgid "Statistics"
+msgstr "Statistika"
+
+#: actions/showgroup.php:432
+msgid "Created"
+msgstr "Wutworjeny"
+
+#: actions/showgroup.php:482
+msgid "Admins"
+msgstr "Administratorojo"
+
+#: actions/showmessage.php:81
+msgid "No such message."
+msgstr "Powěsć njeeksistuje."
+
+#: actions/shownotice.php:90
+msgid "Notice deleted."
+msgstr "Zdźělenka zničena."
+
+#: actions/showstream.php:148
+#, php-format
+msgid "FOAF for %s"
+msgstr "FOAF za %s"
+
+#: actions/siteadminpanel.php:173
+#, php-format
+msgid "Unknown language \"%s\""
+msgstr "Njeznata rěč \"%s\""
+
+#: actions/siteadminpanel.php:266
+msgid "General"
+msgstr "Powšitkowny"
+
+#: actions/siteadminpanel.php:269
+msgid "Site name"
+msgstr "Sydłowe mjeno"
+
+#: actions/siteadminpanel.php:290
+msgid "Local"
+msgstr "Lokalny"
+
+#: actions/siteadminpanel.php:301
+msgid "Default timezone"
+msgstr "Standardne časowe pasmo"
+
+#: actions/siteadminpanel.php:308
+msgid "Default site language"
+msgstr "Standardna sydłowa rěč"
+
+#: actions/siteadminpanel.php:316
+msgid "URLs"
+msgstr "URL"
+
+#: actions/siteadminpanel.php:319
+msgid "Server"
+msgstr "Serwer"
+
+#: actions/siteadminpanel.php:331
+msgid "Access"
+msgstr "Přistup"
+
+#: actions/siteadminpanel.php:334
+msgid "Private"
+msgstr "Priwatny"
+
+#: actions/siteadminpanel.php:340
+msgid "Invite only"
+msgstr "Jenož přeprosyć"
+
+#: actions/siteadminpanel.php:346
+msgid "Closed"
+msgstr "Začinjeny"
+
+#: actions/siteadminpanel.php:348
+msgid "Disable new registrations."
+msgstr "Nowe registrowanja znjemóžnić."
+
+#: actions/siteadminpanel.php:359 actions/siteadminpanel.php:383
+msgid "Never"
+msgstr "Ženje"
+
+#: actions/siteadminpanel.php:366
+msgid "Frequency"
+msgstr "Frekwenca"
+
+#: actions/siteadminpanel.php:380
+msgid "SSL"
+msgstr "SSL"
+
+#: actions/siteadminpanel.php:384
+msgid "Sometimes"
+msgstr "Druhdy"
+
+#: actions/siteadminpanel.php:385
+msgid "Always"
+msgstr "Přeco"
+
+#: actions/siteadminpanel.php:387
+msgid "Use SSL"
+msgstr "SSL wužiwać"
+
+#: actions/siteadminpanel.php:393
+msgid "SSL Server"
+msgstr "SSL-serwer"
+
+#: actions/siteadminpanel.php:400
+msgid "Limits"
+msgstr "Limity"
+
+#: actions/siteadminpanel.php:403
+msgid "Text limit"
+msgstr "Tekstowy limit"
+
+#: actions/siteadminpanel.php:403
+msgid "Maximum number of characters for notices."
+msgstr "Maksimalna ličba znamješkow za zdźělenki."
+
+#: actions/siteadminpanel.php:421 actions/useradminpanel.php:313
+msgid "Save site settings"
+msgstr "Sydłowe nastajenja składować"
+
+#: actions/smssettings.php:91
+msgid "SMS is not available."
+msgstr "SMS k dispoziciji njesteji."
+
+#: actions/smssettings.php:306
+msgid "No phone number."
+msgstr "Žane telefonowe čisło."
+
+#: actions/smssettings.php:318
+msgid "That is already your phone number."
+msgstr "To je hižo twoje telefonowe čisło."
+
+#: actions/smssettings.php:321
+msgid "That phone number already belongs to another user."
+msgstr "Te telefonowe čisło hižo druhemu wužiwarjej słuša."
+
+#: actions/smssettings.php:498
+msgid "No code entered"
+msgstr "Žadyn kod zapodaty"
+
+#: actions/subedit.php:70
+msgid "You are not subscribed to that profile."
+msgstr "Njejsy tón profil abonował."
+
+#: actions/subscribe.php:55
+msgid "Not a local user."
+msgstr "Njeje lokalny wužiwar."
+
+#: actions/subscribe.php:69
+msgid "Subscribed"
+msgstr "Abonowany"
+
+#: actions/subscribers.php:50
+#, php-format
+msgid "%s subscribers"
+msgstr "%s abonentow"
+
+#: actions/subscribers.php:52
+#, php-format
+msgid "%s subscribers, page %d"
+msgstr "%s abonentow, strona %d"
+
+#: actions/subscriptions.php:52
+#, php-format
+msgid "%s subscriptions"
+msgstr "%s abonementow"
+
+#: actions/subscriptions.php:54
+#, php-format
+msgid "%s subscriptions, page %d"
+msgstr "%s abonementow, strona %d"
+
+#: actions/subscriptions.php:194
+msgid "Jabber"
+msgstr "Jabber"
+
+#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+msgid "SMS"
+msgstr "SMS"
+
+#: actions/tagother.php:33
+msgid "Not logged in"
+msgstr "Njepřizjewjeny"
+
+#: actions/tagother.php:39
+msgid "No id argument."
+msgstr "Žadyn argument ID."
+
+#: actions/tagother.php:77 lib/userprofile.php:75
+msgid "User profile"
+msgstr "Wužiwarski profil"
+
+#: actions/tagother.php:81 lib/userprofile.php:102
+msgid "Photo"
+msgstr "Foto"
+
+#: actions/unblock.php:59
+msgid "You haven't blocked that user."
+msgstr "Njejsy toho wužiwarja zablokował."
+
+#: actions/unsubscribe.php:98
+msgid "Unsubscribed"
+msgstr "Wotskazany"
+
+#: actions/useradminpanel.php:58 lib/adminpanelaction.php:305
+#: lib/personalgroupnav.php:115
+msgid "User"
+msgstr "Wužiwar"
+
+#: actions/useradminpanel.php:69
+msgid "User settings for this StatusNet site."
+msgstr "Wužiwarske nastajenja za sydło StatusNet."
+
+#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108
+#: lib/personalgroupnav.php:109
+msgid "Profile"
+msgstr "Profil"
+
+#: actions/useradminpanel.php:231
+msgid "New users"
+msgstr "Nowi wužiwarjo"
+
+#: actions/useradminpanel.php:235
+msgid "New user welcome"
+msgstr "Powitanje noweho wužiwarja"
+
+#: actions/useradminpanel.php:236
+msgid "Welcome text for new users (Max 255 chars)."
+msgstr "Powitanski tekst za nowych wužiwarjow (maks. 255 znamješkow)."
+
+#: actions/useradminpanel.php:241
+msgid "Default subscription"
+msgstr "Standardny abonement"
+
+#: actions/useradminpanel.php:251
+msgid "Invitations"
+msgstr "Přeprošenja"
+
+#: actions/useradminpanel.php:256
+msgid "Invitations enabled"
+msgstr "Přeprošenja zmóžnjene"
+
+#: actions/useradminpanel.php:265
+msgid "Sessions"
+msgstr "Posedźenja"
+
+#: actions/useradminpanel.php:270
+msgid "Handle sessions"
+msgstr "Z posedźenjemi wobchadźeć"
+
+#: actions/userauthorization.php:188
+msgid "License"
+msgstr "Licenca"
+
+#: actions/userauthorization.php:209
+msgid "Accept"
+msgstr "Akceptować"
+
+#: actions/userauthorization.php:210 lib/subscribeform.php:115
+#: lib/subscribeform.php:139
+msgid "Subscribe to this user"
+msgstr "Tutoho wužiwarja abonować"
+
+#: actions/userauthorization.php:211
+msgid "Reject"
+msgstr "Wotpokazać"
+
+#: actions/userauthorization.php:212
+msgid "Reject this subscription"
+msgstr "Tutón abonement wotpokazać"
+
+#: actions/userauthorization.php:247
+msgid "Subscription authorized"
+msgstr "Abonement awtorizowany"
+
+#: actions/userauthorization.php:259
+msgid "Subscription rejected"
+msgstr "Abonement wotpokazany"
+
+#: lib/command.php:620
+#, fuzzy
+msgid "You are subscribed to this person:"
+msgid_plural "You are subscribed to these people:"
+# Plural problem
+
+#: lib/command.php:642
+#, fuzzy
+msgid "This person is subscribed to you:"
+msgid_plural "These people are subscribed to you:"
+# Plural problem
+
+#: lib/command.php:664
+#, fuzzy
+msgid "You are a member of this group:"
+msgid_plural "You are a member of these groups:"
+# Plural problem
+
+#: 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/galleryaction.php:131
+msgid "All"
+msgstr "Wšě"
+
+#: lib/groupeditform.php:168
+msgid "Describe the group or topic"
+msgstr "Skupinu abo temu wopisać"
+
+#: lib/groupeditform.php:170
+#, php-format
+msgid "Describe the group or topic in %d characters"
+msgstr "Skupinu abo temu w %d znamješkach wopisać"
+
+#: lib/groupeditform.php:172
+msgid "Description"
+msgstr "Wopisanje"
+
+#: lib/groupnav.php:85
+msgid "Group"
+msgstr "Skupina"
+
+#: lib/groupnav.php:101
+msgid "Blocked"
+msgstr "Blokowany"
+
+#: lib/groupnav.php:113
+msgid "Logo"
+msgstr "Logo"
+
+#: lib/groupsbymemberssection.php:71
+msgid "Groups with most members"
+msgstr "Skupiny z najwjace čłonami"
+
+#: lib/groupsbypostssection.php:71
+msgid "Groups with most posts"
+msgstr "Skupiny z njawjace powěsćemi"
+
+#: lib/imagefile.php:80
+msgid "Partial upload."
+msgstr "Dźělne nahraće."
+
+#: lib/imagefile.php:118
+msgid "Lost our file."
+msgstr "Naša dataja je so zhubiła."
+
+#: lib/imagefile.php:150 lib/imagefile.php:197
+msgid "Unknown file type"
+msgstr "Njeznaty datajowy typ"
+
+#: lib/jabber.php:192
+#, php-format
+msgid "[%s]"
+msgstr "[%s]"
+
+#: lib/leaveform.php:114
+msgid "Leave"
+msgstr "Wopušćić"
+
+#: lib/logingroupnav.php:80
+msgid "Login with a username and password"
+msgstr "Přizjewjenje z wužiwarskim mjenom a hesłom"
+
+#: lib/logingroupnav.php:86
+msgid "Sign up for a new account"
+msgstr "Nowe konto registrować"
+
+#: lib/mailbox.php:227 lib/noticelist.php:452
+msgid "from"
+msgstr "wot"
+
+#: lib/mail.php:172
+msgid "Email address confirmation"
+msgstr "Wobkrućenje e-mejloweje adresy"
+
+#: lib/mail.php:254
+#, php-format
+msgid "Location: %s\n"
+msgstr "Městno: %s\n"
+
+#: lib/mail.php:256
+#, php-format
+msgid "Homepage: %s\n"
+msgstr "Startowa strona: %s\n"
+
+#: lib/mail.php:258
+#, php-format
+msgid "Bio: %s\n\n"
+msgstr "Biografija: %s\n\n"
+
+#: lib/mail.php:439
+msgid "SMS confirmation"
+msgstr "SMS-wobkrućenje"
+
+#: lib/mail.php:510
+#, php-format
+msgid "New private message from %s"
+msgstr "Nowa priwatna powěsć wot %s"
+
+#: lib/mail.php:559
+#, php-format
+msgid "%s (@%s) added your notice as a favorite"
+msgstr "%s (@%s) je twoju zdźělenku jako faworit přidał"
+
+#: lib/mediafile.php:152
+msgid "The uploaded file was only partially uploaded."
+msgstr "Nahrata dataja bu jenož zdźěla nahrata."
+
+#: lib/mediafile.php:159
+msgid "Missing a temporary folder."
+msgstr "Temporerny rjadowka faluje."
+
+#: lib/mediafile.php:275
+#, php-format
+msgid "%s is not a supported filetype on this server."
+msgstr "%s njeje podpěrany datajowy typ na tutym serwerje."
+
+#: lib/messageform.php:120
+msgid "Send a direct notice"
+msgstr "Direktnu zdźělenku pósłać"
+
+#: lib/messageform.php:146
+msgid "To"
+msgstr "Komu"
+
+#: lib/messageform.php:162 lib/noticeform.php:186
+msgid "Available characters"
+msgstr "K dispoziciji stejace znamješka"
+
+#: lib/noticeform.php:158
+msgid "Send a notice"
+msgstr "Zdźělenku pósłać"
+
+#: lib/noticeform.php:193
+msgid "Attach"
+msgstr "Připowěsnyć"
+
+#: lib/noticeform.php:197
+msgid "Attach a file"
+msgstr "Dataju připowěsnyć"
+
+#: lib/noticelist.php:403
+#, php-format
+msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
+msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
+
+#: lib/noticelist.php:404
+msgid "N"
+msgstr "S"
+
+#: lib/noticelist.php:404
+msgid "S"
+msgstr "J"
+
+#: lib/noticelist.php:405
+msgid "E"
+msgstr "W"
+
+#: lib/noticelist.php:405
+msgid "W"
+msgstr "Z"
+
+#: lib/noticelist.php:526
+msgid "Reply to this notice"
+msgstr "Na tutu zdźělenku wotmołwić"
+
+#: lib/noticelist.php:527
+msgid "Reply"
+msgstr "Wotmołwić"
+
+#: lib/oauthstore.php:283
+msgid "Error inserting new profile"
+msgstr "Zmylk při zasunjenju noweho profila"
+
+#: lib/oauthstore.php:291
+msgid "Error inserting avatar"
+msgstr "Zmylk při zasunjenju awatara"
+
+#: lib/oauthstore.php:311
+msgid "Error inserting remote profile"
+msgstr "Zmylk při zasunjenju zdaleneho profila"
+
+#: lib/oauthstore.php:345
+msgid "Duplicate notice"
+msgstr "Dwójna zdźělenka"
+
+#: lib/personalgroupnav.php:99
+msgid "Personal"
+msgstr "Wosobinski"
+
+#: lib/personalgroupnav.php:104
+msgid "Replies"
+msgstr "Wotmołwy"
+
+#: lib/personalgroupnav.php:114
+msgid "Favorites"
+msgstr "Fawority"
+
+#: lib/personalgroupnav.php:125
+msgid "Your incoming messages"
+msgstr "Twoje dochadźace powěsće"
+
+#: lib/personalgroupnav.php:130
+msgid "Your sent messages"
+msgstr "Twoje pósłane powěsće"
+
+#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+msgid "Subscriptions"
+msgstr "Abonementy"
+
+#: lib/profileaction.php:126
+msgid "All subscriptions"
+msgstr "Wšě abonementy"
+
+#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+msgid "Subscribers"
+msgstr "Abonenća"
+
+#: lib/profileaction.php:157
+msgid "All subscribers"
+msgstr "Wšitcy abonenća"
+
+#: lib/profileaction.php:177
+msgid "User ID"
+msgstr "Wužiwarski ID"
+
+#: lib/profileaction.php:182
+msgid "Member since"
+msgstr "Čłon wot"
+
+#: lib/profileaction.php:235
+msgid "All groups"
+msgstr "Wšě skupiny"
+
+#: lib/publicgroupnav.php:78
+msgid "Public"
+msgstr "Zjawny"
+
+#: lib/publicgroupnav.php:82
+msgid "User groups"
+msgstr "Wužiwarske skupiny"
+
+#: lib/publicgroupnav.php:92
+msgid "Popular"
+msgstr "Woblubowany"
+
+#: lib/searchaction.php:120
+msgid "Search site"
+msgstr "Pytanske sydło"
+
+#: lib/searchaction.php:126
+msgid "Keyword(s)"
+msgstr "Klučowe hesła"
+
+#: lib/searchaction.php:162
+msgid "Search help"
+msgstr "Pytanska pomoc"
+
+#: lib/searchgroupnav.php:80
+msgid "People"
+msgstr "Ludźo"
+
+#: lib/searchgroupnav.php:81
+msgid "Find people on this site"
+msgstr "Ludźi na tutym sydle pytać"
+
+#: lib/searchgroupnav.php:83
+msgid "Find content of notices"
+msgstr "Wobsah zdźělenkow přepytać"
+
+#: lib/searchgroupnav.php:85
+msgid "Find groups on this site"
+msgstr "Skupiny na tutym sydle pytać"
+
+#: lib/section.php:89
+msgid "Untitled section"
+msgstr "Wotrězk bjez titula"
+
+#: lib/section.php:106
+msgid "More..."
+msgstr "Wjace..."
+
+#: lib/subscriptionlist.php:126
+msgid "(none)"
+msgstr "(žadyn)"
+
+#: lib/subs.php:52
+msgid "Already subscribed!"
+msgstr "Hižo abonowany!"
+
+#: lib/subs.php:56
+msgid "User has blocked you."
+msgstr "Wužiwar je će zablokował."
+
+#: lib/subs.php:60
+msgid "Could not subscribe."
+msgstr "Abonowanje njebě móžno"
+
+#: lib/subs.php:128
+msgid "Not subscribed!"
+msgstr "Njeje abonowany!"
+
+#: lib/subs.php:140
+msgid "Couldn't delete subscription."
+msgstr "Abonoment njeje so dał zničić."
+
+#: lib/tagcloudsection.php:56
+msgid "None"
+msgstr "Žadyn"
+
+#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
+msgid "Unsubscribe from this user"
+msgstr "Tutoho wužiwarja wotskazać"
+
+#: lib/unsubscribeform.php:137
+msgid "Unsubscribe"
+msgstr "Wotskazać"
+
+#: lib/userprofile.php:116
+msgid "Edit Avatar"
+msgstr "Awatar wobdźěłać"
+
+#: lib/userprofile.php:236
+msgid "User actions"
+msgstr "Wužiwarske akcije"
+
+#: lib/userprofile.php:248
+msgid "Edit profile settings"
+msgstr "Profilowe nastajenja wobdźěłać"
+
+#: lib/userprofile.php:249
+msgid "Edit"
+msgstr "Wobdźěłać"
+
+#: lib/userprofile.php:272
+msgid "Send a direct message to this user"
+msgstr "Tutomu wužiwarja direktnu powěsć pósłać"
+
+#: lib/userprofile.php:273
+msgid "Message"
+msgstr "Powěsć"
+
+#: lib/util.php:825
+msgid "a few seconds ago"
+msgstr "před něšto sekundami"
+
+#: lib/util.php:827
+msgid "about a minute ago"
+msgstr "před něhdźe jednej mjeńšinu"
+
+#: lib/util.php:829
+#, php-format
+msgid "about %d minutes ago"
+msgstr "před %d mjeńšinami"
+
+#: lib/util.php:831
+msgid "about an hour ago"
+msgstr "před něhdźe jednej hodźinu"
+
+#: lib/util.php:833
+#, php-format
+msgid "about %d hours ago"
+msgstr "před něhdźe %d hodźinami"
+
+#: lib/util.php:835
+msgid "about a day ago"
+msgstr "před něhdźe jednym dnjom"
+
+#: lib/util.php:837
+#, php-format
+msgid "about %d days ago"
+msgstr "před něhdźe %d dnjemi"
+
+#: lib/util.php:839
+msgid "about a month ago"
+msgstr "před něhdźe jednym měsacom"
+
+#: lib/util.php:841
+#, php-format
+msgid "about %d months ago"
+msgstr "před něhdźe %d měsacami"
+
+#: lib/util.php:843
+msgid "about a year ago"
+msgstr "před něhdźe jednym lětom"
+
+#: lib/webcolor.php:82
+#, php-format
+msgid "%s is not a valid color!"
+msgstr "%s płaćiwa barba njeje!"
+
+#: lib/webcolor.php:123
+#, php-format
+msgid "%s is not a valid color! Use 3 or 6 hex chars."
+msgstr "%s płaćiwa barba njeje! Wužij 3 heksadecimalne znamješka abo 6 heksadecimalnych znamješkow."
+
+#: scripts/maildaemon.php:53
+msgid "Not a registered user."
+msgstr "Žadyn zregistrowany wužiwar."
+
+#: scripts/maildaemon.php:57
+msgid "Sorry, that is not your incoming email address."
+msgstr "Wodaj, to twoja adresa za dochadźace e-mejle njeje."
+
+#: scripts/maildaemon.php:61
+msgid "Sorry, no incoming email allowed."
+msgstr "Wodaj, dochadźaće e-mejle njejsu dowolene."
+
diff --git a/locale/is/LC_MESSAGES/statusnet.po b/locale/is/LC_MESSAGES/statusnet.po
index 4e5e3292f..5cb39db10 100644
--- a/locale/is/LC_MESSAGES/statusnet.po
+++ b/locale/is/LC_MESSAGES/statusnet.po
@@ -7,12 +7,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-27 23:50+0000\n"
-"PO-Revision-Date: 2009-11-28 19:50:23+0000\n"
+"POT-Creation-Date: 2009-12-02 23:18+0000\n"
+"PO-Revision-Date: 2009-12-02 23:19:52+0000\n"
"Language-Team: Icelandic\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59523); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59683); Translate extension (2009-11-29)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: is\n"
"X-Message-Group: out-statusnet\n"
@@ -569,7 +569,7 @@ msgstr "Skera af"
#: actions/emailsettings.php:238 actions/favor.php:75
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
@@ -741,7 +741,7 @@ msgid "Conversation"
msgstr ""
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:206 lib/searchgroupnav.php:82
+#: lib/profileaction.php:216 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "Babl"
@@ -1255,26 +1255,26 @@ msgstr "Notandi sem verið er að hlusta á er ekki til."
msgid "You can use the local subscription!"
msgstr "Þú getur notað staðbundna áskrift!"
-#: actions/finishremotesubscribe.php:96
+#: actions/finishremotesubscribe.php:99
msgid "That user has blocked you from subscribing."
msgstr "Þessi notandi hefur bannað þér að gerast áskrifandi"
-#: actions/finishremotesubscribe.php:106
+#: actions/finishremotesubscribe.php:110
#, fuzzy
msgid "You are not authorized."
msgstr "Engin heimild."
-#: actions/finishremotesubscribe.php:109
+#: actions/finishremotesubscribe.php:113
#, fuzzy
msgid "Could not convert request token to access token."
msgstr "Gat ekki breytt beiðnistókum í aðgangstóka."
-#: actions/finishremotesubscribe.php:114
+#: actions/finishremotesubscribe.php:118
#, fuzzy
msgid "Remote service uses unknown version of OMB protocol."
msgstr "Óþekkt útgáfa OMB samskiptamátans."
-#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
msgid "Error updating remote profile"
msgstr "Villa kom upp í uppfærslu persónulegrar fjarsíðu"
@@ -1471,8 +1471,8 @@ msgid ""
"action.newgroup%%) yourself!"
msgstr ""
-#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
-#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr "Hópar"
@@ -1801,55 +1801,55 @@ msgstr "%s gekk úr hópnum %s"
msgid "Already logged in."
msgstr "Þú hefur nú þegar skráð þig inn."
-#: actions/login.php:110 actions/login.php:120
+#: actions/login.php:108 actions/login.php:118
#, fuzzy
msgid "Invalid or expired token."
msgstr "Ótækt bablinnihald"
-#: actions/login.php:143
+#: actions/login.php:146
msgid "Incorrect username or password."
msgstr "Rangt notendanafn eða lykilorð."
-#: actions/login.php:149
+#: actions/login.php:152
#, fuzzy
msgid "Error setting user. You are probably not authorized."
msgstr "Engin heimild."
-#: actions/login.php:204 actions/login.php:257 lib/action.php:458
+#: actions/login.php:207 actions/login.php:260 lib/action.php:458
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Innskráning"
-#: actions/login.php:243
+#: actions/login.php:246
msgid "Login to site"
msgstr "Skrá þig inn á síðuna"
-#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/login.php:249 actions/profilesettings.php:106
#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
#: lib/groupeditform.php:152 lib/userprofile.php:131
msgid "Nickname"
msgstr "Stuttnefni"
-#: actions/login.php:249 actions/register.php:428
+#: actions/login.php:252 actions/register.php:428
#: lib/accountsettingsaction.php:116
msgid "Password"
msgstr "Lykilorð"
-#: actions/login.php:252 actions/register.php:477
+#: actions/login.php:255 actions/register.php:477
msgid "Remember me"
msgstr "Muna eftir mér"
-#: actions/login.php:253 actions/register.php:479
+#: actions/login.php:256 actions/register.php:479
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
"Sjálfvirk innskráning í framtíðinni. Ekki nota þetta á tölvu sem aðrir deila "
"með þér!"
-#: actions/login.php:263
+#: actions/login.php:266
msgid "Lost or forgotten password?"
msgstr "Tapað eða gleymt lykilorð?"
-#: actions/login.php:282
+#: actions/login.php:285
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -1857,7 +1857,7 @@ msgstr ""
"Af öryggisástæðum, vinsamlegast sláðu aftur inn notendanafnið þitt og "
"lykilorð áður en þú breytir stillingunum þínum."
-#: actions/login.php:286
+#: actions/login.php:289
#, fuzzy, php-format
msgid ""
"Login with your username and password. Don't have a username yet? [Register]"
@@ -2798,8 +2798,7 @@ msgstr "Ótækt veffang persónulegrar síðu (vitlaust snið)"
#: actions/remotesubscribe.php:168
#, fuzzy
-msgid ""
-"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
msgstr "Ekki tækt veffang á persónulega síðu (ekkert YADIS skjal)."
#: actions/remotesubscribe.php:176
@@ -2981,7 +2980,7 @@ msgid "Members"
msgstr "Meðlimir"
#: actions/showgroup.php:386 lib/profileaction.php:117
-#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
+#: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95
#: lib/tagcloudsection.php:71
msgid "(None)"
msgstr "(Ekkert)"
@@ -2990,7 +2989,7 @@ msgstr "(Ekkert)"
msgid "All members"
msgstr "Allir meðlimir"
-#: actions/showgroup.php:429 lib/profileaction.php:173
+#: actions/showgroup.php:429 lib/profileaction.php:174
msgid "Statistics"
msgstr "Tölfræði"
@@ -4397,50 +4396,40 @@ msgstr "Tilkynningar á."
msgid "Can't turn on notification."
msgstr "Get ekki kveikt á tilkynningum."
-#: lib/command.php:597
-#, fuzzy, php-format
-msgid "Could not create login token for %s"
-msgstr "Gat ekki búið til OpenID eyðublað: %s"
-
-#: lib/command.php:602
-#, php-format
-msgid "This link is useable only once, and is good for only 2 minutes: %s"
-msgstr ""
-
-#: lib/command.php:618
+#: lib/command.php:592
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "Þú ert ekki áskrifandi."
-#: lib/command.php:620
+#: lib/command.php:594
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Þú ert nú þegar í áskrift að þessum notendum:"
msgstr[1] "Þú ert nú þegar í áskrift að þessum notendum:"
-#: lib/command.php:640
+#: lib/command.php:614
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Gat ekki leyft öðrum að gerast áskrifandi að þér."
-#: lib/command.php:642
+#: lib/command.php:616
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Gat ekki leyft öðrum að gerast áskrifandi að þér."
msgstr[1] "Gat ekki leyft öðrum að gerast áskrifandi að þér."
-#: lib/command.php:662
+#: lib/command.php:636
#, fuzzy
msgid "You are not a member of any groups."
msgstr "Þú ert ekki meðlimur í þessum hópi."
-#: lib/command.php:664
+#: lib/command.php:638
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Þú ert ekki meðlimur í þessum hópi."
msgstr[1] "Þú ert ekki meðlimur í þessum hópi."
-#: lib/command.php:678
+#: lib/command.php:652
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4459,7 +4448,6 @@ msgid ""
"reply #<notice_id> - reply to notice with a given id\n"
"reply <nickname> - reply to the last notice from user\n"
"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
"drop <group> - leave group\n"
"stats - get your stats\n"
"stop - same as 'off'\n"
@@ -4703,7 +4691,7 @@ msgstr ""
msgid "kB"
msgstr ""
-#: lib/jabber.php:192
+#: lib/jabber.php:191
#, php-format
msgid "[%s]"
msgstr ""
@@ -5116,7 +5104,7 @@ msgstr "Skilaboð sem þú hefur sent"
msgid "Tags in %s's notices"
msgstr "Merki í babli %s"
-#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr "Áskriftir"
@@ -5124,7 +5112,7 @@ msgstr "Áskriftir"
msgid "All subscriptions"
msgstr "Allar áskriftir"
-#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+#: lib/profileaction.php:140 lib/profileaction.php:201 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr "Áskrifendur"
@@ -5132,15 +5120,15 @@ msgstr "Áskrifendur"
msgid "All subscribers"
msgstr "Allir áskrifendur"
-#: lib/profileaction.php:177
+#: lib/profileaction.php:178
msgid "User ID"
msgstr ""
-#: lib/profileaction.php:182
+#: lib/profileaction.php:183
msgid "Member since"
msgstr "Meðlimur síðan"
-#: lib/profileaction.php:235
+#: lib/profileaction.php:245
msgid "All groups"
msgstr "Allir hópar"
diff --git a/locale/it/LC_MESSAGES/statusnet.po b/locale/it/LC_MESSAGES/statusnet.po
index 68eb98ebc..79b6ef8c0 100644
--- a/locale/it/LC_MESSAGES/statusnet.po
+++ b/locale/it/LC_MESSAGES/statusnet.po
@@ -8,12 +8,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-27 23:50+0000\n"
-"PO-Revision-Date: 2009-11-28 19:50:26+0000\n"
+"POT-Creation-Date: 2009-12-02 23:18+0000\n"
+"PO-Revision-Date: 2009-12-02 23:19:56+0000\n"
"Language-Team: Italian\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59523); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59683); Translate extension (2009-11-29)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: it\n"
"X-Message-Group: out-statusnet\n"
@@ -577,7 +577,7 @@ msgstr "Ritaglia"
#: actions/emailsettings.php:238 actions/favor.php:75
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
@@ -751,7 +751,7 @@ msgid "Conversation"
msgstr "Codice di conferma"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:206 lib/searchgroupnav.php:82
+#: lib/profileaction.php:216 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "Messaggi"
@@ -1281,27 +1281,27 @@ msgstr "L'utente che intendi seguire non esiste."
msgid "You can use the local subscription!"
msgstr "Puoi usare l'abbonamento locale!"
-#: actions/finishremotesubscribe.php:96
+#: actions/finishremotesubscribe.php:99
msgid "That user has blocked you from subscribing."
msgstr "Quell'utente ti ha bloccato dall'abbonarti."
-#: actions/finishremotesubscribe.php:106
+#: actions/finishremotesubscribe.php:110
#, fuzzy
msgid "You are not authorized."
msgstr "Non autorizzato."
-#: actions/finishremotesubscribe.php:109
+#: actions/finishremotesubscribe.php:113
#, fuzzy
msgid "Could not convert request token to access token."
msgstr ""
"Impossibile convertire le credenziali di richiesta in credenziali di accesso."
-#: actions/finishremotesubscribe.php:114
+#: actions/finishremotesubscribe.php:118
#, fuzzy
msgid "Remote service uses unknown version of OMB protocol."
msgstr "Versione del protocollo OMB sconosciuta."
-#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
msgid "Error updating remote profile"
msgstr "Errore nell'aggiornare il profilo remoto"
@@ -1515,8 +1515,8 @@ msgid ""
"action.newgroup%%) yourself!"
msgstr ""
-#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
-#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr "Gruppi"
@@ -1846,53 +1846,53 @@ msgstr "%s ha lasciato il gruppo %s"
msgid "Already logged in."
msgstr "Accesso già effettuato."
-#: actions/login.php:110 actions/login.php:120
+#: actions/login.php:108 actions/login.php:118
#, fuzzy
msgid "Invalid or expired token."
msgstr "Contenuto del messaggio non valido"
-#: actions/login.php:143
+#: actions/login.php:146
msgid "Incorrect username or password."
msgstr "Nome utente o password non corretto."
-#: actions/login.php:149
+#: actions/login.php:152
#, fuzzy
msgid "Error setting user. You are probably not authorized."
msgstr "Non autorizzato."
-#: actions/login.php:204 actions/login.php:257 lib/action.php:458
+#: actions/login.php:207 actions/login.php:260 lib/action.php:458
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Accedi"
-#: actions/login.php:243
+#: actions/login.php:246
msgid "Login to site"
msgstr "Accedi al sito"
-#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/login.php:249 actions/profilesettings.php:106
#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
#: lib/groupeditform.php:152 lib/userprofile.php:131
msgid "Nickname"
msgstr "Soprannome"
-#: actions/login.php:249 actions/register.php:428
+#: actions/login.php:252 actions/register.php:428
#: lib/accountsettingsaction.php:116
msgid "Password"
msgstr "Password"
-#: actions/login.php:252 actions/register.php:477
+#: actions/login.php:255 actions/register.php:477
msgid "Remember me"
msgstr "Ricordami"
-#: actions/login.php:253 actions/register.php:479
+#: actions/login.php:256 actions/register.php:479
msgid "Automatically login in the future; not for shared computers!"
msgstr "Accedi automaticamente in futuro; non per computer condivisi!"
-#: actions/login.php:263
+#: actions/login.php:266
msgid "Lost or forgotten password?"
msgstr "Password persa o dimenticata?"
-#: actions/login.php:282
+#: actions/login.php:285
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -1900,7 +1900,7 @@ msgstr ""
"Per motivi di sicurezza è necessario reinserire il proprio nome utente e la "
"propria password prima di modificare le impostazioni."
-#: actions/login.php:286
+#: actions/login.php:289
#, fuzzy, php-format
msgid ""
"Login with your username and password. Don't have a username yet? [Register]"
@@ -2849,8 +2849,7 @@ msgstr "URL del profilo non valido (formato errato)"
#: actions/remotesubscribe.php:168
#, fuzzy
-msgid ""
-"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
msgstr "Non è un URL di profilo valido (nessun documento YADIS)."
#: actions/remotesubscribe.php:176
@@ -3031,7 +3030,7 @@ msgid "Members"
msgstr "Membri"
#: actions/showgroup.php:386 lib/profileaction.php:117
-#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
+#: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95
#: lib/tagcloudsection.php:71
msgid "(None)"
msgstr "(nessuno)"
@@ -3040,7 +3039,7 @@ msgstr "(nessuno)"
msgid "All members"
msgstr "Tutti i membri"
-#: actions/showgroup.php:429 lib/profileaction.php:173
+#: actions/showgroup.php:429 lib/profileaction.php:174
msgid "Statistics"
msgstr "Statistiche"
@@ -4467,50 +4466,40 @@ msgstr "Notifiche attivate."
msgid "Can't turn on notification."
msgstr "Impossibile attivare le notifiche."
-#: lib/command.php:597
-#, fuzzy, php-format
-msgid "Could not create login token for %s"
-msgstr "Impossibile creare il modulo OpenID: %s"
-
-#: lib/command.php:602
-#, php-format
-msgid "This link is useable only once, and is good for only 2 minutes: %s"
-msgstr ""
-
-#: lib/command.php:618
+#: lib/command.php:592
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "Non sei abbonato a quel profilo."
-#: lib/command.php:620
+#: lib/command.php:594
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Sei già abbonato a questi utenti:"
msgstr[1] "Sei già abbonato a questi utenti:"
-#: lib/command.php:640
+#: lib/command.php:614
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Impossibile abbonare altri a te."
-#: lib/command.php:642
+#: lib/command.php:616
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Impossibile abbonare altri a te."
msgstr[1] "Impossibile abbonare altri a te."
-#: lib/command.php:662
+#: lib/command.php:636
#, fuzzy
msgid "You are not a member of any groups."
msgstr "Non sei un membro di quel gruppo."
-#: lib/command.php:664
+#: lib/command.php:638
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Non sei un membro di quel gruppo."
msgstr[1] "Non sei un membro di quel gruppo."
-#: lib/command.php:678
+#: lib/command.php:652
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4529,7 +4518,6 @@ msgid ""
"reply #<notice_id> - reply to notice with a given id\n"
"reply <nickname> - reply to the last notice from user\n"
"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
"drop <group> - leave group\n"
"stats - get your stats\n"
"stop - same as 'off'\n"
@@ -4774,7 +4762,7 @@ msgstr ""
msgid "kB"
msgstr ""
-#: lib/jabber.php:192
+#: lib/jabber.php:191
#, php-format
msgid "[%s]"
msgstr ""
@@ -5193,7 +5181,7 @@ msgstr "I tuoi messaggi inviati"
msgid "Tags in %s's notices"
msgstr "Etichette nei messaggi di %s"
-#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr "Abbonamenti"
@@ -5201,7 +5189,7 @@ msgstr "Abbonamenti"
msgid "All subscriptions"
msgstr "Tutti gli abbonamenti"
-#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+#: lib/profileaction.php:140 lib/profileaction.php:201 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr "Abbonati"
@@ -5209,16 +5197,16 @@ msgstr "Abbonati"
msgid "All subscribers"
msgstr "Tutti gli abbonati"
-#: lib/profileaction.php:177
+#: lib/profileaction.php:178
#, fuzzy
msgid "User ID"
msgstr "Utente"
-#: lib/profileaction.php:182
+#: lib/profileaction.php:183
msgid "Member since"
msgstr "Membro dal"
-#: lib/profileaction.php:235
+#: lib/profileaction.php:245
msgid "All groups"
msgstr "Tutti i gruppi"
diff --git a/locale/ja/LC_MESSAGES/statusnet.po b/locale/ja/LC_MESSAGES/statusnet.po
index 987282282..5317bc7a3 100644
--- a/locale/ja/LC_MESSAGES/statusnet.po
+++ b/locale/ja/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-27 23:50+0000\n"
-"PO-Revision-Date: 2009-11-28 19:50:28+0000\n"
+"POT-Creation-Date: 2009-12-02 23:18+0000\n"
+"PO-Revision-Date: 2009-12-02 23:19:59+0000\n"
"Language-Team: Japanese\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59523); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59683); Translate extension (2009-11-29)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ja\n"
"X-Message-Group: out-statusnet\n"
@@ -581,7 +581,7 @@ msgstr ""
#: actions/emailsettings.php:238 actions/favor.php:75
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
@@ -756,7 +756,7 @@ msgid "Conversation"
msgstr "確認コード"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:206 lib/searchgroupnav.php:82
+#: lib/profileaction.php:216 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "通知"
@@ -1280,26 +1280,26 @@ msgstr "リストされているユーザは存在しません。"
msgid "You can use the local subscription!"
msgstr "ローカルサブスクリプションを使用可能です!"
-#: actions/finishremotesubscribe.php:96
+#: actions/finishremotesubscribe.php:99
msgid "That user has blocked you from subscribing."
msgstr ""
-#: actions/finishremotesubscribe.php:106
+#: actions/finishremotesubscribe.php:110
#, fuzzy
msgid "You are not authorized."
msgstr "認証されていません。"
-#: actions/finishremotesubscribe.php:109
+#: actions/finishremotesubscribe.php:113
#, fuzzy
msgid "Could not convert request token to access token."
msgstr "リクエストトークンをアクセストークンに変換できません"
-#: actions/finishremotesubscribe.php:114
+#: actions/finishremotesubscribe.php:118
#, fuzzy
msgid "Remote service uses unknown version of OMB protocol."
msgstr "予期せぬ OMB プロトコルのバージョンです。"
-#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
msgid "Error updating remote profile"
msgstr "リモートプロファイル更新エラー"
@@ -1510,8 +1510,8 @@ msgid ""
"action.newgroup%%) yourself!"
msgstr ""
-#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
-#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr ""
@@ -1834,53 +1834,53 @@ msgstr ""
msgid "Already logged in."
msgstr "既にログインしています。"
-#: actions/login.php:110 actions/login.php:120
+#: actions/login.php:108 actions/login.php:118
#, fuzzy
msgid "Invalid or expired token."
msgstr "不正な通知内容"
-#: actions/login.php:143
+#: actions/login.php:146
msgid "Incorrect username or password."
msgstr "ユーザ名またはパスワードが間違っています。"
-#: actions/login.php:149
+#: actions/login.php:152
#, fuzzy
msgid "Error setting user. You are probably not authorized."
msgstr "認証されていません。"
-#: actions/login.php:204 actions/login.php:257 lib/action.php:458
+#: actions/login.php:207 actions/login.php:260 lib/action.php:458
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "ログイン"
-#: actions/login.php:243
+#: actions/login.php:246
msgid "Login to site"
msgstr ""
-#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/login.php:249 actions/profilesettings.php:106
#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
#: lib/groupeditform.php:152 lib/userprofile.php:131
msgid "Nickname"
msgstr "ニックネーム"
-#: actions/login.php:249 actions/register.php:428
+#: actions/login.php:252 actions/register.php:428
#: lib/accountsettingsaction.php:116
msgid "Password"
msgstr "パスワード"
-#: actions/login.php:252 actions/register.php:477
+#: actions/login.php:255 actions/register.php:477
msgid "Remember me"
msgstr "ログイン状態を保持"
-#: actions/login.php:253 actions/register.php:479
+#: actions/login.php:256 actions/register.php:479
msgid "Automatically login in the future; not for shared computers!"
msgstr "以降は自動的にログインする。共用コンピューターでは避けましょう!"
-#: actions/login.php:263
+#: actions/login.php:266
msgid "Lost or forgotten password?"
msgstr "パスワードを紛失、忘れた?"
-#: actions/login.php:282
+#: actions/login.php:285
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -1888,7 +1888,7 @@ msgstr ""
"セキュリティー上の理由により、設定を変更する前にユーザ名とパスワードを入力し"
"て下さい。"
-#: actions/login.php:286
+#: actions/login.php:289
#, php-format
msgid ""
"Login with your username and password. Don't have a username yet? [Register]"
@@ -2821,8 +2821,7 @@ msgstr "不正なプロファイルURL。(形式不備)"
#: actions/remotesubscribe.php:168
#, fuzzy
-msgid ""
-"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
msgstr "有効なプロファイルURLではありません。(XRDSドキュメントが無い)"
#: actions/remotesubscribe.php:176
@@ -3005,7 +3004,7 @@ msgid "Members"
msgstr "からのメンバー"
#: actions/showgroup.php:386 lib/profileaction.php:117
-#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
+#: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95
#: lib/tagcloudsection.php:71
msgid "(None)"
msgstr ""
@@ -3014,7 +3013,7 @@ msgstr ""
msgid "All members"
msgstr ""
-#: actions/showgroup.php:429 lib/profileaction.php:173
+#: actions/showgroup.php:429 lib/profileaction.php:174
msgid "Statistics"
msgstr "統計データ"
@@ -4418,47 +4417,37 @@ msgstr ""
msgid "Can't turn on notification."
msgstr ""
-#: lib/command.php:597
-#, fuzzy, php-format
-msgid "Could not create login token for %s"
-msgstr "OpenIDを作成できません : %s"
-
-#: lib/command.php:602
-#, php-format
-msgid "This link is useable only once, and is good for only 2 minutes: %s"
-msgstr ""
-
-#: lib/command.php:618
+#: lib/command.php:592
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "そのプロファイルは送信されていません。"
-#: lib/command.php:620
+#: lib/command.php:594
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "そのプロファイルは送信されていません。"
-#: lib/command.php:640
+#: lib/command.php:614
#, fuzzy
msgid "No one is subscribed to you."
msgstr "リモートサブスクライブ"
-#: lib/command.php:642
+#: lib/command.php:616
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "リモートサブスクライブ"
-#: lib/command.php:662
+#: lib/command.php:636
#, fuzzy
msgid "You are not a member of any groups."
msgstr "そのプロファイルは送信されていません。"
-#: lib/command.php:664
+#: lib/command.php:638
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "そのプロファイルは送信されていません。"
-#: lib/command.php:678
+#: lib/command.php:652
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4477,7 +4466,6 @@ msgid ""
"reply #<notice_id> - reply to notice with a given id\n"
"reply <nickname> - reply to the last notice from user\n"
"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
"drop <group> - leave group\n"
"stats - get your stats\n"
"stop - same as 'off'\n"
@@ -4723,7 +4711,7 @@ msgstr ""
msgid "kB"
msgstr ""
-#: lib/jabber.php:192
+#: lib/jabber.php:191
#, php-format
msgid "[%s]"
msgstr ""
@@ -5130,7 +5118,7 @@ msgstr ""
msgid "Tags in %s's notices"
msgstr ""
-#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr "サブスクリプション"
@@ -5138,7 +5126,7 @@ msgstr "サブスクリプション"
msgid "All subscriptions"
msgstr "すべての購読"
-#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+#: lib/profileaction.php:140 lib/profileaction.php:201 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr "購読者"
@@ -5147,15 +5135,15 @@ msgstr "購読者"
msgid "All subscribers"
msgstr "購読者"
-#: lib/profileaction.php:177
+#: lib/profileaction.php:178
msgid "User ID"
msgstr ""
-#: lib/profileaction.php:182
+#: lib/profileaction.php:183
msgid "Member since"
msgstr "からのメンバー"
-#: lib/profileaction.php:235
+#: lib/profileaction.php:245
msgid "All groups"
msgstr ""
diff --git a/locale/ko/LC_MESSAGES/statusnet.po b/locale/ko/LC_MESSAGES/statusnet.po
index ed757fbc5..60ac94a30 100644
--- a/locale/ko/LC_MESSAGES/statusnet.po
+++ b/locale/ko/LC_MESSAGES/statusnet.po
@@ -7,12 +7,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-27 23:50+0000\n"
-"PO-Revision-Date: 2009-11-28 19:50:31+0000\n"
+"POT-Creation-Date: 2009-12-02 23:18+0000\n"
+"PO-Revision-Date: 2009-12-02 23:20:03+0000\n"
"Language-Team: Korean\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59523); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59683); Translate extension (2009-11-29)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ko\n"
"X-Message-Group: out-statusnet\n"
@@ -576,7 +576,7 @@ msgstr "자르기"
#: actions/emailsettings.php:238 actions/favor.php:75
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
@@ -750,7 +750,7 @@ msgid "Conversation"
msgstr "인증 코드"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:206 lib/searchgroupnav.php:82
+#: lib/profileaction.php:216 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "통지"
@@ -1275,26 +1275,26 @@ msgstr "살펴 보고 있는 사용자가 없습니다."
msgid "You can use the local subscription!"
msgstr "당신은 로컬 구독을 사용할 수 있습니다."
-#: actions/finishremotesubscribe.php:96
+#: actions/finishremotesubscribe.php:99
msgid "That user has blocked you from subscribing."
msgstr "이 회원은 구독으로부터 당신을 차단해왔다."
-#: actions/finishremotesubscribe.php:106
+#: actions/finishremotesubscribe.php:110
#, fuzzy
msgid "You are not authorized."
msgstr "인증이 되지 않았습니다."
-#: actions/finishremotesubscribe.php:109
+#: actions/finishremotesubscribe.php:113
#, fuzzy
msgid "Could not convert request token to access token."
msgstr "리퀘스트 토큰을 엑세스 토큰으로 변환 할 수 없습니다."
-#: actions/finishremotesubscribe.php:114
+#: actions/finishremotesubscribe.php:118
#, fuzzy
msgid "Remote service uses unknown version of OMB protocol."
msgstr "OMB 프로토콜의 알려지지 않은 버전"
-#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
msgid "Error updating remote profile"
msgstr "리모트 프로필 업데이트 오류"
@@ -1508,8 +1508,8 @@ msgid ""
"action.newgroup%%) yourself!"
msgstr ""
-#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
-#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr "그룹"
@@ -1827,60 +1827,60 @@ msgstr "%s가 그룹%s를 떠났습니다."
msgid "Already logged in."
msgstr "이미 로그인 하셨습니다."
-#: actions/login.php:110 actions/login.php:120
+#: actions/login.php:108 actions/login.php:118
#, fuzzy
msgid "Invalid or expired token."
msgstr "옳지 않은 통지 내용"
-#: actions/login.php:143
+#: actions/login.php:146
msgid "Incorrect username or password."
msgstr "틀린 계정 또는 비밀 번호"
-#: actions/login.php:149
+#: actions/login.php:152
#, fuzzy
msgid "Error setting user. You are probably not authorized."
msgstr "인증이 되지 않았습니다."
-#: actions/login.php:204 actions/login.php:257 lib/action.php:458
+#: actions/login.php:207 actions/login.php:260 lib/action.php:458
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "로그인"
-#: actions/login.php:243
+#: actions/login.php:246
msgid "Login to site"
msgstr "사이트에 로그인하세요."
-#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/login.php:249 actions/profilesettings.php:106
#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
#: lib/groupeditform.php:152 lib/userprofile.php:131
msgid "Nickname"
msgstr "별명"
-#: actions/login.php:249 actions/register.php:428
+#: actions/login.php:252 actions/register.php:428
#: lib/accountsettingsaction.php:116
msgid "Password"
msgstr "비밀 번호"
-#: actions/login.php:252 actions/register.php:477
+#: actions/login.php:255 actions/register.php:477
msgid "Remember me"
msgstr "자동 로그인"
-#: actions/login.php:253 actions/register.php:479
+#: actions/login.php:256 actions/register.php:479
msgid "Automatically login in the future; not for shared computers!"
msgstr "앞으로는 자동으로 로그인합니다. 공용 컴퓨터에서는 이용하지 마십시오!"
-#: actions/login.php:263
+#: actions/login.php:266
msgid "Lost or forgotten password?"
msgstr "비밀 번호를 잊으셨나요?"
-#: actions/login.php:282
+#: actions/login.php:285
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
msgstr ""
"보안을 위해 세팅을 저장하기 전에 계정과 비밀 번호를 다시 입력 해 주십시오."
-#: actions/login.php:286
+#: actions/login.php:289
#, fuzzy, php-format
msgid ""
"Login with your username and password. Don't have a username yet? [Register]"
@@ -2819,8 +2819,7 @@ msgstr "옳지 않은 프로필 URL (나쁜 포멧)"
#: actions/remotesubscribe.php:168
#, fuzzy
-msgid ""
-"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
msgstr "유효한 프로필 URL이 아닙니다. (YADIS 문서가 없습니다)"
#: actions/remotesubscribe.php:176
@@ -3001,7 +3000,7 @@ msgid "Members"
msgstr "회원"
#: actions/showgroup.php:386 lib/profileaction.php:117
-#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
+#: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95
#: lib/tagcloudsection.php:71
msgid "(None)"
msgstr "(없습니다.)"
@@ -3010,7 +3009,7 @@ msgstr "(없습니다.)"
msgid "All members"
msgstr "모든 회원"
-#: actions/showgroup.php:429 lib/profileaction.php:173
+#: actions/showgroup.php:429 lib/profileaction.php:174
msgid "Statistics"
msgstr "통계"
@@ -4429,47 +4428,37 @@ msgstr "알림이 켜졌습니다."
msgid "Can't turn on notification."
msgstr "알림을 켤 수 없습니다."
-#: lib/command.php:597
-#, fuzzy, php-format
-msgid "Could not create login token for %s"
-msgstr "OpenID를 작성 할 수 없습니다 : %s"
-
-#: lib/command.php:602
-#, php-format
-msgid "This link is useable only once, and is good for only 2 minutes: %s"
-msgstr ""
-
-#: lib/command.php:618
+#: lib/command.php:592
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "당신은 이 프로필에 구독되지 않고있습니다."
-#: lib/command.php:620
+#: lib/command.php:594
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "당신은 다음 사용자를 이미 구독하고 있습니다."
-#: lib/command.php:640
+#: lib/command.php:614
#, fuzzy
msgid "No one is subscribed to you."
msgstr "다른 사람을 구독 하실 수 없습니다."
-#: lib/command.php:642
+#: lib/command.php:616
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "다른 사람을 구독 하실 수 없습니다."
-#: lib/command.php:662
+#: lib/command.php:636
#, fuzzy
msgid "You are not a member of any groups."
msgstr "당신은 해당 그룹의 멤버가 아닙니다."
-#: lib/command.php:664
+#: lib/command.php:638
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "당신은 해당 그룹의 멤버가 아닙니다."
-#: lib/command.php:678
+#: lib/command.php:652
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4488,7 +4477,6 @@ msgid ""
"reply #<notice_id> - reply to notice with a given id\n"
"reply <nickname> - reply to the last notice from user\n"
"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
"drop <group> - leave group\n"
"stats - get your stats\n"
"stop - same as 'off'\n"
@@ -4733,7 +4721,7 @@ msgstr ""
msgid "kB"
msgstr ""
-#: lib/jabber.php:192
+#: lib/jabber.php:191
#, php-format
msgid "[%s]"
msgstr ""
@@ -5144,7 +5132,7 @@ msgstr "당신의 보낸 메시지들"
msgid "Tags in %s's notices"
msgstr "%s의 게시글의 태그"
-#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr "구독"
@@ -5152,7 +5140,7 @@ msgstr "구독"
msgid "All subscriptions"
msgstr "모든 예약 구독"
-#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+#: lib/profileaction.php:140 lib/profileaction.php:201 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr "구독자"
@@ -5160,16 +5148,16 @@ msgstr "구독자"
msgid "All subscribers"
msgstr "모든 구독자"
-#: lib/profileaction.php:177
+#: lib/profileaction.php:178
#, fuzzy
msgid "User ID"
msgstr "이용자"
-#: lib/profileaction.php:182
+#: lib/profileaction.php:183
msgid "Member since"
msgstr "가입한 때"
-#: lib/profileaction.php:235
+#: lib/profileaction.php:245
msgid "All groups"
msgstr "모든 그룹"
diff --git a/locale/mk/LC_MESSAGES/statusnet.po b/locale/mk/LC_MESSAGES/statusnet.po
index 1bf7e3ef1..94511070d 100644
--- a/locale/mk/LC_MESSAGES/statusnet.po
+++ b/locale/mk/LC_MESSAGES/statusnet.po
@@ -8,12 +8,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-27 23:50+0000\n"
-"PO-Revision-Date: 2009-11-28 19:50:34+0000\n"
+"POT-Creation-Date: 2009-12-02 23:18+0000\n"
+"PO-Revision-Date: 2009-12-02 23:20:07+0000\n"
"Language-Team: Macedonian\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59523); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59683); Translate extension (2009-11-29)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: mk\n"
"X-Message-Group: out-statusnet\n"
@@ -574,7 +574,7 @@ msgstr ""
#: actions/emailsettings.php:238 actions/favor.php:75
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
@@ -750,7 +750,7 @@ msgid "Conversation"
msgstr "Локација"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:206 lib/searchgroupnav.php:82
+#: lib/profileaction.php:216 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "Известувања"
@@ -1268,26 +1268,26 @@ msgstr "Корисникот кој го следите не постои."
msgid "You can use the local subscription!"
msgstr "Може да ја користите локалната претплата."
-#: actions/finishremotesubscribe.php:96
+#: actions/finishremotesubscribe.php:99
msgid "That user has blocked you from subscribing."
msgstr ""
-#: actions/finishremotesubscribe.php:106
+#: actions/finishremotesubscribe.php:110
#, fuzzy
msgid "You are not authorized."
msgstr "Не е одобрено."
-#: actions/finishremotesubscribe.php:109
+#: actions/finishremotesubscribe.php:113
#, fuzzy
msgid "Could not convert request token to access token."
msgstr "Белезите за барање не може да се конвертираат во белези за пристап."
-#: actions/finishremotesubscribe.php:114
+#: actions/finishremotesubscribe.php:118
#, fuzzy
msgid "Remote service uses unknown version of OMB protocol."
msgstr "Непозната верзија на протоколот OMB."
-#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
msgid "Error updating remote profile"
msgstr "Грешка во освежувањето на оддалечениот профил"
@@ -1498,8 +1498,8 @@ msgid ""
"action.newgroup%%) yourself!"
msgstr ""
-#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
-#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr ""
@@ -1798,54 +1798,54 @@ msgstr ""
msgid "Already logged in."
msgstr "Веќе сте најавени."
-#: actions/login.php:110 actions/login.php:120
+#: actions/login.php:108 actions/login.php:118
#, fuzzy
msgid "Invalid or expired token."
msgstr "Неправилна содржина за известување"
-#: actions/login.php:143
+#: actions/login.php:146
msgid "Incorrect username or password."
msgstr "Неточно корисничко име или лозинка"
-#: actions/login.php:149
+#: actions/login.php:152
#, fuzzy
msgid "Error setting user. You are probably not authorized."
msgstr "Не е одобрено."
-#: actions/login.php:204 actions/login.php:257 lib/action.php:458
+#: actions/login.php:207 actions/login.php:260 lib/action.php:458
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Пријави се"
-#: actions/login.php:243
+#: actions/login.php:246
msgid "Login to site"
msgstr ""
-#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/login.php:249 actions/profilesettings.php:106
#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
#: lib/groupeditform.php:152 lib/userprofile.php:131
msgid "Nickname"
msgstr "Прекар"
-#: actions/login.php:249 actions/register.php:428
+#: actions/login.php:252 actions/register.php:428
#: lib/accountsettingsaction.php:116
msgid "Password"
msgstr "Лозинка"
-#: actions/login.php:252 actions/register.php:477
+#: actions/login.php:255 actions/register.php:477
msgid "Remember me"
msgstr "Запамети ме"
-#: actions/login.php:253 actions/register.php:479
+#: actions/login.php:256 actions/register.php:479
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
"Следниот пат најавете се автоматски; не за компјутери кои ги делите со други!"
-#: actions/login.php:263
+#: actions/login.php:266
msgid "Lost or forgotten password?"
msgstr "Загубена или заборавена лозинка?"
-#: actions/login.php:282
+#: actions/login.php:285
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -1853,7 +1853,7 @@ msgstr ""
"Поради безбедносни причини треба повторно да го внесете Вашето корисничко "
"име и лозинка пред да ги смените Вашите поставки."
-#: actions/login.php:286
+#: actions/login.php:289
#, fuzzy, php-format
msgid ""
"Login with your username and password. Don't have a username yet? [Register]"
@@ -2781,8 +2781,7 @@ msgstr "Неправилно URL на профил (лош формат)"
#: actions/remotesubscribe.php:168
#, fuzzy
-msgid ""
-"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
msgstr "Неправилно URL на профил (нема YADIS документ)."
#: actions/remotesubscribe.php:176
@@ -2965,7 +2964,7 @@ msgid "Members"
msgstr "Член од"
#: actions/showgroup.php:386 lib/profileaction.php:117
-#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
+#: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95
#: lib/tagcloudsection.php:71
msgid "(None)"
msgstr ""
@@ -2974,7 +2973,7 @@ msgstr ""
msgid "All members"
msgstr ""
-#: actions/showgroup.php:429 lib/profileaction.php:173
+#: actions/showgroup.php:429 lib/profileaction.php:174
msgid "Statistics"
msgstr "Статистика"
@@ -4387,50 +4386,40 @@ msgstr ""
msgid "Can't turn on notification."
msgstr ""
-#: lib/command.php:597
-#, fuzzy, php-format
-msgid "Could not create login token for %s"
-msgstr "OpenID формуларот не може да се креира:%s"
-
-#: lib/command.php:602
-#, php-format
-msgid "This link is useable only once, and is good for only 2 minutes: %s"
-msgstr ""
-
-#: lib/command.php:618
+#: lib/command.php:592
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "Не ни го испративте тој профил."
-#: lib/command.php:620
+#: lib/command.php:594
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Не ни го испративте тој профил."
msgstr[1] "Не ни го испративте тој профил."
-#: lib/command.php:640
+#: lib/command.php:614
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Оддалечена претплата"
-#: lib/command.php:642
+#: lib/command.php:616
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Оддалечена претплата"
msgstr[1] "Оддалечена претплата"
-#: lib/command.php:662
+#: lib/command.php:636
#, fuzzy
msgid "You are not a member of any groups."
msgstr "Не ни го испративте тој профил."
-#: lib/command.php:664
+#: lib/command.php:638
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Не ни го испративте тој профил."
msgstr[1] "Не ни го испративте тој профил."
-#: lib/command.php:678
+#: lib/command.php:652
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4449,7 +4438,6 @@ msgid ""
"reply #<notice_id> - reply to notice with a given id\n"
"reply <nickname> - reply to the last notice from user\n"
"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
"drop <group> - leave group\n"
"stats - get your stats\n"
"stop - same as 'off'\n"
@@ -4698,7 +4686,7 @@ msgstr ""
msgid "kB"
msgstr ""
-#: lib/jabber.php:192
+#: lib/jabber.php:191
#, php-format
msgid "[%s]"
msgstr ""
@@ -5111,7 +5099,7 @@ msgstr ""
msgid "Tags in %s's notices"
msgstr ""
-#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr "Претплати"
@@ -5119,7 +5107,7 @@ msgstr "Претплати"
msgid "All subscriptions"
msgstr "Сите претплати"
-#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+#: lib/profileaction.php:140 lib/profileaction.php:201 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr "Претплатници"
@@ -5128,15 +5116,15 @@ msgstr "Претплатници"
msgid "All subscribers"
msgstr "Претплатници"
-#: lib/profileaction.php:177
+#: lib/profileaction.php:178
msgid "User ID"
msgstr ""
-#: lib/profileaction.php:182
+#: lib/profileaction.php:183
msgid "Member since"
msgstr "Член од"
-#: lib/profileaction.php:235
+#: lib/profileaction.php:245
msgid "All groups"
msgstr ""
diff --git a/locale/nb/LC_MESSAGES/statusnet.po b/locale/nb/LC_MESSAGES/statusnet.po
index ee5126aaa..e6eb1e5d1 100644
--- a/locale/nb/LC_MESSAGES/statusnet.po
+++ b/locale/nb/LC_MESSAGES/statusnet.po
@@ -7,12 +7,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-27 23:50+0000\n"
-"PO-Revision-Date: 2009-11-28 19:50:37+0000\n"
+"POT-Creation-Date: 2009-12-02 23:18+0000\n"
+"PO-Revision-Date: 2009-12-02 23:20:10+0000\n"
"Language-Team: Norwegian (bokmål)‬\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59523); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59683); Translate extension (2009-11-29)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: no\n"
"X-Message-Group: out-statusnet\n"
@@ -572,7 +572,7 @@ msgstr ""
#: actions/emailsettings.php:238 actions/favor.php:75
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
@@ -745,7 +745,7 @@ msgid "Conversation"
msgstr "Bekreftelseskode"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:206 lib/searchgroupnav.php:82
+#: lib/profileaction.php:216 lib/searchgroupnav.php:82
msgid "Notices"
msgstr ""
@@ -1264,24 +1264,24 @@ msgstr ""
msgid "You can use the local subscription!"
msgstr ""
-#: actions/finishremotesubscribe.php:96
+#: actions/finishremotesubscribe.php:99
msgid "That user has blocked you from subscribing."
msgstr ""
-#: actions/finishremotesubscribe.php:106
+#: actions/finishremotesubscribe.php:110
#, fuzzy
msgid "You are not authorized."
msgstr "Ikke autorisert."
-#: actions/finishremotesubscribe.php:109
+#: actions/finishremotesubscribe.php:113
msgid "Could not convert request token to access token."
msgstr ""
-#: actions/finishremotesubscribe.php:114
+#: actions/finishremotesubscribe.php:118
msgid "Remote service uses unknown version of OMB protocol."
msgstr ""
-#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
msgid "Error updating remote profile"
msgstr ""
@@ -1483,8 +1483,8 @@ msgid ""
"action.newgroup%%) yourself!"
msgstr ""
-#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
-#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr ""
@@ -1795,59 +1795,59 @@ msgstr ""
msgid "Already logged in."
msgstr "Allerede innlogget."
-#: actions/login.php:110 actions/login.php:120
+#: actions/login.php:108 actions/login.php:118
msgid "Invalid or expired token."
msgstr ""
-#: actions/login.php:143
+#: actions/login.php:146
msgid "Incorrect username or password."
msgstr "Feil brukernavn eller passord"
-#: actions/login.php:149
+#: actions/login.php:152
#, fuzzy
msgid "Error setting user. You are probably not authorized."
msgstr "Ikke autorisert."
-#: actions/login.php:204 actions/login.php:257 lib/action.php:458
+#: actions/login.php:207 actions/login.php:260 lib/action.php:458
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Logg inn"
-#: actions/login.php:243
+#: actions/login.php:246
msgid "Login to site"
msgstr ""
-#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/login.php:249 actions/profilesettings.php:106
#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
#: lib/groupeditform.php:152 lib/userprofile.php:131
msgid "Nickname"
msgstr "Nick"
-#: actions/login.php:249 actions/register.php:428
+#: actions/login.php:252 actions/register.php:428
#: lib/accountsettingsaction.php:116
msgid "Password"
msgstr "Passord"
-#: actions/login.php:252 actions/register.php:477
+#: actions/login.php:255 actions/register.php:477
msgid "Remember me"
msgstr "Husk meg"
-#: actions/login.php:253 actions/register.php:479
+#: actions/login.php:256 actions/register.php:479
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
"Logg inn automatisk i framtiden. Ikke for datamaskiner du deler med andre!"
-#: actions/login.php:263
+#: actions/login.php:266
msgid "Lost or forgotten password?"
msgstr "Mistet eller glemt passordet?"
-#: actions/login.php:282
+#: actions/login.php:285
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
msgstr ""
-#: actions/login.php:286
+#: actions/login.php:289
#, php-format
msgid ""
"Login with your username and password. Don't have a username yet? [Register]"
@@ -2767,8 +2767,7 @@ msgid "Invalid profile URL (bad format)"
msgstr ""
#: actions/remotesubscribe.php:168
-msgid ""
-"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
msgstr ""
#: actions/remotesubscribe.php:176
@@ -2949,7 +2948,7 @@ msgid "Members"
msgstr "Medlem siden"
#: actions/showgroup.php:386 lib/profileaction.php:117
-#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
+#: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95
#: lib/tagcloudsection.php:71
msgid "(None)"
msgstr ""
@@ -2958,7 +2957,7 @@ msgstr ""
msgid "All members"
msgstr ""
-#: actions/showgroup.php:429 lib/profileaction.php:173
+#: actions/showgroup.php:429 lib/profileaction.php:174
msgid "Statistics"
msgstr "Statistikk"
@@ -4331,50 +4330,40 @@ msgstr ""
msgid "Can't turn on notification."
msgstr ""
-#: lib/command.php:597
-#, fuzzy, php-format
-msgid "Could not create login token for %s"
-msgstr "Klarte ikke å lagre avatar-informasjonen"
-
-#: lib/command.php:602
-#, php-format
-msgid "This link is useable only once, and is good for only 2 minutes: %s"
-msgstr ""
-
-#: lib/command.php:618
+#: lib/command.php:592
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "Ikke autorisert."
-#: lib/command.php:620
+#: lib/command.php:594
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Ikke autorisert."
msgstr[1] "Ikke autorisert."
-#: lib/command.php:640
+#: lib/command.php:614
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Svar til %s"
-#: lib/command.php:642
+#: lib/command.php:616
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Svar til %s"
msgstr[1] "Svar til %s"
-#: lib/command.php:662
+#: lib/command.php:636
#, fuzzy
msgid "You are not a member of any groups."
msgstr "Du er allerede logget inn!"
-#: lib/command.php:664
+#: lib/command.php:638
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Du er allerede logget inn!"
msgstr[1] "Du er allerede logget inn!"
-#: lib/command.php:678
+#: lib/command.php:652
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4393,7 +4382,6 @@ msgid ""
"reply #<notice_id> - reply to notice with a given id\n"
"reply <nickname> - reply to the last notice from user\n"
"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
"drop <group> - leave group\n"
"stats - get your stats\n"
"stop - same as 'off'\n"
@@ -4640,7 +4628,7 @@ msgstr ""
msgid "kB"
msgstr ""
-#: lib/jabber.php:192
+#: lib/jabber.php:191
#, php-format
msgid "[%s]"
msgstr ""
@@ -5051,7 +5039,7 @@ msgstr ""
msgid "Tags in %s's notices"
msgstr ""
-#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr ""
@@ -5059,7 +5047,7 @@ msgstr ""
msgid "All subscriptions"
msgstr "Alle abonnementer"
-#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+#: lib/profileaction.php:140 lib/profileaction.php:201 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr ""
@@ -5068,15 +5056,15 @@ msgstr ""
msgid "All subscribers"
msgstr "Alle abonnementer"
-#: lib/profileaction.php:177
+#: lib/profileaction.php:178
msgid "User ID"
msgstr ""
-#: lib/profileaction.php:182
+#: lib/profileaction.php:183
msgid "Member since"
msgstr "Medlem siden"
-#: lib/profileaction.php:235
+#: lib/profileaction.php:245
msgid "All groups"
msgstr ""
diff --git a/locale/nl/LC_MESSAGES/statusnet.po b/locale/nl/LC_MESSAGES/statusnet.po
index bb3f44d55..e9c4ef9e7 100644
--- a/locale/nl/LC_MESSAGES/statusnet.po
+++ b/locale/nl/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-27 23:50+0000\n"
-"PO-Revision-Date: 2009-11-28 19:50:42+0000\n"
+"POT-Creation-Date: 2009-12-02 23:18+0000\n"
+"PO-Revision-Date: 2009-12-02 23:20:26+0000\n"
"Language-Team: Dutch\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59523); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59683); Translate extension (2009-11-29)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: nl\n"
"X-Message-Group: out-statusnet\n"
@@ -582,7 +582,7 @@ msgstr "Uitsnijden"
#: actions/emailsettings.php:238 actions/favor.php:75
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
@@ -755,7 +755,7 @@ msgid "Conversation"
msgstr "Dialoog"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:206 lib/searchgroupnav.php:82
+#: lib/profileaction.php:216 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "Mededelingen"
@@ -1275,26 +1275,26 @@ msgstr "De gebruiker waarnaar wordt geluisterd bestaat niet."
msgid "You can use the local subscription!"
msgstr "U kunt het lokale abonnement gebruiken!"
-#: actions/finishremotesubscribe.php:96
+#: actions/finishremotesubscribe.php:99
msgid "That user has blocked you from subscribing."
msgstr ""
"Die gebruiker heeft de mogelijkheid om te abonneren voor u geblokkeerd."
-#: actions/finishremotesubscribe.php:106
+#: actions/finishremotesubscribe.php:110
msgid "You are not authorized."
msgstr "U hebt niet de juiste toegangsrechten."
-#: actions/finishremotesubscribe.php:109
+#: actions/finishremotesubscribe.php:113
msgid "Could not convert request token to access token."
msgstr ""
"Het was niet mogelijk het verzoektoken te converteren naar een toegangstoken."
-#: actions/finishremotesubscribe.php:114
+#: actions/finishremotesubscribe.php:118
msgid "Remote service uses unknown version of OMB protocol."
msgstr ""
"De diensten op afstand gebruiken een onbekende versie van het OMB-protocol."
-#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
msgid "Error updating remote profile"
msgstr ""
"Er is een fout opgetreden tijdens het bijwerken van het profiel op afstand."
@@ -1506,8 +1506,8 @@ msgstr ""
"U kunt een [gebruiker registreren](%%action.register%%) en de groep zelf "
"[aanmaken](%%action.newgroup%%)!"
-#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
-#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr "Groepen"
@@ -1842,53 +1842,53 @@ msgstr "%s heeft de groep %s verlaten"
msgid "Already logged in."
msgstr "U bent al aangemeld."
-#: actions/login.php:110 actions/login.php:120
+#: actions/login.php:108 actions/login.php:118
msgid "Invalid or expired token."
msgstr "Het token is ongeldig of verlopen."
-#: actions/login.php:143
+#: actions/login.php:146
msgid "Incorrect username or password."
msgstr "De gebruikersnaam of wachtwoord is onjuist."
-#: actions/login.php:149
+#: actions/login.php:152
msgid "Error setting user. You are probably not authorized."
msgstr ""
"Er is een fout opgetreden bij het maken van de instellingen. U hebt "
"waarschijnlijk niet de juiste rechten."
-#: actions/login.php:204 actions/login.php:257 lib/action.php:458
+#: actions/login.php:207 actions/login.php:260 lib/action.php:458
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Aanmelden"
-#: actions/login.php:243
+#: actions/login.php:246
msgid "Login to site"
msgstr "Aanmelden"
-#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/login.php:249 actions/profilesettings.php:106
#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
#: lib/groupeditform.php:152 lib/userprofile.php:131
msgid "Nickname"
msgstr "Gebruikersnaam"
-#: actions/login.php:249 actions/register.php:428
+#: actions/login.php:252 actions/register.php:428
#: lib/accountsettingsaction.php:116
msgid "Password"
msgstr "Wachtwoord"
-#: actions/login.php:252 actions/register.php:477
+#: actions/login.php:255 actions/register.php:477
msgid "Remember me"
msgstr "Aanmeldgegevens onthouden"
-#: actions/login.php:253 actions/register.php:479
+#: actions/login.php:256 actions/register.php:479
msgid "Automatically login in the future; not for shared computers!"
msgstr "Voortaan automatisch aanmelden. Niet gebruiken op gedeelde computers!"
-#: actions/login.php:263
+#: actions/login.php:266
msgid "Lost or forgotten password?"
msgstr "Wachtwoord kwijt of vergeten?"
-#: actions/login.php:282
+#: actions/login.php:285
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -1896,7 +1896,7 @@ msgstr ""
"Om veiligheidsredenen moet u uw gebruikersnaam en wachtwoord nogmaals "
"invoeren alvorens u uw instellingen kunt wijzigen."
-#: actions/login.php:286
+#: actions/login.php:289
#, php-format
msgid ""
"Login with your username and password. Don't have a username yet? [Register]"
@@ -2854,8 +2854,8 @@ msgid "Invalid profile URL (bad format)"
msgstr "Ongeldige profiel-URL (foutieve opmaak)"
#: actions/remotesubscribe.php:168
-msgid ""
-"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+#, fuzzy
+msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
msgstr ""
"De URL voor het profiel is niet geldig (het is geen YADIS-document of er is "
"geen of ongeldige XRDS gedefinieerd)."
@@ -3049,7 +3049,7 @@ msgid "Members"
msgstr "Leden"
#: actions/showgroup.php:386 lib/profileaction.php:117
-#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
+#: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95
#: lib/tagcloudsection.php:71
msgid "(None)"
msgstr "(geen)"
@@ -3058,7 +3058,7 @@ msgstr "(geen)"
msgid "All members"
msgstr "Alle leden"
-#: actions/showgroup.php:429 lib/profileaction.php:173
+#: actions/showgroup.php:429 lib/profileaction.php:174
msgid "Statistics"
msgstr "Statistieken"
@@ -4132,7 +4132,7 @@ msgstr "Primaire sitenavigatie"
#: lib/action.php:431
msgid "Home"
-msgstr "Thuispagina"
+msgstr "Start"
#: lib/action.php:431
msgid "Personal profile and friends timeline"
@@ -4492,49 +4492,38 @@ msgstr "Notificaties ingeschakeld."
msgid "Can't turn on notification."
msgstr "Het is niet mogelijk de notificatie uit te schakelen."
-#: lib/command.php:597
-#, php-format
-msgid "Could not create login token for %s"
-msgstr "Het was niet mogelijk een aanmeldtoken aan te maken voor %s"
-
-#: lib/command.php:602
-#, php-format
-msgid "This link is useable only once, and is good for only 2 minutes: %s"
-msgstr ""
-"Deze verwijzing kan slechts één keer gebruikt worden en is twee minuten "
-"geldig: %s"
-
-#: lib/command.php:618
+#: lib/command.php:592
msgid "You are not subscribed to anyone."
msgstr "U bent op geen enkele gebruiker geabonneerd."
-#: lib/command.php:620
+#: lib/command.php:594
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "U bent geabonneerd op deze gebruiker:"
msgstr[1] "U bent geabonneerd op deze gebruikers:"
-#: lib/command.php:640
+#: lib/command.php:614
msgid "No one is subscribed to you."
msgstr "Niemand heeft een abonnenment op u."
-#: lib/command.php:642
+#: lib/command.php:616
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Deze gebruiker is op u geabonneerd:"
msgstr[1] "Deze gebruikers zijn op u geabonneerd:"
-#: lib/command.php:662
+#: lib/command.php:636
msgid "You are not a member of any groups."
msgstr "U bent lid van geen enkele groep."
-#: lib/command.php:664
+#: lib/command.php:638
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "U bent lid van deze groep:"
msgstr[1] "U bent lid van deze groepen:"
-#: lib/command.php:678
+#: lib/command.php:652
+#, fuzzy
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4553,7 +4542,6 @@ msgid ""
"reply #<notice_id> - reply to notice with a given id\n"
"reply <nickname> - reply to the last notice from user\n"
"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
"drop <group> - leave group\n"
"stats - get your stats\n"
"stop - same as 'off'\n"
@@ -4833,7 +4821,7 @@ msgstr "MB"
msgid "kB"
msgstr "kB"
-#: lib/jabber.php:192
+#: lib/jabber.php:191
#, php-format
msgid "[%s]"
msgstr "[%s]"
@@ -5327,7 +5315,7 @@ msgstr "Uw verzonden berichten"
msgid "Tags in %s's notices"
msgstr "Labels in de mededelingen van %s"
-#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr "Abonnementen"
@@ -5335,7 +5323,7 @@ msgstr "Abonnementen"
msgid "All subscriptions"
msgstr "Alle abonnementen"
-#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+#: lib/profileaction.php:140 lib/profileaction.php:201 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr "Abonnees"
@@ -5343,15 +5331,15 @@ msgstr "Abonnees"
msgid "All subscribers"
msgstr "Alle abonnees"
-#: lib/profileaction.php:177
+#: lib/profileaction.php:178
msgid "User ID"
msgstr "Gebruikers-ID"
-#: lib/profileaction.php:182
+#: lib/profileaction.php:183
msgid "Member since"
msgstr "Lid sinds"
-#: lib/profileaction.php:235
+#: lib/profileaction.php:245
msgid "All groups"
msgstr "Alle groepen"
diff --git a/locale/nn/LC_MESSAGES/statusnet.po b/locale/nn/LC_MESSAGES/statusnet.po
index 625b5725e..fdae960a3 100644
--- a/locale/nn/LC_MESSAGES/statusnet.po
+++ b/locale/nn/LC_MESSAGES/statusnet.po
@@ -7,12 +7,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-27 23:50+0000\n"
-"PO-Revision-Date: 2009-11-28 19:50:39+0000\n"
+"POT-Creation-Date: 2009-12-02 23:18+0000\n"
+"PO-Revision-Date: 2009-12-02 23:20:13+0000\n"
"Language-Team: Norwegian Nynorsk\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59523); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59683); Translate extension (2009-11-29)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: nn\n"
"X-Message-Group: out-statusnet\n"
@@ -574,7 +574,7 @@ msgstr "Skaler"
#: actions/emailsettings.php:238 actions/favor.php:75
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
@@ -748,7 +748,7 @@ msgid "Conversation"
msgstr "Stadfestingskode"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:206 lib/searchgroupnav.php:82
+#: lib/profileaction.php:216 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "Notisar"
@@ -1275,26 +1275,26 @@ msgstr "Brukaren du lyttar til eksisterer ikkje."
msgid "You can use the local subscription!"
msgstr "Du kan nytta det lokale abonnementet!"
-#: actions/finishremotesubscribe.php:96
+#: actions/finishremotesubscribe.php:99
msgid "That user has blocked you from subscribing."
msgstr "Brukaren tillet deg ikkje å tinga meldingane sine."
-#: actions/finishremotesubscribe.php:106
+#: actions/finishremotesubscribe.php:110
#, fuzzy
msgid "You are not authorized."
msgstr "Ikkje autorisert."
-#: actions/finishremotesubscribe.php:109
+#: actions/finishremotesubscribe.php:113
#, fuzzy
msgid "Could not convert request token to access token."
msgstr "Kan ikkje konvertera spyrjebillett til tilgongsbillett."
-#: actions/finishremotesubscribe.php:114
+#: actions/finishremotesubscribe.php:118
#, fuzzy
msgid "Remote service uses unknown version of OMB protocol."
msgstr "Ukjend versjon av OMB-protokollen."
-#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
msgid "Error updating remote profile"
msgstr "Feil ved oppdatering av ekstern profil"
@@ -1508,8 +1508,8 @@ msgid ""
"action.newgroup%%) yourself!"
msgstr ""
-#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
-#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr "Grupper"
@@ -1829,53 +1829,53 @@ msgstr "%s forlot %s gruppa"
msgid "Already logged in."
msgstr "Allereie logga inn."
-#: actions/login.php:110 actions/login.php:120
+#: actions/login.php:108 actions/login.php:118
#, fuzzy
msgid "Invalid or expired token."
msgstr "Ugyldig notisinnhald"
-#: actions/login.php:143
+#: actions/login.php:146
msgid "Incorrect username or password."
msgstr "Feil brukarnamn eller passord"
-#: actions/login.php:149
+#: actions/login.php:152
#, fuzzy
msgid "Error setting user. You are probably not authorized."
msgstr "Ikkje autorisert."
-#: actions/login.php:204 actions/login.php:257 lib/action.php:458
+#: actions/login.php:207 actions/login.php:260 lib/action.php:458
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Logg inn"
-#: actions/login.php:243
+#: actions/login.php:246
msgid "Login to site"
msgstr "Logg inn "
-#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/login.php:249 actions/profilesettings.php:106
#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
#: lib/groupeditform.php:152 lib/userprofile.php:131
msgid "Nickname"
msgstr "Kallenamn"
-#: actions/login.php:249 actions/register.php:428
+#: actions/login.php:252 actions/register.php:428
#: lib/accountsettingsaction.php:116
msgid "Password"
msgstr "Passord"
-#: actions/login.php:252 actions/register.php:477
+#: actions/login.php:255 actions/register.php:477
msgid "Remember me"
msgstr "Hugs meg"
-#: actions/login.php:253 actions/register.php:479
+#: actions/login.php:256 actions/register.php:479
msgid "Automatically login in the future; not for shared computers!"
msgstr "Logg inn automatisk i framtidi (ikkje for delte maskiner)."
-#: actions/login.php:263
+#: actions/login.php:266
msgid "Lost or forgotten password?"
msgstr "Mista eller gløymd passord?"
-#: actions/login.php:282
+#: actions/login.php:285
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -1883,7 +1883,7 @@ msgstr ""
"Skriv inn brukarnam og passord før du endrar innstillingar (av "
"tryggleiksomsyn)."
-#: actions/login.php:286
+#: actions/login.php:289
#, fuzzy, php-format
msgid ""
"Login with your username and password. Don't have a username yet? [Register]"
@@ -2832,8 +2832,7 @@ msgstr "Ugyldig profil-nettadresse (feil format)"
#: actions/remotesubscribe.php:168
#, fuzzy
-msgid ""
-"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
msgstr "Ikkje ein brukande profil-netadresse (ingen YADIS-dokument)."
#: actions/remotesubscribe.php:176
@@ -3014,7 +3013,7 @@ msgid "Members"
msgstr "Medlemmar"
#: actions/showgroup.php:386 lib/profileaction.php:117
-#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
+#: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95
#: lib/tagcloudsection.php:71
msgid "(None)"
msgstr "(Ingen)"
@@ -3023,7 +3022,7 @@ msgstr "(Ingen)"
msgid "All members"
msgstr "Alle medlemmar"
-#: actions/showgroup.php:429 lib/profileaction.php:173
+#: actions/showgroup.php:429 lib/profileaction.php:174
msgid "Statistics"
msgstr "Statistikk"
@@ -4446,50 +4445,40 @@ msgstr "Notifikasjon på."
msgid "Can't turn on notification."
msgstr "Kan ikkje slå på notifikasjon."
-#: lib/command.php:597
-#, fuzzy, php-format
-msgid "Could not create login token for %s"
-msgstr "Kunne ikkje laga OpenID-form: %s"
-
-#: lib/command.php:602
-#, php-format
-msgid "This link is useable only once, and is good for only 2 minutes: %s"
-msgstr ""
-
-#: lib/command.php:618
+#: lib/command.php:592
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "Du tingar ikkje oppdateringar til den profilen."
-#: lib/command.php:620
+#: lib/command.php:594
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Du tingar allereie oppdatering frå desse brukarane:"
msgstr[1] "Du tingar allereie oppdatering frå desse brukarane:"
-#: lib/command.php:640
+#: lib/command.php:614
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Kan ikkje tinga andre til deg."
-#: lib/command.php:642
+#: lib/command.php:616
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Kan ikkje tinga andre til deg."
msgstr[1] "Kan ikkje tinga andre til deg."
-#: lib/command.php:662
+#: lib/command.php:636
#, fuzzy
msgid "You are not a member of any groups."
msgstr "Du er ikkje medlem av den gruppa."
-#: lib/command.php:664
+#: lib/command.php:638
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Du er ikkje medlem av den gruppa."
msgstr[1] "Du er ikkje medlem av den gruppa."
-#: lib/command.php:678
+#: lib/command.php:652
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4508,7 +4497,6 @@ msgid ""
"reply #<notice_id> - reply to notice with a given id\n"
"reply <nickname> - reply to the last notice from user\n"
"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
"drop <group> - leave group\n"
"stats - get your stats\n"
"stop - same as 'off'\n"
@@ -4753,7 +4741,7 @@ msgstr ""
msgid "kB"
msgstr ""
-#: lib/jabber.php:192
+#: lib/jabber.php:191
#, php-format
msgid "[%s]"
msgstr ""
@@ -5171,7 +5159,7 @@ msgstr "Dine sende meldingar"
msgid "Tags in %s's notices"
msgstr "Merkelappar i %s sine notisar"
-#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr "Tingingar"
@@ -5179,7 +5167,7 @@ msgstr "Tingingar"
msgid "All subscriptions"
msgstr "Alle tingingar"
-#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+#: lib/profileaction.php:140 lib/profileaction.php:201 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr "Tingarar"
@@ -5187,16 +5175,16 @@ msgstr "Tingarar"
msgid "All subscribers"
msgstr "Tingarar"
-#: lib/profileaction.php:177
+#: lib/profileaction.php:178
#, fuzzy
msgid "User ID"
msgstr "Brukar"
-#: lib/profileaction.php:182
+#: lib/profileaction.php:183
msgid "Member since"
msgstr "Medlem sidan"
-#: lib/profileaction.php:235
+#: lib/profileaction.php:245
msgid "All groups"
msgstr "Alle gruppar"
diff --git a/locale/pl/LC_MESSAGES/statusnet.po b/locale/pl/LC_MESSAGES/statusnet.po
index a5220f6e0..62d92064c 100644
--- a/locale/pl/LC_MESSAGES/statusnet.po
+++ b/locale/pl/LC_MESSAGES/statusnet.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-27 23:50+0000\n"
-"PO-Revision-Date: 2009-11-28 19:50:45+0000\n"
+"POT-Creation-Date: 2009-12-02 23:18+0000\n"
+"PO-Revision-Date: 2009-12-02 23:20:31+0000\n"
"Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
"Language-Team: Polish <pl@li.org>\n"
"MIME-Version: 1.0\n"
@@ -18,7 +18,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
"|| n%100>=20) ? 1 : 2);\n"
-"X-Generator: MediaWiki 1.16alpha(r59523); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59683); Translate extension (2009-11-29)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: pl\n"
"X-Message-Group: out-statusnet\n"
@@ -576,7 +576,7 @@ msgstr "Przytnij"
#: actions/emailsettings.php:238 actions/favor.php:75
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
@@ -746,7 +746,7 @@ msgid "Conversation"
msgstr "Rozmowa"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:206 lib/searchgroupnav.php:82
+#: lib/profileaction.php:216 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "Wpisy"
@@ -1260,23 +1260,23 @@ msgstr "Nasłuchiwany użytkownik nie istnieje."
msgid "You can use the local subscription!"
msgstr "Można używać lokalnej subskrypcji."
-#: actions/finishremotesubscribe.php:96
+#: actions/finishremotesubscribe.php:99
msgid "That user has blocked you from subscribing."
msgstr "Ten użytkownik zablokował cię z subskrypcji."
-#: actions/finishremotesubscribe.php:106
+#: actions/finishremotesubscribe.php:110
msgid "You are not authorized."
msgstr "Brak upoważnienia."
-#: actions/finishremotesubscribe.php:109
+#: actions/finishremotesubscribe.php:113
msgid "Could not convert request token to access token."
msgstr "Nie można przekonwertować tokenów żądań na tokeny dostępu."
-#: actions/finishremotesubscribe.php:114
+#: actions/finishremotesubscribe.php:118
msgid "Remote service uses unknown version of OMB protocol."
msgstr "Zdalna usługa używa nieznanej wersji protokołu OMB."
-#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
msgid "Error updating remote profile"
msgstr "Błąd podczas aktualizowania zdalnego profilu"
@@ -1480,8 +1480,8 @@ msgstr ""
"Dlaczego nie [zarejestrujesz konta](%%action.register%%) i sam [utworzysz "
"grupę](%%action.newgroup%%)."
-#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
-#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr "Grupy"
@@ -1813,53 +1813,53 @@ msgstr "Użytkownik %s opuścił grupę %s"
msgid "Already logged in."
msgstr "Jesteś już zalogowany."
-#: actions/login.php:110 actions/login.php:120
+#: actions/login.php:108 actions/login.php:118
msgid "Invalid or expired token."
msgstr "Nieprawidłowy lub wygasły token."
-#: actions/login.php:143
+#: actions/login.php:146
msgid "Incorrect username or password."
msgstr "Niepoprawna nazwa użytkownika lub hasło."
-#: actions/login.php:149
+#: actions/login.php:152
msgid "Error setting user. You are probably not authorized."
msgstr "Błąd podczas ustawiania użytkownika. Prawdopodobnie brak upoważnienia."
-#: actions/login.php:204 actions/login.php:257 lib/action.php:458
+#: actions/login.php:207 actions/login.php:260 lib/action.php:458
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Zaloguj się"
-#: actions/login.php:243
+#: actions/login.php:246
msgid "Login to site"
msgstr "Zaloguj się na stronie"
-#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/login.php:249 actions/profilesettings.php:106
#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
#: lib/groupeditform.php:152 lib/userprofile.php:131
msgid "Nickname"
msgstr "Pseudonim"
-#: actions/login.php:249 actions/register.php:428
+#: actions/login.php:252 actions/register.php:428
#: lib/accountsettingsaction.php:116
msgid "Password"
msgstr "Hasło"
-#: actions/login.php:252 actions/register.php:477
+#: actions/login.php:255 actions/register.php:477
msgid "Remember me"
msgstr "Zapamiętaj mnie"
-#: actions/login.php:253 actions/register.php:479
+#: actions/login.php:256 actions/register.php:479
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
"Automatyczne logowanie. Nie należy używać na komputerach używanych przez "
"wiele osób."
-#: actions/login.php:263
+#: actions/login.php:266
msgid "Lost or forgotten password?"
msgstr "Zgubione lub zapomniane hasło?"
-#: actions/login.php:282
+#: actions/login.php:285
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -1867,7 +1867,7 @@ msgstr ""
"Z powodów bezpieczeństwa ponownie podaj nazwę użytkownika i hasło przed "
"zmienianiem ustawień."
-#: actions/login.php:286
+#: actions/login.php:289
#, php-format
msgid ""
"Login with your username and password. Don't have a username yet? [Register]"
@@ -2815,8 +2815,8 @@ msgid "Invalid profile URL (bad format)"
msgstr "Nieprawidłowy adres URL profilu (błędny format)"
#: actions/remotesubscribe.php:168
-msgid ""
-"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+#, fuzzy
+msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
msgstr ""
"To nie jest prawidłowy adres URL profilu (brak dokumentu YADIS lub określono "
"nieprawidłowe XRDS)."
@@ -3009,7 +3009,7 @@ msgid "Members"
msgstr "Członkowie"
#: actions/showgroup.php:386 lib/profileaction.php:117
-#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
+#: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95
#: lib/tagcloudsection.php:71
msgid "(None)"
msgstr "(Brak)"
@@ -3018,7 +3018,7 @@ msgstr "(Brak)"
msgid "All members"
msgstr "Wszyscy członkowie"
-#: actions/showgroup.php:429 lib/profileaction.php:173
+#: actions/showgroup.php:429 lib/profileaction.php:174
msgid "Statistics"
msgstr "Statystyki"
@@ -4432,52 +4432,41 @@ msgstr "Włączono powiadomienia."
msgid "Can't turn on notification."
msgstr "Nie można włączyć powiadomień."
-#: lib/command.php:597
-#, php-format
-msgid "Could not create login token for %s"
-msgstr "Nie można utworzyć tokenu logowania dla %s"
-
-#: lib/command.php:602
-#, php-format
-msgid "This link is useable only once, and is good for only 2 minutes: %s"
-msgstr ""
-"Ten odnośnik można użyć tylko raz i będzie prawidłowy tylko przez dwie "
-"minuty: %s"
-
-#: lib/command.php:618
+#: lib/command.php:592
msgid "You are not subscribed to anyone."
msgstr "Nie subskrybujesz nikogo."
-#: lib/command.php:620
+#: lib/command.php:594
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Subskrybujesz tę osobę:"
msgstr[1] "Subskrybujesz te osoby:"
msgstr[2] "Subskrybujesz te osoby:"
-#: lib/command.php:640
+#: lib/command.php:614
msgid "No one is subscribed to you."
msgstr "Nikt cię nie subskrybuje."
-#: lib/command.php:642
+#: lib/command.php:616
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Ta osoba cię subskrybuje:"
msgstr[1] "Te osoby cię subskrybują:"
msgstr[2] "Te osoby cię subskrybują:"
-#: lib/command.php:662
+#: lib/command.php:636
msgid "You are not a member of any groups."
msgstr "Nie jesteś członkiem żadnej grupy."
-#: lib/command.php:664
+#: lib/command.php:638
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Jesteś członkiem tej grupy:"
msgstr[1] "Jesteś członkiem tych grup:"
msgstr[2] "Jesteś członkiem tych grup:"
-#: lib/command.php:678
+#: lib/command.php:652
+#, fuzzy
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4496,7 +4485,6 @@ msgid ""
"reply #<notice_id> - reply to notice with a given id\n"
"reply <nickname> - reply to the last notice from user\n"
"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
"drop <group> - leave group\n"
"stats - get your stats\n"
"stop - same as 'off'\n"
@@ -4774,7 +4762,7 @@ msgstr "MB"
msgid "kB"
msgstr "KB"
-#: lib/jabber.php:192
+#: lib/jabber.php:191
#, php-format
msgid "[%s]"
msgstr "[%s]"
@@ -5262,7 +5250,7 @@ msgstr "Wysłane wiadomości"
msgid "Tags in %s's notices"
msgstr "Znaczniki we wpisach użytkownika %s"
-#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr "Subskrypcje"
@@ -5270,7 +5258,7 @@ msgstr "Subskrypcje"
msgid "All subscriptions"
msgstr "Wszystkie subskrypcje"
-#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+#: lib/profileaction.php:140 lib/profileaction.php:201 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr "Subskrybenci"
@@ -5278,15 +5266,15 @@ msgstr "Subskrybenci"
msgid "All subscribers"
msgstr "Wszyscy subskrybenci"
-#: lib/profileaction.php:177
+#: lib/profileaction.php:178
msgid "User ID"
msgstr "Identyfikator użytkownika"
-#: lib/profileaction.php:182
+#: lib/profileaction.php:183
msgid "Member since"
msgstr "Członek od"
-#: lib/profileaction.php:235
+#: lib/profileaction.php:245
msgid "All groups"
msgstr "Wszystkie grupy"
diff --git a/locale/pt/LC_MESSAGES/statusnet.po b/locale/pt/LC_MESSAGES/statusnet.po
index 0a2598f59..c5b3c9515 100644
--- a/locale/pt/LC_MESSAGES/statusnet.po
+++ b/locale/pt/LC_MESSAGES/statusnet.po
@@ -8,12 +8,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-27 23:50+0000\n"
-"PO-Revision-Date: 2009-11-28 19:50:48+0000\n"
+"POT-Creation-Date: 2009-12-02 23:18+0000\n"
+"PO-Revision-Date: 2009-12-02 23:20:35+0000\n"
"Language-Team: Portuguese\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59523); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59683); Translate extension (2009-11-29)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: pt\n"
"X-Message-Group: out-statusnet\n"
@@ -291,7 +291,7 @@ msgstr "Não pode deixar de seguir-se a si próprio!"
#: actions/apifriendshipsexists.php:94
msgid "Two user ids or screen_names must be supplied."
-msgstr ""
+msgstr "Devem ser fornecidos dois nomes de utilizador ou alcunhas."
#: actions/apifriendshipsshow.php:135
msgid "Could not determine source user."
@@ -451,7 +451,7 @@ msgstr "Formato não suportado."
#: actions/apitimelinefavorites.php:107
#, php-format
msgid "%s / Favorites from %s"
-msgstr ""
+msgstr "%s / Favoritas de %s"
#: actions/apitimelinefavorites.php:119
#, php-format
@@ -568,7 +568,7 @@ msgstr "Cortar"
#: actions/emailsettings.php:238 actions/favor.php:75
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
@@ -739,7 +739,7 @@ msgid "Conversation"
msgstr "Conversação"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:206 lib/searchgroupnav.php:82
+#: lib/profileaction.php:216 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "Notas"
@@ -883,7 +883,7 @@ msgstr ""
#: actions/designadminpanel.php:474 lib/designsettings.php:161
msgid "Tile background image"
-msgstr ""
+msgstr "Repetir imagem de fundo em mosaico"
#: actions/designadminpanel.php:483 lib/designsettings.php:170
msgid "Change colours"
@@ -1195,7 +1195,7 @@ msgid ""
"notice to your favorites!"
msgstr ""
"Podia [registar uma conta](%%action.register%%) e ser o primeiro a adicionar "
-"uma nota aos favoritos!"
+"uma nota às favoritas!"
#: actions/favoritesrss.php:111 actions/showfavorites.php:77
#: lib/personalgroupnav.php:115
@@ -1259,23 +1259,23 @@ msgstr "O utilizador que está a escutar não existe."
msgid "You can use the local subscription!"
msgstr "Pode usar a subscrição local!"
-#: actions/finishremotesubscribe.php:96
+#: actions/finishremotesubscribe.php:99
msgid "That user has blocked you from subscribing."
msgstr "Esse utilizador bloqueou-o, impedindo que o subscreva."
-#: actions/finishremotesubscribe.php:106
+#: actions/finishremotesubscribe.php:110
msgid "You are not authorized."
msgstr "Não tem autorização."
-#: actions/finishremotesubscribe.php:109
+#: actions/finishremotesubscribe.php:113
msgid "Could not convert request token to access token."
msgstr "Não foi possível converter a chave de pedido numa chave de acesso."
-#: actions/finishremotesubscribe.php:114
+#: actions/finishremotesubscribe.php:118
msgid "Remote service uses unknown version of OMB protocol."
msgstr "Serviço remoto usa uma versão desconhecida do protocolo OMB."
-#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
msgid "Error updating remote profile"
msgstr "Erro ao actualizar o perfil remoto"
@@ -1303,7 +1303,7 @@ msgstr "Não foi especificado um perfil."
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
#: lib/profileformaction.php:77
msgid "No profile with that ID."
-msgstr "Não foi encontrado um perfil com essa ID."
+msgstr "Não foi encontrado um perfil com essa identificação."
#: actions/groupblock.php:81 actions/groupunblock.php:81
#: actions/makeadmin.php:81
@@ -1483,8 +1483,8 @@ msgstr ""
"Podia [registar uma conta](%%action.register%%) e [criar o grupo](%%action."
"newgroup%%) você mesmo!"
-#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
-#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr "Grupos"
@@ -1815,53 +1815,53 @@ msgstr "%s deixou o grupo %s"
msgid "Already logged in."
msgstr "Sessão já foi iniciada."
-#: actions/login.php:110 actions/login.php:120
+#: actions/login.php:108 actions/login.php:118
msgid "Invalid or expired token."
msgstr "Chave inválida ou expirada."
-#: actions/login.php:143
+#: actions/login.php:146
msgid "Incorrect username or password."
msgstr "Nome de utilizador ou palavra-passe incorrectos."
-#: actions/login.php:149
+#: actions/login.php:152
msgid "Error setting user. You are probably not authorized."
-msgstr ""
+msgstr "Erro ao preparar o utilizador. Provavelmente não está autorizado."
-#: actions/login.php:204 actions/login.php:257 lib/action.php:458
+#: actions/login.php:207 actions/login.php:260 lib/action.php:458
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Entrar"
-#: actions/login.php:243
+#: actions/login.php:246
msgid "Login to site"
msgstr "Iniciar sessão no site"
-#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/login.php:249 actions/profilesettings.php:106
#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
#: lib/groupeditform.php:152 lib/userprofile.php:131
msgid "Nickname"
msgstr "Alcunha"
-#: actions/login.php:249 actions/register.php:428
+#: actions/login.php:252 actions/register.php:428
#: lib/accountsettingsaction.php:116
msgid "Password"
msgstr "Palavra-chave"
-#: actions/login.php:252 actions/register.php:477
+#: actions/login.php:255 actions/register.php:477
msgid "Remember me"
msgstr "Lembrar-me neste computador"
-#: actions/login.php:253 actions/register.php:479
+#: actions/login.php:256 actions/register.php:479
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
"De futuro, iniciar sessão automaticamente. Não usar em computadores "
"partilhados!"
-#: actions/login.php:263
+#: actions/login.php:266
msgid "Lost or forgotten password?"
msgstr "Perdeu ou esqueceu-se da palavra-passe?"
-#: actions/login.php:282
+#: actions/login.php:285
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -1869,7 +1869,7 @@ msgstr ""
"Por razões de segurança, por favor reintroduza o seu nome de utilizador e "
"palavra-passe antes de alterar as suas configurações."
-#: actions/login.php:286
+#: actions/login.php:289
#, php-format
msgid ""
"Login with your username and password. Don't have a username yet? [Register]"
@@ -2821,8 +2821,8 @@ msgid "Invalid profile URL (bad format)"
msgstr "URL de perfil inválido (formato incorrecto)"
#: actions/remotesubscribe.php:168
-msgid ""
-"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+#, fuzzy
+msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
msgstr ""
"URL de perfil não é válida (nenhum documento Yadis ou nenhum XRDS inválido "
"definidos)."
@@ -2832,9 +2832,8 @@ msgid "That’s a local profile! Login to subscribe."
msgstr "Esse perfil é local! Inicie uma sessão para o subscrever."
#: actions/remotesubscribe.php:183
-#, fuzzy
msgid "Couldn’t get a request token."
-msgstr "Não foi possível obter um token de requisição."
+msgstr "Não foi possível obter uma chave de pedido."
#: actions/replies.php:125 actions/repliesrss.php:68
#: lib/personalgroupnav.php:105
@@ -3016,7 +3015,7 @@ msgid "Members"
msgstr "Membros"
#: actions/showgroup.php:386 lib/profileaction.php:117
-#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
+#: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95
#: lib/tagcloudsection.php:71
msgid "(None)"
msgstr "(Nenhum)"
@@ -3025,7 +3024,7 @@ msgstr "(Nenhum)"
msgid "All members"
msgstr "Todos os membros"
-#: actions/showgroup.php:429 lib/profileaction.php:173
+#: actions/showgroup.php:429 lib/profileaction.php:174
msgid "Statistics"
msgstr "Estatísticas"
@@ -3180,119 +3179,116 @@ msgstr "O utilizador já está silenciado."
#: actions/siteadminpanel.php:69
msgid "Basic settings for this StatusNet site."
-msgstr ""
+msgstr "Configurações básicas para este site StatusNet."
#: actions/siteadminpanel.php:147
msgid "Site name must have non-zero length."
-msgstr ""
+msgstr "Nome do site não pode ter comprimento zero."
#: actions/siteadminpanel.php:155
-#, fuzzy
msgid "You must have a valid contact email address"
-msgstr "Não é possível normalizar esse endereço de email"
+msgstr "Tem de ter um endereço válido para o correio electrónico de contacto"
#: actions/siteadminpanel.php:173
#, php-format
msgid "Unknown language \"%s\""
-msgstr ""
+msgstr "Língua desconhecida \"%s\""
#: actions/siteadminpanel.php:180
msgid "Invalid snapshot report URL."
-msgstr ""
+msgstr "URL para onde enviar instantâneos é inválida"
#: actions/siteadminpanel.php:186
msgid "Invalid snapshot run value."
-msgstr ""
+msgstr "Valor de criação do instantâneo é inválido."
#: actions/siteadminpanel.php:192
msgid "Snapshot frequency must be a number."
-msgstr ""
+msgstr "Frequência dos instantâneos estatísticos tem de ser um número."
#: actions/siteadminpanel.php:199
msgid "You must set an SSL server when enabling SSL."
-msgstr ""
+msgstr "Tem de configurar um servidor SSL quando activa o SSL."
#: actions/siteadminpanel.php:204
msgid "Invalid SSL server. The maximum length is 255 characters."
-msgstr ""
+msgstr "Servidor SSL inválido. O tamanho máximo é 255 caracteres."
#: actions/siteadminpanel.php:210
msgid "Minimum text limit is 140 characters."
-msgstr ""
+msgstr "O valor mínimo de limite para o texto é 140 caracteres."
#: actions/siteadminpanel.php:216
msgid "Dupe limit must 1 or more seconds."
-msgstr ""
+msgstr "O limite de dupes tem de ser 1 ou mais segundos."
#: actions/siteadminpanel.php:266
msgid "General"
-msgstr ""
+msgstr "Geral"
#: actions/siteadminpanel.php:269
msgid "Site name"
-msgstr ""
+msgstr "Nome do site"
#: actions/siteadminpanel.php:270
msgid "The name of your site, like \"Yourcompany Microblog\""
-msgstr ""
+msgstr "O nome do seu site, por exemplo \"Microblogue NomeDaEmpresa\""
#: actions/siteadminpanel.php:274
msgid "Brought by"
-msgstr ""
+msgstr "Disponibilizado por"
#: actions/siteadminpanel.php:275
msgid "Text used for credits link in footer of each page"
-msgstr ""
+msgstr "Texto usado para a ligação de atribuição no rodapé de cada página"
#: actions/siteadminpanel.php:279
msgid "Brought by URL"
-msgstr ""
+msgstr "URL da atribuição"
#: actions/siteadminpanel.php:280
msgid "URL used for credits link in footer of each page"
-msgstr ""
+msgstr "URL usada para a ligação de atribuição no rodapé de cada página"
#: actions/siteadminpanel.php:284
-#, fuzzy
msgid "Contact email address for your site"
-msgstr "O endereço de email de recepção removido."
+msgstr "Endereço de correio electrónico de contacto para o site"
#: actions/siteadminpanel.php:290
-#, fuzzy
msgid "Local"
-msgstr "Localidade"
+msgstr "Local"
#: actions/siteadminpanel.php:301
msgid "Default timezone"
-msgstr ""
+msgstr "Fuso horário, por omissão"
#: actions/siteadminpanel.php:302
msgid "Default timezone for the site; usually UTC."
-msgstr ""
+msgstr "Fuso horário por omissão, para o site; normalmente, UTC."
#: actions/siteadminpanel.php:308
msgid "Default site language"
-msgstr ""
+msgstr "Língua do site, por omissão"
#: actions/siteadminpanel.php:316
msgid "URLs"
-msgstr ""
+msgstr "URLs"
#: actions/siteadminpanel.php:319
msgid "Server"
-msgstr ""
+msgstr "Servidor"
#: actions/siteadminpanel.php:319
msgid "Site's server hostname."
-msgstr ""
+msgstr "Hostname do servidor do site."
#: actions/siteadminpanel.php:323
msgid "Fancy URLs"
-msgstr ""
+msgstr "URLs caprichosas"
#: actions/siteadminpanel.php:325
msgid "Use fancy (more readable and memorable) URLs?"
-msgstr ""
+msgstr "Usar URLs caprichosas (fancy URLs) mais legíveis e memoráveis"
#: actions/siteadminpanel.php:331
msgid "Access"
@@ -3344,89 +3340,90 @@ msgstr "Instantâneos dos dados"
#: actions/siteadminpanel.php:361
msgid "When to send statistical data to status.net servers"
-msgstr ""
+msgstr "Quando enviar dados estatísticos para os servidores do status.net"
#: actions/siteadminpanel.php:366
msgid "Frequency"
-msgstr ""
+msgstr "Frequência"
#: actions/siteadminpanel.php:367
msgid "Snapshots will be sent once every N web hits"
-msgstr ""
+msgstr "Instantâneos serão enviados uma vez a cada N acessos da internet"
#: actions/siteadminpanel.php:372
msgid "Report URL"
-msgstr ""
+msgstr "URL para relatórios"
#: actions/siteadminpanel.php:373
msgid "Snapshots will be sent to this URL"
-msgstr ""
+msgstr "Instantâneos serão enviados para esta URL"
#: actions/siteadminpanel.php:380
msgid "SSL"
-msgstr ""
+msgstr "SSL"
#: actions/siteadminpanel.php:384
msgid "Sometimes"
-msgstr ""
+msgstr "Às vezes"
#: actions/siteadminpanel.php:385
msgid "Always"
-msgstr ""
+msgstr "Sempre"
#: actions/siteadminpanel.php:387
msgid "Use SSL"
-msgstr ""
+msgstr "Usar SSL"
#: actions/siteadminpanel.php:388
msgid "When to use SSL"
-msgstr ""
+msgstr "Quando usar SSL"
#: actions/siteadminpanel.php:393
msgid "SSL Server"
-msgstr ""
+msgstr "Servidor SSL"
#: actions/siteadminpanel.php:394
msgid "Server to direct SSL requests to"
-msgstr ""
+msgstr "Servidor para onde encaminhar pedidos SSL"
#: actions/siteadminpanel.php:400
msgid "Limits"
-msgstr ""
+msgstr "Limites"
#: actions/siteadminpanel.php:403
msgid "Text limit"
-msgstr ""
+msgstr "Limite de texto"
#: actions/siteadminpanel.php:403
msgid "Maximum number of characters for notices."
-msgstr ""
+msgstr "Número máximo de caracteres nas notas."
#: actions/siteadminpanel.php:407
msgid "Dupe limit"
-msgstr ""
+msgstr "Limite de dupes (duplicações)"
#: actions/siteadminpanel.php:407
msgid "How long users must wait (in seconds) to post the same thing again."
msgstr ""
+"Quanto tempo os utilizadores terão de esperar (em segundos) para publicar a "
+"mesma coisa outra vez."
#: actions/siteadminpanel.php:421 actions/useradminpanel.php:313
-#, fuzzy
msgid "Save site settings"
-msgstr "Definições do Email"
+msgstr "Gravar configurações do site"
#: actions/smssettings.php:58
msgid "SMS Settings"
-msgstr ""
+msgstr "Configurações de SMS"
#: actions/smssettings.php:69
#, php-format
msgid "You can receive SMS messages through email from %%site.name%%."
-msgstr ""
+msgstr "Pode receber SMSs do site %%site.name%% por correio electrónico."
#: actions/smssettings.php:91
msgid "SMS is not available."
-msgstr ""
+msgstr "SMS não está disponível."
#: actions/smssettings.php:112
msgid "Current confirmed SMS-enabled phone number."
@@ -3626,7 +3623,7 @@ msgstr "Não iniciou sessão."
#: actions/tagother.php:39
msgid "No id argument."
-msgstr ""
+msgstr "Argumento de identificação em falta."
#: actions/tagother.php:65
#, php-format
@@ -3710,20 +3707,21 @@ msgstr "Utilizador não está silenciado."
#: actions/unsubscribe.php:77
msgid "No profile id in request."
-msgstr ""
+msgstr "O pedido não tem a identificação do perfil."
#: actions/unsubscribe.php:84
msgid "No profile with that id."
-msgstr ""
+msgstr "Não existe um perfil com essa identificação."
#: actions/unsubscribe.php:98
msgid "Unsubscribed"
-msgstr ""
+msgstr "Subscrição cancelada"
#: actions/updateprofile.php:62 actions/userauthorization.php:330
#, php-format
msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
msgstr ""
+"Licença ‘%s’ da listenee stream não é compatível com a licença ‘%s’ do site."
#: actions/useradminpanel.php:58 lib/adminpanelaction.php:305
#: lib/personalgroupnav.php:115
@@ -3806,11 +3804,11 @@ msgstr "Se devemos gerir sessões nós próprios."
#: actions/useradminpanel.php:276
msgid "Session debugging"
-msgstr ""
+msgstr "Depuração de sessões"
#: actions/useradminpanel.php:278
msgid "Turn on debugging output for sessions."
-msgstr ""
+msgstr "Ligar a impressão de dados de depuração, para sessões."
#: actions/userauthorization.php:105
msgid "Authorize subscription"
@@ -3849,7 +3847,7 @@ msgstr "Rejeitar esta subscrição"
#: actions/userauthorization.php:225
msgid "No authorization request!"
-msgstr ""
+msgstr "Não há pedido de autorização!"
#: actions/userauthorization.php:247
msgid "Subscription authorized"
@@ -3882,17 +3880,17 @@ msgstr ""
#: actions/userauthorization.php:296
#, php-format
msgid "Listener URI ‘%s’ not found here"
-msgstr ""
+msgstr "Listener URI ‘%s’ não foi encontrado aqui"
#: actions/userauthorization.php:301
#, php-format
msgid "Listenee URI ‘%s’ is too long."
-msgstr ""
+msgstr "Listenee URI ‘%s’ é demasiado longo."
#: actions/userauthorization.php:307
#, php-format
msgid "Listenee URI ‘%s’ is a local user."
-msgstr ""
+msgstr "Listenee URI ‘%s’ é um utilizador local."
#: actions/userauthorization.php:322
#, php-format
@@ -4191,7 +4189,7 @@ msgstr "Contacto"
#: lib/action.php:741
msgid "Badge"
-msgstr ""
+msgstr "Emblema"
#: lib/action.php:769
msgid "StatusNet software license"
@@ -4437,49 +4435,38 @@ msgstr "Notificação ligada."
msgid "Can't turn on notification."
msgstr "Não foi possível ligar a notificação."
-#: lib/command.php:597
-#, php-format
-msgid "Could not create login token for %s"
-msgstr "Não foi possível criar a chave de entrada para %s"
-
-#: lib/command.php:602
-#, php-format
-msgid "This link is useable only once, and is good for only 2 minutes: %s"
-msgstr ""
-"Esta ligação é utilizável uma única vez e só durante os próximos 2 minutos: %"
-"s"
-
-#: lib/command.php:618
+#: lib/command.php:592
msgid "You are not subscribed to anyone."
msgstr "Não subscreveu ninguém."
-#: lib/command.php:620
+#: lib/command.php:594
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Subscreve esta pessoa:"
msgstr[1] "Subscreve estas pessoas:"
-#: lib/command.php:640
+#: lib/command.php:614
msgid "No one is subscribed to you."
msgstr "Ninguém subscreve as suas notas."
-#: lib/command.php:642
+#: lib/command.php:616
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Esta pessoa subscreve as suas notas:"
msgstr[1] "Estas pessoas subscrevem as suas notas:"
-#: lib/command.php:662
+#: lib/command.php:636
msgid "You are not a member of any groups."
msgstr "Não está em nenhum grupo."
-#: lib/command.php:664
+#: lib/command.php:638
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Está no grupo:"
msgstr[1] "Está nos grupos:"
-#: lib/command.php:678
+#: lib/command.php:652
+#, fuzzy
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4498,7 +4485,6 @@ msgid ""
"reply #<notice_id> - reply to notice with a given id\n"
"reply <nickname> - reply to the last notice from user\n"
"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
"drop <group> - leave group\n"
"stats - get your stats\n"
"stop - same as 'off'\n"
@@ -4530,8 +4516,8 @@ msgstr ""
"get <alcunha> - receber última nota do utilizador\n"
"whois <alcunha> - receber perfil do utilizador\n"
"fav <alcunha> - adicionar última nota do utilizador às favoritas\n"
-"fav #<id_da_nota> - adicionar nota com esta id às favoritas\n"
-"reply #<id_da_nota> - responder à nota com esta id\n"
+"fav #<id_da_nota> - adicionar nota com esta identificação às favoritas\n"
+"reply #<id_da_nota> - responder à nota com esta identificação\n"
"reply <alcunha> - responder à última nota do utilizador\n"
"join <grupo> - juntar-se ao grupo\n"
"login - Receber uma ligação para iniciar sessão na interface web\n"
@@ -4775,7 +4761,7 @@ msgstr "MB"
msgid "kB"
msgstr "kB"
-#: lib/jabber.php:192
+#: lib/jabber.php:191
#, php-format
msgid "[%s]"
msgstr "[%s]"
@@ -5265,7 +5251,7 @@ msgstr "Mensagens enviadas"
msgid "Tags in %s's notices"
msgstr "Categorias nas notas de %s"
-#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr "Subscrições"
@@ -5273,7 +5259,7 @@ msgstr "Subscrições"
msgid "All subscriptions"
msgstr "Todas as subscrições"
-#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+#: lib/profileaction.php:140 lib/profileaction.php:201 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr "Subscritores"
@@ -5281,15 +5267,15 @@ msgstr "Subscritores"
msgid "All subscribers"
msgstr "Todos os subscritores"
-#: lib/profileaction.php:177
+#: lib/profileaction.php:178
msgid "User ID"
msgstr "ID de utilizador"
-#: lib/profileaction.php:182
+#: lib/profileaction.php:183
msgid "Member since"
msgstr "Membro desde"
-#: lib/profileaction.php:235
+#: lib/profileaction.php:245
msgid "All groups"
msgstr "Todos os grupos"
diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.po b/locale/pt_BR/LC_MESSAGES/statusnet.po
index 8c57cb2b5..31068710e 100644
--- a/locale/pt_BR/LC_MESSAGES/statusnet.po
+++ b/locale/pt_BR/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-27 23:50+0000\n"
-"PO-Revision-Date: 2009-11-28 19:50:50+0000\n"
+"POT-Creation-Date: 2009-12-02 23:18+0000\n"
+"PO-Revision-Date: 2009-12-02 23:20:38+0000\n"
"Language-Team: Brazilian Portuguese\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59523); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59683); Translate extension (2009-11-29)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: pt-br\n"
"X-Message-Group: out-statusnet\n"
@@ -573,7 +573,7 @@ msgstr "Cortar"
#: actions/emailsettings.php:238 actions/favor.php:75
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
@@ -745,7 +745,7 @@ msgid "Conversation"
msgstr "Código de confirmação"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:206 lib/searchgroupnav.php:82
+#: lib/profileaction.php:216 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "Mensagens"
@@ -1277,26 +1277,26 @@ msgstr "O usuário que está está sendo acompanhado não existe."
msgid "You can use the local subscription!"
msgstr "Você pode usar a assinatura local!"
-#: actions/finishremotesubscribe.php:96
+#: actions/finishremotesubscribe.php:99
msgid "That user has blocked you from subscribing."
msgstr "Esse usuário bloqueou o seu pedido de assinatura."
-#: actions/finishremotesubscribe.php:106
+#: actions/finishremotesubscribe.php:110
msgid "You are not authorized."
msgstr "Não autorizado."
-#: actions/finishremotesubscribe.php:109
+#: actions/finishremotesubscribe.php:113
#, fuzzy
msgid "Could not convert request token to access token."
msgstr ""
"Não foi possível converter os tokens de requisição para tokens de acesso."
-#: actions/finishremotesubscribe.php:114
+#: actions/finishremotesubscribe.php:118
#, fuzzy
msgid "Remote service uses unknown version of OMB protocol."
msgstr "Versão desconhecida do protocolo OMB."
-#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
msgid "Error updating remote profile"
msgstr "Erro na atualização do perfil remoto"
@@ -1512,8 +1512,8 @@ msgid ""
"action.newgroup%%) yourself!"
msgstr ""
-#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
-#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr ""
@@ -1851,55 +1851,55 @@ msgstr ""
msgid "Already logged in."
msgstr "Já está logado."
-#: actions/login.php:110 actions/login.php:120
+#: actions/login.php:108 actions/login.php:118
#, fuzzy
msgid "Invalid or expired token."
msgstr "O conteúdo da mensagem é inválido"
-#: actions/login.php:143
+#: actions/login.php:146
msgid "Incorrect username or password."
msgstr "Nome de usuário e/ou senha incorreto(s)."
-#: actions/login.php:149
+#: actions/login.php:152
#, fuzzy
msgid "Error setting user. You are probably not authorized."
msgstr "Não autorizado."
-#: actions/login.php:204 actions/login.php:257 lib/action.php:458
+#: actions/login.php:207 actions/login.php:260 lib/action.php:458
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Logar"
-#: actions/login.php:243
+#: actions/login.php:246
msgid "Login to site"
msgstr ""
-#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/login.php:249 actions/profilesettings.php:106
#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
#: lib/groupeditform.php:152 lib/userprofile.php:131
msgid "Nickname"
msgstr "Apelido"
-#: actions/login.php:249 actions/register.php:428
+#: actions/login.php:252 actions/register.php:428
#: lib/accountsettingsaction.php:116
msgid "Password"
msgstr "Senha"
-#: actions/login.php:252 actions/register.php:477
+#: actions/login.php:255 actions/register.php:477
msgid "Remember me"
msgstr "Lembrar neste computador"
-#: actions/login.php:253 actions/register.php:479
+#: actions/login.php:256 actions/register.php:479
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
"Entrar automaticamente sem pedir a senha. Não use em computadores "
"compartilhados!"
-#: actions/login.php:263
+#: actions/login.php:266
msgid "Lost or forgotten password?"
msgstr "Perdeu ou esqueceu sua senha?"
-#: actions/login.php:282
+#: actions/login.php:285
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -1907,7 +1907,7 @@ msgstr ""
"Por razões de segurança, por favor, digite novamente seu nome de usuário e "
"senha antes de alterar suas configurações."
-#: actions/login.php:286
+#: actions/login.php:289
#, fuzzy, php-format
msgid ""
"Login with your username and password. Don't have a username yet? [Register]"
@@ -2864,8 +2864,7 @@ msgstr "A URL do perfil é inválida (formato inválido)"
#: actions/remotesubscribe.php:168
#, fuzzy
-msgid ""
-"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
msgstr "Não é uma URL de perfil válida (nenhum documento YADIS)."
#: actions/remotesubscribe.php:176
@@ -3050,7 +3049,7 @@ msgid "Members"
msgstr "Membro desde"
#: actions/showgroup.php:386 lib/profileaction.php:117
-#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
+#: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95
#: lib/tagcloudsection.php:71
#, fuzzy
msgid "(None)"
@@ -3060,7 +3059,7 @@ msgstr "(nenhum)"
msgid "All members"
msgstr ""
-#: actions/showgroup.php:429 lib/profileaction.php:173
+#: actions/showgroup.php:429 lib/profileaction.php:174
msgid "Statistics"
msgstr "Estatísticas"
@@ -4496,50 +4495,40 @@ msgstr "Notificação ligada."
msgid "Can't turn on notification."
msgstr "Não é possível ligar a notificação."
-#: lib/command.php:597
-#, fuzzy, php-format
-msgid "Could not create login token for %s"
-msgstr "Não foi possível criar o formulário OpenID: %s"
-
-#: lib/command.php:602
-#, php-format
-msgid "This link is useable only once, and is good for only 2 minutes: %s"
-msgstr ""
-
-#: lib/command.php:618
+#: lib/command.php:592
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "Você não está assinando esse perfil."
-#: lib/command.php:620
+#: lib/command.php:594
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Você já está assinando esses usuários:"
msgstr[1] "Você já está assinando esses usuários:"
-#: lib/command.php:640
+#: lib/command.php:614
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Não foi possível fazer com que o outros o sigam."
-#: lib/command.php:642
+#: lib/command.php:616
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Não foi possível fazer com que o outros o sigam."
msgstr[1] "Não foi possível fazer com que o outros o sigam."
-#: lib/command.php:662
+#: lib/command.php:636
#, fuzzy
msgid "You are not a member of any groups."
msgstr "Você não está assinando esse perfil."
-#: lib/command.php:664
+#: lib/command.php:638
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Você não é membro deste grupo."
msgstr[1] "Você não é membro deste grupo."
-#: lib/command.php:678
+#: lib/command.php:652
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4558,7 +4547,6 @@ msgid ""
"reply #<notice_id> - reply to notice with a given id\n"
"reply <nickname> - reply to the last notice from user\n"
"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
"drop <group> - leave group\n"
"stats - get your stats\n"
"stop - same as 'off'\n"
@@ -4803,7 +4791,7 @@ msgstr ""
msgid "kB"
msgstr ""
-#: lib/jabber.php:192
+#: lib/jabber.php:191
#, php-format
msgid "[%s]"
msgstr ""
@@ -5223,7 +5211,7 @@ msgstr "Suas mensagens enviadas"
msgid "Tags in %s's notices"
msgstr "Etiquetas nas mensagens de %s"
-#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr "Assinaturas"
@@ -5231,7 +5219,7 @@ msgstr "Assinaturas"
msgid "All subscriptions"
msgstr "Todas as assinaturas"
-#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+#: lib/profileaction.php:140 lib/profileaction.php:201 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr "Assinantes"
@@ -5240,16 +5228,16 @@ msgstr "Assinantes"
msgid "All subscribers"
msgstr "Assinantes"
-#: lib/profileaction.php:177
+#: lib/profileaction.php:178
#, fuzzy
msgid "User ID"
msgstr "Usuário"
-#: lib/profileaction.php:182
+#: lib/profileaction.php:183
msgid "Member since"
msgstr "Membro desde"
-#: lib/profileaction.php:235
+#: lib/profileaction.php:245
msgid "All groups"
msgstr ""
diff --git a/locale/ru/LC_MESSAGES/statusnet.po b/locale/ru/LC_MESSAGES/statusnet.po
index b95b572cb..25e8d8e7c 100644
--- a/locale/ru/LC_MESSAGES/statusnet.po
+++ b/locale/ru/LC_MESSAGES/statusnet.po
@@ -1,5 +1,6 @@
# Translation of StatusNet to Russian
#
+# Author@translatewiki.net: Brion
# Author@translatewiki.net: Lockal
# Author@translatewiki.net: Александр Сигачёв
# --
@@ -9,12 +10,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-27 23:50+0000\n"
-"PO-Revision-Date: 2009-11-28 19:50:53+0000\n"
+"POT-Creation-Date: 2009-12-02 23:18+0000\n"
+"PO-Revision-Date: 2009-12-02 23:20:42+0000\n"
"Language-Team: Russian\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59523); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59683); Translate extension (2009-11-29)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ru\n"
"X-Message-Group: out-statusnet\n"
@@ -480,12 +481,12 @@ msgstr "Обновлено от %1$s на %2$s!"
#: actions/apitimelinementions.php:116
#, php-format
msgid "%1$s / Updates mentioning %2$s"
-msgstr ""
+msgstr "%1$s / Обновления, упоминающие %2$s"
#: actions/apitimelinementions.php:126
#, php-format
msgid "%1$s updates that reply to updates from %2$s / %3$s."
-msgstr ""
+msgstr "%1$s обновил этот ответ на сообщение: %2$s / %3$s."
#: actions/apitimelinepublic.php:106 actions/publicrss.php:103
#, php-format
@@ -500,7 +501,7 @@ msgstr "Обновления %s от всех!"
#: actions/apitimelinetag.php:101 actions/tag.php:66
#, php-format
msgid "Notices tagged with %s"
-msgstr "Записи, помеченные %s"
+msgstr "Записи с тегом %s"
#: actions/apitimelinetag.php:107 actions/tagrss.php:64
#, php-format
@@ -576,7 +577,7 @@ msgstr "Обрезать"
#: actions/emailsettings.php:238 actions/favor.php:75
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
@@ -746,7 +747,7 @@ msgid "Conversation"
msgstr "Дискуссия"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:206 lib/searchgroupnav.php:82
+#: lib/profileaction.php:216 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "Записи"
@@ -1045,11 +1046,12 @@ msgstr "Посылать электронные письма на этот ад
#: actions/emailsettings.php:145 actions/smssettings.php:162
msgid "Make a new email address for posting to; cancels the old one."
msgstr ""
-"Создать новый электронный адрес для постинга здесь; отменить один из старых."
+"Создать новый адрес электронной почты для отсылки сообщений; отменяет старый "
+"адрес."
#: actions/emailsettings.php:148 actions/smssettings.php:164
msgid "New"
-msgstr "Новое"
+msgstr "Новый"
#: actions/emailsettings.php:153 actions/imsettings.php:139
#: actions/smssettings.php:169
@@ -1269,23 +1271,23 @@ msgstr "Указанный пользователь не существует."
msgid "You can use the local subscription!"
msgstr "Вы можете использовать локальную подписку!"
-#: actions/finishremotesubscribe.php:96
+#: actions/finishremotesubscribe.php:99
msgid "That user has blocked you from subscribing."
msgstr "Этот пользователь заблокировал вас на его подписку."
-#: actions/finishremotesubscribe.php:106
+#: actions/finishremotesubscribe.php:110
msgid "You are not authorized."
msgstr "Вы не авторизованы."
-#: actions/finishremotesubscribe.php:109
+#: actions/finishremotesubscribe.php:113
msgid "Could not convert request token to access token."
msgstr "Не удаётся преобразовать ключ запроса в ключ доступа."
-#: actions/finishremotesubscribe.php:114
+#: actions/finishremotesubscribe.php:118
msgid "Remote service uses unknown version of OMB protocol."
msgstr "Удалённый сервис использует неизвестную версию протокола OMB."
-#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
msgid "Error updating remote profile"
msgstr "Ошибка обновления удалённого профиля"
@@ -1481,6 +1483,8 @@ msgid ""
"If you can't find the group you're looking for, you can [create it](%%action."
"newgroup%%) yourself."
msgstr ""
+"Если вы не можете найти группу, которая вас интересует, [создайте её](%% "
+"action.newgroup%%) сами."
#: actions/groupsearch.php:85
#, php-format
@@ -1491,8 +1495,8 @@ msgstr ""
"Почему бы не [зарегистрироваться](%%action.register%%), чтобы [создать "
"группу](%%action.newgroup%%) самому?"
-#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
-#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr "Группы"
@@ -1510,6 +1514,11 @@ msgid ""
"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
"%%%%)"
msgstr ""
+"Группы на сайте %%%%site.name%%%% позволяют искать и общаться с людьми с "
+"общими интересами. После присоединения к группе и вы сможете отправлять "
+"сообщения до всех её участников, используя команду «!имягруппы». Не видите "
+"группу, которая вас интересует? Попробуйте [найти её](%%%%action.groupsearch%"
+"%%%) или [создайте собственную!](%%%%action.newgroup%%%%)"
#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
msgid "Create a new group"
@@ -1820,51 +1829,51 @@ msgstr "%s покинул группу %s"
msgid "Already logged in."
msgstr "Вы уже авторизовались."
-#: actions/login.php:110 actions/login.php:120
+#: actions/login.php:108 actions/login.php:118
msgid "Invalid or expired token."
msgstr "Неверный или устаревший ключ."
-#: actions/login.php:143
+#: actions/login.php:146
msgid "Incorrect username or password."
msgstr "Некорректное имя или пароль."
-#: actions/login.php:149
+#: actions/login.php:152
msgid "Error setting user. You are probably not authorized."
msgstr "Ошибка установки пользователя. Вы, вероятно, не авторизованы."
-#: actions/login.php:204 actions/login.php:257 lib/action.php:458
+#: actions/login.php:207 actions/login.php:260 lib/action.php:458
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Вход"
-#: actions/login.php:243
+#: actions/login.php:246
msgid "Login to site"
msgstr "Авторизоваться"
-#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/login.php:249 actions/profilesettings.php:106
#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
#: lib/groupeditform.php:152 lib/userprofile.php:131
msgid "Nickname"
msgstr "Имя"
-#: actions/login.php:249 actions/register.php:428
+#: actions/login.php:252 actions/register.php:428
#: lib/accountsettingsaction.php:116
msgid "Password"
msgstr "Пароль"
-#: actions/login.php:252 actions/register.php:477
+#: actions/login.php:255 actions/register.php:477
msgid "Remember me"
msgstr "Запомнить меня"
-#: actions/login.php:253 actions/register.php:479
+#: actions/login.php:256 actions/register.php:479
msgid "Automatically login in the future; not for shared computers!"
msgstr "Автоматическии входить в дальнейшем. Не для общедоступных компьютеров!"
-#: actions/login.php:263
+#: actions/login.php:266
msgid "Lost or forgotten password?"
msgstr "Потеряли или забыли пароль?"
-#: actions/login.php:282
+#: actions/login.php:285
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -1872,7 +1881,7 @@ msgstr ""
"По причинам сохранения безопасности введите имя и пароль ещё раз, прежде чем "
"изменять Ваши установки."
-#: actions/login.php:286
+#: actions/login.php:289
#, php-format
msgid ""
"Login with your username and password. Don't have a username yet? [Register]"
@@ -1989,6 +1998,8 @@ msgid ""
"Why not [register an account](%%%%action.register%%%%) and be the first to "
"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
msgstr ""
+"Почему бы не [зарегистрироваться](%%%%action.register%%%%) и не отправить "
+"первое [сообщение на эту тему](%%%%action.newnotice%%%%?status_textarea=%s)?"
#: actions/noticesearchrss.php:96
#, php-format
@@ -2090,8 +2101,8 @@ msgstr "Исходящие для %s"
#: actions/outbox.php:116
msgid "This is your outbox, which lists private messages you have sent."
msgstr ""
-"Это ящик Ваших исходящих писем, здесь приватные сообщения, которые отосланы "
-"Вами."
+"Это список исходящих писем, в котором перечислены отправленные вами личные "
+"сообщения."
#: actions/passwordsettings.php:58
msgid "Change password"
@@ -2819,8 +2830,8 @@ msgid "Invalid profile URL (bad format)"
msgstr "Неверный URL профиля (плохой формат)"
#: actions/remotesubscribe.php:168
-msgid ""
-"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+#, fuzzy
+msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
msgstr ""
"Неверный URL профиля (не YADIS-документ либо не указан или указан неверный "
"XRDS)."
@@ -2947,6 +2958,9 @@ msgid ""
"account](%%%%action.register%%%%) and then post something interesting they "
"would add to their favorites :)"
msgstr ""
+"%s пока не добавил ни одноз записи в любимые. Почему бы не "
+"[зарегистрироваться](%%%%action.register%%%%) и не написать что-нибудь "
+"интересное, что понравилось бы этому пользователю? :)"
#: actions/showfavorites.php:242
msgid "This is a way to share what you like."
@@ -3009,7 +3023,7 @@ msgid "Members"
msgstr "Участники"
#: actions/showgroup.php:386 lib/profileaction.php:117
-#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
+#: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95
#: lib/tagcloudsection.php:71
msgid "(None)"
msgstr "(пока ничего нет)"
@@ -3018,7 +3032,7 @@ msgstr "(пока ничего нет)"
msgid "All members"
msgstr "Все участники"
-#: actions/showgroup.php:429 lib/profileaction.php:173
+#: actions/showgroup.php:429 lib/profileaction.php:174
msgid "Statistics"
msgstr "Статистика"
@@ -3233,7 +3247,7 @@ msgstr "Имя вашего сайта, например, «Yourcompany Microblo
#: actions/siteadminpanel.php:274
msgid "Brought by"
-msgstr ""
+msgstr "Предоставлено"
#: actions/siteadminpanel.php:275
msgid "Text used for credits link in footer of each page"
@@ -3242,7 +3256,7 @@ msgstr ""
#: actions/siteadminpanel.php:279
msgid "Brought by URL"
-msgstr ""
+msgstr "URL-адрес поставщика услуг"
#: actions/siteadminpanel.php:280
msgid "URL used for credits link in footer of each page"
@@ -3597,6 +3611,12 @@ msgid ""
"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
"automatically subscribe to people you already follow there."
msgstr ""
+"Вы сейчас не следите ни за чьими-либо записями; попробуйте подписаться на "
+"знакомых вам людей. Попробуйте использовать [поиск людей](%%action."
+"peoplesearch%%), посмотрите среди учасников групп, которые вас интересуют "
+"или просмотрите список [особых пользователей](%%action.featured%%). Если Вы "
+"пользуетесь [Твиттером](%%action.twittersettings%%), то можете автоматически "
+"подписаться на тех людей, за которыми уже следите там."
#: actions/subscriptions.php:123 actions/subscriptions.php:127
#, php-format
@@ -3663,7 +3683,7 @@ msgstr ""
#: actions/tag.php:68
#, php-format
msgid "Notices tagged with %s, page %d"
-msgstr "Записи, помеченные %s, страница %d"
+msgstr "Записи с тегом %s, страница %d"
#: actions/tag.php:86
#, php-format
@@ -4281,7 +4301,7 @@ msgstr "Автор"
#: lib/attachmentlist.php:278
msgid "Provider"
-msgstr "Поставщик услуг"
+msgstr "Сервис"
#: lib/attachmentnoticesection.php:67
msgid "Notices where this attachment appears"
@@ -4430,50 +4450,41 @@ msgstr "Есть оповещение."
msgid "Can't turn on notification."
msgstr "Есть оповещение."
-#: lib/command.php:597
-#, php-format
-msgid "Could not create login token for %s"
-msgstr "Не удаётся создать ключ входа для %s"
-
-#: lib/command.php:602
-#, php-format
-msgid "This link is useable only once, and is good for only 2 minutes: %s"
-msgstr "Эта ссылка действительна только один раз в течение 2 минут: %s"
-
-#: lib/command.php:618
+#: lib/command.php:592
msgid "You are not subscribed to anyone."
msgstr "Вы ни на кого не подписаны."
-#: lib/command.php:620
+#: lib/command.php:594
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Вы подписаны на этих людей:"
msgstr[1] "Вы подписаны на этих людей:"
msgstr[2] "Вы подписаны на этих людей:"
-#: lib/command.php:640
+#: lib/command.php:614
msgid "No one is subscribed to you."
msgstr "Никто не подписан на вас."
-#: lib/command.php:642
+#: lib/command.php:616
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Эти люди подписались на вас:"
msgstr[1] "Эти люди подписались на вас:"
msgstr[2] "Эти люди подписались на вас:"
-#: lib/command.php:662
+#: lib/command.php:636
msgid "You are not a member of any groups."
msgstr "Вы не состоите ни в одной группе."
-#: lib/command.php:664
+#: lib/command.php:638
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Вы являетесь участником следующих групп:"
msgstr[1] "Вы являетесь участником следующих групп:"
msgstr[2] "Вы являетесь участником следующих групп:"
-#: lib/command.php:678
+#: lib/command.php:652
+#, fuzzy
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4492,7 +4503,6 @@ msgid ""
"reply #<notice_id> - reply to notice with a given id\n"
"reply <nickname> - reply to the last notice from user\n"
"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
"drop <group> - leave group\n"
"stats - get your stats\n"
"stop - same as 'off'\n"
@@ -4584,12 +4594,11 @@ msgid "Upload file"
msgstr "Загрузить файл"
#: lib/designsettings.php:109
-#, fuzzy
msgid ""
"You can upload your personal background image. The maximum file size is 2MB."
msgstr ""
"Вы можете загрузить собственное фоновое изображение. Максимальный размер "
-"файла составляет 2Mb."
+"файла составляет 2МБ."
#: lib/designsettings.php:372
msgid "Bad default color settings: "
@@ -4764,13 +4773,13 @@ msgstr "Неподдерживаемый тип файла"
#: lib/imagefile.php:217
msgid "MB"
-msgstr ""
+msgstr "МБ"
#: lib/imagefile.php:219
msgid "kB"
-msgstr ""
+msgstr "КБ"
-#: lib/jabber.php:192
+#: lib/jabber.php:191
#, php-format
msgid "[%s]"
msgstr "[%s]"
@@ -5259,7 +5268,7 @@ msgstr "Ваши исходящие сообщения"
msgid "Tags in %s's notices"
msgstr "Теги записей пользователя %s"
-#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr "Подписки"
@@ -5267,7 +5276,7 @@ msgstr "Подписки"
msgid "All subscriptions"
msgstr "Все подписки."
-#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+#: lib/profileaction.php:140 lib/profileaction.php:201 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr "Подписчики"
@@ -5275,15 +5284,15 @@ msgstr "Подписчики"
msgid "All subscribers"
msgstr "Все подписчики"
-#: lib/profileaction.php:177
+#: lib/profileaction.php:178
msgid "User ID"
msgstr "ID пользователя"
-#: lib/profileaction.php:182
+#: lib/profileaction.php:183
msgid "Member since"
msgstr "Регистрация"
-#: lib/profileaction.php:235
+#: lib/profileaction.php:245
msgid "All groups"
msgstr "Все группы"
@@ -5478,7 +5487,7 @@ msgstr "Сообщение"
#: lib/userprofile.php:311
msgid "Moderate"
-msgstr ""
+msgstr "Модерировать"
#: lib/util.php:825
msgid "a few seconds ago"
diff --git a/locale/statusnet.po b/locale/statusnet.po
index 67847bc98..0ab702ae5 100644
--- a/locale/statusnet.po
+++ b/locale/statusnet.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-28 19:49+0000\n"
+"POT-Creation-Date: 2009-12-02 23:18+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -555,7 +555,7 @@ msgstr ""
#: actions/emailsettings.php:238 actions/favor.php:75
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
@@ -722,7 +722,7 @@ msgid "Conversation"
msgstr ""
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:206 lib/searchgroupnav.php:82
+#: lib/profileaction.php:216 lib/searchgroupnav.php:82
msgid "Notices"
msgstr ""
@@ -1220,23 +1220,23 @@ msgstr ""
msgid "You can use the local subscription!"
msgstr ""
-#: actions/finishremotesubscribe.php:96
+#: actions/finishremotesubscribe.php:99
msgid "That user has blocked you from subscribing."
msgstr ""
-#: actions/finishremotesubscribe.php:106
+#: actions/finishremotesubscribe.php:110
msgid "You are not authorized."
msgstr ""
-#: actions/finishremotesubscribe.php:109
+#: actions/finishremotesubscribe.php:113
msgid "Could not convert request token to access token."
msgstr ""
-#: actions/finishremotesubscribe.php:114
+#: actions/finishremotesubscribe.php:118
msgid "Remote service uses unknown version of OMB protocol."
msgstr ""
-#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
msgid "Error updating remote profile"
msgstr ""
@@ -1431,8 +1431,8 @@ msgid ""
"action.newgroup%%) yourself!"
msgstr ""
-#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
-#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr ""
@@ -1716,57 +1716,57 @@ msgstr ""
msgid "Already logged in."
msgstr ""
-#: actions/login.php:110 actions/login.php:120
+#: actions/login.php:108 actions/login.php:118
msgid "Invalid or expired token."
msgstr ""
-#: actions/login.php:143
+#: actions/login.php:146
msgid "Incorrect username or password."
msgstr ""
-#: actions/login.php:149
+#: actions/login.php:152
msgid "Error setting user. You are probably not authorized."
msgstr ""
-#: actions/login.php:204 actions/login.php:257 lib/action.php:458
+#: actions/login.php:207 actions/login.php:260 lib/action.php:458
#: lib/logingroupnav.php:79
msgid "Login"
msgstr ""
-#: actions/login.php:243
+#: actions/login.php:246
msgid "Login to site"
msgstr ""
-#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/login.php:249 actions/profilesettings.php:106
#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
#: lib/groupeditform.php:152 lib/userprofile.php:131
msgid "Nickname"
msgstr ""
-#: actions/login.php:249 actions/register.php:428
+#: actions/login.php:252 actions/register.php:428
#: lib/accountsettingsaction.php:116
msgid "Password"
msgstr ""
-#: actions/login.php:252 actions/register.php:477
+#: actions/login.php:255 actions/register.php:477
msgid "Remember me"
msgstr ""
-#: actions/login.php:253 actions/register.php:479
+#: actions/login.php:256 actions/register.php:479
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
-#: actions/login.php:263
+#: actions/login.php:266
msgid "Lost or forgotten password?"
msgstr ""
-#: actions/login.php:282
+#: actions/login.php:285
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
msgstr ""
-#: actions/login.php:286
+#: actions/login.php:289
#, php-format
msgid ""
"Login with your username and password. Don't have a username yet? [Register]"
@@ -2652,8 +2652,7 @@ msgid "Invalid profile URL (bad format)"
msgstr ""
#: actions/remotesubscribe.php:168
-msgid ""
-"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
msgstr ""
#: actions/remotesubscribe.php:176
@@ -2830,7 +2829,7 @@ msgid "Members"
msgstr ""
#: actions/showgroup.php:386 lib/profileaction.php:117
-#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
+#: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95
#: lib/tagcloudsection.php:71
msgid "(None)"
msgstr ""
@@ -2839,7 +2838,7 @@ msgstr ""
msgid "All members"
msgstr ""
-#: actions/showgroup.php:429 lib/profileaction.php:173
+#: actions/showgroup.php:429 lib/profileaction.php:174
msgid "Statistics"
msgstr ""
@@ -4177,47 +4176,37 @@ msgstr ""
msgid "Can't turn on notification."
msgstr ""
-#: lib/command.php:597
-#, php-format
-msgid "Could not create login token for %s"
-msgstr ""
-
-#: lib/command.php:602
-#, php-format
-msgid "This link is useable only once, and is good for only 2 minutes: %s"
-msgstr ""
-
-#: lib/command.php:618
+#: lib/command.php:592
msgid "You are not subscribed to anyone."
msgstr ""
-#: lib/command.php:620
+#: lib/command.php:594
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] ""
msgstr[1] ""
-#: lib/command.php:640
+#: lib/command.php:614
msgid "No one is subscribed to you."
msgstr ""
-#: lib/command.php:642
+#: lib/command.php:616
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] ""
msgstr[1] ""
-#: lib/command.php:662
+#: lib/command.php:636
msgid "You are not a member of any groups."
msgstr ""
-#: lib/command.php:664
+#: lib/command.php:638
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] ""
msgstr[1] ""
-#: lib/command.php:678
+#: lib/command.php:652
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4236,7 +4225,6 @@ msgid ""
"reply #<notice_id> - reply to notice with a given id\n"
"reply <nickname> - reply to the last notice from user\n"
"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
"drop <group> - leave group\n"
"stats - get your stats\n"
"stop - same as 'off'\n"
@@ -4474,7 +4462,7 @@ msgstr ""
msgid "kB"
msgstr ""
-#: lib/jabber.php:192
+#: lib/jabber.php:191
#, php-format
msgid "[%s]"
msgstr ""
@@ -4872,7 +4860,7 @@ msgstr ""
msgid "Tags in %s's notices"
msgstr ""
-#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr ""
@@ -4880,7 +4868,7 @@ msgstr ""
msgid "All subscriptions"
msgstr ""
-#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+#: lib/profileaction.php:140 lib/profileaction.php:201 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr ""
@@ -4888,15 +4876,15 @@ msgstr ""
msgid "All subscribers"
msgstr ""
-#: lib/profileaction.php:177
+#: lib/profileaction.php:178
msgid "User ID"
msgstr ""
-#: lib/profileaction.php:182
+#: lib/profileaction.php:183
msgid "Member since"
msgstr ""
-#: lib/profileaction.php:235
+#: lib/profileaction.php:245
msgid "All groups"
msgstr ""
diff --git a/locale/sv/LC_MESSAGES/statusnet.po b/locale/sv/LC_MESSAGES/statusnet.po
index f82bb65f1..8421ccdb0 100644
--- a/locale/sv/LC_MESSAGES/statusnet.po
+++ b/locale/sv/LC_MESSAGES/statusnet.po
@@ -8,12 +8,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-27 23:50+0000\n"
-"PO-Revision-Date: 2009-11-28 19:50:56+0000\n"
+"POT-Creation-Date: 2009-12-02 23:18+0000\n"
+"PO-Revision-Date: 2009-12-02 23:20:46+0000\n"
"Language-Team: Swedish\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59523); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59683); Translate extension (2009-11-29)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: sv\n"
"X-Message-Group: out-statusnet\n"
@@ -580,7 +580,7 @@ msgstr ""
#: actions/emailsettings.php:238 actions/favor.php:75
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
@@ -757,7 +757,7 @@ msgid "Conversation"
msgstr "Bekräftelsekod"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:206 lib/searchgroupnav.php:82
+#: lib/profileaction.php:216 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "Inlägg"
@@ -1292,26 +1292,26 @@ msgstr "Användaren som avlyssnas existerar inte."
msgid "You can use the local subscription!"
msgstr "Du kan använda lokala prenumerationer!"
-#: actions/finishremotesubscribe.php:96
+#: actions/finishremotesubscribe.php:99
msgid "That user has blocked you from subscribing."
msgstr ""
-#: actions/finishremotesubscribe.php:106
+#: actions/finishremotesubscribe.php:110
#, fuzzy
msgid "You are not authorized."
msgstr "Inte tillstånd ännu."
-#: actions/finishremotesubscribe.php:109
+#: actions/finishremotesubscribe.php:113
#, fuzzy
msgid "Could not convert request token to access token."
msgstr "Kunde inte konvertera förfrågan tokens till Access tokens."
-#: actions/finishremotesubscribe.php:114
+#: actions/finishremotesubscribe.php:118
#, fuzzy
msgid "Remote service uses unknown version of OMB protocol."
msgstr "Okänd version av OMB protokollet."
-#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
msgid "Error updating remote profile"
msgstr "Fel uppstog under uppdatering av fjärranvändare"
@@ -1528,8 +1528,8 @@ msgid ""
"action.newgroup%%) yourself!"
msgstr ""
-#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
-#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr ""
@@ -1861,53 +1861,53 @@ msgstr ""
msgid "Already logged in."
msgstr "Redan inloggad."
-#: actions/login.php:110 actions/login.php:120
+#: actions/login.php:108 actions/login.php:118
#, fuzzy
msgid "Invalid or expired token."
msgstr "Ogiltig innehåll i inlägget "
-#: actions/login.php:143
+#: actions/login.php:146
msgid "Incorrect username or password."
msgstr "Felaktigt användarnamn eller lösenord."
-#: actions/login.php:149
+#: actions/login.php:152
#, fuzzy
msgid "Error setting user. You are probably not authorized."
msgstr "Inte tillstånd ännu."
-#: actions/login.php:204 actions/login.php:257 lib/action.php:458
+#: actions/login.php:207 actions/login.php:260 lib/action.php:458
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Logga in"
-#: actions/login.php:243
+#: actions/login.php:246
msgid "Login to site"
msgstr ""
-#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/login.php:249 actions/profilesettings.php:106
#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
#: lib/groupeditform.php:152 lib/userprofile.php:131
msgid "Nickname"
msgstr "Smeknamn"
-#: actions/login.php:249 actions/register.php:428
+#: actions/login.php:252 actions/register.php:428
#: lib/accountsettingsaction.php:116
msgid "Password"
msgstr "Lösenord"
-#: actions/login.php:252 actions/register.php:477
+#: actions/login.php:255 actions/register.php:477
msgid "Remember me"
msgstr "Kom ihåg mig"
-#: actions/login.php:253 actions/register.php:479
+#: actions/login.php:256 actions/register.php:479
msgid "Automatically login in the future; not for shared computers!"
msgstr "Logga in automatiskt i framtiden; Ej för publika datorer!"
-#: actions/login.php:263
+#: actions/login.php:266
msgid "Lost or forgotten password?"
msgstr "Glömt bort lösenord?"
-#: actions/login.php:282
+#: actions/login.php:285
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -1915,7 +1915,7 @@ msgstr ""
"Av säkerhetsskäl, var vänlig skriv in ditt användarnamn och lösenord innan "
"du ändrar dina inställningar."
-#: actions/login.php:286
+#: actions/login.php:289
#, fuzzy, php-format
msgid ""
"Login with your username and password. Don't have a username yet? [Register]"
@@ -2865,8 +2865,7 @@ msgstr "Nåt är fel med profil URL (Format fel)"
#: actions/remotesubscribe.php:168
#, fuzzy
-msgid ""
-"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
msgstr "Det är ingen giltig profil URL (ingen YADIS angiven)."
#: actions/remotesubscribe.php:176
@@ -3049,7 +3048,7 @@ msgid "Members"
msgstr "Medlem sedan"
#: actions/showgroup.php:386 lib/profileaction.php:117
-#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
+#: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95
#: lib/tagcloudsection.php:71
msgid "(None)"
msgstr ""
@@ -3058,7 +3057,7 @@ msgstr ""
msgid "All members"
msgstr ""
-#: actions/showgroup.php:429 lib/profileaction.php:173
+#: actions/showgroup.php:429 lib/profileaction.php:174
msgid "Statistics"
msgstr "Statistik"
@@ -4496,50 +4495,40 @@ msgstr ""
msgid "Can't turn on notification."
msgstr ""
-#: lib/command.php:597
-#, fuzzy, php-format
-msgid "Could not create login token for %s"
-msgstr "Kan inte skapa OpenID formulär: %s"
-
-#: lib/command.php:602
-#, php-format
-msgid "This link is useable only once, and is good for only 2 minutes: %s"
-msgstr ""
-
-#: lib/command.php:618
+#: lib/command.php:592
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "Du skickade inte oss den profilen"
-#: lib/command.php:620
+#: lib/command.php:594
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Du prenumererar redan på dessa användare:"
msgstr[1] "Du prenumererar redan på dessa användare:"
-#: lib/command.php:640
+#: lib/command.php:614
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Kunde inte prenumerera på annat åt dig."
-#: lib/command.php:642
+#: lib/command.php:616
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Kunde inte prenumerera på annat åt dig."
msgstr[1] "Kunde inte prenumerera på annat åt dig."
-#: lib/command.php:662
+#: lib/command.php:636
#, fuzzy
msgid "You are not a member of any groups."
msgstr "Du skickade inte oss den profilen"
-#: lib/command.php:664
+#: lib/command.php:638
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Du skickade inte oss den profilen"
msgstr[1] "Du skickade inte oss den profilen"
-#: lib/command.php:678
+#: lib/command.php:652
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4558,7 +4547,6 @@ msgid ""
"reply #<notice_id> - reply to notice with a given id\n"
"reply <nickname> - reply to the last notice from user\n"
"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
"drop <group> - leave group\n"
"stats - get your stats\n"
"stop - same as 'off'\n"
@@ -4812,7 +4800,7 @@ msgstr ""
msgid "kB"
msgstr ""
-#: lib/jabber.php:192
+#: lib/jabber.php:191
#, php-format
msgid "[%s]"
msgstr ""
@@ -5236,7 +5224,7 @@ msgstr ""
msgid "Tags in %s's notices"
msgstr ""
-#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr "Prenumerationer"
@@ -5244,7 +5232,7 @@ msgstr "Prenumerationer"
msgid "All subscriptions"
msgstr "Alla prenumerationer"
-#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+#: lib/profileaction.php:140 lib/profileaction.php:201 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr "Prenumerant"
@@ -5253,15 +5241,15 @@ msgstr "Prenumerant"
msgid "All subscribers"
msgstr "Prenumerant"
-#: lib/profileaction.php:177
+#: lib/profileaction.php:178
msgid "User ID"
msgstr ""
-#: lib/profileaction.php:182
+#: lib/profileaction.php:183
msgid "Member since"
msgstr "Medlem sedan"
-#: lib/profileaction.php:235
+#: lib/profileaction.php:245
msgid "All groups"
msgstr ""
diff --git a/locale/te/LC_MESSAGES/statusnet.po b/locale/te/LC_MESSAGES/statusnet.po
index 65a32c04e..fd3695343 100644
--- a/locale/te/LC_MESSAGES/statusnet.po
+++ b/locale/te/LC_MESSAGES/statusnet.po
@@ -8,12 +8,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-27 23:50+0000\n"
-"PO-Revision-Date: 2009-11-28 19:50:58+0000\n"
+"POT-Creation-Date: 2009-12-02 23:18+0000\n"
+"PO-Revision-Date: 2009-12-02 23:20:50+0000\n"
"Language-Team: Telugu\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59523); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59683); Translate extension (2009-11-29)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: te\n"
"X-Message-Group: out-statusnet\n"
@@ -566,7 +566,7 @@ msgstr "కత్తిరించు"
#: actions/emailsettings.php:238 actions/favor.php:75
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
@@ -737,7 +737,7 @@ msgid "Conversation"
msgstr "సంభాషణ"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:206 lib/searchgroupnav.php:82
+#: lib/profileaction.php:216 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "సందేశాలు"
@@ -824,14 +824,13 @@ msgid "Invalid logo URL."
msgstr "తప్పుడు పరిమాణం."
#: actions/designadminpanel.php:274
-#, fuzzy, php-format
+#, php-format
msgid "Theme not available: %s"
-msgstr "హోమ్ పేజీ URL సరైనది కాదు."
+msgstr "అలంకారం అందుబాటులో లేదు: %s"
#: actions/designadminpanel.php:370
-#, fuzzy
msgid "Change logo"
-msgstr "రంగులను మార్చు"
+msgstr "చిహ్నాన్ని మార్చు"
#: actions/designadminpanel.php:375
msgid "Site logo"
@@ -847,7 +846,7 @@ msgstr "సైటు అలంకారం"
#: actions/designadminpanel.php:400
msgid "Theme for the site."
-msgstr ""
+msgstr "సైటుకి అలంకారం."
#: actions/designadminpanel.php:412 lib/designsettings.php:101
msgid "Change background image"
@@ -886,9 +885,8 @@ msgid "Change colours"
msgstr "రంగులను మార్చు"
#: actions/designadminpanel.php:505 lib/designsettings.php:191
-#, fuzzy
msgid "Content"
-msgstr "అనుసంధానించు"
+msgstr "విషయం"
#: actions/designadminpanel.php:518 lib/designsettings.php:204
msgid "Sidebar"
@@ -1243,23 +1241,23 @@ msgstr ""
msgid "You can use the local subscription!"
msgstr ""
-#: actions/finishremotesubscribe.php:96
+#: actions/finishremotesubscribe.php:99
msgid "That user has blocked you from subscribing."
msgstr ""
-#: actions/finishremotesubscribe.php:106
+#: actions/finishremotesubscribe.php:110
msgid "You are not authorized."
msgstr ""
-#: actions/finishremotesubscribe.php:109
+#: actions/finishremotesubscribe.php:113
msgid "Could not convert request token to access token."
msgstr ""
-#: actions/finishremotesubscribe.php:114
+#: actions/finishremotesubscribe.php:118
msgid "Remote service uses unknown version of OMB protocol."
msgstr ""
-#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
msgid "Error updating remote profile"
msgstr "దూరపు ప్రొపైలుని తాజాకరించటంలో పొరపాటు"
@@ -1323,9 +1321,8 @@ msgid "Do not block this user from this group"
msgstr ""
#: actions/groupblock.php:179
-#, fuzzy
msgid "Block this user from this group"
-msgstr "అటువంటి వాడుకరి లేరు."
+msgstr "ఈ గుంపునుండి ఈ వాడుకరిని నిరోధించు"
#: actions/groupblock.php:196
msgid "Database error blocking user from group."
@@ -1381,9 +1378,8 @@ msgid "Pick a square area of the image to be the logo."
msgstr ""
#: actions/grouplogo.php:396
-#, fuzzy
msgid "Logo updated."
-msgstr "అవతారాన్ని తాజాకరించాం."
+msgstr "చిహ్నాన్ని తాజాకరించాం."
#: actions/grouplogo.php:398
#, fuzzy
@@ -1461,8 +1457,8 @@ msgid ""
"action.newgroup%%) yourself!"
msgstr ""
-#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
-#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr "గుంపులు"
@@ -1490,14 +1486,12 @@ msgid "Only an admin can unblock group members."
msgstr ""
#: actions/groupunblock.php:95
-#, fuzzy
msgid "User is not blocked from group."
-msgstr "వాడుకరికి ప్రొఫైలు లేదు."
+msgstr "వాడుకరిని గుంపు నుండి నిరోధించలేదు."
#: actions/groupunblock.php:128 actions/unblock.php:77
-#, fuzzy
msgid "Error removing the block."
-msgstr "వాడుకరిని భద్రపరచడంలో పొరపాటు."
+msgstr "నిరోధాన్ని తొలగించడంలో పొరపాటు."
#: actions/imsettings.php:59
msgid "IM Settings"
@@ -1610,7 +1604,7 @@ msgstr ""
#: actions/invite.php:72
#, php-format
msgid "Invalid email address: %s"
-msgstr ""
+msgstr "తప్పుడు ఈమెయిలు చిరునామా: %s"
#: actions/invite.php:110
msgid "Invitation(s) sent"
@@ -1636,7 +1630,7 @@ msgstr ""
#: actions/invite.php:144
msgid "Invitation(s) sent to the following people:"
-msgstr ""
+msgstr "క్రింది ప్రజలకి ఆహ్వానము(ల)ని పంపించాం:"
#: actions/invite.php:150
msgid ""
@@ -1655,7 +1649,7 @@ msgstr "ఈమెయిలు చిరునామాలు"
#: actions/invite.php:189
msgid "Addresses of friends to invite (one per line)"
-msgstr ""
+msgstr "ఆహ్వానించాల్సిన మిత్రుల చిరునామాలు (లైనుకి ఒకటి చొప్పున)"
#: actions/invite.php:192
msgid "Personal message"
@@ -1663,7 +1657,7 @@ msgstr "వ్యక్తిగత సందేశం"
#: actions/invite.php:194
msgid "Optionally add a personal message to the invitation."
-msgstr ""
+msgstr "ఐచ్ఛికంగా ఆహ్వానానికి వ్యక్తిగత సందేశం చేర్చండి."
#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:225
msgid "Send"
@@ -1749,59 +1743,59 @@ msgstr "%2$s గుంపు నుండి %1$s వైదొలిగారు
msgid "Already logged in."
msgstr "ఇప్పటికే లోనికి ప్రవేశించారు."
-#: actions/login.php:110 actions/login.php:120
+#: actions/login.php:108 actions/login.php:118
#, fuzzy
msgid "Invalid or expired token."
msgstr "సందేశపు విషయం సరైనది కాదు"
-#: actions/login.php:143
+#: actions/login.php:146
msgid "Incorrect username or password."
msgstr "వాడుకరిపేరు లేదా సంకేతపదం తప్పు."
-#: actions/login.php:149
+#: actions/login.php:152
msgid "Error setting user. You are probably not authorized."
msgstr ""
-#: actions/login.php:204 actions/login.php:257 lib/action.php:458
+#: actions/login.php:207 actions/login.php:260 lib/action.php:458
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "ప్రవేశించండి"
-#: actions/login.php:243
+#: actions/login.php:246
msgid "Login to site"
msgstr ""
-#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/login.php:249 actions/profilesettings.php:106
#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
#: lib/groupeditform.php:152 lib/userprofile.php:131
msgid "Nickname"
msgstr "పేరు"
-#: actions/login.php:249 actions/register.php:428
+#: actions/login.php:252 actions/register.php:428
#: lib/accountsettingsaction.php:116
msgid "Password"
msgstr "సంకేతపదం"
-#: actions/login.php:252 actions/register.php:477
+#: actions/login.php:255 actions/register.php:477
msgid "Remember me"
msgstr "నన్ను గుర్తుంచుకో"
-#: actions/login.php:253 actions/register.php:479
+#: actions/login.php:256 actions/register.php:479
msgid "Automatically login in the future; not for shared computers!"
msgstr "భవిష్యత్తులో ఆటోమెటిగ్గా లోనికి ప్రవేశించు; బయటి కంప్యూర్ల కొరకు కాదు!"
-#: actions/login.php:263
+#: actions/login.php:266
msgid "Lost or forgotten password?"
msgstr "మీ సంకేతపదం మర్చిపోయారా?"
-#: actions/login.php:282
+#: actions/login.php:285
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
msgstr ""
"భద్రతా కారణాల దృష్ట్యా, అమరికలు మార్చే ముందు మీ వాడుకరి పేరుని మరియు సంకేతపదాన్ని మరోసారి ఇవ్వండి."
-#: actions/login.php:286
+#: actions/login.php:289
#, php-format
msgid ""
"Login with your username and password. Don't have a username yet? [Register]"
@@ -1948,9 +1942,8 @@ msgid "%1$s's status on %2$s"
msgstr ""
#: actions/oembed.php:157
-#, fuzzy
msgid "content type "
-msgstr "అనుసంధానించు"
+msgstr "విషయ రకం "
#: actions/oembed.php:160
msgid "Only "
@@ -2025,9 +2018,8 @@ msgid "Change your password."
msgstr "మీ సంకేతపదం మార్చుకోండి."
#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
-#, fuzzy
msgid "Password change"
-msgstr "సంకేతపదం భద్రమయ్యింది."
+msgstr "సంకేతపదం మార్పు"
#: actions/passwordsettings.php:104
msgid "Old password"
@@ -2108,9 +2100,8 @@ msgstr ""
#: actions/pathsadminpanel.php:212 actions/siteadminpanel.php:58
#: lib/adminpanelaction.php:299
-#, fuzzy
msgid "Site"
-msgstr "ఆహ్వానించు"
+msgstr "సైటు"
#: actions/pathsadminpanel.php:216
msgid "Path"
@@ -2165,9 +2156,8 @@ msgid "Avatar directory"
msgstr "అవతారాన్ని తొలగించాం."
#: actions/pathsadminpanel.php:269
-#, fuzzy
msgid "Backgrounds"
-msgstr "నేపథ్యం"
+msgstr "నేపథ్యాలు"
#: actions/pathsadminpanel.php:273
#, fuzzy
@@ -2524,7 +2514,7 @@ msgstr "పేరు లేదా ఈమెయిల్ చిరునామా
#: actions/recoverpassword.php:272
msgid "No user with that email address or username."
-msgstr ""
+msgstr "ఆ ఈమెయిలు చిరునామా లేదా వాడుకరిపేరుతో వాడుకరులెవరూ లేరు."
#: actions/recoverpassword.php:287
msgid "No registered email address for that user."
@@ -2712,8 +2702,7 @@ msgid "Invalid profile URL (bad format)"
msgstr "ప్రొపైల్ URL తప్పు (చెడు ఫార్మాట్)"
#: actions/remotesubscribe.php:168
-msgid ""
-"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
msgstr ""
#: actions/remotesubscribe.php:176
@@ -2806,9 +2795,9 @@ msgid "Feed for favorites of %s (RSS 2.0)"
msgstr "%s యొక్క మిత్రుల ఫీడు"
#: actions/showfavorites.php:184
-#, fuzzy, php-format
+#, php-format
msgid "Feed for favorites of %s (Atom)"
-msgstr "%s యొక్క మిత్రుల ఫీడు"
+msgstr "%s యొక్క ఇష్టాంశాల ఫీడు (ఆటమ్)"
#: actions/showfavorites.php:205
msgid ""
@@ -2892,7 +2881,7 @@ msgid "Members"
msgstr "సభ్యులు"
#: actions/showgroup.php:386 lib/profileaction.php:117
-#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
+#: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95
#: lib/tagcloudsection.php:71
msgid "(None)"
msgstr "(ఏమీలేదు)"
@@ -2901,14 +2890,13 @@ msgstr "(ఏమీలేదు)"
msgid "All members"
msgstr "అందరు సభ్యులూ"
-#: actions/showgroup.php:429 lib/profileaction.php:173
+#: actions/showgroup.php:429 lib/profileaction.php:174
msgid "Statistics"
msgstr "గణాంకాలు"
#: actions/showgroup.php:432
-#, fuzzy
msgid "Created"
-msgstr "సృష్టించు"
+msgstr "సృష్టితం"
#: actions/showgroup.php:448
#, php-format
@@ -3050,7 +3038,7 @@ msgstr "సరైన ఈమెయిలు చిరునామా కాదు
#: actions/siteadminpanel.php:173
#, php-format
msgid "Unknown language \"%s\""
-msgstr ""
+msgstr "గుర్తు తెలియని భాష \"%s\""
#: actions/siteadminpanel.php:180
msgid "Invalid snapshot report URL."
@@ -3230,14 +3218,12 @@ msgid "SSL"
msgstr ""
#: actions/siteadminpanel.php:384
-#, fuzzy
msgid "Sometimes"
-msgstr "సందేశాలు"
+msgstr "కొన్నిసార్లు"
#: actions/siteadminpanel.php:385
-#, fuzzy
msgid "Always"
-msgstr "మారుపేర్లు"
+msgstr "ఎల్లప్పుడూ"
#: actions/siteadminpanel.php:387
msgid "Use SSL"
@@ -3261,11 +3247,11 @@ msgstr "పరిమితులు"
#: actions/siteadminpanel.php:403
msgid "Text limit"
-msgstr ""
+msgstr "పాఠ్యపు పరిమితి"
#: actions/siteadminpanel.php:403
msgid "Maximum number of characters for notices."
-msgstr ""
+msgstr "సందేశాలలోని అక్షరాల గరిష్ఠ సంఖ్య."
#: actions/siteadminpanel.php:407
msgid "Dupe limit"
@@ -3276,9 +3262,8 @@ msgid "How long users must wait (in seconds) to post the same thing again."
msgstr ""
#: actions/siteadminpanel.php:421 actions/useradminpanel.php:313
-#, fuzzy
msgid "Save site settings"
-msgstr "అవతారపు అమరికలు"
+msgstr "సైటు అమరికలను భద్రపరచు"
#: actions/smssettings.php:58
msgid "SMS Settings"
@@ -3621,11 +3606,11 @@ msgstr "కొత్త వాడుకరులు"
#: actions/useradminpanel.php:235
msgid "New user welcome"
-msgstr ""
+msgstr "కొత్త వాడుకరి స్వాగతం"
#: actions/useradminpanel.php:236
msgid "Welcome text for new users (Max 255 chars)."
-msgstr ""
+msgstr "కొత్త వాడుకరులకై స్వాగత సందేశం (255 అక్షరాలు గరిష్ఠం)."
#: actions/useradminpanel.php:241
#, fuzzy
@@ -3786,7 +3771,7 @@ msgstr ""
#: actions/usergroups.php:64
#, php-format
msgid "%s groups, page %d"
-msgstr ""
+msgstr "%s గుంపులు, పేజీ %d"
#: actions/usergroups.php:130
msgid "Search for more groups"
@@ -4043,7 +4028,7 @@ msgstr "సంప్రదించు"
#: lib/action.php:741
msgid "Badge"
-msgstr ""
+msgstr "బాడ్జి"
#: lib/action.php:769
msgid "StatusNet software license"
@@ -4120,9 +4105,8 @@ msgid "Unable to delete design setting."
msgstr ""
#: lib/adminpanelaction.php:300
-#, fuzzy
msgid "Basic site configuration"
-msgstr "ఈమెయిల్ చిరునామా నిర్ధారణ"
+msgstr "ప్రాథమిక సైటు స్వరూపణం"
#: lib/adminpanelaction.php:303
#, fuzzy
@@ -4295,50 +4279,40 @@ msgstr ""
msgid "Can't turn on notification."
msgstr ""
-#: lib/command.php:597
-#, fuzzy, php-format
-msgid "Could not create login token for %s"
-msgstr "ఓపెన్ఐడీ ఫారమును సృష్టించలేకపోయాం: %s"
-
-#: lib/command.php:602
-#, php-format
-msgid "This link is useable only once, and is good for only 2 minutes: %s"
-msgstr ""
-
-#: lib/command.php:618
+#: lib/command.php:592
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "%sకి స్పందనలు"
-#: lib/command.php:620
+#: lib/command.php:594
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "%sకి స్పందనలు"
msgstr[1] "%sకి స్పందనలు"
-#: lib/command.php:640
+#: lib/command.php:614
#, fuzzy
msgid "No one is subscribed to you."
msgstr "%sకి స్పందనలు"
-#: lib/command.php:642
+#: lib/command.php:616
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "%sకి స్పందనలు"
msgstr[1] "%sకి స్పందనలు"
-#: lib/command.php:662
+#: lib/command.php:636
#, fuzzy
msgid "You are not a member of any groups."
msgstr "మీరు ఇప్పటికే లోనికి ప్రవేశించారు!"
-#: lib/command.php:664
+#: lib/command.php:638
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "మీరు ఇప్పటికే లోనికి ప్రవేశించారు!"
msgstr[1] "మీరు ఇప్పటికే లోనికి ప్రవేశించారు!"
-#: lib/command.php:678
+#: lib/command.php:652
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4357,7 +4331,6 @@ msgid ""
"reply #<notice_id> - reply to notice with a given id\n"
"reply <nickname> - reply to the last notice from user\n"
"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
"drop <group> - leave group\n"
"stats - get your stats\n"
"stop - same as 'off'\n"
@@ -4598,13 +4571,13 @@ msgstr "తెలియని ఫైలు రకం"
#: lib/imagefile.php:217
msgid "MB"
-msgstr ""
+msgstr "మెబై"
#: lib/imagefile.php:219
msgid "kB"
-msgstr ""
+msgstr "కిబై"
-#: lib/jabber.php:192
+#: lib/jabber.php:191
#, php-format
msgid "[%s]"
msgstr "[%s]"
@@ -4926,9 +4899,8 @@ msgid "at"
msgstr ""
#: lib/noticelist.php:506
-#, fuzzy
msgid "in context"
-msgstr "విషయం లేదు!"
+msgstr "సందర్భంలో"
#: lib/noticelist.php:526
msgid "Reply to this notice"
@@ -5009,7 +4981,7 @@ msgstr "మీరు పంపిన సందేశాలు"
msgid "Tags in %s's notices"
msgstr ""
-#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr "చందాలు"
@@ -5017,7 +4989,7 @@ msgstr "చందాలు"
msgid "All subscriptions"
msgstr "అన్ని చందాలు"
-#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+#: lib/profileaction.php:140 lib/profileaction.php:201 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr "చందాదార్లు"
@@ -5025,15 +4997,15 @@ msgstr "చందాదార్లు"
msgid "All subscribers"
msgstr "అందరు చందాదార్లు"
-#: lib/profileaction.php:177
+#: lib/profileaction.php:178
msgid "User ID"
msgstr "వాడుకరి ID"
-#: lib/profileaction.php:182
+#: lib/profileaction.php:183
msgid "Member since"
msgstr "సభ్యులైన తేదీ"
-#: lib/profileaction.php:235
+#: lib/profileaction.php:245
msgid "All groups"
msgstr "అన్ని గుంపులు"
diff --git a/locale/tr/LC_MESSAGES/statusnet.po b/locale/tr/LC_MESSAGES/statusnet.po
index 23f9bc91e..bbb9c2df9 100644
--- a/locale/tr/LC_MESSAGES/statusnet.po
+++ b/locale/tr/LC_MESSAGES/statusnet.po
@@ -7,12 +7,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-27 23:50+0000\n"
-"PO-Revision-Date: 2009-11-28 19:51:01+0000\n"
+"POT-Creation-Date: 2009-12-02 23:18+0000\n"
+"PO-Revision-Date: 2009-12-02 23:20:53+0000\n"
"Language-Team: Turkish\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59523); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59683); Translate extension (2009-11-29)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: tr\n"
"X-Message-Group: out-statusnet\n"
@@ -577,7 +577,7 @@ msgstr ""
#: actions/emailsettings.php:238 actions/favor.php:75
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
@@ -754,7 +754,7 @@ msgid "Conversation"
msgstr "Yer"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:206 lib/searchgroupnav.php:82
+#: lib/profileaction.php:216 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "Durum mesajları"
@@ -1272,25 +1272,25 @@ msgstr ""
msgid "You can use the local subscription!"
msgstr "Yerel aboneliği kullanabilirsiniz!"
-#: actions/finishremotesubscribe.php:96
+#: actions/finishremotesubscribe.php:99
msgid "That user has blocked you from subscribing."
msgstr ""
-#: actions/finishremotesubscribe.php:106
+#: actions/finishremotesubscribe.php:110
#, fuzzy
msgid "You are not authorized."
msgstr "Yetkilendirilmemiş."
-#: actions/finishremotesubscribe.php:109
+#: actions/finishremotesubscribe.php:113
msgid "Could not convert request token to access token."
msgstr ""
-#: actions/finishremotesubscribe.php:114
+#: actions/finishremotesubscribe.php:118
#, fuzzy
msgid "Remote service uses unknown version of OMB protocol."
msgstr "OMB protokolünün bilinmeğen sürümü."
-#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
msgid "Error updating remote profile"
msgstr "Uzaktaki profili güncellemede hata oluştu"
@@ -1502,8 +1502,8 @@ msgid ""
"action.newgroup%%) yourself!"
msgstr ""
-#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
-#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr ""
@@ -1802,54 +1802,54 @@ msgstr ""
msgid "Already logged in."
msgstr "Zaten giriş yapılmış."
-#: actions/login.php:110 actions/login.php:120
+#: actions/login.php:108 actions/login.php:118
#, fuzzy
msgid "Invalid or expired token."
msgstr "Geçersiz durum mesajı"
-#: actions/login.php:143
+#: actions/login.php:146
msgid "Incorrect username or password."
msgstr "Yanlış kullanıcı adı veya parola."
-#: actions/login.php:149
+#: actions/login.php:152
#, fuzzy
msgid "Error setting user. You are probably not authorized."
msgstr "Yetkilendirilmemiş."
-#: actions/login.php:204 actions/login.php:257 lib/action.php:458
+#: actions/login.php:207 actions/login.php:260 lib/action.php:458
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Giriş"
-#: actions/login.php:243
+#: actions/login.php:246
msgid "Login to site"
msgstr ""
-#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/login.php:249 actions/profilesettings.php:106
#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
#: lib/groupeditform.php:152 lib/userprofile.php:131
msgid "Nickname"
msgstr "Takma ad"
-#: actions/login.php:249 actions/register.php:428
+#: actions/login.php:252 actions/register.php:428
#: lib/accountsettingsaction.php:116
msgid "Password"
msgstr "Parola"
-#: actions/login.php:252 actions/register.php:477
+#: actions/login.php:255 actions/register.php:477
msgid "Remember me"
msgstr "Beni hatırla"
-#: actions/login.php:253 actions/register.php:479
+#: actions/login.php:256 actions/register.php:479
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
"Gelecekte kendiliğinden giriş yap, paylaşılan bilgisayarlar için değildir!"
-#: actions/login.php:263
+#: actions/login.php:266
msgid "Lost or forgotten password?"
msgstr "Parolamı unuttum veya kaybettim"
-#: actions/login.php:282
+#: actions/login.php:285
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -1857,7 +1857,7 @@ msgstr ""
"Güvenliğiniz için, ayarlarınızı değiştirmeden önce lütfen kullanıcı adınızı "
"ve parolanızı tekrar giriniz."
-#: actions/login.php:286
+#: actions/login.php:289
#, fuzzy, php-format
msgid ""
"Login with your username and password. Don't have a username yet? [Register]"
@@ -2785,8 +2785,7 @@ msgstr ""
#: actions/remotesubscribe.php:168
#, fuzzy
-msgid ""
-"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
msgstr "Geçersiz profil adresi (YADIS belgesi yok)."
#: actions/remotesubscribe.php:176
@@ -2968,7 +2967,7 @@ msgid "Members"
msgstr "Üyelik başlangıcı"
#: actions/showgroup.php:386 lib/profileaction.php:117
-#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
+#: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95
#: lib/tagcloudsection.php:71
msgid "(None)"
msgstr ""
@@ -2977,7 +2976,7 @@ msgstr ""
msgid "All members"
msgstr ""
-#: actions/showgroup.php:429 lib/profileaction.php:173
+#: actions/showgroup.php:429 lib/profileaction.php:174
msgid "Statistics"
msgstr "İstatistikler"
@@ -4383,47 +4382,37 @@ msgstr ""
msgid "Can't turn on notification."
msgstr ""
-#: lib/command.php:597
-#, fuzzy, php-format
-msgid "Could not create login token for %s"
-msgstr "OpenID formu yaratılamadı: %s"
-
-#: lib/command.php:602
-#, php-format
-msgid "This link is useable only once, and is good for only 2 minutes: %s"
-msgstr ""
-
-#: lib/command.php:618
+#: lib/command.php:592
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "Bize o profili yollamadınız"
-#: lib/command.php:620
+#: lib/command.php:594
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Bize o profili yollamadınız"
-#: lib/command.php:640
+#: lib/command.php:614
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Uzaktan abonelik"
-#: lib/command.php:642
+#: lib/command.php:616
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Uzaktan abonelik"
-#: lib/command.php:662
+#: lib/command.php:636
#, fuzzy
msgid "You are not a member of any groups."
msgstr "Bize o profili yollamadınız"
-#: lib/command.php:664
+#: lib/command.php:638
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Bize o profili yollamadınız"
-#: lib/command.php:678
+#: lib/command.php:652
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4442,7 +4431,6 @@ msgid ""
"reply #<notice_id> - reply to notice with a given id\n"
"reply <nickname> - reply to the last notice from user\n"
"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
"drop <group> - leave group\n"
"stats - get your stats\n"
"stop - same as 'off'\n"
@@ -4694,7 +4682,7 @@ msgstr ""
msgid "kB"
msgstr ""
-#: lib/jabber.php:192
+#: lib/jabber.php:191
#, php-format
msgid "[%s]"
msgstr ""
@@ -5108,7 +5096,7 @@ msgstr ""
msgid "Tags in %s's notices"
msgstr ""
-#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr "Abonelikler"
@@ -5116,7 +5104,7 @@ msgstr "Abonelikler"
msgid "All subscriptions"
msgstr "Bütün abonelikler"
-#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+#: lib/profileaction.php:140 lib/profileaction.php:201 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr "Abone olanlar"
@@ -5125,15 +5113,15 @@ msgstr "Abone olanlar"
msgid "All subscribers"
msgstr "Abone olanlar"
-#: lib/profileaction.php:177
+#: lib/profileaction.php:178
msgid "User ID"
msgstr ""
-#: lib/profileaction.php:182
+#: lib/profileaction.php:183
msgid "Member since"
msgstr "Üyelik başlangıcı"
-#: lib/profileaction.php:235
+#: lib/profileaction.php:245
msgid "All groups"
msgstr ""
diff --git a/locale/uk/LC_MESSAGES/statusnet.po b/locale/uk/LC_MESSAGES/statusnet.po
index 12c99926b..b3fb43465 100644
--- a/locale/uk/LC_MESSAGES/statusnet.po
+++ b/locale/uk/LC_MESSAGES/statusnet.po
@@ -2,7 +2,6 @@
#
# Author@translatewiki.net: AS
# Author@translatewiki.net: Boogie
-# Author@translatewiki.net: Prima klasy4na
# --
# This file is distributed under the same license as the StatusNet package.
#
@@ -10,12 +9,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-27 23:50+0000\n"
-"PO-Revision-Date: 2009-11-28 19:51:04+0000\n"
+"POT-Creation-Date: 2009-12-02 23:18+0000\n"
+"PO-Revision-Date: 2009-12-02 23:20:56+0000\n"
"Language-Team: Ukrainian\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59523); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59683); Translate extension (2009-11-29)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: uk\n"
"X-Message-Group: out-statusnet\n"
@@ -574,7 +573,7 @@ msgstr "Втяти"
#: actions/emailsettings.php:238 actions/favor.php:75
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
@@ -745,7 +744,7 @@ msgid "Conversation"
msgstr "Розмова"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:206 lib/searchgroupnav.php:82
+#: lib/profileaction.php:216 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "Дописи"
@@ -911,11 +910,11 @@ msgstr "Посилання"
#: actions/designadminpanel.php:572 lib/designsettings.php:247
msgid "Use defaults"
-msgstr "За замовчанням"
+msgstr "За замовч."
#: actions/designadminpanel.php:573 lib/designsettings.php:248
msgid "Restore default designs"
-msgstr "Оновити налаштування за замовчанням"
+msgstr "Оновити налаштування за замовчуванням"
#: actions/designadminpanel.php:579 lib/designsettings.php:254
msgid "Reset back to default"
@@ -989,7 +988,7 @@ msgstr "Налаштування пошти"
#: actions/emailsettings.php:71
#, php-format
msgid "Manage how you get email from %%site.name%%."
-msgstr "Зазначте, як само ви бажаєте отримувати листи з %%site.name%%."
+msgstr "Зазначте, як саме Ви бажаєте отримувати листи з %%site.name%%."
#: actions/emailsettings.php:100 actions/imsettings.php:100
#: actions/smssettings.php:104
@@ -1257,23 +1256,23 @@ msgstr "Користувача, який слідкував за Вашими п
msgid "You can use the local subscription!"
msgstr "Ви можете користуватись локальними підписками!"
-#: actions/finishremotesubscribe.php:96
+#: actions/finishremotesubscribe.php:99
msgid "That user has blocked you from subscribing."
msgstr "Цей користувач заблокував Вашу можливість підписатись."
-#: actions/finishremotesubscribe.php:106
+#: actions/finishremotesubscribe.php:110
msgid "You are not authorized."
msgstr "Не авторизовано."
-#: actions/finishremotesubscribe.php:109
+#: actions/finishremotesubscribe.php:113
msgid "Could not convert request token to access token."
msgstr "Не вдалося перетворити токени запиту на токени звернення."
-#: actions/finishremotesubscribe.php:114
+#: actions/finishremotesubscribe.php:118
msgid "Remote service uses unknown version of OMB protocol."
msgstr "Невідома версія протоколу OMB."
-#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
msgid "Error updating remote profile"
msgstr "Помилка при оновленні віддаленого профілю"
@@ -1482,8 +1481,8 @@ msgstr ""
"Чому б не [зареєструватись](%%action.register%%) і не [створити](%%action."
"newgroup%%) свою власну групу!"
-#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
-#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr "Групи"
@@ -1686,7 +1685,7 @@ msgstr ""
msgid ""
"Use this form to invite your friends and colleagues to use this service."
msgstr ""
-"Скористуйтесь цією формою аби запросити Ваших друзів та колег до нашого "
+"Скористайтесь цією формою аби запросити Ваших друзів та колег до нашого "
"сервісу."
#: actions/invite.php:187
@@ -1817,53 +1816,53 @@ msgstr "%s залишив групу %s"
msgid "Already logged in."
msgstr "Тепер Ви увійшли."
-#: actions/login.php:110 actions/login.php:120
+#: actions/login.php:108 actions/login.php:118
msgid "Invalid or expired token."
msgstr "Недійсний або неправильний токен."
-#: actions/login.php:143
+#: actions/login.php:146
msgid "Incorrect username or password."
msgstr "Неточне ім’я або пароль."
-#: actions/login.php:149
+#: actions/login.php:152
msgid "Error setting user. You are probably not authorized."
msgstr "Помилка. Можливо, Ви не авторизовані."
-#: actions/login.php:204 actions/login.php:257 lib/action.php:458
+#: actions/login.php:207 actions/login.php:260 lib/action.php:458
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Увійти"
-#: actions/login.php:243
+#: actions/login.php:246
msgid "Login to site"
msgstr "Вхід на сайт"
-#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/login.php:249 actions/profilesettings.php:106
#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
#: lib/groupeditform.php:152 lib/userprofile.php:131
msgid "Nickname"
msgstr "Ім’я користувача"
-#: actions/login.php:249 actions/register.php:428
+#: actions/login.php:252 actions/register.php:428
#: lib/accountsettingsaction.php:116
msgid "Password"
msgstr "Пароль"
-#: actions/login.php:252 actions/register.php:477
+#: actions/login.php:255 actions/register.php:477
msgid "Remember me"
msgstr "Пам’ятати мене"
-#: actions/login.php:253 actions/register.php:479
+#: actions/login.php:256 actions/register.php:479
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
"Автоматично входити у майбутньому; не для комп’ютерів загального "
"користування!"
-#: actions/login.php:263
+#: actions/login.php:266
msgid "Lost or forgotten password?"
msgstr "Загубили або забули пароль?"
-#: actions/login.php:282
+#: actions/login.php:285
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -1871,7 +1870,7 @@ msgstr ""
"З міркувань безпеки, будь ласка, введіть ще раз ім’я та пароль, перед тим як "
"змінювати налаштування."
-#: actions/login.php:286
+#: actions/login.php:289
#, php-format
msgid ""
"Login with your username and password. Don't have a username yet? [Register]"
@@ -2061,7 +2060,7 @@ msgstr " (безкоштовно)"
#: actions/othersettings.php:116
msgid "Shorten URLs with"
-msgstr "Скорочені URL-адреси з"
+msgstr "Зручні URL"
#: actions/othersettings.php:117
msgid "Automatic shortening service to use."
@@ -2298,7 +2297,7 @@ msgstr "Налаштування профілю"
msgid ""
"You can update your personal profile info here so people know more about you."
msgstr ""
-"Ви можете доповнити свій особистий профіль і люди знатимуть про Вас більше."
+"Ви можете заповнити свій особистий профіль і люди знатимуть про Вас більше."
#: actions/profilesettings.php:99
msgid "Profile information"
@@ -2307,7 +2306,7 @@ msgstr "Інформація профілю"
#: actions/profilesettings.php:108 lib/groupeditform.php:154
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr ""
-"1-64 літери нижнього регістра і цифри, ніякої пунктуації або інтервалів"
+"1-64 літери нижнього регістру і цифри, ніякої пунктуації або інтервалів"
#: actions/profilesettings.php:111 actions/register.php:447
#: actions/showgroup.php:247 actions/tagother.php:104
@@ -2381,8 +2380,7 @@ msgstr "За яким часовим поясом Ви живете?"
msgid ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
msgstr ""
-"Автоматично підписуватись до тих, хто підписався до мене. (Якщо Ви — бот, то "
-"це саме для Вас. Слава роботам!)"
+"Автоматично підписуватись до тих, хто підписався до мене. (Слава роботам!)"
#: actions/profilesettings.php:221 actions/register.php:223
#, php-format
@@ -2720,7 +2718,7 @@ msgstr "Використовується лише для оновлень, ог
#: actions/register.php:449
msgid "Longer name, preferably your \"real\" name"
-msgstr "Довше ім’я, звичайно ж Ваше \"справжнє\" ім’я :)"
+msgstr "Повне ім’я, звісно ж Ваше справжнє ім’я :)"
#: actions/register.php:493
msgid "My text and files are available under "
@@ -2825,8 +2823,8 @@ msgid "Invalid profile URL (bad format)"
msgstr "Недійсна URL-адреса профілю (неправильний формат)"
#: actions/remotesubscribe.php:168
-msgid ""
-"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+#, fuzzy
+msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
msgstr ""
"Це недійсна URL-адреса профілю (немає документа YADIS; немає або помилкове "
"визначення XRDS)."
@@ -3019,7 +3017,7 @@ msgid "Members"
msgstr "Учасники"
#: actions/showgroup.php:386 lib/profileaction.php:117
-#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
+#: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95
#: lib/tagcloudsection.php:71
msgid "(None)"
msgstr "(Пусто)"
@@ -3028,7 +3026,7 @@ msgstr "(Пусто)"
msgid "All members"
msgstr "Всі учасники"
-#: actions/showgroup.php:429 lib/profileaction.php:173
+#: actions/showgroup.php:429 lib/profileaction.php:174
msgid "Statistics"
msgstr "Статистика"
@@ -3265,15 +3263,15 @@ msgstr "Локаль"
#: actions/siteadminpanel.php:301
msgid "Default timezone"
-msgstr "Часовий пояс за замовчанням"
+msgstr "Часовий пояс за замовчуванням"
#: actions/siteadminpanel.php:302
msgid "Default timezone for the site; usually UTC."
-msgstr "Часовий пояс за замовчанням для сайту; зазвичай UTC."
+msgstr "Часовий пояс за замовчуванням для сайту; зазвичай UTC."
#: actions/siteadminpanel.php:308
msgid "Default site language"
-msgstr "Мова сайту за замовчанням"
+msgstr "Мова сайту за замовчуванням"
#: actions/siteadminpanel.php:316
msgid "URLs"
@@ -3748,7 +3746,7 @@ msgstr "Помилковий текст привітання. Максималь
#: actions/useradminpanel.php:165
#, php-format
msgid "Invalid default subscripton: '%1$s' is not user."
-msgstr "Помилкова підписка за замовчанням: '%1$s' не є користувачем."
+msgstr "Помилкова підписка за замовчуванням: '%1$s' не є користувачем."
#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108
#: lib/personalgroupnav.php:109
@@ -3777,7 +3775,7 @@ msgstr "Текст привітання нових користувачів (255
#: actions/useradminpanel.php:241
msgid "Default subscription"
-msgstr "Підписка за замовчанням"
+msgstr "Підписка за замовчуванням"
#: actions/useradminpanel.php:242
msgid "Automatically subscribe new users to this user."
@@ -4195,7 +4193,7 @@ msgstr "Контакт"
#: lib/action.php:741
msgid "Badge"
-msgstr "«Розштовхати»"
+msgstr "Бедж"
#: lib/action.php:769
msgid "StatusNet software license"
@@ -4441,51 +4439,41 @@ msgstr "Сповіщення увімкнуто."
msgid "Can't turn on notification."
msgstr "Не можна увімкнути сповіщення."
-#: lib/command.php:597
-#, php-format
-msgid "Could not create login token for %s"
-msgstr "Не вдалося створити токен входу для %s"
-
-#: lib/command.php:602
-#, php-format
-msgid "This link is useable only once, and is good for only 2 minutes: %s"
-msgstr ""
-"Це посилання можна використати лише раз, воно дійсне протягом 2 хвилин: %s"
-
-#: lib/command.php:618
+#: lib/command.php:592
msgid "You are not subscribed to anyone."
msgstr "Ви не маєте жодних підписок."
-#: lib/command.php:620
+#: lib/command.php:594
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Ви підписані до цієї особи:"
msgstr[1] "Ви підписані до цих людей:"
msgstr[2] "Ви підписані до цих людей:"
-#: lib/command.php:640
+#: lib/command.php:614
msgid "No one is subscribed to you."
msgstr "До Вас ніхто не підписаний."
-#: lib/command.php:642
+#: lib/command.php:616
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Ця особа є підписаною до Вас:"
msgstr[1] "Ці люди підписані до Вас:"
msgstr[2] "Ці люди підписані до Вас:"
-#: lib/command.php:662
+#: lib/command.php:636
msgid "You are not a member of any groups."
msgstr "Ви не є учасником жодної групи."
-#: lib/command.php:664
+#: lib/command.php:638
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Ви є учасником групи:"
msgstr[1] "Ви є учасником таких груп:"
msgstr[2] "Ви є учасником таких груп:"
-#: lib/command.php:678
+#: lib/command.php:652
+#, fuzzy
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4504,7 +4492,6 @@ msgid ""
"reply #<notice_id> - reply to notice with a given id\n"
"reply <nickname> - reply to the last notice from user\n"
"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
"drop <group> - leave group\n"
"stats - get your stats\n"
"stop - same as 'off'\n"
@@ -4780,7 +4767,7 @@ msgstr "Мб"
msgid "kB"
msgstr "кб"
-#: lib/jabber.php:192
+#: lib/jabber.php:191
#, php-format
msgid "[%s]"
msgstr "[%s]"
@@ -5185,7 +5172,7 @@ msgstr "Зах."
#: lib/noticelist.php:411
msgid "at"
-msgstr "о"
+msgstr "в"
#: lib/noticelist.php:506
msgid "in context"
@@ -5268,7 +5255,7 @@ msgstr "Надіслані вами повідомлення"
msgid "Tags in %s's notices"
msgstr "Теґи у дописах %s"
-#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr "Підписки"
@@ -5276,7 +5263,7 @@ msgstr "Підписки"
msgid "All subscriptions"
msgstr "Всі підписки"
-#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+#: lib/profileaction.php:140 lib/profileaction.php:201 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr "Підписчики"
@@ -5284,15 +5271,15 @@ msgstr "Підписчики"
msgid "All subscribers"
msgstr "Всі підписчики"
-#: lib/profileaction.php:177
+#: lib/profileaction.php:178
msgid "User ID"
msgstr "ІД"
-#: lib/profileaction.php:182
+#: lib/profileaction.php:183
msgid "Member since"
msgstr "З нами від"
-#: lib/profileaction.php:235
+#: lib/profileaction.php:245
msgid "All groups"
msgstr "Всі групи"
diff --git a/locale/vi/LC_MESSAGES/statusnet.po b/locale/vi/LC_MESSAGES/statusnet.po
index e3b2ac65a..b77e2e8fc 100644
--- a/locale/vi/LC_MESSAGES/statusnet.po
+++ b/locale/vi/LC_MESSAGES/statusnet.po
@@ -7,12 +7,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-27 23:50+0000\n"
-"PO-Revision-Date: 2009-11-28 19:51:06+0000\n"
+"POT-Creation-Date: 2009-12-02 23:18+0000\n"
+"PO-Revision-Date: 2009-12-02 23:21:00+0000\n"
"Language-Team: Vietnamese\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59523); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59683); Translate extension (2009-11-29)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: vi\n"
"X-Message-Group: out-statusnet\n"
@@ -584,7 +584,7 @@ msgstr "Nhóm"
#: actions/emailsettings.php:238 actions/favor.php:75
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
@@ -760,7 +760,7 @@ msgid "Conversation"
msgstr "Không có mã số xác nhận."
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:206 lib/searchgroupnav.php:82
+#: lib/profileaction.php:216 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "Tin nhắn"
@@ -1312,26 +1312,26 @@ msgstr "Người dùng đang lắng nghe để không thoát khỏi."
msgid "You can use the local subscription!"
msgstr "Bạn có thể đăng ký tại nơi bạn ở!"
-#: actions/finishremotesubscribe.php:96
+#: actions/finishremotesubscribe.php:99
msgid "That user has blocked you from subscribing."
msgstr ""
-#: actions/finishremotesubscribe.php:106
+#: actions/finishremotesubscribe.php:110
#, fuzzy
msgid "You are not authorized."
msgstr "Chưa được phép."
-#: actions/finishremotesubscribe.php:109
+#: actions/finishremotesubscribe.php:113
#, fuzzy
msgid "Could not convert request token to access token."
msgstr "Không thể chuyển các token yêu cầu đến token truy cập."
-#: actions/finishremotesubscribe.php:114
+#: actions/finishremotesubscribe.php:118
#, fuzzy
msgid "Remote service uses unknown version of OMB protocol."
msgstr "Không biết phiên bản của giao thức OMB."
-#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
msgid "Error updating remote profile"
msgstr "Lỗi xảy ra khi cập nhật hồ sơ cá nhân"
@@ -1549,8 +1549,8 @@ msgid ""
"action.newgroup%%) yourself!"
msgstr ""
-#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
-#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
#, fuzzy
msgid "Groups"
msgstr "Nhóm"
@@ -1887,53 +1887,53 @@ msgstr "%s và nhóm"
msgid "Already logged in."
msgstr "Đã đăng nhập."
-#: actions/login.php:110 actions/login.php:120
+#: actions/login.php:108 actions/login.php:118
#, fuzzy
msgid "Invalid or expired token."
msgstr "Nội dung tin nhắn không hợp lệ"
-#: actions/login.php:143
+#: actions/login.php:146
msgid "Incorrect username or password."
msgstr "Sai tên đăng nhập hoặc mật khẩu."
-#: actions/login.php:149
+#: actions/login.php:152
#, fuzzy
msgid "Error setting user. You are probably not authorized."
msgstr "Chưa được phép."
-#: actions/login.php:204 actions/login.php:257 lib/action.php:458
+#: actions/login.php:207 actions/login.php:260 lib/action.php:458
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Đăng nhập"
-#: actions/login.php:243
+#: actions/login.php:246
msgid "Login to site"
msgstr ""
-#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/login.php:249 actions/profilesettings.php:106
#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
#: lib/groupeditform.php:152 lib/userprofile.php:131
msgid "Nickname"
msgstr "Biệt danh"
-#: actions/login.php:249 actions/register.php:428
+#: actions/login.php:252 actions/register.php:428
#: lib/accountsettingsaction.php:116
msgid "Password"
msgstr "Mật khẩu"
-#: actions/login.php:252 actions/register.php:477
+#: actions/login.php:255 actions/register.php:477
msgid "Remember me"
msgstr "Nhớ tôi"
-#: actions/login.php:253 actions/register.php:479
+#: actions/login.php:256 actions/register.php:479
msgid "Automatically login in the future; not for shared computers!"
msgstr "Sẽ tự động đăng nhập, không dành cho các máy sử dụng chung!"
-#: actions/login.php:263
+#: actions/login.php:266
msgid "Lost or forgotten password?"
msgstr "Mất hoặc quên mật khẩu?"
-#: actions/login.php:282
+#: actions/login.php:285
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -1941,7 +1941,7 @@ msgstr ""
"Vì lý do bảo mật, bạn hãy nhập lại tên đăng nhập và mật khẩu trước khi thay "
"đổi trong điều chỉnh."
-#: actions/login.php:286
+#: actions/login.php:289
#, php-format
msgid ""
"Login with your username and password. Don't have a username yet? [Register]"
@@ -2903,8 +2903,7 @@ msgstr "URL hồ sơ cá nhân không đúng định dạng."
#: actions/remotesubscribe.php:168
#, fuzzy
-msgid ""
-"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
msgstr "Không phải là URL về hồ sơ cá nhân hợp lệ (không phải là "
#: actions/remotesubscribe.php:176
@@ -3087,7 +3086,7 @@ msgid "Members"
msgstr "Thành viên"
#: actions/showgroup.php:386 lib/profileaction.php:117
-#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
+#: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95
#: lib/tagcloudsection.php:71
msgid "(None)"
msgstr ""
@@ -3097,7 +3096,7 @@ msgstr ""
msgid "All members"
msgstr "Thành viên"
-#: actions/showgroup.php:429 lib/profileaction.php:173
+#: actions/showgroup.php:429 lib/profileaction.php:174
msgid "Statistics"
msgstr "Số liệu thống kê"
@@ -4551,47 +4550,37 @@ msgstr "Không có mã số xác nhận."
msgid "Can't turn on notification."
msgstr ""
-#: lib/command.php:597
-#, fuzzy, php-format
-msgid "Could not create login token for %s"
-msgstr "Không thể tạo OpenID mẫu: %s"
-
-#: lib/command.php:602
-#, php-format
-msgid "This link is useable only once, and is good for only 2 minutes: %s"
-msgstr ""
-
-#: lib/command.php:618
+#: lib/command.php:592
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "Bạn chưa cập nhật thông tin riêng"
-#: lib/command.php:620
+#: lib/command.php:594
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Bạn đã theo những người này:"
-#: lib/command.php:640
+#: lib/command.php:614
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Không thể tạo favorite."
-#: lib/command.php:642
+#: lib/command.php:616
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Không thể tạo favorite."
-#: lib/command.php:662
+#: lib/command.php:636
#, fuzzy
msgid "You are not a member of any groups."
msgstr "Bạn chưa cập nhật thông tin riêng"
-#: lib/command.php:664
+#: lib/command.php:638
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Bạn chưa cập nhật thông tin riêng"
-#: lib/command.php:678
+#: lib/command.php:652
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4610,7 +4599,6 @@ msgid ""
"reply #<notice_id> - reply to notice with a given id\n"
"reply <nickname> - reply to the last notice from user\n"
"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
"drop <group> - leave group\n"
"stats - get your stats\n"
"stop - same as 'off'\n"
@@ -4868,7 +4856,7 @@ msgstr ""
msgid "kB"
msgstr ""
-#: lib/jabber.php:192
+#: lib/jabber.php:191
#, php-format
msgid "[%s]"
msgstr ""
@@ -5337,7 +5325,7 @@ msgstr "Thư bạn đã gửi"
msgid "Tags in %s's notices"
msgstr "cảnh báo tin nhắn"
-#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr "Tôi theo bạn này"
@@ -5345,7 +5333,7 @@ msgstr "Tôi theo bạn này"
msgid "All subscriptions"
msgstr "Tất cả đăng nhận"
-#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+#: lib/profileaction.php:140 lib/profileaction.php:201 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr "Bạn này theo tôi"
@@ -5354,15 +5342,15 @@ msgstr "Bạn này theo tôi"
msgid "All subscribers"
msgstr "Bạn này theo tôi"
-#: lib/profileaction.php:177
+#: lib/profileaction.php:178
msgid "User ID"
msgstr ""
-#: lib/profileaction.php:182
+#: lib/profileaction.php:183
msgid "Member since"
msgstr "Gia nhập từ"
-#: lib/profileaction.php:235
+#: lib/profileaction.php:245
#, fuzzy
msgid "All groups"
msgstr "Nhóm"
diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po
index 689217738..2d0853339 100644
--- a/locale/zh_CN/LC_MESSAGES/statusnet.po
+++ b/locale/zh_CN/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-27 23:50+0000\n"
-"PO-Revision-Date: 2009-11-28 19:51:09+0000\n"
+"POT-Creation-Date: 2009-12-02 23:18+0000\n"
+"PO-Revision-Date: 2009-12-02 23:21:03+0000\n"
"Language-Team: Simplified Chinese\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59523); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59683); Translate extension (2009-11-29)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: zh-hans\n"
"X-Message-Group: out-statusnet\n"
@@ -578,7 +578,7 @@ msgstr "剪裁"
#: actions/emailsettings.php:238 actions/favor.php:75
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
@@ -756,7 +756,7 @@ msgid "Conversation"
msgstr "确认码"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:206 lib/searchgroupnav.php:82
+#: lib/profileaction.php:216 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "通告"
@@ -1284,26 +1284,26 @@ msgstr "要查看的用户不存在。"
msgid "You can use the local subscription!"
msgstr "您可以在这里订阅!"
-#: actions/finishremotesubscribe.php:96
+#: actions/finishremotesubscribe.php:99
msgid "That user has blocked you from subscribing."
msgstr "那个用户阻止了你的订阅。"
-#: actions/finishremotesubscribe.php:106
+#: actions/finishremotesubscribe.php:110
#, fuzzy
msgid "You are not authorized."
msgstr "未认证。"
-#: actions/finishremotesubscribe.php:109
+#: actions/finishremotesubscribe.php:113
#, fuzzy
msgid "Could not convert request token to access token."
msgstr "无法将请求标记转换为访问令牌。"
-#: actions/finishremotesubscribe.php:114
+#: actions/finishremotesubscribe.php:118
#, fuzzy
msgid "Remote service uses unknown version of OMB protocol."
msgstr "此OMB协议版本无效。"
-#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
msgid "Error updating remote profile"
msgstr "更新远程的个人信息时出错"
@@ -1520,8 +1520,8 @@ msgid ""
"action.newgroup%%) yourself!"
msgstr ""
-#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
-#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr "组"
@@ -1839,59 +1839,59 @@ msgstr "%s 离开群 %s"
msgid "Already logged in."
msgstr "已登录。"
-#: actions/login.php:110 actions/login.php:120
+#: actions/login.php:108 actions/login.php:118
#, fuzzy
msgid "Invalid or expired token."
msgstr "通告内容不正确"
-#: actions/login.php:143
+#: actions/login.php:146
msgid "Incorrect username or password."
msgstr "用户名或密码不正确。"
-#: actions/login.php:149
+#: actions/login.php:152
#, fuzzy
msgid "Error setting user. You are probably not authorized."
msgstr "未认证。"
-#: actions/login.php:204 actions/login.php:257 lib/action.php:458
+#: actions/login.php:207 actions/login.php:260 lib/action.php:458
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "登录"
-#: actions/login.php:243
+#: actions/login.php:246
msgid "Login to site"
msgstr "登录"
-#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/login.php:249 actions/profilesettings.php:106
#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
#: lib/groupeditform.php:152 lib/userprofile.php:131
msgid "Nickname"
msgstr "昵称"
-#: actions/login.php:249 actions/register.php:428
+#: actions/login.php:252 actions/register.php:428
#: lib/accountsettingsaction.php:116
msgid "Password"
msgstr "密码"
-#: actions/login.php:252 actions/register.php:477
+#: actions/login.php:255 actions/register.php:477
msgid "Remember me"
msgstr "记住登录状态"
-#: actions/login.php:253 actions/register.php:479
+#: actions/login.php:256 actions/register.php:479
msgid "Automatically login in the future; not for shared computers!"
msgstr "保持这台机器上的登录状态。不要在共用的机器上保持登录!"
-#: actions/login.php:263
+#: actions/login.php:266
msgid "Lost or forgotten password?"
msgstr "忘记了密码?"
-#: actions/login.php:282
+#: actions/login.php:285
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
msgstr "由于安全原因,修改设置前需要输入用户名和密码。"
-#: actions/login.php:286
+#: actions/login.php:289
#, fuzzy, php-format
msgid ""
"Login with your username and password. Don't have a username yet? [Register]"
@@ -2826,8 +2826,7 @@ msgstr "个人信息URL不正确(格式错误)"
#: actions/remotesubscribe.php:168
#, fuzzy
-msgid ""
-"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
msgstr "不是有效的个人信息URL(没有YADIS数据)。"
#: actions/remotesubscribe.php:176
@@ -3011,7 +3010,7 @@ msgid "Members"
msgstr "注册于"
#: actions/showgroup.php:386 lib/profileaction.php:117
-#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
+#: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95
#: lib/tagcloudsection.php:71
msgid "(None)"
msgstr "(没有)"
@@ -3020,7 +3019,7 @@ msgstr "(没有)"
msgid "All members"
msgstr "所有成员"
-#: actions/showgroup.php:429 lib/profileaction.php:173
+#: actions/showgroup.php:429 lib/profileaction.php:174
msgid "Statistics"
msgstr "统计"
@@ -4456,47 +4455,37 @@ msgstr "通告开启。"
msgid "Can't turn on notification."
msgstr "无法开启通告。"
-#: lib/command.php:597
-#, fuzzy, php-format
-msgid "Could not create login token for %s"
-msgstr "无法创建 OpenID 表单:%s"
-
-#: lib/command.php:602
-#, php-format
-msgid "This link is useable only once, and is good for only 2 minutes: %s"
-msgstr ""
-
-#: lib/command.php:618
+#: lib/command.php:592
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "您未告知此个人信息"
-#: lib/command.php:620
+#: lib/command.php:594
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "您已订阅这些用户:"
-#: lib/command.php:640
+#: lib/command.php:614
#, fuzzy
msgid "No one is subscribed to you."
msgstr "无法订阅他人更新。"
-#: lib/command.php:642
+#: lib/command.php:616
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "无法订阅他人更新。"
-#: lib/command.php:662
+#: lib/command.php:636
#, fuzzy
msgid "You are not a member of any groups."
msgstr "您未告知此个人信息"
-#: lib/command.php:664
+#: lib/command.php:638
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "您未告知此个人信息"
-#: lib/command.php:678
+#: lib/command.php:652
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4515,7 +4504,6 @@ msgid ""
"reply #<notice_id> - reply to notice with a given id\n"
"reply <nickname> - reply to the last notice from user\n"
"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
"drop <group> - leave group\n"
"stats - get your stats\n"
"stop - same as 'off'\n"
@@ -4769,7 +4757,7 @@ msgstr ""
msgid "kB"
msgstr ""
-#: lib/jabber.php:192
+#: lib/jabber.php:191
#, php-format
msgid "[%s]"
msgstr ""
@@ -5196,7 +5184,7 @@ msgstr "您发送的消息"
msgid "Tags in %s's notices"
msgstr "%s's 的消息的标签"
-#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr "订阅"
@@ -5204,7 +5192,7 @@ msgstr "订阅"
msgid "All subscriptions"
msgstr "所有订阅"
-#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+#: lib/profileaction.php:140 lib/profileaction.php:201 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr "订阅者"
@@ -5213,16 +5201,16 @@ msgstr "订阅者"
msgid "All subscribers"
msgstr "订阅者"
-#: lib/profileaction.php:177
+#: lib/profileaction.php:178
#, fuzzy
msgid "User ID"
msgstr "用户"
-#: lib/profileaction.php:182
+#: lib/profileaction.php:183
msgid "Member since"
msgstr "用户始于"
-#: lib/profileaction.php:235
+#: lib/profileaction.php:245
msgid "All groups"
msgstr "所有组"
diff --git a/locale/zh_TW/LC_MESSAGES/statusnet.po b/locale/zh_TW/LC_MESSAGES/statusnet.po
index ec49a73f8..17a54af33 100644
--- a/locale/zh_TW/LC_MESSAGES/statusnet.po
+++ b/locale/zh_TW/LC_MESSAGES/statusnet.po
@@ -7,12 +7,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-27 23:50+0000\n"
-"PO-Revision-Date: 2009-11-28 19:51:12+0000\n"
+"POT-Creation-Date: 2009-12-02 23:18+0000\n"
+"PO-Revision-Date: 2009-12-02 23:21:06+0000\n"
"Language-Team: Traditional Chinese\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59523); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59683); Translate extension (2009-11-29)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: zh-hant\n"
"X-Message-Group: out-statusnet\n"
@@ -571,7 +571,7 @@ msgstr ""
#: actions/emailsettings.php:238 actions/favor.php:75
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
@@ -748,7 +748,7 @@ msgid "Conversation"
msgstr "地點"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:206 lib/searchgroupnav.php:82
+#: lib/profileaction.php:216 lib/searchgroupnav.php:82
msgid "Notices"
msgstr ""
@@ -1263,24 +1263,24 @@ msgstr ""
msgid "You can use the local subscription!"
msgstr ""
-#: actions/finishremotesubscribe.php:96
+#: actions/finishremotesubscribe.php:99
msgid "That user has blocked you from subscribing."
msgstr ""
-#: actions/finishremotesubscribe.php:106
+#: actions/finishremotesubscribe.php:110
msgid "You are not authorized."
msgstr ""
-#: actions/finishremotesubscribe.php:109
+#: actions/finishremotesubscribe.php:113
#, fuzzy
msgid "Could not convert request token to access token."
msgstr "無法轉換請求標記以致無法存取標記"
-#: actions/finishremotesubscribe.php:114
+#: actions/finishremotesubscribe.php:118
msgid "Remote service uses unknown version of OMB protocol."
msgstr ""
-#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
msgid "Error updating remote profile"
msgstr "更新遠端個人資料發生錯誤"
@@ -1485,8 +1485,8 @@ msgid ""
"action.newgroup%%) yourself!"
msgstr ""
-#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
-#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr ""
@@ -1775,57 +1775,57 @@ msgstr ""
msgid "Already logged in."
msgstr "已登入"
-#: actions/login.php:110 actions/login.php:120
+#: actions/login.php:108 actions/login.php:118
msgid "Invalid or expired token."
msgstr ""
-#: actions/login.php:143
+#: actions/login.php:146
msgid "Incorrect username or password."
msgstr "使用者名稱或密碼錯誤"
-#: actions/login.php:149
+#: actions/login.php:152
msgid "Error setting user. You are probably not authorized."
msgstr ""
-#: actions/login.php:204 actions/login.php:257 lib/action.php:458
+#: actions/login.php:207 actions/login.php:260 lib/action.php:458
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "登入"
-#: actions/login.php:243
+#: actions/login.php:246
msgid "Login to site"
msgstr ""
-#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/login.php:249 actions/profilesettings.php:106
#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
#: lib/groupeditform.php:152 lib/userprofile.php:131
msgid "Nickname"
msgstr "暱稱"
-#: actions/login.php:249 actions/register.php:428
+#: actions/login.php:252 actions/register.php:428
#: lib/accountsettingsaction.php:116
msgid "Password"
msgstr ""
-#: actions/login.php:252 actions/register.php:477
+#: actions/login.php:255 actions/register.php:477
msgid "Remember me"
msgstr ""
-#: actions/login.php:253 actions/register.php:479
+#: actions/login.php:256 actions/register.php:479
msgid "Automatically login in the future; not for shared computers!"
msgstr "未來在同一部電腦自動登入"
-#: actions/login.php:263
+#: actions/login.php:266
msgid "Lost or forgotten password?"
msgstr "遺失或忘記密碼了嗎?"
-#: actions/login.php:282
+#: actions/login.php:285
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
msgstr "為安全起見,請先重新輸入你的使用者名稱與密碼再更改設定。"
-#: actions/login.php:286
+#: actions/login.php:289
#, php-format
msgid ""
"Login with your username and password. Don't have a username yet? [Register]"
@@ -2726,8 +2726,7 @@ msgid "Invalid profile URL (bad format)"
msgstr "個人資料連結無效(格式錯誤)"
#: actions/remotesubscribe.php:168
-msgid ""
-"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
msgstr ""
#: actions/remotesubscribe.php:176
@@ -2908,7 +2907,7 @@ msgid "Members"
msgstr "何時加入會員的呢?"
#: actions/showgroup.php:386 lib/profileaction.php:117
-#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
+#: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95
#: lib/tagcloudsection.php:71
msgid "(None)"
msgstr ""
@@ -2917,7 +2916,7 @@ msgstr ""
msgid "All members"
msgstr ""
-#: actions/showgroup.php:429 lib/profileaction.php:173
+#: actions/showgroup.php:429 lib/profileaction.php:174
msgid "Statistics"
msgstr ""
@@ -4300,47 +4299,37 @@ msgstr ""
msgid "Can't turn on notification."
msgstr ""
-#: lib/command.php:597
-#, fuzzy, php-format
-msgid "Could not create login token for %s"
-msgstr "無法從 %s 建立OpenID"
-
-#: lib/command.php:602
-#, php-format
-msgid "This link is useable only once, and is good for only 2 minutes: %s"
-msgstr ""
-
-#: lib/command.php:618
+#: lib/command.php:592
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "此帳號已註冊"
-#: lib/command.php:620
+#: lib/command.php:594
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "此帳號已註冊"
-#: lib/command.php:640
+#: lib/command.php:614
#, fuzzy
msgid "No one is subscribed to you."
msgstr "無此訂閱"
-#: lib/command.php:642
+#: lib/command.php:616
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "無此訂閱"
-#: lib/command.php:662
+#: lib/command.php:636
#, fuzzy
msgid "You are not a member of any groups."
msgstr "無法連結到伺服器:%s"
-#: lib/command.php:664
+#: lib/command.php:638
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "無法連結到伺服器:%s"
-#: lib/command.php:678
+#: lib/command.php:652
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4359,7 +4348,6 @@ msgid ""
"reply #<notice_id> - reply to notice with a given id\n"
"reply <nickname> - reply to the last notice from user\n"
"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
"drop <group> - leave group\n"
"stats - get your stats\n"
"stop - same as 'off'\n"
@@ -4605,7 +4593,7 @@ msgstr ""
msgid "kB"
msgstr ""
-#: lib/jabber.php:192
+#: lib/jabber.php:191
#, php-format
msgid "[%s]"
msgstr ""
@@ -5018,7 +5006,7 @@ msgstr ""
msgid "Tags in %s's notices"
msgstr ""
-#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr ""
@@ -5026,7 +5014,7 @@ msgstr ""
msgid "All subscriptions"
msgstr "所有訂閱"
-#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+#: lib/profileaction.php:140 lib/profileaction.php:201 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr ""
@@ -5035,15 +5023,15 @@ msgstr ""
msgid "All subscribers"
msgstr "所有訂閱"
-#: lib/profileaction.php:177
+#: lib/profileaction.php:178
msgid "User ID"
msgstr ""
-#: lib/profileaction.php:182
+#: lib/profileaction.php:183
msgid "Member since"
msgstr "何時加入會員的呢?"
-#: lib/profileaction.php:235
+#: lib/profileaction.php:245
msgid "All groups"
msgstr ""
diff --git a/plugins/LilUrl/LilUrlPlugin.php b/plugins/LilUrl/LilUrlPlugin.php
index e906751e8..4a6f1cdc7 100644
--- a/plugins/LilUrl/LilUrlPlugin.php
+++ b/plugins/LilUrl/LilUrlPlugin.php
@@ -54,7 +54,7 @@ class LilUrlPlugin extends UrlShortenerPlugin
if (!isset($y->body)) return;
$x = $y->body->p[0]->a->attributes();
if (isset($x['href'])) {
- return $x['href'];
+ return strval($x['href']);
}
}
}
diff --git a/plugins/Mapstraction/usermap.js b/plugins/Mapstraction/usermap.js
index 270b7efea..e667dd579 100644
--- a/plugins/Mapstraction/usermap.js
+++ b/plugins/Mapstraction/usermap.js
@@ -1,14 +1,83 @@
$(document).ready(function() {
- var mapstraction = new mxn.Mapstraction("map_canvas", _provider);
+ var notices = [];
+ $(".notice").each(function(){
+ var notice = getNoticeFromElement($(this));
+ if(notice['geo'])
+ notices.push(notice);
+ });
+ if($("#map_canvas").length && notices.length>0)
+ {
+ showMapstraction($("#map_canvas"), notices);
+ }
+
+ $('.geo').click(function(){
+ var noticeElement = $(this).closest(".notice");
+ notice = getNoticeFromElement(noticeElement);
+
+ $.fn.jOverlay.options = {
+ color : '#000',
+ opacity : '0.6',
+ zIndex : 99,
+ center : false,
+ bgClickToClose : true,
+ autoHide : true,
+ css : {'max-width':'542px', 'top':'5%', 'left':'32.5%'}
+ };
+ var html="<div id='map_canvas_popup' class='gray smallmap' style='width: 542px; height: 500px' />";
+ html+="<button class='close'>&#215;</button>";
+ html+=$("<div/>").append($(this).clone()).html();
+ $().jOverlay({ "html": html });
+ $('#jOverlayContent').show();
+ $('#jOverlayContent button').click($.closeOverlay);
+
+ showMapstraction($("#map_canvas_popup"), notice);
+
+ return false;
+ });
+});
+
+function getMicroformatValue(element)
+{
+ if(element[0].tagName.toLowerCase() == 'abbr'){
+ return element.attr('title');
+ }else{
+ return element.text();
+ }
+}
+
+function getNoticeFromElement(noticeElement)
+{
+ var notice = {};
+ if(noticeElement.find(".geo").length){
+ var latlon = noticeElement.find(".geo").attr('title').split(";");
+ notice['geo']={'coordinates': [
+ parseFloat(latlon[0]),
+ parseFloat(latlon[1])] };
+ }
+ notice['user']={
+ 'profile_image_url': noticeElement.find("img.avatar").attr('src'),
+ 'profile_url': noticeElement.find(".author a.url").attr('href'),
+ 'screen_name': noticeElement.find(".author .nickname").text()
+ };
+ notice['html']=noticeElement.find(".entry-content").html();
+ notice['url']=noticeElement.find("a.timestamp").attr('href');
+ notice['created_at']=noticeElement.find("abbr.published").text();
+ return notice;
+}
+
+function showMapstraction(element, notices) {
+ if(element instanceof jQuery) element = element[0];
+ if(! $.isArray(notices)) notices = [notices];
+ var mapstraction = new mxn.Mapstraction(element, _provider);
var minLat = 181.0;
var maxLat = -181.0;
var minLon = 181.0;
var maxLon = -181.0;
- for (var i in _notices)
+ for (var i in notices)
{
- var n = _notices[i];
+ var n = notices[i];
var lat = n['geo']['coordinates'][0];
var lon = n['geo']['coordinates'][1];
@@ -42,4 +111,4 @@ $(document).ready(function() {
bounds = new mxn.BoundingBox(minLat, minLon, maxLat, maxLon);
mapstraction.setBounds(bounds);
-});
+}
diff --git a/plugins/MobileProfile/mp-screen.css b/plugins/MobileProfile/mp-screen.css
index 1bb0248ec..e05adeb83 100644
--- a/plugins/MobileProfile/mp-screen.css
+++ b/plugins/MobileProfile/mp-screen.css
@@ -1,3 +1,12 @@
+/** theme: mobile profile screen
+ *
+ * @package StatusNet
+ * @author Sarven Capadisli <csarven@status.net>
+ * @copyright 2009 StatusNet, Inc.
+ * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link http://status.net/
+ */
+
@import url(../../theme/base/css/display.css);
@import url(../../theme/identica/css/display.css);
@@ -64,8 +73,6 @@ width:auto;
margin-left:0;
}
-
-
#site_nav_global_primary {
margin:0;
width:100%;
@@ -81,7 +88,6 @@ float:left;
font-size:0.9em;
}
-
#form_notice {
width:100%;
}
@@ -106,13 +112,16 @@ iPhone/iPod Touch, Android, Opera Mini Simulator
display:none;
}
#form_notice #notice_data-attach {
-top:auto;
-bottom:0;
-left:0;
-right:auto;
-opacity:1;
-z-index:9;
+position:static;
+clear:both;
width:65%;
+height:auto;
+display:block;
+z-index:9;
+padding:0;
+margin:0;
+background:none;
+opacity:1;
}
#form_notice #notice_action-submit {
@@ -168,9 +177,6 @@ margin-bottom:0;
padding-top:4px;
padding-bottom:4px;
}
-.notice .entry-title {
-
-}
.notice div.entry-content {
margin-left:0;
width:65%;
@@ -180,14 +186,21 @@ width:30%;
margin-right:2%;
}
-
+.notice-options form {
+width:16px;
+height:16px;
+}
+.notice-options a,
+.notice-options input {
+box-shadow:none;
+-moz-box-shadow:none;
+-webkit-box-shadow:none;
+}
.entity_profile {
width:auto;
}
-
-
.entity_actions {
margin-right:0;
margin-left:0;
@@ -239,8 +252,6 @@ height:auto;
margin-right:5%;
}
-
-
#footer {
width:96%;
padding:2%;
diff --git a/plugins/PtitUrl/PtitUrlPlugin.php b/plugins/PtitUrl/PtitUrlPlugin.php
index ef453e96d..76a438dd5 100644
--- a/plugins/PtitUrl/PtitUrlPlugin.php
+++ b/plugins/PtitUrl/PtitUrlPlugin.php
@@ -47,11 +47,14 @@ class PtitUrlPlugin extends UrlShortenerPlugin
{
$response = $this->http_get(sprintf($this->serviceUrl,urlencode($url)));
if (!$response) return;
- $response = $this->tidy($response);
- $y = @simplexml_load_string($response);
+ $dom = new DOMDocument();
+ @$dom->loadHTML($response);
+ $y = @simplexml_import_dom($dom);
if (!isset($y->body)) return;
$xml = $y->body->center->table->tr->td->pre->a->attributes();
- if (isset($xml['href'])) return $xml['href'];
+ if (isset($xml['href'])) {
+ return strval($xml['href']);
+ }
}
}
diff --git a/plugins/Realtime/RealtimePlugin.php b/plugins/Realtime/RealtimePlugin.php
index b737e442a..cbfa6bae0 100644
--- a/plugins/Realtime/RealtimePlugin.php
+++ b/plugins/Realtime/RealtimePlugin.php
@@ -220,8 +220,9 @@ class RealtimePlugin extends Plugin
$action->elementStart('body',
(common_current_user()) ? array('id' => $action->trimmed('action'),
- 'class' => 'user_in')
- : array('id' => $action->trimmed('action')));
+ 'class' => 'user_in realtime-popup')
+ : array('id' => $action->trimmed('action'),
+ 'class'=> 'realtime-popup'));
// XXX hack to deal with JS that tries to get the
// root url from page output
diff --git a/plugins/Realtime/realtimeupdate.css b/plugins/Realtime/realtimeupdate.css
index 0ab5dd32b..56f869354 100644
--- a/plugins/Realtime/realtimeupdate.css
+++ b/plugins/Realtime/realtimeupdate.css
@@ -1,3 +1,40 @@
+.realtime-popup address {
+display:none;
+}
+
+.realtime-popup #content {
+width:93.5%;
+}
+
+.realtime-popup #form_notice {
+margin:18px 0 18px 1.795%;
+width:93%;
+max-width:451px;
+}
+
+.realtime-popup #form_notice label[for=notice_data-text],
+.realtime-popup h1 {
+display:none;
+}
+
+.realtime-popup #form_notice label[for=notice_data-attach],
+.realtime-popup #form_notice #notice_data-attach {
+top:0;
+}
+
+.realtime-popup #form_notice #notice_data-attach {
+left:auto;
+right:0;
+}
+
+.realtime-popup .entity_profile {
+width:70%;
+}
+.realtime-popup .entity_actions {
+margin-left:1%;
+}
+
+
#notices_primary {
position:relative;
}
diff --git a/plugins/Realtime/realtimeupdate.js b/plugins/Realtime/realtimeupdate.js
index ec027e11d..ce0297339 100644
--- a/plugins/Realtime/realtimeupdate.js
+++ b/plugins/Realtime/realtimeupdate.js
@@ -94,14 +94,12 @@ RealtimeUpdate = {
$("#notices_primary .notice:first").fadeIn(1000);
SN.U.FormXHR($('#'+noticeItemID+' .form_favor'));
- SN.U.NoticeReply();
+ SN.U.NoticeReplyTo($('#'+noticeItemID));
+ SN.U.NoticeWithAttachment($('#'+noticeItemID));
},
purgeLastNoticeItem: function() {
if ($('#notices_primary .notice').length > RealtimeUpdate._maxnotices) {
- $("#notices_primary .notice:last .form_disfavor").unbind('submit');
- $("#notices_primary .notice:last .form_favor").unbind('submit');
- $("#notices_primary .notice:last .notice_reply").unbind('click');
$("#notices_primary .notice:last").remove();
}
},
@@ -270,7 +268,7 @@ RealtimeUpdate = {
PP.bind('click', function() {
window.open(url,
'',
- 'toolbar=no,resizable=yes,scrollbars=yes,status=yes,width=500,height=550');
+ 'toolbar=no,resizable=yes,scrollbars=yes,status=no,menubar=no,personalbar=no,location=no,width=500,height=550');
return false;
});
@@ -278,26 +276,6 @@ RealtimeUpdate = {
initPopupWindow: function()
{
- $('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'
- });
-
$('.notices .entry-title a, .notices .entry-content a').bind('click', function() {
window.open(this.href, '');
diff --git a/plugins/TightUrl/TightUrlPlugin.php b/plugins/TightUrl/TightUrlPlugin.php
index 56414c8c8..6ced9afdc 100644
--- a/plugins/TightUrl/TightUrlPlugin.php
+++ b/plugins/TightUrl/TightUrlPlugin.php
@@ -48,10 +48,13 @@ class TightUrlPlugin extends UrlShortenerPlugin
{
$response = $this->http_get(sprintf($this->serviceUrl,urlencode($url)));
if (!$response) return;
- $response = $this->tidy($response);
- $y = @simplexml_load_string($response);
+ $dom = new DOMDocument();
+ @$dom->loadHTML($response);
+ $y = @simplexml_import_dom($dom);
if (!isset($y->body)) return;
$xml = $y->body->p[0]->code[0]->a->attributes();
- if (isset($xml['href'])) return $xml['href'];
+ if (isset($xml['href'])) {
+ return strval($xml['href']);
+ }
}
}
diff --git a/plugins/TwitterBridge/daemons/twitterstatusfetcher.php b/plugins/TwitterBridge/daemons/twitterstatusfetcher.php
index b5428316b..eba1d563b 100755
--- a/plugins/TwitterBridge/daemons/twitterstatusfetcher.php
+++ b/plugins/TwitterBridge/daemons/twitterstatusfetcher.php
@@ -109,7 +109,6 @@ class TwitterStatusFetcher extends ParallelizingDaemon
$flink->find();
$flinks = array();
- common_log(LOG_INFO, "hello");
while ($flink->fetch()) {
diff --git a/plugins/UrlShortener/UrlShortenerPlugin.php b/plugins/UrlShortener/UrlShortenerPlugin.php
index 37206aa89..027624b7a 100644
--- a/plugins/UrlShortener/UrlShortenerPlugin.php
+++ b/plugins/UrlShortener/UrlShortenerPlugin.php
@@ -68,14 +68,6 @@ abstract class UrlShortenerPlugin extends Plugin
return $response->getBody();
}
- protected function tidy($response) {
- $response = str_replace('&nbsp;', ' ', $response);
- $config = array('output-xhtml' => true);
- $tidy = new tidy;
- $tidy->parseString($response, $config, 'utf8');
- $tidy->cleanRepair();
- return (string)$tidy;
- }
//------------Below are the methods that connect StatusNet to the implementing Url Shortener plugin------------\\
function onInitializePlugin(){
diff --git a/plugins/UserFlag/UserFlagPlugin.php b/plugins/UserFlag/UserFlagPlugin.php
index 1f1f19957..60c0c2c0a 100644
--- a/plugins/UserFlag/UserFlagPlugin.php
+++ b/plugins/UserFlag/UserFlagPlugin.php
@@ -138,19 +138,15 @@ class UserFlagPlugin extends Plugin
function onEndShowStatusNetStyles($action)
{
- $action->elementStart('style', array('type' => 'text/css'));
- $action->raw('.entity_flag input, .entity_flag p {'.
- ' background:url('.common_path('plugins/UserFlag/flag.gif').') 5px 5px no-repeat;'.
- ' }');
- $action->elementEnd('style');
-
+ $action->cssLink(common_path('plugins/UserFlag/userflag.css'),
+ null, 'screen, projection, tv');
return true;
}
function onEndShowScripts($action)
{
$action->elementStart('script', array('type' => 'text/javascript'));
- $action->raw('/*<![CDATA[*/ SN.U.FormXHR($(".form_entity_flag")); /*]]>*/');
+ $action->raw('/*<![CDATA[*/ if ($(".form_entity_flag").length > 0) { SN.U.FormXHR($(".form_entity_flag")); } /*]]>*/');
$action->elementEnd('script');
return true;
}
diff --git a/plugins/UserFlag/adminprofileflag.php b/plugins/UserFlag/adminprofileflag.php
index 1ac76b506..20b808637 100644
--- a/plugins/UserFlag/adminprofileflag.php
+++ b/plugins/UserFlag/adminprofileflag.php
@@ -145,10 +145,15 @@ class FlaggedProfileListItem extends ProfileListItem
$this->startActions();
if (Event::handle('StartProfileListItemActionElements', array($this))) {
+ $this->out->elementStart('li', 'entity_moderation');
+ $this->out->element('p', null, _('Moderate'));
+ $this->out->elementStart('ul');
$this->showSandboxButton();
$this->showSilenceButton();
$this->showDeleteButton();
$this->showClearButton();
+ $this->out->elementEnd('ul');
+ $this->out->elementEnd('li');
Event::handle('EndProfileListItemActionElements', array($this));
}
$this->endActions();
diff --git a/plugins/UserFlag/flag.gif b/plugins/UserFlag/icon_flag.gif
index 68c8aee25..68c8aee25 100644
--- a/plugins/UserFlag/flag.gif
+++ b/plugins/UserFlag/icon_flag.gif
Binary files differ
diff --git a/plugins/UserFlag/userflag.css b/plugins/UserFlag/userflag.css
new file mode 100644
index 000000000..98da24cc9
--- /dev/null
+++ b/plugins/UserFlag/userflag.css
@@ -0,0 +1,4 @@
+.entity_flag input.submit,
+.entity_flag p {
+background:url(icon_flag.gif) 5px 5px no-repeat;
+}
diff --git a/scripts/checkschema.php b/scripts/checkschema.php
index bf52abe15..bf52abe15 100644..100755
--- a/scripts/checkschema.php
+++ b/scripts/checkschema.php
diff --git a/scripts/stopdaemons.sh b/scripts/stopdaemons.sh
index 55b404c1a..90e7331ca 100755
--- a/scripts/stopdaemons.sh
+++ b/scripts/stopdaemons.sh
@@ -25,7 +25,7 @@ DIR=`php $SDIR/getpiddir.php`
for f in jabberhandler ombhandler publichandler smshandler pinghandler \
xmppconfirmhandler xmppdaemon twitterhandler facebookhandler \
- twitterstatusfetcher synctwitterfriends; do
+ twitterstatusfetcher synctwitterfriends pluginhandler; do
FILES="$DIR/$f.*.pid"
for ff in "$FILES" ; do
diff --git a/scripts/update_translations.php b/scripts/update_translations.php
index 580c472ee..45fe460a0 100755
--- a/scripts/update_translations.php
+++ b/scripts/update_translations.php
@@ -109,7 +109,10 @@ foreach ($languages as $language) {
file_put_contents($pofile, $new_file);
// --backup=off is workaround for Mac OS X fail
system(sprintf('msgmerge -U --backup=off %s %s', $pofile, $statusnet_pot));
- system(sprintf('msgfmt -f -o %s %s', $mofile, $pofile));
+ /* Do not rebuild/add .mo files by default
+ * FIXME: should be made a command line parameter.
+ system(sprintf('msgfmt -o %s %s', $mofile, $pofile));
+ */
} else {
echo "Unchanged - ".$code."\n";
}
diff --git a/theme/readme.txt b/theme/README
index d030f2db4..266a89fdf 100644
--- a/theme/readme.txt
+++ b/theme/README
@@ -1,10 +1,10 @@
-/** Howto: create a statusnet theme
+/** Howto: create a StatusNet theme
*
* @package StatusNet
- * @author Sarven Capadisli <csarven@status.net>
- * @copyright 2009 Control Yourself, Inc.
+ * @author Sarven Capadisli <csarven@status.net>
+ * @copyright 2009 StatusNet, Inc.
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link http://laconi.ca/
+ * @link http://status.net/
*/
Location of key paths and files under theme/:
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index f1bc9c8ac..44d1d0300 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -48,14 +48,6 @@ padding:4px;
font-family:sans-serif;
font-size:1em;
}
-input, textarea, select {
-border-width:2px;
-border-style: solid;
-border-radius:4px;
--moz-border-radius:4px;
--webkit-border-radius:4px;
-}
-
input.submit {
font-weight:bold;
cursor:pointer;
@@ -574,6 +566,7 @@ padding:0;
border:0;
text-align:center;
font-weight:bold;
+cursor:pointer;
}
/* entity_profile */
@@ -701,7 +694,7 @@ padding-left:23px;
.entity_actions a,
.entity_actions p {
-padding:1px 4px 1px 26px;
+padding:2px 4px 1px 26px;
}
.entity_remote_subscribe {
@@ -749,6 +742,35 @@ display:none;
text-align:center;
}
+.entity_moderation {
+position:relative;
+}
+.entity_moderation p {
+border-radius:4px;
+-moz-border-radius:4px;
+-webkit-border-radius:4px;
+font-weight:bold;
+padding-bottom:2px;
+margin-bottom:7px;
+}
+.entity_moderation ul {
+display:none;
+}
+.entity_moderation:hover ul {
+display:block;
+min-width:21%;
+width:100%;
+padding:11px;
+position:absolute;
+top:-1px;
+right:-1px;
+z-index:1;
+border-width:1px;
+border-style:solid;
+border-radius:7px;
+-moz-border-radius:7px;
+-webkit-border-radius:7px;
+}
.entity_tags ul {
list-style-type:none;
@@ -986,7 +1008,7 @@ float:left;
.notice-options .form_favor,
.notice-options .form_disfavor {
float:left;
-margin-left:18px;
+margin-left:20%;
}
.notice-options .form_favor,
.notice-options .form_disfavor {
diff --git a/theme/base/images/icons/icons-01.gif b/theme/base/images/icons/icons-01.gif
index f19d6a3f6..e910c86c0 100644
--- a/theme/base/images/icons/icons-01.gif
+++ b/theme/base/images/icons/icons-01.gif
Binary files differ
diff --git a/theme/base/images/icons/twotone/green/badge.gif b/theme/base/images/icons/twotone/green/badge.gif
new file mode 100644
index 000000000..2dca5b99f
--- /dev/null
+++ b/theme/base/images/icons/twotone/green/badge.gif
Binary files differ
diff --git a/theme/base/images/icons/twotone/green/sandbox.gif b/theme/base/images/icons/twotone/green/sandbox.gif
new file mode 100644
index 000000000..17031962a
--- /dev/null
+++ b/theme/base/images/icons/twotone/green/sandbox.gif
Binary files differ
diff --git a/theme/base/images/icons/twotone/green/silence.gif b/theme/base/images/icons/twotone/green/silence.gif
new file mode 100644
index 000000000..8c624acdd
--- /dev/null
+++ b/theme/base/images/icons/twotone/green/silence.gif
Binary files differ
diff --git a/theme/base/images/icons/twotone/green/skull.gif b/theme/base/images/icons/twotone/green/skull.gif
new file mode 100644
index 000000000..033506732
--- /dev/null
+++ b/theme/base/images/icons/twotone/green/skull.gif
Binary files differ
diff --git a/theme/default/css/display.css b/theme/default/css/display.css
index f4af07081..ad64b4198 100644
--- a/theme/default/css/display.css
+++ b/theme/default/css/display.css
@@ -20,7 +20,13 @@ font-size:1em;
address {
margin-right:5.7%;
}
-
+input, textarea, select {
+border-width:2px;
+border-style: solid;
+border-radius:4px;
+-moz-border-radius:4px;
+-webkit-border-radius:4px;
+}
input, textarea, select, option {
font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
}
@@ -40,7 +46,8 @@ box-shadow:3px 3px 7px rgba(194, 194, 194, 0.3);
.entity_send-a-message .form_notice,
.pagination .nav_prev a,
.pagination .nav_next a,
-.form_settings fieldset fieldset {
+.form_settings fieldset fieldset,
+.entity_moderation:hover ul {
border-color:#DDDDDD;
}
@@ -61,6 +68,7 @@ input.submit,
.entity_remote_subscribe,
.entity_actions a,
.entity_actions input,
+.entity_moderation p,
button {
box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
-moz-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
@@ -89,7 +97,8 @@ a,
.form_settings input.form_action-primary,
.notice-options input,
.entity_actions a,
-.entity_actions input {
+.entity_actions input,
+.entity_moderation p {
color:#002FA7;
}
@@ -97,8 +106,8 @@ color:#002FA7;
.profile {
border-top-color:#C8D1D5;
}
-.section .profile {
-border-top-color:#87B4C8;
+.mark-top {
+border-color:#AAAAAA;
}
#aside_primary {
@@ -144,13 +153,18 @@ button.close,
.form_user_unsubscribe input.submit,
.form_group_join input.submit,
.form_user_subscribe input.submit,
-.entity_subscribe a {
+.entity_subscribe a,
+.entity_moderation p,
+.entity_sandbox input.submit,
+.entity_silence input.submit,
+.entity_delete input.submit {
background-image:url(../../base/images/icons/icons-01.gif);
background-repeat:no-repeat;
background-color:transparent;
}
-#wrap form.processing input.submit {
+#wrap form.processing input.submit,
+.entity_actions a.processing {
background:#FFFFFF url(../../base/images/icons/icon_processing.gif) no-repeat 47% 47%;
cursor:wait;
text-indent:-9999px;
@@ -169,11 +183,12 @@ border-color:transparent;
}
#content,
#site_nav_local_views .current a,
-.entity_send-a-message .form_notice {
+.entity_send-a-message .form_notice,
+.entity_moderation:hover ul {
background-color:#FFFFFF;
}
-#site_nav_local_views li {
+#site_nav_local_views li.current {
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);
@@ -252,7 +267,8 @@ background-position: 5px -718px;
.entity_send-a-message a {
background-position: 5px -852px;
}
-.entity_send-a-message .form_notice {
+.entity_send-a-message .form_notice,
+.entity_moderation:hover ul {
box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7);
-moz-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7);
-webkit-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7);
@@ -271,6 +287,18 @@ background-position: 5px -918px;
.form_make_admin input.submit {
background-position: 5px -983px;
}
+.entity_moderation p {
+background-position: 5px -1313px;
+}
+.entity_sandbox input.submit {
+background-position: 5px -1380px;
+}
+.entity_silence input.submit {
+background-position: 5px -1445px;
+}
+.entity_delete input.submit {
+background-position: 5px -1511px;
+}
/* NOTICES */
.notice .attachment {
diff --git a/theme/default/css/ie.css b/theme/default/css/ie.css
index a0d3cd682..228347166 100644
--- a/theme/default/css/ie.css
+++ b/theme/default/css/ie.css
@@ -7,8 +7,14 @@ color:#FFFFFF;
background-color:#C8D1D5;
}
.form_notice .form_note + label {
-background:transparent url(../../base/images/icons/twotone/green/clip-01.gif) no-repeat 0 45%;
+background:transparent url(../../base/images/icons/icons-01.gif) no-repeat 0 -328px;
}
.form_notice #notice_data-attach {
filter: alpha(opacity=0);
}
+.notice-options form.form_favor input.submit {
+background-position:0 -460px;
+}
+.notice-options form.form_disfavor input.submit {
+background-position:0 -526px;
+}
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index ff7311302..d5a5d38de 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -20,7 +20,13 @@ font-size:1em;
address {
margin-right:7.2%;
}
-
+input, textarea, select {
+border-width:2px;
+border-style: solid;
+border-radius:4px;
+-moz-border-radius:4px;
+-webkit-border-radius:4px;
+}
input, textarea, select, option {
font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
}
@@ -40,7 +46,8 @@ box-shadow:3px 3px 7px rgba(194, 194, 194, 0.3);
.entity_send-a-message .form_notice,
.pagination .nav_prev a,
.pagination .nav_next a,
-.form_settings fieldset fieldset {
+.form_settings fieldset fieldset,
+.entity_moderation:hover ul {
border-color:#DDDDDD;
}
@@ -61,6 +68,7 @@ input.submit,
.entity_remote_subscribe,
.entity_actions a,
.entity_actions input,
+.entity_moderation p,
button {
box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
-moz-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
@@ -89,7 +97,8 @@ a,
.form_settings input.form_action-primary,
.notice-options input,
.entity_actions a,
-.entity_actions input {
+.entity_actions input,
+.entity_moderation p {
color:#002FA7;
}
@@ -97,8 +106,8 @@ color:#002FA7;
.profile {
border-top-color:#CEE1E9;
}
-.section .profile {
-border-top-color:#87B4C8;
+.mark-top {
+border-color:#AAAAAA;
}
#aside_primary {
@@ -144,13 +153,18 @@ button.close,
.form_user_unsubscribe input.submit,
.form_group_join input.submit,
.form_user_subscribe input.submit,
-.entity_subscribe a {
+.entity_subscribe a,
+.entity_moderation p,
+.entity_sandbox input.submit,
+.entity_silence input.submit,
+.entity_delete input.submit {
background-image:url(../../base/images/icons/icons-01.gif);
background-repeat:no-repeat;
background-color:transparent;
}
-#wrap form.processing input.submit {
+#wrap form.processing input.submit,
+.entity_actions a.processing {
background:#FFFFFF url(../../base/images/icons/icon_processing.gif) no-repeat 47% 47%;
cursor:wait;
text-indent:-9999px;
@@ -169,11 +183,12 @@ border-color:transparent;
}
#content,
#site_nav_local_views .current a,
-.entity_send-a-message .form_notice {
+.entity_send-a-message .form_notice,
+.entity_moderation:hover ul {
background-color:#FFFFFF;
}
-#site_nav_local_views li {
+#site_nav_local_views li.current {
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);
@@ -251,7 +266,8 @@ background-position: 5px -718px;
.entity_send-a-message a {
background-position: 5px -852px;
}
-.entity_send-a-message .form_notice {
+.entity_send-a-message .form_notice,
+.entity_moderation:hover ul {
box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7);
-moz-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7);
-webkit-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7);
@@ -270,6 +286,18 @@ background-position: 5px -918px;
.form_make_admin input.submit {
background-position: 5px -983px;
}
+.entity_moderation p {
+background-position: 5px -1313px;
+}
+.entity_sandbox input.submit {
+background-position: 5px -1380px;
+}
+.entity_silence input.submit {
+background-position: 5px -1445px;
+}
+.entity_delete input.submit {
+background-position: 5px -1511px;
+}
/* NOTICES */
.notice .attachment {
diff --git a/theme/identica/css/ie.css b/theme/identica/css/ie.css
index 9ede1e324..f69c13ae7 100644
--- a/theme/identica/css/ie.css
+++ b/theme/identica/css/ie.css
@@ -7,7 +7,7 @@ color:#FFFFFF;
background-color:#D9DADB;
}
.form_notice .form_note + label {
-background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -328px;
+background:transparent url(../../base/images/icons/icons-01.gif) no-repeat 0 -328px;
}
.form_notice #notice_data-attach {
filter: alpha(opacity=0);