summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--actions/login.php2
-rw-r--r--actions/newnotice.php9
-rw-r--r--js/geometa.js216
-rw-r--r--js/util.js14
-rw-r--r--lib/action.php1
-rw-r--r--lib/noticeform.php19
-rw-r--r--lib/router.php54
-rw-r--r--locale/ar/LC_MESSAGES/statusnet.po444
-rw-r--r--locale/bg/LC_MESSAGES/statusnet.po444
-rw-r--r--locale/ca/LC_MESSAGES/statusnet.po442
-rw-r--r--locale/cs/LC_MESSAGES/statusnet.po445
-rw-r--r--locale/de/LC_MESSAGES/statusnet.po440
-rw-r--r--locale/el/LC_MESSAGES/statusnet.po434
-rw-r--r--locale/en_GB/LC_MESSAGES/statusnet.po444
-rw-r--r--locale/es/LC_MESSAGES/statusnet.po449
-rw-r--r--locale/fi/LC_MESSAGES/statusnet.po444
-rw-r--r--locale/fr/LC_MESSAGES/statusnet.po444
-rw-r--r--locale/ga/LC_MESSAGES/statusnet.po446
-rw-r--r--locale/he/LC_MESSAGES/statusnet.po445
-rw-r--r--locale/is/LC_MESSAGES/statusnet.po437
-rw-r--r--locale/it/LC_MESSAGES/statusnet.po442
-rw-r--r--locale/ja/LC_MESSAGES/statusnet.po445
-rw-r--r--locale/ko/LC_MESSAGES/statusnet.po442
-rw-r--r--locale/mk/LC_MESSAGES/statusnet.po445
-rw-r--r--locale/nb/LC_MESSAGES/statusnet.po444
-rw-r--r--locale/nl/LC_MESSAGES/statusnet.po444
-rw-r--r--locale/nn/LC_MESSAGES/statusnet.po442
-rw-r--r--locale/pl/LC_MESSAGES/statusnet.po444
-rw-r--r--locale/pt/LC_MESSAGES/statusnet.po442
-rw-r--r--locale/pt_BR/LC_MESSAGES/statusnet.po448
-rw-r--r--locale/ru/LC_MESSAGES/statusnet.po445
-rw-r--r--locale/statusnet.po411
-rw-r--r--locale/sv/LC_MESSAGES/statusnet.po446
-rw-r--r--locale/te/LC_MESSAGES/statusnet.po443
-rw-r--r--locale/tr/LC_MESSAGES/statusnet.po445
-rw-r--r--locale/uk/LC_MESSAGES/statusnet.po442
-rw-r--r--locale/vi/LC_MESSAGES/statusnet.po449
-rw-r--r--locale/zh_CN/LC_MESSAGES/statusnet.po447
-rw-r--r--locale/zh_TW/LC_MESSAGES/statusnet.po445
39 files changed, 10448 insertions, 4036 deletions
diff --git a/actions/login.php b/actions/login.php
index 63955e3f5..cee29fd09 100644
--- a/actions/login.php
+++ b/actions/login.php
@@ -164,7 +164,7 @@ class LoginAction extends Action
} else {
$url = common_local_url('all',
array('nickname' =>
- $nickname));
+ $user->nickname));
}
common_redirect($url, 303);
diff --git a/actions/newnotice.php b/actions/newnotice.php
index fbd7ab6bc..dd6da0b01 100644
--- a/actions/newnotice.php
+++ b/actions/newnotice.php
@@ -164,6 +164,11 @@ class NewnoticeAction extends Action
$replyto = 'false';
}
+ $lat = $this->trimmed('lat');
+ $lon = $this->trimmed('lon');
+ $location_id = $this->trimmed('location_id');
+ $location_ns = $this->trimmed('location_ns');
+
$upload = null;
$upload = MediaFile::fromUpload('attach');
@@ -183,7 +188,9 @@ class NewnoticeAction extends Action
}
$notice = Notice::saveNew($user->id, $content_shortened, 'web', 1,
- ($replyto == 'false') ? null : $replyto);
+ ($replyto == 'false') ? null : $replyto,
+ null, null,
+ $lat, $lon, $location_id, $location_ns);
if (isset($upload)) {
$upload->attachToNotice($notice);
diff --git a/js/geometa.js b/js/geometa.js
new file mode 100644
index 000000000..ced5be060
--- /dev/null
+++ b/js/geometa.js
@@ -0,0 +1,216 @@
+// A shim to implement the W3C Geolocation API Specification using Gears or the Ajax API
+if ( typeof navigator.geolocation == "undefined" || navigator.geolocation.shim ) (function(){
+
+// -- BEGIN GEARS_INIT
+(function() {
+ // We are already defined. Hooray!
+ if (window.google && google.gears) {
+ return;
+ }
+
+ var factory = null;
+
+ // Firefox
+ if (typeof GearsFactory != 'undefined') {
+ factory = new GearsFactory();
+ } else {
+ // IE
+ try {
+ factory = new ActiveXObject('Gears.Factory');
+ // privateSetGlobalObject is only required and supported on WinCE.
+ if (factory.getBuildInfo().indexOf('ie_mobile') != -1) {
+ factory.privateSetGlobalObject(this);
+ }
+ } catch (e) {
+ // Safari
+ if ((typeof navigator.mimeTypes != 'undefined')
+ && navigator.mimeTypes["application/x-googlegears"]) {
+ factory = document.createElement("object");
+ factory.style.display = "none";
+ factory.width = 0;
+ factory.height = 0;
+ factory.type = "application/x-googlegears";
+ document.documentElement.appendChild(factory);
+ }
+ }
+ }
+
+ // *Do not* define any objects if Gears is not installed. This mimics the
+ // behavior of Gears defining the objects in the future.
+ if (!factory) {
+ return;
+ }
+
+ // Now set up the objects, being careful not to overwrite anything.
+ //
+ // Note: In Internet Explorer for Windows Mobile, you can't add properties to
+ // the window object. However, global objects are automatically added as
+ // properties of the window object in all browsers.
+ if (!window.google) {
+ google = {};
+ }
+
+ if (!google.gears) {
+ google.gears = {factory: factory};
+ }
+})();
+// -- END GEARS_INIT
+
+var GearsGeoLocation = (function() {
+ // -- PRIVATE
+ var geo = google.gears.factory.create('beta.geolocation');
+
+ var wrapSuccess = function(callback, self) { // wrap it for lastPosition love
+ return function(position) {
+ callback(position);
+ self.lastPosition = position;
+ }
+ }
+
+ // -- PUBLIC
+ return {
+ shim: true,
+
+ type: "Gears",
+
+ lastPosition: null,
+
+ getCurrentPosition: function(successCallback, errorCallback, options) {
+ var self = this;
+ var sc = wrapSuccess(successCallback, self);
+ geo.getCurrentPosition(sc, errorCallback, options);
+ },
+
+ watchPosition: function(successCallback, errorCallback, options) {
+ geo.watchPosition(successCallback, errorCallback, options);
+ },
+
+ clearWatch: function(watchId) {
+ geo.clearWatch(watchId);
+ },
+
+ getPermission: function(siteName, imageUrl, extraMessage) {
+ geo.getPermission(siteName, imageUrl, extraMessage);
+ }
+
+ };
+})();
+
+var AjaxGeoLocation = (function() {
+ // -- PRIVATE
+ var loading = false;
+ var loadGoogleLoader = function() {
+ if (!hasGoogleLoader() && !loading) {
+ loading = true;
+ var s = document.createElement('script');
+ s.src = 'http://www.google.com/jsapi?callback=_google_loader_apiLoaded';
+ s.type = "text/javascript";
+ document.getElementsByTagName('body')[0].appendChild(s);
+ }
+ };
+
+ var queue = [];
+ var addLocationQueue = function(callback) {
+ queue.push(callback);
+ }
+
+ var runLocationQueue = function() {
+ if (hasGoogleLoader()) {
+ while (queue.length > 0) {
+ var call = queue.pop();
+ call();
+ }
+ }
+ }
+
+ window['_google_loader_apiLoaded'] = function() {
+ runLocationQueue();
+ }
+
+ var hasGoogleLoader = function() {
+ return (window['google'] && google['loader']);
+ }
+
+ var checkGoogleLoader = function(callback) {
+ if (hasGoogleLoader()) return true;
+
+ addLocationQueue(callback);
+
+ loadGoogleLoader();
+
+ return false;
+ };
+
+ loadGoogleLoader(); // start to load as soon as possible just in case
+
+ // -- PUBLIC
+ return {
+ shim: true,
+
+ type: "ClientLocation",
+
+ lastPosition: null,
+
+ getCurrentPosition: function(successCallback, errorCallback, options) {
+ var self = this;
+ if (!checkGoogleLoader(function() {
+ self.getCurrentPosition(successCallback, errorCallback, options);
+ })) return;
+
+ if (google.loader.ClientLocation) {
+ var cl = google.loader.ClientLocation;
+
+ var position = {
+ 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(),
+
+ // 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
+ }
+ };
+
+ successCallback(position);
+
+ this.lastPosition = position;
+ } else if (errorCallback === "function") {
+ errorCallback({ code: 3, message: "Using the Google ClientLocation API and it is not able to calculate a location."});
+ }
+ },
+
+ watchPosition: function(successCallback, errorCallback, options) {
+ this.getCurrentPosition(successCallback, errorCallback, options);
+
+ var self = this;
+ var watchId = setInterval(function() {
+ self.getCurrentPosition(successCallback, errorCallback, options);
+ }, 10000);
+
+ return watchId;
+ },
+
+ clearWatch: function(watchId) {
+ clearInterval(watchId);
+ },
+
+ getPermission: function(siteName, imageUrl, extraMessage) {
+ // for now just say yes :)
+ return true;
+ }
+
+ };
+})();
+
+// If you have Gears installed use that, else use Ajax ClientLocation
+navigator.geolocation = (window.google && google.gears) ? GearsGeoLocation : AjaxGeoLocation;
+
+})();
diff --git a/js/util.js b/js/util.js
index c59c63910..9c79f837f 100644
--- a/js/util.js
+++ b/js/util.js
@@ -46,7 +46,11 @@ var SN = { // StatusNet
NoticeInReplyTo: 'notice_in-reply-to',
NoticeDataAttach: 'notice_data-attach',
NoticeDataAttachSelected: 'notice_data-attach_selected',
- NoticeActionSubmit: 'notice_action-submit'
+ NoticeActionSubmit: 'notice_action-submit',
+ NoticeLat: 'notice_data-lat',
+ NoticeLon: 'notice_data-lon',
+ NoticeLocationId: 'notice_data-location_id',
+ NoticeLocationNs: 'notice_data-location_ns'
}
},
@@ -351,6 +355,13 @@ var SN = { // StatusNet
});
},
+ NoticeLocationAttach: function() {
+ if(navigator.geolocation) navigator.geolocation.watchPosition(function(position) {
+ $('#'+SN.C.S.NoticeLat).val(position.coords.latitude);
+ $('#'+SN.C.S.NoticeLon).val(position.coords.longitude);
+ });
+ },
+
NewDirectMessage: function() {
NDM = $('.entity_send-a-message a');
NDM.attr({'href':NDM.attr('href')+'&ajax=1'});
@@ -387,6 +398,7 @@ var SN = { // StatusNet
});
SN.U.NoticeDataAttach();
+ SN.U.NoticeLocationAttach();
}
},
diff --git a/lib/action.php b/lib/action.php
index 9c7060bba..8ad391755 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -259,6 +259,7 @@ class Action extends HTMLOutputter // lawsuit
Event::handle('StartShowLaconicaScripts', array($this))) {
$this->script('js/xbImportNode.js');
$this->script('js/util.js');
+ $this->script('js/geometa.js');
// Frame-busting code to avoid clickjacking attacks.
$this->element('script', array('type' => 'text/javascript'),
'if (window.top !== window.self) { window.top.location.href = window.self.location.href; }');
diff --git a/lib/noticeform.php b/lib/noticeform.php
index 1be011c18..ec8624597 100644
--- a/lib/noticeform.php
+++ b/lib/noticeform.php
@@ -76,6 +76,15 @@ class NoticeForm extends Form
var $inreplyto = null;
/**
+ * Pre-filled location content of the form
+ */
+
+ var $lat;
+ var $lon;
+ var $location_id;
+ var $location_ns;
+
+ /**
* Constructor
*
* @param HTMLOutputter $out output channel
@@ -83,13 +92,17 @@ class NoticeForm extends Form
* @param string $content content to pre-fill
*/
- function __construct($out=null, $action=null, $content=null, $user=null, $inreplyto=null)
+ function __construct($out=null, $action=null, $content=null, $user=null, $inreplyto=null, $lat=null, $lon=null, $location_id=null, $location_ns=null)
{
parent::__construct($out);
$this->action = $action;
$this->content = $content;
$this->inreplyto = $inreplyto;
+ $this->lat = $lat;
+ $this->lon = $lon;
+ $this->location_id = $location_id;
+ $this->location_ns = $location_ns;
if ($user) {
$this->user = $user;
@@ -188,6 +201,10 @@ class NoticeForm extends Form
$this->out->hidden('notice_return-to', $this->action, 'returnto');
}
$this->out->hidden('notice_in-reply-to', $this->inreplyto, 'inreplyto');
+ $this->out->hidden('notice_data-lat', empty($this->lat) ? null : $this->lat, 'lat');
+ $this->out->hidden('notice_data-lon', empty($this->lon) ? null : $this->lon, 'lon');
+ $this->out->hidden('notice_data-location_id', empty($this->location_id) ? null : $this->location_id, 'location_id');
+ $this->out->hidden('notice_data-location_ns', empty($this->location_ns) ? null : $this->location_ns, 'location_ns');
Event::handle('StartShowNoticeFormData', array($this));
}
diff --git a/lib/router.php b/lib/router.php
index ceb32aaa7..afe36f712 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -125,7 +125,7 @@ class Router
// exceptional
$m->connect('main/remote', array('action' => 'remotesubscribe'));
- $m->connect('main/remote?nickname=:nickname', array('action' => 'remotesubscribe'), array('nickname' => '['.NICKNAME_FMT.']+'));
+ $m->connect('main/remote?nickname=:nickname', array('action' => 'remotesubscribe'), array('nickname' => '[A-Za-z0-9_-]+'));
foreach (Router::$bare as $action) {
$m->connect('index.php?action=' . $action, array('action' => $action));
@@ -169,10 +169,10 @@ class Router
$m->connect('notice/new', array('action' => 'newnotice'));
$m->connect('notice/new?replyto=:replyto',
array('action' => 'newnotice'),
- array('replyto' => '['.NICKNAME_FMT.']+'));
+ array('replyto' => '[A-Za-z0-9_-]+'));
$m->connect('notice/new?replyto=:replyto&inreplyto=:inreplyto',
array('action' => 'newnotice'),
- array('replyto' => '['.NICKNAME_FMT.']+'),
+ array('replyto' => '[A-Za-z0-9_-]+'),
array('inreplyto' => '[0-9]+'));
$m->connect('notice/:notice/file',
@@ -196,7 +196,7 @@ class Router
array('id' => '[0-9]+'));
$m->connect('message/new', array('action' => 'newmessage'));
- $m->connect('message/new?to=:to', array('action' => 'newmessage'), array('to' => '['.NICKNAME_FMT.']+'));
+ $m->connect('message/new?to=:to', array('action' => 'newmessage'), array('to' => '[A-Za-z0-9_-]+'));
$m->connect('message/:message',
array('action' => 'showmessage'),
array('message' => '[0-9]+'));
@@ -280,7 +280,7 @@ class Router
$m->connect('api/statuses/friends_timeline/:id.:format',
array('action' => 'ApiTimelineFriends',
- 'id' => '['.NICKNAME_FMT.']+',
+ 'id' => '[a-zA-Z0-9]+',
'format' => '(xml|json|rss|atom)'));
$m->connect('api/statuses/home_timeline.:format',
array('action' => 'ApiTimelineFriends',
@@ -288,7 +288,7 @@ class Router
$m->connect('api/statuses/home_timeline/:id.:format',
array('action' => 'ApiTimelineFriends',
- 'id' => '['.NICKNAME_FMT.']+',
+ 'id' => '[a-zA-Z0-9]+',
'format' => '(xml|json|rss|atom)'));
$m->connect('api/statuses/user_timeline.:format',
@@ -297,7 +297,7 @@ class Router
$m->connect('api/statuses/user_timeline/:id.:format',
array('action' => 'ApiTimelineUser',
- 'id' => '['.NICKNAME_FMT.']+',
+ 'id' => '[a-zA-Z0-9]+',
'format' => '(xml|json|rss|atom)'));
$m->connect('api/statuses/mentions.:format',
@@ -306,7 +306,7 @@ class Router
$m->connect('api/statuses/mentions/:id.:format',
array('action' => 'ApiTimelineMentions',
- 'id' => '['.NICKNAME_FMT.']+',
+ 'id' => '[a-zA-Z0-9]+',
'format' => '(xml|json|rss|atom)'));
$m->connect('api/statuses/replies.:format',
@@ -315,7 +315,7 @@ class Router
$m->connect('api/statuses/replies/:id.:format',
array('action' => 'ApiTimelineMentions',
- 'id' => '['.NICKNAME_FMT.']+',
+ 'id' => '[a-zA-Z0-9]+',
'format' => '(xml|json|rss|atom)'));
$m->connect('api/statuses/friends.:format',
@@ -324,7 +324,7 @@ class Router
$m->connect('api/statuses/friends/:id.:format',
array('action' => 'ApiUserFriends',
- 'id' => '['.NICKNAME_FMT.']+',
+ 'id' => '[a-zA-Z0-9]+',
'format' => '(xml|json)'));
$m->connect('api/statuses/followers.:format',
@@ -333,7 +333,7 @@ class Router
$m->connect('api/statuses/followers/:id.:format',
array('action' => 'ApiUserFollowers',
- 'id' => '['.NICKNAME_FMT.']+',
+ 'id' => '[a-zA-Z0-9]+',
'format' => '(xml|json)'));
$m->connect('api/statuses/show.:format',
@@ -362,7 +362,7 @@ class Router
$m->connect('api/users/show/:id.:format',
array('action' => 'ApiUserShow',
- 'id' => '['.NICKNAME_FMT.']+',
+ 'id' => '[a-zA-Z0-9]+',
'format' => '(xml|json)'));
// direct messages
@@ -400,12 +400,12 @@ class Router
$m->connect('api/friendships/create/:id.:format',
array('action' => 'ApiFriendshipsCreate',
- 'id' => '['.NICKNAME_FMT.']+',
+ 'id' => '[a-zA-Z0-9]+',
'format' => '(xml|json)'));
$m->connect('api/friendships/destroy/:id.:format',
array('action' => 'ApiFriendshipsDestroy',
- 'id' => '['.NICKNAME_FMT.']+',
+ 'id' => '[a-zA-Z0-9]+',
'format' => '(xml|json)'));
// Social graph
@@ -462,28 +462,28 @@ class Router
$m->connect('api/favorites/:id.:format',
array('action' => 'ApiTimelineFavorites',
- 'id' => '['.NICKNAME_FMT.']+',
+ 'id' => '[a-zA-Z0-9]+',
'format' => '(xmljson|rss|atom)'));
$m->connect('api/favorites/create/:id.:format',
array('action' => 'ApiFavoriteCreate',
- 'id' => '['.NICKNAME_FMT.']+',
+ 'id' => '[a-zA-Z0-9]+',
'format' => '(xml|json)'));
$m->connect('api/favorites/destroy/:id.:format',
array('action' => 'ApiFavoriteDestroy',
- 'id' => '['.NICKNAME_FMT.']+',
+ 'id' => '[a-zA-Z0-9]+',
'format' => '(xml|json)'));
// blocks
$m->connect('api/blocks/create/:id.:format',
array('action' => 'ApiBlockCreate',
- 'id' => '['.NICKNAME_FMT.']+',
+ 'id' => '[a-zA-Z0-9]+',
'format' => '(xml|json)'));
$m->connect('api/blocks/destroy/:id.:format',
array('action' => 'ApiBlockDestroy',
- 'id' => '['.NICKNAME_FMT.']+',
+ 'id' => '[a-zA-Z0-9]+',
'format' => '(xml|json)'));
// help
@@ -604,14 +604,14 @@ class Router
'replies', 'inbox', 'outbox', 'microsummary') as $a) {
$m->connect(':nickname/'.$a,
array('action' => $a),
- array('nickname' => '['.NICKNAME_FMT.']{1,64}'));
+ array('nickname' => '[a-zA-Z0-9]{1,64}'));
}
foreach (array('subscriptions', 'subscribers') as $a) {
$m->connect(':nickname/'.$a.'/:tag',
array('action' => $a),
array('tag' => '[a-zA-Z0-9]+',
- 'nickname' => '['.NICKNAME_FMT.']{1,64}'));
+ 'nickname' => '[a-zA-Z0-9]{1,64}'));
}
foreach (array('rss', 'groups') as $a) {
@@ -623,31 +623,31 @@ class Router
foreach (array('all', 'replies', 'favorites') as $a) {
$m->connect(':nickname/'.$a.'/rss',
array('action' => $a.'rss'),
- array('nickname' => '['.NICKNAME_FMT.']{1,64}'));
+ array('nickname' => '[a-zA-Z0-9]{1,64}'));
}
$m->connect(':nickname/favorites',
array('action' => 'showfavorites'),
- array('nickname' => '['.NICKNAME_FMT.']{1,64}'));
+ array('nickname' => '[a-zA-Z0-9]{1,64}'));
$m->connect(':nickname/avatar/:size',
array('action' => 'avatarbynickname'),
array('size' => '(original|96|48|24)',
- 'nickname' => '['.NICKNAME_FMT.']{1,64}'));
+ 'nickname' => '[a-zA-Z0-9]{1,64}'));
$m->connect(':nickname/tag/:tag/rss',
array('action' => 'userrss'),
- array('nickname' => '['.NICKNAME_FMT.']{1,64}'),
+ array('nickname' => '[a-zA-Z0-9]{1,64}'),
array('tag' => '[a-zA-Z0-9]+'));
$m->connect(':nickname/tag/:tag',
array('action' => 'showstream'),
- array('nickname' => '['.NICKNAME_FMT.']{1,64}'),
+ array('nickname' => '[a-zA-Z0-9]{1,64}'),
array('tag' => '[a-zA-Z0-9]+'));
$m->connect(':nickname',
array('action' => 'showstream'),
- array('nickname' => '['.NICKNAME_FMT.']{1,64}'));
+ array('nickname' => '[a-zA-Z0-9]{1,64}'));
Event::handle('RouterInitialized', array($m));
}
diff --git a/locale/ar/LC_MESSAGES/statusnet.po b/locale/ar/LC_MESSAGES/statusnet.po
index f4a523b6b..5b4aa5770 100644
--- a/locale/ar/LC_MESSAGES/statusnet.po
+++ b/locale/ar/LC_MESSAGES/statusnet.po
@@ -2,15 +2,18 @@
#
# Author@translatewiki.net: OsamaK
# --
+# 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-18 19:31+0000\n"
+"POT-Creation-Date: 2009-11-19 10:43+0000\n"
"PO-Revision-Date: 2009-11-18 19:31:23+0000\n"
"Language-Team: Arabic\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=6; plural= n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
"X-Generator: MediaWiki 1.16alpha(r59207); Translate extension (2009-11-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ar\n"
@@ -143,7 +146,7 @@ msgstr "تعذّر تحديث المستخدم."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
-#: actions/designadminpanel.php:125 actions/newnotice.php:94
+#: actions/designadminpanel.php:122 actions/newnotice.php:94
#: lib/designsettings.php:283
#, php-format
msgid ""
@@ -225,7 +228,7 @@ msgstr ""
#: 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:184 actions/apigroupismember.php:114
+#: 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
@@ -289,79 +292,66 @@ msgstr ""
msgid "Could not find target user."
msgstr "تعذّر إيجاد المستخدم الهدف."
-#: actions/apigroupcreate.php:136 actions/newgroup.php:204
-msgid "Could not create group."
-msgstr ""
-
-#: actions/apigroupcreate.php:147 actions/editgroup.php:259
-#: actions/newgroup.php:210
-msgid "Could not create aliases."
-msgstr "تعذّر إنشاء الكنى."
-
-#: actions/apigroupcreate.php:166 actions/newgroup.php:224
-msgid "Could not set group membership."
-msgstr "تعذّر ضبط عضوية المجموعة."
-
-#: actions/apigroupcreate.php:212 actions/editgroup.php:182
+#: actions/apigroupcreate.php:164 actions/editgroup.php:182
#: actions/newgroup.php:126 actions/profilesettings.php:208
#: actions/register.php:205
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr ""
-#: actions/apigroupcreate.php:221 actions/editgroup.php:186
+#: 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 ""
-#: actions/apigroupcreate.php:228 actions/editgroup.php:189
+#: 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 "ليس اسمًا مستعارًا صحيحًا."
-#: actions/apigroupcreate.php:244 actions/editgroup.php:195
+#: 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 "الصفحة الرئيسية ليست عنونًا صالحًا."
-#: actions/apigroupcreate.php:253 actions/editgroup.php:198
+#: 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 "الاسم الكامل طويل جدا (الأقصى 255 حرفًا)"
-#: actions/apigroupcreate.php:261
+#: actions/apigroupcreate.php:213
#, php-format
msgid "Description is too long (max %d chars)."
msgstr ""
-#: actions/apigroupcreate.php:272 actions/editgroup.php:204
+#: 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 ""
-#: actions/apigroupcreate.php:291 actions/editgroup.php:215
+#: actions/apigroupcreate.php:243 actions/editgroup.php:215
#: actions/newgroup.php:159
#, php-format
msgid "Too many aliases! Maximum %d."
msgstr ""
-#: actions/apigroupcreate.php:312 actions/editgroup.php:224
+#: actions/apigroupcreate.php:264 actions/editgroup.php:224
#: actions/newgroup.php:168
#, php-format
msgid "Invalid alias: \"%s\""
msgstr "كنية غير صالحة: \"%s\""
-#: actions/apigroupcreate.php:321 actions/editgroup.php:228
+#: actions/apigroupcreate.php:273 actions/editgroup.php:228
#: actions/newgroup.php:172
#, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr ""
-#: actions/apigroupcreate.php:334 actions/editgroup.php:234
+#: actions/apigroupcreate.php:286 actions/editgroup.php:234
#: actions/newgroup.php:178
msgid "Alias can't be the same as nickname."
msgstr ""
@@ -581,10 +571,10 @@ msgstr ""
msgid "There was a problem with your session token. Try again, please."
msgstr ""
-#: actions/avatarsettings.php:277 actions/emailsettings.php:255
-#: actions/grouplogo.php:319 actions/imsettings.php:220
-#: actions/recoverpassword.php:44 actions/smssettings.php:248
-#: lib/designsettings.php:304
+#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
+#: actions/emailsettings.php:255 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/recoverpassword.php:44
+#: actions/smssettings.php:248 lib/designsettings.php:304
msgid "Unexpected form submission."
msgstr ""
@@ -644,7 +634,7 @@ msgstr ""
msgid "Unblock"
msgstr "ألغِ المنع"
-#: actions/blockedfromgroup.php:313
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:80
msgid "Unblock this user"
msgstr "ألغِ منع هذا المستخدم"
@@ -812,7 +802,7 @@ msgid "Delete this user"
msgstr "احذف هذا الإشعار"
#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124
-#: lib/adminpanelaction.php:275 lib/groupnav.php:119
+#: lib/adminpanelaction.php:302 lib/groupnav.php:119
msgid "Design"
msgstr "التصميم"
@@ -820,102 +810,181 @@ msgstr "التصميم"
msgid "Design settings for this StatusNet site."
msgstr ""
-#: actions/designadminpanel.php:220
-msgid "Unable to delete design setting."
-msgstr ""
+#: actions/designadminpanel.php:278
+#, fuzzy
+msgid "Invalid logo URL."
+msgstr "حجم غير صالح."
-#: actions/designadminpanel.php:301
+#: actions/designadminpanel.php:282
#, fuzzy, php-format
msgid "Theme not available: %s"
msgstr "المراسلة الفورية غير متوفرة."
-#: actions/designadminpanel.php:406
+#: actions/designadminpanel.php:288
+#, fuzzy, php-format
+msgid "Theme directory not readable: %s"
+msgstr "المراسلة الفورية غير متوفرة."
+
+#: actions/designadminpanel.php:292
+#, php-format
+msgid "Avatar directory not writable: %s"
+msgstr ""
+
+#: actions/designadminpanel.php:296
+#, php-format
+msgid "Background directory not writable: %s"
+msgstr ""
+
+#: actions/designadminpanel.php:312
+#, php-format
+msgid "Max length for %s %s is 255 characters."
+msgstr ""
+
+#: actions/designadminpanel.php:412
+#, fuzzy
+msgid "Change logo"
+msgstr "غيّر الألوان"
+
+#: actions/designadminpanel.php:417
+#, fuzzy
+msgid "Site logo"
+msgstr "ادعُ"
+
+#: actions/designadminpanel.php:424
#, fuzzy
msgid "Change theme"
msgstr "غيّر"
-#: actions/designadminpanel.php:410
-msgid "Theme"
-msgstr ""
+#: actions/designadminpanel.php:441
+#, fuzzy
+msgid "Site theme"
+msgstr "إشعار الموقع"
-#: actions/designadminpanel.php:411
+#: actions/designadminpanel.php:442
msgid "Theme for the site."
msgstr ""
-#: actions/designadminpanel.php:420 lib/designsettings.php:101
+#: actions/designadminpanel.php:447
+msgid "Theme server"
+msgstr ""
+
+#: actions/designadminpanel.php:451
+msgid "Theme path"
+msgstr ""
+
+#: actions/designadminpanel.php:455
+msgid "Theme directory"
+msgstr ""
+
+#: actions/designadminpanel.php:462
+#, fuzzy
+msgid "Avatar Settings"
+msgstr "إعدادات الأفتار"
+
+#: actions/designadminpanel.php:467
+#, fuzzy
+msgid "Avatar server"
+msgstr "إعدادات الأفتار"
+
+#: actions/designadminpanel.php:471
+#, fuzzy
+msgid "Avatar path"
+msgstr "رُفع الأفتار."
+
+#: actions/designadminpanel.php:475
+#, fuzzy
+msgid "Avatar directory"
+msgstr "حُذف الأفتار."
+
+#: actions/designadminpanel.php:486 lib/designsettings.php:101
msgid "Change background image"
msgstr "غيّر صورة الخلفية"
-#: actions/designadminpanel.php:424 actions/designadminpanel.php:498
+#: actions/designadminpanel.php:491 actions/designadminpanel.php:578
#: lib/designsettings.php:178
msgid "Background"
msgstr "الخلفية"
-#: actions/designadminpanel.php:429
+#: actions/designadminpanel.php:496
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
"$s."
msgstr ""
-#: actions/designadminpanel.php:459 lib/designsettings.php:139
+#: actions/designadminpanel.php:526 lib/designsettings.php:139
msgid "On"
msgstr "مكّن"
-#: actions/designadminpanel.php:475 lib/designsettings.php:155
+#: actions/designadminpanel.php:542 lib/designsettings.php:155
msgid "Off"
msgstr "عطّل"
-#: actions/designadminpanel.php:476 lib/designsettings.php:156
+#: actions/designadminpanel.php:543 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr "مكّن صورة الخلفية أو عطّلها."
-#: actions/designadminpanel.php:481 lib/designsettings.php:161
+#: actions/designadminpanel.php:548 lib/designsettings.php:161
msgid "Tile background image"
msgstr ""
-#: actions/designadminpanel.php:490 lib/designsettings.php:170
+#: actions/designadminpanel.php:554
+#, fuzzy
+msgid "Background server"
+msgstr "الخلفية"
+
+#: actions/designadminpanel.php:558
+#, fuzzy
+msgid "Background path"
+msgstr "الخلفية"
+
+#: actions/designadminpanel.php:562
+#, fuzzy
+msgid "Background directory"
+msgstr "الخلفية"
+
+#: actions/designadminpanel.php:569 lib/designsettings.php:170
msgid "Change colours"
msgstr "غيّر الألوان"
-#: actions/designadminpanel.php:511 lib/designsettings.php:191
+#: actions/designadminpanel.php:591 lib/designsettings.php:191
msgid "Content"
msgstr "المحتوى"
-#: actions/designadminpanel.php:524 lib/designsettings.php:204
+#: actions/designadminpanel.php:604 lib/designsettings.php:204
msgid "Sidebar"
msgstr "الشريط الجانبي"
-#: actions/designadminpanel.php:537 lib/designsettings.php:217
+#: actions/designadminpanel.php:617 lib/designsettings.php:217
msgid "Text"
msgstr "النص"
-#: actions/designadminpanel.php:550 lib/designsettings.php:230
+#: actions/designadminpanel.php:630 lib/designsettings.php:230
msgid "Links"
msgstr "وصلات"
-#: actions/designadminpanel.php:611 lib/designsettings.php:247
+#: actions/designadminpanel.php:658 lib/designsettings.php:247
msgid "Use defaults"
msgstr "استخدم المبدئيات"
-#: actions/designadminpanel.php:612 lib/designsettings.php:248
+#: actions/designadminpanel.php:659 lib/designsettings.php:248
msgid "Restore default designs"
msgstr "استعد التصميمات المبدئية"
-#: actions/designadminpanel.php:618 lib/designsettings.php:254
+#: actions/designadminpanel.php:665 lib/designsettings.php:254
msgid "Reset back to default"
msgstr "ارجع إلى المبدئي"
-#: actions/designadminpanel.php:620 actions/emailsettings.php:195
+#: actions/designadminpanel.php:667 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/profilesettings.php:167 actions/siteadminpanel.php:371
+#: actions/profilesettings.php:167 actions/siteadminpanel.php:414
#: actions/smssettings.php:181 actions/subscriptions.php:203
#: actions/tagother.php:154 actions/useradminpanel.php:226
#: lib/designsettings.php:256 lib/groupeditform.php:202
msgid "Save"
msgstr "أرسل"
-#: actions/designadminpanel.php:621 lib/designsettings.php:257
+#: actions/designadminpanel.php:668 lib/designsettings.php:257
msgid "Save design"
msgstr "احفظ التصميم"
@@ -958,6 +1027,10 @@ msgstr ""
msgid "Could not update group."
msgstr "تعذر تحديث المجموعة."
+#: actions/editgroup.php:259 classes/User_group.php:390
+msgid "Could not create aliases."
+msgstr "تعذّر إنشاء الكنى."
+
#: actions/editgroup.php:269
msgid "Options saved."
msgstr "حُفظت الخيارات."
@@ -1072,7 +1145,7 @@ msgstr "لا عنوان بريد إلكتروني."
msgid "Cannot normalize that email address"
msgstr ""
-#: actions/emailsettings.php:330 actions/siteadminpanel.php:156
+#: actions/emailsettings.php:330 actions/siteadminpanel.php:158
msgid "Not a valid email address"
msgstr "ليس عنوان بريد صالح"
@@ -1732,10 +1805,10 @@ msgstr ""
msgid "Incorrect username or password."
msgstr "اسم المستخدم أو كلمة السر غير صحيحان."
-#: actions/login.php:149 actions/recoverpassword.php:375
-#: actions/register.php:248
-msgid "Error setting user."
-msgstr "خطأ أثناء ضبط المستخدم."
+#: actions/login.php:149
+#, fuzzy
+msgid "Error setting user. You are probably not authorized."
+msgstr "لا تملك تصريحًا."
#: actions/login.php:204 actions/login.php:257 lib/action.php:457
#: lib/logingroupnav.php:79
@@ -2143,7 +2216,7 @@ msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:275
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:309
msgid "Language"
msgstr "اللغة"
@@ -2169,7 +2242,7 @@ msgstr ""
msgid "Bio is too long (max %d chars)."
msgstr ""
-#: actions/profilesettings.php:228 actions/siteadminpanel.php:163
+#: actions/profilesettings.php:228 actions/siteadminpanel.php:165
msgid "Timezone not selected."
msgstr "لم تُختر المنطقة الزمنية."
@@ -2413,6 +2486,10 @@ msgstr ""
msgid "Password and confirmation do not match."
msgstr ""
+#: actions/recoverpassword.php:375 actions/register.php:248
+msgid "Error setting user."
+msgstr "خطأ أثناء ضبط المستخدم."
+
#: actions/recoverpassword.php:382
msgid "New password successfully saved. You are now logged in."
msgstr ""
@@ -2473,7 +2550,7 @@ msgid "Same as password above. Required."
msgstr ""
#: actions/register.php:437 actions/register.php:441
-#: actions/siteadminpanel.php:253 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:287 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "البريد الإلكتروني"
@@ -2884,7 +2961,7 @@ msgstr ""
msgid "User is already silenced."
msgstr ""
-#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:272
+#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:299
#, fuzzy
msgid "Site"
msgstr "ادعُ"
@@ -2893,122 +2970,237 @@ msgstr "ادعُ"
msgid "Basic settings for this StatusNet site."
msgstr ""
-#: actions/siteadminpanel.php:145
+#: actions/siteadminpanel.php:147
msgid "Site name must have non-zero length."
msgstr ""
-#: actions/siteadminpanel.php:153
+#: actions/siteadminpanel.php:155
#, fuzzy
msgid "You must have a valid contact email address"
msgstr "ليس عنوان بريد صالح"
-#: actions/siteadminpanel.php:171
+#: actions/siteadminpanel.php:173
#, php-format
msgid "Unknown language \"%s\""
msgstr ""
-#: actions/siteadminpanel.php:178
+#: actions/siteadminpanel.php:180
msgid "Invalid snapshot report URL."
msgstr ""
-#: actions/siteadminpanel.php:184
+#: actions/siteadminpanel.php:186
msgid "Invalid snapshot run value."
msgstr ""
-#: actions/siteadminpanel.php:190
+#: actions/siteadminpanel.php:192
msgid "Snapshot frequency must be a number."
msgstr ""
-#: actions/siteadminpanel.php:241
+#: actions/siteadminpanel.php:199
+msgid "You must set an SSL sever when enabling SSL."
+msgstr ""
+
+#: actions/siteadminpanel.php:204
+msgid "Invalid SSL server. Max length is 255 characters."
+msgstr ""
+
+#: actions/siteadminpanel.php:210
+msgid "Minimum text limit is 140c."
+msgstr ""
+
+#: actions/siteadminpanel.php:216
+msgid "Dupe limit must 1 or more seconds."
+msgstr ""
+
+#: actions/siteadminpanel.php:224
+#, php-format
+msgid "Locales directory not readable: %s"
+msgstr ""
+
+#: actions/siteadminpanel.php:275
#, fuzzy
msgid "Site name"
msgstr "إشعار الموقع"
-#: actions/siteadminpanel.php:242
+#: actions/siteadminpanel.php:276
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr ""
-#: actions/siteadminpanel.php:245
+#: actions/siteadminpanel.php:279
msgid "Brought by"
msgstr ""
-#: actions/siteadminpanel.php:246
+#: actions/siteadminpanel.php:280
msgid "Text used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:249
+#: actions/siteadminpanel.php:283
msgid "Brought by URL"
msgstr ""
-#: actions/siteadminpanel.php:250
+#: actions/siteadminpanel.php:284
msgid "URL used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:254
+#: actions/siteadminpanel.php:288
#, fuzzy
msgid "contact email address for your site"
msgstr "عنوان بريد إلكتروني غير صالح: %s"
-#: actions/siteadminpanel.php:268
+#: actions/siteadminpanel.php:302
msgid "Default timezone"
msgstr ""
-#: actions/siteadminpanel.php:269
+#: actions/siteadminpanel.php:303
msgid "Default timezone for the site; usually UTC."
msgstr ""
-#: actions/siteadminpanel.php:276
+#: actions/siteadminpanel.php:310
#, fuzzy
msgid "Default site language"
msgstr "اللغة المفضلة"
-#: actions/siteadminpanel.php:282
+#: actions/siteadminpanel.php:316
+msgid "Path to locales"
+msgstr ""
+
+#: actions/siteadminpanel.php:316
+msgid "Directory path to locales"
+msgstr ""
+
+#: actions/siteadminpanel.php:320
+#, fuzzy
+msgid "Server"
+msgstr "استرجع"
+
+#: actions/siteadminpanel.php:320
+msgid "Site's server hostname."
+msgstr ""
+
+#: actions/siteadminpanel.php:324
+msgid "Path"
+msgstr ""
+
+#: actions/siteadminpanel.php:324
+#, fuzzy
+msgid "Site path"
+msgstr "إشعار الموقع"
+
+#: actions/siteadminpanel.php:328
+msgid "Fancy URLs"
+msgstr ""
+
+#: actions/siteadminpanel.php:330
+msgid "Use fancy (more readable and memorable) URLs?"
+msgstr ""
+
+#: actions/siteadminpanel.php:334
#, fuzzy
msgid "Private"
msgstr "خصوصية"
-#: actions/siteadminpanel.php:284
+#: actions/siteadminpanel.php:336
msgid "Prohibit anonymous users (not logged in) from viewing site?"
msgstr ""
-#: actions/siteadminpanel.php:290
+#: actions/siteadminpanel.php:340
+#, fuzzy
+msgid "Invite only"
+msgstr "ادعُ"
+
+#: actions/siteadminpanel.php:342
+msgid "Make registration invitation only."
+msgstr ""
+
+#: actions/siteadminpanel.php:346 actions/useradminpanel.php:171
+#, fuzzy
+msgid "Closed"
+msgstr "ممنوع"
+
+#: actions/siteadminpanel.php:348
+msgid "Disable new registrations."
+msgstr ""
+
+#: actions/siteadminpanel.php:353
msgid "Randomly during Web hit"
msgstr ""
-#: actions/siteadminpanel.php:291
+#: actions/siteadminpanel.php:354
msgid "In a scheduled job"
msgstr ""
-#: actions/siteadminpanel.php:292
+#: actions/siteadminpanel.php:355 actions/siteadminpanel.php:380
#, fuzzy
msgid "Never"
msgstr "استرجع"
-#: actions/siteadminpanel.php:294
+#: actions/siteadminpanel.php:357
msgid "Data snapshots"
msgstr ""
-#: actions/siteadminpanel.php:295
+#: actions/siteadminpanel.php:358
msgid "When to send statistical data to status.net servers"
msgstr ""
-#: actions/siteadminpanel.php:301
+#: actions/siteadminpanel.php:364
msgid "Frequency"
msgstr ""
-#: actions/siteadminpanel.php:302
+#: actions/siteadminpanel.php:365
msgid "Snapshots will be sent once every N Web hits"
msgstr ""
-#: actions/siteadminpanel.php:309
+#: actions/siteadminpanel.php:372
msgid "Report URL"
msgstr ""
-#: actions/siteadminpanel.php:310
+#: actions/siteadminpanel.php:373
msgid "Snapshots will be sent to this URL"
msgstr ""
-#: actions/siteadminpanel.php:371 actions/useradminpanel.php:226
+#: actions/siteadminpanel.php:381
+#, fuzzy
+msgid "Sometimes"
+msgstr "الإشعارات"
+
+#: actions/siteadminpanel.php:382
+#, fuzzy
+msgid "Always"
+msgstr "الكنى"
+
+#: actions/siteadminpanel.php:384
+msgid "Use SSL"
+msgstr ""
+
+#: actions/siteadminpanel.php:385
+msgid "When to use SSL"
+msgstr ""
+
+#: actions/siteadminpanel.php:391
+msgid "SSL Server"
+msgstr ""
+
+#: actions/siteadminpanel.php:392
+msgid "Server to direct SSL requests to"
+msgstr ""
+
+#: actions/siteadminpanel.php:396
+msgid "Text limit"
+msgstr ""
+
+#: actions/siteadminpanel.php:396
+msgid "Maximum number of characters for notices."
+msgstr ""
+
+#: actions/siteadminpanel.php:400
+msgid "Dupe limit"
+msgstr ""
+
+#: actions/siteadminpanel.php:400
+msgid "How long users must wait (in seconds) to post the same thing again."
+msgstr ""
+
+#: actions/siteadminpanel.php:414 actions/useradminpanel.php:226
#, fuzzy
msgid "Save site settings"
msgstr "إعدادات الأفتار"
@@ -3312,11 +3504,6 @@ msgstr "المستخدم"
msgid "User settings for this StatusNet site."
msgstr ""
-#: actions/useradminpanel.php:171
-#, fuzzy
-msgid "Closed"
-msgstr "ممنوع"
-
#: actions/useradminpanel.php:173
msgid "Is registration on this site prohibited?"
msgstr ""
@@ -3527,6 +3714,14 @@ msgstr "مشكلة أثناء حفظ الإشعار."
msgid "DB error inserting reply: %s"
msgstr ""
+#: classes/User_group.php:380
+msgid "Could not create group."
+msgstr ""
+
+#: classes/User_group.php:409
+msgid "Could not set group membership."
+msgstr "تعذّر ضبط عضوية المجموعة."
+
#: classes/User.php:347
#, php-format
msgid "Welcome to %1$s, @%2$s!"
@@ -3757,12 +3952,16 @@ msgstr ""
msgid "saveSettings() not implemented."
msgstr ""
-#: lib/adminpanelaction.php:273
+#: lib/adminpanelaction.php:247
+msgid "Unable to delete design setting."
+msgstr ""
+
+#: lib/adminpanelaction.php:300
#, fuzzy
msgid "Basic site configuration"
msgstr "تأكيد عنوان البريد الإلكتروني"
-#: lib/adminpanelaction.php:276
+#: lib/adminpanelaction.php:303
#, fuzzy
msgid "Design configuration"
msgstr "تأكيد عنوان البريد الإلكتروني"
@@ -4008,19 +4207,19 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:203
+#: lib/common.php:199
msgid "No configuration file found. "
msgstr ""
-#: lib/common.php:204
+#: lib/common.php:200
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:205
+#: lib/common.php:201
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:206
+#: lib/common.php:202
msgid "Go to the installer."
msgstr "اذهب إلى المُثبّت."
@@ -4766,11 +4965,6 @@ msgstr "لا شيء"
msgid "Top posters"
msgstr "أعلى المرسلين"
-#: lib/unblockform.php:80
-#, fuzzy
-msgid "Unlock this user"
-msgstr "ألغِ منع هذا المستخدم"
-
#: lib/unsandboxform.php:69
msgid "Unsandbox"
msgstr ""
@@ -4821,47 +5015,47 @@ msgstr "أرسل رسالة مباشرة إلى هذا المستخدم"
msgid "Message"
msgstr "رسالة"
-#: lib/util.php:821
+#: lib/util.php:826
msgid "a few seconds ago"
msgstr "قبل لحظات قليلة"
-#: lib/util.php:823
+#: lib/util.php:828
msgid "about a minute ago"
msgstr "قبل دقيقة تقريبًا"
-#: lib/util.php:825
+#: lib/util.php:830
#, php-format
msgid "about %d minutes ago"
msgstr ""
-#: lib/util.php:827
+#: lib/util.php:832
msgid "about an hour ago"
msgstr "قبل ساعة تقريبًا"
-#: lib/util.php:829
+#: lib/util.php:834
#, php-format
msgid "about %d hours ago"
msgstr ""
-#: lib/util.php:831
+#: lib/util.php:836
msgid "about a day ago"
msgstr "قبل يوم تقريبا"
-#: lib/util.php:833
+#: lib/util.php:838
#, php-format
msgid "about %d days ago"
msgstr ""
-#: lib/util.php:835
+#: lib/util.php:840
msgid "about a month ago"
msgstr "قبل شهر تقريبًا"
-#: lib/util.php:837
+#: lib/util.php:842
#, php-format
msgid "about %d months ago"
msgstr ""
-#: lib/util.php:839
+#: lib/util.php:844
msgid "about a year ago"
msgstr "قبل سنة تقريبًا"
@@ -4891,5 +5085,9 @@ msgstr ""
msgid "Sorry, no incoming email allowed."
msgstr ""
+#, fuzzy
+#~ msgid "Unlock this user"
+#~ msgstr "ألغِ منع هذا المستخدم"
+
#~ msgid "These people are subscribed to you: "
#~ msgstr "هؤلاء الأشخاص مشتركون بك: "
diff --git a/locale/bg/LC_MESSAGES/statusnet.po b/locale/bg/LC_MESSAGES/statusnet.po
index abda8bab2..70937c64a 100644
--- a/locale/bg/LC_MESSAGES/statusnet.po
+++ b/locale/bg/LC_MESSAGES/statusnet.po
@@ -1,15 +1,18 @@
# Translation of StatusNet to Bulgarian
#
# --
+# 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-18 19:31+0000\n"
+"POT-Creation-Date: 2009-11-19 10:43+0000\n"
"PO-Revision-Date: 2009-11-18 19:31:26+0000\n"
"Language-Team: Bulgarian\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: MediaWiki 1.16alpha(r59207); Translate extension (2009-11-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: bg\n"
@@ -145,7 +148,7 @@ msgstr "Грешка при обновяване на потребителя."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
-#: actions/designadminpanel.php:125 actions/newnotice.php:94
+#: actions/designadminpanel.php:122 actions/newnotice.php:94
#: lib/designsettings.php:283
#, php-format
msgid ""
@@ -231,7 +234,7 @@ msgstr "Всички преки съобщения, изпратени до %s"
#: 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:184 actions/apigroupismember.php:114
+#: 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
@@ -300,22 +303,7 @@ msgstr "Грешка при изтегляне на общия поток"
msgid "Could not find target user."
msgstr "Не са открити бележки."
-#: actions/apigroupcreate.php:136 actions/newgroup.php:204
-msgid "Could not create group."
-msgstr "Грешка при създаване на групата."
-
-#: actions/apigroupcreate.php:147 actions/editgroup.php:259
-#: actions/newgroup.php:210
-#, fuzzy
-msgid "Could not create aliases."
-msgstr "Грешка при отбелязване като любима."
-
-#: actions/apigroupcreate.php:166 actions/newgroup.php:224
-#, fuzzy
-msgid "Could not set group membership."
-msgstr "Грешка при създаване на нов абонамент."
-
-#: actions/apigroupcreate.php:212 actions/editgroup.php:182
+#: actions/apigroupcreate.php:164 actions/editgroup.php:182
#: actions/newgroup.php:126 actions/profilesettings.php:208
#: actions/register.php:205
msgid "Nickname must have only lowercase letters and numbers and no spaces."
@@ -323,60 +311,60 @@ msgstr ""
"Псевдонимът може да съдържа само малки букви, числа и никакво разстояние "
"между тях."
-#: actions/apigroupcreate.php:221 actions/editgroup.php:186
+#: 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 "Опитайте друг псевдоним, този вече е зает."
-#: actions/apigroupcreate.php:228 actions/editgroup.php:189
+#: 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 "Неправилен псевдоним."
-#: actions/apigroupcreate.php:244 actions/editgroup.php:195
+#: 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 "Адресът на личната страница не е правилен URL."
-#: actions/apigroupcreate.php:253 actions/editgroup.php:198
+#: 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 "Пълното име е твърде дълго (макс. 255 знака)"
-#: actions/apigroupcreate.php:261
+#: actions/apigroupcreate.php:213
#, fuzzy, php-format
msgid "Description is too long (max %d chars)."
msgstr "Автобиографията е твърде дълга (до 140 символа)."
-#: actions/apigroupcreate.php:272 actions/editgroup.php:204
+#: 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 "Името на местоположението е твърде дълго (макс. 255 знака)."
-#: actions/apigroupcreate.php:291 actions/editgroup.php:215
+#: actions/apigroupcreate.php:243 actions/editgroup.php:215
#: actions/newgroup.php:159
#, php-format
msgid "Too many aliases! Maximum %d."
msgstr ""
-#: actions/apigroupcreate.php:312 actions/editgroup.php:224
+#: actions/apigroupcreate.php:264 actions/editgroup.php:224
#: actions/newgroup.php:168
#, fuzzy, php-format
msgid "Invalid alias: \"%s\""
msgstr "Неправилен етикет: \"%s\""
-#: actions/apigroupcreate.php:321 actions/editgroup.php:228
+#: actions/apigroupcreate.php:273 actions/editgroup.php:228
#: actions/newgroup.php:172
#, fuzzy, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr "Опитайте друг псевдоним, този вече е зает."
-#: actions/apigroupcreate.php:334 actions/editgroup.php:234
+#: actions/apigroupcreate.php:286 actions/editgroup.php:234
#: actions/newgroup.php:178
msgid "Alias can't be the same as nickname."
msgstr ""
@@ -601,10 +589,10 @@ msgstr "Изрязване"
msgid "There was a problem with your session token. Try again, please."
msgstr "Имаше проблем със сесията ви в сайта. Моля, опитайте отново!"
-#: actions/avatarsettings.php:277 actions/emailsettings.php:255
-#: actions/grouplogo.php:319 actions/imsettings.php:220
-#: actions/recoverpassword.php:44 actions/smssettings.php:248
-#: lib/designsettings.php:304
+#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
+#: actions/emailsettings.php:255 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/recoverpassword.php:44
+#: actions/smssettings.php:248 lib/designsettings.php:304
msgid "Unexpected form submission."
msgstr "Неочаквано изпращане на форма."
@@ -667,7 +655,7 @@ msgstr "Разблокиране на този потребител"
msgid "Unblock"
msgstr "Разблокиране"
-#: actions/blockedfromgroup.php:313
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:80
msgid "Unblock this user"
msgstr "Разблокиране на този потребител"
@@ -841,7 +829,7 @@ msgid "Delete this user"
msgstr "Изтриване на бележката"
#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124
-#: lib/adminpanelaction.php:275 lib/groupnav.php:119
+#: lib/adminpanelaction.php:302 lib/groupnav.php:119
msgid "Design"
msgstr ""
@@ -849,108 +837,183 @@ msgstr ""
msgid "Design settings for this StatusNet site."
msgstr ""
-#: actions/designadminpanel.php:220
+#: actions/designadminpanel.php:278
#, fuzzy
-msgid "Unable to delete design setting."
-msgstr "Грешка при записване настройките за Twitter"
+msgid "Invalid logo URL."
+msgstr "Неправилен размер."
-#: actions/designadminpanel.php:301
+#: actions/designadminpanel.php:282
#, fuzzy, php-format
msgid "Theme not available: %s"
msgstr "Страницата не е достъпна във вида медия, който приемате"
-#: actions/designadminpanel.php:406
+#: actions/designadminpanel.php:288
+#, fuzzy, php-format
+msgid "Theme directory not readable: %s"
+msgstr "Страницата не е достъпна във вида медия, който приемате"
+
+#: actions/designadminpanel.php:292
+#, php-format
+msgid "Avatar directory not writable: %s"
+msgstr ""
+
+#: actions/designadminpanel.php:296
+#, php-format
+msgid "Background directory not writable: %s"
+msgstr ""
+
+#: actions/designadminpanel.php:312
+#, php-format
+msgid "Max length for %s %s is 255 characters."
+msgstr ""
+
+#: actions/designadminpanel.php:412
+#, fuzzy
+msgid "Change logo"
+msgstr "Смяна на паролата"
+
+#: actions/designadminpanel.php:417
+#, fuzzy
+msgid "Site logo"
+msgstr "Покани"
+
+#: actions/designadminpanel.php:424
#, fuzzy
msgid "Change theme"
msgstr "Промяна"
-#: actions/designadminpanel.php:410
-msgid "Theme"
-msgstr ""
+#: actions/designadminpanel.php:441
+#, fuzzy
+msgid "Site theme"
+msgstr "Нова бележка"
-#: actions/designadminpanel.php:411
+#: actions/designadminpanel.php:442
#, fuzzy
msgid "Theme for the site."
msgstr "Излизане от сайта"
-#: actions/designadminpanel.php:420 lib/designsettings.php:101
+#: actions/designadminpanel.php:447
+msgid "Theme server"
+msgstr ""
+
+#: actions/designadminpanel.php:451
+msgid "Theme path"
+msgstr ""
+
+#: actions/designadminpanel.php:455
+msgid "Theme directory"
+msgstr ""
+
+#: actions/designadminpanel.php:462
+#, fuzzy
+msgid "Avatar Settings"
+msgstr "Настройки за аватар"
+
+#: actions/designadminpanel.php:467
+#, fuzzy
+msgid "Avatar server"
+msgstr "Настройки за аватар"
+
+#: actions/designadminpanel.php:471
+#, fuzzy
+msgid "Avatar path"
+msgstr "Аватарът е обновен."
+
+#: actions/designadminpanel.php:475
+#, fuzzy
+msgid "Avatar directory"
+msgstr "Аватарът е обновен."
+
+#: actions/designadminpanel.php:486 lib/designsettings.php:101
msgid "Change background image"
msgstr ""
-#: actions/designadminpanel.php:424 actions/designadminpanel.php:498
+#: actions/designadminpanel.php:491 actions/designadminpanel.php:578
#: lib/designsettings.php:178
msgid "Background"
msgstr ""
-#: actions/designadminpanel.php:429
+#: actions/designadminpanel.php:496
#, fuzzy, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
"$s."
msgstr "Може да качите лого за групата ви."
-#: actions/designadminpanel.php:459 lib/designsettings.php:139
+#: actions/designadminpanel.php:526 lib/designsettings.php:139
msgid "On"
msgstr ""
-#: actions/designadminpanel.php:475 lib/designsettings.php:155
+#: actions/designadminpanel.php:542 lib/designsettings.php:155
msgid "Off"
msgstr ""
-#: actions/designadminpanel.php:476 lib/designsettings.php:156
+#: actions/designadminpanel.php:543 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr ""
-#: actions/designadminpanel.php:481 lib/designsettings.php:161
+#: actions/designadminpanel.php:548 lib/designsettings.php:161
msgid "Tile background image"
msgstr ""
-#: actions/designadminpanel.php:490 lib/designsettings.php:170
+#: actions/designadminpanel.php:554
+msgid "Background server"
+msgstr ""
+
+#: actions/designadminpanel.php:558
+msgid "Background path"
+msgstr ""
+
+#: actions/designadminpanel.php:562
+msgid "Background directory"
+msgstr ""
+
+#: actions/designadminpanel.php:569 lib/designsettings.php:170
#, fuzzy
msgid "Change colours"
msgstr "Смяна на паролата"
-#: actions/designadminpanel.php:511 lib/designsettings.php:191
+#: actions/designadminpanel.php:591 lib/designsettings.php:191
#, fuzzy
msgid "Content"
msgstr "Свързване"
-#: actions/designadminpanel.php:524 lib/designsettings.php:204
+#: actions/designadminpanel.php:604 lib/designsettings.php:204
#, fuzzy
msgid "Sidebar"
msgstr "Търсене"
-#: actions/designadminpanel.php:537 lib/designsettings.php:217
+#: actions/designadminpanel.php:617 lib/designsettings.php:217
msgid "Text"
msgstr "Текст"
-#: actions/designadminpanel.php:550 lib/designsettings.php:230
+#: actions/designadminpanel.php:630 lib/designsettings.php:230
#, fuzzy
msgid "Links"
msgstr "Списък"
-#: actions/designadminpanel.php:611 lib/designsettings.php:247
+#: actions/designadminpanel.php:658 lib/designsettings.php:247
msgid "Use defaults"
msgstr ""
-#: actions/designadminpanel.php:612 lib/designsettings.php:248
+#: actions/designadminpanel.php:659 lib/designsettings.php:248
msgid "Restore default designs"
msgstr ""
-#: actions/designadminpanel.php:618 lib/designsettings.php:254
+#: actions/designadminpanel.php:665 lib/designsettings.php:254
msgid "Reset back to default"
msgstr ""
-#: actions/designadminpanel.php:620 actions/emailsettings.php:195
+#: actions/designadminpanel.php:667 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/profilesettings.php:167 actions/siteadminpanel.php:371
+#: actions/profilesettings.php:167 actions/siteadminpanel.php:414
#: actions/smssettings.php:181 actions/subscriptions.php:203
#: actions/tagother.php:154 actions/useradminpanel.php:226
#: lib/designsettings.php:256 lib/groupeditform.php:202
msgid "Save"
msgstr "Запазване"
-#: actions/designadminpanel.php:621 lib/designsettings.php:257
+#: actions/designadminpanel.php:668 lib/designsettings.php:257
msgid "Save design"
msgstr ""
@@ -993,6 +1056,11 @@ msgstr "Автобиографията е твърде дълга (до 140 си
msgid "Could not update group."
msgstr "Грешка при обновяване на групата."
+#: actions/editgroup.php:259 classes/User_group.php:390
+#, fuzzy
+msgid "Could not create aliases."
+msgstr "Грешка при отбелязване като любима."
+
#: actions/editgroup.php:269
msgid "Options saved."
msgstr "Настройките са запазени."
@@ -1110,7 +1178,7 @@ msgstr "Не е въведена е-поща."
msgid "Cannot normalize that email address"
msgstr "Грешка при нормализиране адреса на е-пощата"
-#: actions/emailsettings.php:330 actions/siteadminpanel.php:156
+#: actions/emailsettings.php:330 actions/siteadminpanel.php:158
msgid "Not a valid email address"
msgstr "Това не е правилен адрес на е-поща."
@@ -1841,10 +1909,10 @@ msgstr "Невалидно съдържание на бележка"
msgid "Incorrect username or password."
msgstr "Грешно име или парола."
-#: actions/login.php:149 actions/recoverpassword.php:375
-#: actions/register.php:248
-msgid "Error setting user."
-msgstr "Грешка в настройките на потребителя."
+#: actions/login.php:149
+#, fuzzy
+msgid "Error setting user. You are probably not authorized."
+msgstr "Забранено."
#: actions/login.php:204 actions/login.php:257 lib/action.php:457
#: lib/logingroupnav.php:79
@@ -2268,7 +2336,7 @@ msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:275
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:309
msgid "Language"
msgstr "Език"
@@ -2296,7 +2364,7 @@ msgstr ""
msgid "Bio is too long (max %d chars)."
msgstr "Автобиографията е твърде дълга (до 140 символа)."
-#: actions/profilesettings.php:228 actions/siteadminpanel.php:163
+#: actions/profilesettings.php:228 actions/siteadminpanel.php:165
msgid "Timezone not selected."
msgstr "Не е избран часови пояс"
@@ -2540,6 +2608,10 @@ msgstr "Паролата трябва да е от поне 6 знака."
msgid "Password and confirmation do not match."
msgstr "Паролата и потвърждението й не съвпадат."
+#: actions/recoverpassword.php:375 actions/register.php:248
+msgid "Error setting user."
+msgstr "Грешка в настройките на потребителя."
+
#: actions/recoverpassword.php:382
msgid "New password successfully saved. You are now logged in."
msgstr "Новата парола е запазена. Влязохте успешно."
@@ -2603,7 +2675,7 @@ msgid "Same as password above. Required."
msgstr "Същото като паролата по-горе. Задължително поле."
#: actions/register.php:437 actions/register.php:441
-#: actions/siteadminpanel.php:253 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:287 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "Е-поща"
@@ -3045,7 +3117,7 @@ msgstr "Не може да изпращате съобщения до този
msgid "User is already silenced."
msgstr "Потребителят ви е блокирал."
-#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:272
+#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:299
#, fuzzy
msgid "Site"
msgstr "Покани"
@@ -3054,122 +3126,236 @@ msgstr "Покани"
msgid "Basic settings for this StatusNet site."
msgstr ""
-#: actions/siteadminpanel.php:145
+#: actions/siteadminpanel.php:147
msgid "Site name must have non-zero length."
msgstr ""
-#: actions/siteadminpanel.php:153
+#: actions/siteadminpanel.php:155
#, fuzzy
msgid "You must have a valid contact email address"
msgstr "Това не е правилен адрес на е-поща."
-#: actions/siteadminpanel.php:171
+#: actions/siteadminpanel.php:173
#, php-format
msgid "Unknown language \"%s\""
msgstr ""
-#: actions/siteadminpanel.php:178
+#: actions/siteadminpanel.php:180
msgid "Invalid snapshot report URL."
msgstr ""
-#: actions/siteadminpanel.php:184
+#: actions/siteadminpanel.php:186
msgid "Invalid snapshot run value."
msgstr ""
-#: actions/siteadminpanel.php:190
+#: actions/siteadminpanel.php:192
msgid "Snapshot frequency must be a number."
msgstr ""
-#: actions/siteadminpanel.php:241
+#: actions/siteadminpanel.php:199
+msgid "You must set an SSL sever when enabling SSL."
+msgstr ""
+
+#: actions/siteadminpanel.php:204
+msgid "Invalid SSL server. Max length is 255 characters."
+msgstr ""
+
+#: actions/siteadminpanel.php:210
+msgid "Minimum text limit is 140c."
+msgstr ""
+
+#: actions/siteadminpanel.php:216
+msgid "Dupe limit must 1 or more seconds."
+msgstr ""
+
+#: actions/siteadminpanel.php:224
+#, php-format
+msgid "Locales directory not readable: %s"
+msgstr ""
+
+#: actions/siteadminpanel.php:275
#, fuzzy
msgid "Site name"
msgstr "Нова бележка"
-#: actions/siteadminpanel.php:242
+#: actions/siteadminpanel.php:276
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr ""
-#: actions/siteadminpanel.php:245
+#: actions/siteadminpanel.php:279
msgid "Brought by"
msgstr ""
-#: actions/siteadminpanel.php:246
+#: actions/siteadminpanel.php:280
msgid "Text used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:249
+#: actions/siteadminpanel.php:283
msgid "Brought by URL"
msgstr ""
-#: actions/siteadminpanel.php:250
+#: actions/siteadminpanel.php:284
msgid "URL used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:254
+#: actions/siteadminpanel.php:288
#, fuzzy
msgid "contact email address for your site"
msgstr "Нов адрес на е-поща за публикщуване в %s"
-#: actions/siteadminpanel.php:268
+#: actions/siteadminpanel.php:302
msgid "Default timezone"
msgstr ""
-#: actions/siteadminpanel.php:269
+#: actions/siteadminpanel.php:303
msgid "Default timezone for the site; usually UTC."
msgstr ""
-#: actions/siteadminpanel.php:276
+#: actions/siteadminpanel.php:310
#, fuzzy
msgid "Default site language"
msgstr "Предпочитан език"
-#: actions/siteadminpanel.php:282
+#: actions/siteadminpanel.php:316
+msgid "Path to locales"
+msgstr ""
+
+#: actions/siteadminpanel.php:316
+msgid "Directory path to locales"
+msgstr ""
+
+#: actions/siteadminpanel.php:320
+#, fuzzy
+msgid "Server"
+msgstr "Възстановяване"
+
+#: actions/siteadminpanel.php:320
+msgid "Site's server hostname."
+msgstr ""
+
+#: actions/siteadminpanel.php:324
+msgid "Path"
+msgstr ""
+
+#: actions/siteadminpanel.php:324
+#, fuzzy
+msgid "Site path"
+msgstr "Нова бележка"
+
+#: actions/siteadminpanel.php:328
+msgid "Fancy URLs"
+msgstr ""
+
+#: actions/siteadminpanel.php:330
+msgid "Use fancy (more readable and memorable) URLs?"
+msgstr ""
+
+#: actions/siteadminpanel.php:334
#, fuzzy
msgid "Private"
msgstr "Поверителност"
-#: actions/siteadminpanel.php:284
+#: actions/siteadminpanel.php:336
msgid "Prohibit anonymous users (not logged in) from viewing site?"
msgstr ""
-#: actions/siteadminpanel.php:290
+#: actions/siteadminpanel.php:340
+#, fuzzy
+msgid "Invite only"
+msgstr "Покани"
+
+#: actions/siteadminpanel.php:342
+msgid "Make registration invitation only."
+msgstr ""
+
+#: actions/siteadminpanel.php:346 actions/useradminpanel.php:171
+#, fuzzy
+msgid "Closed"
+msgstr "Блокиране"
+
+#: actions/siteadminpanel.php:348
+msgid "Disable new registrations."
+msgstr ""
+
+#: actions/siteadminpanel.php:353
msgid "Randomly during Web hit"
msgstr ""
-#: actions/siteadminpanel.php:291
+#: actions/siteadminpanel.php:354
msgid "In a scheduled job"
msgstr ""
-#: actions/siteadminpanel.php:292
+#: actions/siteadminpanel.php:355 actions/siteadminpanel.php:380
#, fuzzy
msgid "Never"
msgstr "Възстановяване"
-#: actions/siteadminpanel.php:294
+#: actions/siteadminpanel.php:357
msgid "Data snapshots"
msgstr ""
-#: actions/siteadminpanel.php:295
+#: actions/siteadminpanel.php:358
msgid "When to send statistical data to status.net servers"
msgstr ""
-#: actions/siteadminpanel.php:301
+#: actions/siteadminpanel.php:364
msgid "Frequency"
msgstr ""
-#: actions/siteadminpanel.php:302
+#: actions/siteadminpanel.php:365
msgid "Snapshots will be sent once every N Web hits"
msgstr ""
-#: actions/siteadminpanel.php:309
+#: actions/siteadminpanel.php:372
msgid "Report URL"
msgstr ""
-#: actions/siteadminpanel.php:310
+#: actions/siteadminpanel.php:373
msgid "Snapshots will be sent to this URL"
msgstr ""
-#: actions/siteadminpanel.php:371 actions/useradminpanel.php:226
+#: actions/siteadminpanel.php:381
+#, fuzzy
+msgid "Sometimes"
+msgstr "Бележки"
+
+#: actions/siteadminpanel.php:382
+msgid "Always"
+msgstr ""
+
+#: actions/siteadminpanel.php:384
+msgid "Use SSL"
+msgstr ""
+
+#: actions/siteadminpanel.php:385
+msgid "When to use SSL"
+msgstr ""
+
+#: actions/siteadminpanel.php:391
+msgid "SSL Server"
+msgstr ""
+
+#: actions/siteadminpanel.php:392
+msgid "Server to direct SSL requests to"
+msgstr ""
+
+#: actions/siteadminpanel.php:396
+msgid "Text limit"
+msgstr ""
+
+#: actions/siteadminpanel.php:396
+msgid "Maximum number of characters for notices."
+msgstr ""
+
+#: actions/siteadminpanel.php:400
+msgid "Dupe limit"
+msgstr ""
+
+#: actions/siteadminpanel.php:400
+msgid "How long users must wait (in seconds) to post the same thing again."
+msgstr ""
+
+#: actions/siteadminpanel.php:414 actions/useradminpanel.php:226
#, fuzzy
msgid "Save site settings"
msgstr "Настройки за аватар"
@@ -3491,11 +3677,6 @@ msgstr "Потребител"
msgid "User settings for this StatusNet site."
msgstr ""
-#: actions/useradminpanel.php:171
-#, fuzzy
-msgid "Closed"
-msgstr "Блокиране"
-
#: actions/useradminpanel.php:173
msgid "Is registration on this site prohibited?"
msgstr ""
@@ -3725,6 +3906,15 @@ msgstr "Проблем при записване на бележката."
msgid "DB error inserting reply: %s"
msgstr "Грешка в базата от данни — отговор при вмъкването: %s"
+#: classes/User_group.php:380
+msgid "Could not create group."
+msgstr "Грешка при създаване на групата."
+
+#: classes/User_group.php:409
+#, fuzzy
+msgid "Could not set group membership."
+msgstr "Грешка при създаване на нов абонамент."
+
#: classes/User.php:347
#, fuzzy, php-format
msgid "Welcome to %1$s, @%2$s!"
@@ -3969,12 +4159,17 @@ msgstr "Командата все още не се поддържа."
msgid "saveSettings() not implemented."
msgstr "Командата все още не се поддържа."
-#: lib/adminpanelaction.php:273
+#: lib/adminpanelaction.php:247
+#, fuzzy
+msgid "Unable to delete design setting."
+msgstr "Грешка при записване настройките за Twitter"
+
+#: lib/adminpanelaction.php:300
#, fuzzy
msgid "Basic site configuration"
msgstr "Потвърждаване адреса на е-поща"
-#: lib/adminpanelaction.php:276
+#: lib/adminpanelaction.php:303
#, fuzzy
msgid "Design configuration"
msgstr "Потвърждение за SMS"
@@ -4224,20 +4419,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:203
+#: lib/common.php:199
#, fuzzy
msgid "No configuration file found. "
msgstr "Няма код за потвърждение."
-#: lib/common.php:204
+#: lib/common.php:200
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:205
+#: lib/common.php:201
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:206
+#: lib/common.php:202
#, fuzzy
msgid "Go to the installer."
msgstr "Влизане в сайта"
@@ -5006,11 +5201,6 @@ msgstr "Без"
msgid "Top posters"
msgstr "Най-често пишещи"
-#: lib/unblockform.php:80
-#, fuzzy
-msgid "Unlock this user"
-msgstr "Разблокиране на този потребител"
-
#: lib/unsandboxform.php:69
msgid "Unsandbox"
msgstr ""
@@ -5063,47 +5253,47 @@ msgstr "Изпращате на пряко съобщение до този по
msgid "Message"
msgstr "Съобщение"
-#: lib/util.php:821
+#: lib/util.php:826
msgid "a few seconds ago"
msgstr "преди няколко секунди"
-#: lib/util.php:823
+#: lib/util.php:828
msgid "about a minute ago"
msgstr "преди около минута"
-#: lib/util.php:825
+#: lib/util.php:830
#, php-format
msgid "about %d minutes ago"
msgstr "преди около %d минути"
-#: lib/util.php:827
+#: lib/util.php:832
msgid "about an hour ago"
msgstr "преди около час"
-#: lib/util.php:829
+#: lib/util.php:834
#, php-format
msgid "about %d hours ago"
msgstr "преди около %d часа"
-#: lib/util.php:831
+#: lib/util.php:836
msgid "about a day ago"
msgstr "преди около ден"
-#: lib/util.php:833
+#: lib/util.php:838
#, php-format
msgid "about %d days ago"
msgstr "преди около %d дни"
-#: lib/util.php:835
+#: lib/util.php:840
msgid "about a month ago"
msgstr "преди около месец"
-#: lib/util.php:837
+#: lib/util.php:842
#, php-format
msgid "about %d months ago"
msgstr "преди около %d месеца"
-#: lib/util.php:839
+#: lib/util.php:844
msgid "about a year ago"
msgstr "преди около година"
@@ -5134,5 +5324,9 @@ msgid "Sorry, no incoming email allowed."
msgstr "Входящата поща не е разрешена."
#, fuzzy
+#~ msgid "Unlock this user"
+#~ msgstr "Разблокиране на този потребител"
+
+#, fuzzy
#~ msgid "These people are subscribed to you: "
#~ msgstr "Абонирани за %s"
diff --git a/locale/ca/LC_MESSAGES/statusnet.po b/locale/ca/LC_MESSAGES/statusnet.po
index 585fa3de5..b62c35c19 100644
--- a/locale/ca/LC_MESSAGES/statusnet.po
+++ b/locale/ca/LC_MESSAGES/statusnet.po
@@ -2,15 +2,18 @@
#
# Author@translatewiki.net: Toniher
# --
+# 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-18 19:31+0000\n"
+"POT-Creation-Date: 2009-11-19 10:43+0000\n"
"PO-Revision-Date: 2009-11-18 19:31:29+0000\n"
"Language-Team: Catalan\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: MediaWiki 1.16alpha(r59207); Translate extension (2009-11-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ca\n"
@@ -144,7 +147,7 @@ msgstr "No s'ha pogut actualitzar l'usuari."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
-#: actions/designadminpanel.php:125 actions/newnotice.php:94
+#: actions/designadminpanel.php:122 actions/newnotice.php:94
#: lib/designsettings.php:283
#, php-format
msgid ""
@@ -228,7 +231,7 @@ msgstr "Tots els missatges directes enviats a %s"
#: 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:184 actions/apigroupismember.php:114
+#: 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
@@ -298,21 +301,7 @@ msgstr "No s'ha pogut recuperar la conversa pública."
msgid "Could not find target user."
msgstr "No es pot trobar cap estatus."
-#: actions/apigroupcreate.php:136 actions/newgroup.php:204
-msgid "Could not create group."
-msgstr "No s'ha pogut crear el grup."
-
-#: actions/apigroupcreate.php:147 actions/editgroup.php:259
-#: actions/newgroup.php:210
-#, fuzzy
-msgid "Could not create aliases."
-msgstr "No es pot crear favorit."
-
-#: actions/apigroupcreate.php:166 actions/newgroup.php:224
-msgid "Could not set group membership."
-msgstr "No s'ha pogut establir la pertinença d'aquest grup."
-
-#: actions/apigroupcreate.php:212 actions/editgroup.php:182
+#: actions/apigroupcreate.php:164 actions/editgroup.php:182
#: actions/newgroup.php:126 actions/profilesettings.php:208
#: actions/register.php:205
msgid "Nickname must have only lowercase letters and numbers and no spaces."
@@ -320,60 +309,60 @@ msgstr ""
"El sobrenom ha de tenir només lletres minúscules i números i no pot tenir "
"espais."
-#: actions/apigroupcreate.php:221 actions/editgroup.php:186
+#: 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 "Aquest sobrenom ja existeix. Prova un altre. "
-#: actions/apigroupcreate.php:228 actions/editgroup.php:189
+#: 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 "Sobrenom no vàlid."
-#: actions/apigroupcreate.php:244 actions/editgroup.php:195
+#: 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 "La pàgina personal no és un URL vàlid."
-#: actions/apigroupcreate.php:253 actions/editgroup.php:198
+#: 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 "El teu nom és massa llarg (màx. 255 caràcters)."
-#: actions/apigroupcreate.php:261
+#: actions/apigroupcreate.php:213
#, php-format
msgid "Description is too long (max %d chars)."
msgstr "La descripció és massa llarga (màx. %d caràcters)."
-#: actions/apigroupcreate.php:272 actions/editgroup.php:204
+#: 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 "La ubicació és massa llarga (màx. 255 caràcters)."
-#: actions/apigroupcreate.php:291 actions/editgroup.php:215
+#: actions/apigroupcreate.php:243 actions/editgroup.php:215
#: actions/newgroup.php:159
#, php-format
msgid "Too many aliases! Maximum %d."
msgstr ""
-#: actions/apigroupcreate.php:312 actions/editgroup.php:224
+#: actions/apigroupcreate.php:264 actions/editgroup.php:224
#: actions/newgroup.php:168
#, fuzzy, php-format
msgid "Invalid alias: \"%s\""
msgstr "Etiqueta no vàlida: \"%s\""
-#: actions/apigroupcreate.php:321 actions/editgroup.php:228
+#: actions/apigroupcreate.php:273 actions/editgroup.php:228
#: actions/newgroup.php:172
#, fuzzy, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr "Aquest sobrenom ja existeix. Prova un altre. "
-#: actions/apigroupcreate.php:334 actions/editgroup.php:234
+#: actions/apigroupcreate.php:286 actions/editgroup.php:234
#: actions/newgroup.php:178
msgid "Alias can't be the same as nickname."
msgstr ""
@@ -599,10 +588,10 @@ msgstr ""
"Sembla que hi ha hagut un problema amb la teva sessió. Prova-ho de nou, si "
"us plau."
-#: actions/avatarsettings.php:277 actions/emailsettings.php:255
-#: actions/grouplogo.php:319 actions/imsettings.php:220
-#: actions/recoverpassword.php:44 actions/smssettings.php:248
-#: lib/designsettings.php:304
+#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
+#: actions/emailsettings.php:255 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/recoverpassword.php:44
+#: actions/smssettings.php:248 lib/designsettings.php:304
msgid "Unexpected form submission."
msgstr "Enviament de formulari inesperat."
@@ -667,7 +656,7 @@ msgstr "Ha fallat el desbloqueig d'usuari."
msgid "Unblock"
msgstr "Desbloquejar"
-#: actions/blockedfromgroup.php:313
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:80
msgid "Unblock this user"
msgstr "Desbloquejar aquest usuari"
@@ -844,7 +833,7 @@ msgid "Delete this user"
msgstr "Eliminar aquesta nota"
#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124
-#: lib/adminpanelaction.php:275 lib/groupnav.php:119
+#: lib/adminpanelaction.php:302 lib/groupnav.php:119
msgid "Design"
msgstr ""
@@ -852,108 +841,183 @@ msgstr ""
msgid "Design settings for this StatusNet site."
msgstr ""
-#: actions/designadminpanel.php:220
+#: actions/designadminpanel.php:278
#, fuzzy
-msgid "Unable to delete design setting."
-msgstr "No s'ha pogut guardar la teva configuració de Twitter!"
+msgid "Invalid logo URL."
+msgstr "Mida invàlida."
-#: actions/designadminpanel.php:301
+#: actions/designadminpanel.php:282
#, fuzzy, php-format
msgid "Theme not available: %s"
msgstr "Aquesta pàgina no està disponible en "
-#: actions/designadminpanel.php:406
+#: actions/designadminpanel.php:288
+#, fuzzy, php-format
+msgid "Theme directory not readable: %s"
+msgstr "Aquesta pàgina no està disponible en "
+
+#: actions/designadminpanel.php:292
+#, php-format
+msgid "Avatar directory not writable: %s"
+msgstr ""
+
+#: actions/designadminpanel.php:296
+#, php-format
+msgid "Background directory not writable: %s"
+msgstr ""
+
+#: actions/designadminpanel.php:312
+#, php-format
+msgid "Max length for %s %s is 255 characters."
+msgstr ""
+
+#: actions/designadminpanel.php:412
+#, fuzzy
+msgid "Change logo"
+msgstr "Canviar la teva contrasenya"
+
+#: actions/designadminpanel.php:417
+#, fuzzy
+msgid "Site logo"
+msgstr "Invitar"
+
+#: actions/designadminpanel.php:424
#, fuzzy
msgid "Change theme"
msgstr "Canviar"
-#: actions/designadminpanel.php:410
-msgid "Theme"
-msgstr ""
+#: actions/designadminpanel.php:441
+#, fuzzy
+msgid "Site theme"
+msgstr "Avís del lloc"
-#: actions/designadminpanel.php:411
+#: actions/designadminpanel.php:442
#, fuzzy
msgid "Theme for the site."
msgstr "Sortir d'aquest lloc"
-#: actions/designadminpanel.php:420 lib/designsettings.php:101
+#: actions/designadminpanel.php:447
+msgid "Theme server"
+msgstr ""
+
+#: actions/designadminpanel.php:451
+msgid "Theme path"
+msgstr ""
+
+#: actions/designadminpanel.php:455
+msgid "Theme directory"
+msgstr ""
+
+#: actions/designadminpanel.php:462
+#, fuzzy
+msgid "Avatar Settings"
+msgstr "Configuració de l'avatar"
+
+#: actions/designadminpanel.php:467
+#, fuzzy
+msgid "Avatar server"
+msgstr "Configuració de l'avatar"
+
+#: actions/designadminpanel.php:471
+#, fuzzy
+msgid "Avatar path"
+msgstr "Avatar actualitzat."
+
+#: actions/designadminpanel.php:475
+#, fuzzy
+msgid "Avatar directory"
+msgstr "Avatar actualitzat."
+
+#: actions/designadminpanel.php:486 lib/designsettings.php:101
msgid "Change background image"
msgstr ""
-#: actions/designadminpanel.php:424 actions/designadminpanel.php:498
+#: actions/designadminpanel.php:491 actions/designadminpanel.php:578
#: lib/designsettings.php:178
msgid "Background"
msgstr ""
-#: actions/designadminpanel.php:429
+#: actions/designadminpanel.php:496
#, fuzzy, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
"$s."
msgstr "Pots pujar una imatge de logo per al grup."
-#: actions/designadminpanel.php:459 lib/designsettings.php:139
+#: actions/designadminpanel.php:526 lib/designsettings.php:139
msgid "On"
msgstr ""
-#: actions/designadminpanel.php:475 lib/designsettings.php:155
+#: actions/designadminpanel.php:542 lib/designsettings.php:155
msgid "Off"
msgstr ""
-#: actions/designadminpanel.php:476 lib/designsettings.php:156
+#: actions/designadminpanel.php:543 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr ""
-#: actions/designadminpanel.php:481 lib/designsettings.php:161
+#: actions/designadminpanel.php:548 lib/designsettings.php:161
msgid "Tile background image"
msgstr ""
-#: actions/designadminpanel.php:490 lib/designsettings.php:170
+#: actions/designadminpanel.php:554
+msgid "Background server"
+msgstr ""
+
+#: actions/designadminpanel.php:558
+msgid "Background path"
+msgstr ""
+
+#: actions/designadminpanel.php:562
+msgid "Background directory"
+msgstr ""
+
+#: actions/designadminpanel.php:569 lib/designsettings.php:170
#, fuzzy
msgid "Change colours"
msgstr "Canviar la teva contrasenya"
-#: actions/designadminpanel.php:511 lib/designsettings.php:191
+#: actions/designadminpanel.php:591 lib/designsettings.php:191
#, fuzzy
msgid "Content"
msgstr "Connectar-se"
-#: actions/designadminpanel.php:524 lib/designsettings.php:204
+#: actions/designadminpanel.php:604 lib/designsettings.php:204
#, fuzzy
msgid "Sidebar"
msgstr "Cercar"
-#: actions/designadminpanel.php:537 lib/designsettings.php:217
+#: actions/designadminpanel.php:617 lib/designsettings.php:217
msgid "Text"
msgstr "Text"
-#: actions/designadminpanel.php:550 lib/designsettings.php:230
+#: actions/designadminpanel.php:630 lib/designsettings.php:230
#, fuzzy
msgid "Links"
msgstr "Inici de sessió"
-#: actions/designadminpanel.php:611 lib/designsettings.php:247
+#: actions/designadminpanel.php:658 lib/designsettings.php:247
msgid "Use defaults"
msgstr ""
-#: actions/designadminpanel.php:612 lib/designsettings.php:248
+#: actions/designadminpanel.php:659 lib/designsettings.php:248
msgid "Restore default designs"
msgstr ""
-#: actions/designadminpanel.php:618 lib/designsettings.php:254
+#: actions/designadminpanel.php:665 lib/designsettings.php:254
msgid "Reset back to default"
msgstr ""
-#: actions/designadminpanel.php:620 actions/emailsettings.php:195
+#: actions/designadminpanel.php:667 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/profilesettings.php:167 actions/siteadminpanel.php:371
+#: actions/profilesettings.php:167 actions/siteadminpanel.php:414
#: actions/smssettings.php:181 actions/subscriptions.php:203
#: actions/tagother.php:154 actions/useradminpanel.php:226
#: lib/designsettings.php:256 lib/groupeditform.php:202
msgid "Save"
msgstr "Guardar"
-#: actions/designadminpanel.php:621 lib/designsettings.php:257
+#: actions/designadminpanel.php:668 lib/designsettings.php:257
msgid "Save design"
msgstr ""
@@ -996,6 +1060,11 @@ msgstr "la descripció és massa llarga (màx. 140 caràcters)."
msgid "Could not update group."
msgstr "No s'ha pogut actualitzar el grup."
+#: actions/editgroup.php:259 classes/User_group.php:390
+#, fuzzy
+msgid "Could not create aliases."
+msgstr "No es pot crear favorit."
+
#: actions/editgroup.php:269
msgid "Options saved."
msgstr "Configuració guardada."
@@ -1117,7 +1186,7 @@ msgstr "No hi ha cap direcció de correu electrònic."
msgid "Cannot normalize that email address"
msgstr "No es pot normalitzar aquesta direcció de correu electrònic"
-#: actions/emailsettings.php:330 actions/siteadminpanel.php:156
+#: actions/emailsettings.php:330 actions/siteadminpanel.php:158
msgid "Not a valid email address"
msgstr "No és una direcció de correu electrònic vàlida."
@@ -1855,10 +1924,10 @@ msgstr "El contingut de l'avís és invàlid"
msgid "Incorrect username or password."
msgstr "Nom d'usuari o contrasenya incorrectes."
-#: actions/login.php:149 actions/recoverpassword.php:375
-#: actions/register.php:248
-msgid "Error setting user."
-msgstr "Error en configurar l'usuari."
+#: actions/login.php:149
+#, fuzzy
+msgid "Error setting user. You are probably not authorized."
+msgstr "No autoritzat."
#: actions/login.php:204 actions/login.php:257 lib/action.php:457
#: lib/logingroupnav.php:79
@@ -2290,7 +2359,7 @@ msgstr ""
"Etiquetes per a tu mateix (lletres, números, -, ., i _), per comes o separat "
"por espais"
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:275
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:309
msgid "Language"
msgstr "Idioma"
@@ -2318,7 +2387,7 @@ msgstr ""
msgid "Bio is too long (max %d chars)."
msgstr "La biografia és massa llarga (màx. 140 caràcters)."
-#: actions/profilesettings.php:228 actions/siteadminpanel.php:163
+#: actions/profilesettings.php:228 actions/siteadminpanel.php:165
msgid "Timezone not selected."
msgstr "Franja horària no seleccionada."
@@ -2565,6 +2634,10 @@ msgstr "La contrasenya ha de tenir 6 o més caràcters."
msgid "Password and confirmation do not match."
msgstr "La contrasenya i la confirmació no coincideixen."
+#: actions/recoverpassword.php:375 actions/register.php:248
+msgid "Error setting user."
+msgstr "Error en configurar l'usuari."
+
#: actions/recoverpassword.php:382
msgid "New password successfully saved. You are now logged in."
msgstr "Nova contrasenya guardada correctament. Has iniciat una sessió."
@@ -2627,7 +2700,7 @@ msgid "Same as password above. Required."
msgstr "Igual a la contrasenya de dalt. Requerit."
#: actions/register.php:437 actions/register.php:441
-#: actions/siteadminpanel.php:253 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:287 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "Correu electrònic"
@@ -3075,7 +3148,7 @@ msgstr "No pots enviar un missatge a aquest usuari."
msgid "User is already silenced."
msgstr "Un usuari t'ha bloquejat."
-#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:272
+#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:299
#, fuzzy
msgid "Site"
msgstr "Invitar"
@@ -3084,122 +3157,236 @@ msgstr "Invitar"
msgid "Basic settings for this StatusNet site."
msgstr ""
-#: actions/siteadminpanel.php:145
+#: actions/siteadminpanel.php:147
msgid "Site name must have non-zero length."
msgstr ""
-#: actions/siteadminpanel.php:153
+#: actions/siteadminpanel.php:155
#, fuzzy
msgid "You must have a valid contact email address"
msgstr "No és una direcció de correu electrònic vàlida."
-#: actions/siteadminpanel.php:171
+#: actions/siteadminpanel.php:173
#, php-format
msgid "Unknown language \"%s\""
msgstr ""
-#: actions/siteadminpanel.php:178
+#: actions/siteadminpanel.php:180
msgid "Invalid snapshot report URL."
msgstr ""
-#: actions/siteadminpanel.php:184
+#: actions/siteadminpanel.php:186
msgid "Invalid snapshot run value."
msgstr ""
-#: actions/siteadminpanel.php:190
+#: actions/siteadminpanel.php:192
msgid "Snapshot frequency must be a number."
msgstr ""
-#: actions/siteadminpanel.php:241
+#: actions/siteadminpanel.php:199
+msgid "You must set an SSL sever when enabling SSL."
+msgstr ""
+
+#: actions/siteadminpanel.php:204
+msgid "Invalid SSL server. Max length is 255 characters."
+msgstr ""
+
+#: actions/siteadminpanel.php:210
+msgid "Minimum text limit is 140c."
+msgstr ""
+
+#: actions/siteadminpanel.php:216
+msgid "Dupe limit must 1 or more seconds."
+msgstr ""
+
+#: actions/siteadminpanel.php:224
+#, php-format
+msgid "Locales directory not readable: %s"
+msgstr ""
+
+#: actions/siteadminpanel.php:275
#, fuzzy
msgid "Site name"
msgstr "Avís del lloc"
-#: actions/siteadminpanel.php:242
+#: actions/siteadminpanel.php:276
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr ""
-#: actions/siteadminpanel.php:245
+#: actions/siteadminpanel.php:279
msgid "Brought by"
msgstr ""
-#: actions/siteadminpanel.php:246
+#: actions/siteadminpanel.php:280
msgid "Text used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:249
+#: actions/siteadminpanel.php:283
msgid "Brought by URL"
msgstr ""
-#: actions/siteadminpanel.php:250
+#: actions/siteadminpanel.php:284
msgid "URL used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:254
+#: actions/siteadminpanel.php:288
#, fuzzy
msgid "contact email address for your site"
msgstr "Nou correu electrònic per publicar a %s"
-#: actions/siteadminpanel.php:268
+#: actions/siteadminpanel.php:302
msgid "Default timezone"
msgstr ""
-#: actions/siteadminpanel.php:269
+#: actions/siteadminpanel.php:303
msgid "Default timezone for the site; usually UTC."
msgstr ""
-#: actions/siteadminpanel.php:276
+#: actions/siteadminpanel.php:310
#, fuzzy
msgid "Default site language"
msgstr "Preferència d'idioma"
-#: actions/siteadminpanel.php:282
+#: actions/siteadminpanel.php:316
+msgid "Path to locales"
+msgstr ""
+
+#: actions/siteadminpanel.php:316
+msgid "Directory path to locales"
+msgstr ""
+
+#: actions/siteadminpanel.php:320
+#, fuzzy
+msgid "Server"
+msgstr "Recuperar"
+
+#: actions/siteadminpanel.php:320
+msgid "Site's server hostname."
+msgstr ""
+
+#: actions/siteadminpanel.php:324
+msgid "Path"
+msgstr ""
+
+#: actions/siteadminpanel.php:324
+#, fuzzy
+msgid "Site path"
+msgstr "Avís del lloc"
+
+#: actions/siteadminpanel.php:328
+msgid "Fancy URLs"
+msgstr ""
+
+#: actions/siteadminpanel.php:330
+msgid "Use fancy (more readable and memorable) URLs?"
+msgstr ""
+
+#: actions/siteadminpanel.php:334
#, fuzzy
msgid "Private"
msgstr "Privacitat"
-#: actions/siteadminpanel.php:284
+#: actions/siteadminpanel.php:336
msgid "Prohibit anonymous users (not logged in) from viewing site?"
msgstr ""
-#: actions/siteadminpanel.php:290
+#: actions/siteadminpanel.php:340
+#, fuzzy
+msgid "Invite only"
+msgstr "Invitar"
+
+#: actions/siteadminpanel.php:342
+msgid "Make registration invitation only."
+msgstr ""
+
+#: actions/siteadminpanel.php:346 actions/useradminpanel.php:171
+#, fuzzy
+msgid "Closed"
+msgstr "Bloquejar"
+
+#: actions/siteadminpanel.php:348
+msgid "Disable new registrations."
+msgstr ""
+
+#: actions/siteadminpanel.php:353
msgid "Randomly during Web hit"
msgstr ""
-#: actions/siteadminpanel.php:291
+#: actions/siteadminpanel.php:354
msgid "In a scheduled job"
msgstr ""
-#: actions/siteadminpanel.php:292
+#: actions/siteadminpanel.php:355 actions/siteadminpanel.php:380
#, fuzzy
msgid "Never"
msgstr "Recuperar"
-#: actions/siteadminpanel.php:294
+#: actions/siteadminpanel.php:357
msgid "Data snapshots"
msgstr ""
-#: actions/siteadminpanel.php:295
+#: actions/siteadminpanel.php:358
msgid "When to send statistical data to status.net servers"
msgstr ""
-#: actions/siteadminpanel.php:301
+#: actions/siteadminpanel.php:364
msgid "Frequency"
msgstr ""
-#: actions/siteadminpanel.php:302
+#: actions/siteadminpanel.php:365
msgid "Snapshots will be sent once every N Web hits"
msgstr ""
-#: actions/siteadminpanel.php:309
+#: actions/siteadminpanel.php:372
msgid "Report URL"
msgstr ""
-#: actions/siteadminpanel.php:310
+#: actions/siteadminpanel.php:373
msgid "Snapshots will be sent to this URL"
msgstr ""
-#: actions/siteadminpanel.php:371 actions/useradminpanel.php:226
+#: actions/siteadminpanel.php:381
+#, fuzzy
+msgid "Sometimes"
+msgstr "Avisos"
+
+#: actions/siteadminpanel.php:382
+msgid "Always"
+msgstr ""
+
+#: actions/siteadminpanel.php:384
+msgid "Use SSL"
+msgstr ""
+
+#: actions/siteadminpanel.php:385
+msgid "When to use SSL"
+msgstr ""
+
+#: actions/siteadminpanel.php:391
+msgid "SSL Server"
+msgstr ""
+
+#: actions/siteadminpanel.php:392
+msgid "Server to direct SSL requests to"
+msgstr ""
+
+#: actions/siteadminpanel.php:396
+msgid "Text limit"
+msgstr ""
+
+#: actions/siteadminpanel.php:396
+msgid "Maximum number of characters for notices."
+msgstr ""
+
+#: actions/siteadminpanel.php:400
+msgid "Dupe limit"
+msgstr ""
+
+#: actions/siteadminpanel.php:400
+msgid "How long users must wait (in seconds) to post the same thing again."
+msgstr ""
+
+#: actions/siteadminpanel.php:414 actions/useradminpanel.php:226
#, fuzzy
msgid "Save site settings"
msgstr "Configuració de l'avatar"
@@ -3521,11 +3708,6 @@ msgstr "Usuari"
msgid "User settings for this StatusNet site."
msgstr ""
-#: actions/useradminpanel.php:171
-#, fuzzy
-msgid "Closed"
-msgstr "Bloquejar"
-
#: actions/useradminpanel.php:173
msgid "Is registration on this site prohibited?"
msgstr ""
@@ -3756,6 +3938,14 @@ msgstr "Problema en guardar l'avís."
msgid "DB error inserting reply: %s"
msgstr "Error de BD en inserir resposta: %s"
+#: classes/User_group.php:380
+msgid "Could not create group."
+msgstr "No s'ha pogut crear el grup."
+
+#: classes/User_group.php:409
+msgid "Could not set group membership."
+msgstr "No s'ha pogut establir la pertinença d'aquest grup."
+
#: classes/User.php:347
#, fuzzy, php-format
msgid "Welcome to %1$s, @%2$s!"
@@ -3996,12 +4186,17 @@ msgstr "Comanda encara no implementada."
msgid "saveSettings() not implemented."
msgstr "Comanda encara no implementada."
-#: lib/adminpanelaction.php:273
+#: lib/adminpanelaction.php:247
+#, fuzzy
+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"
-#: lib/adminpanelaction.php:276
+#: lib/adminpanelaction.php:303
#, fuzzy
msgid "Design configuration"
msgstr "Confirmació SMS"
@@ -4249,20 +4444,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:203
+#: lib/common.php:199
#, fuzzy
msgid "No configuration file found. "
msgstr "Cap codi de confirmació."
-#: lib/common.php:204
+#: lib/common.php:200
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:205
+#: lib/common.php:201
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:206
+#: lib/common.php:202
#, fuzzy
msgid "Go to the installer."
msgstr "Accedir a aquest lloc"
@@ -5037,11 +5232,6 @@ msgstr "Cap"
msgid "Top posters"
msgstr "Que més publiquen"
-#: lib/unblockform.php:80
-#, fuzzy
-msgid "Unlock this user"
-msgstr "Desbloquejar aquest usuari"
-
#: lib/unsandboxform.php:69
msgid "Unsandbox"
msgstr ""
@@ -5094,47 +5284,47 @@ msgstr "Enviar un missatge directe a aquest usuari"
msgid "Message"
msgstr "Missatge"
-#: lib/util.php:821
+#: lib/util.php:826
msgid "a few seconds ago"
msgstr "fa pocs segons"
-#: lib/util.php:823
+#: lib/util.php:828
msgid "about a minute ago"
msgstr "fa un minut"
-#: lib/util.php:825
+#: lib/util.php:830
#, php-format
msgid "about %d minutes ago"
msgstr "fa %d minuts"
-#: lib/util.php:827
+#: lib/util.php:832
msgid "about an hour ago"
msgstr "fa una hora"
-#: lib/util.php:829
+#: lib/util.php:834
#, php-format
msgid "about %d hours ago"
msgstr "fa %d hores"
-#: lib/util.php:831
+#: lib/util.php:836
msgid "about a day ago"
msgstr "fa un dia"
-#: lib/util.php:833
+#: lib/util.php:838
#, php-format
msgid "about %d days ago"
msgstr "fa %d dies"
-#: lib/util.php:835
+#: lib/util.php:840
msgid "about a month ago"
msgstr "fa un mes"
-#: lib/util.php:837
+#: lib/util.php:842
#, php-format
msgid "about %d months ago"
msgstr "fa %d mesos"
-#: lib/util.php:839
+#: lib/util.php:844
msgid "about a year ago"
msgstr "fa un any"
@@ -5165,5 +5355,9 @@ msgid "Sorry, no incoming email allowed."
msgstr "Perdó, no hi ha un correu electrònic entrant permès."
#, fuzzy
+#~ msgid "Unlock this user"
+#~ msgstr "Desbloquejar aquest usuari"
+
+#, fuzzy
#~ msgid "These people are subscribed to you: "
#~ msgstr "Persones subscrites a %s"
diff --git a/locale/cs/LC_MESSAGES/statusnet.po b/locale/cs/LC_MESSAGES/statusnet.po
index 78d54d2c4..a16f2aa14 100644
--- a/locale/cs/LC_MESSAGES/statusnet.po
+++ b/locale/cs/LC_MESSAGES/statusnet.po
@@ -1,15 +1,18 @@
# Translation of StatusNet to Czech
#
# --
+# 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-18 19:31+0000\n"
+"POT-Creation-Date: 2009-11-19 10:43+0000\n"
"PO-Revision-Date: 2009-11-18 19:31:32+0000\n"
"Language-Team: Czech\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n< =4) ? 1 : 2 ;\n"
"X-Generator: MediaWiki 1.16alpha(r59207); Translate extension (2009-11-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: cs\n"
@@ -145,7 +148,7 @@ msgstr "Nelze aktualizovat uživatele"
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
-#: actions/designadminpanel.php:125 actions/newnotice.php:94
+#: actions/designadminpanel.php:122 actions/newnotice.php:94
#: lib/designsettings.php:283
#, php-format
msgid ""
@@ -228,7 +231,7 @@ msgstr ""
#: 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:184 actions/apigroupismember.php:114
+#: 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
@@ -295,82 +298,66 @@ msgstr "Nelze aktualizovat uživatele"
msgid "Could not find target user."
msgstr "Nelze aktualizovat uživatele"
-#: actions/apigroupcreate.php:136 actions/newgroup.php:204
-#, fuzzy
-msgid "Could not create group."
-msgstr "Nelze uložin informace o obrázku"
-
-#: actions/apigroupcreate.php:147 actions/editgroup.php:259
-#: actions/newgroup.php:210
-#, fuzzy
-msgid "Could not create aliases."
-msgstr "Nelze uložin informace o obrázku"
-
-#: actions/apigroupcreate.php:166 actions/newgroup.php:224
-#, fuzzy
-msgid "Could not set group membership."
-msgstr "Nelze vytvořit odebírat"
-
-#: actions/apigroupcreate.php:212 actions/editgroup.php:182
+#: actions/apigroupcreate.php:164 actions/editgroup.php:182
#: actions/newgroup.php:126 actions/profilesettings.php:208
#: actions/register.php:205
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr "Přezdívka může obsahovat pouze malá písmena a čísla bez mezer"
-#: actions/apigroupcreate.php:221 actions/editgroup.php:186
+#: 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řezdívku již někdo používá. Zkuste jinou"
-#: actions/apigroupcreate.php:228 actions/editgroup.php:189
+#: 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 "Není platnou přezdívkou."
-#: actions/apigroupcreate.php:244 actions/editgroup.php:195
+#: 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 "Stránka není platnou URL."
-#: actions/apigroupcreate.php:253 actions/editgroup.php:198
+#: 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 "Jméno je moc dlouhé (maximální délka je 255 znaků)"
-#: actions/apigroupcreate.php:261
+#: actions/apigroupcreate.php:213
#, fuzzy, php-format
msgid "Description is too long (max %d chars)."
msgstr "Text je příliš dlouhý (maximální délka je 140 zanků)"
-#: actions/apigroupcreate.php:272 actions/editgroup.php:204
+#: 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 "Umístění příliš dlouhé (maximálně 255 znaků)"
-#: actions/apigroupcreate.php:291 actions/editgroup.php:215
+#: actions/apigroupcreate.php:243 actions/editgroup.php:215
#: actions/newgroup.php:159
#, php-format
msgid "Too many aliases! Maximum %d."
msgstr ""
-#: actions/apigroupcreate.php:312 actions/editgroup.php:224
+#: actions/apigroupcreate.php:264 actions/editgroup.php:224
#: actions/newgroup.php:168
#, fuzzy, php-format
msgid "Invalid alias: \"%s\""
msgstr "Neplatná adresa '%s'"
-#: actions/apigroupcreate.php:321 actions/editgroup.php:228
+#: actions/apigroupcreate.php:273 actions/editgroup.php:228
#: actions/newgroup.php:172
#, fuzzy, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr "Přezdívku již někdo používá. Zkuste jinou"
-#: actions/apigroupcreate.php:334 actions/editgroup.php:234
+#: actions/apigroupcreate.php:286 actions/editgroup.php:234
#: actions/newgroup.php:178
msgid "Alias can't be the same as nickname."
msgstr ""
@@ -597,10 +584,10 @@ msgstr ""
msgid "There was a problem with your session token. Try again, please."
msgstr ""
-#: actions/avatarsettings.php:277 actions/emailsettings.php:255
-#: actions/grouplogo.php:319 actions/imsettings.php:220
-#: actions/recoverpassword.php:44 actions/smssettings.php:248
-#: lib/designsettings.php:304
+#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
+#: actions/emailsettings.php:255 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/recoverpassword.php:44
+#: actions/smssettings.php:248 lib/designsettings.php:304
msgid "Unexpected form submission."
msgstr "Nečekaná forma submission."
@@ -664,7 +651,7 @@ msgstr "Žádný takový uživatel."
msgid "Unblock"
msgstr ""
-#: actions/blockedfromgroup.php:313
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:80
#, fuzzy
msgid "Unblock this user"
msgstr "Žádný takový uživatel."
@@ -837,7 +824,7 @@ msgid "Delete this user"
msgstr "Žádný takový uživatel."
#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124
-#: lib/adminpanelaction.php:275 lib/groupnav.php:119
+#: lib/adminpanelaction.php:302 lib/groupnav.php:119
msgid "Design"
msgstr ""
@@ -845,106 +832,182 @@ msgstr ""
msgid "Design settings for this StatusNet site."
msgstr ""
-#: actions/designadminpanel.php:220
-msgid "Unable to delete design setting."
-msgstr ""
+#: actions/designadminpanel.php:278
+#, fuzzy
+msgid "Invalid logo URL."
+msgstr "Neplatná velikost"
-#: actions/designadminpanel.php:301
+#: actions/designadminpanel.php:282
#, fuzzy, php-format
msgid "Theme not available: %s"
msgstr "Tato stránka není k dispozici v typu média která přijímáte."
-#: actions/designadminpanel.php:406
+#: actions/designadminpanel.php:288
+#, fuzzy, php-format
+msgid "Theme directory not readable: %s"
+msgstr "Tato stránka není k dispozici v typu média která přijímáte."
+
+#: actions/designadminpanel.php:292
+#, php-format
+msgid "Avatar directory not writable: %s"
+msgstr ""
+
+#: actions/designadminpanel.php:296
+#, php-format
+msgid "Background directory not writable: %s"
+msgstr ""
+
+#: actions/designadminpanel.php:312
+#, php-format
+msgid "Max length for %s %s is 255 characters."
+msgstr ""
+
+#: actions/designadminpanel.php:412
+#, fuzzy
+msgid "Change logo"
+msgstr "Změnit heslo"
+
+#: actions/designadminpanel.php:417
+#, fuzzy
+msgid "Site logo"
+msgstr "Nové sdělení"
+
+#: actions/designadminpanel.php:424
#, fuzzy
msgid "Change theme"
msgstr "Změnit"
-#: actions/designadminpanel.php:410
-msgid "Theme"
-msgstr ""
+#: actions/designadminpanel.php:441
+#, fuzzy
+msgid "Site theme"
+msgstr "Nové sdělení"
-#: actions/designadminpanel.php:411
+#: actions/designadminpanel.php:442
msgid "Theme for the site."
msgstr ""
-#: actions/designadminpanel.php:420 lib/designsettings.php:101
+#: actions/designadminpanel.php:447
+msgid "Theme server"
+msgstr ""
+
+#: actions/designadminpanel.php:451
+msgid "Theme path"
+msgstr ""
+
+#: actions/designadminpanel.php:455
+msgid "Theme directory"
+msgstr ""
+
+#: actions/designadminpanel.php:462
+#, fuzzy
+msgid "Avatar Settings"
+msgstr "Nastavení"
+
+#: actions/designadminpanel.php:467
+#, fuzzy
+msgid "Avatar server"
+msgstr "Nastavení"
+
+#: actions/designadminpanel.php:471
+#, fuzzy
+msgid "Avatar path"
+msgstr "Obrázek nahrán"
+
+#: actions/designadminpanel.php:475
+#, fuzzy
+msgid "Avatar directory"
+msgstr "Obrázek nahrán"
+
+#: actions/designadminpanel.php:486 lib/designsettings.php:101
msgid "Change background image"
msgstr ""
-#: actions/designadminpanel.php:424 actions/designadminpanel.php:498
+#: actions/designadminpanel.php:491 actions/designadminpanel.php:578
#: lib/designsettings.php:178
msgid "Background"
msgstr ""
-#: actions/designadminpanel.php:429
+#: actions/designadminpanel.php:496
#, fuzzy, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
"$s."
msgstr "Je to příliš dlouhé. Maximální sdělení délka je 140 znaků"
-#: actions/designadminpanel.php:459 lib/designsettings.php:139
+#: actions/designadminpanel.php:526 lib/designsettings.php:139
msgid "On"
msgstr ""
-#: actions/designadminpanel.php:475 lib/designsettings.php:155
+#: actions/designadminpanel.php:542 lib/designsettings.php:155
msgid "Off"
msgstr ""
-#: actions/designadminpanel.php:476 lib/designsettings.php:156
+#: actions/designadminpanel.php:543 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr ""
-#: actions/designadminpanel.php:481 lib/designsettings.php:161
+#: actions/designadminpanel.php:548 lib/designsettings.php:161
msgid "Tile background image"
msgstr ""
-#: actions/designadminpanel.php:490 lib/designsettings.php:170
+#: actions/designadminpanel.php:554
+msgid "Background server"
+msgstr ""
+
+#: actions/designadminpanel.php:558
+msgid "Background path"
+msgstr ""
+
+#: actions/designadminpanel.php:562
+msgid "Background directory"
+msgstr ""
+
+#: actions/designadminpanel.php:569 lib/designsettings.php:170
#, fuzzy
msgid "Change colours"
msgstr "Změnit heslo"
-#: actions/designadminpanel.php:511 lib/designsettings.php:191
+#: actions/designadminpanel.php:591 lib/designsettings.php:191
#, fuzzy
msgid "Content"
msgstr "Připojit"
-#: actions/designadminpanel.php:524 lib/designsettings.php:204
+#: actions/designadminpanel.php:604 lib/designsettings.php:204
#, fuzzy
msgid "Sidebar"
msgstr "Hledat"
-#: actions/designadminpanel.php:537 lib/designsettings.php:217
+#: actions/designadminpanel.php:617 lib/designsettings.php:217
msgid "Text"
msgstr ""
-#: actions/designadminpanel.php:550 lib/designsettings.php:230
+#: actions/designadminpanel.php:630 lib/designsettings.php:230
#, fuzzy
msgid "Links"
msgstr "Přihlásit"
-#: actions/designadminpanel.php:611 lib/designsettings.php:247
+#: actions/designadminpanel.php:658 lib/designsettings.php:247
msgid "Use defaults"
msgstr ""
-#: actions/designadminpanel.php:612 lib/designsettings.php:248
+#: actions/designadminpanel.php:659 lib/designsettings.php:248
msgid "Restore default designs"
msgstr ""
-#: actions/designadminpanel.php:618 lib/designsettings.php:254
+#: actions/designadminpanel.php:665 lib/designsettings.php:254
msgid "Reset back to default"
msgstr ""
-#: actions/designadminpanel.php:620 actions/emailsettings.php:195
+#: actions/designadminpanel.php:667 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/profilesettings.php:167 actions/siteadminpanel.php:371
+#: actions/profilesettings.php:167 actions/siteadminpanel.php:414
#: actions/smssettings.php:181 actions/subscriptions.php:203
#: actions/tagother.php:154 actions/useradminpanel.php:226
#: lib/designsettings.php:256 lib/groupeditform.php:202
msgid "Save"
msgstr "Uložit"
-#: actions/designadminpanel.php:621 lib/designsettings.php:257
+#: actions/designadminpanel.php:668 lib/designsettings.php:257
msgid "Save design"
msgstr ""
@@ -988,6 +1051,11 @@ msgstr "Text je příliš dlouhý (maximální délka je 140 zanků)"
msgid "Could not update group."
msgstr "Nelze aktualizovat uživatele"
+#: actions/editgroup.php:259 classes/User_group.php:390
+#, fuzzy
+msgid "Could not create aliases."
+msgstr "Nelze uložin informace o obrázku"
+
#: actions/editgroup.php:269
#, fuzzy
msgid "Options saved."
@@ -1103,7 +1171,7 @@ msgstr ""
msgid "Cannot normalize that email address"
msgstr ""
-#: actions/emailsettings.php:330 actions/siteadminpanel.php:156
+#: actions/emailsettings.php:330 actions/siteadminpanel.php:158
msgid "Not a valid email address"
msgstr ""
@@ -1801,10 +1869,10 @@ msgstr "Neplatný obsah sdělení"
msgid "Incorrect username or password."
msgstr "Neplatné jméno nebo heslo"
-#: actions/login.php:149 actions/recoverpassword.php:375
-#: actions/register.php:248
-msgid "Error setting user."
-msgstr "Chyba nastavení uživatele"
+#: actions/login.php:149
+#, fuzzy
+msgid "Error setting user. You are probably not authorized."
+msgstr "Neautorizován."
#: actions/login.php:204 actions/login.php:257 lib/action.php:457
#: lib/logingroupnav.php:79
@@ -2230,7 +2298,7 @@ msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:275
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:309
msgid "Language"
msgstr ""
@@ -2256,7 +2324,7 @@ msgstr ""
msgid "Bio is too long (max %d chars)."
msgstr "Text je příliš dlouhý (maximální délka je 140 zanků)"
-#: actions/profilesettings.php:228 actions/siteadminpanel.php:163
+#: actions/profilesettings.php:228 actions/siteadminpanel.php:165
msgid "Timezone not selected."
msgstr ""
@@ -2501,6 +2569,10 @@ msgstr "Heslo musí být alespoň 6 znaků dlouhé"
msgid "Password and confirmation do not match."
msgstr "Heslo a potvrzení nesouhlasí"
+#: actions/recoverpassword.php:375 actions/register.php:248
+msgid "Error setting user."
+msgstr "Chyba nastavení uživatele"
+
#: actions/recoverpassword.php:382
msgid "New password successfully saved. You are now logged in."
msgstr "Nové heslo bylo uloženo. Nyní jste přihlášen."
@@ -2562,7 +2634,7 @@ msgid "Same as password above. Required."
msgstr ""
#: actions/register.php:437 actions/register.php:441
-#: actions/siteadminpanel.php:253 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:287 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "Email"
@@ -2990,7 +3062,7 @@ msgstr ""
msgid "User is already silenced."
msgstr "Uživatel nemá profil."
-#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:272
+#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:299
msgid "Site"
msgstr ""
@@ -2998,121 +3070,234 @@ msgstr ""
msgid "Basic settings for this StatusNet site."
msgstr ""
-#: actions/siteadminpanel.php:145
+#: actions/siteadminpanel.php:147
msgid "Site name must have non-zero length."
msgstr ""
-#: actions/siteadminpanel.php:153
+#: actions/siteadminpanel.php:155
#, fuzzy
msgid "You must have a valid contact email address"
msgstr "Není platnou mailovou adresou."
-#: actions/siteadminpanel.php:171
+#: actions/siteadminpanel.php:173
#, php-format
msgid "Unknown language \"%s\""
msgstr ""
-#: actions/siteadminpanel.php:178
+#: actions/siteadminpanel.php:180
msgid "Invalid snapshot report URL."
msgstr ""
-#: actions/siteadminpanel.php:184
+#: actions/siteadminpanel.php:186
msgid "Invalid snapshot run value."
msgstr ""
-#: actions/siteadminpanel.php:190
+#: actions/siteadminpanel.php:192
msgid "Snapshot frequency must be a number."
msgstr ""
-#: actions/siteadminpanel.php:241
+#: actions/siteadminpanel.php:199
+msgid "You must set an SSL sever when enabling SSL."
+msgstr ""
+
+#: actions/siteadminpanel.php:204
+msgid "Invalid SSL server. Max length is 255 characters."
+msgstr ""
+
+#: actions/siteadminpanel.php:210
+msgid "Minimum text limit is 140c."
+msgstr ""
+
+#: actions/siteadminpanel.php:216
+msgid "Dupe limit must 1 or more seconds."
+msgstr ""
+
+#: actions/siteadminpanel.php:224
+#, php-format
+msgid "Locales directory not readable: %s"
+msgstr ""
+
+#: actions/siteadminpanel.php:275
#, fuzzy
msgid "Site name"
msgstr "Nové sdělení"
-#: actions/siteadminpanel.php:242
+#: actions/siteadminpanel.php:276
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr ""
-#: actions/siteadminpanel.php:245
+#: actions/siteadminpanel.php:279
msgid "Brought by"
msgstr ""
-#: actions/siteadminpanel.php:246
+#: actions/siteadminpanel.php:280
msgid "Text used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:249
+#: actions/siteadminpanel.php:283
msgid "Brought by URL"
msgstr ""
-#: actions/siteadminpanel.php:250
+#: actions/siteadminpanel.php:284
msgid "URL used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:254
+#: actions/siteadminpanel.php:288
#, fuzzy
msgid "contact email address for your site"
msgstr "Žádný registrovaný email pro tohoto uživatele."
-#: actions/siteadminpanel.php:268
+#: actions/siteadminpanel.php:302
msgid "Default timezone"
msgstr ""
-#: actions/siteadminpanel.php:269
+#: actions/siteadminpanel.php:303
msgid "Default timezone for the site; usually UTC."
msgstr ""
-#: actions/siteadminpanel.php:276
+#: actions/siteadminpanel.php:310
msgid "Default site language"
msgstr ""
-#: actions/siteadminpanel.php:282
+#: actions/siteadminpanel.php:316
+msgid "Path to locales"
+msgstr ""
+
+#: actions/siteadminpanel.php:316
+msgid "Directory path to locales"
+msgstr ""
+
+#: actions/siteadminpanel.php:320
+#, fuzzy
+msgid "Server"
+msgstr "Obnovit"
+
+#: actions/siteadminpanel.php:320
+msgid "Site's server hostname."
+msgstr ""
+
+#: actions/siteadminpanel.php:324
+msgid "Path"
+msgstr ""
+
+#: actions/siteadminpanel.php:324
+#, fuzzy
+msgid "Site path"
+msgstr "Nové sdělení"
+
+#: actions/siteadminpanel.php:328
+msgid "Fancy URLs"
+msgstr ""
+
+#: actions/siteadminpanel.php:330
+msgid "Use fancy (more readable and memorable) URLs?"
+msgstr ""
+
+#: actions/siteadminpanel.php:334
#, fuzzy
msgid "Private"
msgstr "Soukromí"
-#: actions/siteadminpanel.php:284
+#: actions/siteadminpanel.php:336
msgid "Prohibit anonymous users (not logged in) from viewing site?"
msgstr ""
-#: actions/siteadminpanel.php:290
+#: actions/siteadminpanel.php:340
+msgid "Invite only"
+msgstr ""
+
+#: actions/siteadminpanel.php:342
+msgid "Make registration invitation only."
+msgstr ""
+
+#: actions/siteadminpanel.php:346 actions/useradminpanel.php:171
+#, fuzzy
+msgid "Closed"
+msgstr "Žádný takový uživatel."
+
+#: actions/siteadminpanel.php:348
+msgid "Disable new registrations."
+msgstr ""
+
+#: actions/siteadminpanel.php:353
msgid "Randomly during Web hit"
msgstr ""
-#: actions/siteadminpanel.php:291
+#: actions/siteadminpanel.php:354
msgid "In a scheduled job"
msgstr ""
-#: actions/siteadminpanel.php:292
+#: actions/siteadminpanel.php:355 actions/siteadminpanel.php:380
#, fuzzy
msgid "Never"
msgstr "Obnovit"
-#: actions/siteadminpanel.php:294
+#: actions/siteadminpanel.php:357
msgid "Data snapshots"
msgstr ""
-#: actions/siteadminpanel.php:295
+#: actions/siteadminpanel.php:358
msgid "When to send statistical data to status.net servers"
msgstr ""
-#: actions/siteadminpanel.php:301
+#: actions/siteadminpanel.php:364
msgid "Frequency"
msgstr ""
-#: actions/siteadminpanel.php:302
+#: actions/siteadminpanel.php:365
msgid "Snapshots will be sent once every N Web hits"
msgstr ""
-#: actions/siteadminpanel.php:309
+#: actions/siteadminpanel.php:372
msgid "Report URL"
msgstr ""
-#: actions/siteadminpanel.php:310
+#: actions/siteadminpanel.php:373
msgid "Snapshots will be sent to this URL"
msgstr ""
-#: actions/siteadminpanel.php:371 actions/useradminpanel.php:226
+#: actions/siteadminpanel.php:381
+#, fuzzy
+msgid "Sometimes"
+msgstr "Sdělení"
+
+#: actions/siteadminpanel.php:382
+msgid "Always"
+msgstr ""
+
+#: actions/siteadminpanel.php:384
+msgid "Use SSL"
+msgstr ""
+
+#: actions/siteadminpanel.php:385
+msgid "When to use SSL"
+msgstr ""
+
+#: actions/siteadminpanel.php:391
+msgid "SSL Server"
+msgstr ""
+
+#: actions/siteadminpanel.php:392
+msgid "Server to direct SSL requests to"
+msgstr ""
+
+#: actions/siteadminpanel.php:396
+msgid "Text limit"
+msgstr ""
+
+#: actions/siteadminpanel.php:396
+msgid "Maximum number of characters for notices."
+msgstr ""
+
+#: actions/siteadminpanel.php:400
+msgid "Dupe limit"
+msgstr ""
+
+#: actions/siteadminpanel.php:400
+msgid "How long users must wait (in seconds) to post the same thing again."
+msgstr ""
+
+#: actions/siteadminpanel.php:414 actions/useradminpanel.php:226
#, fuzzy
msgid "Save site settings"
msgstr "Nastavení"
@@ -3431,11 +3616,6 @@ msgstr ""
msgid "User settings for this StatusNet site."
msgstr ""
-#: actions/useradminpanel.php:171
-#, fuzzy
-msgid "Closed"
-msgstr "Žádný takový uživatel."
-
#: actions/useradminpanel.php:173
msgid "Is registration on this site prohibited?"
msgstr ""
@@ -3660,6 +3840,16 @@ msgstr "Problém při ukládání sdělení"
msgid "DB error inserting reply: %s"
msgstr "Chyba v DB při vkládání odpovědi: %s"
+#: classes/User_group.php:380
+#, fuzzy
+msgid "Could not create group."
+msgstr "Nelze uložin informace o obrázku"
+
+#: classes/User_group.php:409
+#, fuzzy
+msgid "Could not set group membership."
+msgstr "Nelze vytvořit odebírat"
+
#: classes/User.php:347
#, php-format
msgid "Welcome to %1$s, @%2$s!"
@@ -3905,12 +4095,16 @@ msgstr ""
msgid "saveSettings() not implemented."
msgstr ""
-#: lib/adminpanelaction.php:273
+#: lib/adminpanelaction.php:247
+msgid "Unable to delete design setting."
+msgstr ""
+
+#: lib/adminpanelaction.php:300
#, fuzzy
msgid "Basic site configuration"
msgstr "Potvrzení emailové adresy"
-#: lib/adminpanelaction.php:276
+#: lib/adminpanelaction.php:303
#, fuzzy
msgid "Design configuration"
msgstr "Potvrzení emailové adresy"
@@ -4158,20 +4352,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:203
+#: lib/common.php:199
#, fuzzy
msgid "No configuration file found. "
msgstr "Žádný potvrzující kód."
-#: lib/common.php:204
+#: lib/common.php:200
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:205
+#: lib/common.php:201
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:206
+#: lib/common.php:202
msgid "Go to the installer."
msgstr ""
@@ -4948,11 +5142,6 @@ msgstr ""
msgid "Top posters"
msgstr ""
-#: lib/unblockform.php:80
-#, fuzzy
-msgid "Unlock this user"
-msgstr "Žádný takový uživatel."
-
#: lib/unsandboxform.php:69
msgid "Unsandbox"
msgstr ""
@@ -5005,47 +5194,47 @@ msgstr ""
msgid "Message"
msgstr ""
-#: lib/util.php:821
+#: lib/util.php:826
msgid "a few seconds ago"
msgstr "před pár sekundami"
-#: lib/util.php:823
+#: lib/util.php:828
msgid "about a minute ago"
msgstr "asi před minutou"
-#: lib/util.php:825
+#: lib/util.php:830
#, php-format
msgid "about %d minutes ago"
msgstr "asi před %d minutami"
-#: lib/util.php:827
+#: lib/util.php:832
msgid "about an hour ago"
msgstr "asi před hodinou"
-#: lib/util.php:829
+#: lib/util.php:834
#, php-format
msgid "about %d hours ago"
msgstr "asi před %d hodinami"
-#: lib/util.php:831
+#: lib/util.php:836
msgid "about a day ago"
msgstr "asi přede dnem"
-#: lib/util.php:833
+#: lib/util.php:838
#, php-format
msgid "about %d days ago"
msgstr "před %d dny"
-#: lib/util.php:835
+#: lib/util.php:840
msgid "about a month ago"
msgstr "asi před měsícem"
-#: lib/util.php:837
+#: lib/util.php:842
#, php-format
msgid "about %d months ago"
msgstr "asi před %d mesíci"
-#: lib/util.php:839
+#: lib/util.php:844
msgid "about a year ago"
msgstr "asi před rokem"
@@ -5076,5 +5265,9 @@ msgid "Sorry, no incoming email allowed."
msgstr ""
#, fuzzy
+#~ msgid "Unlock this user"
+#~ msgstr "Žádný takový uživatel."
+
+#, fuzzy
#~ msgid "These people are subscribed to you: "
#~ msgstr "Vzdálený odběr"
diff --git a/locale/de/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po
index 6de4ddf2e..e6c0a751f 100644
--- a/locale/de/LC_MESSAGES/statusnet.po
+++ b/locale/de/LC_MESSAGES/statusnet.po
@@ -2,15 +2,18 @@
#
# Author@translatewiki.net: Umherirrender
# --
+# 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-18 19:31+0000\n"
+"POT-Creation-Date: 2009-11-19 10:43+0000\n"
"PO-Revision-Date: 2009-11-18 19:31:34+0000\n"
"Language-Team: German\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: MediaWiki 1.16alpha(r59207); Translate extension (2009-11-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: de\n"
@@ -142,7 +145,7 @@ msgstr "Konnte Benutzerdaten nicht aktualisieren."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
-#: actions/designadminpanel.php:125 actions/newnotice.php:94
+#: actions/designadminpanel.php:122 actions/newnotice.php:94
#: lib/designsettings.php:283
#, php-format
msgid ""
@@ -226,7 +229,7 @@ msgstr "Alle an %s gesendeten direkten Nachrichten"
#: 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:184 actions/apigroupismember.php:114
+#: 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
@@ -290,20 +293,7 @@ msgstr "Konnte öffentlichen Stream nicht abrufen."
msgid "Could not find target user."
msgstr "Konnte keine Statusmeldungen finden."
-#: actions/apigroupcreate.php:136 actions/newgroup.php:204
-msgid "Could not create group."
-msgstr "Konnte Gruppe nicht erstellen."
-
-#: actions/apigroupcreate.php:147 actions/editgroup.php:259
-#: actions/newgroup.php:210
-msgid "Could not create aliases."
-msgstr "Konnte keinen Favoriten erstellen."
-
-#: actions/apigroupcreate.php:166 actions/newgroup.php:224
-msgid "Could not set group membership."
-msgstr "Konnte Gruppenmitgliedschaft nicht setzen."
-
-#: actions/apigroupcreate.php:212 actions/editgroup.php:182
+#: actions/apigroupcreate.php:164 actions/editgroup.php:182
#: actions/newgroup.php:126 actions/profilesettings.php:208
#: actions/register.php:205
msgid "Nickname must have only lowercase letters and numbers and no spaces."
@@ -311,61 +301,61 @@ msgstr ""
"Der Nutzername darf nur aus Kleinbuchstaben und Ziffern bestehen. "
"Leerzeichen sind nicht erlaubt."
-#: actions/apigroupcreate.php:221 actions/editgroup.php:186
+#: 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 "Nutzername wird bereits verwendet. Suche dir einen anderen aus."
-#: actions/apigroupcreate.php:228 actions/editgroup.php:189
+#: 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 "Ungültiger Nutzername."
-#: actions/apigroupcreate.php:244 actions/editgroup.php:195
+#: 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 ""
"Homepage ist kein gültiger URL. URL´s müssen ein Präfix wie http enthalten."
-#: actions/apigroupcreate.php:253 actions/editgroup.php:198
+#: 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 "Ihr vollständiger Name ist zu lang (maximal 255 Zeichen)."
-#: actions/apigroupcreate.php:261
+#: actions/apigroupcreate.php:213
#, php-format
msgid "Description is too long (max %d chars)."
msgstr "Die Beschreibung ist zu lang (max. %d Zeichen)."
-#: actions/apigroupcreate.php:272 actions/editgroup.php:204
+#: 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 "Der eingegebene Aufenthaltsort ist zu lang (maximal 255 Zeichen)."
-#: actions/apigroupcreate.php:291 actions/editgroup.php:215
+#: actions/apigroupcreate.php:243 actions/editgroup.php:215
#: actions/newgroup.php:159
#, php-format
msgid "Too many aliases! Maximum %d."
msgstr ""
-#: actions/apigroupcreate.php:312 actions/editgroup.php:224
+#: actions/apigroupcreate.php:264 actions/editgroup.php:224
#: actions/newgroup.php:168
#, php-format
msgid "Invalid alias: \"%s\""
msgstr "Ungültiger Tag: „%s“"
-#: actions/apigroupcreate.php:321 actions/editgroup.php:228
+#: actions/apigroupcreate.php:273 actions/editgroup.php:228
#: actions/newgroup.php:172
#, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr "Nutzername „%s“ wird bereits verwendet. Suche dir einen anderen aus."
-#: actions/apigroupcreate.php:334 actions/editgroup.php:234
+#: actions/apigroupcreate.php:286 actions/editgroup.php:234
#: actions/newgroup.php:178
msgid "Alias can't be the same as nickname."
msgstr ""
@@ -588,10 +578,10 @@ msgstr "Zuschneiden"
msgid "There was a problem with your session token. Try again, please."
msgstr "Es gab ein Problem mit deinem Sitzungstoken. Bitte versuche es erneut."
-#: actions/avatarsettings.php:277 actions/emailsettings.php:255
-#: actions/grouplogo.php:319 actions/imsettings.php:220
-#: actions/recoverpassword.php:44 actions/smssettings.php:248
-#: lib/designsettings.php:304
+#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
+#: actions/emailsettings.php:255 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/recoverpassword.php:44
+#: actions/smssettings.php:248 lib/designsettings.php:304
msgid "Unexpected form submission."
msgstr "Unerwartete Formulareingabe."
@@ -655,7 +645,7 @@ msgstr "Freigeben des Benutzers fehlgeschlagen."
msgid "Unblock"
msgstr "Freigeben"
-#: actions/blockedfromgroup.php:313
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:80
#, fuzzy
msgid "Unblock this user"
msgstr "Benutzer freigeben"
@@ -834,7 +824,7 @@ msgid "Delete this user"
msgstr "Notiz löschen"
#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124
-#: lib/adminpanelaction.php:275 lib/groupnav.php:119
+#: lib/adminpanelaction.php:302 lib/groupnav.php:119
msgid "Design"
msgstr ""
@@ -842,108 +832,183 @@ msgstr ""
msgid "Design settings for this StatusNet site."
msgstr ""
-#: actions/designadminpanel.php:220
+#: actions/designadminpanel.php:278
#, fuzzy
-msgid "Unable to delete design setting."
-msgstr "Konnte Twitter-Einstellungen nicht speichern."
+msgid "Invalid logo URL."
+msgstr "Ungültige Größe."
-#: actions/designadminpanel.php:301
+#: actions/designadminpanel.php:282
#, fuzzy, php-format
msgid "Theme not available: %s"
msgstr "Diese Seite liegt in nicht verfügbar in einem "
-#: actions/designadminpanel.php:406
+#: actions/designadminpanel.php:288
+#, fuzzy, php-format
+msgid "Theme directory not readable: %s"
+msgstr "Diese Seite liegt in nicht verfügbar in einem "
+
+#: actions/designadminpanel.php:292
+#, php-format
+msgid "Avatar directory not writable: %s"
+msgstr ""
+
+#: actions/designadminpanel.php:296
+#, php-format
+msgid "Background directory not writable: %s"
+msgstr ""
+
+#: actions/designadminpanel.php:312
+#, php-format
+msgid "Max length for %s %s is 255 characters."
+msgstr ""
+
+#: actions/designadminpanel.php:412
+#, fuzzy
+msgid "Change logo"
+msgstr "Ändere dein Passwort"
+
+#: actions/designadminpanel.php:417
+#, fuzzy
+msgid "Site logo"
+msgstr "Einladen"
+
+#: actions/designadminpanel.php:424
#, fuzzy
msgid "Change theme"
msgstr "Ändern"
-#: actions/designadminpanel.php:410
-msgid "Theme"
-msgstr ""
+#: actions/designadminpanel.php:441
+#, fuzzy
+msgid "Site theme"
+msgstr "Seitennachricht"
-#: actions/designadminpanel.php:411
+#: actions/designadminpanel.php:442
#, fuzzy
msgid "Theme for the site."
msgstr "Von der Seite abmelden"
-#: actions/designadminpanel.php:420 lib/designsettings.php:101
+#: actions/designadminpanel.php:447
+msgid "Theme server"
+msgstr ""
+
+#: actions/designadminpanel.php:451
+msgid "Theme path"
+msgstr ""
+
+#: actions/designadminpanel.php:455
+msgid "Theme directory"
+msgstr ""
+
+#: actions/designadminpanel.php:462
+#, fuzzy
+msgid "Avatar Settings"
+msgstr "Avatar-Einstellungen"
+
+#: actions/designadminpanel.php:467
+#, fuzzy
+msgid "Avatar server"
+msgstr "Avatar-Einstellungen"
+
+#: actions/designadminpanel.php:471
+#, fuzzy
+msgid "Avatar path"
+msgstr "Avatar aktualisiert."
+
+#: actions/designadminpanel.php:475
+#, fuzzy
+msgid "Avatar directory"
+msgstr "Avatar aktualisiert."
+
+#: actions/designadminpanel.php:486 lib/designsettings.php:101
msgid "Change background image"
msgstr ""
-#: actions/designadminpanel.php:424 actions/designadminpanel.php:498
+#: actions/designadminpanel.php:491 actions/designadminpanel.php:578
#: lib/designsettings.php:178
msgid "Background"
msgstr ""
-#: actions/designadminpanel.php:429
+#: actions/designadminpanel.php:496
#, fuzzy, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
"$s."
msgstr "Du kannst ein Logo für Deine Gruppe hochladen."
-#: actions/designadminpanel.php:459 lib/designsettings.php:139
+#: actions/designadminpanel.php:526 lib/designsettings.php:139
msgid "On"
msgstr ""
-#: actions/designadminpanel.php:475 lib/designsettings.php:155
+#: actions/designadminpanel.php:542 lib/designsettings.php:155
msgid "Off"
msgstr ""
-#: actions/designadminpanel.php:476 lib/designsettings.php:156
+#: actions/designadminpanel.php:543 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr ""
-#: actions/designadminpanel.php:481 lib/designsettings.php:161
+#: actions/designadminpanel.php:548 lib/designsettings.php:161
msgid "Tile background image"
msgstr ""
-#: actions/designadminpanel.php:490 lib/designsettings.php:170
+#: actions/designadminpanel.php:554
+msgid "Background server"
+msgstr ""
+
+#: actions/designadminpanel.php:558
+msgid "Background path"
+msgstr ""
+
+#: actions/designadminpanel.php:562
+msgid "Background directory"
+msgstr ""
+
+#: actions/designadminpanel.php:569 lib/designsettings.php:170
#, fuzzy
msgid "Change colours"
msgstr "Ändere dein Passwort"
-#: actions/designadminpanel.php:511 lib/designsettings.php:191
+#: actions/designadminpanel.php:591 lib/designsettings.php:191
#, fuzzy
msgid "Content"
msgstr "Verbinden"
-#: actions/designadminpanel.php:524 lib/designsettings.php:204
+#: actions/designadminpanel.php:604 lib/designsettings.php:204
#, fuzzy
msgid "Sidebar"
msgstr "Suchen"
-#: actions/designadminpanel.php:537 lib/designsettings.php:217
+#: actions/designadminpanel.php:617 lib/designsettings.php:217
msgid "Text"
msgstr "Text"
-#: actions/designadminpanel.php:550 lib/designsettings.php:230
+#: actions/designadminpanel.php:630 lib/designsettings.php:230
#, fuzzy
msgid "Links"
msgstr "Liste"
-#: actions/designadminpanel.php:611 lib/designsettings.php:247
+#: actions/designadminpanel.php:658 lib/designsettings.php:247
msgid "Use defaults"
msgstr ""
-#: actions/designadminpanel.php:612 lib/designsettings.php:248
+#: actions/designadminpanel.php:659 lib/designsettings.php:248
msgid "Restore default designs"
msgstr ""
-#: actions/designadminpanel.php:618 lib/designsettings.php:254
+#: actions/designadminpanel.php:665 lib/designsettings.php:254
msgid "Reset back to default"
msgstr ""
-#: actions/designadminpanel.php:620 actions/emailsettings.php:195
+#: actions/designadminpanel.php:667 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/profilesettings.php:167 actions/siteadminpanel.php:371
+#: actions/profilesettings.php:167 actions/siteadminpanel.php:414
#: actions/smssettings.php:181 actions/subscriptions.php:203
#: actions/tagother.php:154 actions/useradminpanel.php:226
#: lib/designsettings.php:256 lib/groupeditform.php:202
msgid "Save"
msgstr "Speichern"
-#: actions/designadminpanel.php:621 lib/designsettings.php:257
+#: actions/designadminpanel.php:668 lib/designsettings.php:257
msgid "Save design"
msgstr ""
@@ -986,6 +1051,10 @@ msgstr "Die Beschreibung ist zu lang (max. 140 Zeichen)."
msgid "Could not update group."
msgstr "Konnte Gruppe nicht aktualisieren."
+#: actions/editgroup.php:259 classes/User_group.php:390
+msgid "Could not create aliases."
+msgstr "Konnte keinen Favoriten erstellen."
+
#: actions/editgroup.php:269
msgid "Options saved."
msgstr "Einstellungen gespeichert."
@@ -1108,7 +1177,7 @@ msgstr "Keine E-Mail-Adresse."
msgid "Cannot normalize that email address"
msgstr "Konnte diese E-Mail-Adresse nicht normalisieren"
-#: actions/emailsettings.php:330 actions/siteadminpanel.php:156
+#: actions/emailsettings.php:330 actions/siteadminpanel.php:158
msgid "Not a valid email address"
msgstr "Ungültige E-Mail-Adresse"
@@ -1850,10 +1919,10 @@ msgstr "Ungültiger Nachrichteninhalt"
msgid "Incorrect username or password."
msgstr "Falscher Benutzername oder Passwort."
-#: actions/login.php:149 actions/recoverpassword.php:375
-#: actions/register.php:248
-msgid "Error setting user."
-msgstr "Fehler bei den Nutzereinstellungen."
+#: actions/login.php:149
+#, fuzzy
+msgid "Error setting user. You are probably not authorized."
+msgstr "Nicht autorisiert."
#: actions/login.php:204 actions/login.php:257 lib/action.php:457
#: lib/logingroupnav.php:79
@@ -2285,7 +2354,7 @@ msgstr ""
"Tags über dich selbst (Buchstaben, Zahlen, -, ., und _) durch Kommas oder "
"Leerzeichen getrennt"
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:275
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:309
msgid "Language"
msgstr "Sprache"
@@ -2313,7 +2382,7 @@ msgstr ""
msgid "Bio is too long (max %d chars)."
msgstr "Die Biografie ist zu lang (max. 140 Zeichen)"
-#: actions/profilesettings.php:228 actions/siteadminpanel.php:163
+#: actions/profilesettings.php:228 actions/siteadminpanel.php:165
msgid "Timezone not selected."
msgstr "Keine Zeitzone ausgewählt."
@@ -2558,6 +2627,10 @@ msgstr "Passwort muss mehr als 6 Zeichen enthalten"
msgid "Password and confirmation do not match."
msgstr "Passwort und seine Bestätigung stimmen nicht überein."
+#: actions/recoverpassword.php:375 actions/register.php:248
+msgid "Error setting user."
+msgstr "Fehler bei den Nutzereinstellungen."
+
#: actions/recoverpassword.php:382
msgid "New password successfully saved. You are now logged in."
msgstr "Neues Passwort erfolgreich gespeichert. Du bist jetzt angemeldet."
@@ -2622,7 +2695,7 @@ msgid "Same as password above. Required."
msgstr "Gleiches Passwort wie zuvor. Pflichteingabe."
#: actions/register.php:437 actions/register.php:441
-#: actions/siteadminpanel.php:253 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:287 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "E-Mail"
@@ -3074,7 +3147,7 @@ msgstr "Du kannst diesem Benutzer keine Nachricht schicken."
msgid "User is already silenced."
msgstr "Dieser Benutzer hat dich blockiert."
-#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:272
+#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:299
#, fuzzy
msgid "Site"
msgstr "Einladen"
@@ -3083,122 +3156,236 @@ msgstr "Einladen"
msgid "Basic settings for this StatusNet site."
msgstr ""
-#: actions/siteadminpanel.php:145
+#: actions/siteadminpanel.php:147
msgid "Site name must have non-zero length."
msgstr ""
-#: actions/siteadminpanel.php:153
+#: actions/siteadminpanel.php:155
#, fuzzy
msgid "You must have a valid contact email address"
msgstr "Ungültige E-Mail-Adresse"
-#: actions/siteadminpanel.php:171
+#: actions/siteadminpanel.php:173
#, php-format
msgid "Unknown language \"%s\""
msgstr ""
-#: actions/siteadminpanel.php:178
+#: actions/siteadminpanel.php:180
msgid "Invalid snapshot report URL."
msgstr ""
-#: actions/siteadminpanel.php:184
+#: actions/siteadminpanel.php:186
msgid "Invalid snapshot run value."
msgstr ""
-#: actions/siteadminpanel.php:190
+#: actions/siteadminpanel.php:192
msgid "Snapshot frequency must be a number."
msgstr ""
-#: actions/siteadminpanel.php:241
+#: actions/siteadminpanel.php:199
+msgid "You must set an SSL sever when enabling SSL."
+msgstr ""
+
+#: actions/siteadminpanel.php:204
+msgid "Invalid SSL server. Max length is 255 characters."
+msgstr ""
+
+#: actions/siteadminpanel.php:210
+msgid "Minimum text limit is 140c."
+msgstr ""
+
+#: actions/siteadminpanel.php:216
+msgid "Dupe limit must 1 or more seconds."
+msgstr ""
+
+#: actions/siteadminpanel.php:224
+#, php-format
+msgid "Locales directory not readable: %s"
+msgstr ""
+
+#: actions/siteadminpanel.php:275
#, fuzzy
msgid "Site name"
msgstr "Seitennachricht"
-#: actions/siteadminpanel.php:242
+#: actions/siteadminpanel.php:276
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr ""
-#: actions/siteadminpanel.php:245
+#: actions/siteadminpanel.php:279
msgid "Brought by"
msgstr ""
-#: actions/siteadminpanel.php:246
+#: actions/siteadminpanel.php:280
msgid "Text used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:249
+#: actions/siteadminpanel.php:283
msgid "Brought by URL"
msgstr ""
-#: actions/siteadminpanel.php:250
+#: actions/siteadminpanel.php:284
msgid "URL used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:254
+#: actions/siteadminpanel.php:288
#, fuzzy
msgid "contact email address for your site"
msgstr "Neue E-Mail-Adresse um auf %s zu schreiben"
-#: actions/siteadminpanel.php:268
+#: actions/siteadminpanel.php:302
msgid "Default timezone"
msgstr ""
-#: actions/siteadminpanel.php:269
+#: actions/siteadminpanel.php:303
msgid "Default timezone for the site; usually UTC."
msgstr ""
-#: actions/siteadminpanel.php:276
+#: actions/siteadminpanel.php:310
#, fuzzy
msgid "Default site language"
msgstr "Bevorzugte Sprache"
-#: actions/siteadminpanel.php:282
+#: actions/siteadminpanel.php:316
+msgid "Path to locales"
+msgstr ""
+
+#: actions/siteadminpanel.php:316
+msgid "Directory path to locales"
+msgstr ""
+
+#: actions/siteadminpanel.php:320
+#, fuzzy
+msgid "Server"
+msgstr "Wiederherstellung"
+
+#: actions/siteadminpanel.php:320
+msgid "Site's server hostname."
+msgstr ""
+
+#: actions/siteadminpanel.php:324
+msgid "Path"
+msgstr ""
+
+#: actions/siteadminpanel.php:324
+#, fuzzy
+msgid "Site path"
+msgstr "Seitennachricht"
+
+#: actions/siteadminpanel.php:328
+msgid "Fancy URLs"
+msgstr ""
+
+#: actions/siteadminpanel.php:330
+msgid "Use fancy (more readable and memorable) URLs?"
+msgstr ""
+
+#: actions/siteadminpanel.php:334
#, fuzzy
msgid "Private"
msgstr "Privatsphäre"
-#: actions/siteadminpanel.php:284
+#: actions/siteadminpanel.php:336
msgid "Prohibit anonymous users (not logged in) from viewing site?"
msgstr ""
-#: actions/siteadminpanel.php:290
+#: actions/siteadminpanel.php:340
+#, fuzzy
+msgid "Invite only"
+msgstr "Einladen"
+
+#: actions/siteadminpanel.php:342
+msgid "Make registration invitation only."
+msgstr ""
+
+#: actions/siteadminpanel.php:346 actions/useradminpanel.php:171
+#, fuzzy
+msgid "Closed"
+msgstr "Blockieren"
+
+#: actions/siteadminpanel.php:348
+msgid "Disable new registrations."
+msgstr ""
+
+#: actions/siteadminpanel.php:353
msgid "Randomly during Web hit"
msgstr ""
-#: actions/siteadminpanel.php:291
+#: actions/siteadminpanel.php:354
msgid "In a scheduled job"
msgstr ""
-#: actions/siteadminpanel.php:292
+#: actions/siteadminpanel.php:355 actions/siteadminpanel.php:380
#, fuzzy
msgid "Never"
msgstr "Wiederherstellung"
-#: actions/siteadminpanel.php:294
+#: actions/siteadminpanel.php:357
msgid "Data snapshots"
msgstr ""
-#: actions/siteadminpanel.php:295
+#: actions/siteadminpanel.php:358
msgid "When to send statistical data to status.net servers"
msgstr ""
-#: actions/siteadminpanel.php:301
+#: actions/siteadminpanel.php:364
msgid "Frequency"
msgstr ""
-#: actions/siteadminpanel.php:302
+#: actions/siteadminpanel.php:365
msgid "Snapshots will be sent once every N Web hits"
msgstr ""
-#: actions/siteadminpanel.php:309
+#: actions/siteadminpanel.php:372
msgid "Report URL"
msgstr ""
-#: actions/siteadminpanel.php:310
+#: actions/siteadminpanel.php:373
msgid "Snapshots will be sent to this URL"
msgstr ""
-#: actions/siteadminpanel.php:371 actions/useradminpanel.php:226
+#: actions/siteadminpanel.php:381
+#, fuzzy
+msgid "Sometimes"
+msgstr "Nachrichten"
+
+#: actions/siteadminpanel.php:382
+msgid "Always"
+msgstr ""
+
+#: actions/siteadminpanel.php:384
+msgid "Use SSL"
+msgstr ""
+
+#: actions/siteadminpanel.php:385
+msgid "When to use SSL"
+msgstr ""
+
+#: actions/siteadminpanel.php:391
+msgid "SSL Server"
+msgstr ""
+
+#: actions/siteadminpanel.php:392
+msgid "Server to direct SSL requests to"
+msgstr ""
+
+#: actions/siteadminpanel.php:396
+msgid "Text limit"
+msgstr ""
+
+#: actions/siteadminpanel.php:396
+msgid "Maximum number of characters for notices."
+msgstr ""
+
+#: actions/siteadminpanel.php:400
+msgid "Dupe limit"
+msgstr ""
+
+#: actions/siteadminpanel.php:400
+msgid "How long users must wait (in seconds) to post the same thing again."
+msgstr ""
+
+#: actions/siteadminpanel.php:414 actions/useradminpanel.php:226
#, fuzzy
msgid "Save site settings"
msgstr "Avatar-Einstellungen"
@@ -3518,11 +3705,6 @@ msgstr "Benutzer"
msgid "User settings for this StatusNet site."
msgstr ""
-#: actions/useradminpanel.php:171
-#, fuzzy
-msgid "Closed"
-msgstr "Blockieren"
-
#: actions/useradminpanel.php:173
msgid "Is registration on this site prohibited?"
msgstr ""
@@ -3757,6 +3939,14 @@ msgstr "Problem bei Speichern der Nachricht."
msgid "DB error inserting reply: %s"
msgstr "Datenbankfehler beim Einfügen der Antwort: %s"
+#: classes/User_group.php:380
+msgid "Could not create group."
+msgstr "Konnte Gruppe nicht erstellen."
+
+#: classes/User_group.php:409
+msgid "Could not set group membership."
+msgstr "Konnte Gruppenmitgliedschaft nicht setzen."
+
#: classes/User.php:347
#, fuzzy, php-format
msgid "Welcome to %1$s, @%2$s!"
@@ -3998,12 +4188,17 @@ msgstr "Befehl noch nicht implementiert."
msgid "saveSettings() not implemented."
msgstr "Befehl noch nicht implementiert."
-#: lib/adminpanelaction.php:273
+#: lib/adminpanelaction.php:247
+#, fuzzy
+msgid "Unable to delete design setting."
+msgstr "Konnte Twitter-Einstellungen nicht speichern."
+
+#: lib/adminpanelaction.php:300
#, fuzzy
msgid "Basic site configuration"
msgstr "Bestätigung der E-Mail-Adresse"
-#: lib/adminpanelaction.php:276
+#: lib/adminpanelaction.php:303
#, fuzzy
msgid "Design configuration"
msgstr "SMS-Konfiguration"
@@ -4251,20 +4446,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:203
+#: lib/common.php:199
#, fuzzy
msgid "No configuration file found. "
msgstr "Kein Bestätigungs-Code."
-#: lib/common.php:204
+#: lib/common.php:200
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:205
+#: lib/common.php:201
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:206
+#: lib/common.php:202
#, fuzzy
msgid "Go to the installer."
msgstr "Auf der Seite anmelden"
@@ -5060,11 +5255,6 @@ msgstr "Nichts"
msgid "Top posters"
msgstr "Top-Schreiber"
-#: lib/unblockform.php:80
-#, fuzzy
-msgid "Unlock this user"
-msgstr "Benutzer freigeben"
-
#: lib/unsandboxform.php:69
msgid "Unsandbox"
msgstr ""
@@ -5117,47 +5307,47 @@ msgstr "Direkte Nachricht an Benutzer verschickt"
msgid "Message"
msgstr "Nachricht"
-#: lib/util.php:821
+#: lib/util.php:826
msgid "a few seconds ago"
msgstr "vor wenigen Sekunden"
-#: lib/util.php:823
+#: lib/util.php:828
msgid "about a minute ago"
msgstr "vor einer Minute"
-#: lib/util.php:825
+#: lib/util.php:830
#, php-format
msgid "about %d minutes ago"
msgstr "vor %d Minuten"
-#: lib/util.php:827
+#: lib/util.php:832
msgid "about an hour ago"
msgstr "vor einer Stunde"
-#: lib/util.php:829
+#: lib/util.php:834
#, php-format
msgid "about %d hours ago"
msgstr "vor %d Stunden"
-#: lib/util.php:831
+#: lib/util.php:836
msgid "about a day ago"
msgstr "vor einem Tag"
-#: lib/util.php:833
+#: lib/util.php:838
#, php-format
msgid "about %d days ago"
msgstr "vor %d Tagen"
-#: lib/util.php:835
+#: lib/util.php:840
msgid "about a month ago"
msgstr "vor einem Monat"
-#: lib/util.php:837
+#: lib/util.php:842
#, php-format
msgid "about %d months ago"
msgstr "vor %d Monaten"
-#: lib/util.php:839
+#: lib/util.php:844
msgid "about a year ago"
msgstr "vor einem Jahr"
@@ -5189,5 +5379,9 @@ msgid "Sorry, no incoming email allowed."
msgstr "Sorry, keinen eingehenden E-Mails gestattet."
#, fuzzy
+#~ msgid "Unlock this user"
+#~ msgstr "Benutzer freigeben"
+
+#, fuzzy
#~ msgid "These people are subscribed to you: "
#~ msgstr "Leute, die %s abonniert haben"
diff --git a/locale/el/LC_MESSAGES/statusnet.po b/locale/el/LC_MESSAGES/statusnet.po
index 936f334b8..d684dd7b4 100644
--- a/locale/el/LC_MESSAGES/statusnet.po
+++ b/locale/el/LC_MESSAGES/statusnet.po
@@ -1,15 +1,18 @@
# Translation of StatusNet to Greek
#
# --
+# 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-18 19:31+0000\n"
+"POT-Creation-Date: 2009-11-19 10:43+0000\n"
"PO-Revision-Date: 2009-11-18 19:31:37+0000\n"
"Language-Team: Greek\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: MediaWiki 1.16alpha(r59207); Translate extension (2009-11-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: el\n"
@@ -145,7 +148,7 @@ msgstr "Απέτυχε η ενημέρωση του χρήστη."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
-#: actions/designadminpanel.php:125 actions/newnotice.php:94
+#: actions/designadminpanel.php:122 actions/newnotice.php:94
#: lib/designsettings.php:283
#, php-format
msgid ""
@@ -228,7 +231,7 @@ msgstr ""
#: 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:184 actions/apigroupismember.php:114
+#: 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
@@ -296,82 +299,66 @@ msgstr "Απέτυχε η ενημέρωση του χρήστη."
msgid "Could not find target user."
msgstr "Απέτυχε η εύρεση οποιασδήποτε κατάστασης."
-#: actions/apigroupcreate.php:136 actions/newgroup.php:204
-#, fuzzy
-msgid "Could not create group."
-msgstr "Αδύνατη η αποθήκευση του προφίλ."
-
-#: actions/apigroupcreate.php:147 actions/editgroup.php:259
-#: actions/newgroup.php:210
-#, fuzzy
-msgid "Could not create aliases."
-msgstr "Αδύνατη η αποθήκευση του προφίλ."
-
-#: actions/apigroupcreate.php:166 actions/newgroup.php:224
-#, fuzzy
-msgid "Could not set group membership."
-msgstr "Αδύνατη η αποθήκευση των νέων πληροφοριών του προφίλ"
-
-#: actions/apigroupcreate.php:212 actions/editgroup.php:182
+#: actions/apigroupcreate.php:164 actions/editgroup.php:182
#: actions/newgroup.php:126 actions/profilesettings.php:208
#: actions/register.php:205
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr "Το ψευδώνυμο πρέπει να έχει μόνο πεζούς χαρακτήρες και χωρίς κενά."
-#: actions/apigroupcreate.php:221 actions/editgroup.php:186
+#: 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 "Το ψευδώνυμο είναι ήδη σε χρήση. Δοκιμάστε κάποιο άλλο."
-#: actions/apigroupcreate.php:228 actions/editgroup.php:189
+#: 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 ""
-#: actions/apigroupcreate.php:244 actions/editgroup.php:195
+#: 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 "Η αρχική σελίδα δεν είναι έγκυρο URL."
-#: actions/apigroupcreate.php:253 actions/editgroup.php:198
+#: 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 "Το ονοματεπώνυμο είναι πολύ μεγάλο (μέγιστο 255 χαρακτ.)."
-#: actions/apigroupcreate.php:261
+#: actions/apigroupcreate.php:213
#, fuzzy, php-format
msgid "Description is too long (max %d chars)."
msgstr "Το βιογραφικό είναι πολύ μεγάλο (μέγιστο 140 χαρακτ.)."
-#: actions/apigroupcreate.php:272 actions/editgroup.php:204
+#: 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 "Η τοποθεσία είναι πολύ μεγάλη (μέγιστο 255 χαρακτ.)."
-#: actions/apigroupcreate.php:291 actions/editgroup.php:215
+#: actions/apigroupcreate.php:243 actions/editgroup.php:215
#: actions/newgroup.php:159
#, php-format
msgid "Too many aliases! Maximum %d."
msgstr ""
-#: actions/apigroupcreate.php:312 actions/editgroup.php:224
+#: actions/apigroupcreate.php:264 actions/editgroup.php:224
#: actions/newgroup.php:168
#, php-format
msgid "Invalid alias: \"%s\""
msgstr ""
-#: actions/apigroupcreate.php:321 actions/editgroup.php:228
+#: actions/apigroupcreate.php:273 actions/editgroup.php:228
#: actions/newgroup.php:172
#, fuzzy, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr "Το ψευδώνυμο είναι ήδη σε χρήση. Δοκιμάστε κάποιο άλλο."
-#: actions/apigroupcreate.php:334 actions/editgroup.php:234
+#: actions/apigroupcreate.php:286 actions/editgroup.php:234
#: actions/newgroup.php:178
msgid "Alias can't be the same as nickname."
msgstr ""
@@ -593,10 +580,10 @@ msgstr ""
msgid "There was a problem with your session token. Try again, please."
msgstr ""
-#: actions/avatarsettings.php:277 actions/emailsettings.php:255
-#: actions/grouplogo.php:319 actions/imsettings.php:220
-#: actions/recoverpassword.php:44 actions/smssettings.php:248
-#: lib/designsettings.php:304
+#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
+#: actions/emailsettings.php:255 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/recoverpassword.php:44
+#: actions/smssettings.php:248 lib/designsettings.php:304
msgid "Unexpected form submission."
msgstr ""
@@ -659,7 +646,7 @@ msgstr ""
msgid "Unblock"
msgstr ""
-#: actions/blockedfromgroup.php:313
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:80
msgid "Unblock this user"
msgstr ""
@@ -830,7 +817,7 @@ msgid "Delete this user"
msgstr "Διαγραφή μηνύματος"
#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124
-#: lib/adminpanelaction.php:275 lib/groupnav.php:119
+#: lib/adminpanelaction.php:302 lib/groupnav.php:119
msgid "Design"
msgstr ""
@@ -838,105 +825,179 @@ msgstr ""
msgid "Design settings for this StatusNet site."
msgstr ""
-#: actions/designadminpanel.php:220
-msgid "Unable to delete design setting."
+#: actions/designadminpanel.php:278
+msgid "Invalid logo URL."
msgstr ""
-#: actions/designadminpanel.php:301
+#: actions/designadminpanel.php:282
#, fuzzy, php-format
msgid "Theme not available: %s"
msgstr "Η αρχική σελίδα δεν είναι έγκυρο URL."
-#: actions/designadminpanel.php:406
+#: actions/designadminpanel.php:288
+#, fuzzy, php-format
+msgid "Theme directory not readable: %s"
+msgstr "Η αρχική σελίδα δεν είναι έγκυρο URL."
+
+#: actions/designadminpanel.php:292
+#, php-format
+msgid "Avatar directory not writable: %s"
+msgstr ""
+
+#: actions/designadminpanel.php:296
+#, php-format
+msgid "Background directory not writable: %s"
+msgstr ""
+
+#: actions/designadminpanel.php:312
+#, php-format
+msgid "Max length for %s %s is 255 characters."
+msgstr ""
+
+#: actions/designadminpanel.php:412
+#, fuzzy
+msgid "Change logo"
+msgstr "Αλλάξτε τον κωδικό σας"
+
+#: actions/designadminpanel.php:417
+msgid "Site logo"
+msgstr ""
+
+#: actions/designadminpanel.php:424
#, fuzzy
msgid "Change theme"
msgstr "Αλλαγή"
-#: actions/designadminpanel.php:410
-msgid "Theme"
-msgstr ""
+#: actions/designadminpanel.php:441
+#, fuzzy
+msgid "Site theme"
+msgstr "Αλλαγή"
-#: actions/designadminpanel.php:411
+#: actions/designadminpanel.php:442
msgid "Theme for the site."
msgstr ""
-#: actions/designadminpanel.php:420 lib/designsettings.php:101
+#: actions/designadminpanel.php:447
+msgid "Theme server"
+msgstr ""
+
+#: actions/designadminpanel.php:451
+msgid "Theme path"
+msgstr ""
+
+#: actions/designadminpanel.php:455
+msgid "Theme directory"
+msgstr ""
+
+#: actions/designadminpanel.php:462
+#, fuzzy
+msgid "Avatar Settings"
+msgstr "Ρυθμίσεις OpenID"
+
+#: actions/designadminpanel.php:467
+#, fuzzy
+msgid "Avatar server"
+msgstr "Ρυθμίσεις OpenID"
+
+#: actions/designadminpanel.php:471
+#, fuzzy
+msgid "Avatar path"
+msgstr "Ρυθμίσεις OpenID"
+
+#: actions/designadminpanel.php:475
+#, fuzzy
+msgid "Avatar directory"
+msgstr "Ρυθμίσεις OpenID"
+
+#: actions/designadminpanel.php:486 lib/designsettings.php:101
msgid "Change background image"
msgstr ""
-#: actions/designadminpanel.php:424 actions/designadminpanel.php:498
+#: actions/designadminpanel.php:491 actions/designadminpanel.php:578
#: lib/designsettings.php:178
msgid "Background"
msgstr ""
-#: actions/designadminpanel.php:429
+#: actions/designadminpanel.php:496
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
"$s."
msgstr ""
-#: actions/designadminpanel.php:459 lib/designsettings.php:139
+#: actions/designadminpanel.php:526 lib/designsettings.php:139
msgid "On"
msgstr ""
-#: actions/designadminpanel.php:475 lib/designsettings.php:155
+#: actions/designadminpanel.php:542 lib/designsettings.php:155
msgid "Off"
msgstr ""
-#: actions/designadminpanel.php:476 lib/designsettings.php:156
+#: actions/designadminpanel.php:543 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr ""
-#: actions/designadminpanel.php:481 lib/designsettings.php:161
+#: actions/designadminpanel.php:548 lib/designsettings.php:161
msgid "Tile background image"
msgstr ""
-#: actions/designadminpanel.php:490 lib/designsettings.php:170
+#: actions/designadminpanel.php:554
+msgid "Background server"
+msgstr ""
+
+#: actions/designadminpanel.php:558
+msgid "Background path"
+msgstr ""
+
+#: actions/designadminpanel.php:562
+msgid "Background directory"
+msgstr ""
+
+#: actions/designadminpanel.php:569 lib/designsettings.php:170
#, fuzzy
msgid "Change colours"
msgstr "Αλλάξτε τον κωδικό σας"
-#: actions/designadminpanel.php:511 lib/designsettings.php:191
+#: actions/designadminpanel.php:591 lib/designsettings.php:191
#, fuzzy
msgid "Content"
msgstr "Σύνδεση"
-#: actions/designadminpanel.php:524 lib/designsettings.php:204
+#: actions/designadminpanel.php:604 lib/designsettings.php:204
msgid "Sidebar"
msgstr ""
-#: actions/designadminpanel.php:537 lib/designsettings.php:217
+#: actions/designadminpanel.php:617 lib/designsettings.php:217
msgid "Text"
msgstr ""
-#: actions/designadminpanel.php:550 lib/designsettings.php:230
+#: actions/designadminpanel.php:630 lib/designsettings.php:230
#, fuzzy
msgid "Links"
msgstr "Σύνδεση"
-#: actions/designadminpanel.php:611 lib/designsettings.php:247
+#: actions/designadminpanel.php:658 lib/designsettings.php:247
msgid "Use defaults"
msgstr ""
-#: actions/designadminpanel.php:612 lib/designsettings.php:248
+#: actions/designadminpanel.php:659 lib/designsettings.php:248
msgid "Restore default designs"
msgstr ""
-#: actions/designadminpanel.php:618 lib/designsettings.php:254
+#: actions/designadminpanel.php:665 lib/designsettings.php:254
msgid "Reset back to default"
msgstr ""
-#: actions/designadminpanel.php:620 actions/emailsettings.php:195
+#: actions/designadminpanel.php:667 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/profilesettings.php:167 actions/siteadminpanel.php:371
+#: actions/profilesettings.php:167 actions/siteadminpanel.php:414
#: actions/smssettings.php:181 actions/subscriptions.php:203
#: actions/tagother.php:154 actions/useradminpanel.php:226
#: lib/designsettings.php:256 lib/groupeditform.php:202
msgid "Save"
msgstr ""
-#: actions/designadminpanel.php:621 lib/designsettings.php:257
+#: actions/designadminpanel.php:668 lib/designsettings.php:257
msgid "Save design"
msgstr ""
@@ -980,6 +1041,11 @@ msgstr "Το βιογραφικό είναι πολύ μεγάλο (μέγιστ
msgid "Could not update group."
msgstr "Αδύνατη η αποθήκευση του προφίλ."
+#: actions/editgroup.php:259 classes/User_group.php:390
+#, fuzzy
+msgid "Could not create aliases."
+msgstr "Αδύνατη η αποθήκευση του προφίλ."
+
#: actions/editgroup.php:269
msgid "Options saved."
msgstr ""
@@ -1097,7 +1163,7 @@ msgstr ""
msgid "Cannot normalize that email address"
msgstr "Αδυναμία κανονικοποίησης αυτής της email διεύθυνσης"
-#: actions/emailsettings.php:330 actions/siteadminpanel.php:156
+#: actions/emailsettings.php:330 actions/siteadminpanel.php:158
msgid "Not a valid email address"
msgstr ""
@@ -1777,9 +1843,8 @@ msgstr ""
msgid "Incorrect username or password."
msgstr "Λάθος όνομα χρήστη ή κωδικός"
-#: actions/login.php:149 actions/recoverpassword.php:375
-#: actions/register.php:248
-msgid "Error setting user."
+#: actions/login.php:149
+msgid "Error setting user. You are probably not authorized."
msgstr ""
#: actions/login.php:204 actions/login.php:257 lib/action.php:457
@@ -2199,7 +2264,7 @@ msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:275
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:309
msgid "Language"
msgstr ""
@@ -2228,7 +2293,7 @@ msgstr ""
msgid "Bio is too long (max %d chars)."
msgstr "Το βιογραφικό είναι πολύ μεγάλο (μέγιστο 140 χαρακτ.)."
-#: actions/profilesettings.php:228 actions/siteadminpanel.php:163
+#: actions/profilesettings.php:228 actions/siteadminpanel.php:165
msgid "Timezone not selected."
msgstr ""
@@ -2470,6 +2535,10 @@ msgstr "Ο κωδικός πρέπει να είναι 6 χαρακτήρες ή
msgid "Password and confirmation do not match."
msgstr "Ο κωδικός και η επιβεβαίωση του δεν ταυτίζονται."
+#: actions/recoverpassword.php:375 actions/register.php:248
+msgid "Error setting user."
+msgstr ""
+
#: actions/recoverpassword.php:382
msgid "New password successfully saved. You are now logged in."
msgstr ""
@@ -2530,7 +2599,7 @@ msgid "Same as password above. Required."
msgstr ""
#: actions/register.php:437 actions/register.php:441
-#: actions/siteadminpanel.php:253 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:287 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "Email"
@@ -2968,7 +3037,7 @@ msgstr ""
msgid "User is already silenced."
msgstr ""
-#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:272
+#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:299
msgid "Site"
msgstr ""
@@ -2976,119 +3045,229 @@ msgstr ""
msgid "Basic settings for this StatusNet site."
msgstr ""
-#: actions/siteadminpanel.php:145
+#: actions/siteadminpanel.php:147
msgid "Site name must have non-zero length."
msgstr ""
-#: actions/siteadminpanel.php:153
+#: actions/siteadminpanel.php:155
#, fuzzy
msgid "You must have a valid contact email address"
msgstr "Αδυναμία κανονικοποίησης αυτής της email διεύθυνσης"
-#: actions/siteadminpanel.php:171
+#: actions/siteadminpanel.php:173
#, php-format
msgid "Unknown language \"%s\""
msgstr ""
-#: actions/siteadminpanel.php:178
+#: actions/siteadminpanel.php:180
msgid "Invalid snapshot report URL."
msgstr ""
-#: actions/siteadminpanel.php:184
+#: actions/siteadminpanel.php:186
msgid "Invalid snapshot run value."
msgstr ""
-#: actions/siteadminpanel.php:190
+#: actions/siteadminpanel.php:192
msgid "Snapshot frequency must be a number."
msgstr ""
-#: actions/siteadminpanel.php:241
+#: actions/siteadminpanel.php:199
+msgid "You must set an SSL sever when enabling SSL."
+msgstr ""
+
+#: actions/siteadminpanel.php:204
+msgid "Invalid SSL server. Max length is 255 characters."
+msgstr ""
+
+#: actions/siteadminpanel.php:210
+msgid "Minimum text limit is 140c."
+msgstr ""
+
+#: actions/siteadminpanel.php:216
+msgid "Dupe limit must 1 or more seconds."
+msgstr ""
+
+#: actions/siteadminpanel.php:224
+#, php-format
+msgid "Locales directory not readable: %s"
+msgstr ""
+
+#: actions/siteadminpanel.php:275
msgid "Site name"
msgstr ""
-#: actions/siteadminpanel.php:242
+#: actions/siteadminpanel.php:276
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr ""
-#: actions/siteadminpanel.php:245
+#: actions/siteadminpanel.php:279
msgid "Brought by"
msgstr ""
-#: actions/siteadminpanel.php:246
+#: actions/siteadminpanel.php:280
msgid "Text used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:249
+#: actions/siteadminpanel.php:283
msgid "Brought by URL"
msgstr ""
-#: actions/siteadminpanel.php:250
+#: actions/siteadminpanel.php:284
msgid "URL used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:254
+#: actions/siteadminpanel.php:288
#, fuzzy
msgid "contact email address for your site"
msgstr "Η διεύθυνση του εισερχόμενου email αφαιρέθηκε."
-#: actions/siteadminpanel.php:268
+#: actions/siteadminpanel.php:302
msgid "Default timezone"
msgstr ""
-#: actions/siteadminpanel.php:269
+#: actions/siteadminpanel.php:303
msgid "Default timezone for the site; usually UTC."
msgstr ""
-#: actions/siteadminpanel.php:276
+#: actions/siteadminpanel.php:310
msgid "Default site language"
msgstr ""
-#: actions/siteadminpanel.php:282
+#: actions/siteadminpanel.php:316
+msgid "Path to locales"
+msgstr ""
+
+#: actions/siteadminpanel.php:316
+msgid "Directory path to locales"
+msgstr ""
+
+#: actions/siteadminpanel.php:320
+#, fuzzy
+msgid "Server"
+msgstr "Αποχώρηση"
+
+#: actions/siteadminpanel.php:320
+msgid "Site's server hostname."
+msgstr ""
+
+#: actions/siteadminpanel.php:324
+msgid "Path"
+msgstr ""
+
+#: actions/siteadminpanel.php:324
+msgid "Site path"
+msgstr ""
+
+#: actions/siteadminpanel.php:328
+msgid "Fancy URLs"
+msgstr ""
+
+#: actions/siteadminpanel.php:330
+msgid "Use fancy (more readable and memorable) URLs?"
+msgstr ""
+
+#: actions/siteadminpanel.php:334
msgid "Private"
msgstr ""
-#: actions/siteadminpanel.php:284
+#: actions/siteadminpanel.php:336
msgid "Prohibit anonymous users (not logged in) from viewing site?"
msgstr ""
-#: actions/siteadminpanel.php:290
+#: actions/siteadminpanel.php:340
+msgid "Invite only"
+msgstr ""
+
+#: actions/siteadminpanel.php:342
+msgid "Make registration invitation only."
+msgstr ""
+
+#: actions/siteadminpanel.php:346 actions/useradminpanel.php:171
+msgid "Closed"
+msgstr ""
+
+#: actions/siteadminpanel.php:348
+msgid "Disable new registrations."
+msgstr ""
+
+#: actions/siteadminpanel.php:353
msgid "Randomly during Web hit"
msgstr ""
-#: actions/siteadminpanel.php:291
+#: actions/siteadminpanel.php:354
msgid "In a scheduled job"
msgstr ""
-#: actions/siteadminpanel.php:292
+#: actions/siteadminpanel.php:355 actions/siteadminpanel.php:380
#, fuzzy
msgid "Never"
msgstr "Αποχώρηση"
-#: actions/siteadminpanel.php:294
+#: actions/siteadminpanel.php:357
msgid "Data snapshots"
msgstr ""
-#: actions/siteadminpanel.php:295
+#: actions/siteadminpanel.php:358
msgid "When to send statistical data to status.net servers"
msgstr ""
-#: actions/siteadminpanel.php:301
+#: actions/siteadminpanel.php:364
msgid "Frequency"
msgstr ""
-#: actions/siteadminpanel.php:302
+#: actions/siteadminpanel.php:365
msgid "Snapshots will be sent once every N Web hits"
msgstr ""
-#: actions/siteadminpanel.php:309
+#: actions/siteadminpanel.php:372
msgid "Report URL"
msgstr ""
-#: actions/siteadminpanel.php:310
+#: actions/siteadminpanel.php:373
msgid "Snapshots will be sent to this URL"
msgstr ""
-#: actions/siteadminpanel.php:371 actions/useradminpanel.php:226
+#: actions/siteadminpanel.php:381
+msgid "Sometimes"
+msgstr ""
+
+#: actions/siteadminpanel.php:382
+msgid "Always"
+msgstr ""
+
+#: actions/siteadminpanel.php:384
+msgid "Use SSL"
+msgstr ""
+
+#: actions/siteadminpanel.php:385
+msgid "When to use SSL"
+msgstr ""
+
+#: actions/siteadminpanel.php:391
+msgid "SSL Server"
+msgstr ""
+
+#: actions/siteadminpanel.php:392
+msgid "Server to direct SSL requests to"
+msgstr ""
+
+#: actions/siteadminpanel.php:396
+msgid "Text limit"
+msgstr ""
+
+#: actions/siteadminpanel.php:396
+msgid "Maximum number of characters for notices."
+msgstr ""
+
+#: actions/siteadminpanel.php:400
+msgid "Dupe limit"
+msgstr ""
+
+#: actions/siteadminpanel.php:400
+msgid "How long users must wait (in seconds) to post the same thing again."
+msgstr ""
+
+#: actions/siteadminpanel.php:414 actions/useradminpanel.php:226
#, fuzzy
msgid "Save site settings"
msgstr "Ρυθμίσεις OpenID"
@@ -3398,10 +3577,6 @@ msgstr ""
msgid "User settings for this StatusNet site."
msgstr ""
-#: actions/useradminpanel.php:171
-msgid "Closed"
-msgstr ""
-
#: actions/useradminpanel.php:173
msgid "Is registration on this site prohibited?"
msgstr ""
@@ -3611,6 +3786,16 @@ msgstr ""
msgid "DB error inserting reply: %s"
msgstr "Σφάλμα βάσης δεδομένων κατά την εισαγωγή απάντησης: %s"
+#: classes/User_group.php:380
+#, fuzzy
+msgid "Could not create group."
+msgstr "Αδύνατη η αποθήκευση του προφίλ."
+
+#: classes/User_group.php:409
+#, fuzzy
+msgid "Could not set group membership."
+msgstr "Αδύνατη η αποθήκευση των νέων πληροφοριών του προφίλ"
+
#: classes/User.php:347
#, php-format
msgid "Welcome to %1$s, @%2$s!"
@@ -3846,12 +4031,16 @@ msgstr ""
msgid "saveSettings() not implemented."
msgstr ""
-#: lib/adminpanelaction.php:273
+#: lib/adminpanelaction.php:247
+msgid "Unable to delete design setting."
+msgstr ""
+
+#: lib/adminpanelaction.php:300
#, fuzzy
msgid "Basic site configuration"
msgstr "Επιβεβαίωση διεύθυνσης email"
-#: lib/adminpanelaction.php:276
+#: lib/adminpanelaction.php:303
#, fuzzy
msgid "Design configuration"
msgstr "Επιβεβαίωση διεύθυνσης email"
@@ -4097,20 +4286,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:203
+#: lib/common.php:199
#, fuzzy
msgid "No configuration file found. "
msgstr "Ο κωδικός επιβεβαίωσης δεν βρέθηκε."
-#: lib/common.php:204
+#: lib/common.php:200
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:205
+#: lib/common.php:201
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:206
+#: lib/common.php:202
msgid "Go to the installer."
msgstr ""
@@ -4865,11 +5054,6 @@ msgstr "Κανένα"
msgid "Top posters"
msgstr "Κορυφαίοι δημοσιευτές"
-#: lib/unblockform.php:80
-#, fuzzy
-msgid "Unlock this user"
-msgstr "Αδυναμία διαγραφής αυτού του μηνύματος."
-
#: lib/unsandboxform.php:69
msgid "Unsandbox"
msgstr ""
@@ -4921,47 +5105,47 @@ msgstr ""
msgid "Message"
msgstr ""
-#: lib/util.php:821
+#: lib/util.php:826
msgid "a few seconds ago"
msgstr ""
-#: lib/util.php:823
+#: lib/util.php:828
msgid "about a minute ago"
msgstr ""
-#: lib/util.php:825
+#: lib/util.php:830
#, php-format
msgid "about %d minutes ago"
msgstr ""
-#: lib/util.php:827
+#: lib/util.php:832
msgid "about an hour ago"
msgstr ""
-#: lib/util.php:829
+#: lib/util.php:834
#, php-format
msgid "about %d hours ago"
msgstr ""
-#: lib/util.php:831
+#: lib/util.php:836
msgid "about a day ago"
msgstr ""
-#: lib/util.php:833
+#: lib/util.php:838
#, php-format
msgid "about %d days ago"
msgstr ""
-#: lib/util.php:835
+#: lib/util.php:840
msgid "about a month ago"
msgstr ""
-#: lib/util.php:837
+#: lib/util.php:842
#, php-format
msgid "about %d months ago"
msgstr ""
-#: lib/util.php:839
+#: lib/util.php:844
msgid "about a year ago"
msgstr ""
@@ -4990,3 +5174,7 @@ msgstr ""
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr ""
+
+#, fuzzy
+#~ msgid "Unlock this user"
+#~ msgstr "Αδυναμία διαγραφής αυτού του μηνύματος."
diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po
index fe88e922b..628da61d8 100644
--- a/locale/en_GB/LC_MESSAGES/statusnet.po
+++ b/locale/en_GB/LC_MESSAGES/statusnet.po
@@ -2,21 +2,18 @@
#
# Author@translatewiki.net: CiaranG
# --
-# #-#-#-#-# statusnet.new.pot (PACKAGE VERSION) #-#-#-#-#
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 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-18 19:31+0000\n"
+"POT-Creation-Date: 2009-11-19 10:43+0000\n"
"PO-Revision-Date: 2009-11-18 19:31:40+0000\n"
"Language-Team: British English\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: MediaWiki 1.16alpha(r59207); Translate extension (2009-11-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: en-gb\n"
@@ -149,7 +146,7 @@ msgstr "Couldn't update user."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
-#: actions/designadminpanel.php:125 actions/newnotice.php:94
+#: actions/designadminpanel.php:122 actions/newnotice.php:94
#: lib/designsettings.php:283
#, php-format
msgid ""
@@ -231,7 +228,7 @@ msgstr "All the direct messages sent to %s"
#: 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:184 actions/apigroupismember.php:114
+#: 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
@@ -297,79 +294,66 @@ msgstr "Could not retrieve public stream."
msgid "Could not find target user."
msgstr "Couldn't find any statuses."
-#: actions/apigroupcreate.php:136 actions/newgroup.php:204
-msgid "Could not create group."
-msgstr "Could not create group."
-
-#: actions/apigroupcreate.php:147 actions/editgroup.php:259
-#: actions/newgroup.php:210
-msgid "Could not create aliases."
-msgstr "Could not create aliases"
-
-#: actions/apigroupcreate.php:166 actions/newgroup.php:224
-msgid "Could not set group membership."
-msgstr "Could not set group membership."
-
-#: actions/apigroupcreate.php:212 actions/editgroup.php:182
+#: actions/apigroupcreate.php:164 actions/editgroup.php:182
#: actions/newgroup.php:126 actions/profilesettings.php:208
#: actions/register.php:205
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr "Nickname must have only lowercase letters and numbers, and no spaces."
-#: actions/apigroupcreate.php:221 actions/editgroup.php:186
+#: 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 "Nickname already in use. Try another one."
-#: actions/apigroupcreate.php:228 actions/editgroup.php:189
+#: 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 "Not a valid nickname."
-#: actions/apigroupcreate.php:244 actions/editgroup.php:195
+#: 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 "Homepage is not a valid URL."
-#: actions/apigroupcreate.php:253 actions/editgroup.php:198
+#: 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 "Full name is too long (max 255 chars)."
-#: actions/apigroupcreate.php:261
+#: actions/apigroupcreate.php:213
#, fuzzy, php-format
msgid "Description is too long (max %d chars)."
msgstr "description is too long (max 140 chars)."
-#: actions/apigroupcreate.php:272 actions/editgroup.php:204
+#: 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 "Location is too long (max 255 chars)."
-#: actions/apigroupcreate.php:291 actions/editgroup.php:215
+#: actions/apigroupcreate.php:243 actions/editgroup.php:215
#: actions/newgroup.php:159
#, php-format
msgid "Too many aliases! Maximum %d."
msgstr ""
-#: actions/apigroupcreate.php:312 actions/editgroup.php:224
+#: actions/apigroupcreate.php:264 actions/editgroup.php:224
#: actions/newgroup.php:168
#, fuzzy, php-format
msgid "Invalid alias: \"%s\""
msgstr "Invalid tag: \"%s\""
-#: actions/apigroupcreate.php:321 actions/editgroup.php:228
+#: actions/apigroupcreate.php:273 actions/editgroup.php:228
#: actions/newgroup.php:172
#, fuzzy, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr "Nickname already in use. Try another one."
-#: actions/apigroupcreate.php:334 actions/editgroup.php:234
+#: actions/apigroupcreate.php:286 actions/editgroup.php:234
#: actions/newgroup.php:178
msgid "Alias can't be the same as nickname."
msgstr ""
@@ -593,10 +577,10 @@ msgstr "Crop"
msgid "There was a problem with your session token. Try again, please."
msgstr "There was a problem with your session token. Try again, please."
-#: actions/avatarsettings.php:277 actions/emailsettings.php:255
-#: actions/grouplogo.php:319 actions/imsettings.php:220
-#: actions/recoverpassword.php:44 actions/smssettings.php:248
-#: lib/designsettings.php:304
+#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
+#: actions/emailsettings.php:255 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/recoverpassword.php:44
+#: actions/smssettings.php:248 lib/designsettings.php:304
msgid "Unexpected form submission."
msgstr "Unexpected form submission."
@@ -659,7 +643,7 @@ msgstr "Unblock user failed."
msgid "Unblock"
msgstr "Unblock"
-#: actions/blockedfromgroup.php:313
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:80
msgid "Unblock this user"
msgstr "Unblock this user"
@@ -832,7 +816,7 @@ msgid "Delete this user"
msgstr "Delete this notice"
#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124
-#: lib/adminpanelaction.php:275 lib/groupnav.php:119
+#: lib/adminpanelaction.php:302 lib/groupnav.php:119
msgid "Design"
msgstr ""
@@ -840,107 +824,182 @@ msgstr ""
msgid "Design settings for this StatusNet site."
msgstr ""
-#: actions/designadminpanel.php:220
+#: actions/designadminpanel.php:278
#, fuzzy
-msgid "Unable to delete design setting."
-msgstr "Unable to save your design settings!"
+msgid "Invalid logo URL."
+msgstr "Invalid size."
-#: actions/designadminpanel.php:301
+#: actions/designadminpanel.php:282
#, fuzzy, php-format
msgid "Theme not available: %s"
msgstr "This page is not available in a "
-#: actions/designadminpanel.php:406
+#: actions/designadminpanel.php:288
+#, fuzzy, php-format
+msgid "Theme directory not readable: %s"
+msgstr "This page is not available in a "
+
+#: actions/designadminpanel.php:292
+#, php-format
+msgid "Avatar directory not writable: %s"
+msgstr ""
+
+#: actions/designadminpanel.php:296
+#, php-format
+msgid "Background directory not writable: %s"
+msgstr ""
+
+#: actions/designadminpanel.php:312
+#, php-format
+msgid "Max length for %s %s is 255 characters."
+msgstr ""
+
+#: actions/designadminpanel.php:412
+#, fuzzy
+msgid "Change logo"
+msgstr "Change colours"
+
+#: actions/designadminpanel.php:417
+#, fuzzy
+msgid "Site logo"
+msgstr "Invite"
+
+#: actions/designadminpanel.php:424
#, fuzzy
msgid "Change theme"
msgstr "Change"
-#: actions/designadminpanel.php:410
-msgid "Theme"
-msgstr ""
+#: actions/designadminpanel.php:441
+#, fuzzy
+msgid "Site theme"
+msgstr "Site notice"
-#: actions/designadminpanel.php:411
+#: actions/designadminpanel.php:442
#, fuzzy
msgid "Theme for the site."
msgstr "Logout from the site"
-#: actions/designadminpanel.php:420 lib/designsettings.php:101
+#: actions/designadminpanel.php:447
+msgid "Theme server"
+msgstr ""
+
+#: actions/designadminpanel.php:451
+msgid "Theme path"
+msgstr ""
+
+#: actions/designadminpanel.php:455
+msgid "Theme directory"
+msgstr ""
+
+#: actions/designadminpanel.php:462
+#, fuzzy
+msgid "Avatar Settings"
+msgstr "Avatar settings"
+
+#: actions/designadminpanel.php:467
+#, fuzzy
+msgid "Avatar server"
+msgstr "Avatar settings"
+
+#: actions/designadminpanel.php:471
+#, fuzzy
+msgid "Avatar path"
+msgstr "Avatar updated."
+
+#: actions/designadminpanel.php:475
+#, fuzzy
+msgid "Avatar directory"
+msgstr "Avatar updated."
+
+#: actions/designadminpanel.php:486 lib/designsettings.php:101
msgid "Change background image"
msgstr ""
-#: actions/designadminpanel.php:424 actions/designadminpanel.php:498
+#: actions/designadminpanel.php:491 actions/designadminpanel.php:578
#: lib/designsettings.php:178
msgid "Background"
msgstr ""
-#: actions/designadminpanel.php:429
+#: actions/designadminpanel.php:496
#, fuzzy, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
"$s."
msgstr "You can upload a logo image for your group."
-#: actions/designadminpanel.php:459 lib/designsettings.php:139
+#: actions/designadminpanel.php:526 lib/designsettings.php:139
msgid "On"
msgstr ""
-#: actions/designadminpanel.php:475 lib/designsettings.php:155
+#: actions/designadminpanel.php:542 lib/designsettings.php:155
msgid "Off"
msgstr ""
-#: actions/designadminpanel.php:476 lib/designsettings.php:156
+#: actions/designadminpanel.php:543 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr ""
-#: actions/designadminpanel.php:481 lib/designsettings.php:161
+#: actions/designadminpanel.php:548 lib/designsettings.php:161
msgid "Tile background image"
msgstr ""
-#: actions/designadminpanel.php:490 lib/designsettings.php:170
+#: actions/designadminpanel.php:554
+msgid "Background server"
+msgstr ""
+
+#: actions/designadminpanel.php:558
+msgid "Background path"
+msgstr ""
+
+#: actions/designadminpanel.php:562
+msgid "Background directory"
+msgstr ""
+
+#: actions/designadminpanel.php:569 lib/designsettings.php:170
msgid "Change colours"
msgstr "Change colours"
-#: actions/designadminpanel.php:511 lib/designsettings.php:191
+#: actions/designadminpanel.php:591 lib/designsettings.php:191
#, fuzzy
msgid "Content"
msgstr "Connect"
-#: actions/designadminpanel.php:524 lib/designsettings.php:204
+#: actions/designadminpanel.php:604 lib/designsettings.php:204
#, fuzzy
msgid "Sidebar"
msgstr "Search"
-#: actions/designadminpanel.php:537 lib/designsettings.php:217
+#: actions/designadminpanel.php:617 lib/designsettings.php:217
msgid "Text"
msgstr "Text"
-#: actions/designadminpanel.php:550 lib/designsettings.php:230
+#: actions/designadminpanel.php:630 lib/designsettings.php:230
#, fuzzy
msgid "Links"
msgstr "Login"
-#: actions/designadminpanel.php:611 lib/designsettings.php:247
+#: actions/designadminpanel.php:658 lib/designsettings.php:247
msgid "Use defaults"
msgstr ""
-#: actions/designadminpanel.php:612 lib/designsettings.php:248
+#: actions/designadminpanel.php:659 lib/designsettings.php:248
msgid "Restore default designs"
msgstr ""
-#: actions/designadminpanel.php:618 lib/designsettings.php:254
+#: actions/designadminpanel.php:665 lib/designsettings.php:254
msgid "Reset back to default"
msgstr ""
-#: actions/designadminpanel.php:620 actions/emailsettings.php:195
+#: actions/designadminpanel.php:667 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/profilesettings.php:167 actions/siteadminpanel.php:371
+#: actions/profilesettings.php:167 actions/siteadminpanel.php:414
#: actions/smssettings.php:181 actions/subscriptions.php:203
#: actions/tagother.php:154 actions/useradminpanel.php:226
#: lib/designsettings.php:256 lib/groupeditform.php:202
msgid "Save"
msgstr "Save"
-#: actions/designadminpanel.php:621 lib/designsettings.php:257
+#: actions/designadminpanel.php:668 lib/designsettings.php:257
msgid "Save design"
msgstr ""
@@ -983,6 +1042,10 @@ msgstr "description is too long (max 140 chars)."
msgid "Could not update group."
msgstr "Could not update group."
+#: actions/editgroup.php:259 classes/User_group.php:390
+msgid "Could not create aliases."
+msgstr "Could not create aliases"
+
#: actions/editgroup.php:269
msgid "Options saved."
msgstr "Options saved."
@@ -1099,7 +1162,7 @@ msgstr "No e-mail address."
msgid "Cannot normalize that email address"
msgstr "Cannot normalise that e-mail address"
-#: actions/emailsettings.php:330 actions/siteadminpanel.php:156
+#: actions/emailsettings.php:330 actions/siteadminpanel.php:158
msgid "Not a valid email address"
msgstr "Not a valid e-mail address."
@@ -1827,10 +1890,10 @@ msgstr "Invalid notice content"
msgid "Incorrect username or password."
msgstr "Incorrect username or password."
-#: actions/login.php:149 actions/recoverpassword.php:375
-#: actions/register.php:248
-msgid "Error setting user."
-msgstr "Error setting user."
+#: actions/login.php:149
+#, 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:457
#: lib/logingroupnav.php:79
@@ -2254,7 +2317,7 @@ msgid ""
msgstr ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:275
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:309
msgid "Language"
msgstr "Language"
@@ -2281,7 +2344,7 @@ msgstr ""
msgid "Bio is too long (max %d chars)."
msgstr "Bio is too long (max 140 chars)."
-#: actions/profilesettings.php:228 actions/siteadminpanel.php:163
+#: actions/profilesettings.php:228 actions/siteadminpanel.php:165
msgid "Timezone not selected."
msgstr "Timezone not selected."
@@ -2526,6 +2589,10 @@ msgstr "Password must be 6 chars or more."
msgid "Password and confirmation do not match."
msgstr "Password and confirmation do not match."
+#: actions/recoverpassword.php:375 actions/register.php:248
+msgid "Error setting user."
+msgstr "Error setting user."
+
#: actions/recoverpassword.php:382
msgid "New password successfully saved. You are now logged in."
msgstr "New password successfully saved. You are now logged in."
@@ -2587,7 +2654,7 @@ msgid "Same as password above. Required."
msgstr "Same as password above. Required."
#: actions/register.php:437 actions/register.php:441
-#: actions/siteadminpanel.php:253 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:287 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "E-mail"
@@ -3035,7 +3102,7 @@ msgstr "You can't send a message to this user."
msgid "User is already silenced."
msgstr "User is already blocked from group."
-#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:272
+#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:299
#, fuzzy
msgid "Site"
msgstr "Invite"
@@ -3044,122 +3111,236 @@ msgstr "Invite"
msgid "Basic settings for this StatusNet site."
msgstr ""
-#: actions/siteadminpanel.php:145
+#: actions/siteadminpanel.php:147
msgid "Site name must have non-zero length."
msgstr ""
-#: actions/siteadminpanel.php:153
+#: actions/siteadminpanel.php:155
#, fuzzy
msgid "You must have a valid contact email address"
msgstr "Not a valid e-mail address."
-#: actions/siteadminpanel.php:171
+#: actions/siteadminpanel.php:173
#, php-format
msgid "Unknown language \"%s\""
msgstr ""
-#: actions/siteadminpanel.php:178
+#: actions/siteadminpanel.php:180
msgid "Invalid snapshot report URL."
msgstr ""
-#: actions/siteadminpanel.php:184
+#: actions/siteadminpanel.php:186
msgid "Invalid snapshot run value."
msgstr ""
-#: actions/siteadminpanel.php:190
+#: actions/siteadminpanel.php:192
msgid "Snapshot frequency must be a number."
msgstr ""
-#: actions/siteadminpanel.php:241
+#: actions/siteadminpanel.php:199
+msgid "You must set an SSL sever when enabling SSL."
+msgstr ""
+
+#: actions/siteadminpanel.php:204
+msgid "Invalid SSL server. Max length is 255 characters."
+msgstr ""
+
+#: actions/siteadminpanel.php:210
+msgid "Minimum text limit is 140c."
+msgstr ""
+
+#: actions/siteadminpanel.php:216
+msgid "Dupe limit must 1 or more seconds."
+msgstr ""
+
+#: actions/siteadminpanel.php:224
+#, php-format
+msgid "Locales directory not readable: %s"
+msgstr ""
+
+#: actions/siteadminpanel.php:275
#, fuzzy
msgid "Site name"
msgstr "Site notice"
-#: actions/siteadminpanel.php:242
+#: actions/siteadminpanel.php:276
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr ""
-#: actions/siteadminpanel.php:245
+#: actions/siteadminpanel.php:279
msgid "Brought by"
msgstr ""
-#: actions/siteadminpanel.php:246
+#: actions/siteadminpanel.php:280
msgid "Text used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:249
+#: actions/siteadminpanel.php:283
msgid "Brought by URL"
msgstr ""
-#: actions/siteadminpanel.php:250
+#: actions/siteadminpanel.php:284
msgid "URL used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:254
+#: actions/siteadminpanel.php:288
#, fuzzy
msgid "contact email address for your site"
msgstr "New e-mail address for posting to %s"
-#: actions/siteadminpanel.php:268
+#: actions/siteadminpanel.php:302
msgid "Default timezone"
msgstr ""
-#: actions/siteadminpanel.php:269
+#: actions/siteadminpanel.php:303
msgid "Default timezone for the site; usually UTC."
msgstr ""
-#: actions/siteadminpanel.php:276
+#: actions/siteadminpanel.php:310
#, fuzzy
msgid "Default site language"
msgstr "Preferred language"
-#: actions/siteadminpanel.php:282
+#: actions/siteadminpanel.php:316
+msgid "Path to locales"
+msgstr ""
+
+#: actions/siteadminpanel.php:316
+msgid "Directory path to locales"
+msgstr ""
+
+#: actions/siteadminpanel.php:320
+#, fuzzy
+msgid "Server"
+msgstr "Recover"
+
+#: actions/siteadminpanel.php:320
+msgid "Site's server hostname."
+msgstr ""
+
+#: actions/siteadminpanel.php:324
+msgid "Path"
+msgstr ""
+
+#: actions/siteadminpanel.php:324
+#, fuzzy
+msgid "Site path"
+msgstr "Site notice"
+
+#: actions/siteadminpanel.php:328
+msgid "Fancy URLs"
+msgstr ""
+
+#: actions/siteadminpanel.php:330
+msgid "Use fancy (more readable and memorable) URLs?"
+msgstr ""
+
+#: actions/siteadminpanel.php:334
#, fuzzy
msgid "Private"
msgstr "Privacy"
-#: actions/siteadminpanel.php:284
+#: actions/siteadminpanel.php:336
msgid "Prohibit anonymous users (not logged in) from viewing site?"
msgstr ""
-#: actions/siteadminpanel.php:290
+#: actions/siteadminpanel.php:340
+#, fuzzy
+msgid "Invite only"
+msgstr "Invite"
+
+#: actions/siteadminpanel.php:342
+msgid "Make registration invitation only."
+msgstr ""
+
+#: actions/siteadminpanel.php:346 actions/useradminpanel.php:171
+#, fuzzy
+msgid "Closed"
+msgstr "Block"
+
+#: actions/siteadminpanel.php:348
+msgid "Disable new registrations."
+msgstr ""
+
+#: actions/siteadminpanel.php:353
msgid "Randomly during Web hit"
msgstr ""
-#: actions/siteadminpanel.php:291
+#: actions/siteadminpanel.php:354
msgid "In a scheduled job"
msgstr ""
-#: actions/siteadminpanel.php:292
+#: actions/siteadminpanel.php:355 actions/siteadminpanel.php:380
#, fuzzy
msgid "Never"
msgstr "Recover"
-#: actions/siteadminpanel.php:294
+#: actions/siteadminpanel.php:357
msgid "Data snapshots"
msgstr ""
-#: actions/siteadminpanel.php:295
+#: actions/siteadminpanel.php:358
msgid "When to send statistical data to status.net servers"
msgstr ""
-#: actions/siteadminpanel.php:301
+#: actions/siteadminpanel.php:364
msgid "Frequency"
msgstr ""
-#: actions/siteadminpanel.php:302
+#: actions/siteadminpanel.php:365
msgid "Snapshots will be sent once every N Web hits"
msgstr ""
-#: actions/siteadminpanel.php:309
+#: actions/siteadminpanel.php:372
msgid "Report URL"
msgstr ""
-#: actions/siteadminpanel.php:310
+#: actions/siteadminpanel.php:373
msgid "Snapshots will be sent to this URL"
msgstr ""
-#: actions/siteadminpanel.php:371 actions/useradminpanel.php:226
+#: actions/siteadminpanel.php:381
+#, fuzzy
+msgid "Sometimes"
+msgstr "Notices"
+
+#: actions/siteadminpanel.php:382
+msgid "Always"
+msgstr ""
+
+#: actions/siteadminpanel.php:384
+msgid "Use SSL"
+msgstr ""
+
+#: actions/siteadminpanel.php:385
+msgid "When to use SSL"
+msgstr ""
+
+#: actions/siteadminpanel.php:391
+msgid "SSL Server"
+msgstr ""
+
+#: actions/siteadminpanel.php:392
+msgid "Server to direct SSL requests to"
+msgstr ""
+
+#: actions/siteadminpanel.php:396
+msgid "Text limit"
+msgstr ""
+
+#: actions/siteadminpanel.php:396
+msgid "Maximum number of characters for notices."
+msgstr ""
+
+#: actions/siteadminpanel.php:400
+msgid "Dupe limit"
+msgstr ""
+
+#: actions/siteadminpanel.php:400
+msgid "How long users must wait (in seconds) to post the same thing again."
+msgstr ""
+
+#: actions/siteadminpanel.php:414 actions/useradminpanel.php:226
#, fuzzy
msgid "Save site settings"
msgstr "Avatar settings"
@@ -3478,11 +3659,6 @@ msgstr "User"
msgid "User settings for this StatusNet site."
msgstr ""
-#: actions/useradminpanel.php:171
-#, fuzzy
-msgid "Closed"
-msgstr "Block"
-
#: actions/useradminpanel.php:173
msgid "Is registration on this site prohibited?"
msgstr ""
@@ -3713,6 +3889,14 @@ msgstr "Problem saving notice."
msgid "DB error inserting reply: %s"
msgstr "DB error inserting reply: %s"
+#: classes/User_group.php:380
+msgid "Could not create group."
+msgstr "Could not create group."
+
+#: classes/User_group.php:409
+msgid "Could not set group membership."
+msgstr "Could not set group membership."
+
#: classes/User.php:347
#, fuzzy, php-format
msgid "Welcome to %1$s, @%2$s!"
@@ -3953,12 +4137,17 @@ msgstr "Command not yet implemented."
msgid "saveSettings() not implemented."
msgstr "Command not yet implemented."
-#: lib/adminpanelaction.php:273
+#: lib/adminpanelaction.php:247
+#, fuzzy
+msgid "Unable to delete design setting."
+msgstr "Unable to save your design settings!"
+
+#: lib/adminpanelaction.php:300
#, fuzzy
msgid "Basic site configuration"
msgstr "E-mail address confirmation"
-#: lib/adminpanelaction.php:276
+#: lib/adminpanelaction.php:303
#, fuzzy
msgid "Design configuration"
msgstr "SMS confirmation"
@@ -4206,19 +4395,19 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:203
+#: lib/common.php:199
msgid "No configuration file found. "
msgstr "No configuration file found"
-#: lib/common.php:204
+#: lib/common.php:200
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:205
+#: lib/common.php:201
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:206
+#: lib/common.php:202
#, fuzzy
msgid "Go to the installer."
msgstr "Login to the site"
@@ -4990,11 +5179,6 @@ msgstr "None"
msgid "Top posters"
msgstr "Top posters"
-#: lib/unblockform.php:80
-#, fuzzy
-msgid "Unlock this user"
-msgstr "Unblock this user"
-
#: lib/unsandboxform.php:69
msgid "Unsandbox"
msgstr ""
@@ -5045,47 +5229,47 @@ msgstr "Send a direct message to this user"
msgid "Message"
msgstr "Message"
-#: lib/util.php:821
+#: lib/util.php:826
msgid "a few seconds ago"
msgstr "a few seconds ago"
-#: lib/util.php:823
+#: lib/util.php:828
msgid "about a minute ago"
msgstr "about a minute ago"
-#: lib/util.php:825
+#: lib/util.php:830
#, php-format
msgid "about %d minutes ago"
msgstr "about %d minutes ago"
-#: lib/util.php:827
+#: lib/util.php:832
msgid "about an hour ago"
msgstr "about an hour ago"
-#: lib/util.php:829
+#: lib/util.php:834
#, php-format
msgid "about %d hours ago"
msgstr "about %d hours ago"
-#: lib/util.php:831
+#: lib/util.php:836
msgid "about a day ago"
msgstr "about a day ago"
-#: lib/util.php:833
+#: lib/util.php:838
#, php-format
msgid "about %d days ago"
msgstr "about %d days ago"
-#: lib/util.php:835
+#: lib/util.php:840
msgid "about a month ago"
msgstr "about a month ago"
-#: lib/util.php:837
+#: lib/util.php:842
#, php-format
msgid "about %d months ago"
msgstr "about %d months ago"
-#: lib/util.php:839
+#: lib/util.php:844
msgid "about a year ago"
msgstr "about a year ago"
@@ -5116,5 +5300,9 @@ msgid "Sorry, no incoming email allowed."
msgstr "Sorry, no incoming e-mail allowed."
#, fuzzy
+#~ msgid "Unlock this user"
+#~ msgstr "Unblock this user"
+
+#, fuzzy
#~ msgid "These people are subscribed to you: "
#~ msgstr "People subscribed to %s"
diff --git a/locale/es/LC_MESSAGES/statusnet.po b/locale/es/LC_MESSAGES/statusnet.po
index 54fb75f3d..b3f2469ad 100644
--- a/locale/es/LC_MESSAGES/statusnet.po
+++ b/locale/es/LC_MESSAGES/statusnet.po
@@ -4,20 +4,18 @@
# Author@translatewiki.net: Crazymadlover
# Author@translatewiki.net: Translationista
# --
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 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-18 19:31+0000\n"
+"POT-Creation-Date: 2009-11-19 10:43+0000\n"
"PO-Revision-Date: 2009-11-18 19:31:43+0000\n"
"Language-Team: Spanish\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: MediaWiki 1.16alpha(r59207); Translate extension (2009-11-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: es\n"
@@ -151,7 +149,7 @@ msgstr "No se pudo actualizar el usuario."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
-#: actions/designadminpanel.php:125 actions/newnotice.php:94
+#: actions/designadminpanel.php:122 actions/newnotice.php:94
#: lib/designsettings.php:283
#, php-format
msgid ""
@@ -237,7 +235,7 @@ msgstr "Todos los mensajes directos enviados a %s"
#: 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:184 actions/apigroupismember.php:114
+#: 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
@@ -306,23 +304,7 @@ msgstr "No se pudo acceder a corriente pública."
msgid "Could not find target user."
msgstr "No se pudo encontrar ningún estado."
-#: actions/apigroupcreate.php:136 actions/newgroup.php:204
-#, fuzzy
-msgid "Could not create group."
-msgstr "No se pudo crear grupo."
-
-#: actions/apigroupcreate.php:147 actions/editgroup.php:259
-#: actions/newgroup.php:210
-#, fuzzy
-msgid "Could not create aliases."
-msgstr "No se pudo crear favorito."
-
-#: actions/apigroupcreate.php:166 actions/newgroup.php:224
-#, fuzzy
-msgid "Could not set group membership."
-msgstr "No se pudo configurar miembros de grupo."
-
-#: actions/apigroupcreate.php:212 actions/editgroup.php:182
+#: actions/apigroupcreate.php:164 actions/editgroup.php:182
#: actions/newgroup.php:126 actions/profilesettings.php:208
#: actions/register.php:205
msgid "Nickname must have only lowercase letters and numbers and no spaces."
@@ -330,60 +312,60 @@ msgstr ""
"El apodo debe tener solamente letras minúsculas y números y no puede tener "
"espacios. "
-#: actions/apigroupcreate.php:221 actions/editgroup.php:186
+#: 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 "El apodo ya existe. Prueba otro."
-#: actions/apigroupcreate.php:228 actions/editgroup.php:189
+#: 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 "Apodo no válido"
-#: actions/apigroupcreate.php:244 actions/editgroup.php:195
+#: 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 "La página de inicio no es un URL válido."
-#: actions/apigroupcreate.php:253 actions/editgroup.php:198
+#: 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 "Tu nombre es demasiado largo (max. 255 carac.)"
-#: actions/apigroupcreate.php:261
+#: actions/apigroupcreate.php:213
#, fuzzy, php-format
msgid "Description is too long (max %d chars)."
msgstr "Descripción es demasiado larga (máx. 140 caracteres)."
-#: actions/apigroupcreate.php:272 actions/editgroup.php:204
+#: 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 "La ubicación es demasiado larga (máx. 255 caracteres)."
-#: actions/apigroupcreate.php:291 actions/editgroup.php:215
+#: actions/apigroupcreate.php:243 actions/editgroup.php:215
#: actions/newgroup.php:159
#, php-format
msgid "Too many aliases! Maximum %d."
msgstr ""
-#: actions/apigroupcreate.php:312 actions/editgroup.php:224
+#: actions/apigroupcreate.php:264 actions/editgroup.php:224
#: actions/newgroup.php:168
#, fuzzy, php-format
msgid "Invalid alias: \"%s\""
msgstr "Tag no válido: '%s' "
-#: actions/apigroupcreate.php:321 actions/editgroup.php:228
+#: actions/apigroupcreate.php:273 actions/editgroup.php:228
#: actions/newgroup.php:172
#, fuzzy, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr "El apodo ya existe. Prueba otro."
-#: actions/apigroupcreate.php:334 actions/editgroup.php:234
+#: actions/apigroupcreate.php:286 actions/editgroup.php:234
#: actions/newgroup.php:178
msgid "Alias can't be the same as nickname."
msgstr ""
@@ -606,10 +588,10 @@ msgid "There was a problem with your session token. Try again, please."
msgstr ""
"Hubo un problema con tu clave de sesión. Por favor, intenta nuevamente."
-#: actions/avatarsettings.php:277 actions/emailsettings.php:255
-#: actions/grouplogo.php:319 actions/imsettings.php:220
-#: actions/recoverpassword.php:44 actions/smssettings.php:248
-#: lib/designsettings.php:304
+#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
+#: actions/emailsettings.php:255 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/recoverpassword.php:44
+#: actions/smssettings.php:248 lib/designsettings.php:304
msgid "Unexpected form submission."
msgstr "Envío de formulario inesperado."
@@ -672,7 +654,7 @@ msgstr "Falló desbloquear usuario."
msgid "Unblock"
msgstr "Desbloquear"
-#: actions/blockedfromgroup.php:313
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:80
#, fuzzy
msgid "Unblock this user"
msgstr "Desbloquear este usuario"
@@ -849,7 +831,7 @@ msgid "Delete this user"
msgstr "Borrar este aviso"
#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124
-#: lib/adminpanelaction.php:275 lib/groupnav.php:119
+#: lib/adminpanelaction.php:302 lib/groupnav.php:119
msgid "Design"
msgstr ""
@@ -857,105 +839,180 @@ msgstr ""
msgid "Design settings for this StatusNet site."
msgstr ""
-#: actions/designadminpanel.php:220
+#: actions/designadminpanel.php:278
#, fuzzy
-msgid "Unable to delete design setting."
-msgstr "¡No se pudo guardar tu configuración de Twitter!"
+msgid "Invalid logo URL."
+msgstr "Tamaño inválido."
-#: actions/designadminpanel.php:301
+#: actions/designadminpanel.php:282
#, fuzzy, php-format
msgid "Theme not available: %s"
msgstr "Esta página no está disponible en un "
-#: actions/designadminpanel.php:406
+#: actions/designadminpanel.php:288
+#, fuzzy, php-format
+msgid "Theme directory not readable: %s"
+msgstr "Esta página no está disponible en un "
+
+#: actions/designadminpanel.php:292
+#, php-format
+msgid "Avatar directory not writable: %s"
+msgstr ""
+
+#: actions/designadminpanel.php:296
+#, php-format
+msgid "Background directory not writable: %s"
+msgstr ""
+
+#: actions/designadminpanel.php:312
+#, php-format
+msgid "Max length for %s %s is 255 characters."
+msgstr ""
+
+#: actions/designadminpanel.php:412
+#, fuzzy
+msgid "Change logo"
+msgstr "Cambiar colores"
+
+#: actions/designadminpanel.php:417
+#, fuzzy
+msgid "Site logo"
+msgstr "Invitar"
+
+#: actions/designadminpanel.php:424
#, fuzzy
msgid "Change theme"
msgstr "Cambiar"
-#: actions/designadminpanel.php:410
-msgid "Theme"
-msgstr ""
+#: actions/designadminpanel.php:441
+#, fuzzy
+msgid "Site theme"
+msgstr "Aviso de sitio"
-#: actions/designadminpanel.php:411
+#: actions/designadminpanel.php:442
#, fuzzy
msgid "Theme for the site."
msgstr "Salir de sitio"
-#: actions/designadminpanel.php:420 lib/designsettings.php:101
+#: actions/designadminpanel.php:447
+msgid "Theme server"
+msgstr ""
+
+#: actions/designadminpanel.php:451
+msgid "Theme path"
+msgstr ""
+
+#: actions/designadminpanel.php:455
+msgid "Theme directory"
+msgstr ""
+
+#: actions/designadminpanel.php:462
+#, fuzzy
+msgid "Avatar Settings"
+msgstr "Configuración de Avatar"
+
+#: actions/designadminpanel.php:467
+#, fuzzy
+msgid "Avatar server"
+msgstr "Configuración de Avatar"
+
+#: actions/designadminpanel.php:471
+#, fuzzy
+msgid "Avatar path"
+msgstr "Avatar actualizado"
+
+#: actions/designadminpanel.php:475
+#, fuzzy
+msgid "Avatar directory"
+msgstr "Avatar actualizado"
+
+#: actions/designadminpanel.php:486 lib/designsettings.php:101
msgid "Change background image"
msgstr ""
-#: actions/designadminpanel.php:424 actions/designadminpanel.php:498
+#: actions/designadminpanel.php:491 actions/designadminpanel.php:578
#: lib/designsettings.php:178
msgid "Background"
msgstr ""
-#: actions/designadminpanel.php:429
+#: actions/designadminpanel.php:496
#, fuzzy, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
"$s."
msgstr "Puedes cargar una imagen de logo para tu grupo."
-#: actions/designadminpanel.php:459 lib/designsettings.php:139
+#: actions/designadminpanel.php:526 lib/designsettings.php:139
msgid "On"
msgstr ""
-#: actions/designadminpanel.php:475 lib/designsettings.php:155
+#: actions/designadminpanel.php:542 lib/designsettings.php:155
msgid "Off"
msgstr ""
-#: actions/designadminpanel.php:476 lib/designsettings.php:156
+#: actions/designadminpanel.php:543 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr ""
-#: actions/designadminpanel.php:481 lib/designsettings.php:161
+#: actions/designadminpanel.php:548 lib/designsettings.php:161
msgid "Tile background image"
msgstr ""
-#: actions/designadminpanel.php:490 lib/designsettings.php:170
+#: actions/designadminpanel.php:554
+msgid "Background server"
+msgstr ""
+
+#: actions/designadminpanel.php:558
+msgid "Background path"
+msgstr ""
+
+#: actions/designadminpanel.php:562
+msgid "Background directory"
+msgstr ""
+
+#: actions/designadminpanel.php:569 lib/designsettings.php:170
msgid "Change colours"
msgstr "Cambiar colores"
-#: actions/designadminpanel.php:511 lib/designsettings.php:191
+#: actions/designadminpanel.php:591 lib/designsettings.php:191
msgid "Content"
msgstr "Contenido"
-#: actions/designadminpanel.php:524 lib/designsettings.php:204
+#: actions/designadminpanel.php:604 lib/designsettings.php:204
#, fuzzy
msgid "Sidebar"
msgstr "Buscar"
-#: actions/designadminpanel.php:537 lib/designsettings.php:217
+#: actions/designadminpanel.php:617 lib/designsettings.php:217
msgid "Text"
msgstr "Texto"
-#: actions/designadminpanel.php:550 lib/designsettings.php:230
+#: actions/designadminpanel.php:630 lib/designsettings.php:230
msgid "Links"
msgstr "Vínculos"
-#: actions/designadminpanel.php:611 lib/designsettings.php:247
+#: actions/designadminpanel.php:658 lib/designsettings.php:247
msgid "Use defaults"
msgstr ""
-#: actions/designadminpanel.php:612 lib/designsettings.php:248
+#: actions/designadminpanel.php:659 lib/designsettings.php:248
msgid "Restore default designs"
msgstr ""
-#: actions/designadminpanel.php:618 lib/designsettings.php:254
+#: actions/designadminpanel.php:665 lib/designsettings.php:254
msgid "Reset back to default"
msgstr ""
-#: actions/designadminpanel.php:620 actions/emailsettings.php:195
+#: actions/designadminpanel.php:667 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/profilesettings.php:167 actions/siteadminpanel.php:371
+#: actions/profilesettings.php:167 actions/siteadminpanel.php:414
#: actions/smssettings.php:181 actions/subscriptions.php:203
#: actions/tagother.php:154 actions/useradminpanel.php:226
#: lib/designsettings.php:256 lib/groupeditform.php:202
msgid "Save"
msgstr "Guardar"
-#: actions/designadminpanel.php:621 lib/designsettings.php:257
+#: actions/designadminpanel.php:668 lib/designsettings.php:257
msgid "Save design"
msgstr ""
@@ -998,6 +1055,11 @@ msgstr "Descripción es demasiado larga (máx. 140 caracteres)."
msgid "Could not update group."
msgstr "No se pudo actualizar el grupo."
+#: actions/editgroup.php:259 classes/User_group.php:390
+#, fuzzy
+msgid "Could not create aliases."
+msgstr "No se pudo crear favorito."
+
#: actions/editgroup.php:269
msgid "Options saved."
msgstr "Se guardó Opciones."
@@ -1118,7 +1180,7 @@ msgstr "Sin dirección de correo electrónico"
msgid "Cannot normalize that email address"
msgstr "No se puede normalizar esta dirección de correo electrónico."
-#: actions/emailsettings.php:330 actions/siteadminpanel.php:156
+#: actions/emailsettings.php:330 actions/siteadminpanel.php:158
msgid "Not a valid email address"
msgstr "No es una dirección de correo electrónico válida"
@@ -1862,10 +1924,10 @@ msgstr "El contenido del aviso es inválido"
msgid "Incorrect username or password."
msgstr "Nombre de usuario o contraseña incorrectos."
-#: actions/login.php:149 actions/recoverpassword.php:375
-#: actions/register.php:248
-msgid "Error setting user."
-msgstr "Error al configurar el usuario."
+#: actions/login.php:149
+#, fuzzy
+msgid "Error setting user. You are probably not authorized."
+msgstr "No autorizado."
#: actions/login.php:204 actions/login.php:257 lib/action.php:457
#: lib/logingroupnav.php:79
@@ -2301,7 +2363,7 @@ msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr "Tags para ti (letras, números, -, ., y _), coma - o espacio - separado"
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:275
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:309
msgid "Language"
msgstr "Idioma"
@@ -2329,7 +2391,7 @@ msgstr ""
msgid "Bio is too long (max %d chars)."
msgstr "La biografía es demasiado larga (máx. 140 caracteres)."
-#: actions/profilesettings.php:228 actions/siteadminpanel.php:163
+#: actions/profilesettings.php:228 actions/siteadminpanel.php:165
msgid "Timezone not selected."
msgstr "Zona horaria no seleccionada"
@@ -2580,6 +2642,10 @@ msgstr "La contraseña debe tener 6 o más caracteres."
msgid "Password and confirmation do not match."
msgstr "La contraseña y la confirmación no coinciden."
+#: actions/recoverpassword.php:375 actions/register.php:248
+msgid "Error setting user."
+msgstr "Error al configurar el usuario."
+
#: actions/recoverpassword.php:382
msgid "New password successfully saved. You are now logged in."
msgstr "Nueva contraseña guardada correctamente. Has iniciado una sesión."
@@ -2643,7 +2709,7 @@ msgid "Same as password above. Required."
msgstr "Igual a la contraseña de arriba. Requerida"
#: actions/register.php:437 actions/register.php:441
-#: actions/siteadminpanel.php:253 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:287 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "Correo electrónico"
@@ -3095,7 +3161,7 @@ msgstr "No puedes enviar mensaje a este usuario."
msgid "User is already silenced."
msgstr "El usuario te ha bloqueado."
-#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:272
+#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:299
#, fuzzy
msgid "Site"
msgstr "Invitar"
@@ -3104,122 +3170,236 @@ msgstr "Invitar"
msgid "Basic settings for this StatusNet site."
msgstr ""
-#: actions/siteadminpanel.php:145
+#: actions/siteadminpanel.php:147
msgid "Site name must have non-zero length."
msgstr ""
-#: actions/siteadminpanel.php:153
+#: actions/siteadminpanel.php:155
#, fuzzy
msgid "You must have a valid contact email address"
msgstr "No es una dirección de correo electrónico válida"
-#: actions/siteadminpanel.php:171
+#: actions/siteadminpanel.php:173
#, php-format
msgid "Unknown language \"%s\""
msgstr ""
-#: actions/siteadminpanel.php:178
+#: actions/siteadminpanel.php:180
msgid "Invalid snapshot report URL."
msgstr ""
-#: actions/siteadminpanel.php:184
+#: actions/siteadminpanel.php:186
msgid "Invalid snapshot run value."
msgstr ""
-#: actions/siteadminpanel.php:190
+#: actions/siteadminpanel.php:192
msgid "Snapshot frequency must be a number."
msgstr ""
-#: actions/siteadminpanel.php:241
+#: actions/siteadminpanel.php:199
+msgid "You must set an SSL sever when enabling SSL."
+msgstr ""
+
+#: actions/siteadminpanel.php:204
+msgid "Invalid SSL server. Max length is 255 characters."
+msgstr ""
+
+#: actions/siteadminpanel.php:210
+msgid "Minimum text limit is 140c."
+msgstr ""
+
+#: actions/siteadminpanel.php:216
+msgid "Dupe limit must 1 or more seconds."
+msgstr ""
+
+#: actions/siteadminpanel.php:224
+#, php-format
+msgid "Locales directory not readable: %s"
+msgstr ""
+
+#: actions/siteadminpanel.php:275
#, fuzzy
msgid "Site name"
msgstr "Aviso de sitio"
-#: actions/siteadminpanel.php:242
+#: actions/siteadminpanel.php:276
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr ""
-#: actions/siteadminpanel.php:245
+#: actions/siteadminpanel.php:279
msgid "Brought by"
msgstr ""
-#: actions/siteadminpanel.php:246
+#: actions/siteadminpanel.php:280
msgid "Text used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:249
+#: actions/siteadminpanel.php:283
msgid "Brought by URL"
msgstr ""
-#: actions/siteadminpanel.php:250
+#: actions/siteadminpanel.php:284
msgid "URL used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:254
+#: actions/siteadminpanel.php:288
#, fuzzy
msgid "contact email address for your site"
msgstr "Nueva dirección de correo para postear a %s"
-#: actions/siteadminpanel.php:268
+#: actions/siteadminpanel.php:302
msgid "Default timezone"
msgstr ""
-#: actions/siteadminpanel.php:269
+#: actions/siteadminpanel.php:303
msgid "Default timezone for the site; usually UTC."
msgstr ""
-#: actions/siteadminpanel.php:276
+#: actions/siteadminpanel.php:310
#, fuzzy
msgid "Default site language"
msgstr "Lenguaje de preferencia"
-#: actions/siteadminpanel.php:282
+#: actions/siteadminpanel.php:316
+msgid "Path to locales"
+msgstr ""
+
+#: actions/siteadminpanel.php:316
+msgid "Directory path to locales"
+msgstr ""
+
+#: actions/siteadminpanel.php:320
+#, fuzzy
+msgid "Server"
+msgstr "Recuperar"
+
+#: actions/siteadminpanel.php:320
+msgid "Site's server hostname."
+msgstr ""
+
+#: actions/siteadminpanel.php:324
+msgid "Path"
+msgstr ""
+
+#: actions/siteadminpanel.php:324
+#, fuzzy
+msgid "Site path"
+msgstr "Aviso de sitio"
+
+#: actions/siteadminpanel.php:328
+msgid "Fancy URLs"
+msgstr ""
+
+#: actions/siteadminpanel.php:330
+msgid "Use fancy (more readable and memorable) URLs?"
+msgstr ""
+
+#: actions/siteadminpanel.php:334
#, fuzzy
msgid "Private"
msgstr "Privacidad"
-#: actions/siteadminpanel.php:284
+#: actions/siteadminpanel.php:336
msgid "Prohibit anonymous users (not logged in) from viewing site?"
msgstr ""
-#: actions/siteadminpanel.php:290
+#: actions/siteadminpanel.php:340
+#, fuzzy
+msgid "Invite only"
+msgstr "Invitar"
+
+#: actions/siteadminpanel.php:342
+msgid "Make registration invitation only."
+msgstr ""
+
+#: actions/siteadminpanel.php:346 actions/useradminpanel.php:171
+#, fuzzy
+msgid "Closed"
+msgstr "Bloqueado"
+
+#: actions/siteadminpanel.php:348
+msgid "Disable new registrations."
+msgstr ""
+
+#: actions/siteadminpanel.php:353
msgid "Randomly during Web hit"
msgstr ""
-#: actions/siteadminpanel.php:291
+#: actions/siteadminpanel.php:354
msgid "In a scheduled job"
msgstr ""
-#: actions/siteadminpanel.php:292
+#: actions/siteadminpanel.php:355 actions/siteadminpanel.php:380
#, fuzzy
msgid "Never"
msgstr "Recuperar"
-#: actions/siteadminpanel.php:294
+#: actions/siteadminpanel.php:357
msgid "Data snapshots"
msgstr ""
-#: actions/siteadminpanel.php:295
+#: actions/siteadminpanel.php:358
msgid "When to send statistical data to status.net servers"
msgstr ""
-#: actions/siteadminpanel.php:301
+#: actions/siteadminpanel.php:364
msgid "Frequency"
msgstr ""
-#: actions/siteadminpanel.php:302
+#: actions/siteadminpanel.php:365
msgid "Snapshots will be sent once every N Web hits"
msgstr ""
-#: actions/siteadminpanel.php:309
+#: actions/siteadminpanel.php:372
msgid "Report URL"
msgstr ""
-#: actions/siteadminpanel.php:310
+#: actions/siteadminpanel.php:373
msgid "Snapshots will be sent to this URL"
msgstr ""
-#: actions/siteadminpanel.php:371 actions/useradminpanel.php:226
+#: actions/siteadminpanel.php:381
+#, fuzzy
+msgid "Sometimes"
+msgstr "Avisos"
+
+#: actions/siteadminpanel.php:382
+msgid "Always"
+msgstr ""
+
+#: actions/siteadminpanel.php:384
+msgid "Use SSL"
+msgstr ""
+
+#: actions/siteadminpanel.php:385
+msgid "When to use SSL"
+msgstr ""
+
+#: actions/siteadminpanel.php:391
+msgid "SSL Server"
+msgstr ""
+
+#: actions/siteadminpanel.php:392
+msgid "Server to direct SSL requests to"
+msgstr ""
+
+#: actions/siteadminpanel.php:396
+msgid "Text limit"
+msgstr ""
+
+#: actions/siteadminpanel.php:396
+msgid "Maximum number of characters for notices."
+msgstr ""
+
+#: actions/siteadminpanel.php:400
+msgid "Dupe limit"
+msgstr ""
+
+#: actions/siteadminpanel.php:400
+msgid "How long users must wait (in seconds) to post the same thing again."
+msgstr ""
+
+#: actions/siteadminpanel.php:414 actions/useradminpanel.php:226
#, fuzzy
msgid "Save site settings"
msgstr "Configuración de Avatar"
@@ -3547,11 +3727,6 @@ msgstr "Usuario"
msgid "User settings for this StatusNet site."
msgstr ""
-#: actions/useradminpanel.php:171
-#, fuzzy
-msgid "Closed"
-msgstr "Bloqueado"
-
#: actions/useradminpanel.php:173
msgid "Is registration on this site prohibited?"
msgstr ""
@@ -3786,6 +3961,16 @@ msgstr "Hubo un problema al guardar el aviso."
msgid "DB error inserting reply: %s"
msgstr "Error de BD al insertar respuesta: %s"
+#: classes/User_group.php:380
+#, fuzzy
+msgid "Could not create group."
+msgstr "No se pudo crear grupo."
+
+#: classes/User_group.php:409
+#, fuzzy
+msgid "Could not set group membership."
+msgstr "No se pudo configurar miembros de grupo."
+
#: classes/User.php:347
#, fuzzy, php-format
msgid "Welcome to %1$s, @%2$s!"
@@ -4029,12 +4214,17 @@ msgstr "Todavía no se implementa comando."
msgid "saveSettings() not implemented."
msgstr "Todavía no se implementa comando."
-#: lib/adminpanelaction.php:273
+#: lib/adminpanelaction.php:247
+#, fuzzy
+msgid "Unable to delete design setting."
+msgstr "¡No se pudo guardar tu configuración de Twitter!"
+
+#: lib/adminpanelaction.php:300
#, fuzzy
msgid "Basic site configuration"
msgstr "Confirmación de correo electrónico"
-#: lib/adminpanelaction.php:276
+#: lib/adminpanelaction.php:303
#, fuzzy
msgid "Design configuration"
msgstr "SMS confirmación"
@@ -4282,19 +4472,19 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:203
+#: lib/common.php:199
msgid "No configuration file found. "
msgstr "Ningún archivo de configuración encontrado. "
-#: lib/common.php:204
+#: lib/common.php:200
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:205
+#: lib/common.php:201
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:206
+#: lib/common.php:202
msgid "Go to the installer."
msgstr "Ir al instalador."
@@ -5070,11 +5260,6 @@ msgstr "Ninguno"
msgid "Top posters"
msgstr "Principales posteadores"
-#: lib/unblockform.php:80
-#, fuzzy
-msgid "Unlock this user"
-msgstr "Desbloquear este usuario"
-
#: lib/unsandboxform.php:69
msgid "Unsandbox"
msgstr ""
@@ -5128,47 +5313,47 @@ msgstr "Enviar un mensaje directo a este usuario"
msgid "Message"
msgstr "Mensaje"
-#: lib/util.php:821
+#: lib/util.php:826
msgid "a few seconds ago"
msgstr "hace unos segundos"
-#: lib/util.php:823
+#: lib/util.php:828
msgid "about a minute ago"
msgstr "hace un minuto"
-#: lib/util.php:825
+#: lib/util.php:830
#, php-format
msgid "about %d minutes ago"
msgstr "hace %d minutos"
-#: lib/util.php:827
+#: lib/util.php:832
msgid "about an hour ago"
msgstr "hace una hora"
-#: lib/util.php:829
+#: lib/util.php:834
#, php-format
msgid "about %d hours ago"
msgstr "hace %d horas"
-#: lib/util.php:831
+#: lib/util.php:836
msgid "about a day ago"
msgstr "hace un día"
-#: lib/util.php:833
+#: lib/util.php:838
#, php-format
msgid "about %d days ago"
msgstr "hace %d días"
-#: lib/util.php:835
+#: lib/util.php:840
msgid "about a month ago"
msgstr "hace un mes"
-#: lib/util.php:837
+#: lib/util.php:842
#, php-format
msgid "about %d months ago"
msgstr "hace %d meses"
-#: lib/util.php:839
+#: lib/util.php:844
msgid "about a year ago"
msgstr "hace un año"
@@ -5199,5 +5384,9 @@ msgid "Sorry, no incoming email allowed."
msgstr "Lo sentimos, pero no se permite correos entrantes"
#, fuzzy
+#~ msgid "Unlock this user"
+#~ msgstr "Desbloquear este usuario"
+
+#, fuzzy
#~ msgid "These people are subscribed to you: "
#~ msgstr "Personas suscritas a %s"
diff --git a/locale/fi/LC_MESSAGES/statusnet.po b/locale/fi/LC_MESSAGES/statusnet.po
index ac84ffd42..6563dbc5a 100644
--- a/locale/fi/LC_MESSAGES/statusnet.po
+++ b/locale/fi/LC_MESSAGES/statusnet.po
@@ -3,20 +3,18 @@
# Author@translatewiki.net: Crt
# Author@translatewiki.net: Jaakko
# --
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 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-18 19:31+0000\n"
+"POT-Creation-Date: 2009-11-19 10:43+0000\n"
"PO-Revision-Date: 2009-11-18 19:31:49+0000\n"
"Language-Team: Finnish\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: MediaWiki 1.16alpha(r59207); Translate extension (2009-11-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: fi\n"
@@ -154,7 +152,7 @@ msgstr "Ei voitu päivittää käyttäjää."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
-#: actions/designadminpanel.php:125 actions/newnotice.php:94
+#: actions/designadminpanel.php:122 actions/newnotice.php:94
#: lib/designsettings.php:283
#, php-format
msgid ""
@@ -239,7 +237,7 @@ msgstr "Kaikki suorat viestit käyttäjälle %s"
#: 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:184 actions/apigroupismember.php:114
+#: 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
@@ -305,20 +303,7 @@ msgstr "Julkista päivitysvirtaa ei saatu."
msgid "Could not find target user."
msgstr "Ei löytynyt yhtään päivitystä."
-#: actions/apigroupcreate.php:136 actions/newgroup.php:204
-msgid "Could not create group."
-msgstr "Ryhmän luonti ei onnistunut."
-
-#: actions/apigroupcreate.php:147 actions/editgroup.php:259
-#: actions/newgroup.php:210
-msgid "Could not create aliases."
-msgstr "Ei voitu lisätä aliasta."
-
-#: actions/apigroupcreate.php:166 actions/newgroup.php:224
-msgid "Could not set group membership."
-msgstr "Ryhmän jäsenyystietoja ei voitu asettaa."
-
-#: actions/apigroupcreate.php:212 actions/editgroup.php:182
+#: actions/apigroupcreate.php:164 actions/editgroup.php:182
#: actions/newgroup.php:126 actions/profilesettings.php:208
#: actions/register.php:205
msgid "Nickname must have only lowercase letters and numbers and no spaces."
@@ -326,60 +311,60 @@ msgstr ""
"Käyttäjätunnuksessa voi olla ainoastaan pieniä kirjaimia ja numeroita ilman "
"välilyöntiä."
-#: actions/apigroupcreate.php:221 actions/editgroup.php:186
+#: 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 "Tunnus on jo käytössä. Yritä toista tunnusta."
-#: actions/apigroupcreate.php:228 actions/editgroup.php:189
+#: 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 "Tuo ei ole kelvollinen tunnus."
-#: actions/apigroupcreate.php:244 actions/editgroup.php:195
+#: 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 "Kotisivun verkko-osoite ei ole toimiva."
-#: actions/apigroupcreate.php:253 actions/editgroup.php:198
+#: 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 "Koko nimi on liian pitkä (max 255 merkkiä)."
-#: actions/apigroupcreate.php:261
+#: actions/apigroupcreate.php:213
#, fuzzy, php-format
msgid "Description is too long (max %d chars)."
msgstr "kuvaus on liian pitkä (max 140 merkkiä)."
-#: actions/apigroupcreate.php:272 actions/editgroup.php:204
+#: 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 "Kotipaikka on liian pitkä (max 255 merkkiä)."
-#: actions/apigroupcreate.php:291 actions/editgroup.php:215
+#: actions/apigroupcreate.php:243 actions/editgroup.php:215
#: actions/newgroup.php:159
#, php-format
msgid "Too many aliases! Maximum %d."
msgstr "Liikaa aliaksia. Maksimimäärä on %d."
-#: actions/apigroupcreate.php:312 actions/editgroup.php:224
+#: actions/apigroupcreate.php:264 actions/editgroup.php:224
#: actions/newgroup.php:168
#, php-format
msgid "Invalid alias: \"%s\""
msgstr "Virheellinen alias: \"%s\""
-#: actions/apigroupcreate.php:321 actions/editgroup.php:228
+#: 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\" on jo käytössä. Yritä toista aliasta."
-#: actions/apigroupcreate.php:334 actions/editgroup.php:234
+#: actions/apigroupcreate.php:286 actions/editgroup.php:234
#: actions/newgroup.php:178
msgid "Alias can't be the same as nickname."
msgstr "Alias ei voi olla sama kuin ryhmätunnus."
@@ -602,10 +587,10 @@ msgstr ""
"Istuntosi avaimen kanssa oli ongelmia. Olisitko ystävällinen ja kokeilisit "
"uudelleen."
-#: actions/avatarsettings.php:277 actions/emailsettings.php:255
-#: actions/grouplogo.php:319 actions/imsettings.php:220
-#: actions/recoverpassword.php:44 actions/smssettings.php:248
-#: lib/designsettings.php:304
+#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
+#: actions/emailsettings.php:255 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/recoverpassword.php:44
+#: actions/smssettings.php:248 lib/designsettings.php:304
msgid "Unexpected form submission."
msgstr "Odottamaton lomakkeen lähetys."
@@ -665,7 +650,7 @@ msgstr "Poista käyttäjän esto ryhmästä"
msgid "Unblock"
msgstr "Poista esto"
-#: actions/blockedfromgroup.php:313
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:80
msgid "Unblock this user"
msgstr "Poista esto tältä käyttäjältä"
@@ -838,7 +823,7 @@ msgid "Delete this user"
msgstr "Poista tämä päivitys"
#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124
-#: lib/adminpanelaction.php:275 lib/groupnav.php:119
+#: lib/adminpanelaction.php:302 lib/groupnav.php:119
msgid "Design"
msgstr ""
@@ -846,108 +831,183 @@ msgstr ""
msgid "Design settings for this StatusNet site."
msgstr ""
-#: actions/designadminpanel.php:220
+#: actions/designadminpanel.php:278
#, fuzzy
-msgid "Unable to delete design setting."
-msgstr "Twitter-asetuksia ei voitu tallentaa!"
+msgid "Invalid logo URL."
+msgstr "Koko ei kelpaa."
-#: actions/designadminpanel.php:301
+#: actions/designadminpanel.php:282
#, fuzzy, php-format
msgid "Theme not available: %s"
msgstr "Pikaviestin ei ole käytettävissä."
-#: actions/designadminpanel.php:406
+#: actions/designadminpanel.php:288
+#, fuzzy, php-format
+msgid "Theme directory not readable: %s"
+msgstr "Pikaviestin ei ole käytettävissä."
+
+#: actions/designadminpanel.php:292
+#, php-format
+msgid "Avatar directory not writable: %s"
+msgstr ""
+
+#: actions/designadminpanel.php:296
+#, php-format
+msgid "Background directory not writable: %s"
+msgstr ""
+
+#: actions/designadminpanel.php:312
+#, php-format
+msgid "Max length for %s %s is 255 characters."
+msgstr ""
+
+#: actions/designadminpanel.php:412
+#, fuzzy
+msgid "Change logo"
+msgstr "Vaihda salasanasi"
+
+#: actions/designadminpanel.php:417
+#, fuzzy
+msgid "Site logo"
+msgstr "Kutsu"
+
+#: actions/designadminpanel.php:424
#, fuzzy
msgid "Change theme"
msgstr "Vaihda"
-#: actions/designadminpanel.php:410
-msgid "Theme"
-msgstr ""
+#: actions/designadminpanel.php:441
+#, fuzzy
+msgid "Site theme"
+msgstr "Palvelun ilmoitus"
-#: actions/designadminpanel.php:411
+#: actions/designadminpanel.php:442
#, fuzzy
msgid "Theme for the site."
msgstr "Kirjaudu ulos palvelusta"
-#: actions/designadminpanel.php:420 lib/designsettings.php:101
+#: actions/designadminpanel.php:447
+msgid "Theme server"
+msgstr ""
+
+#: actions/designadminpanel.php:451
+msgid "Theme path"
+msgstr ""
+
+#: actions/designadminpanel.php:455
+msgid "Theme directory"
+msgstr ""
+
+#: actions/designadminpanel.php:462
+#, fuzzy
+msgid "Avatar Settings"
+msgstr "Profiilikuva-asetukset"
+
+#: actions/designadminpanel.php:467
+#, fuzzy
+msgid "Avatar server"
+msgstr "Profiilikuva-asetukset"
+
+#: actions/designadminpanel.php:471
+#, fuzzy
+msgid "Avatar path"
+msgstr "Kuva päivitetty."
+
+#: actions/designadminpanel.php:475
+#, fuzzy
+msgid "Avatar directory"
+msgstr "Kuva poistettu."
+
+#: actions/designadminpanel.php:486 lib/designsettings.php:101
msgid "Change background image"
msgstr ""
-#: actions/designadminpanel.php:424 actions/designadminpanel.php:498
+#: actions/designadminpanel.php:491 actions/designadminpanel.php:578
#: lib/designsettings.php:178
msgid "Background"
msgstr ""
-#: actions/designadminpanel.php:429
+#: actions/designadminpanel.php:496
#, fuzzy, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
"$s."
msgstr "Voit ladata ryhmälle logokuvan. Maksimikoko on %s."
-#: actions/designadminpanel.php:459 lib/designsettings.php:139
+#: actions/designadminpanel.php:526 lib/designsettings.php:139
msgid "On"
msgstr ""
-#: actions/designadminpanel.php:475 lib/designsettings.php:155
+#: actions/designadminpanel.php:542 lib/designsettings.php:155
msgid "Off"
msgstr ""
-#: actions/designadminpanel.php:476 lib/designsettings.php:156
+#: actions/designadminpanel.php:543 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr ""
-#: actions/designadminpanel.php:481 lib/designsettings.php:161
+#: actions/designadminpanel.php:548 lib/designsettings.php:161
msgid "Tile background image"
msgstr ""
-#: actions/designadminpanel.php:490 lib/designsettings.php:170
+#: actions/designadminpanel.php:554
+msgid "Background server"
+msgstr ""
+
+#: actions/designadminpanel.php:558
+msgid "Background path"
+msgstr ""
+
+#: actions/designadminpanel.php:562
+msgid "Background directory"
+msgstr ""
+
+#: actions/designadminpanel.php:569 lib/designsettings.php:170
#, fuzzy
msgid "Change colours"
msgstr "Vaihda salasanasi"
-#: actions/designadminpanel.php:511 lib/designsettings.php:191
+#: actions/designadminpanel.php:591 lib/designsettings.php:191
#, fuzzy
msgid "Content"
msgstr "Yhdistä"
-#: actions/designadminpanel.php:524 lib/designsettings.php:204
+#: actions/designadminpanel.php:604 lib/designsettings.php:204
#, fuzzy
msgid "Sidebar"
msgstr "Haku"
-#: actions/designadminpanel.php:537 lib/designsettings.php:217
+#: actions/designadminpanel.php:617 lib/designsettings.php:217
msgid "Text"
msgstr "Teksti"
-#: actions/designadminpanel.php:550 lib/designsettings.php:230
+#: actions/designadminpanel.php:630 lib/designsettings.php:230
#, fuzzy
msgid "Links"
msgstr "Kirjaudu sisään"
-#: actions/designadminpanel.php:611 lib/designsettings.php:247
+#: actions/designadminpanel.php:658 lib/designsettings.php:247
msgid "Use defaults"
msgstr ""
-#: actions/designadminpanel.php:612 lib/designsettings.php:248
+#: actions/designadminpanel.php:659 lib/designsettings.php:248
msgid "Restore default designs"
msgstr ""
-#: actions/designadminpanel.php:618 lib/designsettings.php:254
+#: actions/designadminpanel.php:665 lib/designsettings.php:254
msgid "Reset back to default"
msgstr ""
-#: actions/designadminpanel.php:620 actions/emailsettings.php:195
+#: actions/designadminpanel.php:667 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/profilesettings.php:167 actions/siteadminpanel.php:371
+#: actions/profilesettings.php:167 actions/siteadminpanel.php:414
#: actions/smssettings.php:181 actions/subscriptions.php:203
#: actions/tagother.php:154 actions/useradminpanel.php:226
#: lib/designsettings.php:256 lib/groupeditform.php:202
msgid "Save"
msgstr "Tallenna"
-#: actions/designadminpanel.php:621 lib/designsettings.php:257
+#: actions/designadminpanel.php:668 lib/designsettings.php:257
msgid "Save design"
msgstr ""
@@ -990,6 +1050,10 @@ msgstr "kuvaus on liian pitkä (max %d merkkiä)."
msgid "Could not update group."
msgstr "Ei voitu päivittää ryhmää."
+#: actions/editgroup.php:259 classes/User_group.php:390
+msgid "Could not create aliases."
+msgstr "Ei voitu lisätä aliasta."
+
#: actions/editgroup.php:269
msgid "Options saved."
msgstr "Asetukset tallennettu."
@@ -1109,7 +1173,7 @@ msgstr "Sähköpostiosoitetta ei ole."
msgid "Cannot normalize that email address"
msgstr "Ei voida normalisoida sähköpostiosoitetta"
-#: actions/emailsettings.php:330 actions/siteadminpanel.php:156
+#: actions/emailsettings.php:330 actions/siteadminpanel.php:158
msgid "Not a valid email address"
msgstr "Tuo ei ole kelvollinen sähköpostiosoite"
@@ -1826,10 +1890,10 @@ msgstr "Päivityksen sisältö ei kelpaa"
msgid "Incorrect username or password."
msgstr "Väärä käyttäjätunnus tai salasana"
-#: actions/login.php:149 actions/recoverpassword.php:375
-#: actions/register.php:248
-msgid "Error setting user."
-msgstr "Virhe tapahtui käyttäjän asettamisessa."
+#: actions/login.php:149
+#, 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:457
#: lib/logingroupnav.php:79
@@ -2261,7 +2325,7 @@ msgstr ""
"Kuvaa itseäsi henkilötageilla (sanoja joissa voi olla muita kirjaimia kuin "
"ääkköset, numeroita, -, ., ja _), pilkulla tai välilyönnillä erotettuna"
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:275
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:309
msgid "Language"
msgstr "Kieli"
@@ -2289,7 +2353,7 @@ msgstr ""
msgid "Bio is too long (max %d chars)."
msgstr "\"Tietoja\" on liian pitkä (max 140 merkkiä)."
-#: actions/profilesettings.php:228 actions/siteadminpanel.php:163
+#: actions/profilesettings.php:228 actions/siteadminpanel.php:165
msgid "Timezone not selected."
msgstr "Aikavyöhykettä ei ole valittu."
@@ -2534,6 +2598,10 @@ msgstr "Salasanassa pitää olla 6 tai useampia merkkejä."
msgid "Password and confirmation do not match."
msgstr "Salasana ja salasanan vahvistus eivät täsmää."
+#: actions/recoverpassword.php:375 actions/register.php:248
+msgid "Error setting user."
+msgstr "Virhe tapahtui käyttäjän asettamisessa."
+
#: actions/recoverpassword.php:382
msgid "New password successfully saved. You are now logged in."
msgstr ""
@@ -2597,7 +2665,7 @@ msgid "Same as password above. Required."
msgstr "Sama kuin ylläoleva salasana. Pakollinen."
#: actions/register.php:437 actions/register.php:441
-#: actions/siteadminpanel.php:253 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:287 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "Sähköposti"
@@ -3048,7 +3116,7 @@ msgstr "Et voi lähettää viestiä tälle käyttäjälle."
msgid "User is already silenced."
msgstr "Käyttäjä on asettanut eston sinulle."
-#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:272
+#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:299
#, fuzzy
msgid "Site"
msgstr "Kutsu"
@@ -3057,122 +3125,237 @@ msgstr "Kutsu"
msgid "Basic settings for this StatusNet site."
msgstr ""
-#: actions/siteadminpanel.php:145
+#: actions/siteadminpanel.php:147
msgid "Site name must have non-zero length."
msgstr ""
-#: actions/siteadminpanel.php:153
+#: actions/siteadminpanel.php:155
#, fuzzy
msgid "You must have a valid contact email address"
msgstr "Tuo ei ole kelvollinen sähköpostiosoite"
-#: actions/siteadminpanel.php:171
+#: actions/siteadminpanel.php:173
#, php-format
msgid "Unknown language \"%s\""
msgstr ""
-#: actions/siteadminpanel.php:178
+#: actions/siteadminpanel.php:180
msgid "Invalid snapshot report URL."
msgstr ""
-#: actions/siteadminpanel.php:184
+#: actions/siteadminpanel.php:186
msgid "Invalid snapshot run value."
msgstr ""
-#: actions/siteadminpanel.php:190
+#: actions/siteadminpanel.php:192
msgid "Snapshot frequency must be a number."
msgstr ""
-#: actions/siteadminpanel.php:241
+#: actions/siteadminpanel.php:199
+msgid "You must set an SSL sever when enabling SSL."
+msgstr ""
+
+#: actions/siteadminpanel.php:204
+msgid "Invalid SSL server. Max length is 255 characters."
+msgstr ""
+
+#: actions/siteadminpanel.php:210
+msgid "Minimum text limit is 140c."
+msgstr ""
+
+#: actions/siteadminpanel.php:216
+msgid "Dupe limit must 1 or more seconds."
+msgstr ""
+
+#: actions/siteadminpanel.php:224
+#, php-format
+msgid "Locales directory not readable: %s"
+msgstr ""
+
+#: actions/siteadminpanel.php:275
#, fuzzy
msgid "Site name"
msgstr "Palvelun ilmoitus"
-#: actions/siteadminpanel.php:242
+#: actions/siteadminpanel.php:276
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr ""
-#: actions/siteadminpanel.php:245
+#: actions/siteadminpanel.php:279
msgid "Brought by"
msgstr ""
-#: actions/siteadminpanel.php:246
+#: actions/siteadminpanel.php:280
msgid "Text used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:249
+#: actions/siteadminpanel.php:283
msgid "Brought by URL"
msgstr ""
-#: actions/siteadminpanel.php:250
+#: actions/siteadminpanel.php:284
msgid "URL used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:254
+#: actions/siteadminpanel.php:288
#, fuzzy
msgid "contact email address for your site"
msgstr "Uusi sähköpostiosoite päivityksien lähettämiseen palveluun %s"
-#: actions/siteadminpanel.php:268
+#: actions/siteadminpanel.php:302
msgid "Default timezone"
msgstr ""
-#: actions/siteadminpanel.php:269
+#: actions/siteadminpanel.php:303
msgid "Default timezone for the site; usually UTC."
msgstr ""
-#: actions/siteadminpanel.php:276
+#: actions/siteadminpanel.php:310
#, fuzzy
msgid "Default site language"
msgstr "Ensisijainen kieli"
-#: actions/siteadminpanel.php:282
+#: actions/siteadminpanel.php:316
+msgid "Path to locales"
+msgstr ""
+
+#: actions/siteadminpanel.php:316
+msgid "Directory path to locales"
+msgstr ""
+
+#: actions/siteadminpanel.php:320
+#, fuzzy
+msgid "Server"
+msgstr "Palauta"
+
+#: actions/siteadminpanel.php:320
+msgid "Site's server hostname."
+msgstr ""
+
+#: actions/siteadminpanel.php:324
+msgid "Path"
+msgstr ""
+
+#: actions/siteadminpanel.php:324
+#, fuzzy
+msgid "Site path"
+msgstr "Palvelun ilmoitus"
+
+#: actions/siteadminpanel.php:328
+msgid "Fancy URLs"
+msgstr ""
+
+#: actions/siteadminpanel.php:330
+msgid "Use fancy (more readable and memorable) URLs?"
+msgstr ""
+
+#: actions/siteadminpanel.php:334
#, fuzzy
msgid "Private"
msgstr "Yksityisyys"
-#: actions/siteadminpanel.php:284
+#: actions/siteadminpanel.php:336
msgid "Prohibit anonymous users (not logged in) from viewing site?"
msgstr ""
-#: actions/siteadminpanel.php:290
+#: actions/siteadminpanel.php:340
+#, fuzzy
+msgid "Invite only"
+msgstr "Kutsu"
+
+#: actions/siteadminpanel.php:342
+msgid "Make registration invitation only."
+msgstr ""
+
+#: actions/siteadminpanel.php:346 actions/useradminpanel.php:171
+#, fuzzy
+msgid "Closed"
+msgstr "Estä"
+
+#: actions/siteadminpanel.php:348
+msgid "Disable new registrations."
+msgstr ""
+
+#: actions/siteadminpanel.php:353
msgid "Randomly during Web hit"
msgstr ""
-#: actions/siteadminpanel.php:291
+#: actions/siteadminpanel.php:354
msgid "In a scheduled job"
msgstr ""
-#: actions/siteadminpanel.php:292
+#: actions/siteadminpanel.php:355 actions/siteadminpanel.php:380
#, fuzzy
msgid "Never"
msgstr "Palauta"
-#: actions/siteadminpanel.php:294
+#: actions/siteadminpanel.php:357
msgid "Data snapshots"
msgstr ""
-#: actions/siteadminpanel.php:295
+#: actions/siteadminpanel.php:358
msgid "When to send statistical data to status.net servers"
msgstr ""
-#: actions/siteadminpanel.php:301
+#: actions/siteadminpanel.php:364
msgid "Frequency"
msgstr ""
-#: actions/siteadminpanel.php:302
+#: actions/siteadminpanel.php:365
msgid "Snapshots will be sent once every N Web hits"
msgstr ""
-#: actions/siteadminpanel.php:309
+#: actions/siteadminpanel.php:372
msgid "Report URL"
msgstr ""
-#: actions/siteadminpanel.php:310
+#: actions/siteadminpanel.php:373
msgid "Snapshots will be sent to this URL"
msgstr ""
-#: actions/siteadminpanel.php:371 actions/useradminpanel.php:226
+#: actions/siteadminpanel.php:381
+#, fuzzy
+msgid "Sometimes"
+msgstr "Päivitykset"
+
+#: actions/siteadminpanel.php:382
+#, fuzzy
+msgid "Always"
+msgstr "Aliakset"
+
+#: actions/siteadminpanel.php:384
+msgid "Use SSL"
+msgstr ""
+
+#: actions/siteadminpanel.php:385
+msgid "When to use SSL"
+msgstr ""
+
+#: actions/siteadminpanel.php:391
+msgid "SSL Server"
+msgstr ""
+
+#: actions/siteadminpanel.php:392
+msgid "Server to direct SSL requests to"
+msgstr ""
+
+#: actions/siteadminpanel.php:396
+msgid "Text limit"
+msgstr ""
+
+#: actions/siteadminpanel.php:396
+msgid "Maximum number of characters for notices."
+msgstr ""
+
+#: actions/siteadminpanel.php:400
+msgid "Dupe limit"
+msgstr ""
+
+#: actions/siteadminpanel.php:400
+msgid "How long users must wait (in seconds) to post the same thing again."
+msgstr ""
+
+#: actions/siteadminpanel.php:414 actions/useradminpanel.php:226
#, fuzzy
msgid "Save site settings"
msgstr "Profiilikuva-asetukset"
@@ -3490,11 +3673,6 @@ msgstr "Käyttäjä"
msgid "User settings for this StatusNet site."
msgstr ""
-#: actions/useradminpanel.php:171
-#, fuzzy
-msgid "Closed"
-msgstr "Estä"
-
#: actions/useradminpanel.php:173
msgid "Is registration on this site prohibited?"
msgstr ""
@@ -3723,6 +3901,14 @@ msgstr "Ongelma päivityksen tallentamisessa."
msgid "DB error inserting reply: %s"
msgstr "Tietokantavirhe tallennettaessa vastausta: %s"
+#: classes/User_group.php:380
+msgid "Could not create group."
+msgstr "Ryhmän luonti ei onnistunut."
+
+#: classes/User_group.php:409
+msgid "Could not set group membership."
+msgstr "Ryhmän jäsenyystietoja ei voitu asettaa."
+
#: classes/User.php:347
#, fuzzy, php-format
msgid "Welcome to %1$s, @%2$s!"
@@ -3963,12 +4149,17 @@ msgstr "Komentoa ei ole vielä toteutettu."
msgid "saveSettings() not implemented."
msgstr "Komentoa ei ole vielä toteutettu."
-#: lib/adminpanelaction.php:273
+#: lib/adminpanelaction.php:247
+#, fuzzy
+msgid "Unable to delete design setting."
+msgstr "Twitter-asetuksia ei voitu tallentaa!"
+
+#: lib/adminpanelaction.php:300
#, fuzzy
msgid "Basic site configuration"
msgstr "Sähköpostiosoitteen vahvistus"
-#: lib/adminpanelaction.php:276
+#: lib/adminpanelaction.php:303
#, fuzzy
msgid "Design configuration"
msgstr "SMS vahvistus"
@@ -4216,20 +4407,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:203
+#: lib/common.php:199
#, fuzzy
msgid "No configuration file found. "
msgstr "Varmistuskoodia ei ole annettu."
-#: lib/common.php:204
+#: lib/common.php:200
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:205
+#: lib/common.php:201
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:206
+#: lib/common.php:202
#, fuzzy
msgid "Go to the installer."
msgstr "Kirjaudu sisään palveluun"
@@ -5009,11 +5200,6 @@ msgstr "Ei mitään"
msgid "Top posters"
msgstr "Eniten päivityksiä"
-#: lib/unblockform.php:80
-#, fuzzy
-msgid "Unlock this user"
-msgstr "Poista esto tältä käyttäjältä"
-
#: lib/unsandboxform.php:69
msgid "Unsandbox"
msgstr ""
@@ -5066,47 +5252,47 @@ msgstr "Lähetä suora viesti tälle käyttäjälle"
msgid "Message"
msgstr "Viesti"
-#: lib/util.php:821
+#: lib/util.php:826
msgid "a few seconds ago"
msgstr "muutama sekunti sitten"
-#: lib/util.php:823
+#: lib/util.php:828
msgid "about a minute ago"
msgstr "noin minuutti sitten"
-#: lib/util.php:825
+#: lib/util.php:830
#, php-format
msgid "about %d minutes ago"
msgstr "noin %d minuuttia sitten"
-#: lib/util.php:827
+#: lib/util.php:832
msgid "about an hour ago"
msgstr "noin tunti sitten"
-#: lib/util.php:829
+#: lib/util.php:834
#, php-format
msgid "about %d hours ago"
msgstr "noin %d tuntia sitten"
-#: lib/util.php:831
+#: lib/util.php:836
msgid "about a day ago"
msgstr "noin päivä sitten"
-#: lib/util.php:833
+#: lib/util.php:838
#, php-format
msgid "about %d days ago"
msgstr "noin %d päivää sitten"
-#: lib/util.php:835
+#: lib/util.php:840
msgid "about a month ago"
msgstr "noin kuukausi sitten"
-#: lib/util.php:837
+#: lib/util.php:842
#, php-format
msgid "about %d months ago"
msgstr "noin %d kuukautta sitten"
-#: lib/util.php:839
+#: lib/util.php:844
msgid "about a year ago"
msgstr "noin vuosi sitten"
@@ -5137,5 +5323,9 @@ msgid "Sorry, no incoming email allowed."
msgstr "Valitettavasti päivitysten teko sähköpostilla ei ole sallittua."
#, fuzzy
+#~ msgid "Unlock this user"
+#~ msgstr "Poista esto tältä käyttäjältä"
+
+#, fuzzy
#~ msgid "These people are subscribed to you: "
#~ msgstr "Ihmiset jotka ovat käyttäjän %s tilaajia"
diff --git a/locale/fr/LC_MESSAGES/statusnet.po b/locale/fr/LC_MESSAGES/statusnet.po
index 3cf6033a4..8c2afd401 100644
--- a/locale/fr/LC_MESSAGES/statusnet.po
+++ b/locale/fr/LC_MESSAGES/statusnet.po
@@ -6,15 +6,18 @@
# Author@translatewiki.net: Peter17
# Author@translatewiki.net: Zetud
# --
+# 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-18 19:31+0000\n"
+"POT-Creation-Date: 2009-11-19 10:43+0000\n"
"PO-Revision-Date: 2009-11-18 19:31:52+0000\n"
"Language-Team: French\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
"X-Generator: MediaWiki 1.16alpha(r59207); Translate extension (2009-11-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: fr\n"
@@ -150,7 +153,7 @@ msgstr "Impossible de mettre à jour l’utilisateur."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
-#: actions/designadminpanel.php:125 actions/newnotice.php:94
+#: actions/designadminpanel.php:122 actions/newnotice.php:94
#: lib/designsettings.php:283
#, php-format
msgid ""
@@ -233,7 +236,7 @@ msgstr "Tous les messages envoyés à %s"
#: 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:184 actions/apigroupismember.php:114
+#: 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
@@ -297,20 +300,7 @@ msgstr "Impossible de déterminer l’utilisateur source."
msgid "Could not find target user."
msgstr "Impossible de trouver l’utilisateur cible."
-#: actions/apigroupcreate.php:136 actions/newgroup.php:204
-msgid "Could not create group."
-msgstr "Impossible de créer le groupe."
-
-#: actions/apigroupcreate.php:147 actions/editgroup.php:259
-#: actions/newgroup.php:210
-msgid "Could not create aliases."
-msgstr "Impossible de créer les alias."
-
-#: actions/apigroupcreate.php:166 actions/newgroup.php:224
-msgid "Could not set group membership."
-msgstr "Impossible d'établir l’inscription au groupe."
-
-#: actions/apigroupcreate.php:212 actions/editgroup.php:182
+#: actions/apigroupcreate.php:164 actions/editgroup.php:182
#: actions/newgroup.php:126 actions/profilesettings.php:208
#: actions/register.php:205
msgid "Nickname must have only lowercase letters and numbers and no spaces."
@@ -318,60 +308,60 @@ msgstr ""
"Les pseudos ne peuvent contenir que des caractères minuscules et des "
"chiffres, sans espaces."
-#: actions/apigroupcreate.php:221 actions/editgroup.php:186
+#: 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 "Pseudo déjà utilisé. Essayez-en un autre."
-#: actions/apigroupcreate.php:228 actions/editgroup.php:189
+#: 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 "Pseudo invalide."
-#: actions/apigroupcreate.php:244 actions/editgroup.php:195
+#: 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 "L’adresse du site personnel n’est pas un URL valide. "
-#: actions/apigroupcreate.php:253 actions/editgroup.php:198
+#: 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 "Nom complet trop long (maximum de 255 caractères)."
-#: actions/apigroupcreate.php:261
+#: actions/apigroupcreate.php:213
#, php-format
msgid "Description is too long (max %d chars)."
msgstr "La description est trop longue (%d caractères maximum)."
-#: actions/apigroupcreate.php:272 actions/editgroup.php:204
+#: 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 "Emplacement trop long (maximum de 255 caractères)."
-#: actions/apigroupcreate.php:291 actions/editgroup.php:215
+#: actions/apigroupcreate.php:243 actions/editgroup.php:215
#: actions/newgroup.php:159
#, php-format
msgid "Too many aliases! Maximum %d."
msgstr "Trop d’alias ! Maximum %d."
-#: actions/apigroupcreate.php:312 actions/editgroup.php:224
+#: actions/apigroupcreate.php:264 actions/editgroup.php:224
#: actions/newgroup.php:168
#, php-format
msgid "Invalid alias: \"%s\""
msgstr "Alias invalide : « %s »"
-#: actions/apigroupcreate.php:321 actions/editgroup.php:228
+#: 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 » déjà utilisé. Essayez-en un autre."
-#: actions/apigroupcreate.php:334 actions/editgroup.php:234
+#: actions/apigroupcreate.php:286 actions/editgroup.php:234
#: actions/newgroup.php:178
msgid "Alias can't be the same as nickname."
msgstr "L’alias ne peut pas être le même que le pseudo."
@@ -597,10 +587,10 @@ msgstr ""
"Un problème est survenu avec votre jeton de session. Veuillez essayer à "
"nouveau."
-#: actions/avatarsettings.php:277 actions/emailsettings.php:255
-#: actions/grouplogo.php:319 actions/imsettings.php:220
-#: actions/recoverpassword.php:44 actions/smssettings.php:248
-#: lib/designsettings.php:304
+#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
+#: actions/emailsettings.php:255 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/recoverpassword.php:44
+#: actions/smssettings.php:248 lib/designsettings.php:304
msgid "Unexpected form submission."
msgstr "Soumission de formulaire inattendue."
@@ -660,7 +650,7 @@ msgstr "Débloquer l’utilisateur du groupe"
msgid "Unblock"
msgstr "Débloquer"
-#: actions/blockedfromgroup.php:313
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:80
msgid "Unblock this user"
msgstr "Débloquer cet utilisateur"
@@ -835,7 +825,7 @@ msgid "Delete this user"
msgstr "Supprimer ce statut"
#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124
-#: lib/adminpanelaction.php:275 lib/groupnav.php:119
+#: lib/adminpanelaction.php:302 lib/groupnav.php:119
msgid "Design"
msgstr "Conception"
@@ -843,40 +833,103 @@ msgstr "Conception"
msgid "Design settings for this StatusNet site."
msgstr ""
-#: actions/designadminpanel.php:220
+#: actions/designadminpanel.php:278
#, fuzzy
-msgid "Unable to delete design setting."
-msgstr "Impossible de sauvegarder les parmètres de la conception."
+msgid "Invalid logo URL."
+msgstr "Taille incorrecte."
-#: actions/designadminpanel.php:301
+#: actions/designadminpanel.php:282
#, fuzzy, php-format
msgid "Theme not available: %s"
msgstr "La messagerie instantanée n’est pas disponible."
-#: actions/designadminpanel.php:406
+#: actions/designadminpanel.php:288
+#, fuzzy, php-format
+msgid "Theme directory not readable: %s"
+msgstr "La messagerie instantanée n’est pas disponible."
+
+#: actions/designadminpanel.php:292
+#, php-format
+msgid "Avatar directory not writable: %s"
+msgstr ""
+
+#: actions/designadminpanel.php:296
+#, php-format
+msgid "Background directory not writable: %s"
+msgstr ""
+
+#: actions/designadminpanel.php:312
+#, php-format
+msgid "Max length for %s %s is 255 characters."
+msgstr ""
+
+#: actions/designadminpanel.php:412
+#, fuzzy
+msgid "Change logo"
+msgstr "Modifier les couleurs"
+
+#: actions/designadminpanel.php:417
+#, fuzzy
+msgid "Site logo"
+msgstr "Inviter"
+
+#: actions/designadminpanel.php:424
#, fuzzy
msgid "Change theme"
msgstr "Modifier"
-#: actions/designadminpanel.php:410
-msgid "Theme"
-msgstr ""
+#: actions/designadminpanel.php:441
+#, fuzzy
+msgid "Site theme"
+msgstr "Notice du site"
-#: actions/designadminpanel.php:411
+#: actions/designadminpanel.php:442
#, fuzzy
msgid "Theme for the site."
msgstr "Fermer la session"
-#: actions/designadminpanel.php:420 lib/designsettings.php:101
+#: actions/designadminpanel.php:447
+msgid "Theme server"
+msgstr ""
+
+#: actions/designadminpanel.php:451
+msgid "Theme path"
+msgstr ""
+
+#: actions/designadminpanel.php:455
+msgid "Theme directory"
+msgstr ""
+
+#: actions/designadminpanel.php:462
+#, fuzzy
+msgid "Avatar Settings"
+msgstr "Paramètres de l’avatar"
+
+#: actions/designadminpanel.php:467
+#, fuzzy
+msgid "Avatar server"
+msgstr "Paramètres de l’avatar"
+
+#: actions/designadminpanel.php:471
+#, fuzzy
+msgid "Avatar path"
+msgstr "Avatar mis à jour."
+
+#: actions/designadminpanel.php:475
+#, fuzzy
+msgid "Avatar directory"
+msgstr "Avatar supprimé."
+
+#: actions/designadminpanel.php:486 lib/designsettings.php:101
msgid "Change background image"
msgstr "Changer l’image d’arrière plan"
-#: actions/designadminpanel.php:424 actions/designadminpanel.php:498
+#: actions/designadminpanel.php:491 actions/designadminpanel.php:578
#: lib/designsettings.php:178
msgid "Background"
msgstr "Arrière plan"
-#: actions/designadminpanel.php:429
+#: actions/designadminpanel.php:496
#, fuzzy, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -885,64 +938,79 @@ msgstr ""
"Vous pouvez choisir un logo pour votre groupe. La taille maximale du fichier "
"est de %s."
-#: actions/designadminpanel.php:459 lib/designsettings.php:139
+#: actions/designadminpanel.php:526 lib/designsettings.php:139
msgid "On"
msgstr "Activé"
-#: actions/designadminpanel.php:475 lib/designsettings.php:155
+#: actions/designadminpanel.php:542 lib/designsettings.php:155
msgid "Off"
msgstr "Désactivé"
-#: actions/designadminpanel.php:476 lib/designsettings.php:156
+#: actions/designadminpanel.php:543 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr "Activer ou désactiver l’image d’arrière plan."
-#: actions/designadminpanel.php:481 lib/designsettings.php:161
+#: actions/designadminpanel.php:548 lib/designsettings.php:161
msgid "Tile background image"
msgstr "Répéter l’image d’arrière plan"
-#: actions/designadminpanel.php:490 lib/designsettings.php:170
+#: actions/designadminpanel.php:554
+#, fuzzy
+msgid "Background server"
+msgstr "Arrière plan"
+
+#: actions/designadminpanel.php:558
+#, fuzzy
+msgid "Background path"
+msgstr "Arrière plan"
+
+#: actions/designadminpanel.php:562
+#, fuzzy
+msgid "Background directory"
+msgstr "Arrière plan"
+
+#: actions/designadminpanel.php:569 lib/designsettings.php:170
msgid "Change colours"
msgstr "Modifier les couleurs"
-#: actions/designadminpanel.php:511 lib/designsettings.php:191
+#: actions/designadminpanel.php:591 lib/designsettings.php:191
msgid "Content"
msgstr "Contenu"
-#: actions/designadminpanel.php:524 lib/designsettings.php:204
+#: actions/designadminpanel.php:604 lib/designsettings.php:204
msgid "Sidebar"
msgstr "Barre latérale"
-#: actions/designadminpanel.php:537 lib/designsettings.php:217
+#: actions/designadminpanel.php:617 lib/designsettings.php:217
msgid "Text"
msgstr "Texte"
-#: actions/designadminpanel.php:550 lib/designsettings.php:230
+#: actions/designadminpanel.php:630 lib/designsettings.php:230
msgid "Links"
msgstr "Liens"
-#: actions/designadminpanel.php:611 lib/designsettings.php:247
+#: actions/designadminpanel.php:658 lib/designsettings.php:247
msgid "Use defaults"
msgstr "Utiliser les valeurs par défaut"
-#: actions/designadminpanel.php:612 lib/designsettings.php:248
+#: actions/designadminpanel.php:659 lib/designsettings.php:248
msgid "Restore default designs"
msgstr "Restaurer les conceptions par défaut"
-#: actions/designadminpanel.php:618 lib/designsettings.php:254
+#: actions/designadminpanel.php:665 lib/designsettings.php:254
msgid "Reset back to default"
msgstr "Revenir aux valeurs par défaut"
-#: actions/designadminpanel.php:620 actions/emailsettings.php:195
+#: actions/designadminpanel.php:667 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/profilesettings.php:167 actions/siteadminpanel.php:371
+#: actions/profilesettings.php:167 actions/siteadminpanel.php:414
#: actions/smssettings.php:181 actions/subscriptions.php:203
#: actions/tagother.php:154 actions/useradminpanel.php:226
#: lib/designsettings.php:256 lib/groupeditform.php:202
msgid "Save"
msgstr "Enregistrer"
-#: actions/designadminpanel.php:621 lib/designsettings.php:257
+#: actions/designadminpanel.php:668 lib/designsettings.php:257
msgid "Save design"
msgstr "Sauvegarder la conception"
@@ -985,6 +1053,10 @@ msgstr "la description est trop longue (%d caractères maximum)."
msgid "Could not update group."
msgstr "Impossible de mettre à jour le groupe."
+#: actions/editgroup.php:259 classes/User_group.php:390
+msgid "Could not create aliases."
+msgstr "Impossible de créer les alias."
+
#: actions/editgroup.php:269
msgid "Options saved."
msgstr "Vos options ont été enregistrées."
@@ -1103,7 +1175,7 @@ msgstr "Aucune adresse courriel."
msgid "Cannot normalize that email address"
msgstr "Impossible d’utiliser cette adresse courriel"
-#: actions/emailsettings.php:330 actions/siteadminpanel.php:156
+#: actions/emailsettings.php:330 actions/siteadminpanel.php:158
msgid "Not a valid email address"
msgstr "Adresse courriel invalide"
@@ -1832,10 +1904,10 @@ msgstr "Jeton invalide ou expiré."
msgid "Incorrect username or password."
msgstr "Identifiant ou mot de passe incorrect."
-#: actions/login.php:149 actions/recoverpassword.php:375
-#: actions/register.php:248
-msgid "Error setting user."
-msgstr "Erreur lors de la configuration de l’utilisateur."
+#: actions/login.php:149
+#, fuzzy
+msgid "Error setting user. You are probably not authorized."
+msgstr "Vous n'êtes pas autorisé."
#: actions/login.php:204 actions/login.php:257 lib/action.php:457
#: lib/logingroupnav.php:79
@@ -2264,7 +2336,7 @@ msgid ""
msgstr ""
"Marquages (tags) pour votre profil, séparés par des virgules ou des espaces"
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:275
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:309
msgid "Language"
msgstr "Langue"
@@ -2292,7 +2364,7 @@ msgstr ""
msgid "Bio is too long (max %d chars)."
msgstr "La bio est trop longue (%d caractères maximum)."
-#: actions/profilesettings.php:228 actions/siteadminpanel.php:163
+#: actions/profilesettings.php:228 actions/siteadminpanel.php:165
msgid "Timezone not selected."
msgstr "Aucun fuseau horaire n’a été choisi."
@@ -2541,6 +2613,10 @@ msgstr "Le mot de passe doit contenir au moins 6 caractères."
msgid "Password and confirmation do not match."
msgstr "Le mot de passe et sa confirmation ne correspondent pas."
+#: actions/recoverpassword.php:375 actions/register.php:248
+msgid "Error setting user."
+msgstr "Erreur lors de la configuration de l’utilisateur."
+
#: actions/recoverpassword.php:382
msgid "New password successfully saved. You are now logged in."
msgstr ""
@@ -2603,7 +2679,7 @@ msgid "Same as password above. Required."
msgstr "Identique au mot de passe ci-dessus. Requis."
#: actions/register.php:437 actions/register.php:441
-#: actions/siteadminpanel.php:253 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:287 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "Courriel"
@@ -3064,7 +3140,7 @@ msgstr "Vous ne pouvez pas envoyer de messages à cet utilisateur."
msgid "User is already silenced."
msgstr "Cet utilisateur est déjà bloqué pour le groupe."
-#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:272
+#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:299
#, fuzzy
msgid "Site"
msgstr "Inviter"
@@ -3073,122 +3149,237 @@ msgstr "Inviter"
msgid "Basic settings for this StatusNet site."
msgstr ""
-#: actions/siteadminpanel.php:145
+#: actions/siteadminpanel.php:147
msgid "Site name must have non-zero length."
msgstr ""
-#: actions/siteadminpanel.php:153
+#: actions/siteadminpanel.php:155
#, fuzzy
msgid "You must have a valid contact email address"
msgstr "Adresse courriel invalide"
-#: actions/siteadminpanel.php:171
+#: actions/siteadminpanel.php:173
#, php-format
msgid "Unknown language \"%s\""
msgstr ""
-#: actions/siteadminpanel.php:178
+#: actions/siteadminpanel.php:180
msgid "Invalid snapshot report URL."
msgstr ""
-#: actions/siteadminpanel.php:184
+#: actions/siteadminpanel.php:186
msgid "Invalid snapshot run value."
msgstr ""
-#: actions/siteadminpanel.php:190
+#: actions/siteadminpanel.php:192
msgid "Snapshot frequency must be a number."
msgstr ""
-#: actions/siteadminpanel.php:241
+#: actions/siteadminpanel.php:199
+msgid "You must set an SSL sever when enabling SSL."
+msgstr ""
+
+#: actions/siteadminpanel.php:204
+msgid "Invalid SSL server. Max length is 255 characters."
+msgstr ""
+
+#: actions/siteadminpanel.php:210
+msgid "Minimum text limit is 140c."
+msgstr ""
+
+#: actions/siteadminpanel.php:216
+msgid "Dupe limit must 1 or more seconds."
+msgstr ""
+
+#: actions/siteadminpanel.php:224
+#, php-format
+msgid "Locales directory not readable: %s"
+msgstr ""
+
+#: actions/siteadminpanel.php:275
#, fuzzy
msgid "Site name"
msgstr "Notice du site"
-#: actions/siteadminpanel.php:242
+#: actions/siteadminpanel.php:276
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr ""
-#: actions/siteadminpanel.php:245
+#: actions/siteadminpanel.php:279
msgid "Brought by"
msgstr ""
-#: actions/siteadminpanel.php:246
+#: actions/siteadminpanel.php:280
msgid "Text used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:249
+#: actions/siteadminpanel.php:283
msgid "Brought by URL"
msgstr ""
-#: actions/siteadminpanel.php:250
+#: actions/siteadminpanel.php:284
msgid "URL used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:254
+#: actions/siteadminpanel.php:288
#, fuzzy
msgid "contact email address for your site"
msgstr "Nouvelle adresse courriel pour poster dans %s"
-#: actions/siteadminpanel.php:268
+#: actions/siteadminpanel.php:302
msgid "Default timezone"
msgstr ""
-#: actions/siteadminpanel.php:269
+#: actions/siteadminpanel.php:303
msgid "Default timezone for the site; usually UTC."
msgstr ""
-#: actions/siteadminpanel.php:276
+#: actions/siteadminpanel.php:310
#, fuzzy
msgid "Default site language"
msgstr "Langue préférée"
-#: actions/siteadminpanel.php:282
+#: actions/siteadminpanel.php:316
+msgid "Path to locales"
+msgstr ""
+
+#: actions/siteadminpanel.php:316
+msgid "Directory path to locales"
+msgstr ""
+
+#: actions/siteadminpanel.php:320
+#, fuzzy
+msgid "Server"
+msgstr "Récupérer"
+
+#: actions/siteadminpanel.php:320
+msgid "Site's server hostname."
+msgstr ""
+
+#: actions/siteadminpanel.php:324
+msgid "Path"
+msgstr ""
+
+#: actions/siteadminpanel.php:324
+#, fuzzy
+msgid "Site path"
+msgstr "Notice du site"
+
+#: actions/siteadminpanel.php:328
+msgid "Fancy URLs"
+msgstr ""
+
+#: actions/siteadminpanel.php:330
+msgid "Use fancy (more readable and memorable) URLs?"
+msgstr ""
+
+#: actions/siteadminpanel.php:334
#, fuzzy
msgid "Private"
msgstr "Confidentialité"
-#: actions/siteadminpanel.php:284
+#: actions/siteadminpanel.php:336
msgid "Prohibit anonymous users (not logged in) from viewing site?"
msgstr ""
-#: actions/siteadminpanel.php:290
+#: actions/siteadminpanel.php:340
+#, fuzzy
+msgid "Invite only"
+msgstr "Inviter"
+
+#: actions/siteadminpanel.php:342
+msgid "Make registration invitation only."
+msgstr ""
+
+#: actions/siteadminpanel.php:346 actions/useradminpanel.php:171
+#, fuzzy
+msgid "Closed"
+msgstr "Bloqué"
+
+#: actions/siteadminpanel.php:348
+msgid "Disable new registrations."
+msgstr ""
+
+#: actions/siteadminpanel.php:353
msgid "Randomly during Web hit"
msgstr ""
-#: actions/siteadminpanel.php:291
+#: actions/siteadminpanel.php:354
msgid "In a scheduled job"
msgstr ""
-#: actions/siteadminpanel.php:292
+#: actions/siteadminpanel.php:355 actions/siteadminpanel.php:380
#, fuzzy
msgid "Never"
msgstr "Récupérer"
-#: actions/siteadminpanel.php:294
+#: actions/siteadminpanel.php:357
msgid "Data snapshots"
msgstr ""
-#: actions/siteadminpanel.php:295
+#: actions/siteadminpanel.php:358
msgid "When to send statistical data to status.net servers"
msgstr ""
-#: actions/siteadminpanel.php:301
+#: actions/siteadminpanel.php:364
msgid "Frequency"
msgstr ""
-#: actions/siteadminpanel.php:302
+#: actions/siteadminpanel.php:365
msgid "Snapshots will be sent once every N Web hits"
msgstr ""
-#: actions/siteadminpanel.php:309
+#: actions/siteadminpanel.php:372
msgid "Report URL"
msgstr ""
-#: actions/siteadminpanel.php:310
+#: actions/siteadminpanel.php:373
msgid "Snapshots will be sent to this URL"
msgstr ""
-#: actions/siteadminpanel.php:371 actions/useradminpanel.php:226
+#: actions/siteadminpanel.php:381
+#, fuzzy
+msgid "Sometimes"
+msgstr "Statuts"
+
+#: actions/siteadminpanel.php:382
+#, fuzzy
+msgid "Always"
+msgstr "Alias"
+
+#: actions/siteadminpanel.php:384
+msgid "Use SSL"
+msgstr ""
+
+#: actions/siteadminpanel.php:385
+msgid "When to use SSL"
+msgstr ""
+
+#: actions/siteadminpanel.php:391
+msgid "SSL Server"
+msgstr ""
+
+#: actions/siteadminpanel.php:392
+msgid "Server to direct SSL requests to"
+msgstr ""
+
+#: actions/siteadminpanel.php:396
+msgid "Text limit"
+msgstr ""
+
+#: actions/siteadminpanel.php:396
+msgid "Maximum number of characters for notices."
+msgstr ""
+
+#: actions/siteadminpanel.php:400
+msgid "Dupe limit"
+msgstr ""
+
+#: actions/siteadminpanel.php:400
+msgid "How long users must wait (in seconds) to post the same thing again."
+msgstr ""
+
+#: actions/siteadminpanel.php:414 actions/useradminpanel.php:226
#, fuzzy
msgid "Save site settings"
msgstr "Paramètres de l’avatar"
@@ -3518,11 +3709,6 @@ msgstr "Utilisateur"
msgid "User settings for this StatusNet site."
msgstr ""
-#: actions/useradminpanel.php:171
-#, fuzzy
-msgid "Closed"
-msgstr "Bloqué"
-
#: actions/useradminpanel.php:173
msgid "Is registration on this site prohibited?"
msgstr ""
@@ -3753,6 +3939,14 @@ msgstr "Problème lors de l’enregistrement du statut."
msgid "DB error inserting reply: %s"
msgstr "Erreur de base de donnée en insérant la réponse :%s"
+#: classes/User_group.php:380
+msgid "Could not create group."
+msgstr "Impossible de créer le groupe."
+
+#: classes/User_group.php:409
+msgid "Could not set group membership."
+msgstr "Impossible d'établir l’inscription au groupe."
+
#: classes/User.php:347
#, php-format
msgid "Welcome to %1$s, @%2$s!"
@@ -3990,12 +4184,17 @@ msgstr "Cette commande n’a pas encore été implémentée."
msgid "saveSettings() not implemented."
msgstr "Cette commande n’a pas encore été implémentée."
-#: lib/adminpanelaction.php:273
+#: lib/adminpanelaction.php:247
+#, fuzzy
+msgid "Unable to delete design setting."
+msgstr "Impossible de sauvegarder les parmètres de la conception."
+
+#: lib/adminpanelaction.php:300
#, fuzzy
msgid "Basic site configuration"
msgstr "Confirmation de l’adresse courriel"
-#: lib/adminpanelaction.php:276
+#: lib/adminpanelaction.php:303
#, fuzzy
msgid "Design configuration"
msgstr "Confirmation SMS"
@@ -4282,20 +4481,20 @@ msgstr ""
"tracks - pas encore implémenté.\n"
"tracking - pas encore implémenté.\n"
-#: lib/common.php:203
+#: lib/common.php:199
msgid "No configuration file found. "
msgstr "Aucun fichier de configuration n'a été trouvé. "
-#: lib/common.php:204
+#: lib/common.php:200
msgid "I looked for configuration files in the following places: "
msgstr ""
"J’ai cherché des fichiers de configuration dans les emplacements suivants : "
-#: lib/common.php:205
+#: lib/common.php:201
msgid "You may wish to run the installer to fix this."
msgstr "Vous pouvez essayer de lancer l’installeur pour régler ce problème."
-#: lib/common.php:206
+#: lib/common.php:202
msgid "Go to the installer."
msgstr "Aller au programme d’installation"
@@ -5141,11 +5340,6 @@ msgstr "Aucun"
msgid "Top posters"
msgstr "Utilisateurs les plus actifs"
-#: lib/unblockform.php:80
-#, fuzzy
-msgid "Unlock this user"
-msgstr "Débloquer cet utilisateur"
-
#: lib/unsandboxform.php:69
msgid "Unsandbox"
msgstr ""
@@ -5196,47 +5390,47 @@ msgstr "Envoyer un message à cet utilisateur"
msgid "Message"
msgstr "Message"
-#: lib/util.php:821
+#: lib/util.php:826
msgid "a few seconds ago"
msgstr "il y a quelques secondes"
-#: lib/util.php:823
+#: lib/util.php:828
msgid "about a minute ago"
msgstr "il y a 1 minute"
-#: lib/util.php:825
+#: lib/util.php:830
#, php-format
msgid "about %d minutes ago"
msgstr "il y a %d minutes"
-#: lib/util.php:827
+#: lib/util.php:832
msgid "about an hour ago"
msgstr "il y a 1 heure"
-#: lib/util.php:829
+#: lib/util.php:834
#, php-format
msgid "about %d hours ago"
msgstr "il y a %d heures"
-#: lib/util.php:831
+#: lib/util.php:836
msgid "about a day ago"
msgstr "il y a 1 jour"
-#: lib/util.php:833
+#: lib/util.php:838
#, php-format
msgid "about %d days ago"
msgstr "il y a %d jours"
-#: lib/util.php:835
+#: lib/util.php:840
msgid "about a month ago"
msgstr "il y a 1 mois"
-#: lib/util.php:837
+#: lib/util.php:842
#, php-format
msgid "about %d months ago"
msgstr "il y a %d mois"
-#: lib/util.php:839
+#: lib/util.php:844
msgid "about a year ago"
msgstr "il y a environ 1 an"
@@ -5267,5 +5461,9 @@ msgstr "Désolé, ceci n’est pas votre adresse de courriel entrant."
msgid "Sorry, no incoming email allowed."
msgstr "Désolé, la réception de courriels n’est pas permise."
+#, fuzzy
+#~ msgid "Unlock this user"
+#~ msgstr "Débloquer cet utilisateur"
+
#~ msgid "These people are subscribed to you: "
#~ msgstr "Ces personnes sont abonnées à vous : "
diff --git a/locale/ga/LC_MESSAGES/statusnet.po b/locale/ga/LC_MESSAGES/statusnet.po
index ff4fd29ef..8f4de8169 100644
--- a/locale/ga/LC_MESSAGES/statusnet.po
+++ b/locale/ga/LC_MESSAGES/statusnet.po
@@ -1,15 +1,18 @@
# Translation of StatusNet to Irish
#
# --
+# 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-18 19:31+0000\n"
+"POT-Creation-Date: 2009-11-19 10:43+0000\n"
"PO-Revision-Date: 2009-11-18 19:31:55+0000\n"
"Language-Team: Irish\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=5; plural=n==1 ? 0 : n==2 ? 1 : n<7 ? 2 : n<11 ? 3 : 4;\n"
"X-Generator: MediaWiki 1.16alpha(r59207); Translate extension (2009-11-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ga\n"
@@ -145,7 +148,7 @@ msgstr "Non se puido actualizar o usuario."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
-#: actions/designadminpanel.php:125 actions/newnotice.php:94
+#: actions/designadminpanel.php:122 actions/newnotice.php:94
#: lib/designsettings.php:283
#, php-format
msgid ""
@@ -231,7 +234,7 @@ msgstr "Tódalas mensaxes directas enviadas a %s"
#: 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:184 actions/apigroupismember.php:114
+#: 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
@@ -302,82 +305,66 @@ msgstr "Non se pudo recuperar a liña de tempo publica."
msgid "Could not find target user."
msgstr "Non se puido atopar ningún estado"
-#: actions/apigroupcreate.php:136 actions/newgroup.php:204
-#, fuzzy
-msgid "Could not create group."
-msgstr "Non se puido crear o favorito."
-
-#: actions/apigroupcreate.php:147 actions/editgroup.php:259
-#: actions/newgroup.php:210
-#, fuzzy
-msgid "Could not create aliases."
-msgstr "Non se puido crear o favorito."
-
-#: actions/apigroupcreate.php:166 actions/newgroup.php:224
-#, fuzzy
-msgid "Could not set group membership."
-msgstr "Non se pode gardar a subscrición."
-
-#: actions/apigroupcreate.php:212 actions/editgroup.php:182
+#: actions/apigroupcreate.php:164 actions/editgroup.php:182
#: actions/newgroup.php:126 actions/profilesettings.php:208
#: actions/register.php:205
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr "O alcume debe ter só letras minúsculas e números, e sen espazos."
-#: actions/apigroupcreate.php:221 actions/editgroup.php:186
+#: 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 "O alcume xa está sendo empregado por outro usuario. Tenta con outro."
-#: actions/apigroupcreate.php:228 actions/editgroup.php:189
+#: 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 "Non é un alcume válido."
-#: actions/apigroupcreate.php:244 actions/editgroup.php:195
+#: 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 "A páxina persoal semella que non é unha URL válida."
-#: actions/apigroupcreate.php:253 actions/editgroup.php:198
+#: 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 "O nome completo é demasiado longo (max 255 car)."
-#: actions/apigroupcreate.php:261
+#: actions/apigroupcreate.php:213
#, php-format
msgid "Description is too long (max %d chars)."
msgstr "O teu Bio é demasiado longo (max 140 car.)."
-#: actions/apigroupcreate.php:272 actions/editgroup.php:204
+#: 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 "A localización é demasiado longa (max 255 car.)."
-#: actions/apigroupcreate.php:291 actions/editgroup.php:215
+#: actions/apigroupcreate.php:243 actions/editgroup.php:215
#: actions/newgroup.php:159
#, php-format
msgid "Too many aliases! Maximum %d."
msgstr ""
-#: actions/apigroupcreate.php:312 actions/editgroup.php:224
+#: actions/apigroupcreate.php:264 actions/editgroup.php:224
#: actions/newgroup.php:168
#, fuzzy, php-format
msgid "Invalid alias: \"%s\""
msgstr "Etiqueta inválida: '%s'"
-#: actions/apigroupcreate.php:321 actions/editgroup.php:228
+#: actions/apigroupcreate.php:273 actions/editgroup.php:228
#: actions/newgroup.php:172
#, fuzzy, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr "O alcume xa está sendo empregado por outro usuario. Tenta con outro."
-#: actions/apigroupcreate.php:334 actions/editgroup.php:234
+#: actions/apigroupcreate.php:286 actions/editgroup.php:234
#: actions/newgroup.php:178
msgid "Alias can't be the same as nickname."
msgstr ""
@@ -603,10 +590,10 @@ msgstr ""
msgid "There was a problem with your session token. Try again, please."
msgstr "Houbo un problema co teu token de sesión. Tentao de novo, anda..."
-#: actions/avatarsettings.php:277 actions/emailsettings.php:255
-#: actions/grouplogo.php:319 actions/imsettings.php:220
-#: actions/recoverpassword.php:44 actions/smssettings.php:248
-#: lib/designsettings.php:304
+#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
+#: actions/emailsettings.php:255 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/recoverpassword.php:44
+#: actions/smssettings.php:248 lib/designsettings.php:304
msgid "Unexpected form submission."
msgstr "Envio de formulario non esperada."
@@ -670,7 +657,7 @@ msgstr "Desbloqueo de usuario fallido."
msgid "Unblock"
msgstr "Desbloquear"
-#: actions/blockedfromgroup.php:313
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:80
#, fuzzy
msgid "Unblock this user"
msgstr "Bloquear usuario"
@@ -852,7 +839,7 @@ msgid "Delete this user"
msgstr "Eliminar chío"
#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124
-#: lib/adminpanelaction.php:275 lib/groupnav.php:119
+#: lib/adminpanelaction.php:302 lib/groupnav.php:119
msgid "Design"
msgstr ""
@@ -860,107 +847,182 @@ msgstr ""
msgid "Design settings for this StatusNet site."
msgstr ""
-#: actions/designadminpanel.php:220
+#: actions/designadminpanel.php:278
#, fuzzy
-msgid "Unable to delete design setting."
-msgstr "Non se puideron gardar os teus axustes de Twitter!"
+msgid "Invalid logo URL."
+msgstr "Tamaño inválido."
-#: actions/designadminpanel.php:301
+#: actions/designadminpanel.php:282
#, fuzzy, php-format
msgid "Theme not available: %s"
msgstr "Esta páxina non está dispoñíbel no tipo de medio que aceptas"
-#: actions/designadminpanel.php:406
+#: actions/designadminpanel.php:288
+#, fuzzy, php-format
+msgid "Theme directory not readable: %s"
+msgstr "Esta páxina non está dispoñíbel no tipo de medio que aceptas"
+
+#: actions/designadminpanel.php:292
+#, php-format
+msgid "Avatar directory not writable: %s"
+msgstr ""
+
+#: actions/designadminpanel.php:296
+#, php-format
+msgid "Background directory not writable: %s"
+msgstr ""
+
+#: actions/designadminpanel.php:312
+#, php-format
+msgid "Max length for %s %s is 255 characters."
+msgstr ""
+
+#: actions/designadminpanel.php:412
+#, fuzzy
+msgid "Change logo"
+msgstr "Cambiar contrasinal"
+
+#: actions/designadminpanel.php:417
+#, fuzzy
+msgid "Site logo"
+msgstr "Invitar"
+
+#: actions/designadminpanel.php:424
#, fuzzy
msgid "Change theme"
msgstr "Modificado"
-#: actions/designadminpanel.php:410
-msgid "Theme"
-msgstr ""
+#: actions/designadminpanel.php:441
+#, fuzzy
+msgid "Site theme"
+msgstr "Novo chío"
-#: actions/designadminpanel.php:411
+#: actions/designadminpanel.php:442
msgid "Theme for the site."
msgstr ""
-#: actions/designadminpanel.php:420 lib/designsettings.php:101
+#: actions/designadminpanel.php:447
+msgid "Theme server"
+msgstr ""
+
+#: actions/designadminpanel.php:451
+msgid "Theme path"
+msgstr ""
+
+#: actions/designadminpanel.php:455
+msgid "Theme directory"
+msgstr ""
+
+#: actions/designadminpanel.php:462
+#, fuzzy
+msgid "Avatar Settings"
+msgstr "Configuracións de Twitter"
+
+#: actions/designadminpanel.php:467
+#, fuzzy
+msgid "Avatar server"
+msgstr "Configuracións de Twitter"
+
+#: actions/designadminpanel.php:471
+#, fuzzy
+msgid "Avatar path"
+msgstr "Avatar actualizado."
+
+#: actions/designadminpanel.php:475
+#, fuzzy
+msgid "Avatar directory"
+msgstr "Avatar actualizado."
+
+#: actions/designadminpanel.php:486 lib/designsettings.php:101
msgid "Change background image"
msgstr ""
-#: actions/designadminpanel.php:424 actions/designadminpanel.php:498
+#: actions/designadminpanel.php:491 actions/designadminpanel.php:578
#: lib/designsettings.php:178
msgid "Background"
msgstr ""
-#: actions/designadminpanel.php:429
+#: actions/designadminpanel.php:496
#, fuzzy, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
"$s."
msgstr "Podes actualizar a túa información do perfil persoal aquí"
-#: actions/designadminpanel.php:459 lib/designsettings.php:139
+#: actions/designadminpanel.php:526 lib/designsettings.php:139
msgid "On"
msgstr ""
-#: actions/designadminpanel.php:475 lib/designsettings.php:155
+#: actions/designadminpanel.php:542 lib/designsettings.php:155
msgid "Off"
msgstr ""
-#: actions/designadminpanel.php:476 lib/designsettings.php:156
+#: actions/designadminpanel.php:543 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr ""
-#: actions/designadminpanel.php:481 lib/designsettings.php:161
+#: actions/designadminpanel.php:548 lib/designsettings.php:161
msgid "Tile background image"
msgstr ""
-#: actions/designadminpanel.php:490 lib/designsettings.php:170
+#: actions/designadminpanel.php:554
+msgid "Background server"
+msgstr ""
+
+#: actions/designadminpanel.php:558
+msgid "Background path"
+msgstr ""
+
+#: actions/designadminpanel.php:562
+msgid "Background directory"
+msgstr ""
+
+#: actions/designadminpanel.php:569 lib/designsettings.php:170
#, fuzzy
msgid "Change colours"
msgstr "Cambiar contrasinal"
-#: actions/designadminpanel.php:511 lib/designsettings.php:191
+#: actions/designadminpanel.php:591 lib/designsettings.php:191
#, fuzzy
msgid "Content"
msgstr "Conectar"
-#: actions/designadminpanel.php:524 lib/designsettings.php:204
+#: actions/designadminpanel.php:604 lib/designsettings.php:204
#, fuzzy
msgid "Sidebar"
msgstr "Buscar"
-#: actions/designadminpanel.php:537 lib/designsettings.php:217
+#: actions/designadminpanel.php:617 lib/designsettings.php:217
msgid "Text"
msgstr "Texto"
-#: actions/designadminpanel.php:550 lib/designsettings.php:230
+#: actions/designadminpanel.php:630 lib/designsettings.php:230
#, fuzzy
msgid "Links"
msgstr "Lista"
-#: actions/designadminpanel.php:611 lib/designsettings.php:247
+#: actions/designadminpanel.php:658 lib/designsettings.php:247
msgid "Use defaults"
msgstr ""
-#: actions/designadminpanel.php:612 lib/designsettings.php:248
+#: actions/designadminpanel.php:659 lib/designsettings.php:248
msgid "Restore default designs"
msgstr ""
-#: actions/designadminpanel.php:618 lib/designsettings.php:254
+#: actions/designadminpanel.php:665 lib/designsettings.php:254
msgid "Reset back to default"
msgstr ""
-#: actions/designadminpanel.php:620 actions/emailsettings.php:195
+#: actions/designadminpanel.php:667 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/profilesettings.php:167 actions/siteadminpanel.php:371
+#: actions/profilesettings.php:167 actions/siteadminpanel.php:414
#: actions/smssettings.php:181 actions/subscriptions.php:203
#: actions/tagother.php:154 actions/useradminpanel.php:226
#: lib/designsettings.php:256 lib/groupeditform.php:202
msgid "Save"
msgstr "Gardar"
-#: actions/designadminpanel.php:621 lib/designsettings.php:257
+#: actions/designadminpanel.php:668 lib/designsettings.php:257
msgid "Save design"
msgstr ""
@@ -1006,6 +1068,11 @@ msgstr "O teu Bio é demasiado longo (max 140 car.)."
msgid "Could not update group."
msgstr "Non se puido actualizar o usuario."
+#: actions/editgroup.php:259 classes/User_group.php:390
+#, fuzzy
+msgid "Could not create aliases."
+msgstr "Non se puido crear o favorito."
+
#: actions/editgroup.php:269
#, fuzzy
msgid "Options saved."
@@ -1125,7 +1192,7 @@ msgstr "Non se inseriu unha dirección de correo"
msgid "Cannot normalize that email address"
msgstr "Esa dirección de correo non se pode normalizar "
-#: actions/emailsettings.php:330 actions/siteadminpanel.php:156
+#: actions/emailsettings.php:330 actions/siteadminpanel.php:158
msgid "Not a valid email address"
msgstr "Non é unha dirección de correo válida"
@@ -1860,10 +1927,10 @@ msgstr "Contido do chío inválido"
msgid "Incorrect username or password."
msgstr "Usuario ou contrasinal incorrectos."
-#: actions/login.php:149 actions/recoverpassword.php:375
-#: actions/register.php:248
-msgid "Error setting user."
-msgstr "Acounteceu un erro configurando o usuario."
+#: actions/login.php:149
+#, 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:457
#: lib/logingroupnav.php:79
@@ -2297,7 +2364,7 @@ msgstr ""
"Etiquetas para o teu usuario (letras, números, -, ., e _), separados por "
"coma ou espazo"
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:275
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:309
msgid "Language"
msgstr "Linguaxe"
@@ -2325,7 +2392,7 @@ msgstr ""
msgid "Bio is too long (max %d chars)."
msgstr "O teu Bio é demasiado longo (max 140 car.)."
-#: actions/profilesettings.php:228 actions/siteadminpanel.php:163
+#: actions/profilesettings.php:228 actions/siteadminpanel.php:165
msgid "Timezone not selected."
msgstr "Fuso Horario non seleccionado"
@@ -2577,6 +2644,10 @@ msgstr "A contrasinal debe ter 6 caracteres ou máis."
msgid "Password and confirmation do not match."
msgstr "A contrasinal e a súa confirmación non coinciden."
+#: actions/recoverpassword.php:375 actions/register.php:248
+msgid "Error setting user."
+msgstr "Acounteceu un erro configurando o usuario."
+
#: actions/recoverpassword.php:382
msgid "New password successfully saved. You are now logged in."
msgstr "A nova contrasinal gardouse correctamente. Xa estas logueado."
@@ -2644,7 +2715,7 @@ msgid "Same as password above. Required."
msgstr "A mesma contrasinal que arriba. Requerido."
#: actions/register.php:437 actions/register.php:441
-#: actions/siteadminpanel.php:253 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:287 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "Correo Electrónico"
@@ -3109,7 +3180,7 @@ msgstr "Non podes enviar mensaxes a este usurio."
msgid "User is already silenced."
msgstr "O usuario bloqueoute."
-#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:272
+#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:299
#, fuzzy
msgid "Site"
msgstr "Invitar"
@@ -3118,122 +3189,236 @@ msgstr "Invitar"
msgid "Basic settings for this StatusNet site."
msgstr ""
-#: actions/siteadminpanel.php:145
+#: actions/siteadminpanel.php:147
msgid "Site name must have non-zero length."
msgstr ""
-#: actions/siteadminpanel.php:153
+#: actions/siteadminpanel.php:155
#, fuzzy
msgid "You must have a valid contact email address"
msgstr "Non é unha dirección de correo válida"
-#: actions/siteadminpanel.php:171
+#: actions/siteadminpanel.php:173
#, php-format
msgid "Unknown language \"%s\""
msgstr ""
-#: actions/siteadminpanel.php:178
+#: actions/siteadminpanel.php:180
msgid "Invalid snapshot report URL."
msgstr ""
-#: actions/siteadminpanel.php:184
+#: actions/siteadminpanel.php:186
msgid "Invalid snapshot run value."
msgstr ""
-#: actions/siteadminpanel.php:190
+#: actions/siteadminpanel.php:192
msgid "Snapshot frequency must be a number."
msgstr ""
-#: actions/siteadminpanel.php:241
+#: actions/siteadminpanel.php:199
+msgid "You must set an SSL sever when enabling SSL."
+msgstr ""
+
+#: actions/siteadminpanel.php:204
+msgid "Invalid SSL server. Max length is 255 characters."
+msgstr ""
+
+#: actions/siteadminpanel.php:210
+msgid "Minimum text limit is 140c."
+msgstr ""
+
+#: actions/siteadminpanel.php:216
+msgid "Dupe limit must 1 or more seconds."
+msgstr ""
+
+#: actions/siteadminpanel.php:224
+#, php-format
+msgid "Locales directory not readable: %s"
+msgstr ""
+
+#: actions/siteadminpanel.php:275
#, fuzzy
msgid "Site name"
msgstr "Novo chío"
-#: actions/siteadminpanel.php:242
+#: actions/siteadminpanel.php:276
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr ""
-#: actions/siteadminpanel.php:245
+#: actions/siteadminpanel.php:279
msgid "Brought by"
msgstr ""
-#: actions/siteadminpanel.php:246
+#: actions/siteadminpanel.php:280
msgid "Text used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:249
+#: actions/siteadminpanel.php:283
msgid "Brought by URL"
msgstr ""
-#: actions/siteadminpanel.php:250
+#: actions/siteadminpanel.php:284
msgid "URL used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:254
+#: actions/siteadminpanel.php:288
#, fuzzy
msgid "contact email address for your site"
msgstr "Nova dirección de email para posterar en %s"
-#: actions/siteadminpanel.php:268
+#: actions/siteadminpanel.php:302
msgid "Default timezone"
msgstr ""
-#: actions/siteadminpanel.php:269
+#: actions/siteadminpanel.php:303
msgid "Default timezone for the site; usually UTC."
msgstr ""
-#: actions/siteadminpanel.php:276
+#: actions/siteadminpanel.php:310
#, fuzzy
msgid "Default site language"
msgstr "Linguaxe preferida"
-#: actions/siteadminpanel.php:282
+#: actions/siteadminpanel.php:316
+msgid "Path to locales"
+msgstr ""
+
+#: actions/siteadminpanel.php:316
+msgid "Directory path to locales"
+msgstr ""
+
+#: actions/siteadminpanel.php:320
+#, fuzzy
+msgid "Server"
+msgstr "Recuperar"
+
+#: actions/siteadminpanel.php:320
+msgid "Site's server hostname."
+msgstr ""
+
+#: actions/siteadminpanel.php:324
+msgid "Path"
+msgstr ""
+
+#: actions/siteadminpanel.php:324
+#, fuzzy
+msgid "Site path"
+msgstr "Novo chío"
+
+#: actions/siteadminpanel.php:328
+msgid "Fancy URLs"
+msgstr ""
+
+#: actions/siteadminpanel.php:330
+msgid "Use fancy (more readable and memorable) URLs?"
+msgstr ""
+
+#: actions/siteadminpanel.php:334
#, fuzzy
msgid "Private"
msgstr "Privacidade"
-#: actions/siteadminpanel.php:284
+#: actions/siteadminpanel.php:336
msgid "Prohibit anonymous users (not logged in) from viewing site?"
msgstr ""
-#: actions/siteadminpanel.php:290
+#: actions/siteadminpanel.php:340
+#, fuzzy
+msgid "Invite only"
+msgstr "Invitar"
+
+#: actions/siteadminpanel.php:342
+msgid "Make registration invitation only."
+msgstr ""
+
+#: actions/siteadminpanel.php:346 actions/useradminpanel.php:171
+#, fuzzy
+msgid "Closed"
+msgstr "Bloquear"
+
+#: actions/siteadminpanel.php:348
+msgid "Disable new registrations."
+msgstr ""
+
+#: actions/siteadminpanel.php:353
msgid "Randomly during Web hit"
msgstr ""
-#: actions/siteadminpanel.php:291
+#: actions/siteadminpanel.php:354
msgid "In a scheduled job"
msgstr ""
-#: actions/siteadminpanel.php:292
+#: actions/siteadminpanel.php:355 actions/siteadminpanel.php:380
#, fuzzy
msgid "Never"
msgstr "Recuperar"
-#: actions/siteadminpanel.php:294
+#: actions/siteadminpanel.php:357
msgid "Data snapshots"
msgstr ""
-#: actions/siteadminpanel.php:295
+#: actions/siteadminpanel.php:358
msgid "When to send statistical data to status.net servers"
msgstr ""
-#: actions/siteadminpanel.php:301
+#: actions/siteadminpanel.php:364
msgid "Frequency"
msgstr ""
-#: actions/siteadminpanel.php:302
+#: actions/siteadminpanel.php:365
msgid "Snapshots will be sent once every N Web hits"
msgstr ""
-#: actions/siteadminpanel.php:309
+#: actions/siteadminpanel.php:372
msgid "Report URL"
msgstr ""
-#: actions/siteadminpanel.php:310
+#: actions/siteadminpanel.php:373
msgid "Snapshots will be sent to this URL"
msgstr ""
-#: actions/siteadminpanel.php:371 actions/useradminpanel.php:226
+#: actions/siteadminpanel.php:381
+#, fuzzy
+msgid "Sometimes"
+msgstr "Chíos"
+
+#: actions/siteadminpanel.php:382
+msgid "Always"
+msgstr ""
+
+#: actions/siteadminpanel.php:384
+msgid "Use SSL"
+msgstr ""
+
+#: actions/siteadminpanel.php:385
+msgid "When to use SSL"
+msgstr ""
+
+#: actions/siteadminpanel.php:391
+msgid "SSL Server"
+msgstr ""
+
+#: actions/siteadminpanel.php:392
+msgid "Server to direct SSL requests to"
+msgstr ""
+
+#: actions/siteadminpanel.php:396
+msgid "Text limit"
+msgstr ""
+
+#: actions/siteadminpanel.php:396
+msgid "Maximum number of characters for notices."
+msgstr ""
+
+#: actions/siteadminpanel.php:400
+msgid "Dupe limit"
+msgstr ""
+
+#: actions/siteadminpanel.php:400
+msgid "How long users must wait (in seconds) to post the same thing again."
+msgstr ""
+
+#: actions/siteadminpanel.php:414 actions/useradminpanel.php:226
#, fuzzy
msgid "Save site settings"
msgstr "Configuracións de Twitter"
@@ -3554,11 +3739,6 @@ msgstr "Usuario"
msgid "User settings for this StatusNet site."
msgstr ""
-#: actions/useradminpanel.php:171
-#, fuzzy
-msgid "Closed"
-msgstr "Bloquear"
-
#: actions/useradminpanel.php:173
msgid "Is registration on this site prohibited?"
msgstr ""
@@ -3790,6 +3970,16 @@ msgstr "Aconteceu un erro ó gardar o chío."
msgid "DB error inserting reply: %s"
msgstr "Erro ó inserir a contestación na BD: %s"
+#: classes/User_group.php:380
+#, fuzzy
+msgid "Could not create group."
+msgstr "Non se puido crear o favorito."
+
+#: classes/User_group.php:409
+#, fuzzy
+msgid "Could not set group membership."
+msgstr "Non se pode gardar a subscrición."
+
#: classes/User.php:347
#, fuzzy, php-format
msgid "Welcome to %1$s, @%2$s!"
@@ -4043,12 +4233,17 @@ msgstr "Comando non implementado."
msgid "saveSettings() not implemented."
msgstr "Comando non implementado."
-#: lib/adminpanelaction.php:273
+#: lib/adminpanelaction.php:247
+#, fuzzy
+msgid "Unable to delete design setting."
+msgstr "Non se puideron gardar os teus axustes de Twitter!"
+
+#: lib/adminpanelaction.php:300
#, fuzzy
msgid "Basic site configuration"
msgstr "Confirmar correo electrónico"
-#: lib/adminpanelaction.php:276
+#: lib/adminpanelaction.php:303
#, fuzzy
msgid "Design configuration"
msgstr "Confirmación de SMS"
@@ -4326,20 +4521,20 @@ msgstr ""
"tracks - non implementado por agora.\n"
"tracking - non implementado por agora.\n"
-#: lib/common.php:203
+#: lib/common.php:199
#, fuzzy
msgid "No configuration file found. "
msgstr "Sen código de confirmación."
-#: lib/common.php:204
+#: lib/common.php:200
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:205
+#: lib/common.php:201
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:206
+#: lib/common.php:202
msgid "Go to the installer."
msgstr ""
@@ -5184,11 +5379,6 @@ msgstr "No"
msgid "Top posters"
msgstr ""
-#: lib/unblockform.php:80
-#, fuzzy
-msgid "Unlock this user"
-msgstr "Bloquear usuario"
-
#: lib/unsandboxform.php:69
msgid "Unsandbox"
msgstr ""
@@ -5245,47 +5435,47 @@ msgstr "Non podes enviar mensaxes a este usurio."
msgid "Message"
msgstr "Nova mensaxe"
-#: lib/util.php:821
+#: lib/util.php:826
msgid "a few seconds ago"
msgstr "fai uns segundos"
-#: lib/util.php:823
+#: lib/util.php:828
msgid "about a minute ago"
msgstr "fai un minuto"
-#: lib/util.php:825
+#: lib/util.php:830
#, php-format
msgid "about %d minutes ago"
msgstr "fai %d minutos"
-#: lib/util.php:827
+#: lib/util.php:832
msgid "about an hour ago"
msgstr "fai unha hora"
-#: lib/util.php:829
+#: lib/util.php:834
#, php-format
msgid "about %d hours ago"
msgstr "fai %d horas"
-#: lib/util.php:831
+#: lib/util.php:836
msgid "about a day ago"
msgstr "fai un día"
-#: lib/util.php:833
+#: lib/util.php:838
#, php-format
msgid "about %d days ago"
msgstr "fai %d días"
-#: lib/util.php:835
+#: lib/util.php:840
msgid "about a month ago"
msgstr "fai un mes"
-#: lib/util.php:837
+#: lib/util.php:842
#, php-format
msgid "about %d months ago"
msgstr "fai %d meses"
-#: lib/util.php:839
+#: lib/util.php:844
msgid "about a year ago"
msgstr "fai un ano"
@@ -5316,5 +5506,9 @@ msgid "Sorry, no incoming email allowed."
msgstr "Aivá, non se permiten correos entrantes."
#, fuzzy
+#~ msgid "Unlock this user"
+#~ msgstr "Bloquear usuario"
+
+#, fuzzy
#~ msgid "These people are subscribed to you: "
#~ msgstr "Suscrito a %s"
diff --git a/locale/he/LC_MESSAGES/statusnet.po b/locale/he/LC_MESSAGES/statusnet.po
index e6adf336f..25efb2853 100644
--- a/locale/he/LC_MESSAGES/statusnet.po
+++ b/locale/he/LC_MESSAGES/statusnet.po
@@ -1,15 +1,18 @@
# Translation of StatusNet to Hebrew
#
# --
+# 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-18 19:31+0000\n"
+"POT-Creation-Date: 2009-11-19 10:43+0000\n"
"PO-Revision-Date: 2009-11-18 19:31:58+0000\n"
"Language-Team: Hebrew\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: MediaWiki 1.16alpha(r59207); Translate extension (2009-11-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: he\n"
@@ -145,7 +148,7 @@ msgstr "עידכון המשתמש נכשל."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
-#: actions/designadminpanel.php:125 actions/newnotice.php:94
+#: actions/designadminpanel.php:122 actions/newnotice.php:94
#: lib/designsettings.php:283
#, php-format
msgid ""
@@ -228,7 +231,7 @@ msgstr ""
#: 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:184 actions/apigroupismember.php:114
+#: 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
@@ -295,82 +298,66 @@ msgstr "עידכון המשתמש נכשל."
msgid "Could not find target user."
msgstr "עידכון המשתמש נכשל."
-#: actions/apigroupcreate.php:136 actions/newgroup.php:204
-#, fuzzy
-msgid "Could not create group."
-msgstr "שמירת מידע התמונה נכשל"
-
-#: actions/apigroupcreate.php:147 actions/editgroup.php:259
-#: actions/newgroup.php:210
-#, fuzzy
-msgid "Could not create aliases."
-msgstr "שמירת מידע התמונה נכשל"
-
-#: actions/apigroupcreate.php:166 actions/newgroup.php:224
-#, fuzzy
-msgid "Could not set group membership."
-msgstr "יצירת המנוי נכשלה."
-
-#: actions/apigroupcreate.php:212 actions/editgroup.php:182
+#: actions/apigroupcreate.php:164 actions/editgroup.php:182
#: actions/newgroup.php:126 actions/profilesettings.php:208
#: actions/register.php:205
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr "כינוי יכול להכיל רק אותיות אנגליות קטנות ומספרים, וללא רווחים."
-#: actions/apigroupcreate.php:221 actions/editgroup.php:186
+#: 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 "כינוי זה כבר תפוס. נסה כינוי אחר."
-#: actions/apigroupcreate.php:228 actions/editgroup.php:189
+#: 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 "שם משתמש לא חוקי."
-#: actions/apigroupcreate.php:244 actions/editgroup.php:195
+#: 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 "לאתר הבית יש כתובת לא חוקית."
-#: actions/apigroupcreate.php:253 actions/editgroup.php:198
+#: 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 "השם המלא ארוך מידי (מותרות 255 אותיות בלבד)"
-#: actions/apigroupcreate.php:261
+#: actions/apigroupcreate.php:213
#, fuzzy, php-format
msgid "Description is too long (max %d chars)."
msgstr "הביוגרפיה ארוכה מידי (לכל היותר 140 אותיות)"
-#: actions/apigroupcreate.php:272 actions/editgroup.php:204
+#: 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 "שם המיקום ארוך מידי (מותר עד 255 אותיות)."
-#: actions/apigroupcreate.php:291 actions/editgroup.php:215
+#: actions/apigroupcreate.php:243 actions/editgroup.php:215
#: actions/newgroup.php:159
#, php-format
msgid "Too many aliases! Maximum %d."
msgstr ""
-#: actions/apigroupcreate.php:312 actions/editgroup.php:224
+#: actions/apigroupcreate.php:264 actions/editgroup.php:224
#: actions/newgroup.php:168
#, fuzzy, php-format
msgid "Invalid alias: \"%s\""
msgstr "כתובת אתר הבית '%s' אינה חוקית"
-#: actions/apigroupcreate.php:321 actions/editgroup.php:228
+#: actions/apigroupcreate.php:273 actions/editgroup.php:228
#: actions/newgroup.php:172
#, fuzzy, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr "כינוי זה כבר תפוס. נסה כינוי אחר."
-#: actions/apigroupcreate.php:334 actions/editgroup.php:234
+#: actions/apigroupcreate.php:286 actions/editgroup.php:234
#: actions/newgroup.php:178
msgid "Alias can't be the same as nickname."
msgstr ""
@@ -598,10 +585,10 @@ msgstr ""
msgid "There was a problem with your session token. Try again, please."
msgstr ""
-#: actions/avatarsettings.php:277 actions/emailsettings.php:255
-#: actions/grouplogo.php:319 actions/imsettings.php:220
-#: actions/recoverpassword.php:44 actions/smssettings.php:248
-#: lib/designsettings.php:304
+#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
+#: actions/emailsettings.php:255 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/recoverpassword.php:44
+#: actions/smssettings.php:248 lib/designsettings.php:304
msgid "Unexpected form submission."
msgstr "הגשת טופס לא צפויה."
@@ -665,7 +652,7 @@ msgstr "אין משתמש כזה."
msgid "Unblock"
msgstr ""
-#: actions/blockedfromgroup.php:313
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:80
#, fuzzy
msgid "Unblock this user"
msgstr "אין משתמש כזה."
@@ -839,7 +826,7 @@ msgid "Delete this user"
msgstr "אין משתמש כזה."
#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124
-#: lib/adminpanelaction.php:275 lib/groupnav.php:119
+#: lib/adminpanelaction.php:302 lib/groupnav.php:119
msgid "Design"
msgstr ""
@@ -847,106 +834,182 @@ msgstr ""
msgid "Design settings for this StatusNet site."
msgstr ""
-#: actions/designadminpanel.php:220
-msgid "Unable to delete design setting."
-msgstr ""
+#: actions/designadminpanel.php:278
+#, fuzzy
+msgid "Invalid logo URL."
+msgstr "גודל לא חוקי."
-#: actions/designadminpanel.php:301
+#: actions/designadminpanel.php:282
#, fuzzy, php-format
msgid "Theme not available: %s"
msgstr "עמוד זה אינו זמין בסוג מדיה שאתה יכול לקבל"
-#: actions/designadminpanel.php:406
+#: actions/designadminpanel.php:288
+#, fuzzy, php-format
+msgid "Theme directory not readable: %s"
+msgstr "עמוד זה אינו זמין בסוג מדיה שאתה יכול לקבל"
+
+#: actions/designadminpanel.php:292
+#, php-format
+msgid "Avatar directory not writable: %s"
+msgstr ""
+
+#: actions/designadminpanel.php:296
+#, php-format
+msgid "Background directory not writable: %s"
+msgstr ""
+
+#: actions/designadminpanel.php:312
+#, php-format
+msgid "Max length for %s %s is 255 characters."
+msgstr ""
+
+#: actions/designadminpanel.php:412
+#, fuzzy
+msgid "Change logo"
+msgstr "שנה סיסמה"
+
+#: actions/designadminpanel.php:417
+#, fuzzy
+msgid "Site logo"
+msgstr "הודעה חדשה"
+
+#: actions/designadminpanel.php:424
#, fuzzy
msgid "Change theme"
msgstr "שנה"
-#: actions/designadminpanel.php:410
-msgid "Theme"
-msgstr ""
+#: actions/designadminpanel.php:441
+#, fuzzy
+msgid "Site theme"
+msgstr "הודעה חדשה"
-#: actions/designadminpanel.php:411
+#: actions/designadminpanel.php:442
msgid "Theme for the site."
msgstr ""
-#: actions/designadminpanel.php:420 lib/designsettings.php:101
+#: actions/designadminpanel.php:447
+msgid "Theme server"
+msgstr ""
+
+#: actions/designadminpanel.php:451
+msgid "Theme path"
+msgstr ""
+
+#: actions/designadminpanel.php:455
+msgid "Theme directory"
+msgstr ""
+
+#: actions/designadminpanel.php:462
+#, fuzzy
+msgid "Avatar Settings"
+msgstr "הגדרות"
+
+#: actions/designadminpanel.php:467
+#, fuzzy
+msgid "Avatar server"
+msgstr "הגדרות"
+
+#: actions/designadminpanel.php:471
+#, fuzzy
+msgid "Avatar path"
+msgstr "התמונה עודכנה."
+
+#: actions/designadminpanel.php:475
+#, fuzzy
+msgid "Avatar directory"
+msgstr "התמונה עודכנה."
+
+#: actions/designadminpanel.php:486 lib/designsettings.php:101
msgid "Change background image"
msgstr ""
-#: actions/designadminpanel.php:424 actions/designadminpanel.php:498
+#: actions/designadminpanel.php:491 actions/designadminpanel.php:578
#: lib/designsettings.php:178
msgid "Background"
msgstr ""
-#: actions/designadminpanel.php:429
+#: actions/designadminpanel.php:496
#, fuzzy, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
"$s."
msgstr "זה ארוך מידי. אורך מירבי להודעה הוא 140 אותיות."
-#: actions/designadminpanel.php:459 lib/designsettings.php:139
+#: actions/designadminpanel.php:526 lib/designsettings.php:139
msgid "On"
msgstr ""
-#: actions/designadminpanel.php:475 lib/designsettings.php:155
+#: actions/designadminpanel.php:542 lib/designsettings.php:155
msgid "Off"
msgstr ""
-#: actions/designadminpanel.php:476 lib/designsettings.php:156
+#: actions/designadminpanel.php:543 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr ""
-#: actions/designadminpanel.php:481 lib/designsettings.php:161
+#: actions/designadminpanel.php:548 lib/designsettings.php:161
msgid "Tile background image"
msgstr ""
-#: actions/designadminpanel.php:490 lib/designsettings.php:170
+#: actions/designadminpanel.php:554
+msgid "Background server"
+msgstr ""
+
+#: actions/designadminpanel.php:558
+msgid "Background path"
+msgstr ""
+
+#: actions/designadminpanel.php:562
+msgid "Background directory"
+msgstr ""
+
+#: actions/designadminpanel.php:569 lib/designsettings.php:170
#, fuzzy
msgid "Change colours"
msgstr "שנה סיסמה"
-#: actions/designadminpanel.php:511 lib/designsettings.php:191
+#: actions/designadminpanel.php:591 lib/designsettings.php:191
#, fuzzy
msgid "Content"
msgstr "התחבר"
-#: actions/designadminpanel.php:524 lib/designsettings.php:204
+#: actions/designadminpanel.php:604 lib/designsettings.php:204
#, fuzzy
msgid "Sidebar"
msgstr "חיפוש"
-#: actions/designadminpanel.php:537 lib/designsettings.php:217
+#: actions/designadminpanel.php:617 lib/designsettings.php:217
msgid "Text"
msgstr "טקסט"
-#: actions/designadminpanel.php:550 lib/designsettings.php:230
+#: actions/designadminpanel.php:630 lib/designsettings.php:230
#, fuzzy
msgid "Links"
msgstr "היכנס"
-#: actions/designadminpanel.php:611 lib/designsettings.php:247
+#: actions/designadminpanel.php:658 lib/designsettings.php:247
msgid "Use defaults"
msgstr ""
-#: actions/designadminpanel.php:612 lib/designsettings.php:248
+#: actions/designadminpanel.php:659 lib/designsettings.php:248
msgid "Restore default designs"
msgstr ""
-#: actions/designadminpanel.php:618 lib/designsettings.php:254
+#: actions/designadminpanel.php:665 lib/designsettings.php:254
msgid "Reset back to default"
msgstr ""
-#: actions/designadminpanel.php:620 actions/emailsettings.php:195
+#: actions/designadminpanel.php:667 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/profilesettings.php:167 actions/siteadminpanel.php:371
+#: actions/profilesettings.php:167 actions/siteadminpanel.php:414
#: actions/smssettings.php:181 actions/subscriptions.php:203
#: actions/tagother.php:154 actions/useradminpanel.php:226
#: lib/designsettings.php:256 lib/groupeditform.php:202
msgid "Save"
msgstr "שמור"
-#: actions/designadminpanel.php:621 lib/designsettings.php:257
+#: actions/designadminpanel.php:668 lib/designsettings.php:257
msgid "Save design"
msgstr ""
@@ -991,6 +1054,11 @@ msgstr "הביוגרפיה ארוכה מידי (לכל היותר 140 אותיו
msgid "Could not update group."
msgstr "עידכון המשתמש נכשל."
+#: actions/editgroup.php:259 classes/User_group.php:390
+#, fuzzy
+msgid "Could not create aliases."
+msgstr "שמירת מידע התמונה נכשל"
+
#: actions/editgroup.php:269
#, fuzzy
msgid "Options saved."
@@ -1106,7 +1174,7 @@ msgstr ""
msgid "Cannot normalize that email address"
msgstr ""
-#: actions/emailsettings.php:330 actions/siteadminpanel.php:156
+#: actions/emailsettings.php:330 actions/siteadminpanel.php:158
msgid "Not a valid email address"
msgstr ""
@@ -1805,10 +1873,10 @@ msgstr "תוכן ההודעה לא חוקי"
msgid "Incorrect username or password."
msgstr "שם משתמש או סיסמה לא נכונים."
-#: actions/login.php:149 actions/recoverpassword.php:375
-#: actions/register.php:248
-msgid "Error setting user."
-msgstr "שגיאה ביצירת שם המשתמש."
+#: actions/login.php:149
+#, fuzzy
+msgid "Error setting user. You are probably not authorized."
+msgstr "לא מורשה."
#: actions/login.php:204 actions/login.php:257 lib/action.php:457
#: lib/logingroupnav.php:79
@@ -2232,7 +2300,7 @@ msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:275
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:309
msgid "Language"
msgstr "שפה"
@@ -2258,7 +2326,7 @@ msgstr ""
msgid "Bio is too long (max %d chars)."
msgstr "הביוגרפיה ארוכה מידי (לכל היותר 140 אותיות)"
-#: actions/profilesettings.php:228 actions/siteadminpanel.php:163
+#: actions/profilesettings.php:228 actions/siteadminpanel.php:165
msgid "Timezone not selected."
msgstr ""
@@ -2501,6 +2569,10 @@ msgstr "הסיסמה חייבת להיות בת לפחות 6 אותיות."
msgid "Password and confirmation do not match."
msgstr "הסיסמה ואישורה אינן תואמות."
+#: actions/recoverpassword.php:375 actions/register.php:248
+msgid "Error setting user."
+msgstr "שגיאה ביצירת שם המשתמש."
+
#: actions/recoverpassword.php:382
msgid "New password successfully saved. You are now logged in."
msgstr "הסיסמה החדשה נשמרה בהצלחה. אתה מחובר למערכת."
@@ -2562,7 +2634,7 @@ msgid "Same as password above. Required."
msgstr ""
#: actions/register.php:437 actions/register.php:441
-#: actions/siteadminpanel.php:253 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:287 lib/accountsettingsaction.php:120
msgid "Email"
msgstr ""
@@ -2987,7 +3059,7 @@ msgstr ""
msgid "User is already silenced."
msgstr "למשתמש אין פרופיל."
-#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:272
+#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:299
msgid "Site"
msgstr ""
@@ -2995,119 +3067,232 @@ msgstr ""
msgid "Basic settings for this StatusNet site."
msgstr ""
-#: actions/siteadminpanel.php:145
+#: actions/siteadminpanel.php:147
msgid "Site name must have non-zero length."
msgstr ""
-#: actions/siteadminpanel.php:153
+#: actions/siteadminpanel.php:155
msgid "You must have a valid contact email address"
msgstr ""
-#: actions/siteadminpanel.php:171
+#: actions/siteadminpanel.php:173
#, php-format
msgid "Unknown language \"%s\""
msgstr ""
-#: actions/siteadminpanel.php:178
+#: actions/siteadminpanel.php:180
msgid "Invalid snapshot report URL."
msgstr ""
-#: actions/siteadminpanel.php:184
+#: actions/siteadminpanel.php:186
msgid "Invalid snapshot run value."
msgstr ""
-#: actions/siteadminpanel.php:190
+#: actions/siteadminpanel.php:192
msgid "Snapshot frequency must be a number."
msgstr ""
-#: actions/siteadminpanel.php:241
+#: actions/siteadminpanel.php:199
+msgid "You must set an SSL sever when enabling SSL."
+msgstr ""
+
+#: actions/siteadminpanel.php:204
+msgid "Invalid SSL server. Max length is 255 characters."
+msgstr ""
+
+#: actions/siteadminpanel.php:210
+msgid "Minimum text limit is 140c."
+msgstr ""
+
+#: actions/siteadminpanel.php:216
+msgid "Dupe limit must 1 or more seconds."
+msgstr ""
+
+#: actions/siteadminpanel.php:224
+#, php-format
+msgid "Locales directory not readable: %s"
+msgstr ""
+
+#: actions/siteadminpanel.php:275
#, fuzzy
msgid "Site name"
msgstr "הודעה חדשה"
-#: actions/siteadminpanel.php:242
+#: actions/siteadminpanel.php:276
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr ""
-#: actions/siteadminpanel.php:245
+#: actions/siteadminpanel.php:279
msgid "Brought by"
msgstr ""
-#: actions/siteadminpanel.php:246
+#: actions/siteadminpanel.php:280
msgid "Text used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:249
+#: actions/siteadminpanel.php:283
msgid "Brought by URL"
msgstr ""
-#: actions/siteadminpanel.php:250
+#: actions/siteadminpanel.php:284
msgid "URL used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:254
+#: actions/siteadminpanel.php:288
msgid "contact email address for your site"
msgstr ""
-#: actions/siteadminpanel.php:268
+#: actions/siteadminpanel.php:302
msgid "Default timezone"
msgstr ""
-#: actions/siteadminpanel.php:269
+#: actions/siteadminpanel.php:303
msgid "Default timezone for the site; usually UTC."
msgstr ""
-#: actions/siteadminpanel.php:276
+#: actions/siteadminpanel.php:310
msgid "Default site language"
msgstr ""
-#: actions/siteadminpanel.php:282
+#: actions/siteadminpanel.php:316
+msgid "Path to locales"
+msgstr ""
+
+#: actions/siteadminpanel.php:316
+msgid "Directory path to locales"
+msgstr ""
+
+#: actions/siteadminpanel.php:320
+#, fuzzy
+msgid "Server"
+msgstr "שיחזור"
+
+#: actions/siteadminpanel.php:320
+msgid "Site's server hostname."
+msgstr ""
+
+#: actions/siteadminpanel.php:324
+msgid "Path"
+msgstr ""
+
+#: actions/siteadminpanel.php:324
+#, fuzzy
+msgid "Site path"
+msgstr "הודעה חדשה"
+
+#: actions/siteadminpanel.php:328
+msgid "Fancy URLs"
+msgstr ""
+
+#: actions/siteadminpanel.php:330
+msgid "Use fancy (more readable and memorable) URLs?"
+msgstr ""
+
+#: actions/siteadminpanel.php:334
#, fuzzy
msgid "Private"
msgstr "פרטיות"
-#: actions/siteadminpanel.php:284
+#: actions/siteadminpanel.php:336
msgid "Prohibit anonymous users (not logged in) from viewing site?"
msgstr ""
-#: actions/siteadminpanel.php:290
+#: actions/siteadminpanel.php:340
+msgid "Invite only"
+msgstr ""
+
+#: actions/siteadminpanel.php:342
+msgid "Make registration invitation only."
+msgstr ""
+
+#: actions/siteadminpanel.php:346 actions/useradminpanel.php:171
+#, fuzzy
+msgid "Closed"
+msgstr "אין משתמש כזה."
+
+#: actions/siteadminpanel.php:348
+msgid "Disable new registrations."
+msgstr ""
+
+#: actions/siteadminpanel.php:353
msgid "Randomly during Web hit"
msgstr ""
-#: actions/siteadminpanel.php:291
+#: actions/siteadminpanel.php:354
msgid "In a scheduled job"
msgstr ""
-#: actions/siteadminpanel.php:292
+#: actions/siteadminpanel.php:355 actions/siteadminpanel.php:380
#, fuzzy
msgid "Never"
msgstr "שיחזור"
-#: actions/siteadminpanel.php:294
+#: actions/siteadminpanel.php:357
msgid "Data snapshots"
msgstr ""
-#: actions/siteadminpanel.php:295
+#: actions/siteadminpanel.php:358
msgid "When to send statistical data to status.net servers"
msgstr ""
-#: actions/siteadminpanel.php:301
+#: actions/siteadminpanel.php:364
msgid "Frequency"
msgstr ""
-#: actions/siteadminpanel.php:302
+#: actions/siteadminpanel.php:365
msgid "Snapshots will be sent once every N Web hits"
msgstr ""
-#: actions/siteadminpanel.php:309
+#: actions/siteadminpanel.php:372
msgid "Report URL"
msgstr ""
-#: actions/siteadminpanel.php:310
+#: actions/siteadminpanel.php:373
msgid "Snapshots will be sent to this URL"
msgstr ""
-#: actions/siteadminpanel.php:371 actions/useradminpanel.php:226
+#: actions/siteadminpanel.php:381
+#, fuzzy
+msgid "Sometimes"
+msgstr "הודעות"
+
+#: actions/siteadminpanel.php:382
+msgid "Always"
+msgstr ""
+
+#: actions/siteadminpanel.php:384
+msgid "Use SSL"
+msgstr ""
+
+#: actions/siteadminpanel.php:385
+msgid "When to use SSL"
+msgstr ""
+
+#: actions/siteadminpanel.php:391
+msgid "SSL Server"
+msgstr ""
+
+#: actions/siteadminpanel.php:392
+msgid "Server to direct SSL requests to"
+msgstr ""
+
+#: actions/siteadminpanel.php:396
+msgid "Text limit"
+msgstr ""
+
+#: actions/siteadminpanel.php:396
+msgid "Maximum number of characters for notices."
+msgstr ""
+
+#: actions/siteadminpanel.php:400
+msgid "Dupe limit"
+msgstr ""
+
+#: actions/siteadminpanel.php:400
+msgid "How long users must wait (in seconds) to post the same thing again."
+msgstr ""
+
+#: actions/siteadminpanel.php:414 actions/useradminpanel.php:226
#, fuzzy
msgid "Save site settings"
msgstr "הגדרות"
@@ -3426,11 +3611,6 @@ msgstr "מתשמש"
msgid "User settings for this StatusNet site."
msgstr ""
-#: actions/useradminpanel.php:171
-#, fuzzy
-msgid "Closed"
-msgstr "אין משתמש כזה."
-
#: actions/useradminpanel.php:173
msgid "Is registration on this site prohibited?"
msgstr ""
@@ -3653,6 +3833,16 @@ msgstr "בעיה בשמירת ההודעה."
msgid "DB error inserting reply: %s"
msgstr "שגיאת מסד נתונים בהכנסת התגובה: %s"
+#: classes/User_group.php:380
+#, fuzzy
+msgid "Could not create group."
+msgstr "שמירת מידע התמונה נכשל"
+
+#: classes/User_group.php:409
+#, fuzzy
+msgid "Could not set group membership."
+msgstr "יצירת המנוי נכשלה."
+
#: classes/User.php:347
#, php-format
msgid "Welcome to %1$s, @%2$s!"
@@ -3898,12 +4088,16 @@ msgstr ""
msgid "saveSettings() not implemented."
msgstr ""
-#: lib/adminpanelaction.php:273
+#: lib/adminpanelaction.php:247
+msgid "Unable to delete design setting."
+msgstr ""
+
+#: lib/adminpanelaction.php:300
#, fuzzy
msgid "Basic site configuration"
msgstr "הרשמות"
-#: lib/adminpanelaction.php:276
+#: lib/adminpanelaction.php:303
msgid "Design configuration"
msgstr ""
@@ -4150,20 +4344,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:203
+#: lib/common.php:199
#, fuzzy
msgid "No configuration file found. "
msgstr "אין קוד אישור."
-#: lib/common.php:204
+#: lib/common.php:200
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:205
+#: lib/common.php:201
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:206
+#: lib/common.php:202
msgid "Go to the installer."
msgstr ""
@@ -4940,11 +5134,6 @@ msgstr "לא"
msgid "Top posters"
msgstr ""
-#: lib/unblockform.php:80
-#, fuzzy
-msgid "Unlock this user"
-msgstr "אין משתמש כזה."
-
#: lib/unsandboxform.php:69
msgid "Unsandbox"
msgstr ""
@@ -4998,47 +5187,47 @@ msgstr ""
msgid "Message"
msgstr "הודעה חדשה"
-#: lib/util.php:821
+#: lib/util.php:826
msgid "a few seconds ago"
msgstr "לפני מספר שניות"
-#: lib/util.php:823
+#: lib/util.php:828
msgid "about a minute ago"
msgstr "לפני כדקה"
-#: lib/util.php:825
+#: lib/util.php:830
#, php-format
msgid "about %d minutes ago"
msgstr "לפני כ-%d דקות"
-#: lib/util.php:827
+#: lib/util.php:832
msgid "about an hour ago"
msgstr "לפני כשעה"
-#: lib/util.php:829
+#: lib/util.php:834
#, php-format
msgid "about %d hours ago"
msgstr "לפני כ-%d שעות"
-#: lib/util.php:831
+#: lib/util.php:836
msgid "about a day ago"
msgstr "לפני כיום"
-#: lib/util.php:833
+#: lib/util.php:838
#, php-format
msgid "about %d days ago"
msgstr "לפני כ-%d ימים"
-#: lib/util.php:835
+#: lib/util.php:840
msgid "about a month ago"
msgstr "לפני כחודש"
-#: lib/util.php:837
+#: lib/util.php:842
#, php-format
msgid "about %d months ago"
msgstr "לפני כ-%d חודשים"
-#: lib/util.php:839
+#: lib/util.php:844
msgid "about a year ago"
msgstr "לפני כשנה"
@@ -5069,5 +5258,9 @@ msgid "Sorry, no incoming email allowed."
msgstr ""
#, fuzzy
+#~ msgid "Unlock this user"
+#~ msgstr "אין משתמש כזה."
+
+#, fuzzy
#~ msgid "These people are subscribed to you: "
#~ msgstr "הרשמה מרוחקת"
diff --git a/locale/is/LC_MESSAGES/statusnet.po b/locale/is/LC_MESSAGES/statusnet.po
index e1a93b509..c5a0216ef 100644
--- a/locale/is/LC_MESSAGES/statusnet.po
+++ b/locale/is/LC_MESSAGES/statusnet.po
@@ -1,15 +1,18 @@
# Translation of StatusNet to Icelandic
#
# --
+# 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-18 19:31+0000\n"
+"POT-Creation-Date: 2009-11-19 10:43+0000\n"
"PO-Revision-Date: 2009-11-18 19:32:01+0000\n"
"Language-Team: Icelandic\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n % 100 != 1 && n % 100 != 21 && n % 100 != 31 && n % 100 != 41 && n % 100 != 51 && n % 100 != 61 && n % 100 != 71 && n % 100 != 81 && n % 100 != 91);\n"
"X-Generator: MediaWiki 1.16alpha(r59207); Translate extension (2009-11-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: is\n"
@@ -144,7 +147,7 @@ msgstr "Gat ekki uppfært notanda."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
-#: actions/designadminpanel.php:125 actions/newnotice.php:94
+#: actions/designadminpanel.php:122 actions/newnotice.php:94
#: lib/designsettings.php:283
#, php-format
msgid ""
@@ -227,7 +230,7 @@ msgstr "Öll bein skilaboð til %s"
#: 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:184 actions/apigroupismember.php:114
+#: 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
@@ -293,79 +296,66 @@ msgstr ""
msgid "Could not find target user."
msgstr ""
-#: actions/apigroupcreate.php:136 actions/newgroup.php:204
-msgid "Could not create group."
-msgstr "Gat ekki búið til hóp."
-
-#: actions/apigroupcreate.php:147 actions/editgroup.php:259
-#: actions/newgroup.php:210
-msgid "Could not create aliases."
-msgstr ""
-
-#: actions/apigroupcreate.php:166 actions/newgroup.php:224
-msgid "Could not set group membership."
-msgstr "Gat ekki skráð hópmeðlimi."
-
-#: actions/apigroupcreate.php:212 actions/editgroup.php:182
+#: actions/apigroupcreate.php:164 actions/editgroup.php:182
#: actions/newgroup.php:126 actions/profilesettings.php:208
#: actions/register.php:205
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr "Stuttnefni geta bara verið lágstafir og tölustafir en engin bil."
-#: actions/apigroupcreate.php:221 actions/editgroup.php:186
+#: 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 "Stuttnefni nú þegar í notkun. Prófaðu eitthvað annað."
-#: actions/apigroupcreate.php:228 actions/editgroup.php:189
+#: 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 "Ekki tækt stuttnefni."
-#: actions/apigroupcreate.php:244 actions/editgroup.php:195
+#: 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 "Heimasíða er ekki gild vefslóð."
-#: actions/apigroupcreate.php:253 actions/editgroup.php:198
+#: 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 "Fullt nafn er of langt (í mesta lagi 255 stafir)."
-#: actions/apigroupcreate.php:261
+#: actions/apigroupcreate.php:213
#, fuzzy, php-format
msgid "Description is too long (max %d chars)."
msgstr "Lýsing er of löng (í mesta lagi 140 tákn)."
-#: actions/apigroupcreate.php:272 actions/editgroup.php:204
+#: 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 "Staðsetning er of löng (í mesta lagi 255 stafir)."
-#: actions/apigroupcreate.php:291 actions/editgroup.php:215
+#: actions/apigroupcreate.php:243 actions/editgroup.php:215
#: actions/newgroup.php:159
#, php-format
msgid "Too many aliases! Maximum %d."
msgstr ""
-#: actions/apigroupcreate.php:312 actions/editgroup.php:224
+#: actions/apigroupcreate.php:264 actions/editgroup.php:224
#: actions/newgroup.php:168
#, php-format
msgid "Invalid alias: \"%s\""
msgstr ""
-#: actions/apigroupcreate.php:321 actions/editgroup.php:228
+#: actions/apigroupcreate.php:273 actions/editgroup.php:228
#: actions/newgroup.php:172
#, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr ""
-#: actions/apigroupcreate.php:334 actions/editgroup.php:234
+#: actions/apigroupcreate.php:286 actions/editgroup.php:234
#: actions/newgroup.php:178
msgid "Alias can't be the same as nickname."
msgstr ""
@@ -588,10 +578,10 @@ msgstr "Skera af"
msgid "There was a problem with your session token. Try again, please."
msgstr "Það kom upp vandamál með setutókann þinn. Vinsamlegast reyndu aftur."
-#: actions/avatarsettings.php:277 actions/emailsettings.php:255
-#: actions/grouplogo.php:319 actions/imsettings.php:220
-#: actions/recoverpassword.php:44 actions/smssettings.php:248
-#: lib/designsettings.php:304
+#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
+#: actions/emailsettings.php:255 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/recoverpassword.php:44
+#: actions/smssettings.php:248 lib/designsettings.php:304
msgid "Unexpected form submission."
msgstr "Bjóst ekki við innsendingu eyðublaðs."
@@ -652,7 +642,7 @@ msgstr ""
msgid "Unblock"
msgstr "Opna"
-#: actions/blockedfromgroup.php:313
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:80
msgid "Unblock this user"
msgstr "Opna á þennan notanda"
@@ -823,7 +813,7 @@ msgid "Delete this user"
msgstr "Eyða þessu babli"
#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124
-#: lib/adminpanelaction.php:275 lib/groupnav.php:119
+#: lib/adminpanelaction.php:302 lib/groupnav.php:119
msgid "Design"
msgstr ""
@@ -831,103 +821,178 @@ msgstr ""
msgid "Design settings for this StatusNet site."
msgstr ""
-#: actions/designadminpanel.php:220
-msgid "Unable to delete design setting."
-msgstr ""
+#: actions/designadminpanel.php:278
+#, fuzzy
+msgid "Invalid logo URL."
+msgstr "Ótæk stærð."
-#: actions/designadminpanel.php:301
+#: actions/designadminpanel.php:282
#, fuzzy, php-format
msgid "Theme not available: %s"
msgstr "Þessi síða er ekki aðgengileg í "
-#: actions/designadminpanel.php:406
+#: actions/designadminpanel.php:288
+#, fuzzy, php-format
+msgid "Theme directory not readable: %s"
+msgstr "Þessi síða er ekki aðgengileg í "
+
+#: actions/designadminpanel.php:292
+#, php-format
+msgid "Avatar directory not writable: %s"
+msgstr ""
+
+#: actions/designadminpanel.php:296
+#, php-format
+msgid "Background directory not writable: %s"
+msgstr ""
+
+#: actions/designadminpanel.php:312
+#, php-format
+msgid "Max length for %s %s is 255 characters."
+msgstr ""
+
+#: actions/designadminpanel.php:412
+#, fuzzy
+msgid "Change logo"
+msgstr "Breyta"
+
+#: actions/designadminpanel.php:417
+#, fuzzy
+msgid "Site logo"
+msgstr "Bjóða"
+
+#: actions/designadminpanel.php:424
#, fuzzy
msgid "Change theme"
msgstr "Breyta"
-#: actions/designadminpanel.php:410
-msgid "Theme"
-msgstr ""
+#: actions/designadminpanel.php:441
+#, fuzzy
+msgid "Site theme"
+msgstr "Babl vefsíðunnar"
-#: actions/designadminpanel.php:411
+#: actions/designadminpanel.php:442
#, fuzzy
msgid "Theme for the site."
msgstr "Skrá þig út af síðunni"
-#: actions/designadminpanel.php:420 lib/designsettings.php:101
+#: actions/designadminpanel.php:447
+msgid "Theme server"
+msgstr ""
+
+#: actions/designadminpanel.php:451
+msgid "Theme path"
+msgstr ""
+
+#: actions/designadminpanel.php:455
+msgid "Theme directory"
+msgstr ""
+
+#: actions/designadminpanel.php:462
+#, fuzzy
+msgid "Avatar Settings"
+msgstr "Stillingar fyrir mynd"
+
+#: actions/designadminpanel.php:467
+#, fuzzy
+msgid "Avatar server"
+msgstr "Stillingar fyrir mynd"
+
+#: actions/designadminpanel.php:471
+#, fuzzy
+msgid "Avatar path"
+msgstr "Mynd hefur verið uppfærð."
+
+#: actions/designadminpanel.php:475
+msgid "Avatar directory"
+msgstr ""
+
+#: actions/designadminpanel.php:486 lib/designsettings.php:101
msgid "Change background image"
msgstr ""
-#: actions/designadminpanel.php:424 actions/designadminpanel.php:498
+#: actions/designadminpanel.php:491 actions/designadminpanel.php:578
#: lib/designsettings.php:178
msgid "Background"
msgstr ""
-#: actions/designadminpanel.php:429
+#: actions/designadminpanel.php:496
#, fuzzy, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
"$s."
msgstr "Þetta er of langt. Hámarkslengd babls er 140 tákn."
-#: actions/designadminpanel.php:459 lib/designsettings.php:139
+#: actions/designadminpanel.php:526 lib/designsettings.php:139
msgid "On"
msgstr ""
-#: actions/designadminpanel.php:475 lib/designsettings.php:155
+#: actions/designadminpanel.php:542 lib/designsettings.php:155
msgid "Off"
msgstr ""
-#: actions/designadminpanel.php:476 lib/designsettings.php:156
+#: actions/designadminpanel.php:543 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr ""
-#: actions/designadminpanel.php:481 lib/designsettings.php:161
+#: actions/designadminpanel.php:548 lib/designsettings.php:161
msgid "Tile background image"
msgstr ""
-#: actions/designadminpanel.php:490 lib/designsettings.php:170
+#: actions/designadminpanel.php:554
+msgid "Background server"
+msgstr ""
+
+#: actions/designadminpanel.php:558
+msgid "Background path"
+msgstr ""
+
+#: actions/designadminpanel.php:562
+msgid "Background directory"
+msgstr ""
+
+#: actions/designadminpanel.php:569 lib/designsettings.php:170
msgid "Change colours"
msgstr ""
-#: actions/designadminpanel.php:511 lib/designsettings.php:191
+#: actions/designadminpanel.php:591 lib/designsettings.php:191
msgid "Content"
msgstr ""
-#: actions/designadminpanel.php:524 lib/designsettings.php:204
+#: actions/designadminpanel.php:604 lib/designsettings.php:204
msgid "Sidebar"
msgstr ""
-#: actions/designadminpanel.php:537 lib/designsettings.php:217
+#: actions/designadminpanel.php:617 lib/designsettings.php:217
msgid "Text"
msgstr "Texti"
-#: actions/designadminpanel.php:550 lib/designsettings.php:230
+#: actions/designadminpanel.php:630 lib/designsettings.php:230
msgid "Links"
msgstr ""
-#: actions/designadminpanel.php:611 lib/designsettings.php:247
+#: actions/designadminpanel.php:658 lib/designsettings.php:247
msgid "Use defaults"
msgstr ""
-#: actions/designadminpanel.php:612 lib/designsettings.php:248
+#: actions/designadminpanel.php:659 lib/designsettings.php:248
msgid "Restore default designs"
msgstr ""
-#: actions/designadminpanel.php:618 lib/designsettings.php:254
+#: actions/designadminpanel.php:665 lib/designsettings.php:254
msgid "Reset back to default"
msgstr ""
-#: actions/designadminpanel.php:620 actions/emailsettings.php:195
+#: actions/designadminpanel.php:667 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/profilesettings.php:167 actions/siteadminpanel.php:371
+#: actions/profilesettings.php:167 actions/siteadminpanel.php:414
#: actions/smssettings.php:181 actions/subscriptions.php:203
#: actions/tagother.php:154 actions/useradminpanel.php:226
#: lib/designsettings.php:256 lib/groupeditform.php:202
msgid "Save"
msgstr "Vista"
-#: actions/designadminpanel.php:621 lib/designsettings.php:257
+#: actions/designadminpanel.php:668 lib/designsettings.php:257
msgid "Save design"
msgstr ""
@@ -970,6 +1035,10 @@ msgstr "Lýsing er of löng (í mesta lagi 140 tákn)."
msgid "Could not update group."
msgstr "Gat ekki uppfært hóp."
+#: actions/editgroup.php:259 classes/User_group.php:390
+msgid "Could not create aliases."
+msgstr ""
+
#: actions/editgroup.php:269
msgid "Options saved."
msgstr "Valmöguleikar vistaðir."
@@ -1086,7 +1155,7 @@ msgstr "Ekkert tölvupóstfang."
msgid "Cannot normalize that email address"
msgstr "Get ekki staðlað þetta tölvupóstfang"
-#: actions/emailsettings.php:330 actions/siteadminpanel.php:156
+#: actions/emailsettings.php:330 actions/siteadminpanel.php:158
msgid "Not a valid email address"
msgstr "Ekki tækt tölvupóstfang"
@@ -1801,10 +1870,10 @@ msgstr "Ótækt bablinnihald"
msgid "Incorrect username or password."
msgstr "Rangt notendanafn eða lykilorð."
-#: actions/login.php:149 actions/recoverpassword.php:375
-#: actions/register.php:248
-msgid "Error setting user."
-msgstr "Villa kom upp í stillingu notanda."
+#: actions/login.php:149
+#, fuzzy
+msgid "Error setting user. You are probably not authorized."
+msgstr "Engin heimild."
#: actions/login.php:204 actions/login.php:257 lib/action.php:457
#: lib/logingroupnav.php:79
@@ -2236,7 +2305,7 @@ msgstr ""
"Merki fyrir þig (bókstafir, tölustafir, -, ., og _), aðskilin með kommu eða "
"bili"
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:275
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:309
msgid "Language"
msgstr "Tungumál"
@@ -2264,7 +2333,7 @@ msgstr ""
msgid "Bio is too long (max %d chars)."
msgstr "Lýsingin er of löng (í mesta lagi 140 tákn)."
-#: actions/profilesettings.php:228 actions/siteadminpanel.php:163
+#: actions/profilesettings.php:228 actions/siteadminpanel.php:165
msgid "Timezone not selected."
msgstr "Tímabelti ekki valið."
@@ -2506,6 +2575,10 @@ msgstr "Lykilorð verður að vera 6 tákn eða fleiri."
msgid "Password and confirmation do not match."
msgstr "Lykilorð og staðfesting passa ekki saman."
+#: actions/recoverpassword.php:375 actions/register.php:248
+msgid "Error setting user."
+msgstr "Villa kom upp í stillingu notanda."
+
#: actions/recoverpassword.php:382
msgid "New password successfully saved. You are now logged in."
msgstr "Tókst að vista nýtt lykilorð. Þú ert núna innskráð(ur)"
@@ -2567,7 +2640,7 @@ msgid "Same as password above. Required."
msgstr "Sama og lykilorðið hér fyrir ofan. Nauðsynlegt."
#: actions/register.php:437 actions/register.php:441
-#: actions/siteadminpanel.php:253 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:287 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "Tölvupóstur"
@@ -3007,7 +3080,7 @@ msgstr "Þú getur ekki sent þessum notanda skilaboð."
msgid "User is already silenced."
msgstr ""
-#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:272
+#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:299
#, fuzzy
msgid "Site"
msgstr "Bjóða"
@@ -3016,122 +3089,235 @@ msgstr "Bjóða"
msgid "Basic settings for this StatusNet site."
msgstr ""
-#: actions/siteadminpanel.php:145
+#: actions/siteadminpanel.php:147
msgid "Site name must have non-zero length."
msgstr ""
-#: actions/siteadminpanel.php:153
+#: actions/siteadminpanel.php:155
#, fuzzy
msgid "You must have a valid contact email address"
msgstr "Ekki tækt tölvupóstfang"
-#: actions/siteadminpanel.php:171
+#: actions/siteadminpanel.php:173
#, php-format
msgid "Unknown language \"%s\""
msgstr ""
-#: actions/siteadminpanel.php:178
+#: actions/siteadminpanel.php:180
msgid "Invalid snapshot report URL."
msgstr ""
-#: actions/siteadminpanel.php:184
+#: actions/siteadminpanel.php:186
msgid "Invalid snapshot run value."
msgstr ""
-#: actions/siteadminpanel.php:190
+#: actions/siteadminpanel.php:192
msgid "Snapshot frequency must be a number."
msgstr ""
-#: actions/siteadminpanel.php:241
+#: actions/siteadminpanel.php:199
+msgid "You must set an SSL sever when enabling SSL."
+msgstr ""
+
+#: actions/siteadminpanel.php:204
+msgid "Invalid SSL server. Max length is 255 characters."
+msgstr ""
+
+#: actions/siteadminpanel.php:210
+msgid "Minimum text limit is 140c."
+msgstr ""
+
+#: actions/siteadminpanel.php:216
+msgid "Dupe limit must 1 or more seconds."
+msgstr ""
+
+#: actions/siteadminpanel.php:224
+#, php-format
+msgid "Locales directory not readable: %s"
+msgstr ""
+
+#: actions/siteadminpanel.php:275
#, fuzzy
msgid "Site name"
msgstr "Babl vefsíðunnar"
-#: actions/siteadminpanel.php:242
+#: actions/siteadminpanel.php:276
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr ""
-#: actions/siteadminpanel.php:245
+#: actions/siteadminpanel.php:279
msgid "Brought by"
msgstr ""
-#: actions/siteadminpanel.php:246
+#: actions/siteadminpanel.php:280
msgid "Text used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:249
+#: actions/siteadminpanel.php:283
msgid "Brought by URL"
msgstr ""
-#: actions/siteadminpanel.php:250
+#: actions/siteadminpanel.php:284
msgid "URL used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:254
+#: actions/siteadminpanel.php:288
#, fuzzy
msgid "contact email address for your site"
msgstr "Nýtt tölvupóstfang til að senda á %s"
-#: actions/siteadminpanel.php:268
+#: actions/siteadminpanel.php:302
msgid "Default timezone"
msgstr ""
-#: actions/siteadminpanel.php:269
+#: actions/siteadminpanel.php:303
msgid "Default timezone for the site; usually UTC."
msgstr ""
-#: actions/siteadminpanel.php:276
+#: actions/siteadminpanel.php:310
#, fuzzy
msgid "Default site language"
msgstr "Tungumál (ákjósanlegt)"
-#: actions/siteadminpanel.php:282
+#: actions/siteadminpanel.php:316
+msgid "Path to locales"
+msgstr ""
+
+#: actions/siteadminpanel.php:316
+msgid "Directory path to locales"
+msgstr ""
+
+#: actions/siteadminpanel.php:320
+#, fuzzy
+msgid "Server"
+msgstr "Endurheimta"
+
+#: actions/siteadminpanel.php:320
+msgid "Site's server hostname."
+msgstr ""
+
+#: actions/siteadminpanel.php:324
+msgid "Path"
+msgstr ""
+
+#: actions/siteadminpanel.php:324
+#, fuzzy
+msgid "Site path"
+msgstr "Babl vefsíðunnar"
+
+#: actions/siteadminpanel.php:328
+msgid "Fancy URLs"
+msgstr ""
+
+#: actions/siteadminpanel.php:330
+msgid "Use fancy (more readable and memorable) URLs?"
+msgstr ""
+
+#: actions/siteadminpanel.php:334
#, fuzzy
msgid "Private"
msgstr "Friðhelgi"
-#: actions/siteadminpanel.php:284
+#: actions/siteadminpanel.php:336
msgid "Prohibit anonymous users (not logged in) from viewing site?"
msgstr ""
-#: actions/siteadminpanel.php:290
+#: actions/siteadminpanel.php:340
+#, fuzzy
+msgid "Invite only"
+msgstr "Bjóða"
+
+#: actions/siteadminpanel.php:342
+msgid "Make registration invitation only."
+msgstr ""
+
+#: actions/siteadminpanel.php:346 actions/useradminpanel.php:171
+msgid "Closed"
+msgstr ""
+
+#: actions/siteadminpanel.php:348
+msgid "Disable new registrations."
+msgstr ""
+
+#: actions/siteadminpanel.php:353
msgid "Randomly during Web hit"
msgstr ""
-#: actions/siteadminpanel.php:291
+#: actions/siteadminpanel.php:354
msgid "In a scheduled job"
msgstr ""
-#: actions/siteadminpanel.php:292
+#: actions/siteadminpanel.php:355 actions/siteadminpanel.php:380
#, fuzzy
msgid "Never"
msgstr "Endurheimta"
-#: actions/siteadminpanel.php:294
+#: actions/siteadminpanel.php:357
msgid "Data snapshots"
msgstr ""
-#: actions/siteadminpanel.php:295
+#: actions/siteadminpanel.php:358
msgid "When to send statistical data to status.net servers"
msgstr ""
-#: actions/siteadminpanel.php:301
+#: actions/siteadminpanel.php:364
msgid "Frequency"
msgstr ""
-#: actions/siteadminpanel.php:302
+#: actions/siteadminpanel.php:365
msgid "Snapshots will be sent once every N Web hits"
msgstr ""
-#: actions/siteadminpanel.php:309
+#: actions/siteadminpanel.php:372
msgid "Report URL"
msgstr ""
-#: actions/siteadminpanel.php:310
+#: actions/siteadminpanel.php:373
msgid "Snapshots will be sent to this URL"
msgstr ""
-#: actions/siteadminpanel.php:371 actions/useradminpanel.php:226
+#: actions/siteadminpanel.php:381
+#, fuzzy
+msgid "Sometimes"
+msgstr "Babl"
+
+#: actions/siteadminpanel.php:382
+msgid "Always"
+msgstr ""
+
+#: actions/siteadminpanel.php:384
+msgid "Use SSL"
+msgstr ""
+
+#: actions/siteadminpanel.php:385
+msgid "When to use SSL"
+msgstr ""
+
+#: actions/siteadminpanel.php:391
+msgid "SSL Server"
+msgstr ""
+
+#: actions/siteadminpanel.php:392
+msgid "Server to direct SSL requests to"
+msgstr ""
+
+#: actions/siteadminpanel.php:396
+msgid "Text limit"
+msgstr ""
+
+#: actions/siteadminpanel.php:396
+msgid "Maximum number of characters for notices."
+msgstr ""
+
+#: actions/siteadminpanel.php:400
+msgid "Dupe limit"
+msgstr ""
+
+#: actions/siteadminpanel.php:400
+msgid "How long users must wait (in seconds) to post the same thing again."
+msgstr ""
+
+#: actions/siteadminpanel.php:414 actions/useradminpanel.php:226
#, fuzzy
msgid "Save site settings"
msgstr "Stillingar fyrir mynd"
@@ -3447,10 +3633,6 @@ msgstr "Notandi"
msgid "User settings for this StatusNet site."
msgstr ""
-#: actions/useradminpanel.php:171
-msgid "Closed"
-msgstr ""
-
#: actions/useradminpanel.php:173
msgid "Is registration on this site prohibited?"
msgstr ""
@@ -3674,6 +3856,14 @@ msgstr "Vandamál komu upp við að vista babl."
msgid "DB error inserting reply: %s"
msgstr "Gagnagrunnsvilla við innsetningu svars: %s"
+#: classes/User_group.php:380
+msgid "Could not create group."
+msgstr "Gat ekki búið til hóp."
+
+#: classes/User_group.php:409
+msgid "Could not set group membership."
+msgstr "Gat ekki skráð hópmeðlimi."
+
#: classes/User.php:347
#, php-format
msgid "Welcome to %1$s, @%2$s!"
@@ -3914,12 +4104,16 @@ msgstr "Skipun hefur ekki verið fullbúin"
msgid "saveSettings() not implemented."
msgstr "Skipun hefur ekki verið fullbúin"
-#: lib/adminpanelaction.php:273
+#: lib/adminpanelaction.php:247
+msgid "Unable to delete design setting."
+msgstr ""
+
+#: lib/adminpanelaction.php:300
#, fuzzy
msgid "Basic site configuration"
msgstr "Staðfesting tölvupóstfangs"
-#: lib/adminpanelaction.php:276
+#: lib/adminpanelaction.php:303
#, fuzzy
msgid "Design configuration"
msgstr "SMS staðfesting"
@@ -4166,20 +4360,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:203
+#: lib/common.php:199
#, fuzzy
msgid "No configuration file found. "
msgstr "Enginn staðfestingarlykill."
-#: lib/common.php:204
+#: lib/common.php:200
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:205
+#: lib/common.php:201
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:206
+#: lib/common.php:202
#, fuzzy
msgid "Go to the installer."
msgstr "Skrá þig inn á síðuna"
@@ -4943,11 +5137,6 @@ msgstr "Ekkert"
msgid "Top posters"
msgstr "Aðalbablararnir"
-#: lib/unblockform.php:80
-#, fuzzy
-msgid "Unlock this user"
-msgstr "Opna á þennan notanda"
-
#: lib/unsandboxform.php:69
msgid "Unsandbox"
msgstr ""
@@ -4998,47 +5187,47 @@ msgstr "Senda bein skilaboð til þessa notanda"
msgid "Message"
msgstr "Skilaboð"
-#: lib/util.php:821
+#: lib/util.php:826
msgid "a few seconds ago"
msgstr "fyrir nokkrum sekúndum"
-#: lib/util.php:823
+#: lib/util.php:828
msgid "about a minute ago"
msgstr "fyrir um einni mínútu síðan"
-#: lib/util.php:825
+#: lib/util.php:830
#, php-format
msgid "about %d minutes ago"
msgstr "fyrir um %d mínútum síðan"
-#: lib/util.php:827
+#: lib/util.php:832
msgid "about an hour ago"
msgstr "fyrir um einum klukkutíma síðan"
-#: lib/util.php:829
+#: lib/util.php:834
#, php-format
msgid "about %d hours ago"
msgstr "fyrir um %d klukkutímum síðan"
-#: lib/util.php:831
+#: lib/util.php:836
msgid "about a day ago"
msgstr "fyrir um einum degi síðan"
-#: lib/util.php:833
+#: lib/util.php:838
#, php-format
msgid "about %d days ago"
msgstr "fyrir um %d dögum síðan"
-#: lib/util.php:835
+#: lib/util.php:840
msgid "about a month ago"
msgstr "fyrir um einum mánuði síðan"
-#: lib/util.php:837
+#: lib/util.php:842
#, php-format
msgid "about %d months ago"
msgstr "fyrir um %d mánuðum síðan"
-#: lib/util.php:839
+#: lib/util.php:844
msgid "about a year ago"
msgstr "fyrir um einu ári síðan"
@@ -5069,5 +5258,9 @@ msgid "Sorry, no incoming email allowed."
msgstr "Því miður er móttökutölvupóstur ekki leyfður."
#, fuzzy
+#~ msgid "Unlock this user"
+#~ msgstr "Opna á þennan notanda"
+
+#, fuzzy
#~ msgid "These people are subscribed to you: "
#~ msgstr "Fólk sem eru áskrifendur að %s"
diff --git a/locale/it/LC_MESSAGES/statusnet.po b/locale/it/LC_MESSAGES/statusnet.po
index c1a19d165..874698170 100644
--- a/locale/it/LC_MESSAGES/statusnet.po
+++ b/locale/it/LC_MESSAGES/statusnet.po
@@ -2,15 +2,18 @@
#
# Author@translatewiki.net: Nemo bis
# --
+# 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-18 19:31+0000\n"
+"POT-Creation-Date: 2009-11-19 10:43+0000\n"
"PO-Revision-Date: 2009-11-18 19:32:04+0000\n"
"Language-Team: Italian\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: MediaWiki 1.16alpha(r59207); Translate extension (2009-11-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: it\n"
@@ -146,7 +149,7 @@ msgstr "Impossibile aggiornare l'utente."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
-#: actions/designadminpanel.php:125 actions/newnotice.php:94
+#: actions/designadminpanel.php:122 actions/newnotice.php:94
#: lib/designsettings.php:283
#, php-format
msgid ""
@@ -230,7 +233,7 @@ msgstr "Tutti i messaggi diretti inviati a %s"
#: 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:184 actions/apigroupismember.php:114
+#: 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
@@ -299,21 +302,7 @@ msgstr "Impossibile recuperare l'attività pubblica."
msgid "Could not find target user."
msgstr "Impossibile trovare un qualsiasi stato."
-#: actions/apigroupcreate.php:136 actions/newgroup.php:204
-msgid "Could not create group."
-msgstr "Impossibile creare il gruppo."
-
-#: actions/apigroupcreate.php:147 actions/editgroup.php:259
-#: actions/newgroup.php:210
-#, fuzzy
-msgid "Could not create aliases."
-msgstr "Impossibile creare preferito."
-
-#: actions/apigroupcreate.php:166 actions/newgroup.php:224
-msgid "Could not set group membership."
-msgstr "Impossibile impostare la membership al gruppo."
-
-#: actions/apigroupcreate.php:212 actions/editgroup.php:182
+#: actions/apigroupcreate.php:164 actions/editgroup.php:182
#: actions/newgroup.php:126 actions/profilesettings.php:208
#: actions/register.php:205
msgid "Nickname must have only lowercase letters and numbers and no spaces."
@@ -321,60 +310,60 @@ msgstr ""
"Il soprannome deve essere composto solo da lettere minuscole e numeri, senza "
"spazi."
-#: actions/apigroupcreate.php:221 actions/editgroup.php:186
+#: 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 "Soprannome già in uso. Prova con un altro."
-#: actions/apigroupcreate.php:228 actions/editgroup.php:189
+#: 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 "Non è un soprannome valido."
-#: actions/apigroupcreate.php:244 actions/editgroup.php:195
+#: 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 "L'URL della pagina web non è valido."
-#: actions/apigroupcreate.php:253 actions/editgroup.php:198
+#: 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 "Nome troppo lungo (max 255 caratteri)"
-#: actions/apigroupcreate.php:261
+#: actions/apigroupcreate.php:213
#, fuzzy, php-format
msgid "Description is too long (max %d chars)."
msgstr "La descrizione è troppo lunga (max 140 caratteri)."
-#: actions/apigroupcreate.php:272 actions/editgroup.php:204
+#: 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 "Ubicazione troppo lunga (max 255 caratteri)."
-#: actions/apigroupcreate.php:291 actions/editgroup.php:215
+#: actions/apigroupcreate.php:243 actions/editgroup.php:215
#: actions/newgroup.php:159
#, php-format
msgid "Too many aliases! Maximum %d."
msgstr ""
-#: actions/apigroupcreate.php:312 actions/editgroup.php:224
+#: actions/apigroupcreate.php:264 actions/editgroup.php:224
#: actions/newgroup.php:168
#, fuzzy, php-format
msgid "Invalid alias: \"%s\""
msgstr "Etichetta non valida: \"%s\""
-#: actions/apigroupcreate.php:321 actions/editgroup.php:228
+#: actions/apigroupcreate.php:273 actions/editgroup.php:228
#: actions/newgroup.php:172
#, fuzzy, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr "Soprannome già in uso. Prova con un altro."
-#: actions/apigroupcreate.php:334 actions/editgroup.php:234
+#: actions/apigroupcreate.php:286 actions/editgroup.php:234
#: actions/newgroup.php:178
msgid "Alias can't be the same as nickname."
msgstr ""
@@ -599,10 +588,10 @@ msgstr "Ritaglia"
msgid "There was a problem with your session token. Try again, please."
msgstr "C'è stato un problema con il tuo token di sessione. Prova di nuovo."
-#: actions/avatarsettings.php:277 actions/emailsettings.php:255
-#: actions/grouplogo.php:319 actions/imsettings.php:220
-#: actions/recoverpassword.php:44 actions/smssettings.php:248
-#: lib/designsettings.php:304
+#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
+#: actions/emailsettings.php:255 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/recoverpassword.php:44
+#: actions/smssettings.php:248 lib/designsettings.php:304
msgid "Unexpected form submission."
msgstr "Invio del modulo inaspettato."
@@ -665,7 +654,7 @@ msgstr "Sblocco dell'utente non riuscito."
msgid "Unblock"
msgstr "Sblocca"
-#: actions/blockedfromgroup.php:313
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:80
msgid "Unblock this user"
msgstr "Sblocca questo utente"
@@ -841,7 +830,7 @@ msgid "Delete this user"
msgstr "Elimina questo messaggio"
#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124
-#: lib/adminpanelaction.php:275 lib/groupnav.php:119
+#: lib/adminpanelaction.php:302 lib/groupnav.php:119
msgid "Design"
msgstr ""
@@ -849,108 +838,183 @@ msgstr ""
msgid "Design settings for this StatusNet site."
msgstr ""
-#: actions/designadminpanel.php:220
+#: actions/designadminpanel.php:278
#, fuzzy
-msgid "Unable to delete design setting."
-msgstr "Impossibile salvare le tue impostazioni di Twitter!"
+msgid "Invalid logo URL."
+msgstr "Dimensione non valida."
-#: actions/designadminpanel.php:301
+#: actions/designadminpanel.php:282
#, fuzzy, php-format
msgid "Theme not available: %s"
msgstr "Questa pagina non è disponibile in un "
-#: actions/designadminpanel.php:406
+#: actions/designadminpanel.php:288
+#, fuzzy, php-format
+msgid "Theme directory not readable: %s"
+msgstr "Questa pagina non è disponibile in un "
+
+#: actions/designadminpanel.php:292
+#, php-format
+msgid "Avatar directory not writable: %s"
+msgstr ""
+
+#: actions/designadminpanel.php:296
+#, php-format
+msgid "Background directory not writable: %s"
+msgstr ""
+
+#: actions/designadminpanel.php:312
+#, php-format
+msgid "Max length for %s %s is 255 characters."
+msgstr ""
+
+#: actions/designadminpanel.php:412
+#, fuzzy
+msgid "Change logo"
+msgstr "Modifica la tua password"
+
+#: actions/designadminpanel.php:417
+#, fuzzy
+msgid "Site logo"
+msgstr "Invita"
+
+#: actions/designadminpanel.php:424
#, fuzzy
msgid "Change theme"
msgstr "Modifica"
-#: actions/designadminpanel.php:410
-msgid "Theme"
-msgstr ""
+#: actions/designadminpanel.php:441
+#, fuzzy
+msgid "Site theme"
+msgstr "Messaggio del sito"
-#: actions/designadminpanel.php:411
+#: actions/designadminpanel.php:442
#, fuzzy
msgid "Theme for the site."
msgstr "Sconnettiti dal sito"
-#: actions/designadminpanel.php:420 lib/designsettings.php:101
+#: actions/designadminpanel.php:447
+msgid "Theme server"
+msgstr ""
+
+#: actions/designadminpanel.php:451
+msgid "Theme path"
+msgstr ""
+
+#: actions/designadminpanel.php:455
+msgid "Theme directory"
+msgstr ""
+
+#: actions/designadminpanel.php:462
+#, fuzzy
+msgid "Avatar Settings"
+msgstr "Impostazioni immagine"
+
+#: actions/designadminpanel.php:467
+#, fuzzy
+msgid "Avatar server"
+msgstr "Impostazioni immagine"
+
+#: actions/designadminpanel.php:471
+#, fuzzy
+msgid "Avatar path"
+msgstr "Immagine aggiornata."
+
+#: actions/designadminpanel.php:475
+#, fuzzy
+msgid "Avatar directory"
+msgstr "Immagine aggiornata."
+
+#: actions/designadminpanel.php:486 lib/designsettings.php:101
msgid "Change background image"
msgstr ""
-#: actions/designadminpanel.php:424 actions/designadminpanel.php:498
+#: actions/designadminpanel.php:491 actions/designadminpanel.php:578
#: lib/designsettings.php:178
msgid "Background"
msgstr ""
-#: actions/designadminpanel.php:429
+#: actions/designadminpanel.php:496
#, fuzzy, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
"$s."
msgstr "Puoi caricare un'immagine per il logo del tuo gruppo."
-#: actions/designadminpanel.php:459 lib/designsettings.php:139
+#: actions/designadminpanel.php:526 lib/designsettings.php:139
msgid "On"
msgstr ""
-#: actions/designadminpanel.php:475 lib/designsettings.php:155
+#: actions/designadminpanel.php:542 lib/designsettings.php:155
msgid "Off"
msgstr ""
-#: actions/designadminpanel.php:476 lib/designsettings.php:156
+#: actions/designadminpanel.php:543 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr ""
-#: actions/designadminpanel.php:481 lib/designsettings.php:161
+#: actions/designadminpanel.php:548 lib/designsettings.php:161
msgid "Tile background image"
msgstr ""
-#: actions/designadminpanel.php:490 lib/designsettings.php:170
+#: actions/designadminpanel.php:554
+msgid "Background server"
+msgstr ""
+
+#: actions/designadminpanel.php:558
+msgid "Background path"
+msgstr ""
+
+#: actions/designadminpanel.php:562
+msgid "Background directory"
+msgstr ""
+
+#: actions/designadminpanel.php:569 lib/designsettings.php:170
#, fuzzy
msgid "Change colours"
msgstr "Modifica la tua password"
-#: actions/designadminpanel.php:511 lib/designsettings.php:191
+#: actions/designadminpanel.php:591 lib/designsettings.php:191
#, fuzzy
msgid "Content"
msgstr "Connetti"
-#: actions/designadminpanel.php:524 lib/designsettings.php:204
+#: actions/designadminpanel.php:604 lib/designsettings.php:204
#, fuzzy
msgid "Sidebar"
msgstr "Ricerca"
-#: actions/designadminpanel.php:537 lib/designsettings.php:217
+#: actions/designadminpanel.php:617 lib/designsettings.php:217
msgid "Text"
msgstr "Testo"
-#: actions/designadminpanel.php:550 lib/designsettings.php:230
+#: actions/designadminpanel.php:630 lib/designsettings.php:230
#, fuzzy
msgid "Links"
msgstr "Elenco"
-#: actions/designadminpanel.php:611 lib/designsettings.php:247
+#: actions/designadminpanel.php:658 lib/designsettings.php:247
msgid "Use defaults"
msgstr ""
-#: actions/designadminpanel.php:612 lib/designsettings.php:248
+#: actions/designadminpanel.php:659 lib/designsettings.php:248
msgid "Restore default designs"
msgstr ""
-#: actions/designadminpanel.php:618 lib/designsettings.php:254
+#: actions/designadminpanel.php:665 lib/designsettings.php:254
msgid "Reset back to default"
msgstr ""
-#: actions/designadminpanel.php:620 actions/emailsettings.php:195
+#: actions/designadminpanel.php:667 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/profilesettings.php:167 actions/siteadminpanel.php:371
+#: actions/profilesettings.php:167 actions/siteadminpanel.php:414
#: actions/smssettings.php:181 actions/subscriptions.php:203
#: actions/tagother.php:154 actions/useradminpanel.php:226
#: lib/designsettings.php:256 lib/groupeditform.php:202
msgid "Save"
msgstr "Salva"
-#: actions/designadminpanel.php:621 lib/designsettings.php:257
+#: actions/designadminpanel.php:668 lib/designsettings.php:257
msgid "Save design"
msgstr ""
@@ -993,6 +1057,11 @@ msgstr "La descrizione è troppo lunga (max 140 caratteri)."
msgid "Could not update group."
msgstr "Impossibile aggiornare il gruppo."
+#: actions/editgroup.php:259 classes/User_group.php:390
+#, fuzzy
+msgid "Could not create aliases."
+msgstr "Impossibile creare preferito."
+
#: actions/editgroup.php:269
msgid "Options saved."
msgstr "Opzioni salvate."
@@ -1113,7 +1182,7 @@ msgstr "Nessun indirizzo email."
msgid "Cannot normalize that email address"
msgstr "Impossibile normalizzare l'indirizzo email"
-#: actions/emailsettings.php:330 actions/siteadminpanel.php:156
+#: actions/emailsettings.php:330 actions/siteadminpanel.php:158
msgid "Not a valid email address"
msgstr "Non è un indirizzo email valido"
@@ -1849,10 +1918,10 @@ msgstr "Contenuto del messaggio non valido"
msgid "Incorrect username or password."
msgstr "Nome utente o password non corretto."
-#: actions/login.php:149 actions/recoverpassword.php:375
-#: actions/register.php:248
-msgid "Error setting user."
-msgstr "Errore nell'impostare l'utente."
+#: actions/login.php:149
+#, fuzzy
+msgid "Error setting user. You are probably not authorized."
+msgstr "Non autorizzato."
#: actions/login.php:204 actions/login.php:257 lib/action.php:457
#: lib/logingroupnav.php:79
@@ -2281,7 +2350,7 @@ msgid ""
msgstr ""
"Le tue etichette (lettere, numeri, -, . e _), separate da virgole o spazi"
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:275
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:309
msgid "Language"
msgstr "Lingua"
@@ -2309,7 +2378,7 @@ msgstr ""
msgid "Bio is too long (max %d chars)."
msgstr "La biografia è troppo lunga (max 140 caratteri)."
-#: actions/profilesettings.php:228 actions/siteadminpanel.php:163
+#: actions/profilesettings.php:228 actions/siteadminpanel.php:165
msgid "Timezone not selected."
msgstr "Fuso orario non selezionato"
@@ -2555,6 +2624,10 @@ msgstr "La password dev'essere lunga almeno 6 caratteri."
msgid "Password and confirmation do not match."
msgstr "La password e la conferma non corrispondono."
+#: actions/recoverpassword.php:375 actions/register.php:248
+msgid "Error setting user."
+msgstr "Errore nell'impostare l'utente."
+
#: actions/recoverpassword.php:382
msgid "New password successfully saved. You are now logged in."
msgstr "Nuova password salvata con successo. Hai effettuato l'accesso."
@@ -2617,7 +2690,7 @@ msgid "Same as password above. Required."
msgstr "Stessa password di sopra. Richiesta."
#: actions/register.php:437 actions/register.php:441
-#: actions/siteadminpanel.php:253 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:287 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "Email"
@@ -3066,7 +3139,7 @@ msgstr "Non puoi inviare un messaggio a questo utente."
msgid "User is already silenced."
msgstr "L'utente ti ha bloccato."
-#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:272
+#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:299
#, fuzzy
msgid "Site"
msgstr "Invita"
@@ -3075,122 +3148,236 @@ msgstr "Invita"
msgid "Basic settings for this StatusNet site."
msgstr ""
-#: actions/siteadminpanel.php:145
+#: actions/siteadminpanel.php:147
msgid "Site name must have non-zero length."
msgstr ""
-#: actions/siteadminpanel.php:153
+#: actions/siteadminpanel.php:155
#, fuzzy
msgid "You must have a valid contact email address"
msgstr "Non è un indirizzo email valido"
-#: actions/siteadminpanel.php:171
+#: actions/siteadminpanel.php:173
#, php-format
msgid "Unknown language \"%s\""
msgstr ""
-#: actions/siteadminpanel.php:178
+#: actions/siteadminpanel.php:180
msgid "Invalid snapshot report URL."
msgstr ""
-#: actions/siteadminpanel.php:184
+#: actions/siteadminpanel.php:186
msgid "Invalid snapshot run value."
msgstr ""
-#: actions/siteadminpanel.php:190
+#: actions/siteadminpanel.php:192
msgid "Snapshot frequency must be a number."
msgstr ""
-#: actions/siteadminpanel.php:241
+#: actions/siteadminpanel.php:199
+msgid "You must set an SSL sever when enabling SSL."
+msgstr ""
+
+#: actions/siteadminpanel.php:204
+msgid "Invalid SSL server. Max length is 255 characters."
+msgstr ""
+
+#: actions/siteadminpanel.php:210
+msgid "Minimum text limit is 140c."
+msgstr ""
+
+#: actions/siteadminpanel.php:216
+msgid "Dupe limit must 1 or more seconds."
+msgstr ""
+
+#: actions/siteadminpanel.php:224
+#, php-format
+msgid "Locales directory not readable: %s"
+msgstr ""
+
+#: actions/siteadminpanel.php:275
#, fuzzy
msgid "Site name"
msgstr "Messaggio del sito"
-#: actions/siteadminpanel.php:242
+#: actions/siteadminpanel.php:276
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr ""
-#: actions/siteadminpanel.php:245
+#: actions/siteadminpanel.php:279
msgid "Brought by"
msgstr ""
-#: actions/siteadminpanel.php:246
+#: actions/siteadminpanel.php:280
msgid "Text used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:249
+#: actions/siteadminpanel.php:283
msgid "Brought by URL"
msgstr ""
-#: actions/siteadminpanel.php:250
+#: actions/siteadminpanel.php:284
msgid "URL used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:254
+#: actions/siteadminpanel.php:288
#, fuzzy
msgid "contact email address for your site"
msgstr "Nuovo indirizzo email per inviare messaggi a %s"
-#: actions/siteadminpanel.php:268
+#: actions/siteadminpanel.php:302
msgid "Default timezone"
msgstr ""
-#: actions/siteadminpanel.php:269
+#: actions/siteadminpanel.php:303
msgid "Default timezone for the site; usually UTC."
msgstr ""
-#: actions/siteadminpanel.php:276
+#: actions/siteadminpanel.php:310
#, fuzzy
msgid "Default site language"
msgstr "Lingua preferita"
-#: actions/siteadminpanel.php:282
+#: actions/siteadminpanel.php:316
+msgid "Path to locales"
+msgstr ""
+
+#: actions/siteadminpanel.php:316
+msgid "Directory path to locales"
+msgstr ""
+
+#: actions/siteadminpanel.php:320
+#, fuzzy
+msgid "Server"
+msgstr "Recupera"
+
+#: actions/siteadminpanel.php:320
+msgid "Site's server hostname."
+msgstr ""
+
+#: actions/siteadminpanel.php:324
+msgid "Path"
+msgstr ""
+
+#: actions/siteadminpanel.php:324
+#, fuzzy
+msgid "Site path"
+msgstr "Messaggio del sito"
+
+#: actions/siteadminpanel.php:328
+msgid "Fancy URLs"
+msgstr ""
+
+#: actions/siteadminpanel.php:330
+msgid "Use fancy (more readable and memorable) URLs?"
+msgstr ""
+
+#: actions/siteadminpanel.php:334
#, fuzzy
msgid "Private"
msgstr "Privacy"
-#: actions/siteadminpanel.php:284
+#: actions/siteadminpanel.php:336
msgid "Prohibit anonymous users (not logged in) from viewing site?"
msgstr ""
-#: actions/siteadminpanel.php:290
+#: actions/siteadminpanel.php:340
+#, fuzzy
+msgid "Invite only"
+msgstr "Invita"
+
+#: actions/siteadminpanel.php:342
+msgid "Make registration invitation only."
+msgstr ""
+
+#: actions/siteadminpanel.php:346 actions/useradminpanel.php:171
+#, fuzzy
+msgid "Closed"
+msgstr "Blocca"
+
+#: actions/siteadminpanel.php:348
+msgid "Disable new registrations."
+msgstr ""
+
+#: actions/siteadminpanel.php:353
msgid "Randomly during Web hit"
msgstr ""
-#: actions/siteadminpanel.php:291
+#: actions/siteadminpanel.php:354
msgid "In a scheduled job"
msgstr ""
-#: actions/siteadminpanel.php:292
+#: actions/siteadminpanel.php:355 actions/siteadminpanel.php:380
#, fuzzy
msgid "Never"
msgstr "Recupera"
-#: actions/siteadminpanel.php:294
+#: actions/siteadminpanel.php:357
msgid "Data snapshots"
msgstr ""
-#: actions/siteadminpanel.php:295
+#: actions/siteadminpanel.php:358
msgid "When to send statistical data to status.net servers"
msgstr ""
-#: actions/siteadminpanel.php:301
+#: actions/siteadminpanel.php:364
msgid "Frequency"
msgstr ""
-#: actions/siteadminpanel.php:302
+#: actions/siteadminpanel.php:365
msgid "Snapshots will be sent once every N Web hits"
msgstr ""
-#: actions/siteadminpanel.php:309
+#: actions/siteadminpanel.php:372
msgid "Report URL"
msgstr ""
-#: actions/siteadminpanel.php:310
+#: actions/siteadminpanel.php:373
msgid "Snapshots will be sent to this URL"
msgstr ""
-#: actions/siteadminpanel.php:371 actions/useradminpanel.php:226
+#: actions/siteadminpanel.php:381
+#, fuzzy
+msgid "Sometimes"
+msgstr "Messaggi"
+
+#: actions/siteadminpanel.php:382
+msgid "Always"
+msgstr ""
+
+#: actions/siteadminpanel.php:384
+msgid "Use SSL"
+msgstr ""
+
+#: actions/siteadminpanel.php:385
+msgid "When to use SSL"
+msgstr ""
+
+#: actions/siteadminpanel.php:391
+msgid "SSL Server"
+msgstr ""
+
+#: actions/siteadminpanel.php:392
+msgid "Server to direct SSL requests to"
+msgstr ""
+
+#: actions/siteadminpanel.php:396
+msgid "Text limit"
+msgstr ""
+
+#: actions/siteadminpanel.php:396
+msgid "Maximum number of characters for notices."
+msgstr ""
+
+#: actions/siteadminpanel.php:400
+msgid "Dupe limit"
+msgstr ""
+
+#: actions/siteadminpanel.php:400
+msgid "How long users must wait (in seconds) to post the same thing again."
+msgstr ""
+
+#: actions/siteadminpanel.php:414 actions/useradminpanel.php:226
#, fuzzy
msgid "Save site settings"
msgstr "Impostazioni immagine"
@@ -3508,11 +3695,6 @@ msgstr "Utente"
msgid "User settings for this StatusNet site."
msgstr ""
-#: actions/useradminpanel.php:171
-#, fuzzy
-msgid "Closed"
-msgstr "Blocca"
-
#: actions/useradminpanel.php:173
msgid "Is registration on this site prohibited?"
msgstr ""
@@ -3744,6 +3926,14 @@ msgstr "Problema nel salvare il messaggio."
msgid "DB error inserting reply: %s"
msgstr "Errore del DB nell'inserire la risposta: %s"
+#: classes/User_group.php:380
+msgid "Could not create group."
+msgstr "Impossibile creare il gruppo."
+
+#: classes/User_group.php:409
+msgid "Could not set group membership."
+msgstr "Impossibile impostare la membership al gruppo."
+
#: classes/User.php:347
#, fuzzy, php-format
msgid "Welcome to %1$s, @%2$s!"
@@ -3984,12 +4174,17 @@ msgstr "Comando non ancora implementato."
msgid "saveSettings() not implemented."
msgstr "Comando non ancora implementato."
-#: lib/adminpanelaction.php:273
+#: lib/adminpanelaction.php:247
+#, fuzzy
+msgid "Unable to delete design setting."
+msgstr "Impossibile salvare le tue impostazioni di Twitter!"
+
+#: lib/adminpanelaction.php:300
#, fuzzy
msgid "Basic site configuration"
msgstr "Conferma indirizzo email"
-#: lib/adminpanelaction.php:276
+#: lib/adminpanelaction.php:303
#, fuzzy
msgid "Design configuration"
msgstr "Conferma SMS"
@@ -4237,20 +4432,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:203
+#: lib/common.php:199
#, fuzzy
msgid "No configuration file found. "
msgstr "Nessun codice di conferma."
-#: lib/common.php:204
+#: lib/common.php:200
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:205
+#: lib/common.php:201
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:206
+#: lib/common.php:202
#, fuzzy
msgid "Go to the installer."
msgstr "Accedi al sito"
@@ -5024,11 +5219,6 @@ msgstr "Nessuno"
msgid "Top posters"
msgstr "Chi scrive più messaggi"
-#: lib/unblockform.php:80
-#, fuzzy
-msgid "Unlock this user"
-msgstr "Sblocca questo utente"
-
#: lib/unsandboxform.php:69
msgid "Unsandbox"
msgstr ""
@@ -5081,47 +5271,47 @@ msgstr "Invia un messaggio diretto a questo utente"
msgid "Message"
msgstr "Messaggio"
-#: lib/util.php:821
+#: lib/util.php:826
msgid "a few seconds ago"
msgstr "pochi secondi fa"
-#: lib/util.php:823
+#: lib/util.php:828
msgid "about a minute ago"
msgstr "circa un minuto fa"
-#: lib/util.php:825
+#: lib/util.php:830
#, php-format
msgid "about %d minutes ago"
msgstr "circa %d minuti fa"
-#: lib/util.php:827
+#: lib/util.php:832
msgid "about an hour ago"
msgstr "circa un'ora fa"
-#: lib/util.php:829
+#: lib/util.php:834
#, php-format
msgid "about %d hours ago"
msgstr "circa %d ore fa"
-#: lib/util.php:831
+#: lib/util.php:836
msgid "about a day ago"
msgstr "circa un giorno fa"
-#: lib/util.php:833
+#: lib/util.php:838
#, php-format
msgid "about %d days ago"
msgstr "circa %d giorni fa"
-#: lib/util.php:835
+#: lib/util.php:840
msgid "about a month ago"
msgstr "circa un mese fa"
-#: lib/util.php:837
+#: lib/util.php:842
#, php-format
msgid "about %d months ago"
msgstr "circa %d mesi fa"
-#: lib/util.php:839
+#: lib/util.php:844
msgid "about a year ago"
msgstr "circa un anno fa"
@@ -5152,5 +5342,9 @@ msgid "Sorry, no incoming email allowed."
msgstr "Email di ricezione non consentita."
#, fuzzy
+#~ msgid "Unlock this user"
+#~ msgstr "Sblocca questo utente"
+
+#, fuzzy
#~ msgid "These people are subscribed to you: "
#~ msgstr "Persone abbonate a %s"
diff --git a/locale/ja/LC_MESSAGES/statusnet.po b/locale/ja/LC_MESSAGES/statusnet.po
index bb8298c7a..54362b777 100644
--- a/locale/ja/LC_MESSAGES/statusnet.po
+++ b/locale/ja/LC_MESSAGES/statusnet.po
@@ -2,15 +2,18 @@
#
# Author@translatewiki.net: Fryed-peach
# --
+# 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-18 19:31+0000\n"
+"POT-Creation-Date: 2009-11-19 10:43+0000\n"
"PO-Revision-Date: 2009-11-18 19:32:07+0000\n"
"Language-Team: Japanese\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: MediaWiki 1.16alpha(r59207); Translate extension (2009-11-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ja\n"
@@ -146,7 +149,7 @@ msgstr "ユーザを更新できません"
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
-#: actions/designadminpanel.php:125 actions/newnotice.php:94
+#: actions/designadminpanel.php:122 actions/newnotice.php:94
#: lib/designsettings.php:283
#, php-format
msgid ""
@@ -229,7 +232,7 @@ msgstr ""
#: 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:184 actions/apigroupismember.php:114
+#: 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
@@ -297,23 +300,7 @@ msgstr "ユーザを更新できません"
msgid "Could not find target user."
msgstr "ユーザを更新できません"
-#: actions/apigroupcreate.php:136 actions/newgroup.php:204
-#, fuzzy
-msgid "Could not create group."
-msgstr "アバターを保存できません"
-
-#: actions/apigroupcreate.php:147 actions/editgroup.php:259
-#: actions/newgroup.php:210
-#, fuzzy
-msgid "Could not create aliases."
-msgstr "アバターを保存できません"
-
-#: actions/apigroupcreate.php:166 actions/newgroup.php:224
-#, fuzzy
-msgid "Could not set group membership."
-msgstr "サブスクリプションを作成できません"
-
-#: actions/apigroupcreate.php:212 actions/editgroup.php:182
+#: actions/apigroupcreate.php:164 actions/editgroup.php:182
#: actions/newgroup.php:126 actions/profilesettings.php:208
#: actions/register.php:205
msgid "Nickname must have only lowercase letters and numbers and no spaces."
@@ -321,60 +308,60 @@ msgstr ""
"ニックネームには、小文字アルファベットと数字のみ使用できます。スペースは使用"
"できません。"
-#: actions/apigroupcreate.php:221 actions/editgroup.php:186
+#: 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 "そのニックネームは既に使用されています。他のものを試してみて下さい。"
-#: actions/apigroupcreate.php:228 actions/editgroup.php:189
+#: 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 "有効なニックネームではありません。"
-#: actions/apigroupcreate.php:244 actions/editgroup.php:195
+#: 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 "ホームページのURLが不適切です。"
-#: actions/apigroupcreate.php:253 actions/editgroup.php:198
+#: 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 "フルネームが長すぎます。(255字まで)"
-#: actions/apigroupcreate.php:261
+#: actions/apigroupcreate.php:213
#, fuzzy, php-format
msgid "Description is too long (max %d chars)."
msgstr "バイオグラフィが長すぎます。(最長140字)"
-#: actions/apigroupcreate.php:272 actions/editgroup.php:204
+#: 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 "場所が長すぎます。(255字まで)"
-#: actions/apigroupcreate.php:291 actions/editgroup.php:215
+#: actions/apigroupcreate.php:243 actions/editgroup.php:215
#: actions/newgroup.php:159
#, php-format
msgid "Too many aliases! Maximum %d."
msgstr ""
-#: actions/apigroupcreate.php:312 actions/editgroup.php:224
+#: actions/apigroupcreate.php:264 actions/editgroup.php:224
#: actions/newgroup.php:168
#, fuzzy, php-format
msgid "Invalid alias: \"%s\""
msgstr "不正なホームページ '%s'"
-#: actions/apigroupcreate.php:321 actions/editgroup.php:228
+#: actions/apigroupcreate.php:273 actions/editgroup.php:228
#: actions/newgroup.php:172
#, fuzzy, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr "そのニックネームは既に使用されています。他のものを試してみて下さい。"
-#: actions/apigroupcreate.php:334 actions/editgroup.php:234
+#: actions/apigroupcreate.php:286 actions/editgroup.php:234
#: actions/newgroup.php:178
msgid "Alias can't be the same as nickname."
msgstr ""
@@ -600,10 +587,10 @@ msgstr ""
msgid "There was a problem with your session token. Try again, please."
msgstr ""
-#: actions/avatarsettings.php:277 actions/emailsettings.php:255
-#: actions/grouplogo.php:319 actions/imsettings.php:220
-#: actions/recoverpassword.php:44 actions/smssettings.php:248
-#: lib/designsettings.php:304
+#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
+#: actions/emailsettings.php:255 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/recoverpassword.php:44
+#: actions/smssettings.php:248 lib/designsettings.php:304
msgid "Unexpected form submission."
msgstr "予期せぬフォーム送信です。"
@@ -667,7 +654,7 @@ msgstr "ユーザのアンブロックに失敗しました。"
msgid "Unblock"
msgstr "アンブロック"
-#: actions/blockedfromgroup.php:313
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:80
msgid "Unblock this user"
msgstr "このユーザをアンブロックする"
@@ -839,7 +826,7 @@ msgid "Delete this user"
msgstr "この通知を削除"
#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124
-#: lib/adminpanelaction.php:275 lib/groupnav.php:119
+#: lib/adminpanelaction.php:302 lib/groupnav.php:119
msgid "Design"
msgstr ""
@@ -847,106 +834,182 @@ msgstr ""
msgid "Design settings for this StatusNet site."
msgstr ""
-#: actions/designadminpanel.php:220
-msgid "Unable to delete design setting."
-msgstr ""
+#: actions/designadminpanel.php:278
+#, fuzzy
+msgid "Invalid logo URL."
+msgstr "不正なサイズ。"
-#: actions/designadminpanel.php:301
+#: actions/designadminpanel.php:282
#, fuzzy, php-format
msgid "Theme not available: %s"
msgstr "このページはあなたが承認したメディアタイプでは利用できません。"
-#: actions/designadminpanel.php:406
+#: actions/designadminpanel.php:288
+#, fuzzy, php-format
+msgid "Theme directory not readable: %s"
+msgstr "このページはあなたが承認したメディアタイプでは利用できません。"
+
+#: actions/designadminpanel.php:292
+#, php-format
+msgid "Avatar directory not writable: %s"
+msgstr ""
+
+#: actions/designadminpanel.php:296
+#, php-format
+msgid "Background directory not writable: %s"
+msgstr ""
+
+#: actions/designadminpanel.php:312
+#, php-format
+msgid "Max length for %s %s is 255 characters."
+msgstr ""
+
+#: actions/designadminpanel.php:412
+#, fuzzy
+msgid "Change logo"
+msgstr "パスワードの変更"
+
+#: actions/designadminpanel.php:417
+#, fuzzy
+msgid "Site logo"
+msgstr "新しい通知"
+
+#: actions/designadminpanel.php:424
#, fuzzy
msgid "Change theme"
msgstr "変更"
-#: actions/designadminpanel.php:410
-msgid "Theme"
-msgstr ""
+#: actions/designadminpanel.php:441
+#, fuzzy
+msgid "Site theme"
+msgstr "新しい通知"
-#: actions/designadminpanel.php:411
+#: actions/designadminpanel.php:442
#, fuzzy
msgid "Theme for the site."
msgstr "サイトからログアウト"
-#: actions/designadminpanel.php:420 lib/designsettings.php:101
+#: actions/designadminpanel.php:447
+msgid "Theme server"
+msgstr ""
+
+#: actions/designadminpanel.php:451
+msgid "Theme path"
+msgstr ""
+
+#: actions/designadminpanel.php:455
+msgid "Theme directory"
+msgstr ""
+
+#: actions/designadminpanel.php:462
+#, fuzzy
+msgid "Avatar Settings"
+msgstr "設定"
+
+#: actions/designadminpanel.php:467
+#, fuzzy
+msgid "Avatar server"
+msgstr "設定"
+
+#: actions/designadminpanel.php:471
+#, fuzzy
+msgid "Avatar path"
+msgstr "アバターが更新されました。"
+
+#: actions/designadminpanel.php:475
+#, fuzzy
+msgid "Avatar directory"
+msgstr "アバターが更新されました。"
+
+#: actions/designadminpanel.php:486 lib/designsettings.php:101
msgid "Change background image"
msgstr ""
-#: actions/designadminpanel.php:424 actions/designadminpanel.php:498
+#: actions/designadminpanel.php:491 actions/designadminpanel.php:578
#: lib/designsettings.php:178
msgid "Background"
msgstr ""
-#: actions/designadminpanel.php:429
+#: actions/designadminpanel.php:496
#, fuzzy, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
"$s."
msgstr "長すぎます。通知は最大 140 字までです。"
-#: actions/designadminpanel.php:459 lib/designsettings.php:139
+#: actions/designadminpanel.php:526 lib/designsettings.php:139
msgid "On"
msgstr ""
-#: actions/designadminpanel.php:475 lib/designsettings.php:155
+#: actions/designadminpanel.php:542 lib/designsettings.php:155
msgid "Off"
msgstr ""
-#: actions/designadminpanel.php:476 lib/designsettings.php:156
+#: actions/designadminpanel.php:543 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr ""
-#: actions/designadminpanel.php:481 lib/designsettings.php:161
+#: actions/designadminpanel.php:548 lib/designsettings.php:161
msgid "Tile background image"
msgstr ""
-#: actions/designadminpanel.php:490 lib/designsettings.php:170
+#: actions/designadminpanel.php:554
+msgid "Background server"
+msgstr ""
+
+#: actions/designadminpanel.php:558
+msgid "Background path"
+msgstr ""
+
+#: actions/designadminpanel.php:562
+msgid "Background directory"
+msgstr ""
+
+#: actions/designadminpanel.php:569 lib/designsettings.php:170
#, fuzzy
msgid "Change colours"
msgstr "パスワードの変更"
-#: actions/designadminpanel.php:511 lib/designsettings.php:191
+#: actions/designadminpanel.php:591 lib/designsettings.php:191
msgid "Content"
msgstr "内容"
-#: actions/designadminpanel.php:524 lib/designsettings.php:204
+#: actions/designadminpanel.php:604 lib/designsettings.php:204
#, fuzzy
msgid "Sidebar"
msgstr "検索"
-#: actions/designadminpanel.php:537 lib/designsettings.php:217
+#: actions/designadminpanel.php:617 lib/designsettings.php:217
msgid "Text"
msgstr ""
-#: actions/designadminpanel.php:550 lib/designsettings.php:230
+#: actions/designadminpanel.php:630 lib/designsettings.php:230
#, fuzzy
msgid "Links"
msgstr "ログイン"
-#: actions/designadminpanel.php:611 lib/designsettings.php:247
+#: actions/designadminpanel.php:658 lib/designsettings.php:247
msgid "Use defaults"
msgstr ""
-#: actions/designadminpanel.php:612 lib/designsettings.php:248
+#: actions/designadminpanel.php:659 lib/designsettings.php:248
msgid "Restore default designs"
msgstr ""
-#: actions/designadminpanel.php:618 lib/designsettings.php:254
+#: actions/designadminpanel.php:665 lib/designsettings.php:254
msgid "Reset back to default"
msgstr ""
-#: actions/designadminpanel.php:620 actions/emailsettings.php:195
+#: actions/designadminpanel.php:667 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/profilesettings.php:167 actions/siteadminpanel.php:371
+#: actions/profilesettings.php:167 actions/siteadminpanel.php:414
#: actions/smssettings.php:181 actions/subscriptions.php:203
#: actions/tagother.php:154 actions/useradminpanel.php:226
#: lib/designsettings.php:256 lib/groupeditform.php:202
msgid "Save"
msgstr "保存"
-#: actions/designadminpanel.php:621 lib/designsettings.php:257
+#: actions/designadminpanel.php:668 lib/designsettings.php:257
msgid "Save design"
msgstr ""
@@ -990,6 +1053,11 @@ msgstr "バイオグラフィが長すぎます。(最長140字)"
msgid "Could not update group."
msgstr "ユーザを更新できません"
+#: actions/editgroup.php:259 classes/User_group.php:390
+#, fuzzy
+msgid "Could not create aliases."
+msgstr "アバターを保存できません"
+
#: actions/editgroup.php:269
#, fuzzy
msgid "Options saved."
@@ -1107,7 +1175,7 @@ msgstr ""
msgid "Cannot normalize that email address"
msgstr "そのメールアドレスを正規化できません"
-#: actions/emailsettings.php:330 actions/siteadminpanel.php:156
+#: actions/emailsettings.php:330 actions/siteadminpanel.php:158
msgid "Not a valid email address"
msgstr ""
@@ -1833,10 +1901,10 @@ msgstr "不正な通知内容"
msgid "Incorrect username or password."
msgstr "ユーザ名またはパスワードが間違っています。"
-#: actions/login.php:149 actions/recoverpassword.php:375
-#: actions/register.php:248
-msgid "Error setting user."
-msgstr "ユーザ設定エラー"
+#: actions/login.php:149
+#, fuzzy
+msgid "Error setting user. You are probably not authorized."
+msgstr "認証されていません。"
#: actions/login.php:204 actions/login.php:257 lib/action.php:457
#: lib/logingroupnav.php:79
@@ -2257,7 +2325,7 @@ msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:275
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:309
msgid "Language"
msgstr ""
@@ -2283,7 +2351,7 @@ msgstr "自分を購読している者を自動的に購読する (非人間に
msgid "Bio is too long (max %d chars)."
msgstr "自己紹介が長すぎます (最長140文字)。"
-#: actions/profilesettings.php:228 actions/siteadminpanel.php:163
+#: actions/profilesettings.php:228 actions/siteadminpanel.php:165
msgid "Timezone not selected."
msgstr ""
@@ -2526,6 +2594,10 @@ msgstr "パスワードは6字以上でなければいけません。"
msgid "Password and confirmation do not match."
msgstr "パスワードと確認が一致しません。"
+#: actions/recoverpassword.php:375 actions/register.php:248
+msgid "Error setting user."
+msgstr "ユーザ設定エラー"
+
#: actions/recoverpassword.php:382
msgid "New password successfully saved. You are now logged in."
msgstr "新しいパスワードの保存に成功しました。ログインしています。"
@@ -2588,7 +2660,7 @@ msgid "Same as password above. Required."
msgstr ""
#: actions/register.php:437 actions/register.php:441
-#: actions/siteadminpanel.php:253 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:287 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "メール"
@@ -3032,7 +3104,7 @@ msgstr ""
msgid "User is already silenced."
msgstr "プロファイルがありません。"
-#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:272
+#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:299
msgid "Site"
msgstr ""
@@ -3040,121 +3112,234 @@ msgstr ""
msgid "Basic settings for this StatusNet site."
msgstr ""
-#: actions/siteadminpanel.php:145
+#: actions/siteadminpanel.php:147
msgid "Site name must have non-zero length."
msgstr ""
-#: actions/siteadminpanel.php:153
+#: actions/siteadminpanel.php:155
#, fuzzy
msgid "You must have a valid contact email address"
msgstr "有効なメールアドレスではありません。"
-#: actions/siteadminpanel.php:171
+#: actions/siteadminpanel.php:173
#, php-format
msgid "Unknown language \"%s\""
msgstr ""
-#: actions/siteadminpanel.php:178
+#: actions/siteadminpanel.php:180
msgid "Invalid snapshot report URL."
msgstr ""
-#: actions/siteadminpanel.php:184
+#: actions/siteadminpanel.php:186
msgid "Invalid snapshot run value."
msgstr ""
-#: actions/siteadminpanel.php:190
+#: actions/siteadminpanel.php:192
msgid "Snapshot frequency must be a number."
msgstr ""
-#: actions/siteadminpanel.php:241
+#: actions/siteadminpanel.php:199
+msgid "You must set an SSL sever when enabling SSL."
+msgstr ""
+
+#: actions/siteadminpanel.php:204
+msgid "Invalid SSL server. Max length is 255 characters."
+msgstr ""
+
+#: actions/siteadminpanel.php:210
+msgid "Minimum text limit is 140c."
+msgstr ""
+
+#: actions/siteadminpanel.php:216
+msgid "Dupe limit must 1 or more seconds."
+msgstr ""
+
+#: actions/siteadminpanel.php:224
+#, php-format
+msgid "Locales directory not readable: %s"
+msgstr ""
+
+#: actions/siteadminpanel.php:275
#, fuzzy
msgid "Site name"
msgstr "新しい通知"
-#: actions/siteadminpanel.php:242
+#: actions/siteadminpanel.php:276
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr ""
-#: actions/siteadminpanel.php:245
+#: actions/siteadminpanel.php:279
msgid "Brought by"
msgstr ""
-#: actions/siteadminpanel.php:246
+#: actions/siteadminpanel.php:280
msgid "Text used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:249
+#: actions/siteadminpanel.php:283
msgid "Brought by URL"
msgstr ""
-#: actions/siteadminpanel.php:250
+#: actions/siteadminpanel.php:284
msgid "URL used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:254
+#: actions/siteadminpanel.php:288
#, fuzzy
msgid "contact email address for your site"
msgstr "そのユーザにはメールアドレスの登録がありません。"
-#: actions/siteadminpanel.php:268
+#: actions/siteadminpanel.php:302
msgid "Default timezone"
msgstr ""
-#: actions/siteadminpanel.php:269
+#: actions/siteadminpanel.php:303
msgid "Default timezone for the site; usually UTC."
msgstr ""
-#: actions/siteadminpanel.php:276
+#: actions/siteadminpanel.php:310
msgid "Default site language"
msgstr ""
-#: actions/siteadminpanel.php:282
+#: actions/siteadminpanel.php:316
+msgid "Path to locales"
+msgstr ""
+
+#: actions/siteadminpanel.php:316
+msgid "Directory path to locales"
+msgstr ""
+
+#: actions/siteadminpanel.php:320
+#, fuzzy
+msgid "Server"
+msgstr "回復"
+
+#: actions/siteadminpanel.php:320
+msgid "Site's server hostname."
+msgstr ""
+
+#: actions/siteadminpanel.php:324
+msgid "Path"
+msgstr ""
+
+#: actions/siteadminpanel.php:324
+#, fuzzy
+msgid "Site path"
+msgstr "新しい通知"
+
+#: actions/siteadminpanel.php:328
+msgid "Fancy URLs"
+msgstr ""
+
+#: actions/siteadminpanel.php:330
+msgid "Use fancy (more readable and memorable) URLs?"
+msgstr ""
+
+#: actions/siteadminpanel.php:334
#, fuzzy
msgid "Private"
msgstr "プライバシー"
-#: actions/siteadminpanel.php:284
+#: actions/siteadminpanel.php:336
msgid "Prohibit anonymous users (not logged in) from viewing site?"
msgstr ""
-#: actions/siteadminpanel.php:290
+#: actions/siteadminpanel.php:340
+msgid "Invite only"
+msgstr ""
+
+#: actions/siteadminpanel.php:342
+msgid "Make registration invitation only."
+msgstr ""
+
+#: actions/siteadminpanel.php:346 actions/useradminpanel.php:171
+#, fuzzy
+msgid "Closed"
+msgstr "ブロック"
+
+#: actions/siteadminpanel.php:348
+msgid "Disable new registrations."
+msgstr ""
+
+#: actions/siteadminpanel.php:353
msgid "Randomly during Web hit"
msgstr ""
-#: actions/siteadminpanel.php:291
+#: actions/siteadminpanel.php:354
msgid "In a scheduled job"
msgstr ""
-#: actions/siteadminpanel.php:292
+#: actions/siteadminpanel.php:355 actions/siteadminpanel.php:380
#, fuzzy
msgid "Never"
msgstr "回復"
-#: actions/siteadminpanel.php:294
+#: actions/siteadminpanel.php:357
msgid "Data snapshots"
msgstr ""
-#: actions/siteadminpanel.php:295
+#: actions/siteadminpanel.php:358
msgid "When to send statistical data to status.net servers"
msgstr ""
-#: actions/siteadminpanel.php:301
+#: actions/siteadminpanel.php:364
msgid "Frequency"
msgstr ""
-#: actions/siteadminpanel.php:302
+#: actions/siteadminpanel.php:365
msgid "Snapshots will be sent once every N Web hits"
msgstr ""
-#: actions/siteadminpanel.php:309
+#: actions/siteadminpanel.php:372
msgid "Report URL"
msgstr ""
-#: actions/siteadminpanel.php:310
+#: actions/siteadminpanel.php:373
msgid "Snapshots will be sent to this URL"
msgstr ""
-#: actions/siteadminpanel.php:371 actions/useradminpanel.php:226
+#: actions/siteadminpanel.php:381
+#, fuzzy
+msgid "Sometimes"
+msgstr "通知"
+
+#: actions/siteadminpanel.php:382
+msgid "Always"
+msgstr ""
+
+#: actions/siteadminpanel.php:384
+msgid "Use SSL"
+msgstr ""
+
+#: actions/siteadminpanel.php:385
+msgid "When to use SSL"
+msgstr ""
+
+#: actions/siteadminpanel.php:391
+msgid "SSL Server"
+msgstr ""
+
+#: actions/siteadminpanel.php:392
+msgid "Server to direct SSL requests to"
+msgstr ""
+
+#: actions/siteadminpanel.php:396
+msgid "Text limit"
+msgstr ""
+
+#: actions/siteadminpanel.php:396
+msgid "Maximum number of characters for notices."
+msgstr ""
+
+#: actions/siteadminpanel.php:400
+msgid "Dupe limit"
+msgstr ""
+
+#: actions/siteadminpanel.php:400
+msgid "How long users must wait (in seconds) to post the same thing again."
+msgstr ""
+
+#: actions/siteadminpanel.php:414 actions/useradminpanel.php:226
#, fuzzy
msgid "Save site settings"
msgstr "設定"
@@ -3470,11 +3655,6 @@ msgstr ""
msgid "User settings for this StatusNet site."
msgstr ""
-#: actions/useradminpanel.php:171
-#, fuzzy
-msgid "Closed"
-msgstr "ブロック"
-
#: actions/useradminpanel.php:173
msgid "Is registration on this site prohibited?"
msgstr ""
@@ -3693,6 +3873,16 @@ msgstr "通知を保存する際に問題が発生しました。"
msgid "DB error inserting reply: %s"
msgstr "返信を追加する際にデータベースエラー : %s"
+#: classes/User_group.php:380
+#, fuzzy
+msgid "Could not create group."
+msgstr "アバターを保存できません"
+
+#: classes/User_group.php:409
+#, fuzzy
+msgid "Could not set group membership."
+msgstr "サブスクリプションを作成できません"
+
#: classes/User.php:347
#, php-format
msgid "Welcome to %1$s, @%2$s!"
@@ -3935,12 +4125,16 @@ msgstr ""
msgid "saveSettings() not implemented."
msgstr ""
-#: lib/adminpanelaction.php:273
+#: lib/adminpanelaction.php:247
+msgid "Unable to delete design setting."
+msgstr ""
+
+#: lib/adminpanelaction.php:300
#, fuzzy
msgid "Basic site configuration"
msgstr "メールアドレス確認"
-#: lib/adminpanelaction.php:276
+#: lib/adminpanelaction.php:303
#, fuzzy
msgid "Design configuration"
msgstr "メールアドレス確認"
@@ -4188,20 +4382,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:203
+#: lib/common.php:199
#, fuzzy
msgid "No configuration file found. "
msgstr "確認コードがありません。"
-#: lib/common.php:204
+#: lib/common.php:200
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:205
+#: lib/common.php:201
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:206
+#: lib/common.php:202
#, fuzzy
msgid "Go to the installer."
msgstr "サイトへログイン"
@@ -4965,11 +5159,6 @@ msgstr ""
msgid "Top posters"
msgstr "上位投稿者"
-#: lib/unblockform.php:80
-#, fuzzy
-msgid "Unlock this user"
-msgstr "このユーザをアンブロックする"
-
#: lib/unsandboxform.php:69
msgid "Unsandbox"
msgstr ""
@@ -5022,47 +5211,47 @@ msgstr ""
msgid "Message"
msgstr ""
-#: lib/util.php:821
+#: lib/util.php:826
msgid "a few seconds ago"
msgstr "数秒前"
-#: lib/util.php:823
+#: lib/util.php:828
msgid "about a minute ago"
msgstr "約 1 分前"
-#: lib/util.php:825
+#: lib/util.php:830
#, php-format
msgid "about %d minutes ago"
msgstr "約 %d 分前"
-#: lib/util.php:827
+#: lib/util.php:832
msgid "about an hour ago"
msgstr "約 1 時間前"
-#: lib/util.php:829
+#: lib/util.php:834
#, php-format
msgid "about %d hours ago"
msgstr "約 %d 時間前"
-#: lib/util.php:831
+#: lib/util.php:836
msgid "about a day ago"
msgstr "約 1 日前"
-#: lib/util.php:833
+#: lib/util.php:838
#, php-format
msgid "about %d days ago"
msgstr "約 %d 日前"
-#: lib/util.php:835
+#: lib/util.php:840
msgid "about a month ago"
msgstr "約 1 ヵ月前"
-#: lib/util.php:837
+#: lib/util.php:842
#, php-format
msgid "about %d months ago"
msgstr "約 %d ヵ月前"
-#: lib/util.php:839
+#: lib/util.php:844
msgid "about a year ago"
msgstr "約 1 年前"
@@ -5093,5 +5282,9 @@ msgid "Sorry, no incoming email allowed."
msgstr ""
#, fuzzy
+#~ msgid "Unlock this user"
+#~ msgstr "このユーザをアンブロックする"
+
+#, fuzzy
#~ msgid "These people are subscribed to you: "
#~ msgstr "リモートサブスクライブ"
diff --git a/locale/ko/LC_MESSAGES/statusnet.po b/locale/ko/LC_MESSAGES/statusnet.po
index b3cf335b8..767c4e75f 100644
--- a/locale/ko/LC_MESSAGES/statusnet.po
+++ b/locale/ko/LC_MESSAGES/statusnet.po
@@ -1,15 +1,18 @@
# Translation of StatusNet to Korean
#
# --
+# 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-18 19:31+0000\n"
+"POT-Creation-Date: 2009-11-19 10:43+0000\n"
"PO-Revision-Date: 2009-11-18 19:32:10+0000\n"
"Language-Team: Korean\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: MediaWiki 1.16alpha(r59207); Translate extension (2009-11-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ko\n"
@@ -145,7 +148,7 @@ msgstr "사용자를 업데이트 할 수 없습니다."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
-#: actions/designadminpanel.php:125 actions/newnotice.php:94
+#: actions/designadminpanel.php:122 actions/newnotice.php:94
#: lib/designsettings.php:283
#, php-format
msgid ""
@@ -229,7 +232,7 @@ msgstr "%s에게 모든 직접 메시지"
#: 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:184 actions/apigroupismember.php:114
+#: 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
@@ -298,21 +301,7 @@ msgstr "공개 stream을 불러올 수 없습니다."
msgid "Could not find target user."
msgstr "어떠한 상태도 찾을 수 없습니다."
-#: actions/apigroupcreate.php:136 actions/newgroup.php:204
-msgid "Could not create group."
-msgstr "새 그룹을 만들 수 없습니다."
-
-#: actions/apigroupcreate.php:147 actions/editgroup.php:259
-#: actions/newgroup.php:210
-#, fuzzy
-msgid "Could not create aliases."
-msgstr "좋아하는 게시글을 생성할 수 없습니다."
-
-#: actions/apigroupcreate.php:166 actions/newgroup.php:224
-msgid "Could not set group membership."
-msgstr "그룹 맴버십을 세팅할 수 없습니다."
-
-#: actions/apigroupcreate.php:212 actions/editgroup.php:182
+#: actions/apigroupcreate.php:164 actions/editgroup.php:182
#: actions/newgroup.php:126 actions/profilesettings.php:208
#: actions/register.php:205
msgid "Nickname must have only lowercase letters and numbers and no spaces."
@@ -320,60 +309,60 @@ msgstr ""
"별명은 반드시 영소문자와 숫자로만 이루어져야 하며 스페이스의 사용이 불가 합니"
"다."
-#: actions/apigroupcreate.php:221 actions/editgroup.php:186
+#: 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 "별명이 이미 사용중 입니다. 다른 별명을 시도해 보십시오."
-#: actions/apigroupcreate.php:228 actions/editgroup.php:189
+#: 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 "유효한 별명이 아닙니다"
-#: actions/apigroupcreate.php:244 actions/editgroup.php:195
+#: 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 "홈페이지 주소형식이 올바르지 않습니다."
-#: actions/apigroupcreate.php:253 actions/editgroup.php:198
+#: 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 "실명이 너무 깁니다. (최대 255글자)"
-#: actions/apigroupcreate.php:261
+#: actions/apigroupcreate.php:213
#, fuzzy, php-format
msgid "Description is too long (max %d chars)."
msgstr "설명이 너무 길어요. (최대 140글자)"
-#: actions/apigroupcreate.php:272 actions/editgroup.php:204
+#: 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 "위치가 너무 깁니다. (최대 255글자)"
-#: actions/apigroupcreate.php:291 actions/editgroup.php:215
+#: actions/apigroupcreate.php:243 actions/editgroup.php:215
#: actions/newgroup.php:159
#, php-format
msgid "Too many aliases! Maximum %d."
msgstr ""
-#: actions/apigroupcreate.php:312 actions/editgroup.php:224
+#: actions/apigroupcreate.php:264 actions/editgroup.php:224
#: actions/newgroup.php:168
#, fuzzy, php-format
msgid "Invalid alias: \"%s\""
msgstr "유효하지 않은태그: \"%s\""
-#: actions/apigroupcreate.php:321 actions/editgroup.php:228
+#: actions/apigroupcreate.php:273 actions/editgroup.php:228
#: actions/newgroup.php:172
#, fuzzy, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr "별명이 이미 사용중 입니다. 다른 별명을 시도해 보십시오."
-#: actions/apigroupcreate.php:334 actions/editgroup.php:234
+#: actions/apigroupcreate.php:286 actions/editgroup.php:234
#: actions/newgroup.php:178
msgid "Alias can't be the same as nickname."
msgstr ""
@@ -598,10 +587,10 @@ msgstr "자르기"
msgid "There was a problem with your session token. Try again, please."
msgstr "세션토큰에 문제가 있습니다. 다시 시도해주세요."
-#: actions/avatarsettings.php:277 actions/emailsettings.php:255
-#: actions/grouplogo.php:319 actions/imsettings.php:220
-#: actions/recoverpassword.php:44 actions/smssettings.php:248
-#: lib/designsettings.php:304
+#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
+#: actions/emailsettings.php:255 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/recoverpassword.php:44
+#: actions/smssettings.php:248 lib/designsettings.php:304
msgid "Unexpected form submission."
msgstr "잘못된 폼 제출"
@@ -664,7 +653,7 @@ msgstr "사용자 차단 해제에 실패했습니다."
msgid "Unblock"
msgstr "차단해제"
-#: actions/blockedfromgroup.php:313
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:80
msgid "Unblock this user"
msgstr "이 사용자를 차단해제합니다."
@@ -839,7 +828,7 @@ msgid "Delete this user"
msgstr "이 게시글 삭제하기"
#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124
-#: lib/adminpanelaction.php:275 lib/groupnav.php:119
+#: lib/adminpanelaction.php:302 lib/groupnav.php:119
msgid "Design"
msgstr ""
@@ -847,108 +836,183 @@ msgstr ""
msgid "Design settings for this StatusNet site."
msgstr ""
-#: actions/designadminpanel.php:220
+#: actions/designadminpanel.php:278
#, fuzzy
-msgid "Unable to delete design setting."
-msgstr "트위터 환경설정을 저장할 수 없습니다."
+msgid "Invalid logo URL."
+msgstr "옳지 않은 크기"
-#: actions/designadminpanel.php:301
+#: actions/designadminpanel.php:282
#, fuzzy, php-format
msgid "Theme not available: %s"
msgstr "이 페이지는 귀하가 승인한 미디어 타입에서는 이용할 수 없습니다."
-#: actions/designadminpanel.php:406
+#: actions/designadminpanel.php:288
+#, fuzzy, php-format
+msgid "Theme directory not readable: %s"
+msgstr "이 페이지는 귀하가 승인한 미디어 타입에서는 이용할 수 없습니다."
+
+#: actions/designadminpanel.php:292
+#, php-format
+msgid "Avatar directory not writable: %s"
+msgstr ""
+
+#: actions/designadminpanel.php:296
+#, php-format
+msgid "Background directory not writable: %s"
+msgstr ""
+
+#: actions/designadminpanel.php:312
+#, php-format
+msgid "Max length for %s %s is 255 characters."
+msgstr ""
+
+#: actions/designadminpanel.php:412
+#, fuzzy
+msgid "Change logo"
+msgstr "비밀번호 바꾸기"
+
+#: actions/designadminpanel.php:417
+#, fuzzy
+msgid "Site logo"
+msgstr "초대"
+
+#: actions/designadminpanel.php:424
#, fuzzy
msgid "Change theme"
msgstr "변환"
-#: actions/designadminpanel.php:410
-msgid "Theme"
-msgstr ""
+#: actions/designadminpanel.php:441
+#, fuzzy
+msgid "Site theme"
+msgstr "사이트 공지"
-#: actions/designadminpanel.php:411
+#: actions/designadminpanel.php:442
#, fuzzy
msgid "Theme for the site."
msgstr "이 사이트로부터 로그아웃"
-#: actions/designadminpanel.php:420 lib/designsettings.php:101
+#: actions/designadminpanel.php:447
+msgid "Theme server"
+msgstr ""
+
+#: actions/designadminpanel.php:451
+msgid "Theme path"
+msgstr ""
+
+#: actions/designadminpanel.php:455
+msgid "Theme directory"
+msgstr ""
+
+#: actions/designadminpanel.php:462
+#, fuzzy
+msgid "Avatar Settings"
+msgstr "아바타 설정"
+
+#: actions/designadminpanel.php:467
+#, fuzzy
+msgid "Avatar server"
+msgstr "아바타 설정"
+
+#: actions/designadminpanel.php:471
+#, fuzzy
+msgid "Avatar path"
+msgstr "아바타가 업데이트 되었습니다."
+
+#: actions/designadminpanel.php:475
+#, fuzzy
+msgid "Avatar directory"
+msgstr "아바타가 업데이트 되었습니다."
+
+#: actions/designadminpanel.php:486 lib/designsettings.php:101
msgid "Change background image"
msgstr ""
-#: actions/designadminpanel.php:424 actions/designadminpanel.php:498
+#: actions/designadminpanel.php:491 actions/designadminpanel.php:578
#: lib/designsettings.php:178
msgid "Background"
msgstr ""
-#: actions/designadminpanel.php:429
+#: actions/designadminpanel.php:496
#, fuzzy, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
"$s."
msgstr "당신그룹의 로고 이미지를 업로드할 수 있습니다."
-#: actions/designadminpanel.php:459 lib/designsettings.php:139
+#: actions/designadminpanel.php:526 lib/designsettings.php:139
msgid "On"
msgstr ""
-#: actions/designadminpanel.php:475 lib/designsettings.php:155
+#: actions/designadminpanel.php:542 lib/designsettings.php:155
msgid "Off"
msgstr ""
-#: actions/designadminpanel.php:476 lib/designsettings.php:156
+#: actions/designadminpanel.php:543 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr ""
-#: actions/designadminpanel.php:481 lib/designsettings.php:161
+#: actions/designadminpanel.php:548 lib/designsettings.php:161
msgid "Tile background image"
msgstr ""
-#: actions/designadminpanel.php:490 lib/designsettings.php:170
+#: actions/designadminpanel.php:554
+msgid "Background server"
+msgstr ""
+
+#: actions/designadminpanel.php:558
+msgid "Background path"
+msgstr ""
+
+#: actions/designadminpanel.php:562
+msgid "Background directory"
+msgstr ""
+
+#: actions/designadminpanel.php:569 lib/designsettings.php:170
#, fuzzy
msgid "Change colours"
msgstr "비밀번호 바꾸기"
-#: actions/designadminpanel.php:511 lib/designsettings.php:191
+#: actions/designadminpanel.php:591 lib/designsettings.php:191
#, fuzzy
msgid "Content"
msgstr "연결"
-#: actions/designadminpanel.php:524 lib/designsettings.php:204
+#: actions/designadminpanel.php:604 lib/designsettings.php:204
#, fuzzy
msgid "Sidebar"
msgstr "검색"
-#: actions/designadminpanel.php:537 lib/designsettings.php:217
+#: actions/designadminpanel.php:617 lib/designsettings.php:217
msgid "Text"
msgstr "문자"
-#: actions/designadminpanel.php:550 lib/designsettings.php:230
+#: actions/designadminpanel.php:630 lib/designsettings.php:230
#, fuzzy
msgid "Links"
msgstr "로그인"
-#: actions/designadminpanel.php:611 lib/designsettings.php:247
+#: actions/designadminpanel.php:658 lib/designsettings.php:247
msgid "Use defaults"
msgstr ""
-#: actions/designadminpanel.php:612 lib/designsettings.php:248
+#: actions/designadminpanel.php:659 lib/designsettings.php:248
msgid "Restore default designs"
msgstr ""
-#: actions/designadminpanel.php:618 lib/designsettings.php:254
+#: actions/designadminpanel.php:665 lib/designsettings.php:254
msgid "Reset back to default"
msgstr ""
-#: actions/designadminpanel.php:620 actions/emailsettings.php:195
+#: actions/designadminpanel.php:667 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/profilesettings.php:167 actions/siteadminpanel.php:371
+#: actions/profilesettings.php:167 actions/siteadminpanel.php:414
#: actions/smssettings.php:181 actions/subscriptions.php:203
#: actions/tagother.php:154 actions/useradminpanel.php:226
#: lib/designsettings.php:256 lib/groupeditform.php:202
msgid "Save"
msgstr "저장"
-#: actions/designadminpanel.php:621 lib/designsettings.php:257
+#: actions/designadminpanel.php:668 lib/designsettings.php:257
msgid "Save design"
msgstr ""
@@ -991,6 +1055,11 @@ msgstr "설명이 너무 길어요. (최대 140글자)"
msgid "Could not update group."
msgstr "그룹을 업데이트 할 수 없습니다."
+#: actions/editgroup.php:259 classes/User_group.php:390
+#, fuzzy
+msgid "Could not create aliases."
+msgstr "좋아하는 게시글을 생성할 수 없습니다."
+
#: actions/editgroup.php:269
msgid "Options saved."
msgstr "옵션들이 저장되었습니다."
@@ -1108,7 +1177,7 @@ msgstr "이메일이 추가 되지 않았습니다."
msgid "Cannot normalize that email address"
msgstr "그 이메일 주소를 정규화 할 수 없습니다."
-#: actions/emailsettings.php:330 actions/siteadminpanel.php:156
+#: actions/emailsettings.php:330 actions/siteadminpanel.php:158
msgid "Not a valid email address"
msgstr "유효한 이메일 주소가 아닙니다."
@@ -1830,10 +1899,10 @@ msgstr "옳지 않은 통지 내용"
msgid "Incorrect username or password."
msgstr "틀린 계정 또는 비밀 번호"
-#: actions/login.php:149 actions/recoverpassword.php:375
-#: actions/register.php:248
-msgid "Error setting user."
-msgstr "사용자 세팅 오류"
+#: actions/login.php:149
+#, fuzzy
+msgid "Error setting user. You are probably not authorized."
+msgstr "인증이 되지 않았습니다."
#: actions/login.php:204 actions/login.php:257 lib/action.php:457
#: lib/logingroupnav.php:79
@@ -2257,7 +2326,7 @@ msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr "당신을 위한 태그, (문자,숫자,-, ., _로 구성) 콤마 혹은 공백으로 구분."
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:275
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:309
msgid "Language"
msgstr "언어"
@@ -2283,7 +2352,7 @@ msgstr "나에게 구독하는 사람에게 자동 구독 신청"
msgid "Bio is too long (max %d chars)."
msgstr "자기소개가 너무 깁니다. (최대 140글자)"
-#: actions/profilesettings.php:228 actions/siteadminpanel.php:163
+#: actions/profilesettings.php:228 actions/siteadminpanel.php:165
msgid "Timezone not selected."
msgstr "타임존이 설정 되지 않았습니다."
@@ -2526,6 +2595,10 @@ msgstr "비밀 번호는 6자 이상이어야 합니다."
msgid "Password and confirmation do not match."
msgstr "비밀 번호가 일치하지 않습니다."
+#: actions/recoverpassword.php:375 actions/register.php:248
+msgid "Error setting user."
+msgstr "사용자 세팅 오류"
+
#: actions/recoverpassword.php:382
msgid "New password successfully saved. You are now logged in."
msgstr ""
@@ -2590,7 +2663,7 @@ msgid "Same as password above. Required."
msgstr "위와 같은 비밀 번호. 필수 사항."
#: actions/register.php:437 actions/register.php:441
-#: actions/siteadminpanel.php:253 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:287 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "이메일"
@@ -3036,7 +3109,7 @@ msgstr "당신은 이 사용자에게 메시지를 보낼 수 없습니다."
msgid "User is already silenced."
msgstr "회원이 당신을 차단해왔습니다."
-#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:272
+#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:299
#, fuzzy
msgid "Site"
msgstr "초대"
@@ -3045,122 +3118,236 @@ msgstr "초대"
msgid "Basic settings for this StatusNet site."
msgstr ""
-#: actions/siteadminpanel.php:145
+#: actions/siteadminpanel.php:147
msgid "Site name must have non-zero length."
msgstr ""
-#: actions/siteadminpanel.php:153
+#: actions/siteadminpanel.php:155
#, fuzzy
msgid "You must have a valid contact email address"
msgstr "유효한 이메일 주소가 아닙니다."
-#: actions/siteadminpanel.php:171
+#: actions/siteadminpanel.php:173
#, php-format
msgid "Unknown language \"%s\""
msgstr ""
-#: actions/siteadminpanel.php:178
+#: actions/siteadminpanel.php:180
msgid "Invalid snapshot report URL."
msgstr ""
-#: actions/siteadminpanel.php:184
+#: actions/siteadminpanel.php:186
msgid "Invalid snapshot run value."
msgstr ""
-#: actions/siteadminpanel.php:190
+#: actions/siteadminpanel.php:192
msgid "Snapshot frequency must be a number."
msgstr ""
-#: actions/siteadminpanel.php:241
+#: actions/siteadminpanel.php:199
+msgid "You must set an SSL sever when enabling SSL."
+msgstr ""
+
+#: actions/siteadminpanel.php:204
+msgid "Invalid SSL server. Max length is 255 characters."
+msgstr ""
+
+#: actions/siteadminpanel.php:210
+msgid "Minimum text limit is 140c."
+msgstr ""
+
+#: actions/siteadminpanel.php:216
+msgid "Dupe limit must 1 or more seconds."
+msgstr ""
+
+#: actions/siteadminpanel.php:224
+#, php-format
+msgid "Locales directory not readable: %s"
+msgstr ""
+
+#: actions/siteadminpanel.php:275
#, fuzzy
msgid "Site name"
msgstr "사이트 공지"
-#: actions/siteadminpanel.php:242
+#: actions/siteadminpanel.php:276
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr ""
-#: actions/siteadminpanel.php:245
+#: actions/siteadminpanel.php:279
msgid "Brought by"
msgstr ""
-#: actions/siteadminpanel.php:246
+#: actions/siteadminpanel.php:280
msgid "Text used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:249
+#: actions/siteadminpanel.php:283
msgid "Brought by URL"
msgstr ""
-#: actions/siteadminpanel.php:250
+#: actions/siteadminpanel.php:284
msgid "URL used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:254
+#: actions/siteadminpanel.php:288
#, fuzzy
msgid "contact email address for your site"
msgstr "%s에 포스팅 할 새로운 이메일 주소"
-#: actions/siteadminpanel.php:268
+#: actions/siteadminpanel.php:302
msgid "Default timezone"
msgstr ""
-#: actions/siteadminpanel.php:269
+#: actions/siteadminpanel.php:303
msgid "Default timezone for the site; usually UTC."
msgstr ""
-#: actions/siteadminpanel.php:276
+#: actions/siteadminpanel.php:310
#, fuzzy
msgid "Default site language"
msgstr "언어 설정"
-#: actions/siteadminpanel.php:282
+#: actions/siteadminpanel.php:316
+msgid "Path to locales"
+msgstr ""
+
+#: actions/siteadminpanel.php:316
+msgid "Directory path to locales"
+msgstr ""
+
+#: actions/siteadminpanel.php:320
+#, fuzzy
+msgid "Server"
+msgstr "복구"
+
+#: actions/siteadminpanel.php:320
+msgid "Site's server hostname."
+msgstr ""
+
+#: actions/siteadminpanel.php:324
+msgid "Path"
+msgstr ""
+
+#: actions/siteadminpanel.php:324
+#, fuzzy
+msgid "Site path"
+msgstr "사이트 공지"
+
+#: actions/siteadminpanel.php:328
+msgid "Fancy URLs"
+msgstr ""
+
+#: actions/siteadminpanel.php:330
+msgid "Use fancy (more readable and memorable) URLs?"
+msgstr ""
+
+#: actions/siteadminpanel.php:334
#, fuzzy
msgid "Private"
msgstr "개인정보 취급방침"
-#: actions/siteadminpanel.php:284
+#: actions/siteadminpanel.php:336
msgid "Prohibit anonymous users (not logged in) from viewing site?"
msgstr ""
-#: actions/siteadminpanel.php:290
+#: actions/siteadminpanel.php:340
+#, fuzzy
+msgid "Invite only"
+msgstr "초대"
+
+#: actions/siteadminpanel.php:342
+msgid "Make registration invitation only."
+msgstr ""
+
+#: actions/siteadminpanel.php:346 actions/useradminpanel.php:171
+#, fuzzy
+msgid "Closed"
+msgstr "차단하기"
+
+#: actions/siteadminpanel.php:348
+msgid "Disable new registrations."
+msgstr ""
+
+#: actions/siteadminpanel.php:353
msgid "Randomly during Web hit"
msgstr ""
-#: actions/siteadminpanel.php:291
+#: actions/siteadminpanel.php:354
msgid "In a scheduled job"
msgstr ""
-#: actions/siteadminpanel.php:292
+#: actions/siteadminpanel.php:355 actions/siteadminpanel.php:380
#, fuzzy
msgid "Never"
msgstr "복구"
-#: actions/siteadminpanel.php:294
+#: actions/siteadminpanel.php:357
msgid "Data snapshots"
msgstr ""
-#: actions/siteadminpanel.php:295
+#: actions/siteadminpanel.php:358
msgid "When to send statistical data to status.net servers"
msgstr ""
-#: actions/siteadminpanel.php:301
+#: actions/siteadminpanel.php:364
msgid "Frequency"
msgstr ""
-#: actions/siteadminpanel.php:302
+#: actions/siteadminpanel.php:365
msgid "Snapshots will be sent once every N Web hits"
msgstr ""
-#: actions/siteadminpanel.php:309
+#: actions/siteadminpanel.php:372
msgid "Report URL"
msgstr ""
-#: actions/siteadminpanel.php:310
+#: actions/siteadminpanel.php:373
msgid "Snapshots will be sent to this URL"
msgstr ""
-#: actions/siteadminpanel.php:371 actions/useradminpanel.php:226
+#: actions/siteadminpanel.php:381
+#, fuzzy
+msgid "Sometimes"
+msgstr "통지"
+
+#: actions/siteadminpanel.php:382
+msgid "Always"
+msgstr ""
+
+#: actions/siteadminpanel.php:384
+msgid "Use SSL"
+msgstr ""
+
+#: actions/siteadminpanel.php:385
+msgid "When to use SSL"
+msgstr ""
+
+#: actions/siteadminpanel.php:391
+msgid "SSL Server"
+msgstr ""
+
+#: actions/siteadminpanel.php:392
+msgid "Server to direct SSL requests to"
+msgstr ""
+
+#: actions/siteadminpanel.php:396
+msgid "Text limit"
+msgstr ""
+
+#: actions/siteadminpanel.php:396
+msgid "Maximum number of characters for notices."
+msgstr ""
+
+#: actions/siteadminpanel.php:400
+msgid "Dupe limit"
+msgstr ""
+
+#: actions/siteadminpanel.php:400
+msgid "How long users must wait (in seconds) to post the same thing again."
+msgstr ""
+
+#: actions/siteadminpanel.php:414 actions/useradminpanel.php:226
#, fuzzy
msgid "Save site settings"
msgstr "아바타 설정"
@@ -3474,11 +3661,6 @@ msgstr "이용자"
msgid "User settings for this StatusNet site."
msgstr ""
-#: actions/useradminpanel.php:171
-#, fuzzy
-msgid "Closed"
-msgstr "차단하기"
-
#: actions/useradminpanel.php:173
msgid "Is registration on this site prohibited?"
msgstr ""
@@ -3708,6 +3890,14 @@ msgstr "통지를 저장하는데 문제가 발생했습니다."
msgid "DB error inserting reply: %s"
msgstr "답신을 추가 할 때에 데이타베이스 에러 : %s"
+#: classes/User_group.php:380
+msgid "Could not create group."
+msgstr "새 그룹을 만들 수 없습니다."
+
+#: classes/User_group.php:409
+msgid "Could not set group membership."
+msgstr "그룹 맴버십을 세팅할 수 없습니다."
+
#: classes/User.php:347
#, fuzzy, php-format
msgid "Welcome to %1$s, @%2$s!"
@@ -3948,12 +4138,17 @@ msgstr "명령이 아직 실행되지 않았습니다."
msgid "saveSettings() not implemented."
msgstr "명령이 아직 실행되지 않았습니다."
-#: lib/adminpanelaction.php:273
+#: lib/adminpanelaction.php:247
+#, fuzzy
+msgid "Unable to delete design setting."
+msgstr "트위터 환경설정을 저장할 수 없습니다."
+
+#: lib/adminpanelaction.php:300
#, fuzzy
msgid "Basic site configuration"
msgstr "이메일 주소 확인서"
-#: lib/adminpanelaction.php:276
+#: lib/adminpanelaction.php:303
#, fuzzy
msgid "Design configuration"
msgstr "SMS 인증"
@@ -4201,20 +4396,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:203
+#: lib/common.php:199
#, fuzzy
msgid "No configuration file found. "
msgstr "확인 코드가 없습니다."
-#: lib/common.php:204
+#: lib/common.php:200
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:205
+#: lib/common.php:201
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:206
+#: lib/common.php:202
#, fuzzy
msgid "Go to the installer."
msgstr "이 사이트 로그인"
@@ -4980,11 +5175,6 @@ msgstr "없음"
msgid "Top posters"
msgstr "상위 게시글 등록자"
-#: lib/unblockform.php:80
-#, fuzzy
-msgid "Unlock this user"
-msgstr "이 사용자를 차단해제합니다."
-
#: lib/unsandboxform.php:69
msgid "Unsandbox"
msgstr ""
@@ -5037,47 +5227,47 @@ msgstr "이 회원에게 직접 메시지를 보냅니다."
msgid "Message"
msgstr "메시지"
-#: lib/util.php:821
+#: lib/util.php:826
msgid "a few seconds ago"
msgstr "몇 초 전"
-#: lib/util.php:823
+#: lib/util.php:828
msgid "about a minute ago"
msgstr "1분 전"
-#: lib/util.php:825
+#: lib/util.php:830
#, php-format
msgid "about %d minutes ago"
msgstr "%d분 전"
-#: lib/util.php:827
+#: lib/util.php:832
msgid "about an hour ago"
msgstr "1시간 전"
-#: lib/util.php:829
+#: lib/util.php:834
#, php-format
msgid "about %d hours ago"
msgstr "%d시간 전"
-#: lib/util.php:831
+#: lib/util.php:836
msgid "about a day ago"
msgstr "하루 전"
-#: lib/util.php:833
+#: lib/util.php:838
#, php-format
msgid "about %d days ago"
msgstr "%d일 전"
-#: lib/util.php:835
+#: lib/util.php:840
msgid "about a month ago"
msgstr "1달 전"
-#: lib/util.php:837
+#: lib/util.php:842
#, php-format
msgid "about %d months ago"
msgstr "%d달 전"
-#: lib/util.php:839
+#: lib/util.php:844
msgid "about a year ago"
msgstr "1년 전"
@@ -5108,5 +5298,9 @@ msgid "Sorry, no incoming email allowed."
msgstr "죄송합니다. 이메일이 허용되지 않습니다."
#, fuzzy
+#~ msgid "Unlock this user"
+#~ msgstr "이 사용자를 차단해제합니다."
+
+#, fuzzy
#~ msgid "These people are subscribed to you: "
#~ msgstr "%s에 의해 구독되는 사람들"
diff --git a/locale/mk/LC_MESSAGES/statusnet.po b/locale/mk/LC_MESSAGES/statusnet.po
index 15b72bd19..6e20b573e 100644
--- a/locale/mk/LC_MESSAGES/statusnet.po
+++ b/locale/mk/LC_MESSAGES/statusnet.po
@@ -2,15 +2,18 @@
#
# Author@translatewiki.net: Bjankuloski06
# --
+# 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-18 19:31+0000\n"
+"POT-Creation-Date: 2009-11-19 10:43+0000\n"
"PO-Revision-Date: 2009-11-18 19:32:13+0000\n"
"Language-Team: Macedonian\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural= n==1 or n%10==1 ? 0 : 1;\n"
"X-Generator: MediaWiki 1.16alpha(r59207); Translate extension (2009-11-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: mk\n"
@@ -146,7 +149,7 @@ msgstr "Корисникот не може да се освежи/"
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
-#: actions/designadminpanel.php:125 actions/newnotice.php:94
+#: actions/designadminpanel.php:122 actions/newnotice.php:94
#: lib/designsettings.php:283
#, php-format
msgid ""
@@ -229,7 +232,7 @@ msgstr ""
#: 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:184 actions/apigroupismember.php:114
+#: 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
@@ -296,82 +299,66 @@ msgstr "Корисникот не може да се освежи/"
msgid "Could not find target user."
msgstr "Корисникот не може да се освежи/"
-#: actions/apigroupcreate.php:136 actions/newgroup.php:204
-#, fuzzy
-msgid "Could not create group."
-msgstr "Информациите за аватарот не може да се снимат"
-
-#: actions/apigroupcreate.php:147 actions/editgroup.php:259
-#: actions/newgroup.php:210
-#, fuzzy
-msgid "Could not create aliases."
-msgstr "Информациите за аватарот не може да се снимат"
-
-#: actions/apigroupcreate.php:166 actions/newgroup.php:224
-#, fuzzy
-msgid "Could not set group membership."
-msgstr "Не може да се креира претплатата"
-
-#: actions/apigroupcreate.php:212 actions/editgroup.php:182
+#: actions/apigroupcreate.php:164 actions/editgroup.php:182
#: actions/newgroup.php:126 actions/profilesettings.php:208
#: actions/register.php:205
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr "Прекарот мора да има само мали букви и бројки и да нема празни места."
-#: actions/apigroupcreate.php:221 actions/editgroup.php:186
+#: 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 "Тој прекар е во употреба. Одберете друг."
-#: actions/apigroupcreate.php:228 actions/editgroup.php:189
+#: 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 "Неправилен прекар."
-#: actions/apigroupcreate.php:244 actions/editgroup.php:195
+#: 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 "Домашната страница не е правилно URL."
-#: actions/apigroupcreate.php:253 actions/editgroup.php:198
+#: 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 "Целото име е предолго (максимум 255 знаци)"
-#: actions/apigroupcreate.php:261
+#: actions/apigroupcreate.php:213
#, fuzzy, php-format
msgid "Description is too long (max %d chars)."
msgstr "Биографијата е предолга (максимумот е 140 знаци)."
-#: actions/apigroupcreate.php:272 actions/editgroup.php:204
+#: 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 "Локацијата е предолга (максимумот е 255 знаци)."
-#: actions/apigroupcreate.php:291 actions/editgroup.php:215
+#: actions/apigroupcreate.php:243 actions/editgroup.php:215
#: actions/newgroup.php:159
#, php-format
msgid "Too many aliases! Maximum %d."
msgstr ""
-#: actions/apigroupcreate.php:312 actions/editgroup.php:224
+#: actions/apigroupcreate.php:264 actions/editgroup.php:224
#: actions/newgroup.php:168
#, fuzzy, php-format
msgid "Invalid alias: \"%s\""
msgstr "Невалидна домашна страница: '%s'"
-#: actions/apigroupcreate.php:321 actions/editgroup.php:228
+#: actions/apigroupcreate.php:273 actions/editgroup.php:228
#: actions/newgroup.php:172
#, fuzzy, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr "Тој прекар е во употреба. Одберете друг."
-#: actions/apigroupcreate.php:334 actions/editgroup.php:234
+#: actions/apigroupcreate.php:286 actions/editgroup.php:234
#: actions/newgroup.php:178
msgid "Alias can't be the same as nickname."
msgstr ""
@@ -598,10 +585,10 @@ msgstr ""
msgid "There was a problem with your session token. Try again, please."
msgstr ""
-#: actions/avatarsettings.php:277 actions/emailsettings.php:255
-#: actions/grouplogo.php:319 actions/imsettings.php:220
-#: actions/recoverpassword.php:44 actions/smssettings.php:248
-#: lib/designsettings.php:304
+#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
+#: actions/emailsettings.php:255 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/recoverpassword.php:44
+#: actions/smssettings.php:248 lib/designsettings.php:304
msgid "Unexpected form submission."
msgstr "Неочекувано испраќање на формулар."
@@ -664,7 +651,7 @@ msgstr "Нема таков корисник."
msgid "Unblock"
msgstr ""
-#: actions/blockedfromgroup.php:313
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:80
#, fuzzy
msgid "Unblock this user"
msgstr "Нема таков корисник."
@@ -837,7 +824,7 @@ msgid "Delete this user"
msgstr "Нема таков корисник."
#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124
-#: lib/adminpanelaction.php:275 lib/groupnav.php:119
+#: lib/adminpanelaction.php:302 lib/groupnav.php:119
msgid "Design"
msgstr ""
@@ -845,106 +832,182 @@ msgstr ""
msgid "Design settings for this StatusNet site."
msgstr ""
-#: actions/designadminpanel.php:220
-msgid "Unable to delete design setting."
-msgstr ""
+#: actions/designadminpanel.php:278
+#, fuzzy
+msgid "Invalid logo URL."
+msgstr "Погрешна големина."
-#: actions/designadminpanel.php:301
+#: actions/designadminpanel.php:282
#, fuzzy, php-format
msgid "Theme not available: %s"
msgstr "Оваа страница не е достапна во форматот кој Вие го прифаќате."
-#: actions/designadminpanel.php:406
+#: actions/designadminpanel.php:288
+#, fuzzy, php-format
+msgid "Theme directory not readable: %s"
+msgstr "Оваа страница не е достапна во форматот кој Вие го прифаќате."
+
+#: actions/designadminpanel.php:292
+#, php-format
+msgid "Avatar directory not writable: %s"
+msgstr ""
+
+#: actions/designadminpanel.php:296
+#, php-format
+msgid "Background directory not writable: %s"
+msgstr ""
+
+#: actions/designadminpanel.php:312
+#, php-format
+msgid "Max length for %s %s is 255 characters."
+msgstr ""
+
+#: actions/designadminpanel.php:412
+#, fuzzy
+msgid "Change logo"
+msgstr "Промени ја лозинката"
+
+#: actions/designadminpanel.php:417
+#, fuzzy
+msgid "Site logo"
+msgstr "Ново известување"
+
+#: actions/designadminpanel.php:424
#, fuzzy
msgid "Change theme"
msgstr "Промени"
-#: actions/designadminpanel.php:410
-msgid "Theme"
-msgstr ""
+#: actions/designadminpanel.php:441
+#, fuzzy
+msgid "Site theme"
+msgstr "Ново известување"
-#: actions/designadminpanel.php:411
+#: actions/designadminpanel.php:442
msgid "Theme for the site."
msgstr ""
-#: actions/designadminpanel.php:420 lib/designsettings.php:101
+#: actions/designadminpanel.php:447
+msgid "Theme server"
+msgstr ""
+
+#: actions/designadminpanel.php:451
+msgid "Theme path"
+msgstr ""
+
+#: actions/designadminpanel.php:455
+msgid "Theme directory"
+msgstr ""
+
+#: actions/designadminpanel.php:462
+#, fuzzy
+msgid "Avatar Settings"
+msgstr "Поставки"
+
+#: actions/designadminpanel.php:467
+#, fuzzy
+msgid "Avatar server"
+msgstr "Поставки"
+
+#: actions/designadminpanel.php:471
+#, fuzzy
+msgid "Avatar path"
+msgstr "Аватарот е ажуриран."
+
+#: actions/designadminpanel.php:475
+#, fuzzy
+msgid "Avatar directory"
+msgstr "Аватарот е ажуриран."
+
+#: actions/designadminpanel.php:486 lib/designsettings.php:101
msgid "Change background image"
msgstr ""
-#: actions/designadminpanel.php:424 actions/designadminpanel.php:498
+#: actions/designadminpanel.php:491 actions/designadminpanel.php:578
#: lib/designsettings.php:178
msgid "Background"
msgstr ""
-#: actions/designadminpanel.php:429
+#: actions/designadminpanel.php:496
#, fuzzy, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
"$s."
msgstr "Ова е предолго. Максималната должина е 140 знаци."
-#: actions/designadminpanel.php:459 lib/designsettings.php:139
+#: actions/designadminpanel.php:526 lib/designsettings.php:139
msgid "On"
msgstr ""
-#: actions/designadminpanel.php:475 lib/designsettings.php:155
+#: actions/designadminpanel.php:542 lib/designsettings.php:155
msgid "Off"
msgstr ""
-#: actions/designadminpanel.php:476 lib/designsettings.php:156
+#: actions/designadminpanel.php:543 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr ""
-#: actions/designadminpanel.php:481 lib/designsettings.php:161
+#: actions/designadminpanel.php:548 lib/designsettings.php:161
msgid "Tile background image"
msgstr ""
-#: actions/designadminpanel.php:490 lib/designsettings.php:170
+#: actions/designadminpanel.php:554
+msgid "Background server"
+msgstr ""
+
+#: actions/designadminpanel.php:558
+msgid "Background path"
+msgstr ""
+
+#: actions/designadminpanel.php:562
+msgid "Background directory"
+msgstr ""
+
+#: actions/designadminpanel.php:569 lib/designsettings.php:170
#, fuzzy
msgid "Change colours"
msgstr "Промени ја лозинката"
-#: actions/designadminpanel.php:511 lib/designsettings.php:191
+#: actions/designadminpanel.php:591 lib/designsettings.php:191
#, fuzzy
msgid "Content"
msgstr "Поврзи се"
-#: actions/designadminpanel.php:524 lib/designsettings.php:204
+#: actions/designadminpanel.php:604 lib/designsettings.php:204
#, fuzzy
msgid "Sidebar"
msgstr "Барај"
-#: actions/designadminpanel.php:537 lib/designsettings.php:217
+#: actions/designadminpanel.php:617 lib/designsettings.php:217
msgid "Text"
msgstr ""
-#: actions/designadminpanel.php:550 lib/designsettings.php:230
+#: actions/designadminpanel.php:630 lib/designsettings.php:230
#, fuzzy
msgid "Links"
msgstr "Пријави се"
-#: actions/designadminpanel.php:611 lib/designsettings.php:247
+#: actions/designadminpanel.php:658 lib/designsettings.php:247
msgid "Use defaults"
msgstr ""
-#: actions/designadminpanel.php:612 lib/designsettings.php:248
+#: actions/designadminpanel.php:659 lib/designsettings.php:248
msgid "Restore default designs"
msgstr ""
-#: actions/designadminpanel.php:618 lib/designsettings.php:254
+#: actions/designadminpanel.php:665 lib/designsettings.php:254
msgid "Reset back to default"
msgstr ""
-#: actions/designadminpanel.php:620 actions/emailsettings.php:195
+#: actions/designadminpanel.php:667 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/profilesettings.php:167 actions/siteadminpanel.php:371
+#: actions/profilesettings.php:167 actions/siteadminpanel.php:414
#: actions/smssettings.php:181 actions/subscriptions.php:203
#: actions/tagother.php:154 actions/useradminpanel.php:226
#: lib/designsettings.php:256 lib/groupeditform.php:202
msgid "Save"
msgstr "Сними"
-#: actions/designadminpanel.php:621 lib/designsettings.php:257
+#: actions/designadminpanel.php:668 lib/designsettings.php:257
msgid "Save design"
msgstr ""
@@ -988,6 +1051,11 @@ msgstr "Биографијата е предолга (максимумот е 14
msgid "Could not update group."
msgstr "Корисникот не може да се освежи/"
+#: actions/editgroup.php:259 classes/User_group.php:390
+#, fuzzy
+msgid "Could not create aliases."
+msgstr "Информациите за аватарот не може да се снимат"
+
#: actions/editgroup.php:269
#, fuzzy
msgid "Options saved."
@@ -1103,7 +1171,7 @@ msgstr ""
msgid "Cannot normalize that email address"
msgstr ""
-#: actions/emailsettings.php:330 actions/siteadminpanel.php:156
+#: actions/emailsettings.php:330 actions/siteadminpanel.php:158
msgid "Not a valid email address"
msgstr ""
@@ -1802,10 +1870,10 @@ msgstr "Неправилна содржина за известување"
msgid "Incorrect username or password."
msgstr "Неточно корисничко име или лозинка"
-#: actions/login.php:149 actions/recoverpassword.php:375
-#: actions/register.php:248
-msgid "Error setting user."
-msgstr "Грешка во поставувањето на корисникот."
+#: actions/login.php:149
+#, fuzzy
+msgid "Error setting user. You are probably not authorized."
+msgstr "Не е одобрено."
#: actions/login.php:204 actions/login.php:257 lib/action.php:457
#: lib/logingroupnav.php:79
@@ -2233,7 +2301,7 @@ msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:275
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:309
msgid "Language"
msgstr ""
@@ -2259,7 +2327,7 @@ msgstr ""
msgid "Bio is too long (max %d chars)."
msgstr "Биографијата е предолга (максимумот е 140 знаци)."
-#: actions/profilesettings.php:228 actions/siteadminpanel.php:163
+#: actions/profilesettings.php:228 actions/siteadminpanel.php:165
msgid "Timezone not selected."
msgstr ""
@@ -2506,6 +2574,10 @@ msgstr "Лозинката мора да биде од најмалку 6 зна
msgid "Password and confirmation do not match."
msgstr "Двете лозинки не се совпаѓаат."
+#: actions/recoverpassword.php:375 actions/register.php:248
+msgid "Error setting user."
+msgstr "Грешка во поставувањето на корисникот."
+
#: actions/recoverpassword.php:382
msgid "New password successfully saved. You are now logged in."
msgstr "Новата лозинка успешно е снимена. Сега сте пријавени."
@@ -2567,7 +2639,7 @@ msgid "Same as password above. Required."
msgstr ""
#: actions/register.php:437 actions/register.php:441
-#: actions/siteadminpanel.php:253 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:287 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "Е-пошта"
@@ -2996,7 +3068,7 @@ msgstr ""
msgid "User is already silenced."
msgstr "Корисникот нема профил."
-#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:272
+#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:299
msgid "Site"
msgstr ""
@@ -3004,121 +3076,234 @@ msgstr ""
msgid "Basic settings for this StatusNet site."
msgstr ""
-#: actions/siteadminpanel.php:145
+#: actions/siteadminpanel.php:147
msgid "Site name must have non-zero length."
msgstr ""
-#: actions/siteadminpanel.php:153
+#: actions/siteadminpanel.php:155
#, fuzzy
msgid "You must have a valid contact email address"
msgstr "Неправилна адреса за е-пошта."
-#: actions/siteadminpanel.php:171
+#: actions/siteadminpanel.php:173
#, php-format
msgid "Unknown language \"%s\""
msgstr ""
-#: actions/siteadminpanel.php:178
+#: actions/siteadminpanel.php:180
msgid "Invalid snapshot report URL."
msgstr ""
-#: actions/siteadminpanel.php:184
+#: actions/siteadminpanel.php:186
msgid "Invalid snapshot run value."
msgstr ""
-#: actions/siteadminpanel.php:190
+#: actions/siteadminpanel.php:192
msgid "Snapshot frequency must be a number."
msgstr ""
-#: actions/siteadminpanel.php:241
+#: actions/siteadminpanel.php:199
+msgid "You must set an SSL sever when enabling SSL."
+msgstr ""
+
+#: actions/siteadminpanel.php:204
+msgid "Invalid SSL server. Max length is 255 characters."
+msgstr ""
+
+#: actions/siteadminpanel.php:210
+msgid "Minimum text limit is 140c."
+msgstr ""
+
+#: actions/siteadminpanel.php:216
+msgid "Dupe limit must 1 or more seconds."
+msgstr ""
+
+#: actions/siteadminpanel.php:224
+#, php-format
+msgid "Locales directory not readable: %s"
+msgstr ""
+
+#: actions/siteadminpanel.php:275
#, fuzzy
msgid "Site name"
msgstr "Ново известување"
-#: actions/siteadminpanel.php:242
+#: actions/siteadminpanel.php:276
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr ""
-#: actions/siteadminpanel.php:245
+#: actions/siteadminpanel.php:279
msgid "Brought by"
msgstr ""
-#: actions/siteadminpanel.php:246
+#: actions/siteadminpanel.php:280
msgid "Text used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:249
+#: actions/siteadminpanel.php:283
msgid "Brought by URL"
msgstr ""
-#: actions/siteadminpanel.php:250
+#: actions/siteadminpanel.php:284
msgid "URL used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:254
+#: actions/siteadminpanel.php:288
#, fuzzy
msgid "contact email address for your site"
msgstr "Нема регистрирана адреса за е-пошта за тој корисник."
-#: actions/siteadminpanel.php:268
+#: actions/siteadminpanel.php:302
msgid "Default timezone"
msgstr ""
-#: actions/siteadminpanel.php:269
+#: actions/siteadminpanel.php:303
msgid "Default timezone for the site; usually UTC."
msgstr ""
-#: actions/siteadminpanel.php:276
+#: actions/siteadminpanel.php:310
msgid "Default site language"
msgstr ""
-#: actions/siteadminpanel.php:282
+#: actions/siteadminpanel.php:316
+msgid "Path to locales"
+msgstr ""
+
+#: actions/siteadminpanel.php:316
+msgid "Directory path to locales"
+msgstr ""
+
+#: actions/siteadminpanel.php:320
+#, fuzzy
+msgid "Server"
+msgstr "Пронајди"
+
+#: actions/siteadminpanel.php:320
+msgid "Site's server hostname."
+msgstr ""
+
+#: actions/siteadminpanel.php:324
+msgid "Path"
+msgstr ""
+
+#: actions/siteadminpanel.php:324
+#, fuzzy
+msgid "Site path"
+msgstr "Ново известување"
+
+#: actions/siteadminpanel.php:328
+msgid "Fancy URLs"
+msgstr ""
+
+#: actions/siteadminpanel.php:330
+msgid "Use fancy (more readable and memorable) URLs?"
+msgstr ""
+
+#: actions/siteadminpanel.php:334
#, fuzzy
msgid "Private"
msgstr "Приватност"
-#: actions/siteadminpanel.php:284
+#: actions/siteadminpanel.php:336
msgid "Prohibit anonymous users (not logged in) from viewing site?"
msgstr ""
-#: actions/siteadminpanel.php:290
+#: actions/siteadminpanel.php:340
+msgid "Invite only"
+msgstr ""
+
+#: actions/siteadminpanel.php:342
+msgid "Make registration invitation only."
+msgstr ""
+
+#: actions/siteadminpanel.php:346 actions/useradminpanel.php:171
+#, fuzzy
+msgid "Closed"
+msgstr "Нема таков корисник."
+
+#: actions/siteadminpanel.php:348
+msgid "Disable new registrations."
+msgstr ""
+
+#: actions/siteadminpanel.php:353
msgid "Randomly during Web hit"
msgstr ""
-#: actions/siteadminpanel.php:291
+#: actions/siteadminpanel.php:354
msgid "In a scheduled job"
msgstr ""
-#: actions/siteadminpanel.php:292
+#: actions/siteadminpanel.php:355 actions/siteadminpanel.php:380
#, fuzzy
msgid "Never"
msgstr "Пронајди"
-#: actions/siteadminpanel.php:294
+#: actions/siteadminpanel.php:357
msgid "Data snapshots"
msgstr ""
-#: actions/siteadminpanel.php:295
+#: actions/siteadminpanel.php:358
msgid "When to send statistical data to status.net servers"
msgstr ""
-#: actions/siteadminpanel.php:301
+#: actions/siteadminpanel.php:364
msgid "Frequency"
msgstr ""
-#: actions/siteadminpanel.php:302
+#: actions/siteadminpanel.php:365
msgid "Snapshots will be sent once every N Web hits"
msgstr ""
-#: actions/siteadminpanel.php:309
+#: actions/siteadminpanel.php:372
msgid "Report URL"
msgstr ""
-#: actions/siteadminpanel.php:310
+#: actions/siteadminpanel.php:373
msgid "Snapshots will be sent to this URL"
msgstr ""
-#: actions/siteadminpanel.php:371 actions/useradminpanel.php:226
+#: actions/siteadminpanel.php:381
+#, fuzzy
+msgid "Sometimes"
+msgstr "Известувања"
+
+#: actions/siteadminpanel.php:382
+msgid "Always"
+msgstr ""
+
+#: actions/siteadminpanel.php:384
+msgid "Use SSL"
+msgstr ""
+
+#: actions/siteadminpanel.php:385
+msgid "When to use SSL"
+msgstr ""
+
+#: actions/siteadminpanel.php:391
+msgid "SSL Server"
+msgstr ""
+
+#: actions/siteadminpanel.php:392
+msgid "Server to direct SSL requests to"
+msgstr ""
+
+#: actions/siteadminpanel.php:396
+msgid "Text limit"
+msgstr ""
+
+#: actions/siteadminpanel.php:396
+msgid "Maximum number of characters for notices."
+msgstr ""
+
+#: actions/siteadminpanel.php:400
+msgid "Dupe limit"
+msgstr ""
+
+#: actions/siteadminpanel.php:400
+msgid "How long users must wait (in seconds) to post the same thing again."
+msgstr ""
+
+#: actions/siteadminpanel.php:414 actions/useradminpanel.php:226
#, fuzzy
msgid "Save site settings"
msgstr "Поставки"
@@ -3437,11 +3622,6 @@ msgstr ""
msgid "User settings for this StatusNet site."
msgstr ""
-#: actions/useradminpanel.php:171
-#, fuzzy
-msgid "Closed"
-msgstr "Нема таков корисник."
-
#: actions/useradminpanel.php:173
msgid "Is registration on this site prohibited?"
msgstr ""
@@ -3665,6 +3845,16 @@ msgstr "Проблем во снимањето на известувањето."
msgid "DB error inserting reply: %s"
msgstr "Одговор од внесот во базата: %s"
+#: classes/User_group.php:380
+#, fuzzy
+msgid "Could not create group."
+msgstr "Информациите за аватарот не може да се снимат"
+
+#: classes/User_group.php:409
+#, fuzzy
+msgid "Could not set group membership."
+msgstr "Не може да се креира претплатата"
+
#: classes/User.php:347
#, php-format
msgid "Welcome to %1$s, @%2$s!"
@@ -3910,12 +4100,16 @@ msgstr ""
msgid "saveSettings() not implemented."
msgstr ""
-#: lib/adminpanelaction.php:273
+#: lib/adminpanelaction.php:247
+msgid "Unable to delete design setting."
+msgstr ""
+
+#: lib/adminpanelaction.php:300
#, fuzzy
msgid "Basic site configuration"
msgstr "Потврдување на адресата"
-#: lib/adminpanelaction.php:276
+#: lib/adminpanelaction.php:303
#, fuzzy
msgid "Design configuration"
msgstr "Потврдување на адресата"
@@ -4163,20 +4357,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:203
+#: lib/common.php:199
#, fuzzy
msgid "No configuration file found. "
msgstr "Нема код за потврда."
-#: lib/common.php:204
+#: lib/common.php:200
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:205
+#: lib/common.php:201
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:206
+#: lib/common.php:202
msgid "Go to the installer."
msgstr ""
@@ -4951,11 +5145,6 @@ msgstr ""
msgid "Top posters"
msgstr ""
-#: lib/unblockform.php:80
-#, fuzzy
-msgid "Unlock this user"
-msgstr "Нема таков корисник."
-
#: lib/unsandboxform.php:69
msgid "Unsandbox"
msgstr ""
@@ -5008,47 +5197,47 @@ msgstr ""
msgid "Message"
msgstr ""
-#: lib/util.php:821
+#: lib/util.php:826
msgid "a few seconds ago"
msgstr "пред неколку секунди"
-#: lib/util.php:823
+#: lib/util.php:828
msgid "about a minute ago"
msgstr "пред една минута"
-#: lib/util.php:825
+#: lib/util.php:830
#, php-format
msgid "about %d minutes ago"
msgstr "пред %d минути"
-#: lib/util.php:827
+#: lib/util.php:832
msgid "about an hour ago"
msgstr "пред еден час"
-#: lib/util.php:829
+#: lib/util.php:834
#, php-format
msgid "about %d hours ago"
msgstr "пред %d часа"
-#: lib/util.php:831
+#: lib/util.php:836
msgid "about a day ago"
msgstr "пред еден ден"
-#: lib/util.php:833
+#: lib/util.php:838
#, php-format
msgid "about %d days ago"
msgstr "пред %d денови"
-#: lib/util.php:835
+#: lib/util.php:840
msgid "about a month ago"
msgstr "пред еден месец"
-#: lib/util.php:837
+#: lib/util.php:842
#, php-format
msgid "about %d months ago"
msgstr "пред %d месеци"
-#: lib/util.php:839
+#: lib/util.php:844
msgid "about a year ago"
msgstr "пред една година"
@@ -5079,5 +5268,9 @@ msgid "Sorry, no incoming email allowed."
msgstr ""
#, fuzzy
+#~ msgid "Unlock this user"
+#~ msgstr "Нема таков корисник."
+
+#, fuzzy
#~ msgid "These people are subscribed to you: "
#~ msgstr "Оддалечена претплата"
diff --git a/locale/nb/LC_MESSAGES/statusnet.po b/locale/nb/LC_MESSAGES/statusnet.po
index 51c5cbac6..1439bee64 100644
--- a/locale/nb/LC_MESSAGES/statusnet.po
+++ b/locale/nb/LC_MESSAGES/statusnet.po
@@ -1,21 +1,18 @@
# Translation of StatusNet to Norwegian (bokmål)‬
#
# --
-# #-#-#-#-# statusnet.new.pot (PACKAGE VERSION) #-#-#-#-#
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 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-18 19:31+0000\n"
+"POT-Creation-Date: 2009-11-19 10:43+0000\n"
"PO-Revision-Date: 2009-11-18 19:32:16+0000\n"
"Language-Team: Norwegian (bokmål)‬\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: MediaWiki 1.16alpha(r59207); Translate extension (2009-11-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: no\n"
@@ -151,7 +148,7 @@ msgstr "Klarte ikke å oppdatere bruker."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
-#: actions/designadminpanel.php:125 actions/newnotice.php:94
+#: actions/designadminpanel.php:122 actions/newnotice.php:94
#: lib/designsettings.php:283
#, php-format
msgid ""
@@ -234,7 +231,7 @@ msgstr ""
#: 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:184 actions/apigroupismember.php:114
+#: 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
@@ -302,82 +299,66 @@ msgstr "Klarte ikke å oppdatere bruker."
msgid "Could not find target user."
msgstr "Klarte ikke å oppdatere bruker."
-#: actions/apigroupcreate.php:136 actions/newgroup.php:204
-#, fuzzy
-msgid "Could not create group."
-msgstr "Klarte ikke å lagre avatar-informasjonen"
-
-#: actions/apigroupcreate.php:147 actions/editgroup.php:259
-#: actions/newgroup.php:210
-#, fuzzy
-msgid "Could not create aliases."
-msgstr "Klarte ikke å lagre avatar-informasjonen"
-
-#: actions/apigroupcreate.php:166 actions/newgroup.php:224
-#, fuzzy
-msgid "Could not set group membership."
-msgstr "Klarte ikke å lagre avatar-informasjonen"
-
-#: actions/apigroupcreate.php:212 actions/editgroup.php:182
+#: actions/apigroupcreate.php:164 actions/editgroup.php:182
#: actions/newgroup.php:126 actions/profilesettings.php:208
#: actions/register.php:205
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr ""
-#: actions/apigroupcreate.php:221 actions/editgroup.php:186
+#: 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 "Det nicket er allerede i bruk. Prøv et annet."
-#: actions/apigroupcreate.php:228 actions/editgroup.php:189
+#: 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 "Ugyldig nick."
-#: actions/apigroupcreate.php:244 actions/editgroup.php:195
+#: 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 ""
-#: actions/apigroupcreate.php:253 actions/editgroup.php:198
+#: 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 "Beklager, navnet er for langt (max 250 tegn)."
-#: actions/apigroupcreate.php:261
+#: actions/apigroupcreate.php:213
#, fuzzy, php-format
msgid "Description is too long (max %d chars)."
msgstr "Bioen er for lang (max 140 tegn)"
-#: actions/apigroupcreate.php:272 actions/editgroup.php:204
+#: 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 ""
-#: actions/apigroupcreate.php:291 actions/editgroup.php:215
+#: actions/apigroupcreate.php:243 actions/editgroup.php:215
#: actions/newgroup.php:159
#, php-format
msgid "Too many aliases! Maximum %d."
msgstr ""
-#: actions/apigroupcreate.php:312 actions/editgroup.php:224
+#: actions/apigroupcreate.php:264 actions/editgroup.php:224
#: actions/newgroup.php:168
#, fuzzy, php-format
msgid "Invalid alias: \"%s\""
msgstr "Ugyldig hjemmeside '%s'"
-#: actions/apigroupcreate.php:321 actions/editgroup.php:228
+#: actions/apigroupcreate.php:273 actions/editgroup.php:228
#: actions/newgroup.php:172
#, fuzzy, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr "Det nicket er allerede i bruk. Prøv et annet."
-#: actions/apigroupcreate.php:334 actions/editgroup.php:234
+#: actions/apigroupcreate.php:286 actions/editgroup.php:234
#: actions/newgroup.php:178
msgid "Alias can't be the same as nickname."
msgstr ""
@@ -602,10 +583,10 @@ msgstr ""
msgid "There was a problem with your session token. Try again, please."
msgstr ""
-#: actions/avatarsettings.php:277 actions/emailsettings.php:255
-#: actions/grouplogo.php:319 actions/imsettings.php:220
-#: actions/recoverpassword.php:44 actions/smssettings.php:248
-#: lib/designsettings.php:304
+#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
+#: actions/emailsettings.php:255 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/recoverpassword.php:44
+#: actions/smssettings.php:248 lib/designsettings.php:304
msgid "Unexpected form submission."
msgstr ""
@@ -668,7 +649,7 @@ msgstr ""
msgid "Unblock"
msgstr ""
-#: actions/blockedfromgroup.php:313
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:80
msgid "Unblock this user"
msgstr ""
@@ -839,7 +820,7 @@ msgid "Delete this user"
msgstr "Kan ikke slette notisen."
#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124
-#: lib/adminpanelaction.php:275 lib/groupnav.php:119
+#: lib/adminpanelaction.php:302 lib/groupnav.php:119
msgid "Design"
msgstr ""
@@ -847,106 +828,181 @@ msgstr ""
msgid "Design settings for this StatusNet site."
msgstr ""
-#: actions/designadminpanel.php:220
-msgid "Unable to delete design setting."
-msgstr ""
+#: actions/designadminpanel.php:278
+#, fuzzy
+msgid "Invalid logo URL."
+msgstr "Ugyldig størrelse"
-#: actions/designadminpanel.php:301
+#: actions/designadminpanel.php:282
#, php-format
msgid "Theme not available: %s"
msgstr ""
-#: actions/designadminpanel.php:406
+#: actions/designadminpanel.php:288
+#, php-format
+msgid "Theme directory not readable: %s"
+msgstr ""
+
+#: actions/designadminpanel.php:292
+#, php-format
+msgid "Avatar directory not writable: %s"
+msgstr ""
+
+#: actions/designadminpanel.php:296
+#, php-format
+msgid "Background directory not writable: %s"
+msgstr ""
+
+#: actions/designadminpanel.php:312
+#, php-format
+msgid "Max length for %s %s is 255 characters."
+msgstr ""
+
+#: actions/designadminpanel.php:412
+#, fuzzy
+msgid "Change logo"
+msgstr "Endre passordet ditt"
+
+#: actions/designadminpanel.php:417
+msgid "Site logo"
+msgstr ""
+
+#: actions/designadminpanel.php:424
#, fuzzy
msgid "Change theme"
msgstr "Endre"
-#: actions/designadminpanel.php:410
-msgid "Theme"
-msgstr ""
+#: actions/designadminpanel.php:441
+#, fuzzy
+msgid "Site theme"
+msgstr "Endre"
-#: actions/designadminpanel.php:411
+#: actions/designadminpanel.php:442
msgid "Theme for the site."
msgstr ""
-#: actions/designadminpanel.php:420 lib/designsettings.php:101
+#: actions/designadminpanel.php:447
+msgid "Theme server"
+msgstr ""
+
+#: actions/designadminpanel.php:451
+msgid "Theme path"
+msgstr ""
+
+#: actions/designadminpanel.php:455
+msgid "Theme directory"
+msgstr ""
+
+#: actions/designadminpanel.php:462
+#, fuzzy
+msgid "Avatar Settings"
+msgstr "Innstillinger for IM"
+
+#: actions/designadminpanel.php:467
+#, fuzzy
+msgid "Avatar server"
+msgstr "Innstillinger for IM"
+
+#: actions/designadminpanel.php:471
+#, fuzzy
+msgid "Avatar path"
+msgstr "Brukerbildet har blitt oppdatert."
+
+#: actions/designadminpanel.php:475
+#, fuzzy
+msgid "Avatar directory"
+msgstr "Brukerbildet har blitt oppdatert."
+
+#: actions/designadminpanel.php:486 lib/designsettings.php:101
msgid "Change background image"
msgstr ""
-#: actions/designadminpanel.php:424 actions/designadminpanel.php:498
+#: actions/designadminpanel.php:491 actions/designadminpanel.php:578
#: lib/designsettings.php:178
msgid "Background"
msgstr ""
-#: actions/designadminpanel.php:429
+#: actions/designadminpanel.php:496
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
"$s."
msgstr ""
-#: actions/designadminpanel.php:459 lib/designsettings.php:139
+#: actions/designadminpanel.php:526 lib/designsettings.php:139
msgid "On"
msgstr ""
-#: actions/designadminpanel.php:475 lib/designsettings.php:155
+#: actions/designadminpanel.php:542 lib/designsettings.php:155
msgid "Off"
msgstr ""
-#: actions/designadminpanel.php:476 lib/designsettings.php:156
+#: actions/designadminpanel.php:543 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr ""
-#: actions/designadminpanel.php:481 lib/designsettings.php:161
+#: actions/designadminpanel.php:548 lib/designsettings.php:161
msgid "Tile background image"
msgstr ""
-#: actions/designadminpanel.php:490 lib/designsettings.php:170
+#: actions/designadminpanel.php:554
+msgid "Background server"
+msgstr ""
+
+#: actions/designadminpanel.php:558
+msgid "Background path"
+msgstr ""
+
+#: actions/designadminpanel.php:562
+msgid "Background directory"
+msgstr ""
+
+#: actions/designadminpanel.php:569 lib/designsettings.php:170
#, fuzzy
msgid "Change colours"
msgstr "Endre passordet ditt"
-#: actions/designadminpanel.php:511 lib/designsettings.php:191
+#: actions/designadminpanel.php:591 lib/designsettings.php:191
#, fuzzy
msgid "Content"
msgstr "Koble til"
-#: actions/designadminpanel.php:524 lib/designsettings.php:204
+#: actions/designadminpanel.php:604 lib/designsettings.php:204
#, fuzzy
msgid "Sidebar"
msgstr "Søk"
-#: actions/designadminpanel.php:537 lib/designsettings.php:217
+#: actions/designadminpanel.php:617 lib/designsettings.php:217
msgid "Text"
msgstr "Tekst"
-#: actions/designadminpanel.php:550 lib/designsettings.php:230
+#: actions/designadminpanel.php:630 lib/designsettings.php:230
#, fuzzy
msgid "Links"
msgstr "Logg inn"
-#: actions/designadminpanel.php:611 lib/designsettings.php:247
+#: actions/designadminpanel.php:658 lib/designsettings.php:247
msgid "Use defaults"
msgstr ""
-#: actions/designadminpanel.php:612 lib/designsettings.php:248
+#: actions/designadminpanel.php:659 lib/designsettings.php:248
msgid "Restore default designs"
msgstr ""
-#: actions/designadminpanel.php:618 lib/designsettings.php:254
+#: actions/designadminpanel.php:665 lib/designsettings.php:254
msgid "Reset back to default"
msgstr ""
-#: actions/designadminpanel.php:620 actions/emailsettings.php:195
+#: actions/designadminpanel.php:667 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/profilesettings.php:167 actions/siteadminpanel.php:371
+#: actions/profilesettings.php:167 actions/siteadminpanel.php:414
#: actions/smssettings.php:181 actions/subscriptions.php:203
#: actions/tagother.php:154 actions/useradminpanel.php:226
#: lib/designsettings.php:256 lib/groupeditform.php:202
msgid "Save"
msgstr "Lagre"
-#: actions/designadminpanel.php:621 lib/designsettings.php:257
+#: actions/designadminpanel.php:668 lib/designsettings.php:257
msgid "Save design"
msgstr ""
@@ -990,6 +1046,11 @@ msgstr "Bioen er for lang (max 140 tegn)"
msgid "Could not update group."
msgstr "Klarte ikke å oppdatere bruker."
+#: actions/editgroup.php:259 classes/User_group.php:390
+#, fuzzy
+msgid "Could not create aliases."
+msgstr "Klarte ikke å lagre avatar-informasjonen"
+
#: actions/editgroup.php:269
msgid "Options saved."
msgstr ""
@@ -1106,7 +1167,7 @@ msgstr "Ingen e-postadresse."
msgid "Cannot normalize that email address"
msgstr "Klarer ikke normalisere epostadressen"
-#: actions/emailsettings.php:330 actions/siteadminpanel.php:156
+#: actions/emailsettings.php:330 actions/siteadminpanel.php:158
msgid "Not a valid email address"
msgstr "Ugyldig e-postadresse"
@@ -1805,10 +1866,10 @@ msgstr ""
msgid "Incorrect username or password."
msgstr "Feil brukernavn eller passord"
-#: actions/login.php:149 actions/recoverpassword.php:375
-#: actions/register.php:248
-msgid "Error setting user."
-msgstr ""
+#: actions/login.php:149
+#, fuzzy
+msgid "Error setting user. You are probably not authorized."
+msgstr "Ikke autorisert."
#: actions/login.php:204 actions/login.php:257 lib/action.php:457
#: lib/logingroupnav.php:79
@@ -2222,7 +2283,7 @@ msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:275
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:309
msgid "Language"
msgstr "Språk"
@@ -2249,7 +2310,7 @@ msgstr ""
msgid "Bio is too long (max %d chars)."
msgstr "«Om meg» er for lang (maks 140 tegn)."
-#: actions/profilesettings.php:228 actions/siteadminpanel.php:163
+#: actions/profilesettings.php:228 actions/siteadminpanel.php:165
msgid "Timezone not selected."
msgstr ""
@@ -2491,6 +2552,10 @@ msgstr "Passordet må bestå av 6 eller flere tegn."
msgid "Password and confirmation do not match."
msgstr ""
+#: actions/recoverpassword.php:375 actions/register.php:248
+msgid "Error setting user."
+msgstr ""
+
#: actions/recoverpassword.php:382
msgid "New password successfully saved. You are now logged in."
msgstr ""
@@ -2552,7 +2617,7 @@ msgid "Same as password above. Required."
msgstr ""
#: actions/register.php:437 actions/register.php:441
-#: actions/siteadminpanel.php:253 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:287 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "E-post"
@@ -2988,7 +3053,7 @@ msgstr ""
msgid "User is already silenced."
msgstr "Du er allerede logget inn!"
-#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:272
+#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:299
msgid "Site"
msgstr ""
@@ -2996,118 +3061,228 @@ msgstr ""
msgid "Basic settings for this StatusNet site."
msgstr ""
-#: actions/siteadminpanel.php:145
+#: actions/siteadminpanel.php:147
msgid "Site name must have non-zero length."
msgstr ""
-#: actions/siteadminpanel.php:153
+#: actions/siteadminpanel.php:155
#, fuzzy
msgid "You must have a valid contact email address"
msgstr "Ugyldig e-postadresse"
-#: actions/siteadminpanel.php:171
+#: actions/siteadminpanel.php:173
#, php-format
msgid "Unknown language \"%s\""
msgstr ""
-#: actions/siteadminpanel.php:178
+#: actions/siteadminpanel.php:180
msgid "Invalid snapshot report URL."
msgstr ""
-#: actions/siteadminpanel.php:184
+#: actions/siteadminpanel.php:186
msgid "Invalid snapshot run value."
msgstr ""
-#: actions/siteadminpanel.php:190
+#: actions/siteadminpanel.php:192
msgid "Snapshot frequency must be a number."
msgstr ""
-#: actions/siteadminpanel.php:241
+#: actions/siteadminpanel.php:199
+msgid "You must set an SSL sever when enabling SSL."
+msgstr ""
+
+#: actions/siteadminpanel.php:204
+msgid "Invalid SSL server. Max length is 255 characters."
+msgstr ""
+
+#: actions/siteadminpanel.php:210
+msgid "Minimum text limit is 140c."
+msgstr ""
+
+#: actions/siteadminpanel.php:216
+msgid "Dupe limit must 1 or more seconds."
+msgstr ""
+
+#: actions/siteadminpanel.php:224
+#, php-format
+msgid "Locales directory not readable: %s"
+msgstr ""
+
+#: actions/siteadminpanel.php:275
msgid "Site name"
msgstr ""
-#: actions/siteadminpanel.php:242
+#: actions/siteadminpanel.php:276
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr ""
-#: actions/siteadminpanel.php:245
+#: actions/siteadminpanel.php:279
msgid "Brought by"
msgstr ""
-#: actions/siteadminpanel.php:246
+#: actions/siteadminpanel.php:280
msgid "Text used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:249
+#: actions/siteadminpanel.php:283
msgid "Brought by URL"
msgstr ""
-#: actions/siteadminpanel.php:250
+#: actions/siteadminpanel.php:284
msgid "URL used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:254
+#: actions/siteadminpanel.php:288
msgid "contact email address for your site"
msgstr ""
-#: actions/siteadminpanel.php:268
+#: actions/siteadminpanel.php:302
msgid "Default timezone"
msgstr ""
-#: actions/siteadminpanel.php:269
+#: actions/siteadminpanel.php:303
msgid "Default timezone for the site; usually UTC."
msgstr ""
-#: actions/siteadminpanel.php:276
+#: actions/siteadminpanel.php:310
msgid "Default site language"
msgstr ""
-#: actions/siteadminpanel.php:282
+#: actions/siteadminpanel.php:316
+msgid "Path to locales"
+msgstr ""
+
+#: actions/siteadminpanel.php:316
+msgid "Directory path to locales"
+msgstr ""
+
+#: actions/siteadminpanel.php:320
+#, fuzzy
+msgid "Server"
+msgstr "Gjenopprett"
+
+#: actions/siteadminpanel.php:320
+msgid "Site's server hostname."
+msgstr ""
+
+#: actions/siteadminpanel.php:324
+msgid "Path"
+msgstr ""
+
+#: actions/siteadminpanel.php:324
+msgid "Site path"
+msgstr ""
+
+#: actions/siteadminpanel.php:328
+msgid "Fancy URLs"
+msgstr ""
+
+#: actions/siteadminpanel.php:330
+msgid "Use fancy (more readable and memorable) URLs?"
+msgstr ""
+
+#: actions/siteadminpanel.php:334
msgid "Private"
msgstr ""
-#: actions/siteadminpanel.php:284
+#: actions/siteadminpanel.php:336
msgid "Prohibit anonymous users (not logged in) from viewing site?"
msgstr ""
-#: actions/siteadminpanel.php:290
+#: actions/siteadminpanel.php:340
+msgid "Invite only"
+msgstr ""
+
+#: actions/siteadminpanel.php:342
+msgid "Make registration invitation only."
+msgstr ""
+
+#: actions/siteadminpanel.php:346 actions/useradminpanel.php:171
+msgid "Closed"
+msgstr ""
+
+#: actions/siteadminpanel.php:348
+msgid "Disable new registrations."
+msgstr ""
+
+#: actions/siteadminpanel.php:353
msgid "Randomly during Web hit"
msgstr ""
-#: actions/siteadminpanel.php:291
+#: actions/siteadminpanel.php:354
msgid "In a scheduled job"
msgstr ""
-#: actions/siteadminpanel.php:292
+#: actions/siteadminpanel.php:355 actions/siteadminpanel.php:380
#, fuzzy
msgid "Never"
msgstr "Gjenopprett"
-#: actions/siteadminpanel.php:294
+#: actions/siteadminpanel.php:357
msgid "Data snapshots"
msgstr ""
-#: actions/siteadminpanel.php:295
+#: actions/siteadminpanel.php:358
msgid "When to send statistical data to status.net servers"
msgstr ""
-#: actions/siteadminpanel.php:301
+#: actions/siteadminpanel.php:364
msgid "Frequency"
msgstr ""
-#: actions/siteadminpanel.php:302
+#: actions/siteadminpanel.php:365
msgid "Snapshots will be sent once every N Web hits"
msgstr ""
-#: actions/siteadminpanel.php:309
+#: actions/siteadminpanel.php:372
msgid "Report URL"
msgstr ""
-#: actions/siteadminpanel.php:310
+#: actions/siteadminpanel.php:373
msgid "Snapshots will be sent to this URL"
msgstr ""
-#: actions/siteadminpanel.php:371 actions/useradminpanel.php:226
+#: actions/siteadminpanel.php:381
+msgid "Sometimes"
+msgstr ""
+
+#: actions/siteadminpanel.php:382
+msgid "Always"
+msgstr ""
+
+#: actions/siteadminpanel.php:384
+msgid "Use SSL"
+msgstr ""
+
+#: actions/siteadminpanel.php:385
+msgid "When to use SSL"
+msgstr ""
+
+#: actions/siteadminpanel.php:391
+msgid "SSL Server"
+msgstr ""
+
+#: actions/siteadminpanel.php:392
+msgid "Server to direct SSL requests to"
+msgstr ""
+
+#: actions/siteadminpanel.php:396
+msgid "Text limit"
+msgstr ""
+
+#: actions/siteadminpanel.php:396
+msgid "Maximum number of characters for notices."
+msgstr ""
+
+#: actions/siteadminpanel.php:400
+msgid "Dupe limit"
+msgstr ""
+
+#: actions/siteadminpanel.php:400
+msgid "How long users must wait (in seconds) to post the same thing again."
+msgstr ""
+
+#: actions/siteadminpanel.php:414 actions/useradminpanel.php:226
#, fuzzy
msgid "Save site settings"
msgstr "Innstillinger for IM"
@@ -3419,10 +3594,6 @@ msgstr ""
msgid "User settings for this StatusNet site."
msgstr ""
-#: actions/useradminpanel.php:171
-msgid "Closed"
-msgstr ""
-
#: actions/useradminpanel.php:173
msgid "Is registration on this site prohibited?"
msgstr ""
@@ -3633,6 +3804,16 @@ msgstr ""
msgid "DB error inserting reply: %s"
msgstr ""
+#: classes/User_group.php:380
+#, fuzzy
+msgid "Could not create group."
+msgstr "Klarte ikke å lagre avatar-informasjonen"
+
+#: classes/User_group.php:409
+#, fuzzy
+msgid "Could not set group membership."
+msgstr "Klarte ikke å lagre avatar-informasjonen"
+
#: classes/User.php:347
#, php-format
msgid "Welcome to %1$s, @%2$s!"
@@ -3867,11 +4048,15 @@ msgstr ""
msgid "saveSettings() not implemented."
msgstr ""
-#: lib/adminpanelaction.php:273
+#: lib/adminpanelaction.php:247
+msgid "Unable to delete design setting."
+msgstr ""
+
+#: lib/adminpanelaction.php:300
msgid "Basic site configuration"
msgstr ""
-#: lib/adminpanelaction.php:276
+#: lib/adminpanelaction.php:303
msgid "Design configuration"
msgstr ""
@@ -4117,20 +4302,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:203
+#: lib/common.php:199
#, fuzzy
msgid "No configuration file found. "
msgstr "Fant ikke bekreftelseskode."
-#: lib/common.php:204
+#: lib/common.php:200
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:205
+#: lib/common.php:201
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:206
+#: lib/common.php:202
msgid "Go to the installer."
msgstr ""
@@ -4899,11 +5084,6 @@ msgstr ""
msgid "Top posters"
msgstr ""
-#: lib/unblockform.php:80
-#, fuzzy
-msgid "Unlock this user"
-msgstr "Kan ikke slette notisen."
-
#: lib/unsandboxform.php:69
msgid "Unsandbox"
msgstr ""
@@ -4956,47 +5136,47 @@ msgstr ""
msgid "Message"
msgstr ""
-#: lib/util.php:821
+#: lib/util.php:826
msgid "a few seconds ago"
msgstr "noen få sekunder siden"
-#: lib/util.php:823
+#: lib/util.php:828
msgid "about a minute ago"
msgstr "omtrent ett minutt siden"
-#: lib/util.php:825
+#: lib/util.php:830
#, php-format
msgid "about %d minutes ago"
msgstr "omtrent %d minutter siden"
-#: lib/util.php:827
+#: lib/util.php:832
msgid "about an hour ago"
msgstr "omtrent én time siden"
-#: lib/util.php:829
+#: lib/util.php:834
#, php-format
msgid "about %d hours ago"
msgstr "omtrent %d timer siden"
-#: lib/util.php:831
+#: lib/util.php:836
msgid "about a day ago"
msgstr "omtrent én dag siden"
-#: lib/util.php:833
+#: lib/util.php:838
#, php-format
msgid "about %d days ago"
msgstr "omtrent %d dager siden"
-#: lib/util.php:835
+#: lib/util.php:840
msgid "about a month ago"
msgstr "omtrent én måned siden"
-#: lib/util.php:837
+#: lib/util.php:842
#, php-format
msgid "about %d months ago"
msgstr "omtrent %d måneder siden"
-#: lib/util.php:839
+#: lib/util.php:844
msgid "about a year ago"
msgstr "omtrent ett år siden"
@@ -5027,5 +5207,9 @@ msgid "Sorry, no incoming email allowed."
msgstr ""
#, fuzzy
+#~ msgid "Unlock this user"
+#~ msgstr "Kan ikke slette notisen."
+
+#, fuzzy
#~ msgid "These people are subscribed to you: "
#~ msgstr "Svar til %s"
diff --git a/locale/nl/LC_MESSAGES/statusnet.po b/locale/nl/LC_MESSAGES/statusnet.po
index 2335a82cf..022b02b5f 100644
--- a/locale/nl/LC_MESSAGES/statusnet.po
+++ b/locale/nl/LC_MESSAGES/statusnet.po
@@ -3,15 +3,18 @@
# Author@translatewiki.net: McDutchie
# Author@translatewiki.net: Siebrand
# --
+# This file is distributed under the same license as the StatusNet package.
+#
msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-18 19:31+0000\n"
+"POT-Creation-Date: 2009-11-19 10:43+0000\n"
"PO-Revision-Date: 2009-11-18 19:32:22+0000\n"
"Language-Team: Dutch\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: MediaWiki 1.16alpha(r59207); Translate extension (2009-11-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: nl\n"
@@ -154,7 +157,7 @@ msgstr "Het was niet mogelijk de gebruiker te actualiseren."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
-#: actions/designadminpanel.php:125 actions/newnotice.php:94
+#: actions/designadminpanel.php:122 actions/newnotice.php:94
#: lib/designsettings.php:283
#, php-format
msgid ""
@@ -239,7 +242,7 @@ msgstr "Alle directe berichten verzonden aan %s"
#: 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:184 actions/apigroupismember.php:114
+#: 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
@@ -306,20 +309,7 @@ msgstr "Het was niet mogelijk de brongebruiker te bepalen."
msgid "Could not find target user."
msgstr "Het was niet mogelijk de doelgebruiker te vinden."
-#: actions/apigroupcreate.php:136 actions/newgroup.php:204
-msgid "Could not create group."
-msgstr "Het was niet mogelijk de groep aan te maken."
-
-#: actions/apigroupcreate.php:147 actions/editgroup.php:259
-#: actions/newgroup.php:210
-msgid "Could not create aliases."
-msgstr "Het was niet mogelijk de aliassen aan te maken."
-
-#: actions/apigroupcreate.php:166 actions/newgroup.php:224
-msgid "Could not set group membership."
-msgstr "Het was niet mogelijk het groepslidmaatschap in te stellen."
-
-#: actions/apigroupcreate.php:212 actions/editgroup.php:182
+#: actions/apigroupcreate.php:164 actions/editgroup.php:182
#: actions/newgroup.php:126 actions/profilesettings.php:208
#: actions/register.php:205
msgid "Nickname must have only lowercase letters and numbers and no spaces."
@@ -327,61 +317,61 @@ msgstr ""
"De gebruikersnaam moet alleen bestaan uit kleine letters en cijfers, en mag "
"geen spaties bevatten."
-#: actions/apigroupcreate.php:221 actions/editgroup.php:186
+#: 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 ""
"De opgegeven gebruikersnaam is al in gebruik. Kies een andere gebruikersnaam."
-#: actions/apigroupcreate.php:228 actions/editgroup.php:189
+#: 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 "Geen geldige gebruikersnaam."
-#: actions/apigroupcreate.php:244 actions/editgroup.php:195
+#: 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 "De thuispagina is geen geldige URL."
-#: actions/apigroupcreate.php:253 actions/editgroup.php:198
+#: 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 "De volledige naam is te lang (maximaal 255 tekens)."
-#: actions/apigroupcreate.php:261
+#: actions/apigroupcreate.php:213
#, php-format
msgid "Description is too long (max %d chars)."
msgstr "De beschrijving is te lang. Gebruik maximaal %d tekens."
-#: actions/apigroupcreate.php:272 actions/editgroup.php:204
+#: 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 "Locatie is te lang (maximaal 255 tekens)."
-#: actions/apigroupcreate.php:291 actions/editgroup.php:215
+#: actions/apigroupcreate.php:243 actions/editgroup.php:215
#: actions/newgroup.php:159
#, php-format
msgid "Too many aliases! Maximum %d."
msgstr "Te veel aliasen! Het maximale aantal is %d."
-#: actions/apigroupcreate.php:312 actions/editgroup.php:224
+#: actions/apigroupcreate.php:264 actions/editgroup.php:224
#: actions/newgroup.php:168
#, php-format
msgid "Invalid alias: \"%s\""
msgstr "Ongeldig alias: \"%s\""
-#: actions/apigroupcreate.php:321 actions/editgroup.php:228
+#: actions/apigroupcreate.php:273 actions/editgroup.php:228
#: actions/newgroup.php:172
#, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr "De alias \"%s\" wordt al gebruikt. Geef een ander alias op."
-#: actions/apigroupcreate.php:334 actions/editgroup.php:234
+#: actions/apigroupcreate.php:286 actions/editgroup.php:234
#: actions/newgroup.php:178
msgid "Alias can't be the same as nickname."
msgstr "Een alias kan niet hetzelfde zijn als de gebruikersnaam."
@@ -606,10 +596,10 @@ msgstr ""
"Er is een probleem ontstaan met uw sessie. Probeer het nog een keer, "
"alstublieft."
-#: actions/avatarsettings.php:277 actions/emailsettings.php:255
-#: actions/grouplogo.php:319 actions/imsettings.php:220
-#: actions/recoverpassword.php:44 actions/smssettings.php:248
-#: lib/designsettings.php:304
+#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
+#: actions/emailsettings.php:255 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/recoverpassword.php:44
+#: actions/smssettings.php:248 lib/designsettings.php:304
msgid "Unexpected form submission."
msgstr "Het formulier is onverwacht ingezonden."
@@ -669,7 +659,7 @@ msgstr "Deze gebruiker weer toegang geven tot de groep"
msgid "Unblock"
msgstr "Deblokkeer"
-#: actions/blockedfromgroup.php:313
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:80
msgid "Unblock this user"
msgstr "Deblokkeer deze gebruiker."
@@ -844,7 +834,7 @@ msgid "Delete this user"
msgstr "Deze mededeling verwijderen"
#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124
-#: lib/adminpanelaction.php:275 lib/groupnav.php:119
+#: lib/adminpanelaction.php:302 lib/groupnav.php:119
msgid "Design"
msgstr "Ontwerp"
@@ -852,40 +842,103 @@ msgstr "Ontwerp"
msgid "Design settings for this StatusNet site."
msgstr ""
-#: actions/designadminpanel.php:220
+#: actions/designadminpanel.php:278
#, fuzzy
-msgid "Unable to delete design setting."
-msgstr "Het was niet mogelijk om uw ontwerpinstellingen op te slaan."
+msgid "Invalid logo URL."
+msgstr "Ongeldige afmetingen."
-#: actions/designadminpanel.php:301
+#: actions/designadminpanel.php:282
#, fuzzy, php-format
msgid "Theme not available: %s"
msgstr "IM is niet beschikbaar."
-#: actions/designadminpanel.php:406
+#: actions/designadminpanel.php:288
+#, fuzzy, php-format
+msgid "Theme directory not readable: %s"
+msgstr "IM is niet beschikbaar."
+
+#: actions/designadminpanel.php:292
+#, php-format
+msgid "Avatar directory not writable: %s"
+msgstr ""
+
+#: actions/designadminpanel.php:296
+#, php-format
+msgid "Background directory not writable: %s"
+msgstr ""
+
+#: actions/designadminpanel.php:312
+#, php-format
+msgid "Max length for %s %s is 255 characters."
+msgstr ""
+
+#: actions/designadminpanel.php:412
+#, fuzzy
+msgid "Change logo"
+msgstr "Kleuren wijzigen"
+
+#: actions/designadminpanel.php:417
+#, fuzzy
+msgid "Site logo"
+msgstr "Uitnodigen"
+
+#: actions/designadminpanel.php:424
#, fuzzy
msgid "Change theme"
msgstr "Wijzigen"
-#: actions/designadminpanel.php:410
-msgid "Theme"
-msgstr ""
+#: actions/designadminpanel.php:441
+#, fuzzy
+msgid "Site theme"
+msgstr "Kennisgeving van site"
-#: actions/designadminpanel.php:411
+#: actions/designadminpanel.php:442
#, fuzzy
msgid "Theme for the site."
msgstr "Van de site afmelden"
-#: actions/designadminpanel.php:420 lib/designsettings.php:101
+#: actions/designadminpanel.php:447
+msgid "Theme server"
+msgstr ""
+
+#: actions/designadminpanel.php:451
+msgid "Theme path"
+msgstr ""
+
+#: actions/designadminpanel.php:455
+msgid "Theme directory"
+msgstr ""
+
+#: actions/designadminpanel.php:462
+#, fuzzy
+msgid "Avatar Settings"
+msgstr "Avatarinstellingen"
+
+#: actions/designadminpanel.php:467
+#, fuzzy
+msgid "Avatar server"
+msgstr "Avatarinstellingen"
+
+#: actions/designadminpanel.php:471
+#, fuzzy
+msgid "Avatar path"
+msgstr "De avatar is bijgewerkt."
+
+#: actions/designadminpanel.php:475
+#, fuzzy
+msgid "Avatar directory"
+msgstr "De avatar is verwijderd."
+
+#: actions/designadminpanel.php:486 lib/designsettings.php:101
msgid "Change background image"
msgstr "Achtergrondafbeelding wijzigen"
-#: actions/designadminpanel.php:424 actions/designadminpanel.php:498
+#: actions/designadminpanel.php:491 actions/designadminpanel.php:578
#: lib/designsettings.php:178
msgid "Background"
msgstr "Achtergrond"
-#: actions/designadminpanel.php:429
+#: actions/designadminpanel.php:496
#, fuzzy, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -894,64 +947,79 @@ msgstr ""
"Hier kunt u een logo voor uw groep uploaden. De maximale bestandsgrootte is %"
"s."
-#: actions/designadminpanel.php:459 lib/designsettings.php:139
+#: actions/designadminpanel.php:526 lib/designsettings.php:139
msgid "On"
msgstr "Aan"
-#: actions/designadminpanel.php:475 lib/designsettings.php:155
+#: actions/designadminpanel.php:542 lib/designsettings.php:155
msgid "Off"
msgstr "Uit"
-#: actions/designadminpanel.php:476 lib/designsettings.php:156
+#: actions/designadminpanel.php:543 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr "Achtergrondafbeelding inschakelen of uitschakelen."
-#: actions/designadminpanel.php:481 lib/designsettings.php:161
+#: actions/designadminpanel.php:548 lib/designsettings.php:161
msgid "Tile background image"
msgstr "Achtergrondafbeelding naast elkaar"
-#: actions/designadminpanel.php:490 lib/designsettings.php:170
+#: actions/designadminpanel.php:554
+#, fuzzy
+msgid "Background server"
+msgstr "Achtergrond"
+
+#: actions/designadminpanel.php:558
+#, fuzzy
+msgid "Background path"
+msgstr "Achtergrond"
+
+#: actions/designadminpanel.php:562
+#, fuzzy
+msgid "Background directory"
+msgstr "Achtergrond"
+
+#: actions/designadminpanel.php:569 lib/designsettings.php:170
msgid "Change colours"
msgstr "Kleuren wijzigen"
-#: actions/designadminpanel.php:511 lib/designsettings.php:191
+#: actions/designadminpanel.php:591 lib/designsettings.php:191
msgid "Content"
msgstr "Inhoud"
-#: actions/designadminpanel.php:524 lib/designsettings.php:204
+#: actions/designadminpanel.php:604 lib/designsettings.php:204
msgid "Sidebar"
msgstr "Menubalk"
-#: actions/designadminpanel.php:537 lib/designsettings.php:217
+#: actions/designadminpanel.php:617 lib/designsettings.php:217
msgid "Text"
msgstr "Tekst"
-#: actions/designadminpanel.php:550 lib/designsettings.php:230
+#: actions/designadminpanel.php:630 lib/designsettings.php:230
msgid "Links"
msgstr "Verwijzingen"
-#: actions/designadminpanel.php:611 lib/designsettings.php:247
+#: actions/designadminpanel.php:658 lib/designsettings.php:247
msgid "Use defaults"
msgstr "Standaardinstellingen gebruiken"
-#: actions/designadminpanel.php:612 lib/designsettings.php:248
+#: actions/designadminpanel.php:659 lib/designsettings.php:248
msgid "Restore default designs"
msgstr "Standaardontwerp toepassen"
-#: actions/designadminpanel.php:618 lib/designsettings.php:254
+#: actions/designadminpanel.php:665 lib/designsettings.php:254
msgid "Reset back to default"
msgstr "Standaardinstellingen toepassen"
-#: actions/designadminpanel.php:620 actions/emailsettings.php:195
+#: actions/designadminpanel.php:667 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/profilesettings.php:167 actions/siteadminpanel.php:371
+#: actions/profilesettings.php:167 actions/siteadminpanel.php:414
#: actions/smssettings.php:181 actions/subscriptions.php:203
#: actions/tagother.php:154 actions/useradminpanel.php:226
#: lib/designsettings.php:256 lib/groupeditform.php:202
msgid "Save"
msgstr "Opslaan"
-#: actions/designadminpanel.php:621 lib/designsettings.php:257
+#: actions/designadminpanel.php:668 lib/designsettings.php:257
msgid "Save design"
msgstr "Ontwerp opslaan"
@@ -994,6 +1062,10 @@ msgstr "de beschrijving is te lang (maximaal %d tekens)"
msgid "Could not update group."
msgstr "Het was niet mogelijk de groep bij te werken."
+#: actions/editgroup.php:259 classes/User_group.php:390
+msgid "Could not create aliases."
+msgstr "Het was niet mogelijk de aliassen aan te maken."
+
#: actions/editgroup.php:269
msgid "Options saved."
msgstr "De instellingen zijn opgeslagen."
@@ -1113,7 +1185,7 @@ msgstr "Geen e-mailadres"
msgid "Cannot normalize that email address"
msgstr "Kan het emailadres niet normaliseren"
-#: actions/emailsettings.php:330 actions/siteadminpanel.php:156
+#: actions/emailsettings.php:330 actions/siteadminpanel.php:158
msgid "Not a valid email address"
msgstr "Geen geldig e-mailadres."
@@ -1854,10 +1926,10 @@ msgstr "Het token is ongeldig of verlopen."
msgid "Incorrect username or password."
msgstr "De gebruikersnaam of wachtwoord is onjuist."
-#: actions/login.php:149 actions/recoverpassword.php:375
-#: actions/register.php:248
-msgid "Error setting user."
-msgstr "Er is een fout opgetreden tijdens het instellen van de gebruiker."
+#: actions/login.php:149
+#, fuzzy
+msgid "Error setting user. You are probably not authorized."
+msgstr "U hebt niet de juiste toegangsrechten."
#: actions/login.php:204 actions/login.php:257 lib/action.php:457
#: lib/logingroupnav.php:79
@@ -2287,7 +2359,7 @@ msgstr ""
"Eigen labels (letter, getallen, -, ., en _). Gescheiden door komma's of "
"spaties"
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:275
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:309
msgid "Language"
msgstr "Taal"
@@ -2315,7 +2387,7 @@ msgstr ""
msgid "Bio is too long (max %d chars)."
msgstr "De beschrijving is te lang (maximaal %d tekens)."
-#: actions/profilesettings.php:228 actions/siteadminpanel.php:163
+#: actions/profilesettings.php:228 actions/siteadminpanel.php:165
msgid "Timezone not selected."
msgstr "Er is geen tijdzone geselecteerd."
@@ -2579,6 +2651,10 @@ msgstr "Het wachtwoord moet uit zes of meer tekens bestaan."
msgid "Password and confirmation do not match."
msgstr "Het wachtwoord en de bevestiging komen niet overeen."
+#: actions/recoverpassword.php:375 actions/register.php:248
+msgid "Error setting user."
+msgstr "Er is een fout opgetreden tijdens het instellen van de gebruiker."
+
#: actions/recoverpassword.php:382
msgid "New password successfully saved. You are now logged in."
msgstr "Het nieuwe wachtwoord is opgeslagen. U bent nu aangemeld."
@@ -2641,7 +2717,7 @@ msgid "Same as password above. Required."
msgstr "Gelijk aan het wachtwoord hierboven. Verplicht"
#: actions/register.php:437 actions/register.php:441
-#: actions/siteadminpanel.php:253 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:287 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "E-mail"
@@ -3118,7 +3194,7 @@ msgstr "U kunt geen bericht naar deze gebruiker zenden."
msgid "User is already silenced."
msgstr "Deze gebruiker is al de toegang tot de groep ontzegd."
-#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:272
+#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:299
#, fuzzy
msgid "Site"
msgstr "Uitnodigen"
@@ -3127,122 +3203,237 @@ msgstr "Uitnodigen"
msgid "Basic settings for this StatusNet site."
msgstr ""
-#: actions/siteadminpanel.php:145
+#: actions/siteadminpanel.php:147
msgid "Site name must have non-zero length."
msgstr ""
-#: actions/siteadminpanel.php:153
+#: actions/siteadminpanel.php:155
#, fuzzy
msgid "You must have a valid contact email address"
msgstr "Geen geldig e-mailadres."
-#: actions/siteadminpanel.php:171
+#: actions/siteadminpanel.php:173
#, php-format
msgid "Unknown language \"%s\""
msgstr ""
-#: actions/siteadminpanel.php:178
+#: actions/siteadminpanel.php:180
msgid "Invalid snapshot report URL."
msgstr ""
-#: actions/siteadminpanel.php:184
+#: actions/siteadminpanel.php:186
msgid "Invalid snapshot run value."
msgstr ""
-#: actions/siteadminpanel.php:190
+#: actions/siteadminpanel.php:192
msgid "Snapshot frequency must be a number."
msgstr ""
-#: actions/siteadminpanel.php:241
+#: actions/siteadminpanel.php:199
+msgid "You must set an SSL sever when enabling SSL."
+msgstr ""
+
+#: actions/siteadminpanel.php:204
+msgid "Invalid SSL server. Max length is 255 characters."
+msgstr ""
+
+#: actions/siteadminpanel.php:210
+msgid "Minimum text limit is 140c."
+msgstr ""
+
+#: actions/siteadminpanel.php:216
+msgid "Dupe limit must 1 or more seconds."
+msgstr ""
+
+#: actions/siteadminpanel.php:224
+#, php-format
+msgid "Locales directory not readable: %s"
+msgstr ""
+
+#: actions/siteadminpanel.php:275
#, fuzzy
msgid "Site name"
msgstr "Kennisgeving van site"
-#: actions/siteadminpanel.php:242
+#: actions/siteadminpanel.php:276
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr ""
-#: actions/siteadminpanel.php:245
+#: actions/siteadminpanel.php:279
msgid "Brought by"
msgstr ""
-#: actions/siteadminpanel.php:246
+#: actions/siteadminpanel.php:280
msgid "Text used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:249
+#: actions/siteadminpanel.php:283
msgid "Brought by URL"
msgstr ""
-#: actions/siteadminpanel.php:250
+#: actions/siteadminpanel.php:284
msgid "URL used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:254
+#: actions/siteadminpanel.php:288
#, fuzzy
msgid "contact email address for your site"
msgstr "Nieuw e-mailadres om e-mail te versturen aan %s"
-#: actions/siteadminpanel.php:268
+#: actions/siteadminpanel.php:302
msgid "Default timezone"
msgstr ""
-#: actions/siteadminpanel.php:269
+#: actions/siteadminpanel.php:303
msgid "Default timezone for the site; usually UTC."
msgstr ""
-#: actions/siteadminpanel.php:276
+#: actions/siteadminpanel.php:310
#, fuzzy
msgid "Default site language"
msgstr "Voorkeurstaal"
-#: actions/siteadminpanel.php:282
+#: actions/siteadminpanel.php:316
+msgid "Path to locales"
+msgstr ""
+
+#: actions/siteadminpanel.php:316
+msgid "Directory path to locales"
+msgstr ""
+
+#: actions/siteadminpanel.php:320
+#, fuzzy
+msgid "Server"
+msgstr "Herstellen"
+
+#: actions/siteadminpanel.php:320
+msgid "Site's server hostname."
+msgstr ""
+
+#: actions/siteadminpanel.php:324
+msgid "Path"
+msgstr ""
+
+#: actions/siteadminpanel.php:324
+#, fuzzy
+msgid "Site path"
+msgstr "Kennisgeving van site"
+
+#: actions/siteadminpanel.php:328
+msgid "Fancy URLs"
+msgstr ""
+
+#: actions/siteadminpanel.php:330
+msgid "Use fancy (more readable and memorable) URLs?"
+msgstr ""
+
+#: actions/siteadminpanel.php:334
#, fuzzy
msgid "Private"
msgstr "Privacy"
-#: actions/siteadminpanel.php:284
+#: actions/siteadminpanel.php:336
msgid "Prohibit anonymous users (not logged in) from viewing site?"
msgstr ""
-#: actions/siteadminpanel.php:290
+#: actions/siteadminpanel.php:340
+#, fuzzy
+msgid "Invite only"
+msgstr "Uitnodigen"
+
+#: actions/siteadminpanel.php:342
+msgid "Make registration invitation only."
+msgstr ""
+
+#: actions/siteadminpanel.php:346 actions/useradminpanel.php:171
+#, fuzzy
+msgid "Closed"
+msgstr "Geblokkeerd"
+
+#: actions/siteadminpanel.php:348
+msgid "Disable new registrations."
+msgstr ""
+
+#: actions/siteadminpanel.php:353
msgid "Randomly during Web hit"
msgstr ""
-#: actions/siteadminpanel.php:291
+#: actions/siteadminpanel.php:354
msgid "In a scheduled job"
msgstr ""
-#: actions/siteadminpanel.php:292
+#: actions/siteadminpanel.php:355 actions/siteadminpanel.php:380
#, fuzzy
msgid "Never"
msgstr "Herstellen"
-#: actions/siteadminpanel.php:294
+#: actions/siteadminpanel.php:357
msgid "Data snapshots"
msgstr ""
-#: actions/siteadminpanel.php:295
+#: actions/siteadminpanel.php:358
msgid "When to send statistical data to status.net servers"
msgstr ""
-#: actions/siteadminpanel.php:301
+#: actions/siteadminpanel.php:364
msgid "Frequency"
msgstr ""
-#: actions/siteadminpanel.php:302
+#: actions/siteadminpanel.php:365
msgid "Snapshots will be sent once every N Web hits"
msgstr ""
-#: actions/siteadminpanel.php:309
+#: actions/siteadminpanel.php:372
msgid "Report URL"
msgstr ""
-#: actions/siteadminpanel.php:310
+#: actions/siteadminpanel.php:373
msgid "Snapshots will be sent to this URL"
msgstr ""
-#: actions/siteadminpanel.php:371 actions/useradminpanel.php:226
+#: actions/siteadminpanel.php:381
+#, fuzzy
+msgid "Sometimes"
+msgstr "Mededelingen"
+
+#: actions/siteadminpanel.php:382
+#, fuzzy
+msgid "Always"
+msgstr "Aliasen"
+
+#: actions/siteadminpanel.php:384
+msgid "Use SSL"
+msgstr ""
+
+#: actions/siteadminpanel.php:385
+msgid "When to use SSL"
+msgstr ""
+
+#: actions/siteadminpanel.php:391
+msgid "SSL Server"
+msgstr ""
+
+#: actions/siteadminpanel.php:392
+msgid "Server to direct SSL requests to"
+msgstr ""
+
+#: actions/siteadminpanel.php:396
+msgid "Text limit"
+msgstr ""
+
+#: actions/siteadminpanel.php:396
+msgid "Maximum number of characters for notices."
+msgstr ""
+
+#: actions/siteadminpanel.php:400
+msgid "Dupe limit"
+msgstr ""
+
+#: actions/siteadminpanel.php:400
+msgid "How long users must wait (in seconds) to post the same thing again."
+msgstr ""
+
+#: actions/siteadminpanel.php:414 actions/useradminpanel.php:226
#, fuzzy
msgid "Save site settings"
msgstr "Avatarinstellingen"
@@ -3571,11 +3762,6 @@ msgstr "Gebruiker"
msgid "User settings for this StatusNet site."
msgstr ""
-#: actions/useradminpanel.php:171
-#, fuzzy
-msgid "Closed"
-msgstr "Geblokkeerd"
-
#: actions/useradminpanel.php:173
msgid "Is registration on this site prohibited?"
msgstr ""
@@ -3813,6 +3999,14 @@ msgid "DB error inserting reply: %s"
msgstr ""
"Er is een databasefout opgetreden bij het invoegen van het antwoord: %s"
+#: classes/User_group.php:380
+msgid "Could not create group."
+msgstr "Het was niet mogelijk de groep aan te maken."
+
+#: classes/User_group.php:409
+msgid "Could not set group membership."
+msgstr "Het was niet mogelijk het groepslidmaatschap in te stellen."
+
#: classes/User.php:347
#, php-format
msgid "Welcome to %1$s, @%2$s!"
@@ -4049,12 +4243,17 @@ msgstr "Dit commando is nog niet geïmplementeerd."
msgid "saveSettings() not implemented."
msgstr "Dit commando is nog niet geïmplementeerd."
-#: lib/adminpanelaction.php:273
+#: lib/adminpanelaction.php:247
+#, fuzzy
+msgid "Unable to delete design setting."
+msgstr "Het was niet mogelijk om uw ontwerpinstellingen op te slaan."
+
+#: lib/adminpanelaction.php:300
#, fuzzy
msgid "Basic site configuration"
msgstr "E-mailadresbevestiging"
-#: lib/adminpanelaction.php:276
+#: lib/adminpanelaction.php:303
#, fuzzy
msgid "Design configuration"
msgstr "SMS-bevestiging"
@@ -4344,20 +4543,20 @@ msgstr ""
"tracks - nog niet beschikbaar\n"
"tracking - nog niet beschikbaar\n"
-#: lib/common.php:203
+#: lib/common.php:199
msgid "No configuration file found. "
msgstr "Er is geen instellingenbestand aangetroffen. "
-#: lib/common.php:204
+#: lib/common.php:200
msgid "I looked for configuration files in the following places: "
msgstr "Er is gezocht naar instellingenbestanden op de volgende plaatsen: "
-#: lib/common.php:205
+#: lib/common.php:201
msgid "You may wish to run the installer to fix this."
msgstr ""
"U kunt proberen de installer uit te voeren om dit probleem op te lossen."
-#: lib/common.php:206
+#: lib/common.php:202
msgid "Go to the installer."
msgstr "Naar het installatieprogramma gaan."
@@ -5204,11 +5403,6 @@ msgstr "Geen"
msgid "Top posters"
msgstr "Meest actieve gebruikers"
-#: lib/unblockform.php:80
-#, fuzzy
-msgid "Unlock this user"
-msgstr "Deblokkeer deze gebruiker."
-
#: lib/unsandboxform.php:69
msgid "Unsandbox"
msgstr ""
@@ -5259,47 +5453,47 @@ msgstr "Deze gebruiker een direct bericht zenden"
msgid "Message"
msgstr "Bericht"
-#: lib/util.php:821
+#: lib/util.php:826
msgid "a few seconds ago"
msgstr "een paar seconden geleden"
-#: lib/util.php:823
+#: lib/util.php:828
msgid "about a minute ago"
msgstr "ongeveer een minuut geleden"
-#: lib/util.php:825
+#: lib/util.php:830
#, php-format
msgid "about %d minutes ago"
msgstr "ongeveer %d minuten geleden"
-#: lib/util.php:827
+#: lib/util.php:832
msgid "about an hour ago"
msgstr "ongeveer een uur geleden"
-#: lib/util.php:829
+#: lib/util.php:834
#, php-format
msgid "about %d hours ago"
msgstr "ongeveer %d uur geleden"
-#: lib/util.php:831
+#: lib/util.php:836
msgid "about a day ago"
msgstr "ongeveer een dag geleden"
-#: lib/util.php:833
+#: lib/util.php:838
#, php-format
msgid "about %d days ago"
msgstr "ongeveer %d dagen geleden"
-#: lib/util.php:835
+#: lib/util.php:840
msgid "about a month ago"
msgstr "ongeveer een maand geleden"
-#: lib/util.php:837
+#: lib/util.php:842
#, php-format
msgid "about %d months ago"
msgstr "ongeveer %d maanden geleden"
-#: lib/util.php:839
+#: lib/util.php:844
msgid "about a year ago"
msgstr "ongeveer een jaar geleden"
@@ -5329,5 +5523,9 @@ msgstr "Dit is niet uw inkomende e-mailadres."
msgid "Sorry, no incoming email allowed."
msgstr "Inkomende e-mail is niet toegestaan."
+#, fuzzy
+#~ msgid "Unlock this user"
+#~ msgstr "Deblokkeer deze gebruiker."
+
#~ msgid "These people are subscribed to you: "
#~ msgstr "De volgende gebruikers hebben een abonnement op u: "
diff --git a/locale/nn/LC_MESSAGES/statusnet.po b/locale/nn/LC_MESSAGES/statusnet.po
index dc1a70e1e..7e57fe4b3 100644
--- a/locale/nn/LC_MESSAGES/statusnet.po
+++ b/locale/nn/LC_MESSAGES/statusnet.po
@@ -1,15 +1,18 @@
# Translation of StatusNet to Norwegian Nynorsk
#
# --
+# 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-18 19:31+0000\n"
+"POT-Creation-Date: 2009-11-19 10:43+0000\n"
"PO-Revision-Date: 2009-11-18 19:32:19+0000\n"
"Language-Team: Norwegian Nynorsk\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: MediaWiki 1.16alpha(r59207); Translate extension (2009-11-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: nn\n"
@@ -145,7 +148,7 @@ msgstr "Kan ikkje oppdatera brukar."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
-#: actions/designadminpanel.php:125 actions/newnotice.php:94
+#: actions/designadminpanel.php:122 actions/newnotice.php:94
#: lib/designsettings.php:283
#, php-format
msgid ""
@@ -229,7 +232,7 @@ msgstr "Alle direkte meldingar sendt til %s"
#: 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:184 actions/apigroupismember.php:114
+#: 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
@@ -298,80 +301,66 @@ msgstr "Kan ikkje hente offentleg straum."
msgid "Could not find target user."
msgstr "Kan ikkje finna einkvan status."
-#: actions/apigroupcreate.php:136 actions/newgroup.php:204
-msgid "Could not create group."
-msgstr "Kunne ikkje laga gruppa."
-
-#: actions/apigroupcreate.php:147 actions/editgroup.php:259
-#: actions/newgroup.php:210
-#, fuzzy
-msgid "Could not create aliases."
-msgstr "Kunne ikkje lagre favoritt."
-
-#: actions/apigroupcreate.php:166 actions/newgroup.php:224
-msgid "Could not set group membership."
-msgstr "Kunne ikkje bli med i gruppa."
-
-#: actions/apigroupcreate.php:212 actions/editgroup.php:182
+#: actions/apigroupcreate.php:164 actions/editgroup.php:182
#: actions/newgroup.php:126 actions/profilesettings.php:208
#: actions/register.php:205
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr "Kallenamn må berre ha små bokstavar og nummer, ingen mellomrom."
-#: actions/apigroupcreate.php:221 actions/editgroup.php:186
+#: 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 "Kallenamnet er allereie i bruk. Prøv eit anna."
-#: actions/apigroupcreate.php:228 actions/editgroup.php:189
+#: 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 "Ikkje eit gyldig brukarnamn."
-#: actions/apigroupcreate.php:244 actions/editgroup.php:195
+#: 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 "Heimesida er ikkje ei gyldig internettadresse."
-#: actions/apigroupcreate.php:253 actions/editgroup.php:198
+#: 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 "Ditt fulle namn er for langt (maksimalt 255 teikn)."
-#: actions/apigroupcreate.php:261
+#: actions/apigroupcreate.php:213
#, fuzzy, php-format
msgid "Description is too long (max %d chars)."
msgstr "skildringa er for lang (maks 140 teikn)."
-#: actions/apigroupcreate.php:272 actions/editgroup.php:204
+#: 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 "Plassering er for lang (maksimalt 255 teikn)."
-#: actions/apigroupcreate.php:291 actions/editgroup.php:215
+#: actions/apigroupcreate.php:243 actions/editgroup.php:215
#: actions/newgroup.php:159
#, php-format
msgid "Too many aliases! Maximum %d."
msgstr ""
-#: actions/apigroupcreate.php:312 actions/editgroup.php:224
+#: actions/apigroupcreate.php:264 actions/editgroup.php:224
#: actions/newgroup.php:168
#, fuzzy, php-format
msgid "Invalid alias: \"%s\""
msgstr "Ugyldig merkelapp: %s"
-#: actions/apigroupcreate.php:321 actions/editgroup.php:228
+#: actions/apigroupcreate.php:273 actions/editgroup.php:228
#: actions/newgroup.php:172
#, fuzzy, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr "Kallenamnet er allereie i bruk. Prøv eit anna."
-#: actions/apigroupcreate.php:334 actions/editgroup.php:234
+#: actions/apigroupcreate.php:286 actions/editgroup.php:234
#: actions/newgroup.php:178
msgid "Alias can't be the same as nickname."
msgstr ""
@@ -596,10 +585,10 @@ msgstr "Skaler"
msgid "There was a problem with your session token. Try again, please."
msgstr "Der var eit problem med sesjonen din. Vennlegst prøv på nytt."
-#: actions/avatarsettings.php:277 actions/emailsettings.php:255
-#: actions/grouplogo.php:319 actions/imsettings.php:220
-#: actions/recoverpassword.php:44 actions/smssettings.php:248
-#: lib/designsettings.php:304
+#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
+#: actions/emailsettings.php:255 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/recoverpassword.php:44
+#: actions/smssettings.php:248 lib/designsettings.php:304
msgid "Unexpected form submission."
msgstr "Uventa skjemasending."
@@ -662,7 +651,7 @@ msgstr "De-blokkering av brukar feila."
msgid "Unblock"
msgstr "Lås opp"
-#: actions/blockedfromgroup.php:313
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:80
msgid "Unblock this user"
msgstr "Lås opp brukaren"
@@ -838,7 +827,7 @@ msgid "Delete this user"
msgstr "Slett denne notisen"
#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124
-#: lib/adminpanelaction.php:275 lib/groupnav.php:119
+#: lib/adminpanelaction.php:302 lib/groupnav.php:119
msgid "Design"
msgstr ""
@@ -846,108 +835,183 @@ msgstr ""
msgid "Design settings for this StatusNet site."
msgstr ""
-#: actions/designadminpanel.php:220
+#: actions/designadminpanel.php:278
#, fuzzy
-msgid "Unable to delete design setting."
-msgstr "Klarte ikkje å lagra Twitter-innstillingane dine!"
+msgid "Invalid logo URL."
+msgstr "Ugyldig storleik."
-#: actions/designadminpanel.php:301
+#: actions/designadminpanel.php:282
#, fuzzy, php-format
msgid "Theme not available: %s"
msgstr "Denne sida er ikkje tilgjengleg i eit"
-#: actions/designadminpanel.php:406
+#: actions/designadminpanel.php:288
+#, fuzzy, php-format
+msgid "Theme directory not readable: %s"
+msgstr "Denne sida er ikkje tilgjengleg i eit"
+
+#: actions/designadminpanel.php:292
+#, php-format
+msgid "Avatar directory not writable: %s"
+msgstr ""
+
+#: actions/designadminpanel.php:296
+#, php-format
+msgid "Background directory not writable: %s"
+msgstr ""
+
+#: actions/designadminpanel.php:312
+#, php-format
+msgid "Max length for %s %s is 255 characters."
+msgstr ""
+
+#: actions/designadminpanel.php:412
+#, fuzzy
+msgid "Change logo"
+msgstr "Endra passordet ditt"
+
+#: actions/designadminpanel.php:417
+#, fuzzy
+msgid "Site logo"
+msgstr "Invitér"
+
+#: actions/designadminpanel.php:424
#, fuzzy
msgid "Change theme"
msgstr "Endra"
-#: actions/designadminpanel.php:410
-msgid "Theme"
-msgstr ""
+#: actions/designadminpanel.php:441
+#, fuzzy
+msgid "Site theme"
+msgstr "Statusmelding"
-#: actions/designadminpanel.php:411
+#: actions/designadminpanel.php:442
#, fuzzy
msgid "Theme for the site."
msgstr "Logg ut or sida"
-#: actions/designadminpanel.php:420 lib/designsettings.php:101
+#: actions/designadminpanel.php:447
+msgid "Theme server"
+msgstr ""
+
+#: actions/designadminpanel.php:451
+msgid "Theme path"
+msgstr ""
+
+#: actions/designadminpanel.php:455
+msgid "Theme directory"
+msgstr ""
+
+#: actions/designadminpanel.php:462
+#, fuzzy
+msgid "Avatar Settings"
+msgstr "Avatar-innstillingar"
+
+#: actions/designadminpanel.php:467
+#, fuzzy
+msgid "Avatar server"
+msgstr "Avatar-innstillingar"
+
+#: actions/designadminpanel.php:471
+#, fuzzy
+msgid "Avatar path"
+msgstr "Lasta opp brukarbilete."
+
+#: actions/designadminpanel.php:475
+#, fuzzy
+msgid "Avatar directory"
+msgstr "Lasta opp brukarbilete."
+
+#: actions/designadminpanel.php:486 lib/designsettings.php:101
msgid "Change background image"
msgstr ""
-#: actions/designadminpanel.php:424 actions/designadminpanel.php:498
+#: actions/designadminpanel.php:491 actions/designadminpanel.php:578
#: lib/designsettings.php:178
msgid "Background"
msgstr ""
-#: actions/designadminpanel.php:429
+#: actions/designadminpanel.php:496
#, fuzzy, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
"$s."
msgstr "Du kan lasta opp ein logo for gruppa."
-#: actions/designadminpanel.php:459 lib/designsettings.php:139
+#: actions/designadminpanel.php:526 lib/designsettings.php:139
msgid "On"
msgstr ""
-#: actions/designadminpanel.php:475 lib/designsettings.php:155
+#: actions/designadminpanel.php:542 lib/designsettings.php:155
msgid "Off"
msgstr ""
-#: actions/designadminpanel.php:476 lib/designsettings.php:156
+#: actions/designadminpanel.php:543 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr ""
-#: actions/designadminpanel.php:481 lib/designsettings.php:161
+#: actions/designadminpanel.php:548 lib/designsettings.php:161
msgid "Tile background image"
msgstr ""
-#: actions/designadminpanel.php:490 lib/designsettings.php:170
+#: actions/designadminpanel.php:554
+msgid "Background server"
+msgstr ""
+
+#: actions/designadminpanel.php:558
+msgid "Background path"
+msgstr ""
+
+#: actions/designadminpanel.php:562
+msgid "Background directory"
+msgstr ""
+
+#: actions/designadminpanel.php:569 lib/designsettings.php:170
#, fuzzy
msgid "Change colours"
msgstr "Endra passordet ditt"
-#: actions/designadminpanel.php:511 lib/designsettings.php:191
+#: actions/designadminpanel.php:591 lib/designsettings.php:191
#, fuzzy
msgid "Content"
msgstr "Kopla til"
-#: actions/designadminpanel.php:524 lib/designsettings.php:204
+#: actions/designadminpanel.php:604 lib/designsettings.php:204
#, fuzzy
msgid "Sidebar"
msgstr "Søk"
-#: actions/designadminpanel.php:537 lib/designsettings.php:217
+#: actions/designadminpanel.php:617 lib/designsettings.php:217
msgid "Text"
msgstr "Tekst"
-#: actions/designadminpanel.php:550 lib/designsettings.php:230
+#: actions/designadminpanel.php:630 lib/designsettings.php:230
#, fuzzy
msgid "Links"
msgstr "Logg inn"
-#: actions/designadminpanel.php:611 lib/designsettings.php:247
+#: actions/designadminpanel.php:658 lib/designsettings.php:247
msgid "Use defaults"
msgstr ""
-#: actions/designadminpanel.php:612 lib/designsettings.php:248
+#: actions/designadminpanel.php:659 lib/designsettings.php:248
msgid "Restore default designs"
msgstr ""
-#: actions/designadminpanel.php:618 lib/designsettings.php:254
+#: actions/designadminpanel.php:665 lib/designsettings.php:254
msgid "Reset back to default"
msgstr ""
-#: actions/designadminpanel.php:620 actions/emailsettings.php:195
+#: actions/designadminpanel.php:667 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/profilesettings.php:167 actions/siteadminpanel.php:371
+#: actions/profilesettings.php:167 actions/siteadminpanel.php:414
#: actions/smssettings.php:181 actions/subscriptions.php:203
#: actions/tagother.php:154 actions/useradminpanel.php:226
#: lib/designsettings.php:256 lib/groupeditform.php:202
msgid "Save"
msgstr "Lagra"
-#: actions/designadminpanel.php:621 lib/designsettings.php:257
+#: actions/designadminpanel.php:668 lib/designsettings.php:257
msgid "Save design"
msgstr ""
@@ -990,6 +1054,11 @@ msgstr "skildringa er for lang (maks 140 teikn)."
msgid "Could not update group."
msgstr "Kann ikkje oppdatera gruppa."
+#: actions/editgroup.php:259 classes/User_group.php:390
+#, fuzzy
+msgid "Could not create aliases."
+msgstr "Kunne ikkje lagre favoritt."
+
#: actions/editgroup.php:269
msgid "Options saved."
msgstr "Lagra innstillingar."
@@ -1108,7 +1177,7 @@ msgstr "Ingen epostadresse."
msgid "Cannot normalize that email address"
msgstr "Klarar ikkje normalisera epostadressa"
-#: actions/emailsettings.php:330 actions/siteadminpanel.php:156
+#: actions/emailsettings.php:330 actions/siteadminpanel.php:158
msgid "Not a valid email address"
msgstr "Ikkje ei gyldig epostadresse"
@@ -1832,10 +1901,10 @@ msgstr "Ugyldig notisinnhald"
msgid "Incorrect username or password."
msgstr "Feil brukarnamn eller passord"
-#: actions/login.php:149 actions/recoverpassword.php:375
-#: actions/register.php:248
-msgid "Error setting user."
-msgstr "Feil ved å setja brukar."
+#: actions/login.php:149
+#, fuzzy
+msgid "Error setting user. You are probably not authorized."
+msgstr "Ikkje autorisert."
#: actions/login.php:204 actions/login.php:257 lib/action.php:457
#: lib/logingroupnav.php:79
@@ -2265,7 +2334,7 @@ msgstr ""
"merkelappar for deg sjølv ( bokstavar, nummer, -, ., og _ ), komma eller "
"mellomroms separert."
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:275
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:309
msgid "Language"
msgstr "Språk"
@@ -2292,7 +2361,7 @@ msgstr ""
msgid "Bio is too long (max %d chars)."
msgstr "«Om meg» er for lang (maks 140 "
-#: actions/profilesettings.php:228 actions/siteadminpanel.php:163
+#: actions/profilesettings.php:228 actions/siteadminpanel.php:165
msgid "Timezone not selected."
msgstr "Tidssone er ikkje valt."
@@ -2537,6 +2606,10 @@ msgstr "Passord må vera 6 tekn eller meir."
msgid "Password and confirmation do not match."
msgstr "Passord og stadfesting stemmer ikkje."
+#: actions/recoverpassword.php:375 actions/register.php:248
+msgid "Error setting user."
+msgstr "Feil ved å setja brukar."
+
#: actions/recoverpassword.php:382
msgid "New password successfully saved. You are now logged in."
msgstr "Lagra det nye passordet. Du er logga inn."
@@ -2600,7 +2673,7 @@ msgid "Same as password above. Required."
msgstr "Samme som passord over. Påkrevd."
#: actions/register.php:437 actions/register.php:441
-#: actions/siteadminpanel.php:253 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:287 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "Epost"
@@ -3049,7 +3122,7 @@ msgstr "Du kan ikkje sende melding til denne brukaren."
msgid "User is already silenced."
msgstr "Brukar har blokkert deg."
-#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:272
+#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:299
#, fuzzy
msgid "Site"
msgstr "Invitér"
@@ -3058,122 +3131,236 @@ msgstr "Invitér"
msgid "Basic settings for this StatusNet site."
msgstr ""
-#: actions/siteadminpanel.php:145
+#: actions/siteadminpanel.php:147
msgid "Site name must have non-zero length."
msgstr ""
-#: actions/siteadminpanel.php:153
+#: actions/siteadminpanel.php:155
#, fuzzy
msgid "You must have a valid contact email address"
msgstr "Ikkje ei gyldig epostadresse"
-#: actions/siteadminpanel.php:171
+#: actions/siteadminpanel.php:173
#, php-format
msgid "Unknown language \"%s\""
msgstr ""
-#: actions/siteadminpanel.php:178
+#: actions/siteadminpanel.php:180
msgid "Invalid snapshot report URL."
msgstr ""
-#: actions/siteadminpanel.php:184
+#: actions/siteadminpanel.php:186
msgid "Invalid snapshot run value."
msgstr ""
-#: actions/siteadminpanel.php:190
+#: actions/siteadminpanel.php:192
msgid "Snapshot frequency must be a number."
msgstr ""
-#: actions/siteadminpanel.php:241
+#: actions/siteadminpanel.php:199
+msgid "You must set an SSL sever when enabling SSL."
+msgstr ""
+
+#: actions/siteadminpanel.php:204
+msgid "Invalid SSL server. Max length is 255 characters."
+msgstr ""
+
+#: actions/siteadminpanel.php:210
+msgid "Minimum text limit is 140c."
+msgstr ""
+
+#: actions/siteadminpanel.php:216
+msgid "Dupe limit must 1 or more seconds."
+msgstr ""
+
+#: actions/siteadminpanel.php:224
+#, php-format
+msgid "Locales directory not readable: %s"
+msgstr ""
+
+#: actions/siteadminpanel.php:275
#, fuzzy
msgid "Site name"
msgstr "Statusmelding"
-#: actions/siteadminpanel.php:242
+#: actions/siteadminpanel.php:276
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr ""
-#: actions/siteadminpanel.php:245
+#: actions/siteadminpanel.php:279
msgid "Brought by"
msgstr ""
-#: actions/siteadminpanel.php:246
+#: actions/siteadminpanel.php:280
msgid "Text used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:249
+#: actions/siteadminpanel.php:283
msgid "Brought by URL"
msgstr ""
-#: actions/siteadminpanel.php:250
+#: actions/siteadminpanel.php:284
msgid "URL used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:254
+#: actions/siteadminpanel.php:288
#, fuzzy
msgid "contact email address for your site"
msgstr "Ny epostadresse for å oppdatera %s"
-#: actions/siteadminpanel.php:268
+#: actions/siteadminpanel.php:302
msgid "Default timezone"
msgstr ""
-#: actions/siteadminpanel.php:269
+#: actions/siteadminpanel.php:303
msgid "Default timezone for the site; usually UTC."
msgstr ""
-#: actions/siteadminpanel.php:276
+#: actions/siteadminpanel.php:310
#, fuzzy
msgid "Default site language"
msgstr "Foretrukke språk"
-#: actions/siteadminpanel.php:282
+#: actions/siteadminpanel.php:316
+msgid "Path to locales"
+msgstr ""
+
+#: actions/siteadminpanel.php:316
+msgid "Directory path to locales"
+msgstr ""
+
+#: actions/siteadminpanel.php:320
+#, fuzzy
+msgid "Server"
+msgstr "Gjenopprett"
+
+#: actions/siteadminpanel.php:320
+msgid "Site's server hostname."
+msgstr ""
+
+#: actions/siteadminpanel.php:324
+msgid "Path"
+msgstr ""
+
+#: actions/siteadminpanel.php:324
+#, fuzzy
+msgid "Site path"
+msgstr "Statusmelding"
+
+#: actions/siteadminpanel.php:328
+msgid "Fancy URLs"
+msgstr ""
+
+#: actions/siteadminpanel.php:330
+msgid "Use fancy (more readable and memorable) URLs?"
+msgstr ""
+
+#: actions/siteadminpanel.php:334
#, fuzzy
msgid "Private"
msgstr "Personvern"
-#: actions/siteadminpanel.php:284
+#: actions/siteadminpanel.php:336
msgid "Prohibit anonymous users (not logged in) from viewing site?"
msgstr ""
-#: actions/siteadminpanel.php:290
+#: actions/siteadminpanel.php:340
+#, fuzzy
+msgid "Invite only"
+msgstr "Invitér"
+
+#: actions/siteadminpanel.php:342
+msgid "Make registration invitation only."
+msgstr ""
+
+#: actions/siteadminpanel.php:346 actions/useradminpanel.php:171
+#, fuzzy
+msgid "Closed"
+msgstr "Blokkér"
+
+#: actions/siteadminpanel.php:348
+msgid "Disable new registrations."
+msgstr ""
+
+#: actions/siteadminpanel.php:353
msgid "Randomly during Web hit"
msgstr ""
-#: actions/siteadminpanel.php:291
+#: actions/siteadminpanel.php:354
msgid "In a scheduled job"
msgstr ""
-#: actions/siteadminpanel.php:292
+#: actions/siteadminpanel.php:355 actions/siteadminpanel.php:380
#, fuzzy
msgid "Never"
msgstr "Gjenopprett"
-#: actions/siteadminpanel.php:294
+#: actions/siteadminpanel.php:357
msgid "Data snapshots"
msgstr ""
-#: actions/siteadminpanel.php:295
+#: actions/siteadminpanel.php:358
msgid "When to send statistical data to status.net servers"
msgstr ""
-#: actions/siteadminpanel.php:301
+#: actions/siteadminpanel.php:364
msgid "Frequency"
msgstr ""
-#: actions/siteadminpanel.php:302
+#: actions/siteadminpanel.php:365
msgid "Snapshots will be sent once every N Web hits"
msgstr ""
-#: actions/siteadminpanel.php:309
+#: actions/siteadminpanel.php:372
msgid "Report URL"
msgstr ""
-#: actions/siteadminpanel.php:310
+#: actions/siteadminpanel.php:373
msgid "Snapshots will be sent to this URL"
msgstr ""
-#: actions/siteadminpanel.php:371 actions/useradminpanel.php:226
+#: actions/siteadminpanel.php:381
+#, fuzzy
+msgid "Sometimes"
+msgstr "Notisar"
+
+#: actions/siteadminpanel.php:382
+msgid "Always"
+msgstr ""
+
+#: actions/siteadminpanel.php:384
+msgid "Use SSL"
+msgstr ""
+
+#: actions/siteadminpanel.php:385
+msgid "When to use SSL"
+msgstr ""
+
+#: actions/siteadminpanel.php:391
+msgid "SSL Server"
+msgstr ""
+
+#: actions/siteadminpanel.php:392
+msgid "Server to direct SSL requests to"
+msgstr ""
+
+#: actions/siteadminpanel.php:396
+msgid "Text limit"
+msgstr ""
+
+#: actions/siteadminpanel.php:396
+msgid "Maximum number of characters for notices."
+msgstr ""
+
+#: actions/siteadminpanel.php:400
+msgid "Dupe limit"
+msgstr ""
+
+#: actions/siteadminpanel.php:400
+msgid "How long users must wait (in seconds) to post the same thing again."
+msgstr ""
+
+#: actions/siteadminpanel.php:414 actions/useradminpanel.php:226
#, fuzzy
msgid "Save site settings"
msgstr "Avatar-innstillingar"
@@ -3491,11 +3678,6 @@ msgstr "Brukar"
msgid "User settings for this StatusNet site."
msgstr ""
-#: actions/useradminpanel.php:171
-#, fuzzy
-msgid "Closed"
-msgstr "Blokkér"
-
#: actions/useradminpanel.php:173
msgid "Is registration on this site prohibited?"
msgstr ""
@@ -3724,6 +3906,14 @@ msgstr "Eit problem oppstod ved lagring av notis."
msgid "DB error inserting reply: %s"
msgstr "Databasefeil, kan ikkje lagra svar: %s"
+#: classes/User_group.php:380
+msgid "Could not create group."
+msgstr "Kunne ikkje laga gruppa."
+
+#: classes/User_group.php:409
+msgid "Could not set group membership."
+msgstr "Kunne ikkje bli med i gruppa."
+
#: classes/User.php:347
#, fuzzy, php-format
msgid "Welcome to %1$s, @%2$s!"
@@ -3964,12 +4154,17 @@ msgstr "Kommando ikkje implementert."
msgid "saveSettings() not implemented."
msgstr "Kommando ikkje implementert."
-#: lib/adminpanelaction.php:273
+#: lib/adminpanelaction.php:247
+#, fuzzy
+msgid "Unable to delete design setting."
+msgstr "Klarte ikkje å lagra Twitter-innstillingane dine!"
+
+#: lib/adminpanelaction.php:300
#, fuzzy
msgid "Basic site configuration"
msgstr "Stadfesting av epostadresse"
-#: lib/adminpanelaction.php:276
+#: lib/adminpanelaction.php:303
#, fuzzy
msgid "Design configuration"
msgstr "SMS bekreftelse"
@@ -4217,20 +4412,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:203
+#: lib/common.php:199
#, fuzzy
msgid "No configuration file found. "
msgstr "Ingen stadfestingskode."
-#: lib/common.php:204
+#: lib/common.php:200
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:205
+#: lib/common.php:201
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:206
+#: lib/common.php:202
#, fuzzy
msgid "Go to the installer."
msgstr "Logg inn or sida"
@@ -5003,11 +5198,6 @@ msgstr "Ingen"
msgid "Top posters"
msgstr "Med flest meldingar"
-#: lib/unblockform.php:80
-#, fuzzy
-msgid "Unlock this user"
-msgstr "Lås opp brukaren"
-
#: lib/unsandboxform.php:69
msgid "Unsandbox"
msgstr ""
@@ -5060,47 +5250,47 @@ msgstr "Send ei direktemelding til denne brukaren"
msgid "Message"
msgstr "Melding"
-#: lib/util.php:821
+#: lib/util.php:826
msgid "a few seconds ago"
msgstr "eit par sekund sidan"
-#: lib/util.php:823
+#: lib/util.php:828
msgid "about a minute ago"
msgstr "omtrent eitt minutt sidan"
-#: lib/util.php:825
+#: lib/util.php:830
#, php-format
msgid "about %d minutes ago"
msgstr "~%d minutt sidan"
-#: lib/util.php:827
+#: lib/util.php:832
msgid "about an hour ago"
msgstr "omtrent ein time sidan"
-#: lib/util.php:829
+#: lib/util.php:834
#, php-format
msgid "about %d hours ago"
msgstr "~%d timar sidan"
-#: lib/util.php:831
+#: lib/util.php:836
msgid "about a day ago"
msgstr "omtrent ein dag sidan"
-#: lib/util.php:833
+#: lib/util.php:838
#, php-format
msgid "about %d days ago"
msgstr "~%d dagar sidan"
-#: lib/util.php:835
+#: lib/util.php:840
msgid "about a month ago"
msgstr "omtrent ein månad sidan"
-#: lib/util.php:837
+#: lib/util.php:842
#, php-format
msgid "about %d months ago"
msgstr "~%d månadar sidan"
-#: lib/util.php:839
+#: lib/util.php:844
msgid "about a year ago"
msgstr "omtrent eitt år sidan"
@@ -5131,5 +5321,9 @@ msgid "Sorry, no incoming email allowed."
msgstr "Beklager, inngåande epost er ikkje tillatt."
#, fuzzy
+#~ msgid "Unlock this user"
+#~ msgstr "Lås opp brukaren"
+
+#, fuzzy
#~ msgid "These people are subscribed to you: "
#~ msgstr "Mennesker som tingar %s"
diff --git a/locale/pl/LC_MESSAGES/statusnet.po b/locale/pl/LC_MESSAGES/statusnet.po
index e9bb0fd74..c7b3d860f 100644
--- a/locale/pl/LC_MESSAGES/statusnet.po
+++ b/locale/pl/LC_MESSAGES/statusnet.po
@@ -1,15 +1,18 @@
# Translation of StatusNet to Polish
#
# --
+# 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-18 19:31+0000\n"
+"POT-Creation-Date: 2009-11-19 10:43+0000\n"
"PO-Revision-Date: 2009-11-18 19:32:25+0000\n"
"Language-Team: Polish\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10< =4 && (n%100<10 or n%100>=20) ? 1 : 2);\n"
"X-Generator: MediaWiki 1.16alpha(r59207); Translate extension (2009-11-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: pl\n"
@@ -153,7 +156,7 @@ msgstr "Nie można zaktualizować użytkownika."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
-#: actions/designadminpanel.php:125 actions/newnotice.php:94
+#: actions/designadminpanel.php:122 actions/newnotice.php:94
#: lib/designsettings.php:283
#, php-format
msgid ""
@@ -241,7 +244,7 @@ msgstr "Wszystkie bezpośrednie wiadomości wysłane do użytkownika %s"
#: 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:184 actions/apigroupismember.php:114
+#: 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
@@ -306,79 +309,66 @@ msgstr "Nie można określić użytkownika źródłowego."
msgid "Could not find target user."
msgstr "Nie można znaleźć użytkownika docelowego."
-#: actions/apigroupcreate.php:136 actions/newgroup.php:204
-msgid "Could not create group."
-msgstr "Nie można utworzyć grupy."
-
-#: actions/apigroupcreate.php:147 actions/editgroup.php:259
-#: actions/newgroup.php:210
-msgid "Could not create aliases."
-msgstr "Nie można utworzyć aliasów."
-
-#: actions/apigroupcreate.php:166 actions/newgroup.php:224
-msgid "Could not set group membership."
-msgstr "Nie można ustawić członkostwa w grupie."
-
-#: actions/apigroupcreate.php:212 actions/editgroup.php:182
+#: actions/apigroupcreate.php:164 actions/editgroup.php:182
#: actions/newgroup.php:126 actions/profilesettings.php:208
#: actions/register.php:205
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr "Pseudonim może zawierać tylko małe litery i cyfry, bez spacji."
-#: actions/apigroupcreate.php:221 actions/editgroup.php:186
+#: 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 "Pseudonim jest już używany. Spróbuj innego."
-#: actions/apigroupcreate.php:228 actions/editgroup.php:189
+#: 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 "To nie jest prawidłowy pseudonim."
-#: actions/apigroupcreate.php:244 actions/editgroup.php:195
+#: 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 "Strona domowa nie jest prawidłowym adresem URL."
-#: actions/apigroupcreate.php:253 actions/editgroup.php:198
+#: 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 "Imię i nazwisko jest za długie (maksymalnie 255 znaków)."
-#: actions/apigroupcreate.php:261
+#: actions/apigroupcreate.php:213
#, fuzzy, php-format
msgid "Description is too long (max %d chars)."
msgstr "opis jest za długi (maksymalnie 140 znaków)."
-#: actions/apigroupcreate.php:272 actions/editgroup.php:204
+#: 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 "Położenie jest za długie (maksymalnie 255 znaków)."
-#: actions/apigroupcreate.php:291 actions/editgroup.php:215
+#: actions/apigroupcreate.php:243 actions/editgroup.php:215
#: actions/newgroup.php:159
#, php-format
msgid "Too many aliases! Maximum %d."
msgstr "Za dużo aliasów! Maksymalnie %d."
-#: actions/apigroupcreate.php:312 actions/editgroup.php:224
+#: actions/apigroupcreate.php:264 actions/editgroup.php:224
#: actions/newgroup.php:168
#, php-format
msgid "Invalid alias: \"%s\""
msgstr "Nieprawidłowy alias: \"%s\""
-#: actions/apigroupcreate.php:321 actions/editgroup.php:228
+#: 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\" jest już używany. Spróbuj innego."
-#: actions/apigroupcreate.php:334 actions/editgroup.php:234
+#: actions/apigroupcreate.php:286 actions/editgroup.php:234
#: actions/newgroup.php:178
msgid "Alias can't be the same as nickname."
msgstr "Alias nie może być taki sam jak pseudonim."
@@ -602,10 +592,10 @@ msgstr "Przytnij"
msgid "There was a problem with your session token. Try again, please."
msgstr "Wystąpił problem z tokenem sesji. Spróbuj ponownie."
-#: actions/avatarsettings.php:277 actions/emailsettings.php:255
-#: actions/grouplogo.php:319 actions/imsettings.php:220
-#: actions/recoverpassword.php:44 actions/smssettings.php:248
-#: lib/designsettings.php:304
+#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
+#: actions/emailsettings.php:255 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/recoverpassword.php:44
+#: actions/smssettings.php:248 lib/designsettings.php:304
msgid "Unexpected form submission."
msgstr "Nieoczekiwane wysłanie formularza."
@@ -665,7 +655,7 @@ msgstr "Odblokuj użytkownika w tej grupie"
msgid "Unblock"
msgstr "Odblokuj"
-#: actions/blockedfromgroup.php:313
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:80
msgid "Unblock this user"
msgstr "Odblokuj tego użytkownika"
@@ -840,7 +830,7 @@ msgid "Delete this user"
msgstr "Usuń ten wpis"
#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124
-#: lib/adminpanelaction.php:275 lib/groupnav.php:119
+#: lib/adminpanelaction.php:302 lib/groupnav.php:119
msgid "Design"
msgstr "Wygląd"
@@ -848,104 +838,182 @@ msgstr "Wygląd"
msgid "Design settings for this StatusNet site."
msgstr ""
-#: actions/designadminpanel.php:220
+#: actions/designadminpanel.php:278
#, fuzzy
-msgid "Unable to delete design setting."
-msgstr "Nie można zapisać ustawień wyglądu!"
+msgid "Invalid logo URL."
+msgstr "Nieprawidłowy rozmiar."
-#: actions/designadminpanel.php:301
+#: actions/designadminpanel.php:282
#, fuzzy, php-format
msgid "Theme not available: %s"
msgstr "Ta strona nie jest dostępna w "
-#: actions/designadminpanel.php:406
+#: actions/designadminpanel.php:288
+#, fuzzy, php-format
+msgid "Theme directory not readable: %s"
+msgstr "Ta strona nie jest dostępna w "
+
+#: actions/designadminpanel.php:292
+#, php-format
+msgid "Avatar directory not writable: %s"
+msgstr ""
+
+#: actions/designadminpanel.php:296
+#, php-format
+msgid "Background directory not writable: %s"
+msgstr ""
+
+#: actions/designadminpanel.php:312
+#, php-format
+msgid "Max length for %s %s is 255 characters."
+msgstr ""
+
+#: actions/designadminpanel.php:412
+#, fuzzy
+msgid "Change logo"
+msgstr "Zmień kolory"
+
+#: actions/designadminpanel.php:417
+#, fuzzy
+msgid "Site logo"
+msgstr "Zaproś"
+
+#: actions/designadminpanel.php:424
#, fuzzy
msgid "Change theme"
msgstr "Zmień"
-#: actions/designadminpanel.php:410
-msgid "Theme"
-msgstr ""
+#: actions/designadminpanel.php:441
+#, fuzzy
+msgid "Site theme"
+msgstr "Wpis strony"
-#: actions/designadminpanel.php:411
+#: actions/designadminpanel.php:442
#, fuzzy
msgid "Theme for the site."
msgstr "Wyloguj się ze strony"
-#: actions/designadminpanel.php:420 lib/designsettings.php:101
+#: actions/designadminpanel.php:447
+msgid "Theme server"
+msgstr ""
+
+#: actions/designadminpanel.php:451
+msgid "Theme path"
+msgstr ""
+
+#: actions/designadminpanel.php:455
+msgid "Theme directory"
+msgstr ""
+
+#: actions/designadminpanel.php:462
+#, fuzzy
+msgid "Avatar Settings"
+msgstr "Ustawienia awatara"
+
+#: actions/designadminpanel.php:467
+#, fuzzy
+msgid "Avatar server"
+msgstr "Ustawienia awatara"
+
+#: actions/designadminpanel.php:471
+#, fuzzy
+msgid "Avatar path"
+msgstr "Zaktualizowano awatar."
+
+#: actions/designadminpanel.php:475
+#, fuzzy
+msgid "Avatar directory"
+msgstr "Usunięto awatar."
+
+#: actions/designadminpanel.php:486 lib/designsettings.php:101
msgid "Change background image"
msgstr "Zmień obraz tłas"
-#: actions/designadminpanel.php:424 actions/designadminpanel.php:498
+#: actions/designadminpanel.php:491 actions/designadminpanel.php:578
#: lib/designsettings.php:178
msgid "Background"
msgstr "Tło"
-#: actions/designadminpanel.php:429
+#: actions/designadminpanel.php:496
#, fuzzy, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
"$s."
msgstr "Można wysłać obraz logo grupy. Maksymalny rozmiar pliku to %s."
-#: actions/designadminpanel.php:459 lib/designsettings.php:139
+#: actions/designadminpanel.php:526 lib/designsettings.php:139
msgid "On"
msgstr "Włączone"
-#: actions/designadminpanel.php:475 lib/designsettings.php:155
+#: actions/designadminpanel.php:542 lib/designsettings.php:155
msgid "Off"
msgstr "Wyłączone"
-#: actions/designadminpanel.php:476 lib/designsettings.php:156
+#: actions/designadminpanel.php:543 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr "Włącz lub wyłącz obraz tła."
-#: actions/designadminpanel.php:481 lib/designsettings.php:161
+#: actions/designadminpanel.php:548 lib/designsettings.php:161
msgid "Tile background image"
msgstr "Kafelkowy obraz tła"
-#: actions/designadminpanel.php:490 lib/designsettings.php:170
+#: actions/designadminpanel.php:554
+#, fuzzy
+msgid "Background server"
+msgstr "Tło"
+
+#: actions/designadminpanel.php:558
+#, fuzzy
+msgid "Background path"
+msgstr "Tło"
+
+#: actions/designadminpanel.php:562
+#, fuzzy
+msgid "Background directory"
+msgstr "Tło"
+
+#: actions/designadminpanel.php:569 lib/designsettings.php:170
msgid "Change colours"
msgstr "Zmień kolory"
-#: actions/designadminpanel.php:511 lib/designsettings.php:191
+#: actions/designadminpanel.php:591 lib/designsettings.php:191
msgid "Content"
msgstr "Zawartość"
-#: actions/designadminpanel.php:524 lib/designsettings.php:204
+#: actions/designadminpanel.php:604 lib/designsettings.php:204
msgid "Sidebar"
msgstr "Panel boczny"
-#: actions/designadminpanel.php:537 lib/designsettings.php:217
+#: actions/designadminpanel.php:617 lib/designsettings.php:217
msgid "Text"
msgstr "Tekst"
-#: actions/designadminpanel.php:550 lib/designsettings.php:230
+#: actions/designadminpanel.php:630 lib/designsettings.php:230
msgid "Links"
msgstr "Odnośniki"
-#: actions/designadminpanel.php:611 lib/designsettings.php:247
+#: actions/designadminpanel.php:658 lib/designsettings.php:247
msgid "Use defaults"
msgstr "Użyj domyślnych"
-#: actions/designadminpanel.php:612 lib/designsettings.php:248
+#: actions/designadminpanel.php:659 lib/designsettings.php:248
msgid "Restore default designs"
msgstr "Przywróć domyślny wygląd"
-#: actions/designadminpanel.php:618 lib/designsettings.php:254
+#: actions/designadminpanel.php:665 lib/designsettings.php:254
msgid "Reset back to default"
msgstr "Przywróć domyślne ustawienia"
-#: actions/designadminpanel.php:620 actions/emailsettings.php:195
+#: actions/designadminpanel.php:667 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/profilesettings.php:167 actions/siteadminpanel.php:371
+#: actions/profilesettings.php:167 actions/siteadminpanel.php:414
#: actions/smssettings.php:181 actions/subscriptions.php:203
#: actions/tagother.php:154 actions/useradminpanel.php:226
#: lib/designsettings.php:256 lib/groupeditform.php:202
msgid "Save"
msgstr "Zapisz"
-#: actions/designadminpanel.php:621 lib/designsettings.php:257
+#: actions/designadminpanel.php:668 lib/designsettings.php:257
msgid "Save design"
msgstr "Zapisz wygląd"
@@ -988,6 +1056,10 @@ msgstr "opis jest za długi (maksymalnie 140 znaków)."
msgid "Could not update group."
msgstr "Nie można zaktualizować grupy."
+#: actions/editgroup.php:259 classes/User_group.php:390
+msgid "Could not create aliases."
+msgstr "Nie można utworzyć aliasów."
+
#: actions/editgroup.php:269
msgid "Options saved."
msgstr "Zapisano opcje."
@@ -1105,7 +1177,7 @@ msgstr "Brak adresu e-mail."
msgid "Cannot normalize that email address"
msgstr "Nie można znormalizować tego adresu e-mail"
-#: actions/emailsettings.php:330 actions/siteadminpanel.php:156
+#: actions/emailsettings.php:330 actions/siteadminpanel.php:158
msgid "Not a valid email address"
msgstr "To nie jest prawidłowy adres e-mail"
@@ -1841,10 +1913,10 @@ msgstr "Nieprawidłowa zawartość wpisu"
msgid "Incorrect username or password."
msgstr "Niepoprawna nazwa użytkownika lub hasło."
-#: actions/login.php:149 actions/recoverpassword.php:375
-#: actions/register.php:248
-msgid "Error setting user."
-msgstr "Błąd podczas ustawiania użytkownika."
+#: actions/login.php:149
+#, fuzzy
+msgid "Error setting user. You are probably not authorized."
+msgstr "Brak upoważnienia."
#: actions/login.php:204 actions/login.php:257 lib/action.php:457
#: lib/logingroupnav.php:79
@@ -2276,7 +2348,7 @@ msgstr ""
"Znaczniki dla siebie (litery, liczby, -, . i _), oddzielone przecinkami lub "
"spacjami"
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:275
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:309
msgid "Language"
msgstr "Język"
@@ -2304,7 +2376,7 @@ msgstr ""
msgid "Bio is too long (max %d chars)."
msgstr "Wpis \"O mnie\" jest za długi (maksymalnie 140 znaków)."
-#: actions/profilesettings.php:228 actions/siteadminpanel.php:163
+#: actions/profilesettings.php:228 actions/siteadminpanel.php:165
msgid "Timezone not selected."
msgstr "Nie wybrano strefy czasowej."
@@ -2557,6 +2629,10 @@ msgstr "Hasło musi mieć sześć lub więcej znaków."
msgid "Password and confirmation do not match."
msgstr "Hasło i potwierdzenie nie pasują do siebie."
+#: actions/recoverpassword.php:375 actions/register.php:248
+msgid "Error setting user."
+msgstr "Błąd podczas ustawiania użytkownika."
+
#: actions/recoverpassword.php:382
msgid "New password successfully saved. You are now logged in."
msgstr "Pomyślnie zapisano nowe hasło. Jesteś teraz zalogowany."
@@ -2624,7 +2700,7 @@ msgid "Same as password above. Required."
msgstr "Takie samo jak powyższe hasło. Wymagane."
#: actions/register.php:437 actions/register.php:441
-#: actions/siteadminpanel.php:253 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:287 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "E-mail"
@@ -3102,7 +3178,7 @@ msgstr "Nie można wysłać wiadomości do tego użytkownika."
msgid "User is already silenced."
msgstr "Użytkownik został już zablokował w grupie."
-#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:272
+#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:299
#, fuzzy
msgid "Site"
msgstr "Zaproś"
@@ -3111,122 +3187,237 @@ msgstr "Zaproś"
msgid "Basic settings for this StatusNet site."
msgstr ""
-#: actions/siteadminpanel.php:145
+#: actions/siteadminpanel.php:147
msgid "Site name must have non-zero length."
msgstr ""
-#: actions/siteadminpanel.php:153
+#: actions/siteadminpanel.php:155
#, fuzzy
msgid "You must have a valid contact email address"
msgstr "To nie jest prawidłowy adres e-mail"
-#: actions/siteadminpanel.php:171
+#: actions/siteadminpanel.php:173
#, php-format
msgid "Unknown language \"%s\""
msgstr ""
-#: actions/siteadminpanel.php:178
+#: actions/siteadminpanel.php:180
msgid "Invalid snapshot report URL."
msgstr ""
-#: actions/siteadminpanel.php:184
+#: actions/siteadminpanel.php:186
msgid "Invalid snapshot run value."
msgstr ""
-#: actions/siteadminpanel.php:190
+#: actions/siteadminpanel.php:192
msgid "Snapshot frequency must be a number."
msgstr ""
-#: actions/siteadminpanel.php:241
+#: actions/siteadminpanel.php:199
+msgid "You must set an SSL sever when enabling SSL."
+msgstr ""
+
+#: actions/siteadminpanel.php:204
+msgid "Invalid SSL server. Max length is 255 characters."
+msgstr ""
+
+#: actions/siteadminpanel.php:210
+msgid "Minimum text limit is 140c."
+msgstr ""
+
+#: actions/siteadminpanel.php:216
+msgid "Dupe limit must 1 or more seconds."
+msgstr ""
+
+#: actions/siteadminpanel.php:224
+#, php-format
+msgid "Locales directory not readable: %s"
+msgstr ""
+
+#: actions/siteadminpanel.php:275
#, fuzzy
msgid "Site name"
msgstr "Wpis strony"
-#: actions/siteadminpanel.php:242
+#: actions/siteadminpanel.php:276
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr ""
-#: actions/siteadminpanel.php:245
+#: actions/siteadminpanel.php:279
msgid "Brought by"
msgstr ""
-#: actions/siteadminpanel.php:246
+#: actions/siteadminpanel.php:280
msgid "Text used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:249
+#: actions/siteadminpanel.php:283
msgid "Brought by URL"
msgstr ""
-#: actions/siteadminpanel.php:250
+#: actions/siteadminpanel.php:284
msgid "URL used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:254
+#: actions/siteadminpanel.php:288
#, fuzzy
msgid "contact email address for your site"
msgstr "Nowy adres e-mail do wysyłania do %s"
-#: actions/siteadminpanel.php:268
+#: actions/siteadminpanel.php:302
msgid "Default timezone"
msgstr ""
-#: actions/siteadminpanel.php:269
+#: actions/siteadminpanel.php:303
msgid "Default timezone for the site; usually UTC."
msgstr ""
-#: actions/siteadminpanel.php:276
+#: actions/siteadminpanel.php:310
#, fuzzy
msgid "Default site language"
msgstr "Preferowany język"
-#: actions/siteadminpanel.php:282
+#: actions/siteadminpanel.php:316
+msgid "Path to locales"
+msgstr ""
+
+#: actions/siteadminpanel.php:316
+msgid "Directory path to locales"
+msgstr ""
+
+#: actions/siteadminpanel.php:320
+#, fuzzy
+msgid "Server"
+msgstr "Przywróć"
+
+#: actions/siteadminpanel.php:320
+msgid "Site's server hostname."
+msgstr ""
+
+#: actions/siteadminpanel.php:324
+msgid "Path"
+msgstr ""
+
+#: actions/siteadminpanel.php:324
+#, fuzzy
+msgid "Site path"
+msgstr "Wpis strony"
+
+#: actions/siteadminpanel.php:328
+msgid "Fancy URLs"
+msgstr ""
+
+#: actions/siteadminpanel.php:330
+msgid "Use fancy (more readable and memorable) URLs?"
+msgstr ""
+
+#: actions/siteadminpanel.php:334
#, fuzzy
msgid "Private"
msgstr "Prywatność"
-#: actions/siteadminpanel.php:284
+#: actions/siteadminpanel.php:336
msgid "Prohibit anonymous users (not logged in) from viewing site?"
msgstr ""
-#: actions/siteadminpanel.php:290
+#: actions/siteadminpanel.php:340
+#, fuzzy
+msgid "Invite only"
+msgstr "Zaproś"
+
+#: actions/siteadminpanel.php:342
+msgid "Make registration invitation only."
+msgstr ""
+
+#: actions/siteadminpanel.php:346 actions/useradminpanel.php:171
+#, fuzzy
+msgid "Closed"
+msgstr "Zablokowano"
+
+#: actions/siteadminpanel.php:348
+msgid "Disable new registrations."
+msgstr ""
+
+#: actions/siteadminpanel.php:353
msgid "Randomly during Web hit"
msgstr ""
-#: actions/siteadminpanel.php:291
+#: actions/siteadminpanel.php:354
msgid "In a scheduled job"
msgstr ""
-#: actions/siteadminpanel.php:292
+#: actions/siteadminpanel.php:355 actions/siteadminpanel.php:380
#, fuzzy
msgid "Never"
msgstr "Przywróć"
-#: actions/siteadminpanel.php:294
+#: actions/siteadminpanel.php:357
msgid "Data snapshots"
msgstr ""
-#: actions/siteadminpanel.php:295
+#: actions/siteadminpanel.php:358
msgid "When to send statistical data to status.net servers"
msgstr ""
-#: actions/siteadminpanel.php:301
+#: actions/siteadminpanel.php:364
msgid "Frequency"
msgstr ""
-#: actions/siteadminpanel.php:302
+#: actions/siteadminpanel.php:365
msgid "Snapshots will be sent once every N Web hits"
msgstr ""
-#: actions/siteadminpanel.php:309
+#: actions/siteadminpanel.php:372
msgid "Report URL"
msgstr ""
-#: actions/siteadminpanel.php:310
+#: actions/siteadminpanel.php:373
msgid "Snapshots will be sent to this URL"
msgstr ""
-#: actions/siteadminpanel.php:371 actions/useradminpanel.php:226
+#: actions/siteadminpanel.php:381
+#, fuzzy
+msgid "Sometimes"
+msgstr "Wpisy"
+
+#: actions/siteadminpanel.php:382
+#, fuzzy
+msgid "Always"
+msgstr "Aliasy"
+
+#: actions/siteadminpanel.php:384
+msgid "Use SSL"
+msgstr ""
+
+#: actions/siteadminpanel.php:385
+msgid "When to use SSL"
+msgstr ""
+
+#: actions/siteadminpanel.php:391
+msgid "SSL Server"
+msgstr ""
+
+#: actions/siteadminpanel.php:392
+msgid "Server to direct SSL requests to"
+msgstr ""
+
+#: actions/siteadminpanel.php:396
+msgid "Text limit"
+msgstr ""
+
+#: actions/siteadminpanel.php:396
+msgid "Maximum number of characters for notices."
+msgstr ""
+
+#: actions/siteadminpanel.php:400
+msgid "Dupe limit"
+msgstr ""
+
+#: actions/siteadminpanel.php:400
+msgid "How long users must wait (in seconds) to post the same thing again."
+msgstr ""
+
+#: actions/siteadminpanel.php:414 actions/useradminpanel.php:226
#, fuzzy
msgid "Save site settings"
msgstr "Ustawienia awatara"
@@ -3553,11 +3744,6 @@ msgstr "Użytkownik"
msgid "User settings for this StatusNet site."
msgstr ""
-#: actions/useradminpanel.php:171
-#, fuzzy
-msgid "Closed"
-msgstr "Zablokowano"
-
#: actions/useradminpanel.php:173
msgid "Is registration on this site prohibited?"
msgstr ""
@@ -3788,6 +3974,14 @@ msgstr "Problem podczas zapisywania wpisu."
msgid "DB error inserting reply: %s"
msgstr "Błąd bazy danych podczas wprowadzania odpowiedzi: %s"
+#: classes/User_group.php:380
+msgid "Could not create group."
+msgstr "Nie można utworzyć grupy."
+
+#: classes/User_group.php:409
+msgid "Could not set group membership."
+msgstr "Nie można ustawić członkostwa w grupie."
+
#: classes/User.php:347
#, php-format
msgid "Welcome to %1$s, @%2$s!"
@@ -4026,12 +4220,17 @@ msgstr "Nie zaimplementowano polecenia."
msgid "saveSettings() not implemented."
msgstr "Nie zaimplementowano polecenia."
-#: lib/adminpanelaction.php:273
+#: lib/adminpanelaction.php:247
+#, fuzzy
+msgid "Unable to delete design setting."
+msgstr "Nie można zapisać ustawień wyglądu!"
+
+#: lib/adminpanelaction.php:300
#, fuzzy
msgid "Basic site configuration"
msgstr "Potwierdzenie adresu e-mail"
-#: lib/adminpanelaction.php:276
+#: lib/adminpanelaction.php:303
#, fuzzy
msgid "Design configuration"
msgstr "Potwierdzenie SMS"
@@ -4308,20 +4507,20 @@ msgstr ""
"tracks - jeszcze nie zaimplementowano.\n"
"tracking - jeszcze nie zaimplementowano.\n"
-#: lib/common.php:203
+#: lib/common.php:199
#, fuzzy
msgid "No configuration file found. "
msgstr "Brak kodu potwierdzającego."
-#: lib/common.php:204
+#: lib/common.php:200
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:205
+#: lib/common.php:201
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:206
+#: lib/common.php:202
#, fuzzy
msgid "Go to the installer."
msgstr "Zaloguj się na stronę"
@@ -5156,11 +5355,6 @@ msgstr "Brak"
msgid "Top posters"
msgstr "Najczęściej wysyłający wpisy"
-#: lib/unblockform.php:80
-#, fuzzy
-msgid "Unlock this user"
-msgstr "Odblokuj tego użytkownika"
-
#: lib/unsandboxform.php:69
msgid "Unsandbox"
msgstr ""
@@ -5211,47 +5405,47 @@ msgstr "Wyślij bezpośrednią wiadomość do tego użytkownika"
msgid "Message"
msgstr "Wiadomość"
-#: lib/util.php:821
+#: lib/util.php:826
msgid "a few seconds ago"
msgstr "kilka sekund temu"
-#: lib/util.php:823
+#: lib/util.php:828
msgid "about a minute ago"
msgstr "około minutę temu"
-#: lib/util.php:825
+#: lib/util.php:830
#, php-format
msgid "about %d minutes ago"
msgstr "około %d minut temu"
-#: lib/util.php:827
+#: lib/util.php:832
msgid "about an hour ago"
msgstr "około godzinę temu"
-#: lib/util.php:829
+#: lib/util.php:834
#, php-format
msgid "about %d hours ago"
msgstr "około %d godzin temu"
-#: lib/util.php:831
+#: lib/util.php:836
msgid "about a day ago"
msgstr "blisko dzień temu"
-#: lib/util.php:833
+#: lib/util.php:838
#, php-format
msgid "about %d days ago"
msgstr "około %d dni temu"
-#: lib/util.php:835
+#: lib/util.php:840
msgid "about a month ago"
msgstr "około miesiąc temu"
-#: lib/util.php:837
+#: lib/util.php:842
#, php-format
msgid "about %d months ago"
msgstr "około %d miesięcy temu"
-#: lib/util.php:839
+#: lib/util.php:844
msgid "about a year ago"
msgstr "około rok temu"
@@ -5284,5 +5478,9 @@ msgid "Sorry, no incoming email allowed."
msgstr "Przepraszamy, przychodzący e-mail nie jest dozwolony."
#, fuzzy
+#~ msgid "Unlock this user"
+#~ msgstr "Odblokuj tego użytkownika"
+
+#, fuzzy
#~ msgid "These people are subscribed to you: "
#~ msgstr "Osoby zasubskrybowane do %s"
diff --git a/locale/pt/LC_MESSAGES/statusnet.po b/locale/pt/LC_MESSAGES/statusnet.po
index d15d53cd8..f2ef56285 100644
--- a/locale/pt/LC_MESSAGES/statusnet.po
+++ b/locale/pt/LC_MESSAGES/statusnet.po
@@ -1,20 +1,18 @@
# Translation of StatusNet to Portuguese
#
# --
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 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-18 19:31+0000\n"
+"POT-Creation-Date: 2009-11-19 10:43+0000\n"
"PO-Revision-Date: 2009-11-18 19:32:28+0000\n"
"Language-Team: Portuguese\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: MediaWiki 1.16alpha(r59207); Translate extension (2009-11-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: pt\n"
@@ -149,7 +147,7 @@ msgstr "Não foi possível actualizar o utilizador."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
-#: actions/designadminpanel.php:125 actions/newnotice.php:94
+#: actions/designadminpanel.php:122 actions/newnotice.php:94
#: lib/designsettings.php:283
#, php-format
msgid ""
@@ -232,7 +230,7 @@ msgstr ""
#: 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:184 actions/apigroupismember.php:114
+#: 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
@@ -299,80 +297,66 @@ msgstr "Não foi possível actualizar o utilizador."
msgid "Could not find target user."
msgstr "Não foi possivel encontrar algum estado."
-#: actions/apigroupcreate.php:136 actions/newgroup.php:204
-msgid "Could not create group."
-msgstr ""
-
-#: actions/apigroupcreate.php:147 actions/editgroup.php:259
-#: actions/newgroup.php:210
-#, fuzzy
-msgid "Could not create aliases."
-msgstr "Não foi possível criar o formulário de OpenID: %s"
-
-#: actions/apigroupcreate.php:166 actions/newgroup.php:224
-msgid "Could not set group membership."
-msgstr ""
-
-#: actions/apigroupcreate.php:212 actions/editgroup.php:182
+#: actions/apigroupcreate.php:164 actions/editgroup.php:182
#: actions/newgroup.php:126 actions/profilesettings.php:208
#: actions/register.php:205
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr "Alcunha só deve conter letras minúsculas e números. Sem espaços."
-#: actions/apigroupcreate.php:221 actions/editgroup.php:186
+#: 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 "Alcunha já em uso. Tente outra diferente."
-#: actions/apigroupcreate.php:228 actions/editgroup.php:189
+#: 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 ""
-#: actions/apigroupcreate.php:244 actions/editgroup.php:195
+#: 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 "A Homepage inserida não é um URL válido."
-#: actions/apigroupcreate.php:253 actions/editgroup.php:198
+#: 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 "Nome completo é demasiado longo (máx. 255 caracteres)."
-#: actions/apigroupcreate.php:261
+#: actions/apigroupcreate.php:213
#, fuzzy, php-format
msgid "Description is too long (max %d chars)."
msgstr "Bio é demasiada extensa (máx 140 car)."
-#: actions/apigroupcreate.php:272 actions/editgroup.php:204
+#: 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 "Localidade é muito longa (máx. 255 caracteres)."
-#: actions/apigroupcreate.php:291 actions/editgroup.php:215
+#: actions/apigroupcreate.php:243 actions/editgroup.php:215
#: actions/newgroup.php:159
#, php-format
msgid "Too many aliases! Maximum %d."
msgstr ""
-#: actions/apigroupcreate.php:312 actions/editgroup.php:224
+#: actions/apigroupcreate.php:264 actions/editgroup.php:224
#: actions/newgroup.php:168
#, fuzzy, php-format
msgid "Invalid alias: \"%s\""
msgstr "Endereço de email inválido: %s"
-#: actions/apigroupcreate.php:321 actions/editgroup.php:228
+#: actions/apigroupcreate.php:273 actions/editgroup.php:228
#: actions/newgroup.php:172
#, fuzzy, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr "Alcunha já em uso. Tente outra diferente."
-#: actions/apigroupcreate.php:334 actions/editgroup.php:234
+#: actions/apigroupcreate.php:286 actions/editgroup.php:234
#: actions/newgroup.php:178
msgid "Alias can't be the same as nickname."
msgstr ""
@@ -593,10 +577,10 @@ msgstr ""
msgid "There was a problem with your session token. Try again, please."
msgstr ""
-#: actions/avatarsettings.php:277 actions/emailsettings.php:255
-#: actions/grouplogo.php:319 actions/imsettings.php:220
-#: actions/recoverpassword.php:44 actions/smssettings.php:248
-#: lib/designsettings.php:304
+#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
+#: actions/emailsettings.php:255 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/recoverpassword.php:44
+#: actions/smssettings.php:248 lib/designsettings.php:304
msgid "Unexpected form submission."
msgstr ""
@@ -658,7 +642,7 @@ msgstr "Desbloquear este utilizador"
msgid "Unblock"
msgstr "Desbloquear"
-#: actions/blockedfromgroup.php:313
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:80
msgid "Unblock this user"
msgstr "Desbloquear este utilizador"
@@ -830,7 +814,7 @@ msgid "Delete this user"
msgstr "Não é possível remover a mensagem."
#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124
-#: lib/adminpanelaction.php:275 lib/groupnav.php:119
+#: lib/adminpanelaction.php:302 lib/groupnav.php:119
msgid "Design"
msgstr ""
@@ -838,105 +822,181 @@ msgstr ""
msgid "Design settings for this StatusNet site."
msgstr ""
-#: actions/designadminpanel.php:220
-msgid "Unable to delete design setting."
-msgstr ""
+#: actions/designadminpanel.php:278
+#, fuzzy
+msgid "Invalid logo URL."
+msgstr "Tamanho inválido."
-#: actions/designadminpanel.php:301
+#: actions/designadminpanel.php:282
#, php-format
msgid "Theme not available: %s"
msgstr ""
-#: actions/designadminpanel.php:406
+#: actions/designadminpanel.php:288
+#, php-format
+msgid "Theme directory not readable: %s"
+msgstr ""
+
+#: actions/designadminpanel.php:292
+#, php-format
+msgid "Avatar directory not writable: %s"
+msgstr ""
+
+#: actions/designadminpanel.php:296
+#, php-format
+msgid "Background directory not writable: %s"
+msgstr ""
+
+#: actions/designadminpanel.php:312
+#, php-format
+msgid "Max length for %s %s is 255 characters."
+msgstr ""
+
+#: actions/designadminpanel.php:412
+#, fuzzy
+msgid "Change logo"
+msgstr "Modificar a sua palavra-passe"
+
+#: actions/designadminpanel.php:417
+#, fuzzy
+msgid "Site logo"
+msgstr "Convidar"
+
+#: actions/designadminpanel.php:424
#, fuzzy
msgid "Change theme"
msgstr "Modificar"
-#: actions/designadminpanel.php:410
-msgid "Theme"
-msgstr ""
+#: actions/designadminpanel.php:441
+#, fuzzy
+msgid "Site theme"
+msgstr "Modificar"
-#: actions/designadminpanel.php:411
+#: actions/designadminpanel.php:442
msgid "Theme for the site."
msgstr ""
-#: actions/designadminpanel.php:420 lib/designsettings.php:101
+#: actions/designadminpanel.php:447
+msgid "Theme server"
+msgstr ""
+
+#: actions/designadminpanel.php:451
+msgid "Theme path"
+msgstr ""
+
+#: actions/designadminpanel.php:455
+msgid "Theme directory"
+msgstr ""
+
+#: actions/designadminpanel.php:462
+#, fuzzy
+msgid "Avatar Settings"
+msgstr "Definições de IM"
+
+#: actions/designadminpanel.php:467
+#, fuzzy
+msgid "Avatar server"
+msgstr "Avatar actualizado."
+
+#: actions/designadminpanel.php:471
+#, fuzzy
+msgid "Avatar path"
+msgstr "Avatar actualizado."
+
+#: actions/designadminpanel.php:475
+#, fuzzy
+msgid "Avatar directory"
+msgstr "Avatar actualizado."
+
+#: actions/designadminpanel.php:486 lib/designsettings.php:101
msgid "Change background image"
msgstr ""
-#: actions/designadminpanel.php:424 actions/designadminpanel.php:498
+#: actions/designadminpanel.php:491 actions/designadminpanel.php:578
#: lib/designsettings.php:178
msgid "Background"
msgstr ""
-#: actions/designadminpanel.php:429
+#: actions/designadminpanel.php:496
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
"$s."
msgstr ""
-#: actions/designadminpanel.php:459 lib/designsettings.php:139
+#: actions/designadminpanel.php:526 lib/designsettings.php:139
msgid "On"
msgstr ""
-#: actions/designadminpanel.php:475 lib/designsettings.php:155
+#: actions/designadminpanel.php:542 lib/designsettings.php:155
msgid "Off"
msgstr ""
-#: actions/designadminpanel.php:476 lib/designsettings.php:156
+#: actions/designadminpanel.php:543 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr ""
-#: actions/designadminpanel.php:481 lib/designsettings.php:161
+#: actions/designadminpanel.php:548 lib/designsettings.php:161
msgid "Tile background image"
msgstr ""
-#: actions/designadminpanel.php:490 lib/designsettings.php:170
+#: actions/designadminpanel.php:554
+msgid "Background server"
+msgstr ""
+
+#: actions/designadminpanel.php:558
+msgid "Background path"
+msgstr ""
+
+#: actions/designadminpanel.php:562
+msgid "Background directory"
+msgstr ""
+
+#: actions/designadminpanel.php:569 lib/designsettings.php:170
#, fuzzy
msgid "Change colours"
msgstr "Modificar a sua palavra-passe"
-#: actions/designadminpanel.php:511 lib/designsettings.php:191
+#: actions/designadminpanel.php:591 lib/designsettings.php:191
#, fuzzy
msgid "Content"
msgstr "Ligar"
-#: actions/designadminpanel.php:524 lib/designsettings.php:204
+#: actions/designadminpanel.php:604 lib/designsettings.php:204
msgid "Sidebar"
msgstr ""
-#: actions/designadminpanel.php:537 lib/designsettings.php:217
+#: actions/designadminpanel.php:617 lib/designsettings.php:217
msgid "Text"
msgstr ""
-#: actions/designadminpanel.php:550 lib/designsettings.php:230
+#: actions/designadminpanel.php:630 lib/designsettings.php:230
#, fuzzy
msgid "Links"
msgstr "Entrar"
-#: actions/designadminpanel.php:611 lib/designsettings.php:247
+#: actions/designadminpanel.php:658 lib/designsettings.php:247
msgid "Use defaults"
msgstr ""
-#: actions/designadminpanel.php:612 lib/designsettings.php:248
+#: actions/designadminpanel.php:659 lib/designsettings.php:248
msgid "Restore default designs"
msgstr ""
-#: actions/designadminpanel.php:618 lib/designsettings.php:254
+#: actions/designadminpanel.php:665 lib/designsettings.php:254
msgid "Reset back to default"
msgstr ""
-#: actions/designadminpanel.php:620 actions/emailsettings.php:195
+#: actions/designadminpanel.php:667 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/profilesettings.php:167 actions/siteadminpanel.php:371
+#: actions/profilesettings.php:167 actions/siteadminpanel.php:414
#: actions/smssettings.php:181 actions/subscriptions.php:203
#: actions/tagother.php:154 actions/useradminpanel.php:226
#: lib/designsettings.php:256 lib/groupeditform.php:202
msgid "Save"
msgstr ""
-#: actions/designadminpanel.php:621 lib/designsettings.php:257
+#: actions/designadminpanel.php:668 lib/designsettings.php:257
msgid "Save design"
msgstr ""
@@ -979,6 +1039,11 @@ msgstr "Bio é demasiada extensa (máx 140 car)."
msgid "Could not update group."
msgstr ""
+#: actions/editgroup.php:259 classes/User_group.php:390
+#, fuzzy
+msgid "Could not create aliases."
+msgstr "Não foi possível criar o formulário de OpenID: %s"
+
#: actions/editgroup.php:269
msgid "Options saved."
msgstr ""
@@ -1095,7 +1160,7 @@ msgstr ""
msgid "Cannot normalize that email address"
msgstr "Não é possível normalizar esse endereço de email"
-#: actions/emailsettings.php:330 actions/siteadminpanel.php:156
+#: actions/emailsettings.php:330 actions/siteadminpanel.php:158
msgid "Not a valid email address"
msgstr ""
@@ -1798,10 +1863,9 @@ msgstr "Conteúdo da mensagem inválido"
msgid "Incorrect username or password."
msgstr "Nome de utilizador ou palavra-passe incorrecta"
-#: actions/login.php:149 actions/recoverpassword.php:375
-#: actions/register.php:248
-msgid "Error setting user."
-msgstr "Erro ao configurar utilizador."
+#: actions/login.php:149
+msgid "Error setting user. You are probably not authorized."
+msgstr ""
#: actions/login.php:204 actions/login.php:257 lib/action.php:457
#: lib/logingroupnav.php:79
@@ -2218,7 +2282,7 @@ msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:275
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:309
msgid "Language"
msgstr "Linguagem"
@@ -2246,7 +2310,7 @@ msgstr ""
msgid "Bio is too long (max %d chars)."
msgstr "Bio é demasiada extensa (máx 140 car)."
-#: actions/profilesettings.php:228 actions/siteadminpanel.php:163
+#: actions/profilesettings.php:228 actions/siteadminpanel.php:165
msgid "Timezone not selected."
msgstr ""
@@ -2488,6 +2552,10 @@ msgstr ""
msgid "Password and confirmation do not match."
msgstr ""
+#: actions/recoverpassword.php:375 actions/register.php:248
+msgid "Error setting user."
+msgstr "Erro ao configurar utilizador."
+
#: actions/recoverpassword.php:382
msgid "New password successfully saved. You are now logged in."
msgstr "Nova palavra-passe foi guardada com sucesso. Está agora conectado."
@@ -2549,7 +2617,7 @@ msgid "Same as password above. Required."
msgstr ""
#: actions/register.php:437 actions/register.php:441
-#: actions/siteadminpanel.php:253 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:287 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "Email"
@@ -2983,7 +3051,7 @@ msgstr ""
msgid "User is already silenced."
msgstr "O utilizador bloqueou-o."
-#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:272
+#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:299
#, fuzzy
msgid "Site"
msgstr "Convidar"
@@ -2992,118 +3060,230 @@ msgstr "Convidar"
msgid "Basic settings for this StatusNet site."
msgstr ""
-#: actions/siteadminpanel.php:145
+#: actions/siteadminpanel.php:147
msgid "Site name must have non-zero length."
msgstr ""
-#: actions/siteadminpanel.php:153
+#: 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"
-#: actions/siteadminpanel.php:171
+#: actions/siteadminpanel.php:173
#, php-format
msgid "Unknown language \"%s\""
msgstr ""
-#: actions/siteadminpanel.php:178
+#: actions/siteadminpanel.php:180
msgid "Invalid snapshot report URL."
msgstr ""
-#: actions/siteadminpanel.php:184
+#: actions/siteadminpanel.php:186
msgid "Invalid snapshot run value."
msgstr ""
-#: actions/siteadminpanel.php:190
+#: actions/siteadminpanel.php:192
msgid "Snapshot frequency must be a number."
msgstr ""
-#: actions/siteadminpanel.php:241
+#: actions/siteadminpanel.php:199
+msgid "You must set an SSL sever when enabling SSL."
+msgstr ""
+
+#: actions/siteadminpanel.php:204
+msgid "Invalid SSL server. Max length is 255 characters."
+msgstr ""
+
+#: actions/siteadminpanel.php:210
+msgid "Minimum text limit is 140c."
+msgstr ""
+
+#: actions/siteadminpanel.php:216
+msgid "Dupe limit must 1 or more seconds."
+msgstr ""
+
+#: actions/siteadminpanel.php:224
+#, php-format
+msgid "Locales directory not readable: %s"
+msgstr ""
+
+#: actions/siteadminpanel.php:275
msgid "Site name"
msgstr ""
-#: actions/siteadminpanel.php:242
+#: actions/siteadminpanel.php:276
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr ""
-#: actions/siteadminpanel.php:245
+#: actions/siteadminpanel.php:279
msgid "Brought by"
msgstr ""
-#: actions/siteadminpanel.php:246
+#: actions/siteadminpanel.php:280
msgid "Text used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:249
+#: actions/siteadminpanel.php:283
msgid "Brought by URL"
msgstr ""
-#: actions/siteadminpanel.php:250
+#: actions/siteadminpanel.php:284
msgid "URL used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:254
+#: actions/siteadminpanel.php:288
#, fuzzy
msgid "contact email address for your site"
msgstr "O endereço de email de recepção removido."
-#: actions/siteadminpanel.php:268
+#: actions/siteadminpanel.php:302
msgid "Default timezone"
msgstr ""
-#: actions/siteadminpanel.php:269
+#: actions/siteadminpanel.php:303
msgid "Default timezone for the site; usually UTC."
msgstr ""
-#: actions/siteadminpanel.php:276
+#: actions/siteadminpanel.php:310
msgid "Default site language"
msgstr ""
-#: actions/siteadminpanel.php:282
+#: actions/siteadminpanel.php:316
+msgid "Path to locales"
+msgstr ""
+
+#: actions/siteadminpanel.php:316
+msgid "Directory path to locales"
+msgstr ""
+
+#: actions/siteadminpanel.php:320
+msgid "Server"
+msgstr ""
+
+#: actions/siteadminpanel.php:320
+msgid "Site's server hostname."
+msgstr ""
+
+#: actions/siteadminpanel.php:324
+msgid "Path"
+msgstr ""
+
+#: actions/siteadminpanel.php:324
+#, fuzzy
+msgid "Site path"
+msgstr "Convidar"
+
+#: actions/siteadminpanel.php:328
+msgid "Fancy URLs"
+msgstr ""
+
+#: actions/siteadminpanel.php:330
+msgid "Use fancy (more readable and memorable) URLs?"
+msgstr ""
+
+#: actions/siteadminpanel.php:334
msgid "Private"
msgstr ""
-#: actions/siteadminpanel.php:284
+#: actions/siteadminpanel.php:336
msgid "Prohibit anonymous users (not logged in) from viewing site?"
msgstr ""
-#: actions/siteadminpanel.php:290
+#: actions/siteadminpanel.php:340
+#, fuzzy
+msgid "Invite only"
+msgstr "Convidar"
+
+#: actions/siteadminpanel.php:342
+msgid "Make registration invitation only."
+msgstr ""
+
+#: actions/siteadminpanel.php:346 actions/useradminpanel.php:171
+#, fuzzy
+msgid "Closed"
+msgstr "Bloquear"
+
+#: actions/siteadminpanel.php:348
+msgid "Disable new registrations."
+msgstr ""
+
+#: actions/siteadminpanel.php:353
msgid "Randomly during Web hit"
msgstr ""
-#: actions/siteadminpanel.php:291
+#: actions/siteadminpanel.php:354
msgid "In a scheduled job"
msgstr ""
-#: actions/siteadminpanel.php:292
+#: actions/siteadminpanel.php:355 actions/siteadminpanel.php:380
msgid "Never"
msgstr ""
-#: actions/siteadminpanel.php:294
+#: actions/siteadminpanel.php:357
msgid "Data snapshots"
msgstr ""
-#: actions/siteadminpanel.php:295
+#: actions/siteadminpanel.php:358
msgid "When to send statistical data to status.net servers"
msgstr ""
-#: actions/siteadminpanel.php:301
+#: actions/siteadminpanel.php:364
msgid "Frequency"
msgstr ""
-#: actions/siteadminpanel.php:302
+#: actions/siteadminpanel.php:365
msgid "Snapshots will be sent once every N Web hits"
msgstr ""
-#: actions/siteadminpanel.php:309
+#: actions/siteadminpanel.php:372
msgid "Report URL"
msgstr ""
-#: actions/siteadminpanel.php:310
+#: actions/siteadminpanel.php:373
msgid "Snapshots will be sent to this URL"
msgstr ""
-#: actions/siteadminpanel.php:371 actions/useradminpanel.php:226
+#: actions/siteadminpanel.php:381
+msgid "Sometimes"
+msgstr ""
+
+#: actions/siteadminpanel.php:382
+msgid "Always"
+msgstr ""
+
+#: actions/siteadminpanel.php:384
+msgid "Use SSL"
+msgstr ""
+
+#: actions/siteadminpanel.php:385
+msgid "When to use SSL"
+msgstr ""
+
+#: actions/siteadminpanel.php:391
+msgid "SSL Server"
+msgstr ""
+
+#: actions/siteadminpanel.php:392
+msgid "Server to direct SSL requests to"
+msgstr ""
+
+#: actions/siteadminpanel.php:396
+msgid "Text limit"
+msgstr ""
+
+#: actions/siteadminpanel.php:396
+msgid "Maximum number of characters for notices."
+msgstr ""
+
+#: actions/siteadminpanel.php:400
+msgid "Dupe limit"
+msgstr ""
+
+#: actions/siteadminpanel.php:400
+msgid "How long users must wait (in seconds) to post the same thing again."
+msgstr ""
+
+#: actions/siteadminpanel.php:414 actions/useradminpanel.php:226
#, fuzzy
msgid "Save site settings"
msgstr "Definições do Email"
@@ -3411,11 +3591,6 @@ msgstr ""
msgid "User settings for this StatusNet site."
msgstr ""
-#: actions/useradminpanel.php:171
-#, fuzzy
-msgid "Closed"
-msgstr "Bloquear"
-
#: actions/useradminpanel.php:173
msgid "Is registration on this site prohibited?"
msgstr ""
@@ -3626,6 +3801,14 @@ msgstr ""
msgid "DB error inserting reply: %s"
msgstr "Ocorreu um erro na base de dados ao inserir a resposta: %s"
+#: classes/User_group.php:380
+msgid "Could not create group."
+msgstr ""
+
+#: classes/User_group.php:409
+msgid "Could not set group membership."
+msgstr ""
+
#: classes/User.php:347
#, php-format
msgid "Welcome to %1$s, @%2$s!"
@@ -3861,12 +4044,16 @@ msgstr ""
msgid "saveSettings() not implemented."
msgstr ""
-#: lib/adminpanelaction.php:273
+#: lib/adminpanelaction.php:247
+msgid "Unable to delete design setting."
+msgstr ""
+
+#: lib/adminpanelaction.php:300
#, fuzzy
msgid "Basic site configuration"
msgstr "Confirmação do Endereço de Email"
-#: lib/adminpanelaction.php:276
+#: lib/adminpanelaction.php:303
#, fuzzy
msgid "Design configuration"
msgstr "Confirmação do Endereço de Email"
@@ -4112,20 +4299,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:203
+#: lib/common.php:199
#, fuzzy
msgid "No configuration file found. "
msgstr "Código de confirmação não encontrado"
-#: lib/common.php:204
+#: lib/common.php:200
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:205
+#: lib/common.php:201
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:206
+#: lib/common.php:202
msgid "Go to the installer."
msgstr ""
@@ -4883,11 +5070,6 @@ msgstr "Nenhum"
msgid "Top posters"
msgstr "Top posters"
-#: lib/unblockform.php:80
-#, fuzzy
-msgid "Unlock this user"
-msgstr "Desbloquear este utilizador"
-
#: lib/unsandboxform.php:69
msgid "Unsandbox"
msgstr ""
@@ -4940,47 +5122,47 @@ msgstr ""
msgid "Message"
msgstr ""
-#: lib/util.php:821
+#: lib/util.php:826
msgid "a few seconds ago"
msgstr ""
-#: lib/util.php:823
+#: lib/util.php:828
msgid "about a minute ago"
msgstr ""
-#: lib/util.php:825
+#: lib/util.php:830
#, php-format
msgid "about %d minutes ago"
msgstr ""
-#: lib/util.php:827
+#: lib/util.php:832
msgid "about an hour ago"
msgstr ""
-#: lib/util.php:829
+#: lib/util.php:834
#, php-format
msgid "about %d hours ago"
msgstr ""
-#: lib/util.php:831
+#: lib/util.php:836
msgid "about a day ago"
msgstr ""
-#: lib/util.php:833
+#: lib/util.php:838
#, php-format
msgid "about %d days ago"
msgstr ""
-#: lib/util.php:835
+#: lib/util.php:840
msgid "about a month ago"
msgstr ""
-#: lib/util.php:837
+#: lib/util.php:842
#, php-format
msgid "about %d months ago"
msgstr ""
-#: lib/util.php:839
+#: lib/util.php:844
msgid "about a year ago"
msgstr ""
@@ -5011,5 +5193,9 @@ msgid "Sorry, no incoming email allowed."
msgstr ""
#, fuzzy
+#~ msgid "Unlock this user"
+#~ msgstr "Desbloquear este utilizador"
+
+#, fuzzy
#~ msgid "These people are subscribed to you: "
#~ msgstr "Já subscrito!."
diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.po b/locale/pt_BR/LC_MESSAGES/statusnet.po
index b8780318e..074cde443 100644
--- a/locale/pt_BR/LC_MESSAGES/statusnet.po
+++ b/locale/pt_BR/LC_MESSAGES/statusnet.po
@@ -1,17 +1,20 @@
# Translation of StatusNet to Brazilian Portuguese
#
# Author@translatewiki.net: Ewout
+# Author: Frederico Goncalves Guimaraes <frederico@teia.bio.br>, 2009.
# --
-# Frederico Goncalves Guimaraes <frederico@teia.bio.br>, 2009.
+# 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-18 19:31+0000\n"
+"POT-Creation-Date: 2009-11-19 10:43+0000\n"
"PO-Revision-Date: 2009-11-18 19:32:31+0000\n"
"Language-Team: Brazilian Portuguese\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
"X-Generator: MediaWiki 1.16alpha(r59207); Translate extension (2009-11-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: pt-br\n"
@@ -147,7 +150,7 @@ msgstr "Não foi possível atualizar o usuário."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
-#: actions/designadminpanel.php:125 actions/newnotice.php:94
+#: actions/designadminpanel.php:122 actions/newnotice.php:94
#: lib/designsettings.php:283
#, php-format
msgid ""
@@ -233,7 +236,7 @@ msgstr "Todas as mensagens diretas enviadas para %s"
#: 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:184 actions/apigroupismember.php:114
+#: 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
@@ -302,23 +305,7 @@ msgstr "Não foi possível recuperar o fluxo público."
msgid "Could not find target user."
msgstr "Não foi possível encontrar nenhum status."
-#: actions/apigroupcreate.php:136 actions/newgroup.php:204
-#, fuzzy
-msgid "Could not create group."
-msgstr "Não foi possível criar a favorita."
-
-#: actions/apigroupcreate.php:147 actions/editgroup.php:259
-#: actions/newgroup.php:210
-#, fuzzy
-msgid "Could not create aliases."
-msgstr "Não foi possível criar a favorita."
-
-#: actions/apigroupcreate.php:166 actions/newgroup.php:224
-#, fuzzy
-msgid "Could not set group membership."
-msgstr "Não foi possível salvar a assinatura."
-
-#: actions/apigroupcreate.php:212 actions/editgroup.php:182
+#: actions/apigroupcreate.php:164 actions/editgroup.php:182
#: actions/newgroup.php:126 actions/profilesettings.php:208
#: actions/register.php:205
msgid "Nickname must have only lowercase letters and numbers and no spaces."
@@ -326,60 +313,60 @@ msgstr ""
"O apelido deve conter apenas letras minúsculas e/ou números e não pode ter "
"acentuação e espaços."
-#: actions/apigroupcreate.php:221 actions/editgroup.php:186
+#: 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 "Este apelido já está em uso. Tente outro."
-#: actions/apigroupcreate.php:228 actions/editgroup.php:189
+#: 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 "Não é um apelido válido."
-#: actions/apigroupcreate.php:244 actions/editgroup.php:195
+#: 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 "A URL do site informada não é válida."
-#: actions/apigroupcreate.php:253 actions/editgroup.php:198
+#: 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 "O nome completo é muito extenso (máx. 255 caracteres)"
-#: actions/apigroupcreate.php:261
+#: actions/apigroupcreate.php:213
#, fuzzy, php-format
msgid "Description is too long (max %d chars)."
msgstr "descrição muito extensa (máximo 140 caracteres)."
-#: actions/apigroupcreate.php:272 actions/editgroup.php:204
+#: 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 "A localização é muito extensa (máx. 255 caracteres)."
-#: actions/apigroupcreate.php:291 actions/editgroup.php:215
+#: actions/apigroupcreate.php:243 actions/editgroup.php:215
#: actions/newgroup.php:159
#, php-format
msgid "Too many aliases! Maximum %d."
msgstr ""
-#: actions/apigroupcreate.php:312 actions/editgroup.php:224
+#: actions/apigroupcreate.php:264 actions/editgroup.php:224
#: actions/newgroup.php:168
#, fuzzy, php-format
msgid "Invalid alias: \"%s\""
msgstr "Etiqueta inválida: \"%s\""
-#: actions/apigroupcreate.php:321 actions/editgroup.php:228
+#: actions/apigroupcreate.php:273 actions/editgroup.php:228
#: actions/newgroup.php:172
#, fuzzy, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr "Este apelido já está em uso. Tente outro."
-#: actions/apigroupcreate.php:334 actions/editgroup.php:234
+#: actions/apigroupcreate.php:286 actions/editgroup.php:234
#: actions/newgroup.php:178
msgid "Alias can't be the same as nickname."
msgstr ""
@@ -604,10 +591,10 @@ msgid "There was a problem with your session token. Try again, please."
msgstr ""
"Ocorreu um problema com o seu token de sessão. Tente novamente, por favor."
-#: actions/avatarsettings.php:277 actions/emailsettings.php:255
-#: actions/grouplogo.php:319 actions/imsettings.php:220
-#: actions/recoverpassword.php:44 actions/smssettings.php:248
-#: lib/designsettings.php:304
+#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
+#: actions/emailsettings.php:255 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/recoverpassword.php:44
+#: actions/smssettings.php:248 lib/designsettings.php:304
msgid "Unexpected form submission."
msgstr "Submissão inesperada de formulário."
@@ -669,7 +656,7 @@ msgstr "Não foi possível desbloquear o usuário."
msgid "Unblock"
msgstr "Desbloquear"
-#: actions/blockedfromgroup.php:313
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:80
msgid "Unblock this user"
msgstr "Desbloquear este usuário"
@@ -846,7 +833,7 @@ msgid "Delete this user"
msgstr "Excluir esta mensagem"
#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124
-#: lib/adminpanelaction.php:275 lib/groupnav.php:119
+#: lib/adminpanelaction.php:302 lib/groupnav.php:119
msgid "Design"
msgstr ""
@@ -854,108 +841,183 @@ msgstr ""
msgid "Design settings for this StatusNet site."
msgstr ""
-#: actions/designadminpanel.php:220
+#: actions/designadminpanel.php:278
#, fuzzy
-msgid "Unable to delete design setting."
-msgstr "Não foi possível salvar suas configurações do Twitter!"
+msgid "Invalid logo URL."
+msgstr "Tamanho inválido."
-#: actions/designadminpanel.php:301
+#: actions/designadminpanel.php:282
#, fuzzy, php-format
msgid "Theme not available: %s"
msgstr "Esta página não está disponível em um "
-#: actions/designadminpanel.php:406
+#: actions/designadminpanel.php:288
+#, fuzzy, php-format
+msgid "Theme directory not readable: %s"
+msgstr "Esta página não está disponível em um "
+
+#: actions/designadminpanel.php:292
+#, php-format
+msgid "Avatar directory not writable: %s"
+msgstr ""
+
+#: actions/designadminpanel.php:296
+#, php-format
+msgid "Background directory not writable: %s"
+msgstr ""
+
+#: actions/designadminpanel.php:312
+#, php-format
+msgid "Max length for %s %s is 255 characters."
+msgstr ""
+
+#: actions/designadminpanel.php:412
+#, fuzzy
+msgid "Change logo"
+msgstr "Altere a sua senha"
+
+#: actions/designadminpanel.php:417
+#, fuzzy
+msgid "Site logo"
+msgstr "Convidar"
+
+#: actions/designadminpanel.php:424
#, fuzzy
msgid "Change theme"
msgstr "Alterar"
-#: actions/designadminpanel.php:410
-msgid "Theme"
-msgstr ""
+#: actions/designadminpanel.php:441
+#, fuzzy
+msgid "Site theme"
+msgstr "Nova mensagem"
-#: actions/designadminpanel.php:411
+#: actions/designadminpanel.php:442
#, fuzzy
msgid "Theme for the site."
msgstr "Sair deste site"
-#: actions/designadminpanel.php:420 lib/designsettings.php:101
+#: actions/designadminpanel.php:447
+msgid "Theme server"
+msgstr ""
+
+#: actions/designadminpanel.php:451
+msgid "Theme path"
+msgstr ""
+
+#: actions/designadminpanel.php:455
+msgid "Theme directory"
+msgstr ""
+
+#: actions/designadminpanel.php:462
+#, fuzzy
+msgid "Avatar Settings"
+msgstr "Configurações do avatar"
+
+#: actions/designadminpanel.php:467
+#, fuzzy
+msgid "Avatar server"
+msgstr "Configurações do avatar"
+
+#: actions/designadminpanel.php:471
+#, fuzzy
+msgid "Avatar path"
+msgstr "O avatar foi atualizado."
+
+#: actions/designadminpanel.php:475
+#, fuzzy
+msgid "Avatar directory"
+msgstr "O avatar foi atualizado."
+
+#: actions/designadminpanel.php:486 lib/designsettings.php:101
msgid "Change background image"
msgstr ""
-#: actions/designadminpanel.php:424 actions/designadminpanel.php:498
+#: actions/designadminpanel.php:491 actions/designadminpanel.php:578
#: lib/designsettings.php:178
msgid "Background"
msgstr ""
-#: actions/designadminpanel.php:429
+#: actions/designadminpanel.php:496
#, fuzzy, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
"$s."
msgstr "Você pode enviar seu avatar pessoal."
-#: actions/designadminpanel.php:459 lib/designsettings.php:139
+#: actions/designadminpanel.php:526 lib/designsettings.php:139
msgid "On"
msgstr ""
-#: actions/designadminpanel.php:475 lib/designsettings.php:155
+#: actions/designadminpanel.php:542 lib/designsettings.php:155
msgid "Off"
msgstr ""
-#: actions/designadminpanel.php:476 lib/designsettings.php:156
+#: actions/designadminpanel.php:543 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr ""
-#: actions/designadminpanel.php:481 lib/designsettings.php:161
+#: actions/designadminpanel.php:548 lib/designsettings.php:161
msgid "Tile background image"
msgstr ""
-#: actions/designadminpanel.php:490 lib/designsettings.php:170
+#: actions/designadminpanel.php:554
+msgid "Background server"
+msgstr ""
+
+#: actions/designadminpanel.php:558
+msgid "Background path"
+msgstr ""
+
+#: actions/designadminpanel.php:562
+msgid "Background directory"
+msgstr ""
+
+#: actions/designadminpanel.php:569 lib/designsettings.php:170
#, fuzzy
msgid "Change colours"
msgstr "Altere a sua senha"
-#: actions/designadminpanel.php:511 lib/designsettings.php:191
+#: actions/designadminpanel.php:591 lib/designsettings.php:191
#, fuzzy
msgid "Content"
msgstr "Conectar"
-#: actions/designadminpanel.php:524 lib/designsettings.php:204
+#: actions/designadminpanel.php:604 lib/designsettings.php:204
#, fuzzy
msgid "Sidebar"
msgstr "Procurar"
-#: actions/designadminpanel.php:537 lib/designsettings.php:217
+#: actions/designadminpanel.php:617 lib/designsettings.php:217
msgid "Text"
msgstr "Texto"
-#: actions/designadminpanel.php:550 lib/designsettings.php:230
+#: actions/designadminpanel.php:630 lib/designsettings.php:230
#, fuzzy
msgid "Links"
msgstr "Lista"
-#: actions/designadminpanel.php:611 lib/designsettings.php:247
+#: actions/designadminpanel.php:658 lib/designsettings.php:247
msgid "Use defaults"
msgstr ""
-#: actions/designadminpanel.php:612 lib/designsettings.php:248
+#: actions/designadminpanel.php:659 lib/designsettings.php:248
msgid "Restore default designs"
msgstr ""
-#: actions/designadminpanel.php:618 lib/designsettings.php:254
+#: actions/designadminpanel.php:665 lib/designsettings.php:254
msgid "Reset back to default"
msgstr ""
-#: actions/designadminpanel.php:620 actions/emailsettings.php:195
+#: actions/designadminpanel.php:667 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/profilesettings.php:167 actions/siteadminpanel.php:371
+#: actions/profilesettings.php:167 actions/siteadminpanel.php:414
#: actions/smssettings.php:181 actions/subscriptions.php:203
#: actions/tagother.php:154 actions/useradminpanel.php:226
#: lib/designsettings.php:256 lib/groupeditform.php:202
msgid "Save"
msgstr "Salvar"
-#: actions/designadminpanel.php:621 lib/designsettings.php:257
+#: actions/designadminpanel.php:668 lib/designsettings.php:257
msgid "Save design"
msgstr ""
@@ -998,6 +1060,11 @@ msgstr "descrição muito extensa (máximo 140 caracteres)."
msgid "Could not update group."
msgstr "Não foi possível atualizar o grupo."
+#: actions/editgroup.php:259 classes/User_group.php:390
+#, fuzzy
+msgid "Could not create aliases."
+msgstr "Não foi possível criar a favorita."
+
#: actions/editgroup.php:269
msgid "Options saved."
msgstr "As configurações foram salvas."
@@ -1117,7 +1184,7 @@ msgstr "Nenhum endereço de e-mail."
msgid "Cannot normalize that email address"
msgstr "Não foi possível normalizar este endereço de e-mail"
-#: actions/emailsettings.php:330 actions/siteadminpanel.php:156
+#: actions/emailsettings.php:330 actions/siteadminpanel.php:158
msgid "Not a valid email address"
msgstr "Não é um endereço de e-mail válido"
@@ -1867,10 +1934,10 @@ msgstr "O conteúdo da mensagem é inválido"
msgid "Incorrect username or password."
msgstr "Nome de usuário e/ou senha incorreto(s)."
-#: actions/login.php:149 actions/recoverpassword.php:375
-#: actions/register.php:248
-msgid "Error setting user."
-msgstr "Erro na configuração do usuário."
+#: actions/login.php:149
+#, 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:457
#: lib/logingroupnav.php:79
@@ -2307,7 +2374,7 @@ msgstr ""
"Suas etiquetas (letras, números, -, ., e _), separadas por vírgulas ou "
"espaços"
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:275
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:309
msgid "Language"
msgstr "Idioma"
@@ -2333,7 +2400,7 @@ msgstr "Assinar automaticamente à quem me assinar"
msgid "Bio is too long (max %d chars)."
msgstr "Descrição muito extensa (máximo 140 caracteres)."
-#: actions/profilesettings.php:228 actions/siteadminpanel.php:163
+#: actions/profilesettings.php:228 actions/siteadminpanel.php:165
msgid "Timezone not selected."
msgstr "O fuso horário não foi selecionado."
@@ -2582,6 +2649,10 @@ msgstr "A senha deve ter 6 caracteres ou mais."
msgid "Password and confirmation do not match."
msgstr "A senha e a confirmação não coincidem."
+#: actions/recoverpassword.php:375 actions/register.php:248
+msgid "Error setting user."
+msgstr "Erro na configuração do usuário."
+
#: actions/recoverpassword.php:382
msgid "New password successfully saved. You are now logged in."
msgstr ""
@@ -2645,7 +2716,7 @@ msgid "Same as password above. Required."
msgstr "Igual à senha acima. Obrigatório."
#: actions/register.php:437 actions/register.php:441
-#: actions/siteadminpanel.php:253 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:287 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "E-mail"
@@ -3099,7 +3170,7 @@ msgstr "Você não pode enviar uma mensagem para esse usuário."
msgid "User is already silenced."
msgstr "O usuário bloqueou você."
-#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:272
+#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:299
#, fuzzy
msgid "Site"
msgstr "Convidar"
@@ -3108,122 +3179,236 @@ msgstr "Convidar"
msgid "Basic settings for this StatusNet site."
msgstr ""
-#: actions/siteadminpanel.php:145
+#: actions/siteadminpanel.php:147
msgid "Site name must have non-zero length."
msgstr ""
-#: actions/siteadminpanel.php:153
+#: actions/siteadminpanel.php:155
#, fuzzy
msgid "You must have a valid contact email address"
msgstr "Não é um endereço de e-mail válido"
-#: actions/siteadminpanel.php:171
+#: actions/siteadminpanel.php:173
#, php-format
msgid "Unknown language \"%s\""
msgstr ""
-#: actions/siteadminpanel.php:178
+#: actions/siteadminpanel.php:180
msgid "Invalid snapshot report URL."
msgstr ""
-#: actions/siteadminpanel.php:184
+#: actions/siteadminpanel.php:186
msgid "Invalid snapshot run value."
msgstr ""
-#: actions/siteadminpanel.php:190
+#: actions/siteadminpanel.php:192
msgid "Snapshot frequency must be a number."
msgstr ""
-#: actions/siteadminpanel.php:241
+#: actions/siteadminpanel.php:199
+msgid "You must set an SSL sever when enabling SSL."
+msgstr ""
+
+#: actions/siteadminpanel.php:204
+msgid "Invalid SSL server. Max length is 255 characters."
+msgstr ""
+
+#: actions/siteadminpanel.php:210
+msgid "Minimum text limit is 140c."
+msgstr ""
+
+#: actions/siteadminpanel.php:216
+msgid "Dupe limit must 1 or more seconds."
+msgstr ""
+
+#: actions/siteadminpanel.php:224
+#, php-format
+msgid "Locales directory not readable: %s"
+msgstr ""
+
+#: actions/siteadminpanel.php:275
#, fuzzy
msgid "Site name"
msgstr "Nova mensagem"
-#: actions/siteadminpanel.php:242
+#: actions/siteadminpanel.php:276
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr ""
-#: actions/siteadminpanel.php:245
+#: actions/siteadminpanel.php:279
msgid "Brought by"
msgstr ""
-#: actions/siteadminpanel.php:246
+#: actions/siteadminpanel.php:280
msgid "Text used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:249
+#: actions/siteadminpanel.php:283
msgid "Brought by URL"
msgstr ""
-#: actions/siteadminpanel.php:250
+#: actions/siteadminpanel.php:284
msgid "URL used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:254
+#: actions/siteadminpanel.php:288
#, fuzzy
msgid "contact email address for your site"
msgstr "Novo endereço de e-mail para postar para %s"
-#: actions/siteadminpanel.php:268
+#: actions/siteadminpanel.php:302
msgid "Default timezone"
msgstr ""
-#: actions/siteadminpanel.php:269
+#: actions/siteadminpanel.php:303
msgid "Default timezone for the site; usually UTC."
msgstr ""
-#: actions/siteadminpanel.php:276
+#: actions/siteadminpanel.php:310
#, fuzzy
msgid "Default site language"
msgstr "Idioma preferencial"
-#: actions/siteadminpanel.php:282
+#: actions/siteadminpanel.php:316
+msgid "Path to locales"
+msgstr ""
+
+#: actions/siteadminpanel.php:316
+msgid "Directory path to locales"
+msgstr ""
+
+#: actions/siteadminpanel.php:320
+#, fuzzy
+msgid "Server"
+msgstr "Recuperar"
+
+#: actions/siteadminpanel.php:320
+msgid "Site's server hostname."
+msgstr ""
+
+#: actions/siteadminpanel.php:324
+msgid "Path"
+msgstr ""
+
+#: actions/siteadminpanel.php:324
+#, fuzzy
+msgid "Site path"
+msgstr "Nova mensagem"
+
+#: actions/siteadminpanel.php:328
+msgid "Fancy URLs"
+msgstr ""
+
+#: actions/siteadminpanel.php:330
+msgid "Use fancy (more readable and memorable) URLs?"
+msgstr ""
+
+#: actions/siteadminpanel.php:334
#, fuzzy
msgid "Private"
msgstr "Privacidade"
-#: actions/siteadminpanel.php:284
+#: actions/siteadminpanel.php:336
msgid "Prohibit anonymous users (not logged in) from viewing site?"
msgstr ""
-#: actions/siteadminpanel.php:290
+#: actions/siteadminpanel.php:340
+#, fuzzy
+msgid "Invite only"
+msgstr "Convidar"
+
+#: actions/siteadminpanel.php:342
+msgid "Make registration invitation only."
+msgstr ""
+
+#: actions/siteadminpanel.php:346 actions/useradminpanel.php:171
+#, fuzzy
+msgid "Closed"
+msgstr "Bloquear"
+
+#: actions/siteadminpanel.php:348
+msgid "Disable new registrations."
+msgstr ""
+
+#: actions/siteadminpanel.php:353
msgid "Randomly during Web hit"
msgstr ""
-#: actions/siteadminpanel.php:291
+#: actions/siteadminpanel.php:354
msgid "In a scheduled job"
msgstr ""
-#: actions/siteadminpanel.php:292
+#: actions/siteadminpanel.php:355 actions/siteadminpanel.php:380
#, fuzzy
msgid "Never"
msgstr "Recuperar"
-#: actions/siteadminpanel.php:294
+#: actions/siteadminpanel.php:357
msgid "Data snapshots"
msgstr ""
-#: actions/siteadminpanel.php:295
+#: actions/siteadminpanel.php:358
msgid "When to send statistical data to status.net servers"
msgstr ""
-#: actions/siteadminpanel.php:301
+#: actions/siteadminpanel.php:364
msgid "Frequency"
msgstr ""
-#: actions/siteadminpanel.php:302
+#: actions/siteadminpanel.php:365
msgid "Snapshots will be sent once every N Web hits"
msgstr ""
-#: actions/siteadminpanel.php:309
+#: actions/siteadminpanel.php:372
msgid "Report URL"
msgstr ""
-#: actions/siteadminpanel.php:310
+#: actions/siteadminpanel.php:373
msgid "Snapshots will be sent to this URL"
msgstr ""
-#: actions/siteadminpanel.php:371 actions/useradminpanel.php:226
+#: actions/siteadminpanel.php:381
+#, fuzzy
+msgid "Sometimes"
+msgstr "Mensagens"
+
+#: actions/siteadminpanel.php:382
+msgid "Always"
+msgstr ""
+
+#: actions/siteadminpanel.php:384
+msgid "Use SSL"
+msgstr ""
+
+#: actions/siteadminpanel.php:385
+msgid "When to use SSL"
+msgstr ""
+
+#: actions/siteadminpanel.php:391
+msgid "SSL Server"
+msgstr ""
+
+#: actions/siteadminpanel.php:392
+msgid "Server to direct SSL requests to"
+msgstr ""
+
+#: actions/siteadminpanel.php:396
+msgid "Text limit"
+msgstr ""
+
+#: actions/siteadminpanel.php:396
+msgid "Maximum number of characters for notices."
+msgstr ""
+
+#: actions/siteadminpanel.php:400
+msgid "Dupe limit"
+msgstr ""
+
+#: actions/siteadminpanel.php:400
+msgid "How long users must wait (in seconds) to post the same thing again."
+msgstr ""
+
+#: actions/siteadminpanel.php:414 actions/useradminpanel.php:226
#, fuzzy
msgid "Save site settings"
msgstr "Configurações do avatar"
@@ -3544,11 +3729,6 @@ msgstr "Usuário"
msgid "User settings for this StatusNet site."
msgstr ""
-#: actions/useradminpanel.php:171
-#, fuzzy
-msgid "Closed"
-msgstr "Bloquear"
-
#: actions/useradminpanel.php:173
msgid "Is registration on this site prohibited?"
msgstr ""
@@ -3780,6 +3960,16 @@ msgstr "Problema ao salvar a mensagem."
msgid "DB error inserting reply: %s"
msgstr "Erro no banco de dados na inserção da reposta: %s"
+#: classes/User_group.php:380
+#, fuzzy
+msgid "Could not create group."
+msgstr "Não foi possível criar a favorita."
+
+#: classes/User_group.php:409
+#, fuzzy
+msgid "Could not set group membership."
+msgstr "Não foi possível salvar a assinatura."
+
#: classes/User.php:347
#, fuzzy, php-format
msgid "Welcome to %1$s, @%2$s!"
@@ -4025,12 +4215,17 @@ msgstr "O comando não foi implementado ainda."
msgid "saveSettings() not implemented."
msgstr "O comando não foi implementado ainda."
-#: lib/adminpanelaction.php:273
+#: lib/adminpanelaction.php:247
+#, fuzzy
+msgid "Unable to delete design setting."
+msgstr "Não foi possível salvar suas configurações do Twitter!"
+
+#: lib/adminpanelaction.php:300
#, fuzzy
msgid "Basic site configuration"
msgstr "Confirmação do endereço de e-mail"
-#: lib/adminpanelaction.php:276
+#: lib/adminpanelaction.php:303
#, fuzzy
msgid "Design configuration"
msgstr "Confirmação de SMS"
@@ -4281,20 +4476,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:203
+#: lib/common.php:199
#, fuzzy
msgid "No configuration file found. "
msgstr "Nenhum código de confirmação."
-#: lib/common.php:204
+#: lib/common.php:200
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:205
+#: lib/common.php:201
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:206
+#: lib/common.php:202
#, fuzzy
msgid "Go to the installer."
msgstr "Entrar"
@@ -5070,11 +5265,6 @@ msgstr "Nenhuma"
msgid "Top posters"
msgstr "Quem mais publica"
-#: lib/unblockform.php:80
-#, fuzzy
-msgid "Unlock this user"
-msgstr "Desbloquear este usuário"
-
#: lib/unsandboxform.php:69
msgid "Unsandbox"
msgstr ""
@@ -5130,47 +5320,47 @@ msgstr "Você não pode enviar uma mensagem para esse usuário."
msgid "Message"
msgstr "Nova mensagem"
-#: lib/util.php:821
+#: lib/util.php:826
msgid "a few seconds ago"
msgstr "segundos atrás"
-#: lib/util.php:823
+#: lib/util.php:828
msgid "about a minute ago"
msgstr "1 min atrás"
-#: lib/util.php:825
+#: lib/util.php:830
#, php-format
msgid "about %d minutes ago"
msgstr "%d mins atrás"
-#: lib/util.php:827
+#: lib/util.php:832
msgid "about an hour ago"
msgstr "1 hora atrás"
-#: lib/util.php:829
+#: lib/util.php:834
#, php-format
msgid "about %d hours ago"
msgstr "%d horas atrás"
-#: lib/util.php:831
+#: lib/util.php:836
msgid "about a day ago"
msgstr "1 dia atrás"
-#: lib/util.php:833
+#: lib/util.php:838
#, php-format
msgid "about %d days ago"
msgstr "%d dias atrás"
-#: lib/util.php:835
+#: lib/util.php:840
msgid "about a month ago"
msgstr "1 mês atrás"
-#: lib/util.php:837
+#: lib/util.php:842
#, php-format
msgid "about %d months ago"
msgstr "%d meses atrás"
-#: lib/util.php:839
+#: lib/util.php:844
msgid "about a year ago"
msgstr "1 ano atrás"
@@ -5201,5 +5391,9 @@ msgid "Sorry, no incoming email allowed."
msgstr "Desculpe-me, mas não é permitido o recebimento de emails."
#, fuzzy
+#~ msgid "Unlock this user"
+#~ msgstr "Desbloquear este usuário"
+
+#, fuzzy
#~ msgid "These people are subscribed to you: "
#~ msgstr "Assinantes de %s"
diff --git a/locale/ru/LC_MESSAGES/statusnet.po b/locale/ru/LC_MESSAGES/statusnet.po
index 99845f550..ce0aae056 100644
--- a/locale/ru/LC_MESSAGES/statusnet.po
+++ b/locale/ru/LC_MESSAGES/statusnet.po
@@ -3,15 +3,18 @@
# Author@translatewiki.net: Lockal
# Author@translatewiki.net: Александр Сигачёв
# --
+# 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-18 19:31+0000\n"
+"POT-Creation-Date: 2009-11-19 10:43+0000\n"
"PO-Revision-Date: 2009-11-18 19:32:36+0000\n"
"Language-Team: Russian\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10< =4 && (n%100<10 or n%100>=20) ? 1 : 2);\n"
"X-Generator: MediaWiki 1.16alpha(r59207); Translate extension (2009-11-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ru\n"
@@ -145,7 +148,7 @@ msgstr "Не удаётся обновить пользователя."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
-#: actions/designadminpanel.php:125 actions/newnotice.php:94
+#: actions/designadminpanel.php:122 actions/newnotice.php:94
#: lib/designsettings.php:283
#, php-format
msgid ""
@@ -231,7 +234,7 @@ msgstr "Все прямые сообщения посланные для %s"
#: 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:184 actions/apigroupismember.php:114
+#: 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
@@ -301,81 +304,67 @@ msgstr "Не удаётся определить исходного пользо
msgid "Could not find target user."
msgstr "Не удаётся найти целевого пользователя."
-#: actions/apigroupcreate.php:136 actions/newgroup.php:204
-msgid "Could not create group."
-msgstr "Не удаётся создать группу."
-
-#: actions/apigroupcreate.php:147 actions/editgroup.php:259
-#: actions/newgroup.php:210
-#, fuzzy
-msgid "Could not create aliases."
-msgstr "Не удаётся создать любимую запись."
-
-#: actions/apigroupcreate.php:166 actions/newgroup.php:224
-msgid "Could not set group membership."
-msgstr "Не удаётся назначить членство в группе."
-
-#: actions/apigroupcreate.php:212 actions/editgroup.php:182
+#: actions/apigroupcreate.php:164 actions/editgroup.php:182
#: actions/newgroup.php:126 actions/profilesettings.php:208
#: actions/register.php:205
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr ""
"Имя должно состоять только из прописных букв и цифр и не иметь пробелов."
-#: actions/apigroupcreate.php:221 actions/editgroup.php:186
+#: 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 "Такое имя уже используется. Попробуйте какое-нибудь другое."
-#: actions/apigroupcreate.php:228 actions/editgroup.php:189
+#: 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 "Неверное имя."
-#: actions/apigroupcreate.php:244 actions/editgroup.php:195
+#: 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 "URL Главной страницы неверен."
-#: actions/apigroupcreate.php:253 actions/editgroup.php:198
+#: 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 "Полное имя слишком длинное (не больше 255 знаков)."
-#: actions/apigroupcreate.php:261
+#: actions/apigroupcreate.php:213
#, php-format
msgid "Description is too long (max %d chars)."
msgstr "Слишком длинное описание (максимум %d символов)"
-#: actions/apigroupcreate.php:272 actions/editgroup.php:204
+#: 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 "Слишком длинное месторасположение (максимум 255 знаков)."
-#: actions/apigroupcreate.php:291 actions/editgroup.php:215
+#: actions/apigroupcreate.php:243 actions/editgroup.php:215
#: actions/newgroup.php:159
#, php-format
msgid "Too many aliases! Maximum %d."
msgstr ""
-#: actions/apigroupcreate.php:312 actions/editgroup.php:224
+#: actions/apigroupcreate.php:264 actions/editgroup.php:224
#: actions/newgroup.php:168
#, fuzzy, php-format
msgid "Invalid alias: \"%s\""
msgstr "Неверный тег: \"%s\""
-#: actions/apigroupcreate.php:321 actions/editgroup.php:228
+#: actions/apigroupcreate.php:273 actions/editgroup.php:228
#: actions/newgroup.php:172
#, fuzzy, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr "Такое имя уже используется. Попробуйте какое-нибудь другое."
-#: actions/apigroupcreate.php:334 actions/editgroup.php:234
+#: actions/apigroupcreate.php:286 actions/editgroup.php:234
#: actions/newgroup.php:178
msgid "Alias can't be the same as nickname."
msgstr ""
@@ -598,10 +587,10 @@ msgstr "Обрезать"
msgid "There was a problem with your session token. Try again, please."
msgstr "Проблема с Вашей сессией. Попробуйте ещё раз, пожалуйста."
-#: actions/avatarsettings.php:277 actions/emailsettings.php:255
-#: actions/grouplogo.php:319 actions/imsettings.php:220
-#: actions/recoverpassword.php:44 actions/smssettings.php:248
-#: lib/designsettings.php:304
+#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
+#: actions/emailsettings.php:255 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/recoverpassword.php:44
+#: actions/smssettings.php:248 lib/designsettings.php:304
msgid "Unexpected form submission."
msgstr "Нетиповое подтверждение формы."
@@ -662,7 +651,7 @@ msgstr "Разблокировать пользователя в группе."
msgid "Unblock"
msgstr "Разблокировать"
-#: actions/blockedfromgroup.php:313
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:80
msgid "Unblock this user"
msgstr "Разблокировать пользователя."
@@ -835,7 +824,7 @@ msgid "Delete this user"
msgstr "Удалить эту запись"
#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124
-#: lib/adminpanelaction.php:275 lib/groupnav.php:119
+#: lib/adminpanelaction.php:302 lib/groupnav.php:119
msgid "Design"
msgstr ""
@@ -843,104 +832,182 @@ msgstr ""
msgid "Design settings for this StatusNet site."
msgstr ""
-#: actions/designadminpanel.php:220
+#: actions/designadminpanel.php:278
#, fuzzy
-msgid "Unable to delete design setting."
-msgstr "Не удаётся сохранить Ваши установки по Твиттеру!"
+msgid "Invalid logo URL."
+msgstr "Неверный размер."
-#: actions/designadminpanel.php:301
+#: actions/designadminpanel.php:282
#, fuzzy, php-format
msgid "Theme not available: %s"
msgstr "Страница недоступна для того типа, который Вы задействовали."
-#: actions/designadminpanel.php:406
+#: actions/designadminpanel.php:288
+#, fuzzy, php-format
+msgid "Theme directory not readable: %s"
+msgstr "Страница недоступна для того типа, который Вы задействовали."
+
+#: actions/designadminpanel.php:292
+#, php-format
+msgid "Avatar directory not writable: %s"
+msgstr ""
+
+#: actions/designadminpanel.php:296
+#, php-format
+msgid "Background directory not writable: %s"
+msgstr ""
+
+#: actions/designadminpanel.php:312
+#, php-format
+msgid "Max length for %s %s is 255 characters."
+msgstr ""
+
+#: actions/designadminpanel.php:412
+#, fuzzy
+msgid "Change logo"
+msgstr "Изменение цветовой гаммы"
+
+#: actions/designadminpanel.php:417
+#, fuzzy
+msgid "Site logo"
+msgstr "Пригласить"
+
+#: actions/designadminpanel.php:424
#, fuzzy
msgid "Change theme"
msgstr "Изменить"
-#: actions/designadminpanel.php:410
-msgid "Theme"
-msgstr ""
+#: actions/designadminpanel.php:441
+#, fuzzy
+msgid "Site theme"
+msgstr "Новая запись"
-#: actions/designadminpanel.php:411
+#: actions/designadminpanel.php:442
#, fuzzy
msgid "Theme for the site."
msgstr "Выйти"
-#: actions/designadminpanel.php:420 lib/designsettings.php:101
+#: actions/designadminpanel.php:447
+msgid "Theme server"
+msgstr ""
+
+#: actions/designadminpanel.php:451
+msgid "Theme path"
+msgstr ""
+
+#: actions/designadminpanel.php:455
+msgid "Theme directory"
+msgstr ""
+
+#: actions/designadminpanel.php:462
+#, fuzzy
+msgid "Avatar Settings"
+msgstr "Настройки аватара"
+
+#: actions/designadminpanel.php:467
+#, fuzzy
+msgid "Avatar server"
+msgstr "Настройки аватара"
+
+#: actions/designadminpanel.php:471
+#, fuzzy
+msgid "Avatar path"
+msgstr "Аватар обновлён."
+
+#: actions/designadminpanel.php:475
+#, fuzzy
+msgid "Avatar directory"
+msgstr "Аватар удалён."
+
+#: actions/designadminpanel.php:486 lib/designsettings.php:101
msgid "Change background image"
msgstr "Изменение фонового изображения"
-#: actions/designadminpanel.php:424 actions/designadminpanel.php:498
+#: actions/designadminpanel.php:491 actions/designadminpanel.php:578
#: lib/designsettings.php:178
msgid "Background"
msgstr "Фон"
-#: actions/designadminpanel.php:429
+#: actions/designadminpanel.php:496
#, fuzzy, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
"$s."
msgstr "Тут вы можете загрузить логотип для группы."
-#: actions/designadminpanel.php:459 lib/designsettings.php:139
+#: actions/designadminpanel.php:526 lib/designsettings.php:139
msgid "On"
msgstr ""
-#: actions/designadminpanel.php:475 lib/designsettings.php:155
+#: actions/designadminpanel.php:542 lib/designsettings.php:155
msgid "Off"
msgstr ""
-#: actions/designadminpanel.php:476 lib/designsettings.php:156
+#: actions/designadminpanel.php:543 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr ""
-#: actions/designadminpanel.php:481 lib/designsettings.php:161
+#: actions/designadminpanel.php:548 lib/designsettings.php:161
msgid "Tile background image"
msgstr ""
-#: actions/designadminpanel.php:490 lib/designsettings.php:170
+#: actions/designadminpanel.php:554
+#, fuzzy
+msgid "Background server"
+msgstr "Фон"
+
+#: actions/designadminpanel.php:558
+#, fuzzy
+msgid "Background path"
+msgstr "Фон"
+
+#: actions/designadminpanel.php:562
+#, fuzzy
+msgid "Background directory"
+msgstr "Фон"
+
+#: actions/designadminpanel.php:569 lib/designsettings.php:170
msgid "Change colours"
msgstr "Изменение цветовой гаммы"
-#: actions/designadminpanel.php:511 lib/designsettings.php:191
+#: actions/designadminpanel.php:591 lib/designsettings.php:191
msgid "Content"
msgstr "Содержание"
-#: actions/designadminpanel.php:524 lib/designsettings.php:204
+#: actions/designadminpanel.php:604 lib/designsettings.php:204
msgid "Sidebar"
msgstr "Боковая панель"
-#: actions/designadminpanel.php:537 lib/designsettings.php:217
+#: actions/designadminpanel.php:617 lib/designsettings.php:217
msgid "Text"
msgstr "Текст"
-#: actions/designadminpanel.php:550 lib/designsettings.php:230
+#: actions/designadminpanel.php:630 lib/designsettings.php:230
msgid "Links"
msgstr "Ссылки"
-#: actions/designadminpanel.php:611 lib/designsettings.php:247
+#: actions/designadminpanel.php:658 lib/designsettings.php:247
msgid "Use defaults"
msgstr "Использовать значения по умолчанию"
-#: actions/designadminpanel.php:612 lib/designsettings.php:248
+#: actions/designadminpanel.php:659 lib/designsettings.php:248
msgid "Restore default designs"
msgstr ""
-#: actions/designadminpanel.php:618 lib/designsettings.php:254
+#: actions/designadminpanel.php:665 lib/designsettings.php:254
msgid "Reset back to default"
msgstr ""
-#: actions/designadminpanel.php:620 actions/emailsettings.php:195
+#: actions/designadminpanel.php:667 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/profilesettings.php:167 actions/siteadminpanel.php:371
+#: actions/profilesettings.php:167 actions/siteadminpanel.php:414
#: actions/smssettings.php:181 actions/subscriptions.php:203
#: actions/tagother.php:154 actions/useradminpanel.php:226
#: lib/designsettings.php:256 lib/groupeditform.php:202
msgid "Save"
msgstr "Сохранить"
-#: actions/designadminpanel.php:621 lib/designsettings.php:257
+#: actions/designadminpanel.php:668 lib/designsettings.php:257
msgid "Save design"
msgstr ""
@@ -983,6 +1050,11 @@ msgstr "Слишком длинное описание (максимум %d си
msgid "Could not update group."
msgstr "Не удаётся обновить информацию о группе."
+#: actions/editgroup.php:259 classes/User_group.php:390
+#, fuzzy
+msgid "Could not create aliases."
+msgstr "Не удаётся создать любимую запись."
+
#: actions/editgroup.php:269
msgid "Options saved."
msgstr "Настройки сохранены."
@@ -1108,7 +1180,7 @@ msgstr "Нет электронного адреса."
msgid "Cannot normalize that email address"
msgstr "Не удаётся стандартизировать этот электронный адрес"
-#: actions/emailsettings.php:330 actions/siteadminpanel.php:156
+#: actions/emailsettings.php:330 actions/siteadminpanel.php:158
msgid "Not a valid email address"
msgstr "Неверный электронный адрес"
@@ -1839,10 +1911,10 @@ msgstr "Неверный контент записи"
msgid "Incorrect username or password."
msgstr "Некорректное имя или пароль."
-#: actions/login.php:149 actions/recoverpassword.php:375
-#: actions/register.php:248
-msgid "Error setting user."
-msgstr "Ошибка в установках пользователя."
+#: actions/login.php:149
+#, fuzzy
+msgid "Error setting user. You are probably not authorized."
+msgstr "Вы не авторизованы."
#: actions/login.php:204 actions/login.php:257 lib/action.php:457
#: lib/logingroupnav.php:79
@@ -2268,7 +2340,7 @@ msgstr ""
"Теги для самого себя (буквы, цифры, -, ., и _), разделенные запятой или "
"пробелом"
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:275
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:309
msgid "Language"
msgstr "Язык"
@@ -2294,7 +2366,7 @@ msgstr "Автоматически подписываться на всех, к
msgid "Bio is too long (max %d chars)."
msgstr "Слишком длинная биография (максимум %d символов)."
-#: actions/profilesettings.php:228 actions/siteadminpanel.php:163
+#: actions/profilesettings.php:228 actions/siteadminpanel.php:165
msgid "Timezone not selected."
msgstr "Часовой пояс не выбран."
@@ -2542,6 +2614,10 @@ msgstr "Пароль должен быть длиной не менее 6 сим
msgid "Password and confirmation do not match."
msgstr "Пароль и его подтверждение не совпадают."
+#: actions/recoverpassword.php:375 actions/register.php:248
+msgid "Error setting user."
+msgstr "Ошибка в установках пользователя."
+
#: actions/recoverpassword.php:382
msgid "New password successfully saved. You are now logged in."
msgstr "Новый пароль успешно сохранён. Вы авторизовались."
@@ -2610,7 +2686,7 @@ msgid "Same as password above. Required."
msgstr "Тот же пароль что и сверху. Обязательно."
#: actions/register.php:437 actions/register.php:441
-#: actions/siteadminpanel.php:253 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:287 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "Email"
@@ -3073,7 +3149,7 @@ msgstr "Вы не можете послать сообщение этому по
msgid "User is already silenced."
msgstr "Пользователь заблокировал Вас."
-#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:272
+#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:299
#, fuzzy
msgid "Site"
msgstr "Пригласить"
@@ -3082,122 +3158,236 @@ msgstr "Пригласить"
msgid "Basic settings for this StatusNet site."
msgstr ""
-#: actions/siteadminpanel.php:145
+#: actions/siteadminpanel.php:147
msgid "Site name must have non-zero length."
msgstr ""
-#: actions/siteadminpanel.php:153
+#: actions/siteadminpanel.php:155
#, fuzzy
msgid "You must have a valid contact email address"
msgstr "Неверный электронный адрес"
-#: actions/siteadminpanel.php:171
+#: actions/siteadminpanel.php:173
#, php-format
msgid "Unknown language \"%s\""
msgstr ""
-#: actions/siteadminpanel.php:178
+#: actions/siteadminpanel.php:180
msgid "Invalid snapshot report URL."
msgstr ""
-#: actions/siteadminpanel.php:184
+#: actions/siteadminpanel.php:186
msgid "Invalid snapshot run value."
msgstr ""
-#: actions/siteadminpanel.php:190
+#: actions/siteadminpanel.php:192
msgid "Snapshot frequency must be a number."
msgstr ""
-#: actions/siteadminpanel.php:241
+#: actions/siteadminpanel.php:199
+msgid "You must set an SSL sever when enabling SSL."
+msgstr ""
+
+#: actions/siteadminpanel.php:204
+msgid "Invalid SSL server. Max length is 255 characters."
+msgstr ""
+
+#: actions/siteadminpanel.php:210
+msgid "Minimum text limit is 140c."
+msgstr ""
+
+#: actions/siteadminpanel.php:216
+msgid "Dupe limit must 1 or more seconds."
+msgstr ""
+
+#: actions/siteadminpanel.php:224
+#, php-format
+msgid "Locales directory not readable: %s"
+msgstr ""
+
+#: actions/siteadminpanel.php:275
#, fuzzy
msgid "Site name"
msgstr "Новая запись"
-#: actions/siteadminpanel.php:242
+#: actions/siteadminpanel.php:276
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr ""
-#: actions/siteadminpanel.php:245
+#: actions/siteadminpanel.php:279
msgid "Brought by"
msgstr ""
-#: actions/siteadminpanel.php:246
+#: actions/siteadminpanel.php:280
msgid "Text used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:249
+#: actions/siteadminpanel.php:283
msgid "Brought by URL"
msgstr ""
-#: actions/siteadminpanel.php:250
+#: actions/siteadminpanel.php:284
msgid "URL used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:254
+#: actions/siteadminpanel.php:288
#, fuzzy
msgid "contact email address for your site"
msgstr "Новый электронный адрес для постинга %s"
-#: actions/siteadminpanel.php:268
+#: actions/siteadminpanel.php:302
msgid "Default timezone"
msgstr ""
-#: actions/siteadminpanel.php:269
+#: actions/siteadminpanel.php:303
msgid "Default timezone for the site; usually UTC."
msgstr ""
-#: actions/siteadminpanel.php:276
+#: actions/siteadminpanel.php:310
#, fuzzy
msgid "Default site language"
msgstr "Предпочитаемый язык"
-#: actions/siteadminpanel.php:282
+#: actions/siteadminpanel.php:316
+msgid "Path to locales"
+msgstr ""
+
+#: actions/siteadminpanel.php:316
+msgid "Directory path to locales"
+msgstr ""
+
+#: actions/siteadminpanel.php:320
+#, fuzzy
+msgid "Server"
+msgstr "Восстановление"
+
+#: actions/siteadminpanel.php:320
+msgid "Site's server hostname."
+msgstr ""
+
+#: actions/siteadminpanel.php:324
+msgid "Path"
+msgstr ""
+
+#: actions/siteadminpanel.php:324
+#, fuzzy
+msgid "Site path"
+msgstr "Новая запись"
+
+#: actions/siteadminpanel.php:328
+msgid "Fancy URLs"
+msgstr ""
+
+#: actions/siteadminpanel.php:330
+msgid "Use fancy (more readable and memorable) URLs?"
+msgstr ""
+
+#: actions/siteadminpanel.php:334
#, fuzzy
msgid "Private"
msgstr "Пользовательское соглашение"
-#: actions/siteadminpanel.php:284
+#: actions/siteadminpanel.php:336
msgid "Prohibit anonymous users (not logged in) from viewing site?"
msgstr ""
-#: actions/siteadminpanel.php:290
+#: actions/siteadminpanel.php:340
+#, fuzzy
+msgid "Invite only"
+msgstr "Пригласить"
+
+#: actions/siteadminpanel.php:342
+msgid "Make registration invitation only."
+msgstr ""
+
+#: actions/siteadminpanel.php:346 actions/useradminpanel.php:171
+#, fuzzy
+msgid "Closed"
+msgstr "Блокировать"
+
+#: actions/siteadminpanel.php:348
+msgid "Disable new registrations."
+msgstr ""
+
+#: actions/siteadminpanel.php:353
msgid "Randomly during Web hit"
msgstr ""
-#: actions/siteadminpanel.php:291
+#: actions/siteadminpanel.php:354
msgid "In a scheduled job"
msgstr ""
-#: actions/siteadminpanel.php:292
+#: actions/siteadminpanel.php:355 actions/siteadminpanel.php:380
#, fuzzy
msgid "Never"
msgstr "Восстановление"
-#: actions/siteadminpanel.php:294
+#: actions/siteadminpanel.php:357
msgid "Data snapshots"
msgstr ""
-#: actions/siteadminpanel.php:295
+#: actions/siteadminpanel.php:358
msgid "When to send statistical data to status.net servers"
msgstr ""
-#: actions/siteadminpanel.php:301
+#: actions/siteadminpanel.php:364
msgid "Frequency"
msgstr ""
-#: actions/siteadminpanel.php:302
+#: actions/siteadminpanel.php:365
msgid "Snapshots will be sent once every N Web hits"
msgstr ""
-#: actions/siteadminpanel.php:309
+#: actions/siteadminpanel.php:372
msgid "Report URL"
msgstr ""
-#: actions/siteadminpanel.php:310
+#: actions/siteadminpanel.php:373
msgid "Snapshots will be sent to this URL"
msgstr ""
-#: actions/siteadminpanel.php:371 actions/useradminpanel.php:226
+#: actions/siteadminpanel.php:381
+#, fuzzy
+msgid "Sometimes"
+msgstr "Записи"
+
+#: actions/siteadminpanel.php:382
+msgid "Always"
+msgstr ""
+
+#: actions/siteadminpanel.php:384
+msgid "Use SSL"
+msgstr ""
+
+#: actions/siteadminpanel.php:385
+msgid "When to use SSL"
+msgstr ""
+
+#: actions/siteadminpanel.php:391
+msgid "SSL Server"
+msgstr ""
+
+#: actions/siteadminpanel.php:392
+msgid "Server to direct SSL requests to"
+msgstr ""
+
+#: actions/siteadminpanel.php:396
+msgid "Text limit"
+msgstr ""
+
+#: actions/siteadminpanel.php:396
+msgid "Maximum number of characters for notices."
+msgstr ""
+
+#: actions/siteadminpanel.php:400
+msgid "Dupe limit"
+msgstr ""
+
+#: actions/siteadminpanel.php:400
+msgid "How long users must wait (in seconds) to post the same thing again."
+msgstr ""
+
+#: actions/siteadminpanel.php:414 actions/useradminpanel.php:226
#, fuzzy
msgid "Save site settings"
msgstr "Настройки аватара"
@@ -3515,11 +3705,6 @@ msgstr "Пользователь"
msgid "User settings for this StatusNet site."
msgstr ""
-#: actions/useradminpanel.php:171
-#, fuzzy
-msgid "Closed"
-msgstr "Блокировать"
-
#: actions/useradminpanel.php:173
msgid "Is registration on this site prohibited?"
msgstr ""
@@ -3750,6 +3935,14 @@ msgstr "Проблемы с сохранением записи."
msgid "DB error inserting reply: %s"
msgstr "Ошибка баз данных при вставке ответа для %s"
+#: classes/User_group.php:380
+msgid "Could not create group."
+msgstr "Не удаётся создать группу."
+
+#: classes/User_group.php:409
+msgid "Could not set group membership."
+msgstr "Не удаётся назначить членство в группе."
+
#: classes/User.php:347
#, fuzzy, php-format
msgid "Welcome to %1$s, @%2$s!"
@@ -3990,12 +4183,17 @@ msgstr "Команда ещё не выполнена."
msgid "saveSettings() not implemented."
msgstr "Команда ещё не выполнена."
-#: lib/adminpanelaction.php:273
+#: lib/adminpanelaction.php:247
+#, fuzzy
+msgid "Unable to delete design setting."
+msgstr "Не удаётся сохранить Ваши установки по Твиттеру!"
+
+#: lib/adminpanelaction.php:300
#, fuzzy
msgid "Basic site configuration"
msgstr "Подтверждение электронного адреса"
-#: lib/adminpanelaction.php:276
+#: lib/adminpanelaction.php:303
#, fuzzy
msgid "Design configuration"
msgstr "Подтверждение СМС"
@@ -4243,20 +4441,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:203
+#: lib/common.php:199
#, fuzzy
msgid "No configuration file found. "
msgstr "Нет кода подтверждения."
-#: lib/common.php:204
+#: lib/common.php:200
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:205
+#: lib/common.php:201
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:206
+#: lib/common.php:202
#, fuzzy
msgid "Go to the installer."
msgstr "Войти"
@@ -5025,11 +5223,6 @@ msgstr "Нет тэгов"
msgid "Top posters"
msgstr "Самые активные"
-#: lib/unblockform.php:80
-#, fuzzy
-msgid "Unlock this user"
-msgstr "Разблокировать пользователя."
-
#: lib/unsandboxform.php:69
msgid "Unsandbox"
msgstr ""
@@ -5081,47 +5274,47 @@ msgstr "Послать приватное сообщение этому поль
msgid "Message"
msgstr "Сообщение"
-#: lib/util.php:821
+#: lib/util.php:826
msgid "a few seconds ago"
msgstr "пару секунд назад"
-#: lib/util.php:823
+#: lib/util.php:828
msgid "about a minute ago"
msgstr "около минуты назад"
-#: lib/util.php:825
+#: lib/util.php:830
#, php-format
msgid "about %d minutes ago"
msgstr "около %d минут(ы) назад"
-#: lib/util.php:827
+#: lib/util.php:832
msgid "about an hour ago"
msgstr "около часа назад"
-#: lib/util.php:829
+#: lib/util.php:834
#, php-format
msgid "about %d hours ago"
msgstr "около %d часа(ов) назад"
-#: lib/util.php:831
+#: lib/util.php:836
msgid "about a day ago"
msgstr "около дня назад"
-#: lib/util.php:833
+#: lib/util.php:838
#, php-format
msgid "about %d days ago"
msgstr "около %d дня(ей) назад"
-#: lib/util.php:835
+#: lib/util.php:840
msgid "about a month ago"
msgstr "около месяца назад"
-#: lib/util.php:837
+#: lib/util.php:842
#, php-format
msgid "about %d months ago"
msgstr "около %d месяца(ев) назад"
-#: lib/util.php:839
+#: lib/util.php:844
msgid "about a year ago"
msgstr "около года назад"
@@ -5152,5 +5345,9 @@ msgid "Sorry, no incoming email allowed."
msgstr "Простите, входящих писем нет."
#, fuzzy
+#~ msgid "Unlock this user"
+#~ msgstr "Разблокировать пользователя."
+
+#, fuzzy
#~ msgid "These people are subscribed to you: "
#~ msgstr "Люди подписанные на %s"
diff --git a/locale/statusnet.po b/locale/statusnet.po
index 925808159..d65222eb1 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-18 19:31+0000\n"
+"POT-Creation-Date: 2009-11-19 10:43+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"
@@ -143,7 +143,7 @@ msgstr ""
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
-#: actions/designadminpanel.php:125 actions/newnotice.php:94
+#: actions/designadminpanel.php:122 actions/newnotice.php:94
#: lib/designsettings.php:283
#, php-format
msgid ""
@@ -224,7 +224,7 @@ msgstr ""
#: 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:184 actions/apigroupismember.php:114
+#: 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
@@ -288,79 +288,66 @@ msgstr ""
msgid "Could not find target user."
msgstr ""
-#: actions/apigroupcreate.php:136 actions/newgroup.php:204
-msgid "Could not create group."
-msgstr ""
-
-#: actions/apigroupcreate.php:147 actions/editgroup.php:259
-#: actions/newgroup.php:210
-msgid "Could not create aliases."
-msgstr ""
-
-#: actions/apigroupcreate.php:166 actions/newgroup.php:224
-msgid "Could not set group membership."
-msgstr ""
-
-#: actions/apigroupcreate.php:212 actions/editgroup.php:182
+#: actions/apigroupcreate.php:164 actions/editgroup.php:182
#: actions/newgroup.php:126 actions/profilesettings.php:208
#: actions/register.php:205
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr ""
-#: actions/apigroupcreate.php:221 actions/editgroup.php:186
+#: 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 ""
-#: actions/apigroupcreate.php:228 actions/editgroup.php:189
+#: 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 ""
-#: actions/apigroupcreate.php:244 actions/editgroup.php:195
+#: 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 ""
-#: actions/apigroupcreate.php:253 actions/editgroup.php:198
+#: 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 ""
-#: actions/apigroupcreate.php:261
+#: actions/apigroupcreate.php:213
#, php-format
msgid "Description is too long (max %d chars)."
msgstr ""
-#: actions/apigroupcreate.php:272 actions/editgroup.php:204
+#: 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 ""
-#: actions/apigroupcreate.php:291 actions/editgroup.php:215
+#: actions/apigroupcreate.php:243 actions/editgroup.php:215
#: actions/newgroup.php:159
#, php-format
msgid "Too many aliases! Maximum %d."
msgstr ""
-#: actions/apigroupcreate.php:312 actions/editgroup.php:224
+#: actions/apigroupcreate.php:264 actions/editgroup.php:224
#: actions/newgroup.php:168
#, php-format
msgid "Invalid alias: \"%s\""
msgstr ""
-#: actions/apigroupcreate.php:321 actions/editgroup.php:228
+#: actions/apigroupcreate.php:273 actions/editgroup.php:228
#: actions/newgroup.php:172
#, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr ""
-#: actions/apigroupcreate.php:334 actions/editgroup.php:234
+#: actions/apigroupcreate.php:286 actions/editgroup.php:234
#: actions/newgroup.php:178
msgid "Alias can't be the same as nickname."
msgstr ""
@@ -579,10 +566,10 @@ msgstr ""
msgid "There was a problem with your session token. Try again, please."
msgstr ""
-#: actions/avatarsettings.php:277 actions/emailsettings.php:255
-#: actions/grouplogo.php:319 actions/imsettings.php:220
-#: actions/recoverpassword.php:44 actions/smssettings.php:248
-#: lib/designsettings.php:304
+#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
+#: actions/emailsettings.php:255 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/recoverpassword.php:44
+#: actions/smssettings.php:248 lib/designsettings.php:304
msgid "Unexpected form submission."
msgstr ""
@@ -642,7 +629,7 @@ msgstr ""
msgid "Unblock"
msgstr ""
-#: actions/blockedfromgroup.php:313
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:80
msgid "Unblock this user"
msgstr ""
@@ -805,7 +792,7 @@ msgid "Delete this user"
msgstr ""
#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124
-#: lib/adminpanelaction.php:275 lib/groupnav.php:119
+#: lib/adminpanelaction.php:302 lib/groupnav.php:119
msgid "Design"
msgstr ""
@@ -813,101 +800,169 @@ msgstr ""
msgid "Design settings for this StatusNet site."
msgstr ""
-#: actions/designadminpanel.php:220
-msgid "Unable to delete design setting."
+#: actions/designadminpanel.php:278
+msgid "Invalid logo URL."
msgstr ""
-#: actions/designadminpanel.php:301
+#: actions/designadminpanel.php:282
#, php-format
msgid "Theme not available: %s"
msgstr ""
-#: actions/designadminpanel.php:406
+#: actions/designadminpanel.php:288
+#, php-format
+msgid "Theme directory not readable: %s"
+msgstr ""
+
+#: actions/designadminpanel.php:292
+#, php-format
+msgid "Avatar directory not writable: %s"
+msgstr ""
+
+#: actions/designadminpanel.php:296
+#, php-format
+msgid "Background directory not writable: %s"
+msgstr ""
+
+#: actions/designadminpanel.php:312
+#, php-format
+msgid "Max length for %s %s is 255 characters."
+msgstr ""
+
+#: actions/designadminpanel.php:412
+msgid "Change logo"
+msgstr ""
+
+#: actions/designadminpanel.php:417
+msgid "Site logo"
+msgstr ""
+
+#: actions/designadminpanel.php:424
msgid "Change theme"
msgstr ""
-#: actions/designadminpanel.php:410
-msgid "Theme"
+#: actions/designadminpanel.php:441
+msgid "Site theme"
msgstr ""
-#: actions/designadminpanel.php:411
+#: actions/designadminpanel.php:442
msgid "Theme for the site."
msgstr ""
-#: actions/designadminpanel.php:420 lib/designsettings.php:101
+#: actions/designadminpanel.php:447
+msgid "Theme server"
+msgstr ""
+
+#: actions/designadminpanel.php:451
+msgid "Theme path"
+msgstr ""
+
+#: actions/designadminpanel.php:455
+msgid "Theme directory"
+msgstr ""
+
+#: actions/designadminpanel.php:462
+msgid "Avatar Settings"
+msgstr ""
+
+#: actions/designadminpanel.php:467
+msgid "Avatar server"
+msgstr ""
+
+#: actions/designadminpanel.php:471
+msgid "Avatar path"
+msgstr ""
+
+#: actions/designadminpanel.php:475
+msgid "Avatar directory"
+msgstr ""
+
+#: actions/designadminpanel.php:486 lib/designsettings.php:101
msgid "Change background image"
msgstr ""
-#: actions/designadminpanel.php:424 actions/designadminpanel.php:498
+#: actions/designadminpanel.php:491 actions/designadminpanel.php:578
#: lib/designsettings.php:178
msgid "Background"
msgstr ""
-#: actions/designadminpanel.php:429
+#: actions/designadminpanel.php:496
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
"$s."
msgstr ""
-#: actions/designadminpanel.php:459 lib/designsettings.php:139
+#: actions/designadminpanel.php:526 lib/designsettings.php:139
msgid "On"
msgstr ""
-#: actions/designadminpanel.php:475 lib/designsettings.php:155
+#: actions/designadminpanel.php:542 lib/designsettings.php:155
msgid "Off"
msgstr ""
-#: actions/designadminpanel.php:476 lib/designsettings.php:156
+#: actions/designadminpanel.php:543 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr ""
-#: actions/designadminpanel.php:481 lib/designsettings.php:161
+#: actions/designadminpanel.php:548 lib/designsettings.php:161
msgid "Tile background image"
msgstr ""
-#: actions/designadminpanel.php:490 lib/designsettings.php:170
+#: actions/designadminpanel.php:554
+msgid "Background server"
+msgstr ""
+
+#: actions/designadminpanel.php:558
+msgid "Background path"
+msgstr ""
+
+#: actions/designadminpanel.php:562
+msgid "Background directory"
+msgstr ""
+
+#: actions/designadminpanel.php:569 lib/designsettings.php:170
msgid "Change colours"
msgstr ""
-#: actions/designadminpanel.php:511 lib/designsettings.php:191
+#: actions/designadminpanel.php:591 lib/designsettings.php:191
msgid "Content"
msgstr ""
-#: actions/designadminpanel.php:524 lib/designsettings.php:204
+#: actions/designadminpanel.php:604 lib/designsettings.php:204
msgid "Sidebar"
msgstr ""
-#: actions/designadminpanel.php:537 lib/designsettings.php:217
+#: actions/designadminpanel.php:617 lib/designsettings.php:217
msgid "Text"
msgstr ""
-#: actions/designadminpanel.php:550 lib/designsettings.php:230
+#: actions/designadminpanel.php:630 lib/designsettings.php:230
msgid "Links"
msgstr ""
-#: actions/designadminpanel.php:611 lib/designsettings.php:247
+#: actions/designadminpanel.php:658 lib/designsettings.php:247
msgid "Use defaults"
msgstr ""
-#: actions/designadminpanel.php:612 lib/designsettings.php:248
+#: actions/designadminpanel.php:659 lib/designsettings.php:248
msgid "Restore default designs"
msgstr ""
-#: actions/designadminpanel.php:618 lib/designsettings.php:254
+#: actions/designadminpanel.php:665 lib/designsettings.php:254
msgid "Reset back to default"
msgstr ""
-#: actions/designadminpanel.php:620 actions/emailsettings.php:195
+#: actions/designadminpanel.php:667 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/profilesettings.php:167 actions/siteadminpanel.php:371
+#: actions/profilesettings.php:167 actions/siteadminpanel.php:414
#: actions/smssettings.php:181 actions/subscriptions.php:203
#: actions/tagother.php:154 actions/useradminpanel.php:226
#: lib/designsettings.php:256 lib/groupeditform.php:202
msgid "Save"
msgstr ""
-#: actions/designadminpanel.php:621 lib/designsettings.php:257
+#: actions/designadminpanel.php:668 lib/designsettings.php:257
msgid "Save design"
msgstr ""
@@ -950,6 +1005,10 @@ msgstr ""
msgid "Could not update group."
msgstr ""
+#: actions/editgroup.php:259 classes/User_group.php:390
+msgid "Could not create aliases."
+msgstr ""
+
#: actions/editgroup.php:269
msgid "Options saved."
msgstr ""
@@ -1064,7 +1123,7 @@ msgstr ""
msgid "Cannot normalize that email address"
msgstr ""
-#: actions/emailsettings.php:330 actions/siteadminpanel.php:156
+#: actions/emailsettings.php:330 actions/siteadminpanel.php:158
msgid "Not a valid email address"
msgstr ""
@@ -1724,9 +1783,8 @@ msgstr ""
msgid "Incorrect username or password."
msgstr ""
-#: actions/login.php:149 actions/recoverpassword.php:375
-#: actions/register.php:248
-msgid "Error setting user."
+#: actions/login.php:149
+msgid "Error setting user. You are probably not authorized."
msgstr ""
#: actions/login.php:204 actions/login.php:257 lib/action.php:457
@@ -2135,7 +2193,7 @@ msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:275
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:309
msgid "Language"
msgstr ""
@@ -2161,7 +2219,7 @@ msgstr ""
msgid "Bio is too long (max %d chars)."
msgstr ""
-#: actions/profilesettings.php:228 actions/siteadminpanel.php:163
+#: actions/profilesettings.php:228 actions/siteadminpanel.php:165
msgid "Timezone not selected."
msgstr ""
@@ -2399,6 +2457,10 @@ msgstr ""
msgid "Password and confirmation do not match."
msgstr ""
+#: actions/recoverpassword.php:375 actions/register.php:248
+msgid "Error setting user."
+msgstr ""
+
#: actions/recoverpassword.php:382
msgid "New password successfully saved. You are now logged in."
msgstr ""
@@ -2459,7 +2521,7 @@ msgid "Same as password above. Required."
msgstr ""
#: actions/register.php:437 actions/register.php:441
-#: actions/siteadminpanel.php:253 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:287 lib/accountsettingsaction.php:120
msgid "Email"
msgstr ""
@@ -2870,7 +2932,7 @@ msgstr ""
msgid "User is already silenced."
msgstr ""
-#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:272
+#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:299
msgid "Site"
msgstr ""
@@ -2878,116 +2940,225 @@ msgstr ""
msgid "Basic settings for this StatusNet site."
msgstr ""
-#: actions/siteadminpanel.php:145
+#: actions/siteadminpanel.php:147
msgid "Site name must have non-zero length."
msgstr ""
-#: actions/siteadminpanel.php:153
+#: actions/siteadminpanel.php:155
msgid "You must have a valid contact email address"
msgstr ""
-#: actions/siteadminpanel.php:171
+#: actions/siteadminpanel.php:173
#, php-format
msgid "Unknown language \"%s\""
msgstr ""
-#: actions/siteadminpanel.php:178
+#: actions/siteadminpanel.php:180
msgid "Invalid snapshot report URL."
msgstr ""
-#: actions/siteadminpanel.php:184
+#: actions/siteadminpanel.php:186
msgid "Invalid snapshot run value."
msgstr ""
-#: actions/siteadminpanel.php:190
+#: actions/siteadminpanel.php:192
msgid "Snapshot frequency must be a number."
msgstr ""
-#: actions/siteadminpanel.php:241
+#: actions/siteadminpanel.php:199
+msgid "You must set an SSL sever when enabling SSL."
+msgstr ""
+
+#: actions/siteadminpanel.php:204
+msgid "Invalid SSL server. Max length is 255 characters."
+msgstr ""
+
+#: actions/siteadminpanel.php:210
+msgid "Minimum text limit is 140c."
+msgstr ""
+
+#: actions/siteadminpanel.php:216
+msgid "Dupe limit must 1 or more seconds."
+msgstr ""
+
+#: actions/siteadminpanel.php:224
+#, php-format
+msgid "Locales directory not readable: %s"
+msgstr ""
+
+#: actions/siteadminpanel.php:275
msgid "Site name"
msgstr ""
-#: actions/siteadminpanel.php:242
+#: actions/siteadminpanel.php:276
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr ""
-#: actions/siteadminpanel.php:245
+#: actions/siteadminpanel.php:279
msgid "Brought by"
msgstr ""
-#: actions/siteadminpanel.php:246
+#: actions/siteadminpanel.php:280
msgid "Text used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:249
+#: actions/siteadminpanel.php:283
msgid "Brought by URL"
msgstr ""
-#: actions/siteadminpanel.php:250
+#: actions/siteadminpanel.php:284
msgid "URL used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:254
+#: actions/siteadminpanel.php:288
msgid "contact email address for your site"
msgstr ""
-#: actions/siteadminpanel.php:268
+#: actions/siteadminpanel.php:302
msgid "Default timezone"
msgstr ""
-#: actions/siteadminpanel.php:269
+#: actions/siteadminpanel.php:303
msgid "Default timezone for the site; usually UTC."
msgstr ""
-#: actions/siteadminpanel.php:276
+#: actions/siteadminpanel.php:310
msgid "Default site language"
msgstr ""
-#: actions/siteadminpanel.php:282
+#: actions/siteadminpanel.php:316
+msgid "Path to locales"
+msgstr ""
+
+#: actions/siteadminpanel.php:316
+msgid "Directory path to locales"
+msgstr ""
+
+#: actions/siteadminpanel.php:320
+msgid "Server"
+msgstr ""
+
+#: actions/siteadminpanel.php:320
+msgid "Site's server hostname."
+msgstr ""
+
+#: actions/siteadminpanel.php:324
+msgid "Path"
+msgstr ""
+
+#: actions/siteadminpanel.php:324
+msgid "Site path"
+msgstr ""
+
+#: actions/siteadminpanel.php:328
+msgid "Fancy URLs"
+msgstr ""
+
+#: actions/siteadminpanel.php:330
+msgid "Use fancy (more readable and memorable) URLs?"
+msgstr ""
+
+#: actions/siteadminpanel.php:334
msgid "Private"
msgstr ""
-#: actions/siteadminpanel.php:284
+#: actions/siteadminpanel.php:336
msgid "Prohibit anonymous users (not logged in) from viewing site?"
msgstr ""
-#: actions/siteadminpanel.php:290
+#: actions/siteadminpanel.php:340
+msgid "Invite only"
+msgstr ""
+
+#: actions/siteadminpanel.php:342
+msgid "Make registration invitation only."
+msgstr ""
+
+#: actions/siteadminpanel.php:346 actions/useradminpanel.php:171
+msgid "Closed"
+msgstr ""
+
+#: actions/siteadminpanel.php:348
+msgid "Disable new registrations."
+msgstr ""
+
+#: actions/siteadminpanel.php:353
msgid "Randomly during Web hit"
msgstr ""
-#: actions/siteadminpanel.php:291
+#: actions/siteadminpanel.php:354
msgid "In a scheduled job"
msgstr ""
-#: actions/siteadminpanel.php:292
+#: actions/siteadminpanel.php:355 actions/siteadminpanel.php:380
msgid "Never"
msgstr ""
-#: actions/siteadminpanel.php:294
+#: actions/siteadminpanel.php:357
msgid "Data snapshots"
msgstr ""
-#: actions/siteadminpanel.php:295
+#: actions/siteadminpanel.php:358
msgid "When to send statistical data to status.net servers"
msgstr ""
-#: actions/siteadminpanel.php:301
+#: actions/siteadminpanel.php:364
msgid "Frequency"
msgstr ""
-#: actions/siteadminpanel.php:302
+#: actions/siteadminpanel.php:365
msgid "Snapshots will be sent once every N Web hits"
msgstr ""
-#: actions/siteadminpanel.php:309
+#: actions/siteadminpanel.php:372
msgid "Report URL"
msgstr ""
-#: actions/siteadminpanel.php:310
+#: actions/siteadminpanel.php:373
msgid "Snapshots will be sent to this URL"
msgstr ""
-#: actions/siteadminpanel.php:371 actions/useradminpanel.php:226
+#: actions/siteadminpanel.php:381
+msgid "Sometimes"
+msgstr ""
+
+#: actions/siteadminpanel.php:382
+msgid "Always"
+msgstr ""
+
+#: actions/siteadminpanel.php:384
+msgid "Use SSL"
+msgstr ""
+
+#: actions/siteadminpanel.php:385
+msgid "When to use SSL"
+msgstr ""
+
+#: actions/siteadminpanel.php:391
+msgid "SSL Server"
+msgstr ""
+
+#: actions/siteadminpanel.php:392
+msgid "Server to direct SSL requests to"
+msgstr ""
+
+#: actions/siteadminpanel.php:396
+msgid "Text limit"
+msgstr ""
+
+#: actions/siteadminpanel.php:396
+msgid "Maximum number of characters for notices."
+msgstr ""
+
+#: actions/siteadminpanel.php:400
+msgid "Dupe limit"
+msgstr ""
+
+#: actions/siteadminpanel.php:400
+msgid "How long users must wait (in seconds) to post the same thing again."
+msgstr ""
+
+#: actions/siteadminpanel.php:414 actions/useradminpanel.php:226
msgid "Save site settings"
msgstr ""
@@ -3287,10 +3458,6 @@ msgstr ""
msgid "User settings for this StatusNet site."
msgstr ""
-#: actions/useradminpanel.php:171
-msgid "Closed"
-msgstr ""
-
#: actions/useradminpanel.php:173
msgid "Is registration on this site prohibited?"
msgstr ""
@@ -3499,6 +3666,14 @@ msgstr ""
msgid "DB error inserting reply: %s"
msgstr ""
+#: classes/User_group.php:380
+msgid "Could not create group."
+msgstr ""
+
+#: classes/User_group.php:409
+msgid "Could not set group membership."
+msgstr ""
+
#: classes/User.php:347
#, php-format
msgid "Welcome to %1$s, @%2$s!"
@@ -3726,11 +3901,15 @@ msgstr ""
msgid "saveSettings() not implemented."
msgstr ""
-#: lib/adminpanelaction.php:273
+#: lib/adminpanelaction.php:247
+msgid "Unable to delete design setting."
+msgstr ""
+
+#: lib/adminpanelaction.php:300
msgid "Basic site configuration"
msgstr ""
-#: lib/adminpanelaction.php:276
+#: lib/adminpanelaction.php:303
msgid "Design configuration"
msgstr ""
@@ -3969,19 +4148,19 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:203
+#: lib/common.php:199
msgid "No configuration file found. "
msgstr ""
-#: lib/common.php:204
+#: lib/common.php:200
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:205
+#: lib/common.php:201
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:206
+#: lib/common.php:202
msgid "Go to the installer."
msgstr ""
@@ -4721,10 +4900,6 @@ msgstr ""
msgid "Top posters"
msgstr ""
-#: lib/unblockform.php:80
-msgid "Unlock this user"
-msgstr ""
-
#: lib/unsandboxform.php:69
msgid "Unsandbox"
msgstr ""
@@ -4773,47 +4948,47 @@ msgstr ""
msgid "Message"
msgstr ""
-#: lib/util.php:821
+#: lib/util.php:826
msgid "a few seconds ago"
msgstr ""
-#: lib/util.php:823
+#: lib/util.php:828
msgid "about a minute ago"
msgstr ""
-#: lib/util.php:825
+#: lib/util.php:830
#, php-format
msgid "about %d minutes ago"
msgstr ""
-#: lib/util.php:827
+#: lib/util.php:832
msgid "about an hour ago"
msgstr ""
-#: lib/util.php:829
+#: lib/util.php:834
#, php-format
msgid "about %d hours ago"
msgstr ""
-#: lib/util.php:831
+#: lib/util.php:836
msgid "about a day ago"
msgstr ""
-#: lib/util.php:833
+#: lib/util.php:838
#, php-format
msgid "about %d days ago"
msgstr ""
-#: lib/util.php:835
+#: lib/util.php:840
msgid "about a month ago"
msgstr ""
-#: lib/util.php:837
+#: lib/util.php:842
#, php-format
msgid "about %d months ago"
msgstr ""
-#: lib/util.php:839
+#: lib/util.php:844
msgid "about a year ago"
msgstr ""
diff --git a/locale/sv/LC_MESSAGES/statusnet.po b/locale/sv/LC_MESSAGES/statusnet.po
index 45732d233..ce932a624 100644
--- a/locale/sv/LC_MESSAGES/statusnet.po
+++ b/locale/sv/LC_MESSAGES/statusnet.po
@@ -1,15 +1,18 @@
# Translation of StatusNet to Swedish
#
# --
+# 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-18 19:31+0000\n"
+"POT-Creation-Date: 2009-11-19 10:43+0000\n"
"PO-Revision-Date: 2009-11-18 19:32:39+0000\n"
"Language-Team: Swedish\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: MediaWiki 1.16alpha(r59207); Translate extension (2009-11-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: sv\n"
@@ -145,7 +148,7 @@ msgstr "Kunde inte uppdatera användare."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
-#: actions/designadminpanel.php:125 actions/newnotice.php:94
+#: actions/designadminpanel.php:122 actions/newnotice.php:94
#: lib/designsettings.php:283
#, php-format
msgid ""
@@ -230,7 +233,7 @@ msgstr "Alla direktmeddelanden skickade till %s"
#: 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:184 actions/apigroupismember.php:114
+#: 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
@@ -299,83 +302,67 @@ msgstr "Kunde inte ta emot favoritinläggen."
msgid "Could not find target user."
msgstr "Kunde inte få fram status."
-#: actions/apigroupcreate.php:136 actions/newgroup.php:204
-#, fuzzy
-msgid "Could not create group."
-msgstr "Kunde inte skapa favorit."
-
-#: actions/apigroupcreate.php:147 actions/editgroup.php:259
-#: actions/newgroup.php:210
-#, fuzzy
-msgid "Could not create aliases."
-msgstr "Kunde inte skapa favorit."
-
-#: actions/apigroupcreate.php:166 actions/newgroup.php:224
-#, fuzzy
-msgid "Could not set group membership."
-msgstr "Kunde inte skapa prenumeration."
-
-#: actions/apigroupcreate.php:212 actions/editgroup.php:182
+#: actions/apigroupcreate.php:164 actions/editgroup.php:182
#: actions/newgroup.php:126 actions/profilesettings.php:208
#: actions/register.php:205
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr ""
"Smeknamnet får endast innehålla små bokstäver eller siffror, inga mellanslag."
-#: actions/apigroupcreate.php:221 actions/editgroup.php:186
+#: 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 "Användarnamnet används redan, försök med ett annat."
-#: actions/apigroupcreate.php:228 actions/editgroup.php:189
+#: 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 "Det är inget giltigt användarnamn."
-#: actions/apigroupcreate.php:244 actions/editgroup.php:195
+#: 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 "Hemsidan har ingen giltig URL"
-#: actions/apigroupcreate.php:253 actions/editgroup.php:198
+#: 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 "Ditt namn är för långt (max 255 tecken)."
-#: actions/apigroupcreate.php:261
+#: actions/apigroupcreate.php:213
#, fuzzy, php-format
msgid "Description is too long (max %d chars)."
msgstr "Biografin är för lång (max 140 tecken)"
-#: actions/apigroupcreate.php:272 actions/editgroup.php:204
+#: 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 "Platse är för lång (max 255 tecken)."
-#: actions/apigroupcreate.php:291 actions/editgroup.php:215
+#: actions/apigroupcreate.php:243 actions/editgroup.php:215
#: actions/newgroup.php:159
#, php-format
msgid "Too many aliases! Maximum %d."
msgstr ""
-#: actions/apigroupcreate.php:312 actions/editgroup.php:224
+#: actions/apigroupcreate.php:264 actions/editgroup.php:224
#: actions/newgroup.php:168
#, fuzzy, php-format
msgid "Invalid alias: \"%s\""
msgstr "Ogiltig hemsideadress '%s'"
-#: actions/apigroupcreate.php:321 actions/editgroup.php:228
+#: actions/apigroupcreate.php:273 actions/editgroup.php:228
#: actions/newgroup.php:172
#, fuzzy, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr "Användarnamnet används redan, försök med ett annat."
-#: actions/apigroupcreate.php:334 actions/editgroup.php:234
+#: actions/apigroupcreate.php:286 actions/editgroup.php:234
#: actions/newgroup.php:178
msgid "Alias can't be the same as nickname."
msgstr ""
@@ -603,10 +590,10 @@ msgstr ""
msgid "There was a problem with your session token. Try again, please."
msgstr "Det var något problem med din session. Försök igen, tack."
-#: actions/avatarsettings.php:277 actions/emailsettings.php:255
-#: actions/grouplogo.php:319 actions/imsettings.php:220
-#: actions/recoverpassword.php:44 actions/smssettings.php:248
-#: lib/designsettings.php:304
+#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
+#: actions/emailsettings.php:255 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/recoverpassword.php:44
+#: actions/smssettings.php:248 lib/designsettings.php:304
msgid "Unexpected form submission."
msgstr "Oväntat utskick av formuläret."
@@ -670,7 +657,7 @@ msgstr "Ingen sådan användare"
msgid "Unblock"
msgstr ""
-#: actions/blockedfromgroup.php:313
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:80
#, fuzzy
msgid "Unblock this user"
msgstr "Ingen sådan användare"
@@ -849,7 +836,7 @@ msgid "Delete this user"
msgstr "Ta bort inlägg"
#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124
-#: lib/adminpanelaction.php:275 lib/groupnav.php:119
+#: lib/adminpanelaction.php:302 lib/groupnav.php:119
msgid "Design"
msgstr ""
@@ -857,107 +844,182 @@ msgstr ""
msgid "Design settings for this StatusNet site."
msgstr ""
-#: actions/designadminpanel.php:220
+#: actions/designadminpanel.php:278
#, fuzzy
-msgid "Unable to delete design setting."
-msgstr "Kunde inte spara dina Twitter inställningar!"
+msgid "Invalid logo URL."
+msgstr "Felaktig storlek"
-#: actions/designadminpanel.php:301
+#: actions/designadminpanel.php:282
#, fuzzy, php-format
msgid "Theme not available: %s"
msgstr "Denna sida är inte tillgänglig i den mediatyp du accepterat"
-#: actions/designadminpanel.php:406
+#: actions/designadminpanel.php:288
+#, fuzzy, php-format
+msgid "Theme directory not readable: %s"
+msgstr "Denna sida är inte tillgänglig i den mediatyp du accepterat"
+
+#: actions/designadminpanel.php:292
+#, php-format
+msgid "Avatar directory not writable: %s"
+msgstr ""
+
+#: actions/designadminpanel.php:296
+#, php-format
+msgid "Background directory not writable: %s"
+msgstr ""
+
+#: actions/designadminpanel.php:312
+#, php-format
+msgid "Max length for %s %s is 255 characters."
+msgstr ""
+
+#: actions/designadminpanel.php:412
+#, fuzzy
+msgid "Change logo"
+msgstr "Ändra ditt lösenord"
+
+#: actions/designadminpanel.php:417
+#, fuzzy
+msgid "Site logo"
+msgstr "Bjud in"
+
+#: actions/designadminpanel.php:424
#, fuzzy
msgid "Change theme"
msgstr "Ändra"
-#: actions/designadminpanel.php:410
-msgid "Theme"
-msgstr ""
+#: actions/designadminpanel.php:441
+#, fuzzy
+msgid "Site theme"
+msgstr "Nytt inlägg"
-#: actions/designadminpanel.php:411
+#: actions/designadminpanel.php:442
msgid "Theme for the site."
msgstr ""
-#: actions/designadminpanel.php:420 lib/designsettings.php:101
+#: actions/designadminpanel.php:447
+msgid "Theme server"
+msgstr ""
+
+#: actions/designadminpanel.php:451
+msgid "Theme path"
+msgstr ""
+
+#: actions/designadminpanel.php:455
+msgid "Theme directory"
+msgstr ""
+
+#: actions/designadminpanel.php:462
+#, fuzzy
+msgid "Avatar Settings"
+msgstr "Twitter inställningar"
+
+#: actions/designadminpanel.php:467
+#, fuzzy
+msgid "Avatar server"
+msgstr "Twitter inställningar"
+
+#: actions/designadminpanel.php:471
+#, fuzzy
+msgid "Avatar path"
+msgstr "Användarbilden uppdaterad."
+
+#: actions/designadminpanel.php:475
+#, fuzzy
+msgid "Avatar directory"
+msgstr "Användarbilden uppdaterad."
+
+#: actions/designadminpanel.php:486 lib/designsettings.php:101
msgid "Change background image"
msgstr ""
-#: actions/designadminpanel.php:424 actions/designadminpanel.php:498
+#: actions/designadminpanel.php:491 actions/designadminpanel.php:578
#: lib/designsettings.php:178
msgid "Background"
msgstr ""
-#: actions/designadminpanel.php:429
+#: actions/designadminpanel.php:496
#, fuzzy, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
"$s."
msgstr "Du kan uppdatera din personliga profil här"
-#: actions/designadminpanel.php:459 lib/designsettings.php:139
+#: actions/designadminpanel.php:526 lib/designsettings.php:139
msgid "On"
msgstr ""
-#: actions/designadminpanel.php:475 lib/designsettings.php:155
+#: actions/designadminpanel.php:542 lib/designsettings.php:155
msgid "Off"
msgstr ""
-#: actions/designadminpanel.php:476 lib/designsettings.php:156
+#: actions/designadminpanel.php:543 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr ""
-#: actions/designadminpanel.php:481 lib/designsettings.php:161
+#: actions/designadminpanel.php:548 lib/designsettings.php:161
msgid "Tile background image"
msgstr ""
-#: actions/designadminpanel.php:490 lib/designsettings.php:170
+#: actions/designadminpanel.php:554
+msgid "Background server"
+msgstr ""
+
+#: actions/designadminpanel.php:558
+msgid "Background path"
+msgstr ""
+
+#: actions/designadminpanel.php:562
+msgid "Background directory"
+msgstr ""
+
+#: actions/designadminpanel.php:569 lib/designsettings.php:170
#, fuzzy
msgid "Change colours"
msgstr "Ändra ditt lösenord"
-#: actions/designadminpanel.php:511 lib/designsettings.php:191
+#: actions/designadminpanel.php:591 lib/designsettings.php:191
#, fuzzy
msgid "Content"
msgstr "Anslut"
-#: actions/designadminpanel.php:524 lib/designsettings.php:204
+#: actions/designadminpanel.php:604 lib/designsettings.php:204
#, fuzzy
msgid "Sidebar"
msgstr "Sök"
-#: actions/designadminpanel.php:537 lib/designsettings.php:217
+#: actions/designadminpanel.php:617 lib/designsettings.php:217
msgid "Text"
msgstr "Text"
-#: actions/designadminpanel.php:550 lib/designsettings.php:230
+#: actions/designadminpanel.php:630 lib/designsettings.php:230
#, fuzzy
msgid "Links"
msgstr "Logga in"
-#: actions/designadminpanel.php:611 lib/designsettings.php:247
+#: actions/designadminpanel.php:658 lib/designsettings.php:247
msgid "Use defaults"
msgstr ""
-#: actions/designadminpanel.php:612 lib/designsettings.php:248
+#: actions/designadminpanel.php:659 lib/designsettings.php:248
msgid "Restore default designs"
msgstr ""
-#: actions/designadminpanel.php:618 lib/designsettings.php:254
+#: actions/designadminpanel.php:665 lib/designsettings.php:254
msgid "Reset back to default"
msgstr ""
-#: actions/designadminpanel.php:620 actions/emailsettings.php:195
+#: actions/designadminpanel.php:667 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/profilesettings.php:167 actions/siteadminpanel.php:371
+#: actions/profilesettings.php:167 actions/siteadminpanel.php:414
#: actions/smssettings.php:181 actions/subscriptions.php:203
#: actions/tagother.php:154 actions/useradminpanel.php:226
#: lib/designsettings.php:256 lib/groupeditform.php:202
msgid "Save"
msgstr "Spara"
-#: actions/designadminpanel.php:621 lib/designsettings.php:257
+#: actions/designadminpanel.php:668 lib/designsettings.php:257
msgid "Save design"
msgstr ""
@@ -1004,6 +1066,11 @@ msgstr "Biografin är för lång (max 140 tecken)"
msgid "Could not update group."
msgstr "Kunde inte uppdatera användare."
+#: actions/editgroup.php:259 classes/User_group.php:390
+#, fuzzy
+msgid "Could not create aliases."
+msgstr "Kunde inte skapa favorit."
+
#: actions/editgroup.php:269
#, fuzzy
msgid "Options saved."
@@ -1122,7 +1189,7 @@ msgstr "Ingen emailadress."
msgid "Cannot normalize that email address"
msgstr "Kan inte normalisera den emailadressen"
-#: actions/emailsettings.php:330 actions/siteadminpanel.php:156
+#: actions/emailsettings.php:330 actions/siteadminpanel.php:158
msgid "Not a valid email address"
msgstr "Ingen giltig emailadress"
@@ -1865,10 +1932,10 @@ msgstr "Ogiltig innehåll i inlägget "
msgid "Incorrect username or password."
msgstr "Felaktigt användarnamn eller lösenord."
-#: actions/login.php:149 actions/recoverpassword.php:375
-#: actions/register.php:248
-msgid "Error setting user."
-msgstr "Fel uppstog i användarens inställning"
+#: actions/login.php:149
+#, 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:457
#: lib/logingroupnav.php:79
@@ -2296,7 +2363,7 @@ msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:275
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:309
msgid "Language"
msgstr "Språk"
@@ -2324,7 +2391,7 @@ msgstr ""
msgid "Bio is too long (max %d chars)."
msgstr "Biografin är för lång (max 140 tecken)"
-#: actions/profilesettings.php:228 actions/siteadminpanel.php:163
+#: actions/profilesettings.php:228 actions/siteadminpanel.php:165
msgid "Timezone not selected."
msgstr "Du har inte valt tidszon"
@@ -2570,6 +2637,10 @@ msgstr "Lösenordet måste vara 6 tecken eller fler."
msgid "Password and confirmation do not match."
msgstr "Lösenord och bekräftelse matchar inte."
+#: actions/recoverpassword.php:375 actions/register.php:248
+msgid "Error setting user."
+msgstr "Fel uppstog i användarens inställning"
+
#: actions/recoverpassword.php:382
msgid "New password successfully saved. You are now logged in."
msgstr "Nya lösenordet har blivit sparat. Du är nu även inloggad."
@@ -2633,7 +2704,7 @@ msgid "Same as password above. Required."
msgstr "Samma som lösenordet ovan. Måste fyllas i."
#: actions/register.php:437 actions/register.php:441
-#: actions/siteadminpanel.php:253 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:287 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "Epost"
@@ -3080,7 +3151,7 @@ msgstr "Du kan inte skicka meddelande till den användaren."
msgid "User is already silenced."
msgstr "Användaren har ingen profil."
-#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:272
+#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:299
#, fuzzy
msgid "Site"
msgstr "Bjud in"
@@ -3089,122 +3160,236 @@ msgstr "Bjud in"
msgid "Basic settings for this StatusNet site."
msgstr ""
-#: actions/siteadminpanel.php:145
+#: actions/siteadminpanel.php:147
msgid "Site name must have non-zero length."
msgstr ""
-#: actions/siteadminpanel.php:153
+#: actions/siteadminpanel.php:155
#, fuzzy
msgid "You must have a valid contact email address"
msgstr "Ingen giltig emailadress"
-#: actions/siteadminpanel.php:171
+#: actions/siteadminpanel.php:173
#, php-format
msgid "Unknown language \"%s\""
msgstr ""
-#: actions/siteadminpanel.php:178
+#: actions/siteadminpanel.php:180
msgid "Invalid snapshot report URL."
msgstr ""
-#: actions/siteadminpanel.php:184
+#: actions/siteadminpanel.php:186
msgid "Invalid snapshot run value."
msgstr ""
-#: actions/siteadminpanel.php:190
+#: actions/siteadminpanel.php:192
msgid "Snapshot frequency must be a number."
msgstr ""
-#: actions/siteadminpanel.php:241
+#: actions/siteadminpanel.php:199
+msgid "You must set an SSL sever when enabling SSL."
+msgstr ""
+
+#: actions/siteadminpanel.php:204
+msgid "Invalid SSL server. Max length is 255 characters."
+msgstr ""
+
+#: actions/siteadminpanel.php:210
+msgid "Minimum text limit is 140c."
+msgstr ""
+
+#: actions/siteadminpanel.php:216
+msgid "Dupe limit must 1 or more seconds."
+msgstr ""
+
+#: actions/siteadminpanel.php:224
+#, php-format
+msgid "Locales directory not readable: %s"
+msgstr ""
+
+#: actions/siteadminpanel.php:275
#, fuzzy
msgid "Site name"
msgstr "Nytt inlägg"
-#: actions/siteadminpanel.php:242
+#: actions/siteadminpanel.php:276
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr ""
-#: actions/siteadminpanel.php:245
+#: actions/siteadminpanel.php:279
msgid "Brought by"
msgstr ""
-#: actions/siteadminpanel.php:246
+#: actions/siteadminpanel.php:280
msgid "Text used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:249
+#: actions/siteadminpanel.php:283
msgid "Brought by URL"
msgstr ""
-#: actions/siteadminpanel.php:250
+#: actions/siteadminpanel.php:284
msgid "URL used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:254
+#: actions/siteadminpanel.php:288
#, fuzzy
msgid "contact email address for your site"
msgstr "Ny emailadress för att skicka till %s"
-#: actions/siteadminpanel.php:268
+#: actions/siteadminpanel.php:302
msgid "Default timezone"
msgstr ""
-#: actions/siteadminpanel.php:269
+#: actions/siteadminpanel.php:303
msgid "Default timezone for the site; usually UTC."
msgstr ""
-#: actions/siteadminpanel.php:276
+#: actions/siteadminpanel.php:310
#, fuzzy
msgid "Default site language"
msgstr "Språkval"
-#: actions/siteadminpanel.php:282
+#: actions/siteadminpanel.php:316
+msgid "Path to locales"
+msgstr ""
+
+#: actions/siteadminpanel.php:316
+msgid "Directory path to locales"
+msgstr ""
+
+#: actions/siteadminpanel.php:320
+#, fuzzy
+msgid "Server"
+msgstr "Återställ"
+
+#: actions/siteadminpanel.php:320
+msgid "Site's server hostname."
+msgstr ""
+
+#: actions/siteadminpanel.php:324
+msgid "Path"
+msgstr ""
+
+#: actions/siteadminpanel.php:324
+#, fuzzy
+msgid "Site path"
+msgstr "Nytt inlägg"
+
+#: actions/siteadminpanel.php:328
+msgid "Fancy URLs"
+msgstr ""
+
+#: actions/siteadminpanel.php:330
+msgid "Use fancy (more readable and memorable) URLs?"
+msgstr ""
+
+#: actions/siteadminpanel.php:334
#, fuzzy
msgid "Private"
msgstr "Sekretesspolicy"
-#: actions/siteadminpanel.php:284
+#: actions/siteadminpanel.php:336
msgid "Prohibit anonymous users (not logged in) from viewing site?"
msgstr ""
-#: actions/siteadminpanel.php:290
+#: actions/siteadminpanel.php:340
+#, fuzzy
+msgid "Invite only"
+msgstr "Bjud in"
+
+#: actions/siteadminpanel.php:342
+msgid "Make registration invitation only."
+msgstr ""
+
+#: actions/siteadminpanel.php:346 actions/useradminpanel.php:171
+#, fuzzy
+msgid "Closed"
+msgstr "Ingen sådan användare"
+
+#: actions/siteadminpanel.php:348
+msgid "Disable new registrations."
+msgstr ""
+
+#: actions/siteadminpanel.php:353
msgid "Randomly during Web hit"
msgstr ""
-#: actions/siteadminpanel.php:291
+#: actions/siteadminpanel.php:354
msgid "In a scheduled job"
msgstr ""
-#: actions/siteadminpanel.php:292
+#: actions/siteadminpanel.php:355 actions/siteadminpanel.php:380
#, fuzzy
msgid "Never"
msgstr "Återställ"
-#: actions/siteadminpanel.php:294
+#: actions/siteadminpanel.php:357
msgid "Data snapshots"
msgstr ""
-#: actions/siteadminpanel.php:295
+#: actions/siteadminpanel.php:358
msgid "When to send statistical data to status.net servers"
msgstr ""
-#: actions/siteadminpanel.php:301
+#: actions/siteadminpanel.php:364
msgid "Frequency"
msgstr ""
-#: actions/siteadminpanel.php:302
+#: actions/siteadminpanel.php:365
msgid "Snapshots will be sent once every N Web hits"
msgstr ""
-#: actions/siteadminpanel.php:309
+#: actions/siteadminpanel.php:372
msgid "Report URL"
msgstr ""
-#: actions/siteadminpanel.php:310
+#: actions/siteadminpanel.php:373
msgid "Snapshots will be sent to this URL"
msgstr ""
-#: actions/siteadminpanel.php:371 actions/useradminpanel.php:226
+#: actions/siteadminpanel.php:381
+#, fuzzy
+msgid "Sometimes"
+msgstr "Inlägg"
+
+#: actions/siteadminpanel.php:382
+msgid "Always"
+msgstr ""
+
+#: actions/siteadminpanel.php:384
+msgid "Use SSL"
+msgstr ""
+
+#: actions/siteadminpanel.php:385
+msgid "When to use SSL"
+msgstr ""
+
+#: actions/siteadminpanel.php:391
+msgid "SSL Server"
+msgstr ""
+
+#: actions/siteadminpanel.php:392
+msgid "Server to direct SSL requests to"
+msgstr ""
+
+#: actions/siteadminpanel.php:396
+msgid "Text limit"
+msgstr ""
+
+#: actions/siteadminpanel.php:396
+msgid "Maximum number of characters for notices."
+msgstr ""
+
+#: actions/siteadminpanel.php:400
+msgid "Dupe limit"
+msgstr ""
+
+#: actions/siteadminpanel.php:400
+msgid "How long users must wait (in seconds) to post the same thing again."
+msgstr ""
+
+#: actions/siteadminpanel.php:414 actions/useradminpanel.php:226
#, fuzzy
msgid "Save site settings"
msgstr "Twitter inställningar"
@@ -3533,11 +3718,6 @@ msgstr ""
msgid "User settings for this StatusNet site."
msgstr ""
-#: actions/useradminpanel.php:171
-#, fuzzy
-msgid "Closed"
-msgstr "Ingen sådan användare"
-
#: actions/useradminpanel.php:173
msgid "Is registration on this site prohibited?"
msgstr ""
@@ -3763,6 +3943,16 @@ msgstr "Det var ett problem när inlägget sparades."
msgid "DB error inserting reply: %s"
msgstr "Databasfel för svar: %s"
+#: classes/User_group.php:380
+#, fuzzy
+msgid "Could not create group."
+msgstr "Kunde inte skapa favorit."
+
+#: classes/User_group.php:409
+#, fuzzy
+msgid "Could not set group membership."
+msgstr "Kunde inte skapa prenumeration."
+
#: classes/User.php:347
#, fuzzy, php-format
msgid "Welcome to %1$s, @%2$s!"
@@ -4013,12 +4203,17 @@ msgstr ""
msgid "saveSettings() not implemented."
msgstr ""
-#: lib/adminpanelaction.php:273
+#: lib/adminpanelaction.php:247
+#, fuzzy
+msgid "Unable to delete design setting."
+msgstr "Kunde inte spara dina Twitter inställningar!"
+
+#: lib/adminpanelaction.php:300
#, fuzzy
msgid "Basic site configuration"
msgstr "Bekräfta epostadress"
-#: lib/adminpanelaction.php:276
+#: lib/adminpanelaction.php:303
#, fuzzy
msgid "Design configuration"
msgstr "SMS Bekräftelse"
@@ -4266,20 +4461,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:203
+#: lib/common.php:199
#, fuzzy
msgid "No configuration file found. "
msgstr "Ingen bekräftelsekod."
-#: lib/common.php:204
+#: lib/common.php:200
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:205
+#: lib/common.php:201
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:206
+#: lib/common.php:202
msgid "Go to the installer."
msgstr ""
@@ -5072,11 +5267,6 @@ msgstr "Nej"
msgid "Top posters"
msgstr ""
-#: lib/unblockform.php:80
-#, fuzzy
-msgid "Unlock this user"
-msgstr "Ingen sådan användare"
-
#: lib/unsandboxform.php:69
msgid "Unsandbox"
msgstr ""
@@ -5132,47 +5322,47 @@ msgstr "Du kan inte skicka meddelande till den användaren."
msgid "Message"
msgstr "Nytt meddelande"
-#: lib/util.php:821
+#: lib/util.php:826
msgid "a few seconds ago"
msgstr "ett par sekunder sedan"
-#: lib/util.php:823
+#: lib/util.php:828
msgid "about a minute ago"
msgstr "för nån minut sedan"
-#: lib/util.php:825
+#: lib/util.php:830
#, php-format
msgid "about %d minutes ago"
msgstr "för %d minuter sedan"
-#: lib/util.php:827
+#: lib/util.php:832
msgid "about an hour ago"
msgstr "för en timma sedan"
-#: lib/util.php:829
+#: lib/util.php:834
#, php-format
msgid "about %d hours ago"
msgstr "för %d timmar sedan"
-#: lib/util.php:831
+#: lib/util.php:836
msgid "about a day ago"
msgstr "för en dag sedan"
-#: lib/util.php:833
+#: lib/util.php:838
#, php-format
msgid "about %d days ago"
msgstr "för %d dagar sedan"
-#: lib/util.php:835
+#: lib/util.php:840
msgid "about a month ago"
msgstr "för en månad sedan"
-#: lib/util.php:837
+#: lib/util.php:842
#, php-format
msgid "about %d months ago"
msgstr "för %d månader sedan"
-#: lib/util.php:839
+#: lib/util.php:844
msgid "about a year ago"
msgstr "för ett år sedan"
@@ -5203,5 +5393,9 @@ msgid "Sorry, no incoming email allowed."
msgstr "Ledsen, men inga inkommande email är tillåtna."
#, fuzzy
+#~ msgid "Unlock this user"
+#~ msgstr "Ingen sådan användare"
+
+#, fuzzy
#~ msgid "These people are subscribed to you: "
#~ msgstr "Fjärrprenumerera"
diff --git a/locale/te/LC_MESSAGES/statusnet.po b/locale/te/LC_MESSAGES/statusnet.po
index 5aabf0d0e..cb02d50f6 100644
--- a/locale/te/LC_MESSAGES/statusnet.po
+++ b/locale/te/LC_MESSAGES/statusnet.po
@@ -2,15 +2,18 @@
#
# Author@translatewiki.net: Veeven
# --
+# 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-18 19:31+0000\n"
+"POT-Creation-Date: 2009-11-19 10:43+0000\n"
"PO-Revision-Date: 2009-11-18 19:32:42+0000\n"
"Language-Team: Telugu\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: MediaWiki 1.16alpha(r59207); Translate extension (2009-11-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: te\n"
@@ -144,7 +147,7 @@ msgstr "వాడుకరిని తాజాకరించలేకున
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
-#: actions/designadminpanel.php:125 actions/newnotice.php:94
+#: actions/designadminpanel.php:122 actions/newnotice.php:94
#: lib/designsettings.php:283
#, php-format
msgid ""
@@ -227,7 +230,7 @@ msgstr ""
#: 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:184 actions/apigroupismember.php:114
+#: 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
@@ -294,80 +297,66 @@ msgstr "వాడుకరిని తాజాకరించలేకున
msgid "Could not find target user."
msgstr "వాడుకరిని తాజాకరించలేకున్నాం."
-#: actions/apigroupcreate.php:136 actions/newgroup.php:204
-msgid "Could not create group."
-msgstr "గుంపుని సృష్టించలేకపోయాం."
-
-#: actions/apigroupcreate.php:147 actions/editgroup.php:259
-#: actions/newgroup.php:210
-msgid "Could not create aliases."
-msgstr "మారుపేర్లని సృష్టించలేకపోయాం."
-
-#: actions/apigroupcreate.php:166 actions/newgroup.php:224
-#, fuzzy
-msgid "Could not set group membership."
-msgstr "చందాని సృష్టించలేకపోయాం."
-
-#: actions/apigroupcreate.php:212 actions/editgroup.php:182
+#: actions/apigroupcreate.php:164 actions/editgroup.php:182
#: actions/newgroup.php:126 actions/profilesettings.php:208
#: actions/register.php:205
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr ""
-#: actions/apigroupcreate.php:221 actions/editgroup.php:186
+#: 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 "ఆ పేరుని ఇప్పటికే వాడుతున్నారు. మరోటి ప్రయత్నించండి."
-#: actions/apigroupcreate.php:228 actions/editgroup.php:189
+#: 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 "సరైన పేరు కాదు."
-#: actions/apigroupcreate.php:244 actions/editgroup.php:195
+#: 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 "హోమ్ పేజీ URL సరైనది కాదు."
-#: actions/apigroupcreate.php:253 actions/editgroup.php:198
+#: 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 "పూర్తి పేరు చాలా పెద్దగా ఉంది (గరిష్ఠంగా 255 అక్షరాలు)."
-#: actions/apigroupcreate.php:261
+#: actions/apigroupcreate.php:213
#, php-format
msgid "Description is too long (max %d chars)."
msgstr "వివరణ చాలా పెద్దగా ఉంది (%d అక్షరాలు గరిష్ఠం)."
-#: actions/apigroupcreate.php:272 actions/editgroup.php:204
+#: 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 "ప్రాంతం పేరు మరీ పెద్దగా ఉంది (255 అక్షరాలు గరిష్ఠం)."
-#: actions/apigroupcreate.php:291 actions/editgroup.php:215
+#: actions/apigroupcreate.php:243 actions/editgroup.php:215
#: actions/newgroup.php:159
#, php-format
msgid "Too many aliases! Maximum %d."
msgstr "చాలా మారుపేర్లు! %d గరిష్ఠం."
-#: actions/apigroupcreate.php:312 actions/editgroup.php:224
+#: actions/apigroupcreate.php:264 actions/editgroup.php:224
#: actions/newgroup.php:168
#, php-format
msgid "Invalid alias: \"%s\""
msgstr "తప్పుడు మారుపేరు: \"%s\""
-#: actions/apigroupcreate.php:321 actions/editgroup.php:228
+#: actions/apigroupcreate.php:273 actions/editgroup.php:228
#: actions/newgroup.php:172
#, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr "\"%s\" అన్న మారుపేరుని ఇప్పటికే వాడుతున్నారు. మరొకటి ప్రయత్నించండి."
-#: actions/apigroupcreate.php:334 actions/editgroup.php:234
+#: actions/apigroupcreate.php:286 actions/editgroup.php:234
#: actions/newgroup.php:178
msgid "Alias can't be the same as nickname."
msgstr "మారుపేరు పేరుతో సమానంగా ఉండకూడదు."
@@ -589,10 +578,10 @@ msgstr "కత్తిరించు"
msgid "There was a problem with your session token. Try again, please."
msgstr ""
-#: actions/avatarsettings.php:277 actions/emailsettings.php:255
-#: actions/grouplogo.php:319 actions/imsettings.php:220
-#: actions/recoverpassword.php:44 actions/smssettings.php:248
-#: lib/designsettings.php:304
+#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
+#: actions/emailsettings.php:255 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/recoverpassword.php:44
+#: actions/smssettings.php:248 lib/designsettings.php:304
msgid "Unexpected form submission."
msgstr ""
@@ -654,7 +643,7 @@ msgstr "అటువంటి వాడుకరి లేరు."
msgid "Unblock"
msgstr ""
-#: actions/blockedfromgroup.php:313
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:80
#, fuzzy
msgid "Unblock this user"
msgstr "అటువంటి వాడుకరి లేరు."
@@ -824,7 +813,7 @@ msgid "Delete this user"
msgstr "ఈ నోటీసుని తొలగించు"
#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124
-#: lib/adminpanelaction.php:275 lib/groupnav.php:119
+#: lib/adminpanelaction.php:302 lib/groupnav.php:119
msgid "Design"
msgstr "రూపురేఖలు"
@@ -832,103 +821,182 @@ msgstr "రూపురేఖలు"
msgid "Design settings for this StatusNet site."
msgstr ""
-#: actions/designadminpanel.php:220
-msgid "Unable to delete design setting."
-msgstr ""
+#: actions/designadminpanel.php:278
+#, fuzzy
+msgid "Invalid logo URL."
+msgstr "తప్పుడు పరిమాణం."
-#: actions/designadminpanel.php:301
+#: actions/designadminpanel.php:282
#, fuzzy, php-format
msgid "Theme not available: %s"
msgstr "హోమ్ పేజీ URL సరైనది కాదు."
-#: actions/designadminpanel.php:406
+#: actions/designadminpanel.php:288
+#, fuzzy, php-format
+msgid "Theme directory not readable: %s"
+msgstr "హోమ్ పేజీ URL సరైనది కాదు."
+
+#: actions/designadminpanel.php:292
+#, php-format
+msgid "Avatar directory not writable: %s"
+msgstr ""
+
+#: actions/designadminpanel.php:296
+#, php-format
+msgid "Background directory not writable: %s"
+msgstr ""
+
+#: actions/designadminpanel.php:312
+#, php-format
+msgid "Max length for %s %s is 255 characters."
+msgstr ""
+
+#: actions/designadminpanel.php:412
+#, fuzzy
+msgid "Change logo"
+msgstr "రంగులను మార్చు"
+
+#: actions/designadminpanel.php:417
+#, fuzzy
+msgid "Site logo"
+msgstr "ఆహ్వానించు"
+
+#: actions/designadminpanel.php:424
#, fuzzy
msgid "Change theme"
msgstr "మార్చు"
-#: actions/designadminpanel.php:410
-msgid "Theme"
-msgstr ""
+#: actions/designadminpanel.php:441
+#, fuzzy
+msgid "Site theme"
+msgstr "కొత్త సందేశం"
-#: actions/designadminpanel.php:411
+#: actions/designadminpanel.php:442
msgid "Theme for the site."
msgstr ""
-#: actions/designadminpanel.php:420 lib/designsettings.php:101
+#: actions/designadminpanel.php:447
+msgid "Theme server"
+msgstr ""
+
+#: actions/designadminpanel.php:451
+msgid "Theme path"
+msgstr ""
+
+#: actions/designadminpanel.php:455
+msgid "Theme directory"
+msgstr ""
+
+#: actions/designadminpanel.php:462
+#, fuzzy
+msgid "Avatar Settings"
+msgstr "అవతారపు అమరికలు"
+
+#: actions/designadminpanel.php:467
+#, fuzzy
+msgid "Avatar server"
+msgstr "అవతారపు అమరికలు"
+
+#: actions/designadminpanel.php:471
+#, fuzzy
+msgid "Avatar path"
+msgstr "అవతారాన్ని తాజాకరించాం."
+
+#: actions/designadminpanel.php:475
+#, fuzzy
+msgid "Avatar directory"
+msgstr "అవతారాన్ని తొలగించాం."
+
+#: actions/designadminpanel.php:486 lib/designsettings.php:101
msgid "Change background image"
msgstr "నేపథ్య చిత్రాన్ని మార్చు"
-#: actions/designadminpanel.php:424 actions/designadminpanel.php:498
+#: actions/designadminpanel.php:491 actions/designadminpanel.php:578
#: lib/designsettings.php:178
msgid "Background"
msgstr "నేపథ్యం"
-#: actions/designadminpanel.php:429
+#: actions/designadminpanel.php:496
#, fuzzy, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
"$s."
msgstr "మీ స్వంత నేపథ్యపు చిత్రాన్ని మీరు ఎక్కించవచ్చు. గరిష్ఠ ఫైలు పరిమాణం 2మెబై."
-#: actions/designadminpanel.php:459 lib/designsettings.php:139
+#: actions/designadminpanel.php:526 lib/designsettings.php:139
msgid "On"
msgstr ""
-#: actions/designadminpanel.php:475 lib/designsettings.php:155
+#: actions/designadminpanel.php:542 lib/designsettings.php:155
msgid "Off"
msgstr ""
-#: actions/designadminpanel.php:476 lib/designsettings.php:156
+#: actions/designadminpanel.php:543 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr ""
-#: actions/designadminpanel.php:481 lib/designsettings.php:161
+#: actions/designadminpanel.php:548 lib/designsettings.php:161
msgid "Tile background image"
msgstr ""
-#: actions/designadminpanel.php:490 lib/designsettings.php:170
+#: actions/designadminpanel.php:554
+#, fuzzy
+msgid "Background server"
+msgstr "నేపథ్యం"
+
+#: actions/designadminpanel.php:558
+#, fuzzy
+msgid "Background path"
+msgstr "నేపథ్యం"
+
+#: actions/designadminpanel.php:562
+#, fuzzy
+msgid "Background directory"
+msgstr "నేపథ్యం"
+
+#: actions/designadminpanel.php:569 lib/designsettings.php:170
msgid "Change colours"
msgstr "రంగులను మార్చు"
-#: actions/designadminpanel.php:511 lib/designsettings.php:191
+#: actions/designadminpanel.php:591 lib/designsettings.php:191
#, fuzzy
msgid "Content"
msgstr "అనుసంధానించు"
-#: actions/designadminpanel.php:524 lib/designsettings.php:204
+#: actions/designadminpanel.php:604 lib/designsettings.php:204
msgid "Sidebar"
msgstr "పక్కపట్టీ"
-#: actions/designadminpanel.php:537 lib/designsettings.php:217
+#: actions/designadminpanel.php:617 lib/designsettings.php:217
msgid "Text"
msgstr "పాఠ్యం"
-#: actions/designadminpanel.php:550 lib/designsettings.php:230
+#: actions/designadminpanel.php:630 lib/designsettings.php:230
msgid "Links"
msgstr "లంకెలు"
-#: actions/designadminpanel.php:611 lib/designsettings.php:247
+#: actions/designadminpanel.php:658 lib/designsettings.php:247
msgid "Use defaults"
msgstr ""
-#: actions/designadminpanel.php:612 lib/designsettings.php:248
+#: actions/designadminpanel.php:659 lib/designsettings.php:248
msgid "Restore default designs"
msgstr ""
-#: actions/designadminpanel.php:618 lib/designsettings.php:254
+#: actions/designadminpanel.php:665 lib/designsettings.php:254
msgid "Reset back to default"
msgstr ""
-#: actions/designadminpanel.php:620 actions/emailsettings.php:195
+#: actions/designadminpanel.php:667 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/profilesettings.php:167 actions/siteadminpanel.php:371
+#: actions/profilesettings.php:167 actions/siteadminpanel.php:414
#: actions/smssettings.php:181 actions/subscriptions.php:203
#: actions/tagother.php:154 actions/useradminpanel.php:226
#: lib/designsettings.php:256 lib/groupeditform.php:202
msgid "Save"
msgstr "భద్రపరచు"
-#: actions/designadminpanel.php:621 lib/designsettings.php:257
+#: actions/designadminpanel.php:668 lib/designsettings.php:257
msgid "Save design"
msgstr "రూపురేఖలని భద్రపరచు"
@@ -972,6 +1040,10 @@ msgstr "వివరణ చాలా పెద్దదిగా ఉంది (1
msgid "Could not update group."
msgstr "వాడుకరిని తాజాకరించలేకున్నాం."
+#: actions/editgroup.php:259 classes/User_group.php:390
+msgid "Could not create aliases."
+msgstr "మారుపేర్లని సృష్టించలేకపోయాం."
+
#: actions/editgroup.php:269
msgid "Options saved."
msgstr "ఎంపికలు భద్రమయ్యాయి."
@@ -1086,7 +1158,7 @@ msgstr "ఈమెయిలు చిరునామా లేదు."
msgid "Cannot normalize that email address"
msgstr ""
-#: actions/emailsettings.php:330 actions/siteadminpanel.php:156
+#: actions/emailsettings.php:330 actions/siteadminpanel.php:158
msgid "Not a valid email address"
msgstr "సరైన ఈమెయిలు చిరునామా కాదు"
@@ -1758,9 +1830,8 @@ msgstr "సందేశపు విషయం సరైనది కాదు"
msgid "Incorrect username or password."
msgstr "వాడుకరిపేరు లేదా సంకేతపదం తప్పు."
-#: actions/login.php:149 actions/recoverpassword.php:375
-#: actions/register.php:248
-msgid "Error setting user."
+#: actions/login.php:149
+msgid "Error setting user. You are probably not authorized."
msgstr ""
#: actions/login.php:204 actions/login.php:257 lib/action.php:457
@@ -2178,7 +2249,7 @@ msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:275
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:309
msgid "Language"
msgstr "భాష"
@@ -2204,7 +2275,7 @@ msgstr ""
msgid "Bio is too long (max %d chars)."
msgstr "స్వపరిచయం చాలా పెద్దగా ఉంది (140 అక్షరాలు గరిష్ఠం)."
-#: actions/profilesettings.php:228 actions/siteadminpanel.php:163
+#: actions/profilesettings.php:228 actions/siteadminpanel.php:165
msgid "Timezone not selected."
msgstr "కాలమండలాన్ని ఎంచుకోలేదు."
@@ -2446,6 +2517,10 @@ msgstr "సంకేతపదం 6 లేదా అంతకంటే ఎక్
msgid "Password and confirmation do not match."
msgstr "సంకేతపదం మరియు నిర్ధారణ సరిపోలేదు."
+#: actions/recoverpassword.php:375 actions/register.php:248
+msgid "Error setting user."
+msgstr ""
+
#: actions/recoverpassword.php:382
msgid "New password successfully saved. You are now logged in."
msgstr "మీ కొత్త సంకేతపదం భద్రమైంది. మీరు ఇప్పుడు లోనికి ప్రవేశించారు."
@@ -2507,7 +2582,7 @@ msgid "Same as password above. Required."
msgstr "పై సంకేతపదం మరోసారి. తప్పనిసరి."
#: actions/register.php:437 actions/register.php:441
-#: actions/siteadminpanel.php:253 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:287 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "ఈమెయిల్"
@@ -2924,7 +2999,7 @@ msgstr ""
msgid "User is already silenced."
msgstr "వాడుకరిని ఇప్పటికే గుంపునుండి నిరోధించారు."
-#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:272
+#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:299
#, fuzzy
msgid "Site"
msgstr "ఆహ్వానించు"
@@ -2933,122 +3008,237 @@ msgstr "ఆహ్వానించు"
msgid "Basic settings for this StatusNet site."
msgstr ""
-#: actions/siteadminpanel.php:145
+#: actions/siteadminpanel.php:147
msgid "Site name must have non-zero length."
msgstr ""
-#: actions/siteadminpanel.php:153
+#: actions/siteadminpanel.php:155
#, fuzzy
msgid "You must have a valid contact email address"
msgstr "సరైన ఈమెయిలు చిరునామా కాదు"
-#: actions/siteadminpanel.php:171
+#: actions/siteadminpanel.php:173
#, php-format
msgid "Unknown language \"%s\""
msgstr ""
-#: actions/siteadminpanel.php:178
+#: actions/siteadminpanel.php:180
msgid "Invalid snapshot report URL."
msgstr ""
-#: actions/siteadminpanel.php:184
+#: actions/siteadminpanel.php:186
msgid "Invalid snapshot run value."
msgstr ""
-#: actions/siteadminpanel.php:190
+#: actions/siteadminpanel.php:192
msgid "Snapshot frequency must be a number."
msgstr ""
-#: actions/siteadminpanel.php:241
+#: actions/siteadminpanel.php:199
+msgid "You must set an SSL sever when enabling SSL."
+msgstr ""
+
+#: actions/siteadminpanel.php:204
+msgid "Invalid SSL server. Max length is 255 characters."
+msgstr ""
+
+#: actions/siteadminpanel.php:210
+msgid "Minimum text limit is 140c."
+msgstr ""
+
+#: actions/siteadminpanel.php:216
+msgid "Dupe limit must 1 or more seconds."
+msgstr ""
+
+#: actions/siteadminpanel.php:224
+#, php-format
+msgid "Locales directory not readable: %s"
+msgstr ""
+
+#: actions/siteadminpanel.php:275
#, fuzzy
msgid "Site name"
msgstr "కొత్త సందేశం"
-#: actions/siteadminpanel.php:242
+#: actions/siteadminpanel.php:276
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr ""
-#: actions/siteadminpanel.php:245
+#: actions/siteadminpanel.php:279
msgid "Brought by"
msgstr ""
-#: actions/siteadminpanel.php:246
+#: actions/siteadminpanel.php:280
msgid "Text used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:249
+#: actions/siteadminpanel.php:283
msgid "Brought by URL"
msgstr ""
-#: actions/siteadminpanel.php:250
+#: actions/siteadminpanel.php:284
msgid "URL used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:254
+#: actions/siteadminpanel.php:288
#, fuzzy
msgid "contact email address for your site"
msgstr "ఈ వాడుకరికై నమోదైన ఈమెయిల్ చిరునామాలు ఏమీ లేవు."
-#: actions/siteadminpanel.php:268
+#: actions/siteadminpanel.php:302
msgid "Default timezone"
msgstr ""
-#: actions/siteadminpanel.php:269
+#: actions/siteadminpanel.php:303
msgid "Default timezone for the site; usually UTC."
msgstr ""
-#: actions/siteadminpanel.php:276
+#: actions/siteadminpanel.php:310
#, fuzzy
msgid "Default site language"
msgstr "ప్రాథాన్యతా భాష"
-#: actions/siteadminpanel.php:282
+#: actions/siteadminpanel.php:316
+msgid "Path to locales"
+msgstr ""
+
+#: actions/siteadminpanel.php:316
+msgid "Directory path to locales"
+msgstr ""
+
+#: actions/siteadminpanel.php:320
+#, fuzzy
+msgid "Server"
+msgstr "వైదొలగు"
+
+#: actions/siteadminpanel.php:320
+msgid "Site's server hostname."
+msgstr ""
+
+#: actions/siteadminpanel.php:324
+msgid "Path"
+msgstr ""
+
+#: actions/siteadminpanel.php:324
+#, fuzzy
+msgid "Site path"
+msgstr "కొత్త సందేశం"
+
+#: actions/siteadminpanel.php:328
+msgid "Fancy URLs"
+msgstr ""
+
+#: actions/siteadminpanel.php:330
+msgid "Use fancy (more readable and memorable) URLs?"
+msgstr ""
+
+#: actions/siteadminpanel.php:334
#, fuzzy
msgid "Private"
msgstr "అంతరంగికత"
-#: actions/siteadminpanel.php:284
+#: actions/siteadminpanel.php:336
msgid "Prohibit anonymous users (not logged in) from viewing site?"
msgstr ""
-#: actions/siteadminpanel.php:290
+#: actions/siteadminpanel.php:340
+#, fuzzy
+msgid "Invite only"
+msgstr "ఆహ్వానించు"
+
+#: actions/siteadminpanel.php:342
+msgid "Make registration invitation only."
+msgstr ""
+
+#: actions/siteadminpanel.php:346 actions/useradminpanel.php:171
+#, fuzzy
+msgid "Closed"
+msgstr "అటువంటి వాడుకరి లేరు."
+
+#: actions/siteadminpanel.php:348
+msgid "Disable new registrations."
+msgstr ""
+
+#: actions/siteadminpanel.php:353
msgid "Randomly during Web hit"
msgstr ""
-#: actions/siteadminpanel.php:291
+#: actions/siteadminpanel.php:354
msgid "In a scheduled job"
msgstr ""
-#: actions/siteadminpanel.php:292
+#: actions/siteadminpanel.php:355 actions/siteadminpanel.php:380
#, fuzzy
msgid "Never"
msgstr "వైదొలగు"
-#: actions/siteadminpanel.php:294
+#: actions/siteadminpanel.php:357
msgid "Data snapshots"
msgstr ""
-#: actions/siteadminpanel.php:295
+#: actions/siteadminpanel.php:358
msgid "When to send statistical data to status.net servers"
msgstr ""
-#: actions/siteadminpanel.php:301
+#: actions/siteadminpanel.php:364
msgid "Frequency"
msgstr ""
-#: actions/siteadminpanel.php:302
+#: actions/siteadminpanel.php:365
msgid "Snapshots will be sent once every N Web hits"
msgstr ""
-#: actions/siteadminpanel.php:309
+#: actions/siteadminpanel.php:372
msgid "Report URL"
msgstr ""
-#: actions/siteadminpanel.php:310
+#: actions/siteadminpanel.php:373
msgid "Snapshots will be sent to this URL"
msgstr ""
-#: actions/siteadminpanel.php:371 actions/useradminpanel.php:226
+#: actions/siteadminpanel.php:381
+#, fuzzy
+msgid "Sometimes"
+msgstr "సందేశాలు"
+
+#: actions/siteadminpanel.php:382
+#, fuzzy
+msgid "Always"
+msgstr "మారుపేర్లు"
+
+#: actions/siteadminpanel.php:384
+msgid "Use SSL"
+msgstr ""
+
+#: actions/siteadminpanel.php:385
+msgid "When to use SSL"
+msgstr ""
+
+#: actions/siteadminpanel.php:391
+msgid "SSL Server"
+msgstr ""
+
+#: actions/siteadminpanel.php:392
+msgid "Server to direct SSL requests to"
+msgstr ""
+
+#: actions/siteadminpanel.php:396
+msgid "Text limit"
+msgstr ""
+
+#: actions/siteadminpanel.php:396
+msgid "Maximum number of characters for notices."
+msgstr ""
+
+#: actions/siteadminpanel.php:400
+msgid "Dupe limit"
+msgstr ""
+
+#: actions/siteadminpanel.php:400
+msgid "How long users must wait (in seconds) to post the same thing again."
+msgstr ""
+
+#: actions/siteadminpanel.php:414 actions/useradminpanel.php:226
#, fuzzy
msgid "Save site settings"
msgstr "అవతారపు అమరికలు"
@@ -3361,11 +3551,6 @@ msgstr "వాడుకరి"
msgid "User settings for this StatusNet site."
msgstr ""
-#: actions/useradminpanel.php:171
-#, fuzzy
-msgid "Closed"
-msgstr "అటువంటి వాడుకరి లేరు."
-
#: actions/useradminpanel.php:173
msgid "Is registration on this site prohibited?"
msgstr ""
@@ -3580,6 +3765,15 @@ msgstr "సందేశాన్ని భద్రపరచడంలో పొ
msgid "DB error inserting reply: %s"
msgstr ""
+#: classes/User_group.php:380
+msgid "Could not create group."
+msgstr "గుంపుని సృష్టించలేకపోయాం."
+
+#: classes/User_group.php:409
+#, fuzzy
+msgid "Could not set group membership."
+msgstr "చందాని సృష్టించలేకపోయాం."
+
#: classes/User.php:347
#, php-format
msgid "Welcome to %1$s, @%2$s!"
@@ -3819,12 +4013,16 @@ msgstr ""
msgid "saveSettings() not implemented."
msgstr ""
-#: lib/adminpanelaction.php:273
+#: lib/adminpanelaction.php:247
+msgid "Unable to delete design setting."
+msgstr ""
+
+#: lib/adminpanelaction.php:300
#, fuzzy
msgid "Basic site configuration"
msgstr "ఈమెయిల్ చిరునామా నిర్ధారణ"
-#: lib/adminpanelaction.php:276
+#: lib/adminpanelaction.php:303
#, fuzzy
msgid "Design configuration"
msgstr "SMS నిర్ధారణ"
@@ -4075,20 +4273,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:203
+#: lib/common.php:199
#, fuzzy
msgid "No configuration file found. "
msgstr "నిర్ధారణ సంకేతం లేదు."
-#: lib/common.php:204
+#: lib/common.php:200
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:205
+#: lib/common.php:201
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:206
+#: lib/common.php:202
msgid "Go to the installer."
msgstr ""
@@ -4849,11 +5047,6 @@ msgstr "ఏమీలేదు"
msgid "Top posters"
msgstr ""
-#: lib/unblockform.php:80
-#, fuzzy
-msgid "Unlock this user"
-msgstr "అటువంటి వాడుకరి లేరు."
-
#: lib/unsandboxform.php:69
msgid "Unsandbox"
msgstr ""
@@ -4905,47 +5098,47 @@ msgstr ""
msgid "Message"
msgstr "సందేశం"
-#: lib/util.php:821
+#: lib/util.php:826
msgid "a few seconds ago"
msgstr "కొన్ని క్షణాల క్రితం"
-#: lib/util.php:823
+#: lib/util.php:828
msgid "about a minute ago"
msgstr "ఓ నిమిషం క్రితం"
-#: lib/util.php:825
+#: lib/util.php:830
#, php-format
msgid "about %d minutes ago"
msgstr "%d నిమిషాల క్రితం"
-#: lib/util.php:827
+#: lib/util.php:832
msgid "about an hour ago"
msgstr "ఒక గంట క్రితం"
-#: lib/util.php:829
+#: lib/util.php:834
#, php-format
msgid "about %d hours ago"
msgstr "%d గంటల క్రితం"
-#: lib/util.php:831
+#: lib/util.php:836
msgid "about a day ago"
msgstr "ఓ రోజు క్రితం"
-#: lib/util.php:833
+#: lib/util.php:838
#, php-format
msgid "about %d days ago"
msgstr "%d రోజుల క్రితం"
-#: lib/util.php:835
+#: lib/util.php:840
msgid "about a month ago"
msgstr "ఓ నెల క్రితం"
-#: lib/util.php:837
+#: lib/util.php:842
#, php-format
msgid "about %d months ago"
msgstr "%d నెలల క్రితం"
-#: lib/util.php:839
+#: lib/util.php:844
msgid "about a year ago"
msgstr "ఒక సంవత్సరం క్రితం"
@@ -4976,5 +5169,9 @@ msgid "Sorry, no incoming email allowed."
msgstr ""
#, fuzzy
+#~ msgid "Unlock this user"
+#~ msgstr "అటువంటి వాడుకరి లేరు."
+
+#, fuzzy
#~ msgid "These people are subscribed to you: "
#~ msgstr "%sకి స్పందనలు"
diff --git a/locale/tr/LC_MESSAGES/statusnet.po b/locale/tr/LC_MESSAGES/statusnet.po
index 82688a58f..76336f905 100644
--- a/locale/tr/LC_MESSAGES/statusnet.po
+++ b/locale/tr/LC_MESSAGES/statusnet.po
@@ -1,15 +1,18 @@
# Translation of StatusNet to Turkish
#
# --
+# 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-18 19:31+0000\n"
+"POT-Creation-Date: 2009-11-19 10:43+0000\n"
"PO-Revision-Date: 2009-11-18 19:32:45+0000\n"
"Language-Team: Turkish\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: MediaWiki 1.16alpha(r59207); Translate extension (2009-11-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: tr\n"
@@ -145,7 +148,7 @@ msgstr "Kullanıcı güncellenemedi."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
-#: actions/designadminpanel.php:125 actions/newnotice.php:94
+#: actions/designadminpanel.php:122 actions/newnotice.php:94
#: lib/designsettings.php:283
#, php-format
msgid ""
@@ -229,7 +232,7 @@ msgstr ""
#: 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:184 actions/apigroupismember.php:114
+#: 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
@@ -296,23 +299,7 @@ msgstr "Kullanıcı güncellenemedi."
msgid "Could not find target user."
msgstr "Kullanıcı güncellenemedi."
-#: actions/apigroupcreate.php:136 actions/newgroup.php:204
-#, fuzzy
-msgid "Could not create group."
-msgstr "Avatar bilgisi kaydedilemedi"
-
-#: actions/apigroupcreate.php:147 actions/editgroup.php:259
-#: actions/newgroup.php:210
-#, fuzzy
-msgid "Could not create aliases."
-msgstr "Avatar bilgisi kaydedilemedi"
-
-#: actions/apigroupcreate.php:166 actions/newgroup.php:224
-#, fuzzy
-msgid "Could not set group membership."
-msgstr "Abonelik oluşturulamadı."
-
-#: actions/apigroupcreate.php:212 actions/editgroup.php:182
+#: actions/apigroupcreate.php:164 actions/editgroup.php:182
#: actions/newgroup.php:126 actions/profilesettings.php:208
#: actions/register.php:205
msgid "Nickname must have only lowercase letters and numbers and no spaces."
@@ -320,60 +307,60 @@ msgstr ""
"Takma ad sadece küçük harflerden ve rakamlardan oluşabilir, boşluk "
"kullanılamaz. "
-#: actions/apigroupcreate.php:221 actions/editgroup.php:186
+#: 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 "Takma ad kullanımda. Başka bir tane deneyin."
-#: actions/apigroupcreate.php:228 actions/editgroup.php:189
+#: 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 "Geçersiz bir takma ad."
-#: actions/apigroupcreate.php:244 actions/editgroup.php:195
+#: 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 "Başlangıç sayfası adresi geçerli bir URL değil."
-#: actions/apigroupcreate.php:253 actions/editgroup.php:198
+#: 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 "Tam isim çok uzun (azm: 255 karakter)."
-#: actions/apigroupcreate.php:261
+#: actions/apigroupcreate.php:213
#, fuzzy, php-format
msgid "Description is too long (max %d chars)."
msgstr "Hakkında bölümü çok uzun (azm 140 karakter)."
-#: actions/apigroupcreate.php:272 actions/editgroup.php:204
+#: 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 "Yer bilgisi çok uzun (azm: 255 karakter)."
-#: actions/apigroupcreate.php:291 actions/editgroup.php:215
+#: actions/apigroupcreate.php:243 actions/editgroup.php:215
#: actions/newgroup.php:159
#, php-format
msgid "Too many aliases! Maximum %d."
msgstr ""
-#: actions/apigroupcreate.php:312 actions/editgroup.php:224
+#: actions/apigroupcreate.php:264 actions/editgroup.php:224
#: actions/newgroup.php:168
#, fuzzy, php-format
msgid "Invalid alias: \"%s\""
msgstr "%s Geçersiz başlangıç sayfası"
-#: actions/apigroupcreate.php:321 actions/editgroup.php:228
+#: actions/apigroupcreate.php:273 actions/editgroup.php:228
#: actions/newgroup.php:172
#, fuzzy, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr "Takma ad kullanımda. Başka bir tane deneyin."
-#: actions/apigroupcreate.php:334 actions/editgroup.php:234
+#: actions/apigroupcreate.php:286 actions/editgroup.php:234
#: actions/newgroup.php:178
msgid "Alias can't be the same as nickname."
msgstr ""
@@ -601,10 +588,10 @@ msgstr ""
msgid "There was a problem with your session token. Try again, please."
msgstr ""
-#: actions/avatarsettings.php:277 actions/emailsettings.php:255
-#: actions/grouplogo.php:319 actions/imsettings.php:220
-#: actions/recoverpassword.php:44 actions/smssettings.php:248
-#: lib/designsettings.php:304
+#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
+#: actions/emailsettings.php:255 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/recoverpassword.php:44
+#: actions/smssettings.php:248 lib/designsettings.php:304
msgid "Unexpected form submission."
msgstr "Beklenmeğen form girdisi."
@@ -668,7 +655,7 @@ msgstr "Böyle bir kullanıcı yok."
msgid "Unblock"
msgstr ""
-#: actions/blockedfromgroup.php:313
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:80
#, fuzzy
msgid "Unblock this user"
msgstr "Böyle bir kullanıcı yok."
@@ -841,7 +828,7 @@ msgid "Delete this user"
msgstr "Böyle bir kullanıcı yok."
#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124
-#: lib/adminpanelaction.php:275 lib/groupnav.php:119
+#: lib/adminpanelaction.php:302 lib/groupnav.php:119
msgid "Design"
msgstr ""
@@ -849,38 +836,102 @@ msgstr ""
msgid "Design settings for this StatusNet site."
msgstr ""
-#: actions/designadminpanel.php:220
-msgid "Unable to delete design setting."
-msgstr ""
+#: actions/designadminpanel.php:278
+#, fuzzy
+msgid "Invalid logo URL."
+msgstr "Geçersiz büyüklük."
-#: actions/designadminpanel.php:301
+#: actions/designadminpanel.php:282
#, fuzzy, php-format
msgid "Theme not available: %s"
msgstr "Bu sayfa kabul ettiğiniz ortam türünde kullanılabilir değil"
-#: actions/designadminpanel.php:406
+#: actions/designadminpanel.php:288
+#, fuzzy, php-format
+msgid "Theme directory not readable: %s"
+msgstr "Bu sayfa kabul ettiğiniz ortam türünde kullanılabilir değil"
+
+#: actions/designadminpanel.php:292
+#, php-format
+msgid "Avatar directory not writable: %s"
+msgstr ""
+
+#: actions/designadminpanel.php:296
+#, php-format
+msgid "Background directory not writable: %s"
+msgstr ""
+
+#: actions/designadminpanel.php:312
+#, php-format
+msgid "Max length for %s %s is 255 characters."
+msgstr ""
+
+#: actions/designadminpanel.php:412
+#, fuzzy
+msgid "Change logo"
+msgstr "Parolayı değiştir"
+
+#: actions/designadminpanel.php:417
+#, fuzzy
+msgid "Site logo"
+msgstr "Yeni durum mesajı"
+
+#: actions/designadminpanel.php:424
#, fuzzy
msgid "Change theme"
msgstr "Değiştir"
-#: actions/designadminpanel.php:410
-msgid "Theme"
-msgstr ""
+#: actions/designadminpanel.php:441
+#, fuzzy
+msgid "Site theme"
+msgstr "Yeni durum mesajı"
-#: actions/designadminpanel.php:411
+#: actions/designadminpanel.php:442
msgid "Theme for the site."
msgstr ""
-#: actions/designadminpanel.php:420 lib/designsettings.php:101
+#: actions/designadminpanel.php:447
+msgid "Theme server"
+msgstr ""
+
+#: actions/designadminpanel.php:451
+msgid "Theme path"
+msgstr ""
+
+#: actions/designadminpanel.php:455
+msgid "Theme directory"
+msgstr ""
+
+#: actions/designadminpanel.php:462
+#, fuzzy
+msgid "Avatar Settings"
+msgstr "Ayarlar"
+
+#: actions/designadminpanel.php:467
+#, fuzzy
+msgid "Avatar server"
+msgstr "Ayarlar"
+
+#: actions/designadminpanel.php:471
+#, fuzzy
+msgid "Avatar path"
+msgstr "Avatar güncellendi."
+
+#: actions/designadminpanel.php:475
+#, fuzzy
+msgid "Avatar directory"
+msgstr "Avatar güncellendi."
+
+#: actions/designadminpanel.php:486 lib/designsettings.php:101
msgid "Change background image"
msgstr ""
-#: actions/designadminpanel.php:424 actions/designadminpanel.php:498
+#: actions/designadminpanel.php:491 actions/designadminpanel.php:578
#: lib/designsettings.php:178
msgid "Background"
msgstr ""
-#: actions/designadminpanel.php:429
+#: actions/designadminpanel.php:496
#, fuzzy, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -888,68 +939,80 @@ msgid ""
msgstr ""
"Ah, durumunuz biraz uzun kaçtı. Azami 180 karaktere sığdırmaya ne dersiniz?"
-#: actions/designadminpanel.php:459 lib/designsettings.php:139
+#: actions/designadminpanel.php:526 lib/designsettings.php:139
msgid "On"
msgstr ""
-#: actions/designadminpanel.php:475 lib/designsettings.php:155
+#: actions/designadminpanel.php:542 lib/designsettings.php:155
msgid "Off"
msgstr ""
-#: actions/designadminpanel.php:476 lib/designsettings.php:156
+#: actions/designadminpanel.php:543 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr ""
-#: actions/designadminpanel.php:481 lib/designsettings.php:161
+#: actions/designadminpanel.php:548 lib/designsettings.php:161
msgid "Tile background image"
msgstr ""
-#: actions/designadminpanel.php:490 lib/designsettings.php:170
+#: actions/designadminpanel.php:554
+msgid "Background server"
+msgstr ""
+
+#: actions/designadminpanel.php:558
+msgid "Background path"
+msgstr ""
+
+#: actions/designadminpanel.php:562
+msgid "Background directory"
+msgstr ""
+
+#: actions/designadminpanel.php:569 lib/designsettings.php:170
#, fuzzy
msgid "Change colours"
msgstr "Parolayı değiştir"
-#: actions/designadminpanel.php:511 lib/designsettings.php:191
+#: actions/designadminpanel.php:591 lib/designsettings.php:191
#, fuzzy
msgid "Content"
msgstr "Bağlan"
-#: actions/designadminpanel.php:524 lib/designsettings.php:204
+#: actions/designadminpanel.php:604 lib/designsettings.php:204
#, fuzzy
msgid "Sidebar"
msgstr "Ara"
-#: actions/designadminpanel.php:537 lib/designsettings.php:217
+#: actions/designadminpanel.php:617 lib/designsettings.php:217
msgid "Text"
msgstr ""
-#: actions/designadminpanel.php:550 lib/designsettings.php:230
+#: actions/designadminpanel.php:630 lib/designsettings.php:230
#, fuzzy
msgid "Links"
msgstr "Giriş"
-#: actions/designadminpanel.php:611 lib/designsettings.php:247
+#: actions/designadminpanel.php:658 lib/designsettings.php:247
msgid "Use defaults"
msgstr ""
-#: actions/designadminpanel.php:612 lib/designsettings.php:248
+#: actions/designadminpanel.php:659 lib/designsettings.php:248
msgid "Restore default designs"
msgstr ""
-#: actions/designadminpanel.php:618 lib/designsettings.php:254
+#: actions/designadminpanel.php:665 lib/designsettings.php:254
msgid "Reset back to default"
msgstr ""
-#: actions/designadminpanel.php:620 actions/emailsettings.php:195
+#: actions/designadminpanel.php:667 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/profilesettings.php:167 actions/siteadminpanel.php:371
+#: actions/profilesettings.php:167 actions/siteadminpanel.php:414
#: actions/smssettings.php:181 actions/subscriptions.php:203
#: actions/tagother.php:154 actions/useradminpanel.php:226
#: lib/designsettings.php:256 lib/groupeditform.php:202
msgid "Save"
msgstr "Kaydet"
-#: actions/designadminpanel.php:621 lib/designsettings.php:257
+#: actions/designadminpanel.php:668 lib/designsettings.php:257
msgid "Save design"
msgstr ""
@@ -993,6 +1056,11 @@ msgstr "Hakkında bölümü çok uzun (azm 140 karakter)."
msgid "Could not update group."
msgstr "Kullanıcı güncellenemedi."
+#: actions/editgroup.php:259 classes/User_group.php:390
+#, fuzzy
+msgid "Could not create aliases."
+msgstr "Avatar bilgisi kaydedilemedi"
+
#: actions/editgroup.php:269
#, fuzzy
msgid "Options saved."
@@ -1108,7 +1176,7 @@ msgstr ""
msgid "Cannot normalize that email address"
msgstr ""
-#: actions/emailsettings.php:330 actions/siteadminpanel.php:156
+#: actions/emailsettings.php:330 actions/siteadminpanel.php:158
msgid "Not a valid email address"
msgstr ""
@@ -1806,10 +1874,10 @@ msgstr "Geçersiz durum mesajı"
msgid "Incorrect username or password."
msgstr "Yanlış kullanıcı adı veya parola."
-#: actions/login.php:149 actions/recoverpassword.php:375
-#: actions/register.php:248
-msgid "Error setting user."
-msgstr "Kullanıcı ayarlamada hata oluştu."
+#: actions/login.php:149
+#, fuzzy
+msgid "Error setting user. You are probably not authorized."
+msgstr "Yetkilendirilmemiş."
#: actions/login.php:204 actions/login.php:257 lib/action.php:457
#: lib/logingroupnav.php:79
@@ -2242,7 +2310,7 @@ msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:275
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:309
msgid "Language"
msgstr ""
@@ -2268,7 +2336,7 @@ msgstr ""
msgid "Bio is too long (max %d chars)."
msgstr "Hakkında bölümü çok uzun (azm 140 karakter)."
-#: actions/profilesettings.php:228 actions/siteadminpanel.php:163
+#: actions/profilesettings.php:228 actions/siteadminpanel.php:165
msgid "Timezone not selected."
msgstr ""
@@ -2513,6 +2581,10 @@ msgstr "Parola 6 veya daha fazla karakterden oluşmalıdır."
msgid "Password and confirmation do not match."
msgstr "Parola ve onaylaması birbirini tutmuyor."
+#: actions/recoverpassword.php:375 actions/register.php:248
+msgid "Error setting user."
+msgstr "Kullanıcı ayarlamada hata oluştu."
+
#: actions/recoverpassword.php:382
msgid "New password successfully saved. You are now logged in."
msgstr "Yeni parola başarıyla kaydedildi. Şimdi giriş yaptınız."
@@ -2574,7 +2646,7 @@ msgid "Same as password above. Required."
msgstr ""
#: actions/register.php:437 actions/register.php:441
-#: actions/siteadminpanel.php:253 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:287 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "Eposta"
@@ -2999,7 +3071,7 @@ msgstr ""
msgid "User is already silenced."
msgstr "Kullanıcının profili yok."
-#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:272
+#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:299
msgid "Site"
msgstr ""
@@ -3007,121 +3079,234 @@ msgstr ""
msgid "Basic settings for this StatusNet site."
msgstr ""
-#: actions/siteadminpanel.php:145
+#: actions/siteadminpanel.php:147
msgid "Site name must have non-zero length."
msgstr ""
-#: actions/siteadminpanel.php:153
+#: actions/siteadminpanel.php:155
#, fuzzy
msgid "You must have a valid contact email address"
msgstr "Geçersiz bir eposta adresi."
-#: actions/siteadminpanel.php:171
+#: actions/siteadminpanel.php:173
#, php-format
msgid "Unknown language \"%s\""
msgstr ""
-#: actions/siteadminpanel.php:178
+#: actions/siteadminpanel.php:180
msgid "Invalid snapshot report URL."
msgstr ""
-#: actions/siteadminpanel.php:184
+#: actions/siteadminpanel.php:186
msgid "Invalid snapshot run value."
msgstr ""
-#: actions/siteadminpanel.php:190
+#: actions/siteadminpanel.php:192
msgid "Snapshot frequency must be a number."
msgstr ""
-#: actions/siteadminpanel.php:241
+#: actions/siteadminpanel.php:199
+msgid "You must set an SSL sever when enabling SSL."
+msgstr ""
+
+#: actions/siteadminpanel.php:204
+msgid "Invalid SSL server. Max length is 255 characters."
+msgstr ""
+
+#: actions/siteadminpanel.php:210
+msgid "Minimum text limit is 140c."
+msgstr ""
+
+#: actions/siteadminpanel.php:216
+msgid "Dupe limit must 1 or more seconds."
+msgstr ""
+
+#: actions/siteadminpanel.php:224
+#, php-format
+msgid "Locales directory not readable: %s"
+msgstr ""
+
+#: actions/siteadminpanel.php:275
#, fuzzy
msgid "Site name"
msgstr "Yeni durum mesajı"
-#: actions/siteadminpanel.php:242
+#: actions/siteadminpanel.php:276
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr ""
-#: actions/siteadminpanel.php:245
+#: actions/siteadminpanel.php:279
msgid "Brought by"
msgstr ""
-#: actions/siteadminpanel.php:246
+#: actions/siteadminpanel.php:280
msgid "Text used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:249
+#: actions/siteadminpanel.php:283
msgid "Brought by URL"
msgstr ""
-#: actions/siteadminpanel.php:250
+#: actions/siteadminpanel.php:284
msgid "URL used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:254
+#: actions/siteadminpanel.php:288
#, fuzzy
msgid "contact email address for your site"
msgstr "Kullanıcı için kaydedilmiş eposta adresi yok."
-#: actions/siteadminpanel.php:268
+#: actions/siteadminpanel.php:302
msgid "Default timezone"
msgstr ""
-#: actions/siteadminpanel.php:269
+#: actions/siteadminpanel.php:303
msgid "Default timezone for the site; usually UTC."
msgstr ""
-#: actions/siteadminpanel.php:276
+#: actions/siteadminpanel.php:310
msgid "Default site language"
msgstr ""
-#: actions/siteadminpanel.php:282
+#: actions/siteadminpanel.php:316
+msgid "Path to locales"
+msgstr ""
+
+#: actions/siteadminpanel.php:316
+msgid "Directory path to locales"
+msgstr ""
+
+#: actions/siteadminpanel.php:320
+#, fuzzy
+msgid "Server"
+msgstr "Geri al"
+
+#: actions/siteadminpanel.php:320
+msgid "Site's server hostname."
+msgstr ""
+
+#: actions/siteadminpanel.php:324
+msgid "Path"
+msgstr ""
+
+#: actions/siteadminpanel.php:324
+#, fuzzy
+msgid "Site path"
+msgstr "Yeni durum mesajı"
+
+#: actions/siteadminpanel.php:328
+msgid "Fancy URLs"
+msgstr ""
+
+#: actions/siteadminpanel.php:330
+msgid "Use fancy (more readable and memorable) URLs?"
+msgstr ""
+
+#: actions/siteadminpanel.php:334
#, fuzzy
msgid "Private"
msgstr "Gizlilik"
-#: actions/siteadminpanel.php:284
+#: actions/siteadminpanel.php:336
msgid "Prohibit anonymous users (not logged in) from viewing site?"
msgstr ""
-#: actions/siteadminpanel.php:290
+#: actions/siteadminpanel.php:340
+msgid "Invite only"
+msgstr ""
+
+#: actions/siteadminpanel.php:342
+msgid "Make registration invitation only."
+msgstr ""
+
+#: actions/siteadminpanel.php:346 actions/useradminpanel.php:171
+#, fuzzy
+msgid "Closed"
+msgstr "Böyle bir kullanıcı yok."
+
+#: actions/siteadminpanel.php:348
+msgid "Disable new registrations."
+msgstr ""
+
+#: actions/siteadminpanel.php:353
msgid "Randomly during Web hit"
msgstr ""
-#: actions/siteadminpanel.php:291
+#: actions/siteadminpanel.php:354
msgid "In a scheduled job"
msgstr ""
-#: actions/siteadminpanel.php:292
+#: actions/siteadminpanel.php:355 actions/siteadminpanel.php:380
#, fuzzy
msgid "Never"
msgstr "Geri al"
-#: actions/siteadminpanel.php:294
+#: actions/siteadminpanel.php:357
msgid "Data snapshots"
msgstr ""
-#: actions/siteadminpanel.php:295
+#: actions/siteadminpanel.php:358
msgid "When to send statistical data to status.net servers"
msgstr ""
-#: actions/siteadminpanel.php:301
+#: actions/siteadminpanel.php:364
msgid "Frequency"
msgstr ""
-#: actions/siteadminpanel.php:302
+#: actions/siteadminpanel.php:365
msgid "Snapshots will be sent once every N Web hits"
msgstr ""
-#: actions/siteadminpanel.php:309
+#: actions/siteadminpanel.php:372
msgid "Report URL"
msgstr ""
-#: actions/siteadminpanel.php:310
+#: actions/siteadminpanel.php:373
msgid "Snapshots will be sent to this URL"
msgstr ""
-#: actions/siteadminpanel.php:371 actions/useradminpanel.php:226
+#: actions/siteadminpanel.php:381
+#, fuzzy
+msgid "Sometimes"
+msgstr "Durum mesajları"
+
+#: actions/siteadminpanel.php:382
+msgid "Always"
+msgstr ""
+
+#: actions/siteadminpanel.php:384
+msgid "Use SSL"
+msgstr ""
+
+#: actions/siteadminpanel.php:385
+msgid "When to use SSL"
+msgstr ""
+
+#: actions/siteadminpanel.php:391
+msgid "SSL Server"
+msgstr ""
+
+#: actions/siteadminpanel.php:392
+msgid "Server to direct SSL requests to"
+msgstr ""
+
+#: actions/siteadminpanel.php:396
+msgid "Text limit"
+msgstr ""
+
+#: actions/siteadminpanel.php:396
+msgid "Maximum number of characters for notices."
+msgstr ""
+
+#: actions/siteadminpanel.php:400
+msgid "Dupe limit"
+msgstr ""
+
+#: actions/siteadminpanel.php:400
+msgid "How long users must wait (in seconds) to post the same thing again."
+msgstr ""
+
+#: actions/siteadminpanel.php:414 actions/useradminpanel.php:226
#, fuzzy
msgid "Save site settings"
msgstr "Ayarlar"
@@ -3439,11 +3624,6 @@ msgstr ""
msgid "User settings for this StatusNet site."
msgstr ""
-#: actions/useradminpanel.php:171
-#, fuzzy
-msgid "Closed"
-msgstr "Böyle bir kullanıcı yok."
-
#: actions/useradminpanel.php:173
msgid "Is registration on this site prohibited?"
msgstr ""
@@ -3661,6 +3841,16 @@ msgstr "Durum mesajını kaydederken hata oluştu."
msgid "DB error inserting reply: %s"
msgstr "Cevap eklenirken veritabanı hatası: %s"
+#: classes/User_group.php:380
+#, fuzzy
+msgid "Could not create group."
+msgstr "Avatar bilgisi kaydedilemedi"
+
+#: classes/User_group.php:409
+#, fuzzy
+msgid "Could not set group membership."
+msgstr "Abonelik oluşturulamadı."
+
#: classes/User.php:347
#, php-format
msgid "Welcome to %1$s, @%2$s!"
@@ -3906,12 +4096,16 @@ msgstr ""
msgid "saveSettings() not implemented."
msgstr ""
-#: lib/adminpanelaction.php:273
+#: lib/adminpanelaction.php:247
+msgid "Unable to delete design setting."
+msgstr ""
+
+#: lib/adminpanelaction.php:300
#, fuzzy
msgid "Basic site configuration"
msgstr "Eposta adresi onayı"
-#: lib/adminpanelaction.php:276
+#: lib/adminpanelaction.php:303
#, fuzzy
msgid "Design configuration"
msgstr "Eposta adresi onayı"
@@ -4159,20 +4353,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:203
+#: lib/common.php:199
#, fuzzy
msgid "No configuration file found. "
msgstr "Onay kodu yok."
-#: lib/common.php:204
+#: lib/common.php:200
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:205
+#: lib/common.php:201
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:206
+#: lib/common.php:202
msgid "Go to the installer."
msgstr ""
@@ -4950,11 +5144,6 @@ msgstr ""
msgid "Top posters"
msgstr ""
-#: lib/unblockform.php:80
-#, fuzzy
-msgid "Unlock this user"
-msgstr "Böyle bir kullanıcı yok."
-
#: lib/unsandboxform.php:69
msgid "Unsandbox"
msgstr ""
@@ -5007,47 +5196,47 @@ msgstr ""
msgid "Message"
msgstr ""
-#: lib/util.php:821
+#: lib/util.php:826
msgid "a few seconds ago"
msgstr "birkaç saniye önce"
-#: lib/util.php:823
+#: lib/util.php:828
msgid "about a minute ago"
msgstr "yaklaşık bir dakika önce"
-#: lib/util.php:825
+#: lib/util.php:830
#, php-format
msgid "about %d minutes ago"
msgstr "yaklaşık %d dakika önce"
-#: lib/util.php:827
+#: lib/util.php:832
msgid "about an hour ago"
msgstr "yaklaşık bir saat önce"
-#: lib/util.php:829
+#: lib/util.php:834
#, php-format
msgid "about %d hours ago"
msgstr "yaklaşık %d saat önce"
-#: lib/util.php:831
+#: lib/util.php:836
msgid "about a day ago"
msgstr "yaklaşık bir gün önce"
-#: lib/util.php:833
+#: lib/util.php:838
#, php-format
msgid "about %d days ago"
msgstr "yaklaşık %d gün önce"
-#: lib/util.php:835
+#: lib/util.php:840
msgid "about a month ago"
msgstr "yaklaşık bir ay önce"
-#: lib/util.php:837
+#: lib/util.php:842
#, php-format
msgid "about %d months ago"
msgstr "yaklaşık %d ay önce"
-#: lib/util.php:839
+#: lib/util.php:844
msgid "about a year ago"
msgstr "yaklaşık bir yıl önce"
@@ -5078,5 +5267,9 @@ msgid "Sorry, no incoming email allowed."
msgstr ""
#, fuzzy
+#~ msgid "Unlock this user"
+#~ msgstr "Böyle bir kullanıcı yok."
+
+#, fuzzy
#~ msgid "These people are subscribed to you: "
#~ msgstr "Uzaktan abonelik"
diff --git a/locale/uk/LC_MESSAGES/statusnet.po b/locale/uk/LC_MESSAGES/statusnet.po
index 4db942e5d..94db9c503 100644
--- a/locale/uk/LC_MESSAGES/statusnet.po
+++ b/locale/uk/LC_MESSAGES/statusnet.po
@@ -1,15 +1,18 @@
# Translation of StatusNet to Ukrainian
#
# --
+# 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-18 19:31+0000\n"
+"POT-Creation-Date: 2009-11-19 10:43+0000\n"
"PO-Revision-Date: 2009-11-18 19:32:48+0000\n"
"Language-Team: Ukrainian\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10< =4 && (n%100<10 or n%100>=20) ? 1 : 2);\n"
"X-Generator: MediaWiki 1.16alpha(r59207); Translate extension (2009-11-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: uk\n"
@@ -145,7 +148,7 @@ msgstr "Не вдалося оновити користувача."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
-#: actions/designadminpanel.php:125 actions/newnotice.php:94
+#: actions/designadminpanel.php:122 actions/newnotice.php:94
#: lib/designsettings.php:283
#, php-format
msgid ""
@@ -230,7 +233,7 @@ msgstr "Всі прямі повідомлення надіслані до %s"
#: 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:184 actions/apigroupismember.php:114
+#: 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
@@ -299,21 +302,7 @@ msgstr "Не вдається відновити загальний потік."
msgid "Could not find target user."
msgstr "Жодних статусів не виявлено."
-#: actions/apigroupcreate.php:136 actions/newgroup.php:204
-msgid "Could not create group."
-msgstr "Не вдалося створити нову групу"
-
-#: actions/apigroupcreate.php:147 actions/editgroup.php:259
-#: actions/newgroup.php:210
-#, fuzzy
-msgid "Could not create aliases."
-msgstr "Не можна позначити як обране."
-
-#: actions/apigroupcreate.php:166 actions/newgroup.php:224
-msgid "Could not set group membership."
-msgstr "Не вдалося встановити членство."
-
-#: actions/apigroupcreate.php:212 actions/editgroup.php:182
+#: actions/apigroupcreate.php:164 actions/editgroup.php:182
#: actions/newgroup.php:126 actions/profilesettings.php:208
#: actions/register.php:205
msgid "Nickname must have only lowercase letters and numbers and no spaces."
@@ -321,60 +310,60 @@ msgstr ""
"Ім'я користувача повинно складатись з літер нижнього регістру і цифр, ніяких "
"інтервалів."
-#: actions/apigroupcreate.php:221 actions/editgroup.php:186
+#: 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 "Це ім'я вже використовується. Спробуйте інше."
-#: actions/apigroupcreate.php:228 actions/editgroup.php:189
+#: 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 "Це недійсне ім'я користувача."
-#: actions/apigroupcreate.php:244 actions/editgroup.php:195
+#: 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 "Веб-сторінка має недійсну URL-адресу."
-#: actions/apigroupcreate.php:253 actions/editgroup.php:198
+#: 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 "Повне ім'я задовге (255 знаків максимум)"
-#: actions/apigroupcreate.php:261
+#: actions/apigroupcreate.php:213
#, fuzzy, php-format
msgid "Description is too long (max %d chars)."
msgstr "опис надто довгий (140 знаків максимум)"
-#: actions/apigroupcreate.php:272 actions/editgroup.php:204
+#: 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 "Локація надто довга (255 знаків максимум)"
-#: actions/apigroupcreate.php:291 actions/editgroup.php:215
+#: actions/apigroupcreate.php:243 actions/editgroup.php:215
#: actions/newgroup.php:159
#, php-format
msgid "Too many aliases! Maximum %d."
msgstr ""
-#: actions/apigroupcreate.php:312 actions/editgroup.php:224
+#: actions/apigroupcreate.php:264 actions/editgroup.php:224
#: actions/newgroup.php:168
#, fuzzy, php-format
msgid "Invalid alias: \"%s\""
msgstr "Недійсний тег: \"%s\""
-#: actions/apigroupcreate.php:321 actions/editgroup.php:228
+#: actions/apigroupcreate.php:273 actions/editgroup.php:228
#: actions/newgroup.php:172
#, fuzzy, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr "Це ім'я вже використовується. Спробуйте інше."
-#: actions/apigroupcreate.php:334 actions/editgroup.php:234
+#: actions/apigroupcreate.php:286 actions/editgroup.php:234
#: actions/newgroup.php:178
msgid "Alias can't be the same as nickname."
msgstr ""
@@ -600,10 +589,10 @@ msgid "There was a problem with your session token. Try again, please."
msgstr ""
"Виникли певні проблеми з токеном поточної сесії. Спробуйте знов, будь ласка."
-#: actions/avatarsettings.php:277 actions/emailsettings.php:255
-#: actions/grouplogo.php:319 actions/imsettings.php:220
-#: actions/recoverpassword.php:44 actions/smssettings.php:248
-#: lib/designsettings.php:304
+#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
+#: actions/emailsettings.php:255 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/recoverpassword.php:44
+#: actions/smssettings.php:248 lib/designsettings.php:304
msgid "Unexpected form submission."
msgstr "Несподіване представлення форми."
@@ -666,7 +655,7 @@ msgstr "Спроба розблокувати користувача невда
msgid "Unblock"
msgstr "Розблокувати"
-#: actions/blockedfromgroup.php:313
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:80
msgid "Unblock this user"
msgstr "Розблокувати цього користувача"
@@ -843,7 +832,7 @@ msgid "Delete this user"
msgstr "Видалити повідомлення"
#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124
-#: lib/adminpanelaction.php:275 lib/groupnav.php:119
+#: lib/adminpanelaction.php:302 lib/groupnav.php:119
msgid "Design"
msgstr ""
@@ -851,108 +840,183 @@ msgstr ""
msgid "Design settings for this StatusNet site."
msgstr ""
-#: actions/designadminpanel.php:220
+#: actions/designadminpanel.php:278
#, fuzzy
-msgid "Unable to delete design setting."
-msgstr "Не маю можливості зберегти ваші налаштування Твіттера!"
+msgid "Invalid logo URL."
+msgstr "Недійсний розмір."
-#: actions/designadminpanel.php:301
+#: actions/designadminpanel.php:282
#, fuzzy, php-format
msgid "Theme not available: %s"
msgstr "Ця сторінка не доступна в "
-#: actions/designadminpanel.php:406
+#: actions/designadminpanel.php:288
+#, fuzzy, php-format
+msgid "Theme directory not readable: %s"
+msgstr "Ця сторінка не доступна в "
+
+#: actions/designadminpanel.php:292
+#, php-format
+msgid "Avatar directory not writable: %s"
+msgstr ""
+
+#: actions/designadminpanel.php:296
+#, php-format
+msgid "Background directory not writable: %s"
+msgstr ""
+
+#: actions/designadminpanel.php:312
+#, php-format
+msgid "Max length for %s %s is 255 characters."
+msgstr ""
+
+#: actions/designadminpanel.php:412
+#, fuzzy
+msgid "Change logo"
+msgstr "Змінити ваш пароль"
+
+#: actions/designadminpanel.php:417
+#, fuzzy
+msgid "Site logo"
+msgstr "Запросити"
+
+#: actions/designadminpanel.php:424
#, fuzzy
msgid "Change theme"
msgstr "Змінити"
-#: actions/designadminpanel.php:410
-msgid "Theme"
-msgstr ""
+#: actions/designadminpanel.php:441
+#, fuzzy
+msgid "Site theme"
+msgstr "Зауваження сайту"
-#: actions/designadminpanel.php:411
+#: actions/designadminpanel.php:442
#, fuzzy
msgid "Theme for the site."
msgstr "Вийти з сайту"
-#: actions/designadminpanel.php:420 lib/designsettings.php:101
+#: actions/designadminpanel.php:447
+msgid "Theme server"
+msgstr ""
+
+#: actions/designadminpanel.php:451
+msgid "Theme path"
+msgstr ""
+
+#: actions/designadminpanel.php:455
+msgid "Theme directory"
+msgstr ""
+
+#: actions/designadminpanel.php:462
+#, fuzzy
+msgid "Avatar Settings"
+msgstr "Налаштування аватари"
+
+#: actions/designadminpanel.php:467
+#, fuzzy
+msgid "Avatar server"
+msgstr "Налаштування аватари"
+
+#: actions/designadminpanel.php:471
+#, fuzzy
+msgid "Avatar path"
+msgstr "Аватару оновлено."
+
+#: actions/designadminpanel.php:475
+#, fuzzy
+msgid "Avatar directory"
+msgstr "Аватару оновлено."
+
+#: actions/designadminpanel.php:486 lib/designsettings.php:101
msgid "Change background image"
msgstr ""
-#: actions/designadminpanel.php:424 actions/designadminpanel.php:498
+#: actions/designadminpanel.php:491 actions/designadminpanel.php:578
#: lib/designsettings.php:178
msgid "Background"
msgstr ""
-#: actions/designadminpanel.php:429
+#: actions/designadminpanel.php:496
#, fuzzy, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
"$s."
msgstr "Ви маєте можливість завантажити логотип для вашої группи."
-#: actions/designadminpanel.php:459 lib/designsettings.php:139
+#: actions/designadminpanel.php:526 lib/designsettings.php:139
msgid "On"
msgstr ""
-#: actions/designadminpanel.php:475 lib/designsettings.php:155
+#: actions/designadminpanel.php:542 lib/designsettings.php:155
msgid "Off"
msgstr ""
-#: actions/designadminpanel.php:476 lib/designsettings.php:156
+#: actions/designadminpanel.php:543 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr ""
-#: actions/designadminpanel.php:481 lib/designsettings.php:161
+#: actions/designadminpanel.php:548 lib/designsettings.php:161
msgid "Tile background image"
msgstr ""
-#: actions/designadminpanel.php:490 lib/designsettings.php:170
+#: actions/designadminpanel.php:554
+msgid "Background server"
+msgstr ""
+
+#: actions/designadminpanel.php:558
+msgid "Background path"
+msgstr ""
+
+#: actions/designadminpanel.php:562
+msgid "Background directory"
+msgstr ""
+
+#: actions/designadminpanel.php:569 lib/designsettings.php:170
#, fuzzy
msgid "Change colours"
msgstr "Змінити ваш пароль"
-#: actions/designadminpanel.php:511 lib/designsettings.php:191
+#: actions/designadminpanel.php:591 lib/designsettings.php:191
#, fuzzy
msgid "Content"
msgstr "З'єднання"
-#: actions/designadminpanel.php:524 lib/designsettings.php:204
+#: actions/designadminpanel.php:604 lib/designsettings.php:204
#, fuzzy
msgid "Sidebar"
msgstr "Пошук"
-#: actions/designadminpanel.php:537 lib/designsettings.php:217
+#: actions/designadminpanel.php:617 lib/designsettings.php:217
msgid "Text"
msgstr "Текст"
-#: actions/designadminpanel.php:550 lib/designsettings.php:230
+#: actions/designadminpanel.php:630 lib/designsettings.php:230
#, fuzzy
msgid "Links"
msgstr "Увійти"
-#: actions/designadminpanel.php:611 lib/designsettings.php:247
+#: actions/designadminpanel.php:658 lib/designsettings.php:247
msgid "Use defaults"
msgstr ""
-#: actions/designadminpanel.php:612 lib/designsettings.php:248
+#: actions/designadminpanel.php:659 lib/designsettings.php:248
msgid "Restore default designs"
msgstr ""
-#: actions/designadminpanel.php:618 lib/designsettings.php:254
+#: actions/designadminpanel.php:665 lib/designsettings.php:254
msgid "Reset back to default"
msgstr ""
-#: actions/designadminpanel.php:620 actions/emailsettings.php:195
+#: actions/designadminpanel.php:667 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/profilesettings.php:167 actions/siteadminpanel.php:371
+#: actions/profilesettings.php:167 actions/siteadminpanel.php:414
#: actions/smssettings.php:181 actions/subscriptions.php:203
#: actions/tagother.php:154 actions/useradminpanel.php:226
#: lib/designsettings.php:256 lib/groupeditform.php:202
msgid "Save"
msgstr "Зберегти"
-#: actions/designadminpanel.php:621 lib/designsettings.php:257
+#: actions/designadminpanel.php:668 lib/designsettings.php:257
msgid "Save design"
msgstr ""
@@ -995,6 +1059,11 @@ msgstr "опис надто довгий (140 знаків максимум)"
msgid "Could not update group."
msgstr "Не вдалося оновити групу."
+#: actions/editgroup.php:259 classes/User_group.php:390
+#, fuzzy
+msgid "Could not create aliases."
+msgstr "Не можна позначити як обране."
+
#: actions/editgroup.php:269
msgid "Options saved."
msgstr "Опції збережено."
@@ -1113,7 +1182,7 @@ msgstr "Немає електронної адреси."
msgid "Cannot normalize that email address"
msgstr "Не можна полагодити цю поштову адресу"
-#: actions/emailsettings.php:330 actions/siteadminpanel.php:156
+#: actions/emailsettings.php:330 actions/siteadminpanel.php:158
msgid "Not a valid email address"
msgstr "Це недійсна електронна адреса"
@@ -1852,10 +1921,10 @@ msgstr "Недійсний зміст повідомлення"
msgid "Incorrect username or password."
msgstr "Неточне ім'я або пароль."
-#: actions/login.php:149 actions/recoverpassword.php:375
-#: actions/register.php:248
-msgid "Error setting user."
-msgstr "Помилка в налаштуваннях користувача."
+#: actions/login.php:149
+#, fuzzy
+msgid "Error setting user. You are probably not authorized."
+msgstr "Не авторизовано."
#: actions/login.php:204 actions/login.php:257 lib/action.php:457
#: lib/logingroupnav.php:79
@@ -2290,7 +2359,7 @@ msgstr ""
"Позначте себе тегами (літери, цифри, -, . та _), відокремлюючи кожен комою "
"або пробілом"
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:275
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:309
msgid "Language"
msgstr "Мова"
@@ -2318,7 +2387,7 @@ msgstr ""
msgid "Bio is too long (max %d chars)."
msgstr "Ви перевищили ліміт (140 знаків це максимум)"
-#: actions/profilesettings.php:228 actions/siteadminpanel.php:163
+#: actions/profilesettings.php:228 actions/siteadminpanel.php:165
msgid "Timezone not selected."
msgstr "Часовий пояс не обрано."
@@ -2564,6 +2633,10 @@ msgstr "Пароль має складатись з 6-ти або більше
msgid "Password and confirmation do not match."
msgstr "Пароль та підтвердження не співпадають."
+#: actions/recoverpassword.php:375 actions/register.php:248
+msgid "Error setting user."
+msgstr "Помилка в налаштуваннях користувача."
+
#: actions/recoverpassword.php:382
msgid "New password successfully saved. You are now logged in."
msgstr "Новий пароль успішно збережено. Тепер ви увійшли."
@@ -2628,7 +2701,7 @@ msgid "Same as password above. Required."
msgstr "Такий само, як і пароль вище. Неодмінно."
#: actions/register.php:437 actions/register.php:441
-#: actions/siteadminpanel.php:253 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:287 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "Пошта"
@@ -3077,7 +3150,7 @@ msgstr "Ви не можете надіслати повідомлення ць
msgid "User is already silenced."
msgstr "Користувач заблокував вас."
-#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:272
+#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:299
#, fuzzy
msgid "Site"
msgstr "Запросити"
@@ -3086,122 +3159,236 @@ msgstr "Запросити"
msgid "Basic settings for this StatusNet site."
msgstr ""
-#: actions/siteadminpanel.php:145
+#: actions/siteadminpanel.php:147
msgid "Site name must have non-zero length."
msgstr ""
-#: actions/siteadminpanel.php:153
+#: actions/siteadminpanel.php:155
#, fuzzy
msgid "You must have a valid contact email address"
msgstr "Це недійсна електронна адреса"
-#: actions/siteadminpanel.php:171
+#: actions/siteadminpanel.php:173
#, php-format
msgid "Unknown language \"%s\""
msgstr ""
-#: actions/siteadminpanel.php:178
+#: actions/siteadminpanel.php:180
msgid "Invalid snapshot report URL."
msgstr ""
-#: actions/siteadminpanel.php:184
+#: actions/siteadminpanel.php:186
msgid "Invalid snapshot run value."
msgstr ""
-#: actions/siteadminpanel.php:190
+#: actions/siteadminpanel.php:192
msgid "Snapshot frequency must be a number."
msgstr ""
-#: actions/siteadminpanel.php:241
+#: actions/siteadminpanel.php:199
+msgid "You must set an SSL sever when enabling SSL."
+msgstr ""
+
+#: actions/siteadminpanel.php:204
+msgid "Invalid SSL server. Max length is 255 characters."
+msgstr ""
+
+#: actions/siteadminpanel.php:210
+msgid "Minimum text limit is 140c."
+msgstr ""
+
+#: actions/siteadminpanel.php:216
+msgid "Dupe limit must 1 or more seconds."
+msgstr ""
+
+#: actions/siteadminpanel.php:224
+#, php-format
+msgid "Locales directory not readable: %s"
+msgstr ""
+
+#: actions/siteadminpanel.php:275
#, fuzzy
msgid "Site name"
msgstr "Зауваження сайту"
-#: actions/siteadminpanel.php:242
+#: actions/siteadminpanel.php:276
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr ""
-#: actions/siteadminpanel.php:245
+#: actions/siteadminpanel.php:279
msgid "Brought by"
msgstr ""
-#: actions/siteadminpanel.php:246
+#: actions/siteadminpanel.php:280
msgid "Text used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:249
+#: actions/siteadminpanel.php:283
msgid "Brought by URL"
msgstr ""
-#: actions/siteadminpanel.php:250
+#: actions/siteadminpanel.php:284
msgid "URL used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:254
+#: actions/siteadminpanel.php:288
#, fuzzy
msgid "contact email address for your site"
msgstr "Нова електронна адреса для надсилання повідомлень на %s"
-#: actions/siteadminpanel.php:268
+#: actions/siteadminpanel.php:302
msgid "Default timezone"
msgstr ""
-#: actions/siteadminpanel.php:269
+#: actions/siteadminpanel.php:303
msgid "Default timezone for the site; usually UTC."
msgstr ""
-#: actions/siteadminpanel.php:276
+#: actions/siteadminpanel.php:310
#, fuzzy
msgid "Default site language"
msgstr "Мова, якій надаєте перевагу"
-#: actions/siteadminpanel.php:282
+#: actions/siteadminpanel.php:316
+msgid "Path to locales"
+msgstr ""
+
+#: actions/siteadminpanel.php:316
+msgid "Directory path to locales"
+msgstr ""
+
+#: actions/siteadminpanel.php:320
+#, fuzzy
+msgid "Server"
+msgstr "Відновити"
+
+#: actions/siteadminpanel.php:320
+msgid "Site's server hostname."
+msgstr ""
+
+#: actions/siteadminpanel.php:324
+msgid "Path"
+msgstr ""
+
+#: actions/siteadminpanel.php:324
+#, fuzzy
+msgid "Site path"
+msgstr "Зауваження сайту"
+
+#: actions/siteadminpanel.php:328
+msgid "Fancy URLs"
+msgstr ""
+
+#: actions/siteadminpanel.php:330
+msgid "Use fancy (more readable and memorable) URLs?"
+msgstr ""
+
+#: actions/siteadminpanel.php:334
#, fuzzy
msgid "Private"
msgstr "Конфіденційність"
-#: actions/siteadminpanel.php:284
+#: actions/siteadminpanel.php:336
msgid "Prohibit anonymous users (not logged in) from viewing site?"
msgstr ""
-#: actions/siteadminpanel.php:290
+#: actions/siteadminpanel.php:340
+#, fuzzy
+msgid "Invite only"
+msgstr "Запросити"
+
+#: actions/siteadminpanel.php:342
+msgid "Make registration invitation only."
+msgstr ""
+
+#: actions/siteadminpanel.php:346 actions/useradminpanel.php:171
+#, fuzzy
+msgid "Closed"
+msgstr "Блок"
+
+#: actions/siteadminpanel.php:348
+msgid "Disable new registrations."
+msgstr ""
+
+#: actions/siteadminpanel.php:353
msgid "Randomly during Web hit"
msgstr ""
-#: actions/siteadminpanel.php:291
+#: actions/siteadminpanel.php:354
msgid "In a scheduled job"
msgstr ""
-#: actions/siteadminpanel.php:292
+#: actions/siteadminpanel.php:355 actions/siteadminpanel.php:380
#, fuzzy
msgid "Never"
msgstr "Відновити"
-#: actions/siteadminpanel.php:294
+#: actions/siteadminpanel.php:357
msgid "Data snapshots"
msgstr ""
-#: actions/siteadminpanel.php:295
+#: actions/siteadminpanel.php:358
msgid "When to send statistical data to status.net servers"
msgstr ""
-#: actions/siteadminpanel.php:301
+#: actions/siteadminpanel.php:364
msgid "Frequency"
msgstr ""
-#: actions/siteadminpanel.php:302
+#: actions/siteadminpanel.php:365
msgid "Snapshots will be sent once every N Web hits"
msgstr ""
-#: actions/siteadminpanel.php:309
+#: actions/siteadminpanel.php:372
msgid "Report URL"
msgstr ""
-#: actions/siteadminpanel.php:310
+#: actions/siteadminpanel.php:373
msgid "Snapshots will be sent to this URL"
msgstr ""
-#: actions/siteadminpanel.php:371 actions/useradminpanel.php:226
+#: actions/siteadminpanel.php:381
+#, fuzzy
+msgid "Sometimes"
+msgstr "Повідомлення"
+
+#: actions/siteadminpanel.php:382
+msgid "Always"
+msgstr ""
+
+#: actions/siteadminpanel.php:384
+msgid "Use SSL"
+msgstr ""
+
+#: actions/siteadminpanel.php:385
+msgid "When to use SSL"
+msgstr ""
+
+#: actions/siteadminpanel.php:391
+msgid "SSL Server"
+msgstr ""
+
+#: actions/siteadminpanel.php:392
+msgid "Server to direct SSL requests to"
+msgstr ""
+
+#: actions/siteadminpanel.php:396
+msgid "Text limit"
+msgstr ""
+
+#: actions/siteadminpanel.php:396
+msgid "Maximum number of characters for notices."
+msgstr ""
+
+#: actions/siteadminpanel.php:400
+msgid "Dupe limit"
+msgstr ""
+
+#: actions/siteadminpanel.php:400
+msgid "How long users must wait (in seconds) to post the same thing again."
+msgstr ""
+
+#: actions/siteadminpanel.php:414 actions/useradminpanel.php:226
#, fuzzy
msgid "Save site settings"
msgstr "Налаштування аватари"
@@ -3518,11 +3705,6 @@ msgstr "Користувач"
msgid "User settings for this StatusNet site."
msgstr ""
-#: actions/useradminpanel.php:171
-#, fuzzy
-msgid "Closed"
-msgstr "Блок"
-
#: actions/useradminpanel.php:173
msgid "Is registration on this site prohibited?"
msgstr ""
@@ -3755,6 +3937,14 @@ msgstr "Проблема при збереженні повідомлення."
msgid "DB error inserting reply: %s"
msgstr "Помилка бази даних при додаванні відповіді: %s"
+#: classes/User_group.php:380
+msgid "Could not create group."
+msgstr "Не вдалося створити нову групу"
+
+#: classes/User_group.php:409
+msgid "Could not set group membership."
+msgstr "Не вдалося встановити членство."
+
#: classes/User.php:347
#, fuzzy, php-format
msgid "Welcome to %1$s, @%2$s!"
@@ -3995,12 +4185,17 @@ msgstr "Виконання команди ще не завершено."
msgid "saveSettings() not implemented."
msgstr "Виконання команди ще не завершено."
-#: lib/adminpanelaction.php:273
+#: lib/adminpanelaction.php:247
+#, fuzzy
+msgid "Unable to delete design setting."
+msgstr "Не маю можливості зберегти ваші налаштування Твіттера!"
+
+#: lib/adminpanelaction.php:300
#, fuzzy
msgid "Basic site configuration"
msgstr "Підтвердження електронної адреси"
-#: lib/adminpanelaction.php:276
+#: lib/adminpanelaction.php:303
#, fuzzy
msgid "Design configuration"
msgstr "Підтвердження СМС"
@@ -4248,20 +4443,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:203
+#: lib/common.php:199
#, fuzzy
msgid "No configuration file found. "
msgstr "Немає коду підтвердження."
-#: lib/common.php:204
+#: lib/common.php:200
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:205
+#: lib/common.php:201
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:206
+#: lib/common.php:202
#, fuzzy
msgid "Go to the installer."
msgstr "Увійти на сайт"
@@ -5036,11 +5231,6 @@ msgstr "Пусто"
msgid "Top posters"
msgstr "Топ дописувачів"
-#: lib/unblockform.php:80
-#, fuzzy
-msgid "Unlock this user"
-msgstr "Розблокувати цього користувача"
-
#: lib/unsandboxform.php:69
msgid "Unsandbox"
msgstr ""
@@ -5093,47 +5283,47 @@ msgstr "Надіслати пряме повідомлення цьому кор
msgid "Message"
msgstr "Повідомлення"
-#: lib/util.php:821
+#: lib/util.php:826
msgid "a few seconds ago"
msgstr "мить тому"
-#: lib/util.php:823
+#: lib/util.php:828
msgid "about a minute ago"
msgstr "хвилину тому"
-#: lib/util.php:825
+#: lib/util.php:830
#, php-format
msgid "about %d minutes ago"
msgstr "близько %d хвилин тому"
-#: lib/util.php:827
+#: lib/util.php:832
msgid "about an hour ago"
msgstr "годину тому"
-#: lib/util.php:829
+#: lib/util.php:834
#, php-format
msgid "about %d hours ago"
msgstr "близько %d годин тому"
-#: lib/util.php:831
+#: lib/util.php:836
msgid "about a day ago"
msgstr "день тому"
-#: lib/util.php:833
+#: lib/util.php:838
#, php-format
msgid "about %d days ago"
msgstr "близько %d днів тому"
-#: lib/util.php:835
+#: lib/util.php:840
msgid "about a month ago"
msgstr "місяць тому"
-#: lib/util.php:837
+#: lib/util.php:842
#, php-format
msgid "about %d months ago"
msgstr "близько %d місяців тому"
-#: lib/util.php:839
+#: lib/util.php:844
msgid "about a year ago"
msgstr "рік тому"
@@ -5165,5 +5355,9 @@ msgstr ""
"Вибачте, але не затверджено жодної електронної адреси для вхідної пошти."
#, fuzzy
+#~ msgid "Unlock this user"
+#~ msgstr "Розблокувати цього користувача"
+
+#, fuzzy
#~ msgid "These people are subscribed to you: "
#~ msgstr "Люди підписані до %s"
diff --git a/locale/vi/LC_MESSAGES/statusnet.po b/locale/vi/LC_MESSAGES/statusnet.po
index 94b4c9be6..0fe1fed57 100644
--- a/locale/vi/LC_MESSAGES/statusnet.po
+++ b/locale/vi/LC_MESSAGES/statusnet.po
@@ -1,15 +1,18 @@
# Translation of StatusNet to Vietnamese
#
# --
+# 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-18 19:31+0000\n"
+"POT-Creation-Date: 2009-11-19 10:43+0000\n"
"PO-Revision-Date: 2009-11-18 19:32:50+0000\n"
"Language-Team: Vietnamese\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: MediaWiki 1.16alpha(r59207); Translate extension (2009-11-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: vi\n"
@@ -145,7 +148,7 @@ msgstr "Không thể cập nhật thành viên."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
-#: actions/designadminpanel.php:125 actions/newnotice.php:94
+#: actions/designadminpanel.php:122 actions/newnotice.php:94
#: lib/designsettings.php:283
#, php-format
msgid ""
@@ -231,7 +234,7 @@ msgstr ""
#: 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:184 actions/apigroupismember.php:114
+#: 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
@@ -302,82 +305,66 @@ msgstr "Không thể lấy lại các tin nhắn ưa thích"
msgid "Could not find target user."
msgstr "Không tìm thấy bất kỳ trạng thái nào."
-#: actions/apigroupcreate.php:136 actions/newgroup.php:204
-#, fuzzy
-msgid "Could not create group."
-msgstr "Không thể tạo favorite."
-
-#: actions/apigroupcreate.php:147 actions/editgroup.php:259
-#: actions/newgroup.php:210
-#, fuzzy
-msgid "Could not create aliases."
-msgstr "Không thể tạo favorite."
-
-#: actions/apigroupcreate.php:166 actions/newgroup.php:224
-#, fuzzy
-msgid "Could not set group membership."
-msgstr "Không thể tạo đăng nhận."
-
-#: actions/apigroupcreate.php:212 actions/editgroup.php:182
+#: actions/apigroupcreate.php:164 actions/editgroup.php:182
#: actions/newgroup.php:126 actions/profilesettings.php:208
#: actions/register.php:205
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr "Biệt hiệu phải là chữ viết thường hoặc số và không có khoảng trắng."
-#: actions/apigroupcreate.php:221 actions/editgroup.php:186
+#: 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 "Biệt hiệu này đã dùng rồi. Hãy nhập biệt hiệu khác."
-#: actions/apigroupcreate.php:228 actions/editgroup.php:189
+#: 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 "Biệt hiệu không hợp lệ."
-#: actions/apigroupcreate.php:244 actions/editgroup.php:195
+#: 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 "Trang chủ không phải là URL"
-#: actions/apigroupcreate.php:253 actions/editgroup.php:198
+#: 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 "Tên đầy đủ quá dài (tối đa là 255 ký tự)."
-#: actions/apigroupcreate.php:261
+#: actions/apigroupcreate.php:213
#, fuzzy, php-format
msgid "Description is too long (max %d chars)."
msgstr "Lý lịch quá dài (không quá 140 ký tự)"
-#: actions/apigroupcreate.php:272 actions/editgroup.php:204
+#: 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 "Tên khu vực quá dài (không quá 255 ký tự)."
-#: actions/apigroupcreate.php:291 actions/editgroup.php:215
+#: actions/apigroupcreate.php:243 actions/editgroup.php:215
#: actions/newgroup.php:159
#, php-format
msgid "Too many aliases! Maximum %d."
msgstr ""
-#: actions/apigroupcreate.php:312 actions/editgroup.php:224
+#: actions/apigroupcreate.php:264 actions/editgroup.php:224
#: actions/newgroup.php:168
#, fuzzy, php-format
msgid "Invalid alias: \"%s\""
msgstr "Trang chủ '%s' không hợp lệ"
-#: actions/apigroupcreate.php:321 actions/editgroup.php:228
+#: actions/apigroupcreate.php:273 actions/editgroup.php:228
#: actions/newgroup.php:172
#, fuzzy, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr "Biệt hiệu này đã dùng rồi. Hãy nhập biệt hiệu khác."
-#: actions/apigroupcreate.php:334 actions/editgroup.php:234
+#: actions/apigroupcreate.php:286 actions/editgroup.php:234
#: actions/newgroup.php:178
msgid "Alias can't be the same as nickname."
msgstr ""
@@ -608,10 +595,10 @@ msgstr "Nhóm"
msgid "There was a problem with your session token. Try again, please."
msgstr "Có lỗi xảy ra khi thao tác. Hãy thử lại lần nữa."
-#: actions/avatarsettings.php:277 actions/emailsettings.php:255
-#: actions/grouplogo.php:319 actions/imsettings.php:220
-#: actions/recoverpassword.php:44 actions/smssettings.php:248
-#: lib/designsettings.php:304
+#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
+#: actions/emailsettings.php:255 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/recoverpassword.php:44
+#: actions/smssettings.php:248 lib/designsettings.php:304
msgid "Unexpected form submission."
msgstr "Bất ngờ gửi mẫu thông tin. "
@@ -675,7 +662,7 @@ msgstr "Bỏ chặn người dùng này"
msgid "Unblock"
msgstr "Bỏ chặn"
-#: actions/blockedfromgroup.php:313
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:80
msgid "Unblock this user"
msgstr "Bỏ chặn người dùng này"
@@ -851,7 +838,7 @@ msgid "Delete this user"
msgstr "Xóa tin nhắn"
#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124
-#: lib/adminpanelaction.php:275 lib/groupnav.php:119
+#: lib/adminpanelaction.php:302 lib/groupnav.php:119
msgid "Design"
msgstr ""
@@ -859,41 +846,104 @@ msgstr ""
msgid "Design settings for this StatusNet site."
msgstr ""
-#: actions/designadminpanel.php:220
+#: actions/designadminpanel.php:278
#, fuzzy
-msgid "Unable to delete design setting."
-msgstr "Không thể lưu thông tin Twitter của bạn!"
+msgid "Invalid logo URL."
+msgstr "Kích thước không hợp lệ."
-#: actions/designadminpanel.php:301
+#: actions/designadminpanel.php:282
#, fuzzy, php-format
msgid "Theme not available: %s"
msgstr "Trang này không phải là phương tiện truyền thông mà bạn chấp nhận."
-#: actions/designadminpanel.php:406
+#: actions/designadminpanel.php:288
+#, fuzzy, php-format
+msgid "Theme directory not readable: %s"
+msgstr "Trang này không phải là phương tiện truyền thông mà bạn chấp nhận."
+
+#: actions/designadminpanel.php:292
+#, php-format
+msgid "Avatar directory not writable: %s"
+msgstr ""
+
+#: actions/designadminpanel.php:296
+#, php-format
+msgid "Background directory not writable: %s"
+msgstr ""
+
+#: actions/designadminpanel.php:312
+#, php-format
+msgid "Max length for %s %s is 255 characters."
+msgstr ""
+
+#: actions/designadminpanel.php:412
+#, fuzzy
+msgid "Change logo"
+msgstr "Thay đổi mật khẩu của bạn"
+
+#: actions/designadminpanel.php:417
+#, fuzzy
+msgid "Site logo"
+msgstr "Thư mời"
+
+#: actions/designadminpanel.php:424
#, fuzzy
msgid "Change theme"
msgstr "Thay đổi"
-#: actions/designadminpanel.php:410
-msgid "Theme"
-msgstr ""
+#: actions/designadminpanel.php:441
+#, fuzzy
+msgid "Site theme"
+msgstr "Thông báo mới"
-#: actions/designadminpanel.php:411
+#: actions/designadminpanel.php:442
msgid "Theme for the site."
msgstr ""
-#: actions/designadminpanel.php:420 lib/designsettings.php:101
+#: actions/designadminpanel.php:447
+msgid "Theme server"
+msgstr ""
+
+#: actions/designadminpanel.php:451
+msgid "Theme path"
+msgstr ""
+
+#: actions/designadminpanel.php:455
+msgid "Theme directory"
+msgstr ""
+
+#: actions/designadminpanel.php:462
+#, fuzzy
+msgid "Avatar Settings"
+msgstr "Thay đổi hình đại diện"
+
+#: actions/designadminpanel.php:467
+#, fuzzy
+msgid "Avatar server"
+msgstr "Thay đổi hình đại diện"
+
+#: actions/designadminpanel.php:471
+#, fuzzy
+msgid "Avatar path"
+msgstr "Hình đại diện đã được cập nhật."
+
+#: actions/designadminpanel.php:475
+#, fuzzy
+msgid "Avatar directory"
+msgstr "Hình đại diện đã được cập nhật."
+
+#: actions/designadminpanel.php:486 lib/designsettings.php:101
#, fuzzy
msgid "Change background image"
msgstr "Background Theme:"
-#: actions/designadminpanel.php:424 actions/designadminpanel.php:498
+#: actions/designadminpanel.php:491 actions/designadminpanel.php:578
#: lib/designsettings.php:178
#, fuzzy
msgid "Background"
msgstr "Background Theme:"
-#: actions/designadminpanel.php:429
+#: actions/designadminpanel.php:496
#, fuzzy, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -902,69 +952,84 @@ msgstr ""
"Bạn có thể cập nhật hồ sơ cá nhân tại đây để mọi người có thể biết thông tin "
"về bạn."
-#: actions/designadminpanel.php:459 lib/designsettings.php:139
+#: actions/designadminpanel.php:526 lib/designsettings.php:139
msgid "On"
msgstr ""
-#: actions/designadminpanel.php:475 lib/designsettings.php:155
+#: actions/designadminpanel.php:542 lib/designsettings.php:155
msgid "Off"
msgstr ""
-#: actions/designadminpanel.php:476 lib/designsettings.php:156
+#: actions/designadminpanel.php:543 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr ""
-#: actions/designadminpanel.php:481 lib/designsettings.php:161
+#: actions/designadminpanel.php:548 lib/designsettings.php:161
#, fuzzy
msgid "Tile background image"
msgstr "Background Theme:"
-#: actions/designadminpanel.php:490 lib/designsettings.php:170
+#: actions/designadminpanel.php:554
+#, fuzzy
+msgid "Background server"
+msgstr "Background Theme:"
+
+#: actions/designadminpanel.php:558
+#, fuzzy
+msgid "Background path"
+msgstr "Background Theme:"
+
+#: actions/designadminpanel.php:562
+#, fuzzy
+msgid "Background directory"
+msgstr "Background Theme:"
+
+#: actions/designadminpanel.php:569 lib/designsettings.php:170
#, fuzzy
msgid "Change colours"
msgstr "Thay đổi mật khẩu của bạn"
-#: actions/designadminpanel.php:511 lib/designsettings.php:191
+#: actions/designadminpanel.php:591 lib/designsettings.php:191
#, fuzzy
msgid "Content"
msgstr "Kết nối"
-#: actions/designadminpanel.php:524 lib/designsettings.php:204
+#: actions/designadminpanel.php:604 lib/designsettings.php:204
#, fuzzy
msgid "Sidebar"
msgstr "Tìm kiếm"
-#: actions/designadminpanel.php:537 lib/designsettings.php:217
+#: actions/designadminpanel.php:617 lib/designsettings.php:217
msgid "Text"
msgstr "Chuỗi bất kỳ"
-#: actions/designadminpanel.php:550 lib/designsettings.php:230
+#: actions/designadminpanel.php:630 lib/designsettings.php:230
#, fuzzy
msgid "Links"
msgstr "Đăng nhập"
-#: actions/designadminpanel.php:611 lib/designsettings.php:247
+#: actions/designadminpanel.php:658 lib/designsettings.php:247
msgid "Use defaults"
msgstr ""
-#: actions/designadminpanel.php:612 lib/designsettings.php:248
+#: actions/designadminpanel.php:659 lib/designsettings.php:248
msgid "Restore default designs"
msgstr ""
-#: actions/designadminpanel.php:618 lib/designsettings.php:254
+#: actions/designadminpanel.php:665 lib/designsettings.php:254
msgid "Reset back to default"
msgstr ""
-#: actions/designadminpanel.php:620 actions/emailsettings.php:195
+#: actions/designadminpanel.php:667 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/profilesettings.php:167 actions/siteadminpanel.php:371
+#: actions/profilesettings.php:167 actions/siteadminpanel.php:414
#: actions/smssettings.php:181 actions/subscriptions.php:203
#: actions/tagother.php:154 actions/useradminpanel.php:226
#: lib/designsettings.php:256 lib/groupeditform.php:202
msgid "Save"
msgstr "Lưu"
-#: actions/designadminpanel.php:621 lib/designsettings.php:257
+#: actions/designadminpanel.php:668 lib/designsettings.php:257
#, fuzzy
msgid "Save design"
msgstr "Lưu"
@@ -1013,6 +1078,11 @@ msgstr "Lý lịch quá dài (không quá 140 ký tự)"
msgid "Could not update group."
msgstr "Không thể cập nhật thành viên."
+#: actions/editgroup.php:259 classes/User_group.php:390
+#, fuzzy
+msgid "Could not create aliases."
+msgstr "Không thể tạo favorite."
+
#: actions/editgroup.php:269
#, fuzzy
msgid "Options saved."
@@ -1136,7 +1206,7 @@ msgstr "Không có địa chỉ email."
msgid "Cannot normalize that email address"
msgstr "Không thể bình thường hóa địa chỉ GTalk này"
-#: actions/emailsettings.php:330 actions/siteadminpanel.php:156
+#: actions/emailsettings.php:330 actions/siteadminpanel.php:158
#, fuzzy
msgid "Not a valid email address"
msgstr "Địa chỉ email không hợp lệ."
@@ -1892,10 +1962,10 @@ msgstr "Nội dung tin nhắn không hợp lệ"
msgid "Incorrect username or password."
msgstr "Sai tên đăng nhập hoặc mật khẩu."
-#: actions/login.php:149 actions/recoverpassword.php:375
-#: actions/register.php:248
-msgid "Error setting user."
-msgstr "Lỗi xảy ra khi tạo thành viên."
+#: actions/login.php:149
+#, 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:457
#: lib/logingroupnav.php:79
@@ -2334,7 +2404,7 @@ msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:275
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:309
msgid "Language"
msgstr "Ngôn ngữ"
@@ -2360,7 +2430,7 @@ msgstr "Tự động theo những người nào đăng ký theo tôi"
msgid "Bio is too long (max %d chars)."
msgstr "Lý lịch quá dài (không quá 140 ký tự)"
-#: actions/profilesettings.php:228 actions/siteadminpanel.php:163
+#: actions/profilesettings.php:228 actions/siteadminpanel.php:165
msgid "Timezone not selected."
msgstr ""
@@ -2609,6 +2679,10 @@ msgstr "Mật khẩu phải nhiều hơn 6 ký tự."
msgid "Password and confirmation do not match."
msgstr "Mật khẩu và mật khẩu xác nhận không khớp nhau."
+#: actions/recoverpassword.php:375 actions/register.php:248
+msgid "Error setting user."
+msgstr "Lỗi xảy ra khi tạo thành viên."
+
#: actions/recoverpassword.php:382
msgid "New password successfully saved. You are now logged in."
msgstr "Mật khẩu mới đã được lưu. Bạn có thể đăng nhập ngay bây giờ."
@@ -2673,7 +2747,7 @@ msgid "Same as password above. Required."
msgstr "Cùng mật khẩu ở trên. Bắt buộc."
#: actions/register.php:437 actions/register.php:441
-#: actions/siteadminpanel.php:253 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:287 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "Email"
@@ -3117,7 +3191,7 @@ msgstr "Bạn đã theo những người này:"
msgid "User is already silenced."
msgstr "Người dùng không có thông tin."
-#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:272
+#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:299
#, fuzzy
msgid "Site"
msgstr "Thư mời"
@@ -3126,122 +3200,236 @@ msgstr "Thư mời"
msgid "Basic settings for this StatusNet site."
msgstr ""
-#: actions/siteadminpanel.php:145
+#: actions/siteadminpanel.php:147
msgid "Site name must have non-zero length."
msgstr ""
-#: actions/siteadminpanel.php:153
+#: actions/siteadminpanel.php:155
#, fuzzy
msgid "You must have a valid contact email address"
msgstr "Địa chỉ email không hợp lệ."
-#: actions/siteadminpanel.php:171
+#: actions/siteadminpanel.php:173
#, php-format
msgid "Unknown language \"%s\""
msgstr ""
-#: actions/siteadminpanel.php:178
+#: actions/siteadminpanel.php:180
msgid "Invalid snapshot report URL."
msgstr ""
-#: actions/siteadminpanel.php:184
+#: actions/siteadminpanel.php:186
msgid "Invalid snapshot run value."
msgstr ""
-#: actions/siteadminpanel.php:190
+#: actions/siteadminpanel.php:192
msgid "Snapshot frequency must be a number."
msgstr ""
-#: actions/siteadminpanel.php:241
+#: actions/siteadminpanel.php:199
+msgid "You must set an SSL sever when enabling SSL."
+msgstr ""
+
+#: actions/siteadminpanel.php:204
+msgid "Invalid SSL server. Max length is 255 characters."
+msgstr ""
+
+#: actions/siteadminpanel.php:210
+msgid "Minimum text limit is 140c."
+msgstr ""
+
+#: actions/siteadminpanel.php:216
+msgid "Dupe limit must 1 or more seconds."
+msgstr ""
+
+#: actions/siteadminpanel.php:224
+#, php-format
+msgid "Locales directory not readable: %s"
+msgstr ""
+
+#: actions/siteadminpanel.php:275
#, fuzzy
msgid "Site name"
msgstr "Thông báo mới"
-#: actions/siteadminpanel.php:242
+#: actions/siteadminpanel.php:276
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr ""
-#: actions/siteadminpanel.php:245
+#: actions/siteadminpanel.php:279
msgid "Brought by"
msgstr ""
-#: actions/siteadminpanel.php:246
+#: actions/siteadminpanel.php:280
msgid "Text used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:249
+#: actions/siteadminpanel.php:283
msgid "Brought by URL"
msgstr ""
-#: actions/siteadminpanel.php:250
+#: actions/siteadminpanel.php:284
msgid "URL used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:254
+#: actions/siteadminpanel.php:288
#, fuzzy
msgid "contact email address for your site"
msgstr "Dia chi email moi de gui tin nhan den %s"
-#: actions/siteadminpanel.php:268
+#: actions/siteadminpanel.php:302
msgid "Default timezone"
msgstr ""
-#: actions/siteadminpanel.php:269
+#: actions/siteadminpanel.php:303
msgid "Default timezone for the site; usually UTC."
msgstr ""
-#: actions/siteadminpanel.php:276
+#: actions/siteadminpanel.php:310
#, fuzzy
msgid "Default site language"
msgstr "Ngôn ngữ bạn thích"
-#: actions/siteadminpanel.php:282
+#: actions/siteadminpanel.php:316
+msgid "Path to locales"
+msgstr ""
+
+#: actions/siteadminpanel.php:316
+msgid "Directory path to locales"
+msgstr ""
+
+#: actions/siteadminpanel.php:320
+#, fuzzy
+msgid "Server"
+msgstr "Khôi phục"
+
+#: actions/siteadminpanel.php:320
+msgid "Site's server hostname."
+msgstr ""
+
+#: actions/siteadminpanel.php:324
+msgid "Path"
+msgstr ""
+
+#: actions/siteadminpanel.php:324
+#, fuzzy
+msgid "Site path"
+msgstr "Thông báo mới"
+
+#: actions/siteadminpanel.php:328
+msgid "Fancy URLs"
+msgstr ""
+
+#: actions/siteadminpanel.php:330
+msgid "Use fancy (more readable and memorable) URLs?"
+msgstr ""
+
+#: actions/siteadminpanel.php:334
#, fuzzy
msgid "Private"
msgstr "Riêng tư"
-#: actions/siteadminpanel.php:284
+#: actions/siteadminpanel.php:336
msgid "Prohibit anonymous users (not logged in) from viewing site?"
msgstr ""
-#: actions/siteadminpanel.php:290
+#: actions/siteadminpanel.php:340
+#, fuzzy
+msgid "Invite only"
+msgstr "Thư mời"
+
+#: actions/siteadminpanel.php:342
+msgid "Make registration invitation only."
+msgstr ""
+
+#: actions/siteadminpanel.php:346 actions/useradminpanel.php:171
+#, fuzzy
+msgid "Closed"
+msgstr "Ban user"
+
+#: actions/siteadminpanel.php:348
+msgid "Disable new registrations."
+msgstr ""
+
+#: actions/siteadminpanel.php:353
msgid "Randomly during Web hit"
msgstr ""
-#: actions/siteadminpanel.php:291
+#: actions/siteadminpanel.php:354
msgid "In a scheduled job"
msgstr ""
-#: actions/siteadminpanel.php:292
+#: actions/siteadminpanel.php:355 actions/siteadminpanel.php:380
#, fuzzy
msgid "Never"
msgstr "Khôi phục"
-#: actions/siteadminpanel.php:294
+#: actions/siteadminpanel.php:357
msgid "Data snapshots"
msgstr ""
-#: actions/siteadminpanel.php:295
+#: actions/siteadminpanel.php:358
msgid "When to send statistical data to status.net servers"
msgstr ""
-#: actions/siteadminpanel.php:301
+#: actions/siteadminpanel.php:364
msgid "Frequency"
msgstr ""
-#: actions/siteadminpanel.php:302
+#: actions/siteadminpanel.php:365
msgid "Snapshots will be sent once every N Web hits"
msgstr ""
-#: actions/siteadminpanel.php:309
+#: actions/siteadminpanel.php:372
msgid "Report URL"
msgstr ""
-#: actions/siteadminpanel.php:310
+#: actions/siteadminpanel.php:373
msgid "Snapshots will be sent to this URL"
msgstr ""
-#: actions/siteadminpanel.php:371 actions/useradminpanel.php:226
+#: actions/siteadminpanel.php:381
+#, fuzzy
+msgid "Sometimes"
+msgstr "Tin nhắn"
+
+#: actions/siteadminpanel.php:382
+msgid "Always"
+msgstr ""
+
+#: actions/siteadminpanel.php:384
+msgid "Use SSL"
+msgstr ""
+
+#: actions/siteadminpanel.php:385
+msgid "When to use SSL"
+msgstr ""
+
+#: actions/siteadminpanel.php:391
+msgid "SSL Server"
+msgstr ""
+
+#: actions/siteadminpanel.php:392
+msgid "Server to direct SSL requests to"
+msgstr ""
+
+#: actions/siteadminpanel.php:396
+msgid "Text limit"
+msgstr ""
+
+#: actions/siteadminpanel.php:396
+msgid "Maximum number of characters for notices."
+msgstr ""
+
+#: actions/siteadminpanel.php:400
+msgid "Dupe limit"
+msgstr ""
+
+#: actions/siteadminpanel.php:400
+msgid "How long users must wait (in seconds) to post the same thing again."
+msgstr ""
+
+#: actions/siteadminpanel.php:414 actions/useradminpanel.php:226
#, fuzzy
msgid "Save site settings"
msgstr "Thay đổi hình đại diện"
@@ -3575,11 +3763,6 @@ msgstr ""
msgid "User settings for this StatusNet site."
msgstr ""
-#: actions/useradminpanel.php:171
-#, fuzzy
-msgid "Closed"
-msgstr "Ban user"
-
#: actions/useradminpanel.php:173
msgid "Is registration on this site prohibited?"
msgstr ""
@@ -3808,6 +3991,16 @@ msgstr "Có lỗi xảy ra khi lưu tin nhắn."
msgid "DB error inserting reply: %s"
msgstr "Lỗi cơ sở dữ liệu khi chèn trả lời: %s"
+#: classes/User_group.php:380
+#, fuzzy
+msgid "Could not create group."
+msgstr "Không thể tạo favorite."
+
+#: classes/User_group.php:409
+#, fuzzy
+msgid "Could not set group membership."
+msgstr "Không thể tạo đăng nhận."
+
#: classes/User.php:347
#, fuzzy, php-format
msgid "Welcome to %1$s, @%2$s!"
@@ -4060,12 +4253,17 @@ msgstr ""
msgid "saveSettings() not implemented."
msgstr ""
-#: lib/adminpanelaction.php:273
+#: lib/adminpanelaction.php:247
+#, fuzzy
+msgid "Unable to delete design setting."
+msgstr "Không thể lưu thông tin Twitter của bạn!"
+
+#: lib/adminpanelaction.php:300
#, fuzzy
msgid "Basic site configuration"
msgstr "Xac nhan dia chi email"
-#: lib/adminpanelaction.php:276
+#: lib/adminpanelaction.php:303
#, fuzzy
msgid "Design configuration"
msgstr "Xác nhận SMS"
@@ -4320,20 +4518,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:203
+#: lib/common.php:199
#, fuzzy
msgid "No configuration file found. "
msgstr "Không có mã số xác nhận."
-#: lib/common.php:204
+#: lib/common.php:200
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:205
+#: lib/common.php:201
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:206
+#: lib/common.php:202
msgid "Go to the installer."
msgstr ""
@@ -5179,11 +5377,6 @@ msgstr "Không"
msgid "Top posters"
msgstr "Top posters"
-#: lib/unblockform.php:80
-#, fuzzy
-msgid "Unlock this user"
-msgstr "Bỏ chặn người dùng này"
-
#: lib/unsandboxform.php:69
msgid "Unsandbox"
msgstr ""
@@ -5239,47 +5432,47 @@ msgstr "Bạn đã theo những người này:"
msgid "Message"
msgstr "Tin mới nhất"
-#: lib/util.php:821
+#: lib/util.php:826
msgid "a few seconds ago"
msgstr "vài giây trước"
-#: lib/util.php:823
+#: lib/util.php:828
msgid "about a minute ago"
msgstr "1 phút trước"
-#: lib/util.php:825
+#: lib/util.php:830
#, php-format
msgid "about %d minutes ago"
msgstr "%d phút trước"
-#: lib/util.php:827
+#: lib/util.php:832
msgid "about an hour ago"
msgstr "1 giờ trước"
-#: lib/util.php:829
+#: lib/util.php:834
#, php-format
msgid "about %d hours ago"
msgstr "%d giờ trước"
-#: lib/util.php:831
+#: lib/util.php:836
msgid "about a day ago"
msgstr "1 ngày trước"
-#: lib/util.php:833
+#: lib/util.php:838
#, php-format
msgid "about %d days ago"
msgstr "%d ngày trước"
-#: lib/util.php:835
+#: lib/util.php:840
msgid "about a month ago"
msgstr "1 tháng trước"
-#: lib/util.php:837
+#: lib/util.php:842
#, php-format
msgid "about %d months ago"
msgstr "%d tháng trước"
-#: lib/util.php:839
+#: lib/util.php:844
msgid "about a year ago"
msgstr "1 năm trước"
@@ -5311,5 +5504,9 @@ msgid "Sorry, no incoming email allowed."
msgstr "Xin lỗi, không có địa chỉ email cho phép."
#, fuzzy
+#~ msgid "Unlock this user"
+#~ msgstr "Bỏ chặn người dùng này"
+
+#, fuzzy
#~ msgid "These people are subscribed to you: "
#~ msgstr "Theo nhóm này"
diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po
index 763aa3410..f32b9e629 100644
--- a/locale/zh_CN/LC_MESSAGES/statusnet.po
+++ b/locale/zh_CN/LC_MESSAGES/statusnet.po
@@ -1,20 +1,22 @@
# Translation of StatusNet to Simplified Chinese
#
+# Author@translatewiki.net: Translationista
+# Author: Gouki <gouki@goukihq.org>, 2008
# --
# Messages of identi.ca
# Copyright (C) 2008 Gouki <gouki@goukihq.org>
-# This file is distributed under the same license as the identi.ca package.
-# Gouki <gouki@goukihq.org>, 2008
+# 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-18 19:31+0000\n"
+"POT-Creation-Date: 2009-11-19 10:43+0000\n"
"PO-Revision-Date: 2009-11-18 19:32:53+0000\n"
"Language-Team: Simplified Chinese\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: MediaWiki 1.16alpha(r59207); Translate extension (2009-11-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: zh-hans\n"
@@ -150,7 +152,7 @@ msgstr "无法更新用户。"
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
-#: actions/designadminpanel.php:125 actions/newnotice.php:94
+#: actions/designadminpanel.php:122 actions/newnotice.php:94
#: lib/designsettings.php:283
#, php-format
msgid ""
@@ -234,7 +236,7 @@ msgstr "发给 %s 的直接消息"
#: 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:184 actions/apigroupismember.php:114
+#: 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
@@ -303,81 +305,66 @@ msgstr "无法获取收藏的通告。"
msgid "Could not find target user."
msgstr "找不到任何信息。"
-#: actions/apigroupcreate.php:136 actions/newgroup.php:204
-msgid "Could not create group."
-msgstr "无法创建组。"
-
-#: actions/apigroupcreate.php:147 actions/editgroup.php:259
-#: actions/newgroup.php:210
-#, fuzzy
-msgid "Could not create aliases."
-msgstr "无法创建收藏。"
-
-#: actions/apigroupcreate.php:166 actions/newgroup.php:224
-#, fuzzy
-msgid "Could not set group membership."
-msgstr "无法删除订阅。"
-
-#: actions/apigroupcreate.php:212 actions/editgroup.php:182
+#: actions/apigroupcreate.php:164 actions/editgroup.php:182
#: actions/newgroup.php:126 actions/profilesettings.php:208
#: actions/register.php:205
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr "昵称只能使用小写字母和数字,不包含空格。"
-#: actions/apigroupcreate.php:221 actions/editgroup.php:186
+#: 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 "昵称已被使用,换一个吧。"
-#: actions/apigroupcreate.php:228 actions/editgroup.php:189
+#: 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 "不是有效的昵称。"
-#: actions/apigroupcreate.php:244 actions/editgroup.php:195
+#: 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 "主页的URL不正确。"
-#: actions/apigroupcreate.php:253 actions/editgroup.php:198
+#: 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 "全名过长(不能超过 255 个字符)。"
-#: actions/apigroupcreate.php:261
+#: actions/apigroupcreate.php:213
#, fuzzy, php-format
msgid "Description is too long (max %d chars)."
msgstr "描述过长(不能超过140字符)。"
-#: actions/apigroupcreate.php:272 actions/editgroup.php:204
+#: 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 "位置过长(不能超过255个字符)。"
-#: actions/apigroupcreate.php:291 actions/editgroup.php:215
+#: actions/apigroupcreate.php:243 actions/editgroup.php:215
#: actions/newgroup.php:159
#, php-format
msgid "Too many aliases! Maximum %d."
msgstr ""
-#: actions/apigroupcreate.php:312 actions/editgroup.php:224
+#: actions/apigroupcreate.php:264 actions/editgroup.php:224
#: actions/newgroup.php:168
#, fuzzy, php-format
msgid "Invalid alias: \"%s\""
msgstr "主页'%s'不正确"
-#: actions/apigroupcreate.php:321 actions/editgroup.php:228
+#: actions/apigroupcreate.php:273 actions/editgroup.php:228
#: actions/newgroup.php:172
#, fuzzy, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr "昵称已被使用,换一个吧。"
-#: actions/apigroupcreate.php:334 actions/editgroup.php:234
+#: actions/apigroupcreate.php:286 actions/editgroup.php:234
#: actions/newgroup.php:178
msgid "Alias can't be the same as nickname."
msgstr ""
@@ -604,10 +591,10 @@ msgstr "剪裁"
msgid "There was a problem with your session token. Try again, please."
msgstr "会话标识有问题,请重试。"
-#: actions/avatarsettings.php:277 actions/emailsettings.php:255
-#: actions/grouplogo.php:319 actions/imsettings.php:220
-#: actions/recoverpassword.php:44 actions/smssettings.php:248
-#: lib/designsettings.php:304
+#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
+#: actions/emailsettings.php:255 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/recoverpassword.php:44
+#: actions/smssettings.php:248 lib/designsettings.php:304
msgid "Unexpected form submission."
msgstr "未预料的表单提交。"
@@ -671,7 +658,7 @@ msgstr "取消阻止用户失败。"
msgid "Unblock"
msgstr "取消阻止"
-#: actions/blockedfromgroup.php:313
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:80
#, fuzzy
msgid "Unblock this user"
msgstr "取消阻止次用户"
@@ -849,7 +836,7 @@ msgid "Delete this user"
msgstr "删除通告"
#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124
-#: lib/adminpanelaction.php:275 lib/groupnav.php:119
+#: lib/adminpanelaction.php:302 lib/groupnav.php:119
msgid "Design"
msgstr ""
@@ -857,108 +844,183 @@ msgstr ""
msgid "Design settings for this StatusNet site."
msgstr ""
-#: actions/designadminpanel.php:220
+#: actions/designadminpanel.php:278
#, fuzzy
-msgid "Unable to delete design setting."
-msgstr "无法保存 Twitter 设置!"
+msgid "Invalid logo URL."
+msgstr "大小不正确。"
-#: actions/designadminpanel.php:301
+#: actions/designadminpanel.php:282
#, fuzzy, php-format
msgid "Theme not available: %s"
msgstr "这个页面不提供您想要的媒体类型"
-#: actions/designadminpanel.php:406
+#: actions/designadminpanel.php:288
+#, fuzzy, php-format
+msgid "Theme directory not readable: %s"
+msgstr "这个页面不提供您想要的媒体类型"
+
+#: actions/designadminpanel.php:292
+#, php-format
+msgid "Avatar directory not writable: %s"
+msgstr ""
+
+#: actions/designadminpanel.php:296
+#, php-format
+msgid "Background directory not writable: %s"
+msgstr ""
+
+#: actions/designadminpanel.php:312
+#, php-format
+msgid "Max length for %s %s is 255 characters."
+msgstr ""
+
+#: actions/designadminpanel.php:412
+#, fuzzy
+msgid "Change logo"
+msgstr "修改密码"
+
+#: actions/designadminpanel.php:417
+#, fuzzy
+msgid "Site logo"
+msgstr "邀请"
+
+#: actions/designadminpanel.php:424
#, fuzzy
msgid "Change theme"
msgstr "修改"
-#: actions/designadminpanel.php:410
-msgid "Theme"
-msgstr ""
+#: actions/designadminpanel.php:441
+#, fuzzy
+msgid "Site theme"
+msgstr "新通告"
-#: actions/designadminpanel.php:411
+#: actions/designadminpanel.php:442
#, fuzzy
msgid "Theme for the site."
msgstr "登出本站"
-#: actions/designadminpanel.php:420 lib/designsettings.php:101
+#: actions/designadminpanel.php:447
+msgid "Theme server"
+msgstr ""
+
+#: actions/designadminpanel.php:451
+msgid "Theme path"
+msgstr ""
+
+#: actions/designadminpanel.php:455
+msgid "Theme directory"
+msgstr ""
+
+#: actions/designadminpanel.php:462
+#, fuzzy
+msgid "Avatar Settings"
+msgstr "头像设置"
+
+#: actions/designadminpanel.php:467
+#, fuzzy
+msgid "Avatar server"
+msgstr "头像设置"
+
+#: actions/designadminpanel.php:471
+#, fuzzy
+msgid "Avatar path"
+msgstr "头像已更新。"
+
+#: actions/designadminpanel.php:475
+#, fuzzy
+msgid "Avatar directory"
+msgstr "头像已更新。"
+
+#: actions/designadminpanel.php:486 lib/designsettings.php:101
msgid "Change background image"
msgstr ""
-#: actions/designadminpanel.php:424 actions/designadminpanel.php:498
+#: actions/designadminpanel.php:491 actions/designadminpanel.php:578
#: lib/designsettings.php:178
msgid "Background"
msgstr ""
-#: actions/designadminpanel.php:429
+#: actions/designadminpanel.php:496
#, fuzzy, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
"$s."
msgstr "你可以给你的组上载一个logo图。"
-#: actions/designadminpanel.php:459 lib/designsettings.php:139
+#: actions/designadminpanel.php:526 lib/designsettings.php:139
msgid "On"
msgstr ""
-#: actions/designadminpanel.php:475 lib/designsettings.php:155
+#: actions/designadminpanel.php:542 lib/designsettings.php:155
msgid "Off"
msgstr ""
-#: actions/designadminpanel.php:476 lib/designsettings.php:156
+#: actions/designadminpanel.php:543 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr ""
-#: actions/designadminpanel.php:481 lib/designsettings.php:161
+#: actions/designadminpanel.php:548 lib/designsettings.php:161
msgid "Tile background image"
msgstr ""
-#: actions/designadminpanel.php:490 lib/designsettings.php:170
+#: actions/designadminpanel.php:554
+msgid "Background server"
+msgstr ""
+
+#: actions/designadminpanel.php:558
+msgid "Background path"
+msgstr ""
+
+#: actions/designadminpanel.php:562
+msgid "Background directory"
+msgstr ""
+
+#: actions/designadminpanel.php:569 lib/designsettings.php:170
#, fuzzy
msgid "Change colours"
msgstr "修改密码"
-#: actions/designadminpanel.php:511 lib/designsettings.php:191
+#: actions/designadminpanel.php:591 lib/designsettings.php:191
#, fuzzy
msgid "Content"
msgstr "连接"
-#: actions/designadminpanel.php:524 lib/designsettings.php:204
+#: actions/designadminpanel.php:604 lib/designsettings.php:204
#, fuzzy
msgid "Sidebar"
msgstr "搜索"
-#: actions/designadminpanel.php:537 lib/designsettings.php:217
+#: actions/designadminpanel.php:617 lib/designsettings.php:217
msgid "Text"
msgstr "文本"
-#: actions/designadminpanel.php:550 lib/designsettings.php:230
+#: actions/designadminpanel.php:630 lib/designsettings.php:230
#, fuzzy
msgid "Links"
msgstr "登录"
-#: actions/designadminpanel.php:611 lib/designsettings.php:247
+#: actions/designadminpanel.php:658 lib/designsettings.php:247
msgid "Use defaults"
msgstr ""
-#: actions/designadminpanel.php:612 lib/designsettings.php:248
+#: actions/designadminpanel.php:659 lib/designsettings.php:248
msgid "Restore default designs"
msgstr ""
-#: actions/designadminpanel.php:618 lib/designsettings.php:254
+#: actions/designadminpanel.php:665 lib/designsettings.php:254
msgid "Reset back to default"
msgstr ""
-#: actions/designadminpanel.php:620 actions/emailsettings.php:195
+#: actions/designadminpanel.php:667 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/profilesettings.php:167 actions/siteadminpanel.php:371
+#: actions/profilesettings.php:167 actions/siteadminpanel.php:414
#: actions/smssettings.php:181 actions/subscriptions.php:203
#: actions/tagother.php:154 actions/useradminpanel.php:226
#: lib/designsettings.php:256 lib/groupeditform.php:202
msgid "Save"
msgstr "保存"
-#: actions/designadminpanel.php:621 lib/designsettings.php:257
+#: actions/designadminpanel.php:668 lib/designsettings.php:257
msgid "Save design"
msgstr ""
@@ -1001,6 +1063,11 @@ msgstr "描述过长(不能超过140字符)。"
msgid "Could not update group."
msgstr "无法更新组"
+#: actions/editgroup.php:259 classes/User_group.php:390
+#, fuzzy
+msgid "Could not create aliases."
+msgstr "无法创建收藏。"
+
#: actions/editgroup.php:269
msgid "Options saved."
msgstr "选项已保存。"
@@ -1118,7 +1185,7 @@ msgstr "没有电子邮件地址。"
msgid "Cannot normalize that email address"
msgstr "无法识别此电子邮件"
-#: actions/emailsettings.php:330 actions/siteadminpanel.php:156
+#: actions/emailsettings.php:330 actions/siteadminpanel.php:158
msgid "Not a valid email address"
msgstr "不是有效的电子邮件"
@@ -1846,10 +1913,10 @@ msgstr "通告内容不正确"
msgid "Incorrect username or password."
msgstr "用户名或密码不正确。"
-#: actions/login.php:149 actions/recoverpassword.php:375
-#: actions/register.php:248
-msgid "Error setting user."
-msgstr "保存用户设置时出错。"
+#: actions/login.php:149
+#, fuzzy
+msgid "Error setting user. You are probably not authorized."
+msgstr "未认证。"
#: actions/login.php:204 actions/login.php:257 lib/action.php:457
#: lib/logingroupnav.php:79
@@ -2272,7 +2339,7 @@ msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr "你的标签 (字母letters, 数字numbers, -, ., 和 _), 以逗号或空格分隔"
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:275
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:309
msgid "Language"
msgstr "语言"
@@ -2298,7 +2365,7 @@ msgstr "自动订阅任何订阅我的更新的人(这个选项最适合机器
msgid "Bio is too long (max %d chars)."
msgstr "自述过长(不能超过140字符)。"
-#: actions/profilesettings.php:228 actions/siteadminpanel.php:163
+#: actions/profilesettings.php:228 actions/siteadminpanel.php:165
msgid "Timezone not selected."
msgstr "未选择时区。"
@@ -2544,6 +2611,10 @@ msgstr "密码必须是 6 个字符或更多。"
msgid "Password and confirmation do not match."
msgstr "密码和确认不匹配。"
+#: actions/recoverpassword.php:375 actions/register.php:248
+msgid "Error setting user."
+msgstr "保存用户设置时出错。"
+
#: actions/recoverpassword.php:382
msgid "New password successfully saved. You are now logged in."
msgstr "新密码已保存,您现在已登录。"
@@ -2605,7 +2676,7 @@ msgid "Same as password above. Required."
msgstr "相同的密码。此项必填。"
#: actions/register.php:437 actions/register.php:441
-#: actions/siteadminpanel.php:253 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:287 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "电子邮件"
@@ -3050,7 +3121,7 @@ msgstr "无法向此用户发送消息。"
msgid "User is already silenced."
msgstr "用户没有个人信息。"
-#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:272
+#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:299
#, fuzzy
msgid "Site"
msgstr "邀请"
@@ -3059,122 +3130,236 @@ msgstr "邀请"
msgid "Basic settings for this StatusNet site."
msgstr ""
-#: actions/siteadminpanel.php:145
+#: actions/siteadminpanel.php:147
msgid "Site name must have non-zero length."
msgstr ""
-#: actions/siteadminpanel.php:153
+#: actions/siteadminpanel.php:155
#, fuzzy
msgid "You must have a valid contact email address"
msgstr "不是有效的电子邮件"
-#: actions/siteadminpanel.php:171
+#: actions/siteadminpanel.php:173
#, php-format
msgid "Unknown language \"%s\""
msgstr ""
-#: actions/siteadminpanel.php:178
+#: actions/siteadminpanel.php:180
msgid "Invalid snapshot report URL."
msgstr ""
-#: actions/siteadminpanel.php:184
+#: actions/siteadminpanel.php:186
msgid "Invalid snapshot run value."
msgstr ""
-#: actions/siteadminpanel.php:190
+#: actions/siteadminpanel.php:192
msgid "Snapshot frequency must be a number."
msgstr ""
-#: actions/siteadminpanel.php:241
+#: actions/siteadminpanel.php:199
+msgid "You must set an SSL sever when enabling SSL."
+msgstr ""
+
+#: actions/siteadminpanel.php:204
+msgid "Invalid SSL server. Max length is 255 characters."
+msgstr ""
+
+#: actions/siteadminpanel.php:210
+msgid "Minimum text limit is 140c."
+msgstr ""
+
+#: actions/siteadminpanel.php:216
+msgid "Dupe limit must 1 or more seconds."
+msgstr ""
+
+#: actions/siteadminpanel.php:224
+#, php-format
+msgid "Locales directory not readable: %s"
+msgstr ""
+
+#: actions/siteadminpanel.php:275
#, fuzzy
msgid "Site name"
msgstr "新通告"
-#: actions/siteadminpanel.php:242
+#: actions/siteadminpanel.php:276
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr ""
-#: actions/siteadminpanel.php:245
+#: actions/siteadminpanel.php:279
msgid "Brought by"
msgstr ""
-#: actions/siteadminpanel.php:246
+#: actions/siteadminpanel.php:280
msgid "Text used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:249
+#: actions/siteadminpanel.php:283
msgid "Brought by URL"
msgstr ""
-#: actions/siteadminpanel.php:250
+#: actions/siteadminpanel.php:284
msgid "URL used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:254
+#: actions/siteadminpanel.php:288
#, fuzzy
msgid "contact email address for your site"
msgstr "新的电子邮件地址,用于发布 %s 信息"
-#: actions/siteadminpanel.php:268
+#: actions/siteadminpanel.php:302
msgid "Default timezone"
msgstr ""
-#: actions/siteadminpanel.php:269
+#: actions/siteadminpanel.php:303
msgid "Default timezone for the site; usually UTC."
msgstr ""
-#: actions/siteadminpanel.php:276
+#: actions/siteadminpanel.php:310
#, fuzzy
msgid "Default site language"
msgstr "首选语言"
-#: actions/siteadminpanel.php:282
+#: actions/siteadminpanel.php:316
+msgid "Path to locales"
+msgstr ""
+
+#: actions/siteadminpanel.php:316
+msgid "Directory path to locales"
+msgstr ""
+
+#: actions/siteadminpanel.php:320
+#, fuzzy
+msgid "Server"
+msgstr "恢复"
+
+#: actions/siteadminpanel.php:320
+msgid "Site's server hostname."
+msgstr ""
+
+#: actions/siteadminpanel.php:324
+msgid "Path"
+msgstr ""
+
+#: actions/siteadminpanel.php:324
+#, fuzzy
+msgid "Site path"
+msgstr "新通告"
+
+#: actions/siteadminpanel.php:328
+msgid "Fancy URLs"
+msgstr ""
+
+#: actions/siteadminpanel.php:330
+msgid "Use fancy (more readable and memorable) URLs?"
+msgstr ""
+
+#: actions/siteadminpanel.php:334
#, fuzzy
msgid "Private"
msgstr "隐私"
-#: actions/siteadminpanel.php:284
+#: actions/siteadminpanel.php:336
msgid "Prohibit anonymous users (not logged in) from viewing site?"
msgstr ""
-#: actions/siteadminpanel.php:290
+#: actions/siteadminpanel.php:340
+#, fuzzy
+msgid "Invite only"
+msgstr "邀请"
+
+#: actions/siteadminpanel.php:342
+msgid "Make registration invitation only."
+msgstr ""
+
+#: actions/siteadminpanel.php:346 actions/useradminpanel.php:171
+#, fuzzy
+msgid "Closed"
+msgstr "阻止"
+
+#: actions/siteadminpanel.php:348
+msgid "Disable new registrations."
+msgstr ""
+
+#: actions/siteadminpanel.php:353
msgid "Randomly during Web hit"
msgstr ""
-#: actions/siteadminpanel.php:291
+#: actions/siteadminpanel.php:354
msgid "In a scheduled job"
msgstr ""
-#: actions/siteadminpanel.php:292
+#: actions/siteadminpanel.php:355 actions/siteadminpanel.php:380
#, fuzzy
msgid "Never"
msgstr "恢复"
-#: actions/siteadminpanel.php:294
+#: actions/siteadminpanel.php:357
msgid "Data snapshots"
msgstr ""
-#: actions/siteadminpanel.php:295
+#: actions/siteadminpanel.php:358
msgid "When to send statistical data to status.net servers"
msgstr ""
-#: actions/siteadminpanel.php:301
+#: actions/siteadminpanel.php:364
msgid "Frequency"
msgstr ""
-#: actions/siteadminpanel.php:302
+#: actions/siteadminpanel.php:365
msgid "Snapshots will be sent once every N Web hits"
msgstr ""
-#: actions/siteadminpanel.php:309
+#: actions/siteadminpanel.php:372
msgid "Report URL"
msgstr ""
-#: actions/siteadminpanel.php:310
+#: actions/siteadminpanel.php:373
msgid "Snapshots will be sent to this URL"
msgstr ""
-#: actions/siteadminpanel.php:371 actions/useradminpanel.php:226
+#: actions/siteadminpanel.php:381
+#, fuzzy
+msgid "Sometimes"
+msgstr "通告"
+
+#: actions/siteadminpanel.php:382
+msgid "Always"
+msgstr ""
+
+#: actions/siteadminpanel.php:384
+msgid "Use SSL"
+msgstr ""
+
+#: actions/siteadminpanel.php:385
+msgid "When to use SSL"
+msgstr ""
+
+#: actions/siteadminpanel.php:391
+msgid "SSL Server"
+msgstr ""
+
+#: actions/siteadminpanel.php:392
+msgid "Server to direct SSL requests to"
+msgstr ""
+
+#: actions/siteadminpanel.php:396
+msgid "Text limit"
+msgstr ""
+
+#: actions/siteadminpanel.php:396
+msgid "Maximum number of characters for notices."
+msgstr ""
+
+#: actions/siteadminpanel.php:400
+msgid "Dupe limit"
+msgstr ""
+
+#: actions/siteadminpanel.php:400
+msgid "How long users must wait (in seconds) to post the same thing again."
+msgstr ""
+
+#: actions/siteadminpanel.php:414 actions/useradminpanel.php:226
#, fuzzy
msgid "Save site settings"
msgstr "头像设置"
@@ -3500,11 +3685,6 @@ msgstr "用户"
msgid "User settings for this StatusNet site."
msgstr ""
-#: actions/useradminpanel.php:171
-#, fuzzy
-msgid "Closed"
-msgstr "阻止"
-
#: actions/useradminpanel.php:173
msgid "Is registration on this site prohibited?"
msgstr ""
@@ -3729,6 +3909,15 @@ msgstr "保存通告时出错。"
msgid "DB error inserting reply: %s"
msgstr "添加回复时数据库出错:%s"
+#: classes/User_group.php:380
+msgid "Could not create group."
+msgstr "无法创建组。"
+
+#: classes/User_group.php:409
+#, fuzzy
+msgid "Could not set group membership."
+msgstr "无法删除订阅。"
+
#: classes/User.php:347
#, fuzzy, php-format
msgid "Welcome to %1$s, @%2$s!"
@@ -3978,12 +4167,17 @@ msgstr "命令尚未实现。"
msgid "saveSettings() not implemented."
msgstr "命令尚未实现。"
-#: lib/adminpanelaction.php:273
+#: lib/adminpanelaction.php:247
+#, fuzzy
+msgid "Unable to delete design setting."
+msgstr "无法保存 Twitter 设置!"
+
+#: lib/adminpanelaction.php:300
#, fuzzy
msgid "Basic site configuration"
msgstr "电子邮件地址确认"
-#: lib/adminpanelaction.php:276
+#: lib/adminpanelaction.php:303
#, fuzzy
msgid "Design configuration"
msgstr "SMS短信确认"
@@ -4231,20 +4425,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:203
+#: lib/common.php:199
#, fuzzy
msgid "No configuration file found. "
msgstr "没有验证码"
-#: lib/common.php:204
+#: lib/common.php:200
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:205
+#: lib/common.php:201
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:206
+#: lib/common.php:202
#, fuzzy
msgid "Go to the installer."
msgstr "登入本站"
@@ -5043,11 +5237,6 @@ msgstr "否"
msgid "Top posters"
msgstr "灌水精英"
-#: lib/unblockform.php:80
-#, fuzzy
-msgid "Unlock this user"
-msgstr "取消阻止次用户"
-
#: lib/unsandboxform.php:69
msgid "Unsandbox"
msgstr ""
@@ -5104,47 +5293,47 @@ msgstr "无法向此用户发送消息。"
msgid "Message"
msgstr "新消息"
-#: lib/util.php:821
+#: lib/util.php:826
msgid "a few seconds ago"
msgstr "几秒前"
-#: lib/util.php:823
+#: lib/util.php:828
msgid "about a minute ago"
msgstr "一分钟前"
-#: lib/util.php:825
+#: lib/util.php:830
#, php-format
msgid "about %d minutes ago"
msgstr "%d 分钟前"
-#: lib/util.php:827
+#: lib/util.php:832
msgid "about an hour ago"
msgstr "一小时前"
-#: lib/util.php:829
+#: lib/util.php:834
#, php-format
msgid "about %d hours ago"
msgstr "%d 小时前"
-#: lib/util.php:831
+#: lib/util.php:836
msgid "about a day ago"
msgstr "一天前"
-#: lib/util.php:833
+#: lib/util.php:838
#, php-format
msgid "about %d days ago"
msgstr "%d 天前"
-#: lib/util.php:835
+#: lib/util.php:840
msgid "about a month ago"
msgstr "一个月前"
-#: lib/util.php:837
+#: lib/util.php:842
#, php-format
msgid "about %d months ago"
msgstr "%d 个月前"
-#: lib/util.php:839
+#: lib/util.php:844
msgid "about a year ago"
msgstr "一年前"
@@ -5175,5 +5364,9 @@ msgid "Sorry, no incoming email allowed."
msgstr "对不起,发布用的电子邮件无法使用。"
#, fuzzy
+#~ msgid "Unlock this user"
+#~ msgstr "取消阻止次用户"
+
+#, fuzzy
#~ msgid "These people are subscribed to you: "
#~ msgstr "订阅 %s"
diff --git a/locale/zh_TW/LC_MESSAGES/statusnet.po b/locale/zh_TW/LC_MESSAGES/statusnet.po
index 0e6e27d53..ed366612b 100644
--- a/locale/zh_TW/LC_MESSAGES/statusnet.po
+++ b/locale/zh_TW/LC_MESSAGES/statusnet.po
@@ -1,20 +1,18 @@
# Translation of StatusNet to Traditional Chinese
#
# --
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 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-18 19:31+0000\n"
+"POT-Creation-Date: 2009-11-19 10:43+0000\n"
"PO-Revision-Date: 2009-11-18 19:32:56+0000\n"
"Language-Team: Traditional Chinese\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: MediaWiki 1.16alpha(r59207); Translate extension (2009-11-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: zh-hant\n"
@@ -150,7 +148,7 @@ msgstr "無法更新使用者"
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
-#: actions/designadminpanel.php:125 actions/newnotice.php:94
+#: actions/designadminpanel.php:122 actions/newnotice.php:94
#: lib/designsettings.php:283
#, php-format
msgid ""
@@ -233,7 +231,7 @@ msgstr ""
#: 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:184 actions/apigroupismember.php:114
+#: 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
@@ -300,82 +298,66 @@ msgstr "無法更新使用者"
msgid "Could not find target user."
msgstr "無法更新使用者"
-#: actions/apigroupcreate.php:136 actions/newgroup.php:204
-#, fuzzy
-msgid "Could not create group."
-msgstr "無法存取個人圖像資料"
-
-#: actions/apigroupcreate.php:147 actions/editgroup.php:259
-#: actions/newgroup.php:210
-#, fuzzy
-msgid "Could not create aliases."
-msgstr "無法存取個人圖像資料"
-
-#: actions/apigroupcreate.php:166 actions/newgroup.php:224
-#, fuzzy
-msgid "Could not set group membership."
-msgstr "註冊失敗"
-
-#: actions/apigroupcreate.php:212 actions/editgroup.php:182
+#: actions/apigroupcreate.php:164 actions/editgroup.php:182
#: actions/newgroup.php:126 actions/profilesettings.php:208
#: actions/register.php:205
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr "暱稱請用小寫字母或數字,勿加空格。"
-#: actions/apigroupcreate.php:221 actions/editgroup.php:186
+#: 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 "此暱稱已有人使用。再試試看別的吧。"
-#: actions/apigroupcreate.php:228 actions/editgroup.php:189
+#: 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 ""
-#: actions/apigroupcreate.php:244 actions/editgroup.php:195
+#: 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 "個人首頁位址錯誤"
-#: actions/apigroupcreate.php:253 actions/editgroup.php:198
+#: 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 "全名過長(最多255字元)"
-#: actions/apigroupcreate.php:261
+#: actions/apigroupcreate.php:213
#, fuzzy, php-format
msgid "Description is too long (max %d chars)."
msgstr "自我介紹過長(共140個字元)"
-#: actions/apigroupcreate.php:272 actions/editgroup.php:204
+#: 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 "地點過長(共255個字)"
-#: actions/apigroupcreate.php:291 actions/editgroup.php:215
+#: actions/apigroupcreate.php:243 actions/editgroup.php:215
#: actions/newgroup.php:159
#, php-format
msgid "Too many aliases! Maximum %d."
msgstr ""
-#: actions/apigroupcreate.php:312 actions/editgroup.php:224
+#: actions/apigroupcreate.php:264 actions/editgroup.php:224
#: actions/newgroup.php:168
#, fuzzy, php-format
msgid "Invalid alias: \"%s\""
msgstr "個人首頁連結%s無效"
-#: actions/apigroupcreate.php:321 actions/editgroup.php:228
+#: actions/apigroupcreate.php:273 actions/editgroup.php:228
#: actions/newgroup.php:172
#, fuzzy, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr "此暱稱已有人使用。再試試看別的吧。"
-#: actions/apigroupcreate.php:334 actions/editgroup.php:234
+#: actions/apigroupcreate.php:286 actions/editgroup.php:234
#: actions/newgroup.php:178
msgid "Alias can't be the same as nickname."
msgstr ""
@@ -600,10 +582,10 @@ msgstr ""
msgid "There was a problem with your session token. Try again, please."
msgstr ""
-#: actions/avatarsettings.php:277 actions/emailsettings.php:255
-#: actions/grouplogo.php:319 actions/imsettings.php:220
-#: actions/recoverpassword.php:44 actions/smssettings.php:248
-#: lib/designsettings.php:304
+#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
+#: actions/emailsettings.php:255 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/recoverpassword.php:44
+#: actions/smssettings.php:248 lib/designsettings.php:304
msgid "Unexpected form submission."
msgstr ""
@@ -667,7 +649,7 @@ msgstr "無此使用者"
msgid "Unblock"
msgstr ""
-#: actions/blockedfromgroup.php:313
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:80
#, fuzzy
msgid "Unblock this user"
msgstr "無此使用者"
@@ -840,7 +822,7 @@ msgid "Delete this user"
msgstr "無此使用者"
#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124
-#: lib/adminpanelaction.php:275 lib/groupnav.php:119
+#: lib/adminpanelaction.php:302 lib/groupnav.php:119
msgid "Design"
msgstr ""
@@ -848,105 +830,181 @@ msgstr ""
msgid "Design settings for this StatusNet site."
msgstr ""
-#: actions/designadminpanel.php:220
-msgid "Unable to delete design setting."
-msgstr ""
+#: actions/designadminpanel.php:278
+#, fuzzy
+msgid "Invalid logo URL."
+msgstr "尺寸錯誤"
-#: actions/designadminpanel.php:301
+#: actions/designadminpanel.php:282
#, fuzzy, php-format
msgid "Theme not available: %s"
msgstr "個人首頁位址錯誤"
-#: actions/designadminpanel.php:406
+#: actions/designadminpanel.php:288
+#, fuzzy, php-format
+msgid "Theme directory not readable: %s"
+msgstr "個人首頁位址錯誤"
+
+#: actions/designadminpanel.php:292
+#, php-format
+msgid "Avatar directory not writable: %s"
+msgstr ""
+
+#: actions/designadminpanel.php:296
+#, php-format
+msgid "Background directory not writable: %s"
+msgstr ""
+
+#: actions/designadminpanel.php:312
+#, php-format
+msgid "Max length for %s %s is 255 characters."
+msgstr ""
+
+#: actions/designadminpanel.php:412
+#, fuzzy
+msgid "Change logo"
+msgstr "更改密碼"
+
+#: actions/designadminpanel.php:417
+#, fuzzy
+msgid "Site logo"
+msgstr "新訊息"
+
+#: actions/designadminpanel.php:424
#, fuzzy
msgid "Change theme"
msgstr "更改"
-#: actions/designadminpanel.php:410
-msgid "Theme"
-msgstr ""
+#: actions/designadminpanel.php:441
+#, fuzzy
+msgid "Site theme"
+msgstr "新訊息"
-#: actions/designadminpanel.php:411
+#: actions/designadminpanel.php:442
msgid "Theme for the site."
msgstr ""
-#: actions/designadminpanel.php:420 lib/designsettings.php:101
+#: actions/designadminpanel.php:447
+msgid "Theme server"
+msgstr ""
+
+#: actions/designadminpanel.php:451
+msgid "Theme path"
+msgstr ""
+
+#: actions/designadminpanel.php:455
+msgid "Theme directory"
+msgstr ""
+
+#: actions/designadminpanel.php:462
+#, fuzzy
+msgid "Avatar Settings"
+msgstr "線上即時通設定"
+
+#: actions/designadminpanel.php:467
+#, fuzzy
+msgid "Avatar server"
+msgstr "線上即時通設定"
+
+#: actions/designadminpanel.php:471
+#, fuzzy
+msgid "Avatar path"
+msgstr "更新個人圖像"
+
+#: actions/designadminpanel.php:475
+#, fuzzy
+msgid "Avatar directory"
+msgstr "更新個人圖像"
+
+#: actions/designadminpanel.php:486 lib/designsettings.php:101
msgid "Change background image"
msgstr ""
-#: actions/designadminpanel.php:424 actions/designadminpanel.php:498
+#: actions/designadminpanel.php:491 actions/designadminpanel.php:578
#: lib/designsettings.php:178
msgid "Background"
msgstr ""
-#: actions/designadminpanel.php:429
+#: actions/designadminpanel.php:496
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
"$s."
msgstr ""
-#: actions/designadminpanel.php:459 lib/designsettings.php:139
+#: actions/designadminpanel.php:526 lib/designsettings.php:139
msgid "On"
msgstr ""
-#: actions/designadminpanel.php:475 lib/designsettings.php:155
+#: actions/designadminpanel.php:542 lib/designsettings.php:155
msgid "Off"
msgstr ""
-#: actions/designadminpanel.php:476 lib/designsettings.php:156
+#: actions/designadminpanel.php:543 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr ""
-#: actions/designadminpanel.php:481 lib/designsettings.php:161
+#: actions/designadminpanel.php:548 lib/designsettings.php:161
msgid "Tile background image"
msgstr ""
-#: actions/designadminpanel.php:490 lib/designsettings.php:170
+#: actions/designadminpanel.php:554
+msgid "Background server"
+msgstr ""
+
+#: actions/designadminpanel.php:558
+msgid "Background path"
+msgstr ""
+
+#: actions/designadminpanel.php:562
+msgid "Background directory"
+msgstr ""
+
+#: actions/designadminpanel.php:569 lib/designsettings.php:170
#, fuzzy
msgid "Change colours"
msgstr "更改密碼"
-#: actions/designadminpanel.php:511 lib/designsettings.php:191
+#: actions/designadminpanel.php:591 lib/designsettings.php:191
#, fuzzy
msgid "Content"
msgstr "連結"
-#: actions/designadminpanel.php:524 lib/designsettings.php:204
+#: actions/designadminpanel.php:604 lib/designsettings.php:204
msgid "Sidebar"
msgstr ""
-#: actions/designadminpanel.php:537 lib/designsettings.php:217
+#: actions/designadminpanel.php:617 lib/designsettings.php:217
msgid "Text"
msgstr ""
-#: actions/designadminpanel.php:550 lib/designsettings.php:230
+#: actions/designadminpanel.php:630 lib/designsettings.php:230
#, fuzzy
msgid "Links"
msgstr "登入"
-#: actions/designadminpanel.php:611 lib/designsettings.php:247
+#: actions/designadminpanel.php:658 lib/designsettings.php:247
msgid "Use defaults"
msgstr ""
-#: actions/designadminpanel.php:612 lib/designsettings.php:248
+#: actions/designadminpanel.php:659 lib/designsettings.php:248
msgid "Restore default designs"
msgstr ""
-#: actions/designadminpanel.php:618 lib/designsettings.php:254
+#: actions/designadminpanel.php:665 lib/designsettings.php:254
msgid "Reset back to default"
msgstr ""
-#: actions/designadminpanel.php:620 actions/emailsettings.php:195
+#: actions/designadminpanel.php:667 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/profilesettings.php:167 actions/siteadminpanel.php:371
+#: actions/profilesettings.php:167 actions/siteadminpanel.php:414
#: actions/smssettings.php:181 actions/subscriptions.php:203
#: actions/tagother.php:154 actions/useradminpanel.php:226
#: lib/designsettings.php:256 lib/groupeditform.php:202
msgid "Save"
msgstr ""
-#: actions/designadminpanel.php:621 lib/designsettings.php:257
+#: actions/designadminpanel.php:668 lib/designsettings.php:257
msgid "Save design"
msgstr ""
@@ -990,6 +1048,11 @@ msgstr "自我介紹過長(共140個字元)"
msgid "Could not update group."
msgstr "無法更新使用者"
+#: actions/editgroup.php:259 classes/User_group.php:390
+#, fuzzy
+msgid "Could not create aliases."
+msgstr "無法存取個人圖像資料"
+
#: actions/editgroup.php:269
msgid "Options saved."
msgstr ""
@@ -1104,7 +1167,7 @@ msgstr ""
msgid "Cannot normalize that email address"
msgstr ""
-#: actions/emailsettings.php:330 actions/siteadminpanel.php:156
+#: actions/emailsettings.php:330 actions/siteadminpanel.php:158
msgid "Not a valid email address"
msgstr ""
@@ -1783,10 +1846,9 @@ msgstr ""
msgid "Incorrect username or password."
msgstr "使用者名稱或密碼錯誤"
-#: actions/login.php:149 actions/recoverpassword.php:375
-#: actions/register.php:248
-msgid "Error setting user."
-msgstr "使用者設定發生錯誤"
+#: actions/login.php:149
+msgid "Error setting user. You are probably not authorized."
+msgstr ""
#: actions/login.php:204 actions/login.php:257 lib/action.php:457
#: lib/logingroupnav.php:79
@@ -2199,7 +2261,7 @@ msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:275
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:309
msgid "Language"
msgstr ""
@@ -2225,7 +2287,7 @@ msgstr ""
msgid "Bio is too long (max %d chars)."
msgstr "自我介紹過長(共140個字元)"
-#: actions/profilesettings.php:228 actions/siteadminpanel.php:163
+#: actions/profilesettings.php:228 actions/siteadminpanel.php:165
msgid "Timezone not selected."
msgstr ""
@@ -2465,6 +2527,10 @@ msgstr ""
msgid "Password and confirmation do not match."
msgstr ""
+#: actions/recoverpassword.php:375 actions/register.php:248
+msgid "Error setting user."
+msgstr "使用者設定發生錯誤"
+
#: actions/recoverpassword.php:382
msgid "New password successfully saved. You are now logged in."
msgstr "新密碼已儲存成功。你已登入。"
@@ -2526,7 +2592,7 @@ msgid "Same as password above. Required."
msgstr ""
#: actions/register.php:437 actions/register.php:441
-#: actions/siteadminpanel.php:253 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:287 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "電子信箱"
@@ -2944,7 +3010,7 @@ msgstr ""
msgid "User is already silenced."
msgstr ""
-#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:272
+#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:299
msgid "Site"
msgstr ""
@@ -2952,119 +3018,230 @@ msgstr ""
msgid "Basic settings for this StatusNet site."
msgstr ""
-#: actions/siteadminpanel.php:145
+#: actions/siteadminpanel.php:147
msgid "Site name must have non-zero length."
msgstr ""
-#: actions/siteadminpanel.php:153
+#: actions/siteadminpanel.php:155
#, fuzzy
msgid "You must have a valid contact email address"
msgstr "此信箱無效"
-#: actions/siteadminpanel.php:171
+#: actions/siteadminpanel.php:173
#, php-format
msgid "Unknown language \"%s\""
msgstr ""
-#: actions/siteadminpanel.php:178
+#: actions/siteadminpanel.php:180
msgid "Invalid snapshot report URL."
msgstr ""
-#: actions/siteadminpanel.php:184
+#: actions/siteadminpanel.php:186
msgid "Invalid snapshot run value."
msgstr ""
-#: actions/siteadminpanel.php:190
+#: actions/siteadminpanel.php:192
msgid "Snapshot frequency must be a number."
msgstr ""
-#: actions/siteadminpanel.php:241
+#: actions/siteadminpanel.php:199
+msgid "You must set an SSL sever when enabling SSL."
+msgstr ""
+
+#: actions/siteadminpanel.php:204
+msgid "Invalid SSL server. Max length is 255 characters."
+msgstr ""
+
+#: actions/siteadminpanel.php:210
+msgid "Minimum text limit is 140c."
+msgstr ""
+
+#: actions/siteadminpanel.php:216
+msgid "Dupe limit must 1 or more seconds."
+msgstr ""
+
+#: actions/siteadminpanel.php:224
+#, php-format
+msgid "Locales directory not readable: %s"
+msgstr ""
+
+#: actions/siteadminpanel.php:275
#, fuzzy
msgid "Site name"
msgstr "新訊息"
-#: actions/siteadminpanel.php:242
+#: actions/siteadminpanel.php:276
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr ""
-#: actions/siteadminpanel.php:245
+#: actions/siteadminpanel.php:279
msgid "Brought by"
msgstr ""
-#: actions/siteadminpanel.php:246
+#: actions/siteadminpanel.php:280
msgid "Text used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:249
+#: actions/siteadminpanel.php:283
msgid "Brought by URL"
msgstr ""
-#: actions/siteadminpanel.php:250
+#: actions/siteadminpanel.php:284
msgid "URL used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:254
+#: actions/siteadminpanel.php:288
#, fuzzy
msgid "contact email address for your site"
msgstr "查無此使用者所註冊的信箱"
-#: actions/siteadminpanel.php:268
+#: actions/siteadminpanel.php:302
msgid "Default timezone"
msgstr ""
-#: actions/siteadminpanel.php:269
+#: actions/siteadminpanel.php:303
msgid "Default timezone for the site; usually UTC."
msgstr ""
-#: actions/siteadminpanel.php:276
+#: actions/siteadminpanel.php:310
msgid "Default site language"
msgstr ""
-#: actions/siteadminpanel.php:282
+#: actions/siteadminpanel.php:316
+msgid "Path to locales"
+msgstr ""
+
+#: actions/siteadminpanel.php:316
+msgid "Directory path to locales"
+msgstr ""
+
+#: actions/siteadminpanel.php:320
+msgid "Server"
+msgstr ""
+
+#: actions/siteadminpanel.php:320
+msgid "Site's server hostname."
+msgstr ""
+
+#: actions/siteadminpanel.php:324
+msgid "Path"
+msgstr ""
+
+#: actions/siteadminpanel.php:324
+#, fuzzy
+msgid "Site path"
+msgstr "新訊息"
+
+#: actions/siteadminpanel.php:328
+msgid "Fancy URLs"
+msgstr ""
+
+#: actions/siteadminpanel.php:330
+msgid "Use fancy (more readable and memorable) URLs?"
+msgstr ""
+
+#: actions/siteadminpanel.php:334
msgid "Private"
msgstr ""
-#: actions/siteadminpanel.php:284
+#: actions/siteadminpanel.php:336
msgid "Prohibit anonymous users (not logged in) from viewing site?"
msgstr ""
-#: actions/siteadminpanel.php:290
+#: actions/siteadminpanel.php:340
+msgid "Invite only"
+msgstr ""
+
+#: actions/siteadminpanel.php:342
+msgid "Make registration invitation only."
+msgstr ""
+
+#: actions/siteadminpanel.php:346 actions/useradminpanel.php:171
+#, fuzzy
+msgid "Closed"
+msgstr "無此使用者"
+
+#: actions/siteadminpanel.php:348
+msgid "Disable new registrations."
+msgstr ""
+
+#: actions/siteadminpanel.php:353
msgid "Randomly during Web hit"
msgstr ""
-#: actions/siteadminpanel.php:291
+#: actions/siteadminpanel.php:354
msgid "In a scheduled job"
msgstr ""
-#: actions/siteadminpanel.php:292
+#: actions/siteadminpanel.php:355 actions/siteadminpanel.php:380
msgid "Never"
msgstr ""
-#: actions/siteadminpanel.php:294
+#: actions/siteadminpanel.php:357
msgid "Data snapshots"
msgstr ""
-#: actions/siteadminpanel.php:295
+#: actions/siteadminpanel.php:358
msgid "When to send statistical data to status.net servers"
msgstr ""
-#: actions/siteadminpanel.php:301
+#: actions/siteadminpanel.php:364
msgid "Frequency"
msgstr ""
-#: actions/siteadminpanel.php:302
+#: actions/siteadminpanel.php:365
msgid "Snapshots will be sent once every N Web hits"
msgstr ""
-#: actions/siteadminpanel.php:309
+#: actions/siteadminpanel.php:372
msgid "Report URL"
msgstr ""
-#: actions/siteadminpanel.php:310
+#: actions/siteadminpanel.php:373
msgid "Snapshots will be sent to this URL"
msgstr ""
-#: actions/siteadminpanel.php:371 actions/useradminpanel.php:226
+#: actions/siteadminpanel.php:381
+msgid "Sometimes"
+msgstr ""
+
+#: actions/siteadminpanel.php:382
+msgid "Always"
+msgstr ""
+
+#: actions/siteadminpanel.php:384
+msgid "Use SSL"
+msgstr ""
+
+#: actions/siteadminpanel.php:385
+msgid "When to use SSL"
+msgstr ""
+
+#: actions/siteadminpanel.php:391
+msgid "SSL Server"
+msgstr ""
+
+#: actions/siteadminpanel.php:392
+msgid "Server to direct SSL requests to"
+msgstr ""
+
+#: actions/siteadminpanel.php:396
+msgid "Text limit"
+msgstr ""
+
+#: actions/siteadminpanel.php:396
+msgid "Maximum number of characters for notices."
+msgstr ""
+
+#: actions/siteadminpanel.php:400
+msgid "Dupe limit"
+msgstr ""
+
+#: actions/siteadminpanel.php:400
+msgid "How long users must wait (in seconds) to post the same thing again."
+msgstr ""
+
+#: actions/siteadminpanel.php:414 actions/useradminpanel.php:226
#, fuzzy
msgid "Save site settings"
msgstr "線上即時通設定"
@@ -3379,11 +3556,6 @@ msgstr ""
msgid "User settings for this StatusNet site."
msgstr ""
-#: actions/useradminpanel.php:171
-#, fuzzy
-msgid "Closed"
-msgstr "無此使用者"
-
#: actions/useradminpanel.php:173
msgid "Is registration on this site prohibited?"
msgstr ""
@@ -3595,6 +3767,16 @@ msgstr ""
msgid "DB error inserting reply: %s"
msgstr "增加回覆時,資料庫發生錯誤: %s"
+#: classes/User_group.php:380
+#, fuzzy
+msgid "Could not create group."
+msgstr "無法存取個人圖像資料"
+
+#: classes/User_group.php:409
+#, fuzzy
+msgid "Could not set group membership."
+msgstr "註冊失敗"
+
#: classes/User.php:347
#, php-format
msgid "Welcome to %1$s, @%2$s!"
@@ -3834,12 +4016,16 @@ msgstr ""
msgid "saveSettings() not implemented."
msgstr ""
-#: lib/adminpanelaction.php:273
+#: lib/adminpanelaction.php:247
+msgid "Unable to delete design setting."
+msgstr ""
+
+#: lib/adminpanelaction.php:300
#, fuzzy
msgid "Basic site configuration"
msgstr "確認信箱"
-#: lib/adminpanelaction.php:276
+#: lib/adminpanelaction.php:303
#, fuzzy
msgid "Design configuration"
msgstr "確認信箱"
@@ -4085,20 +4271,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:203
+#: lib/common.php:199
#, fuzzy
msgid "No configuration file found. "
msgstr "無確認碼"
-#: lib/common.php:204
+#: lib/common.php:200
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:205
+#: lib/common.php:201
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:206
+#: lib/common.php:202
msgid "Go to the installer."
msgstr ""
@@ -4867,11 +5053,6 @@ msgstr ""
msgid "Top posters"
msgstr ""
-#: lib/unblockform.php:80
-#, fuzzy
-msgid "Unlock this user"
-msgstr "無此使用者"
-
#: lib/unsandboxform.php:69
msgid "Unsandbox"
msgstr ""
@@ -4924,47 +5105,47 @@ msgstr ""
msgid "Message"
msgstr ""
-#: lib/util.php:821
+#: lib/util.php:826
msgid "a few seconds ago"
msgstr ""
-#: lib/util.php:823
+#: lib/util.php:828
msgid "about a minute ago"
msgstr ""
-#: lib/util.php:825
+#: lib/util.php:830
#, php-format
msgid "about %d minutes ago"
msgstr ""
-#: lib/util.php:827
+#: lib/util.php:832
msgid "about an hour ago"
msgstr ""
-#: lib/util.php:829
+#: lib/util.php:834
#, php-format
msgid "about %d hours ago"
msgstr ""
-#: lib/util.php:831
+#: lib/util.php:836
msgid "about a day ago"
msgstr ""
-#: lib/util.php:833
+#: lib/util.php:838
#, php-format
msgid "about %d days ago"
msgstr ""
-#: lib/util.php:835
+#: lib/util.php:840
msgid "about a month ago"
msgstr ""
-#: lib/util.php:837
+#: lib/util.php:842
#, php-format
msgid "about %d months ago"
msgstr ""
-#: lib/util.php:839
+#: lib/util.php:844
msgid "about a year ago"
msgstr ""
@@ -4995,5 +5176,9 @@ msgid "Sorry, no incoming email allowed."
msgstr ""
#, fuzzy
+#~ msgid "Unlock this user"
+#~ msgstr "無此使用者"
+
+#, fuzzy
#~ msgid "These people are subscribed to you: "
#~ msgstr "此帳號已註冊"