From a4d733b68dad7f70857309b7da8e95cb164da746 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Fri, 22 Jan 2010 15:04:53 -0800 Subject: [PATCH 001/134] Fix for PoweredByStatusNetPlugin to be localizable (was broken for non-English word order) (Note the .po files will have to be added manually for now as we haven't set TranslateWiki up for plugins I think) --- .../PoweredByStatusNetPlugin.php | 5 +-- .../locale/PoweredByStatusNet.po | 32 +++++++++++++++++++ 2 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 plugins/PoweredByStatusNet/locale/PoweredByStatusNet.po diff --git a/plugins/PoweredByStatusNet/PoweredByStatusNetPlugin.php b/plugins/PoweredByStatusNet/PoweredByStatusNetPlugin.php index c59fcca890..14d1608d3c 100644 --- a/plugins/PoweredByStatusNet/PoweredByStatusNetPlugin.php +++ b/plugins/PoweredByStatusNet/PoweredByStatusNetPlugin.php @@ -46,8 +46,9 @@ class PoweredByStatusNetPlugin extends Plugin function onEndAddressData($action) { $action->elementStart('span', 'poweredby'); - $action->text(_('powered by')); - $action->element('a', array('href' => 'http://status.net/'), 'StatusNet'); + $action->raw(sprintf(_m('powered by %s'), + sprintf('%s', + _m('StatusNet')))); $action->elementEnd('span'); return true; diff --git a/plugins/PoweredByStatusNet/locale/PoweredByStatusNet.po b/plugins/PoweredByStatusNet/locale/PoweredByStatusNet.po new file mode 100644 index 0000000000..bd39124efe --- /dev/null +++ b/plugins/PoweredByStatusNet/locale/PoweredByStatusNet.po @@ -0,0 +1,32 @@ +# 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 , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-01-22 15:03-0800\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: PoweredByStatusNetPlugin.php:49 +#, php-format +msgid "powered by %s" +msgstr "" + +#: PoweredByStatusNetPlugin.php:51 +msgid "StatusNet" +msgstr "" + +#: PoweredByStatusNetPlugin.php:64 +msgid "" +"Outputs powered by StatusNet after site " +"name." +msgstr "" From 51fdba09d4bdc2b933e40c9ea5ea6de76c4aa799 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Thu, 21 Jan 2010 16:49:49 +0100 Subject: [PATCH 002/134] Event hooks for before and after site_notice --- EVENTS.txt | 6 ++++++ lib/action.php | 6 +++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/EVENTS.txt b/EVENTS.txt index 6e6afa070f..1ed670697b 100644 --- a/EVENTS.txt +++ b/EVENTS.txt @@ -150,6 +150,12 @@ StartAddressData: Allows the site owner to provide additional information about EndAddressData: At the end of
- $action: the current action +StartShowSiteNotice: Before showing site notice +- $action: the current action + +EndShowSiteNotice: After showing site notice +- $action: the current action + StartLoginGroupNav: Before showing the login and register navigation menu - $action: the current action diff --git a/lib/action.php b/lib/action.php index 171bea17c7..22425e6821 100644 --- a/lib/action.php +++ b/lib/action.php @@ -373,7 +373,11 @@ class Action extends HTMLOutputter // lawsuit $this->elementStart('div', array('id' => 'header')); $this->showLogo(); $this->showPrimaryNav(); - $this->showSiteNotice(); + if (Event::handle('StartShowSiteNotice', array($this))) { + $this->showSiteNotice(); + + Event::handle('EndShowSiteNotice', array($this)); + } if (common_logged_in()) { $this->showNoticeForm(); } else { From aaa2dd2712504dc9399d6cc5e1a002eb08ce6d4f Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Tue, 12 Jan 2010 01:02:55 +0000 Subject: [PATCH 003/134] Styles for application details page --- theme/base/css/display.css | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 2e4c88dfa3..5e280bdfee 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -894,6 +894,39 @@ font-weight:normal; margin-right:11px; } +#showapplication .entity_profile { +width:68%; +} +#showapplication .entity_profile img { +max-width:96px; +max-height:96px; +} +#showapplication .entity_profile .entity_fn { +margin-left:0; +} +#showapplication .entity_profile .entity_fn .fn:before, +#showapplication .entity_profile .entity_fn .fn:after { +content:''; +} +#showapplication .entity_data { +clear:both; +margin-bottom:18px; +} +#showapplication .entity_data h2 { +display:none; +} +#showapplication .entity_data dl { +margin-bottom:18px; +} +#showapplication .entity_data dt { +font-weight:bold; +} +#showapplication .entity_data dd { +margin-left:1.795%; +font-family:monospace; +font-size:1.3em; +} + /* NOTICE */ .notice, .profile { From f3c732587ca17d7fe693d2f3830bd65f3b1f678f Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Tue, 12 Jan 2010 02:04:20 +0000 Subject: [PATCH 004/134] Styles for application list --- theme/base/css/display.css | 16 +++++++++++++++- theme/default/css/display.css | 2 ++ theme/identica/css/display.css | 2 ++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 5e280bdfee..c33f64aca0 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -894,6 +894,19 @@ font-weight:normal; margin-right:11px; } +/*applications*/ +.applications { +margin-bottom:18px; +float:left; +width:100%; +} +.applications li { +list-style-type:none; +} +.application img { +max-width:96px; +max-height:96px; +} #showapplication .entity_profile { width:68%; } @@ -929,7 +942,8 @@ font-size:1.3em; /* NOTICE */ .notice, -.profile { +.profile, +.application { position:relative; padding-top:11px; padding-bottom:11px; diff --git a/theme/default/css/display.css b/theme/default/css/display.css index 8a2c011752..4a45303caa 100644 --- a/theme/default/css/display.css +++ b/theme/default/css/display.css @@ -129,6 +129,7 @@ color:#002FA7; .notice, .profile, +.application, #content tbody tr { border-top-color:#C8D1D5; } @@ -378,6 +379,7 @@ box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); -webkit-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); } #content .notices li:hover, +#content .applications li:hover, #content tbody tr:hover { background-color:rgba(240, 240, 240, 0.2); } diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index 4ee48459d0..96e3c61bc6 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -129,6 +129,7 @@ color:#002FA7; .notice, .profile, +.application, #content tbody tr { border-top-color:#CEE1E9; } @@ -377,6 +378,7 @@ box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); -webkit-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); } #content .notices li:hover, +#content .applications li:hover, #content tbody tr:hover { background-color:rgba(240, 240, 240, 0.2); } From cae113941d9c2aadcbe4763a481b2bb25a205075 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Tue, 12 Jan 2010 02:33:36 +0000 Subject: [PATCH 005/134] Added key icon for application key and secret rest action --- theme/base/images/icons/icons-01.gif | Bin 3607 -> 3650 bytes theme/base/images/icons/twotone/green/key.gif | Bin 0 -> 76 bytes theme/default/css/display.css | 6 +++++- theme/identica/css/display.css | 6 +++++- 4 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 theme/base/images/icons/twotone/green/key.gif diff --git a/theme/base/images/icons/icons-01.gif b/theme/base/images/icons/icons-01.gif index 06202a047b40daed0f0ceec269d9025232de4dc6..f93d33d79bce50e1e407c98d534c6cbff24d4366 100644 GIT binary patch delta 96 zcmbO(b4Z5A-P6s&GEs`*6#Mi48+raQ3IG59U-2gkBNxMe1|0?<07`9^W&XltIDMjl zq}F7kpC!_klVmOXyvp-$e2>3vRuHD%YdbahO2y=z?nN${lO9D(aobtK$jD#~0Koes A;Q#;t delta 53 zcmX>kGhK$q-P6s&GEs`5gZ+8HMxK96!tqlC6o0ZXaxwg8&|v@qpwwnr<}X}q-}xCC G8LR=HZ4L Date: Tue, 12 Jan 2010 02:51:33 +0000 Subject: [PATCH 006/134] Styles for image max width/height and radio form controls --- theme/base/css/display.css | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/theme/base/css/display.css b/theme/base/css/display.css index c33f64aca0..507733979f 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -903,17 +903,15 @@ width:100%; .applications li { list-style-type:none; } -.application img { +.application img, +#showapplication .entity_profile img, +#editapplication .form_data #application_icon img { max-width:96px; max-height:96px; } #showapplication .entity_profile { width:68%; } -#showapplication .entity_profile img { -max-width:96px; -max-height:96px; -} #showapplication .entity_profile .entity_fn { margin-left:0; } @@ -939,6 +937,10 @@ margin-left:1.795%; font-family:monospace; font-size:1.3em; } +#editapplication .form_data #application_types label.radio, +#editapplication .form_data #default_access_types label.radio { +width:15%; +} /* NOTICE */ .notice, From fa218ec65dde91f129eb17c7d443bec4017d170c Mon Sep 17 00:00:00 2001 From: Craig Andrews Date: Wed, 13 Jan 2010 22:05:22 -0500 Subject: [PATCH 007/134] Revert "Drop the Google Client API-based AJAX geolocation lookup shim -- it fails to ask for user permission, causing us quite a bit of difficulty." This reverts commit 749b8b5b8ca4d1c39d350879aadddbdb9d8b71d5. --- js/geometa.js | 123 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 118 insertions(+), 5 deletions(-) diff --git a/js/geometa.js b/js/geometa.js index 87e3c99a16..21deb18852 100644 --- a/js/geometa.js +++ b/js/geometa.js @@ -1,4 +1,4 @@ -// A shim to implement the W3C Geolocation API Specification using Gears +// 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 @@ -96,9 +96,122 @@ var GearsGeoLocation = (function() { }; }); -// If you have Gears installed use that -if (window.google && google.gears) { - navigator.geolocation = GearsGeoLocation(); -} +var AjaxGeoLocation = (function() { + // -- PRIVATE + var loading = false; + var loadGoogleLoader = function() { + if (!hasGoogleLoader() && !loading) { + loading = true; + var s = document.createElement('script'); + s.src = (document.location.protocol == "https:"?"https://":"http://") + 'www.google.com/jsapi?callback=_google_loader_apiLoaded'; + s.type = "text/javascript"; + document.getElementsByTagName('body')[0].appendChild(s); + } + }; + + var queue = []; + var addLocationQueue = function(callback) { + queue.push(callback); + } + + var runLocationQueue = function() { + if (hasGoogleLoader()) { + while (queue.length > 0) { + var call = queue.pop(); + call(); + } + } + } + + window['_google_loader_apiLoaded'] = function() { + runLocationQueue(); + } + + var hasGoogleLoader = function() { + return (window['google'] && google['loader']); + } + + var checkGoogleLoader = function(callback) { + if (hasGoogleLoader()) return true; + + addLocationQueue(callback); + + loadGoogleLoader(); + + return false; + }; + + loadGoogleLoader(); // start to load as soon as possible just in case + + // -- PUBLIC + return { + shim: true, + + type: "ClientLocation", + + lastPosition: null, + + getCurrentPosition: function(successCallback, errorCallback, options) { + var self = this; + if (!checkGoogleLoader(function() { + self.getCurrentPosition(successCallback, errorCallback, options); + })) return; + + if (google.loader.ClientLocation) { + var cl = google.loader.ClientLocation; + + var position = { + coords: { + latitude: cl.latitude, + longitude: cl.longitude, + altitude: null, + accuracy: 43000, // same as Gears accuracy over wifi? + altitudeAccuracy: null, + heading: null, + speed: null, + }, + // extra info that is outside of the bounds of the core API + address: { + city: cl.address.city, + country: cl.address.country, + country_code: cl.address.country_code, + region: cl.address.region + }, + timestamp: new Date() + }; + + successCallback(position); + + this.lastPosition = position; + } else if (errorCallback === "function") { + errorCallback({ code: 3, message: "Using the Google ClientLocation API and it is not able to calculate a location."}); + } + }, + + watchPosition: function(successCallback, errorCallback, options) { + this.getCurrentPosition(successCallback, errorCallback, options); + + var self = this; + var watchId = setInterval(function() { + self.getCurrentPosition(successCallback, errorCallback, options); + }, 10000); + + return watchId; + }, + + clearWatch: function(watchId) { + clearInterval(watchId); + }, + + getPermission: function(siteName, imageUrl, extraMessage) { + // for now just say yes :) + return true; + } + + }; +}); + +// If you have Gears installed use that, else use Ajax ClientLocation +navigator.geolocation = (window.google && google.gears) ? GearsGeoLocation() : AjaxGeoLocation(); })(); From 414c80a18d6bbcb75e816a5f4ff10d6c54107d41 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Sat, 16 Jan 2010 19:16:44 +0000 Subject: [PATCH 008/134] Removed extra comma in object --- js/geometa.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/geometa.js b/js/geometa.js index 21deb18852..6bad095ec8 100644 --- a/js/geometa.js +++ b/js/geometa.js @@ -168,7 +168,7 @@ var AjaxGeoLocation = (function() { accuracy: 43000, // same as Gears accuracy over wifi? altitudeAccuracy: null, heading: null, - speed: null, + speed: null }, // extra info that is outside of the bounds of the core API address: { From ab53a8704b13a20f8ae885d2b92883e0c7101424 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Sat, 16 Jan 2010 19:42:32 +0000 Subject: [PATCH 009/134] Some JSlint-ing --- js/geometa.js | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/js/geometa.js b/js/geometa.js index 6bad095ec8..bba59b4486 100644 --- a/js/geometa.js +++ b/js/geometa.js @@ -1,5 +1,5 @@ // A shim to implement the W3C Geolocation API Specification using Gears or the Ajax API -if (typeof navigator.geolocation == "undefined" || navigator.geolocation.shim ) (function(){ +if (typeof navigator.geolocation == "undefined" || navigator.geolocation.shim ) { (function(){ // -- BEGIN GEARS_INIT (function() { @@ -23,8 +23,7 @@ if (typeof navigator.geolocation == "undefined" || navigator.geolocation.shim ) } } catch (e) { // Safari - if ((typeof navigator.mimeTypes != 'undefined') - && navigator.mimeTypes["application/x-googlegears"]) { + if ((typeof navigator.mimeTypes != 'undefined') && navigator.mimeTypes["application/x-googlegears"]) { factory = document.createElement("object"); factory.style.display = "none"; factory.width = 0; @@ -64,8 +63,8 @@ var GearsGeoLocation = (function() { return function(position) { callback(position); self.lastPosition = position; - } - } + }; + }; // -- PUBLIC return { @@ -112,7 +111,7 @@ var AjaxGeoLocation = (function() { var queue = []; var addLocationQueue = function(callback) { queue.push(callback); - } + }; var runLocationQueue = function() { if (hasGoogleLoader()) { @@ -121,18 +120,18 @@ var AjaxGeoLocation = (function() { call(); } } - } + }; window['_google_loader_apiLoaded'] = function() { runLocationQueue(); - } + }; var hasGoogleLoader = function() { return (window['google'] && google['loader']); - } + }; var checkGoogleLoader = function(callback) { - if (hasGoogleLoader()) return true; + if (hasGoogleLoader()) { return true; } addLocationQueue(callback); @@ -155,7 +154,7 @@ var AjaxGeoLocation = (function() { var self = this; if (!checkGoogleLoader(function() { self.getCurrentPosition(successCallback, errorCallback, options); - })) return; + })) { return; } if (google.loader.ClientLocation) { var cl = google.loader.ClientLocation; @@ -215,3 +214,4 @@ var AjaxGeoLocation = (function() { navigator.geolocation = (window.google && google.gears) ? GearsGeoLocation() : AjaxGeoLocation(); })(); +} From 68c864c95a10b9018862c8ff3677c1185f1df496 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Sat, 16 Jan 2010 19:44:37 +0000 Subject: [PATCH 010/134] JSLinting on JSON --- js/util.js | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/js/util.js b/js/util.js index a749c5d9f4..2d19b8df25 100644 --- a/js/util.js +++ b/js/util.js @@ -529,13 +529,13 @@ var SN = { // StatusNet $('#'+SN.C.S.NoticeDataGeo).attr('checked', true); var cookieValue = { - 'NLat': data.lat, - 'NLon': data.lon, - 'NLNS': lns, - 'NLID': lid, - 'NLN': NLN_text, - 'NLNU': location.url, - 'NDG': true + NLat: data.lat, + NLon: data.lon, + NLNS: lns, + NLID: lid, + NLN: NLN_text, + NLNU: location.url, + NDG: true }; $.cookie(SN.C.S.NoticeDataGeoCookie, JSON.stringify(cookieValue)); }); @@ -570,9 +570,9 @@ var SN = { // StatusNet $('#'+SN.C.S.NoticeLon).val(position.coords.longitude); var data = { - 'lat': position.coords.latitude, - 'lon': position.coords.longitude, - 'token': $('#token').val() + lat: position.coords.latitude, + lon: position.coords.longitude, + token: $('#token').val() }; getJSONgeocodeURL(geocodeURL, data); From f043bc62a53250eaf383e9f36f95031fcd4e1160 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Sat, 16 Jan 2010 20:10:46 +0000 Subject: [PATCH 011/134] Added missing position paramater --- js/util.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/js/util.js b/js/util.js index 2d19b8df25..0947319554 100644 --- a/js/util.js +++ b/js/util.js @@ -498,7 +498,7 @@ var SN = { // StatusNet $.cookie(SN.C.S.NoticeDataGeoCookie, 'disabled'); } - function getJSONgeocodeURL(geocodeURL, data) { + function getJSONgeocodeURL(geocodeURL, data, position) { $.getJSON(geocodeURL, data, function(location) { var lns, lid; @@ -575,7 +575,7 @@ var SN = { // StatusNet token: $('#token').val() }; - getJSONgeocodeURL(geocodeURL, data); + getJSONgeocodeURL(geocodeURL, data, position); }, function(error) { @@ -602,7 +602,7 @@ var SN = { // StatusNet 'token': $('#token').val() }; - getJSONgeocodeURL(geocodeURL, data); + getJSONgeocodeURL(geocodeURL, data, position); } else { removeNoticeDataGeo(); From 2a1ab137cc233314b4c115d0687c27c7dbaec96f Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Sat, 16 Jan 2010 20:57:18 +0000 Subject: [PATCH 012/134] Using visibility:hidden instead of display:none for checkbox --- theme/base/css/display.css | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 507733979f..fc11a9234d 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -73,7 +73,7 @@ input.checkbox, input.radio { position:relative; top:2px; -left:0; +left:auto; border:0; } @@ -567,7 +567,8 @@ float:right; font-size:0.8em; } -.form_notice #notice_data-geo_wrap label { +.form_notice #notice_data-geo_wrap label, +.form_notice #notice_data-geo_wrap input { position:absolute; top:25px; right:4px; @@ -578,7 +579,7 @@ height:16px; display:block; } .form_notice #notice_data-geo_wrap input { -display:none; +visibility:hidden; } .form_notice #notice_data-geo_wrap label { font-weight:normal; From 37e642bece04a208a7c7b0bffe8bb1dc3f976d1e Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Sun, 17 Jan 2010 14:04:47 +0000 Subject: [PATCH 013/134] Inline script for maxlength is deprecated --- plugins/MobileProfile/MobileProfilePlugin.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/plugins/MobileProfile/MobileProfilePlugin.php b/plugins/MobileProfile/MobileProfilePlugin.php index 14d2500e8f..d426fc282b 100644 --- a/plugins/MobileProfile/MobileProfilePlugin.php +++ b/plugins/MobileProfile/MobileProfilePlugin.php @@ -356,8 +356,6 @@ class MobileProfilePlugin extends WAP20Plugin $contentLimit = Notice::maxContent(); - $form->out->inlineScript('maxLength = ' . $contentLimit . ';'); - if ($contentLimit > 0) { $form->out->element('div', array('id' => 'notice_text-count'), $contentLimit); From 2742494fe82d5c12016d46e2de5a849efe2ebee6 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Sun, 17 Jan 2010 19:45:35 +0000 Subject: [PATCH 014/134] Updated UI for notice aside content and notice options in MobileProfile --- plugins/MobileProfile/mp-screen.css | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/plugins/MobileProfile/mp-screen.css b/plugins/MobileProfile/mp-screen.css index 3eefc0c8e0..472fbb0013 100644 --- a/plugins/MobileProfile/mp-screen.css +++ b/plugins/MobileProfile/mp-screen.css @@ -179,10 +179,12 @@ padding-bottom:4px; } .notice div.entry-content { margin-left:0; -width:62.5%; +width:75%; +max-width:100%; +min-width:0; } .notice-options { -width:34%; +width:50px; margin-right:1%; } @@ -190,12 +192,29 @@ margin-right:1%; width:16px; height:16px; } -.notice-options a, -.notice-options input { +.notice .notice-options a, +.notice .notice-options input { box-shadow:none; -moz-box-shadow:none; -webkit-box-shadow:none; } +.notice .notice-options a, +.notice .notice-options form { +margin:-4px 0 0 0; +} +.notice .notice-options .notice_repeat, +.notice .notice-options .notice_delete { +margin-top:18px; +} +.notice .notice-options .notice_reply, +.notice .notice-options .notice_repeat { +margin-left:18px; +} + + +.notice .notice-options .notice_delete { +float:left; +} .entity_profile { width:auto; From 940fc463c814ac26cdec9e3afdf67fd9187519a3 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Sun, 17 Jan 2010 22:31:47 +0000 Subject: [PATCH 015/134] Took out focus out of textare when location share is enabled/disabled. Also avoids the conflict with the URL fragment on the conversation page. --- js/util.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/js/util.js b/js/util.js index 0947319554..d93467d4a5 100644 --- a/js/util.js +++ b/js/util.js @@ -628,8 +628,6 @@ var SN = { // StatusNet else { removeNoticeDataGeo(); } - - $('#'+SN.C.S.NoticeDataText).focus(); }).change(); } }, From f92a9dad8c68c8a1355a2f00b29d21209b62dd34 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Mon, 18 Jan 2010 11:12:05 +0000 Subject: [PATCH 016/134] Moved farbtastic's stylesheet to use relative paths for its own images --- {theme/base/css => js/farbtastic}/farbtastic.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename {theme/base/css => js/farbtastic}/farbtastic.css (70%) diff --git a/theme/base/css/farbtastic.css b/js/farbtastic/farbtastic.css similarity index 70% rename from theme/base/css/farbtastic.css rename to js/farbtastic/farbtastic.css index 7efcc73c3b..a88e7b868b 100644 --- a/theme/base/css/farbtastic.css +++ b/js/farbtastic/farbtastic.css @@ -16,17 +16,17 @@ height: 101px; } .farbtastic .wheel { - background: url(../../../js/farbtastic/wheel.png) no-repeat; + background: url(wheel.png) no-repeat; width: 195px; height: 195px; } .farbtastic .overlay { - background: url(../../../js/farbtastic/mask.png) no-repeat; + background: url(mask.png) no-repeat; } .farbtastic .marker { width: 17px; height: 17px; margin: -8px 0 0 -8px; overflow: hidden; - background: url(../../../js/farbtastic/marker.png) no-repeat; + background: url(marker.png) no-repeat; } From 0f3658d3da788b071da408839195526a10da5e2e Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Mon, 18 Jan 2010 11:29:05 +0000 Subject: [PATCH 017/134] Updated path to farbtastic stylesheet --- actions/designadminpanel.php | 2 +- lib/designsettings.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/actions/designadminpanel.php b/actions/designadminpanel.php index f862aff0eb..72ad6ade2a 100644 --- a/actions/designadminpanel.php +++ b/actions/designadminpanel.php @@ -289,7 +289,7 @@ class DesignadminpanelAction extends AdminPanelAction function showStylesheets() { parent::showStylesheets(); - $this->cssLink('css/farbtastic.css','base','screen, projection, tv'); + $this->cssLink('js/farbtastic/farbtastic.css',null,'screen, projection, tv'); } /** diff --git a/lib/designsettings.php b/lib/designsettings.php index b70ba0dfca..8e44c03a92 100644 --- a/lib/designsettings.php +++ b/lib/designsettings.php @@ -314,7 +314,7 @@ class DesignSettingsAction extends AccountSettingsAction function showStylesheets() { parent::showStylesheets(); - $this->cssLink('css/farbtastic.css','base','screen, projection, tv'); + $this->cssLink('js/farbtastic/farbtastic.css',null,'screen, projection, tv'); } /** From c367e09d1130d4d4f01e029c4659b18f55ae6d8f Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Mon, 18 Jan 2010 12:55:14 +0000 Subject: [PATCH 018/134] Some JS cleaning up for NoticeLocationAttach (which fixes also fixes a few bugs in WebKit) --- js/util.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/js/util.js b/js/util.js index d93467d4a5..a7339010a7 100644 --- a/js/util.js +++ b/js/util.js @@ -498,7 +498,7 @@ var SN = { // StatusNet $.cookie(SN.C.S.NoticeDataGeoCookie, 'disabled'); } - function getJSONgeocodeURL(geocodeURL, data, position) { + function getJSONgeocodeURL(geocodeURL, data) { $.getJSON(geocodeURL, data, function(location) { var lns, lid; @@ -513,7 +513,7 @@ var SN = { // StatusNet } if (typeof(location.name) == 'undefined') { - NLN_text = position.coords.latitude + ';' + position.coords.longitude; + NLN_text = data.lat + ';' + data.lon; } else { NLN_text = location.name; @@ -575,7 +575,7 @@ var SN = { // StatusNet token: $('#token').val() }; - getJSONgeocodeURL(geocodeURL, data, position); + getJSONgeocodeURL(geocodeURL, data); }, function(error) { @@ -597,12 +597,12 @@ var SN = { // StatusNet else { if (NLat.length > 0 && NLon.length > 0) { var data = { - 'lat': NLat, - 'lon': NLon, - 'token': $('#token').val() + lat: NLat, + lon: NLon, + token: $('#token').val() }; - getJSONgeocodeURL(geocodeURL, data, position); + getJSONgeocodeURL(geocodeURL, data); } else { removeNoticeDataGeo(); From c3ee1af7bee3b7268fc4cfd40ef45d9ca512fe97 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Mon, 18 Jan 2010 17:17:02 +0000 Subject: [PATCH 019/134] Missing null className for incoming email form legend --- actions/emailsettings.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/actions/emailsettings.php b/actions/emailsettings.php index bfef2970da..08608348cd 100644 --- a/actions/emailsettings.php +++ b/actions/emailsettings.php @@ -130,7 +130,7 @@ class EmailsettingsAction extends AccountSettingsAction if (common_config('emailpost', 'enabled') && $user->email) { $this->elementStart('fieldset', array('id' => 'settings_email_incoming')); - $this->element('legend',_('Incoming email')); + $this->element('legend', null, _('Incoming email')); if ($user->incomingemail) { $this->elementStart('p'); $this->element('span', 'address', $user->incomingemail); From e3ee5663abfc5fa873f4b2c76f6f89971c3c9aae Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Wed, 20 Jan 2010 18:32:24 +0100 Subject: [PATCH 020/134] Updated notice item view where a) notice text no longer wraps around (under author's photo) b) supplemental notice content and options will start right under notice text. --- plugins/MobileProfile/mp-screen.css | 12 +++++++++++- theme/base/css/display.css | 22 +++++++++++++++++++--- 2 files changed, 30 insertions(+), 4 deletions(-) diff --git a/plugins/MobileProfile/mp-screen.css b/plugins/MobileProfile/mp-screen.css index 472fbb0013..76071352d0 100644 --- a/plugins/MobileProfile/mp-screen.css +++ b/plugins/MobileProfile/mp-screen.css @@ -176,8 +176,18 @@ margin-bottom:0; .profile { padding-top:4px; padding-bottom:4px; +min-height:65px; } -.notice div.entry-content { +#content .notice .entry-title { +float:left; +width:100%; +margin-left:0; +} +#content .notice .author .photo { +position:static; +float:left; +} +#content .notice div.entry-content { margin-left:0; width:75%; max-width:100%; diff --git a/theme/base/css/display.css b/theme/base/css/display.css index fc11a9234d..82670c964a 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -1006,6 +1006,16 @@ float:left; #shownotice .vcard .photo { margin-bottom:4px; } +#content .notice .author .photo { +position:absolute; +top:11px; +left:0; +float:none; +} +#content .notice .entry-title { +margin-left:59px; +} + .vcard .url { text-decoration:none; } @@ -1014,13 +1024,19 @@ text-decoration:underline; } .notice .entry-title { -float:left; -width:100%; overflow:hidden; } .notice .entry-title.ov { overflow:visible; } +#showstream .notice .entry-title, +#showstream .notice div.entry-content { +margin-left:0; +} +#shownotice .notice .entry-title, +#shownotice .notice div.entry-content { +margin-left:110px; +} #shownotice .notice .entry-title { font-size:2.2em; } @@ -1050,7 +1066,6 @@ max-width:70%; } #showstream .notice div.entry-content, #shownotice .notice div.entry-content { -margin-left:0; max-width:79%; } @@ -1114,6 +1129,7 @@ position:relative; font-size:0.95em; width:113px; float:right; +margin-top:3px; margin-right:4px; } From 51775e38bab8f3c41aa19bed84a38d1a7f534e37 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Wed, 20 Jan 2010 18:50:48 +0100 Subject: [PATCH 021/134] Better alignment for notice options in MobileProfile --- plugins/MobileProfile/mp-screen.css | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/plugins/MobileProfile/mp-screen.css b/plugins/MobileProfile/mp-screen.css index 76071352d0..04fa5fb002 100644 --- a/plugins/MobileProfile/mp-screen.css +++ b/plugins/MobileProfile/mp-screen.css @@ -194,7 +194,7 @@ max-width:100%; min-width:0; } .notice-options { -width:50px; +width:43px; margin-right:1%; } @@ -202,6 +202,13 @@ margin-right:1%; width:16px; height:16px; } +.notice-options form.processing { +background-image:none; +} +#wrap .notice-options form.processing input.submit { +background-position:0 47%; +} + .notice .notice-options a, .notice .notice-options input { box-shadow:none; @@ -212,16 +219,16 @@ box-shadow:none; .notice .notice-options form { margin:-4px 0 0 0; } -.notice .notice-options .notice_repeat, +.notice .notice-options .form_repeat, .notice .notice-options .notice_delete { -margin-top:18px; +margin-top:11px; } -.notice .notice-options .notice_reply, -.notice .notice-options .notice_repeat { -margin-left:18px; +.notice .notice-options .form_favor, +.notice .notice-options .form_disfavor, +.notice .notice-options .form_repeat { +margin-right:11px; } - .notice .notice-options .notice_delete { float:left; } From fed111f08aeba6be5bfc5e924975048e6a8f6521 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Thu, 21 Jan 2010 13:23:04 +0100 Subject: [PATCH 022/134] Removed mobile stylesheet from core output. If Mobile support is seeked, MobileProfile plugin should be used. --- lib/action.php | 4 - theme/base/css/mobile.css | 150 -------------------------------------- 2 files changed, 154 deletions(-) delete mode 100644 theme/base/css/mobile.css diff --git a/lib/action.php b/lib/action.php index 22425e6821..e242775585 100644 --- a/lib/action.php +++ b/lib/action.php @@ -199,10 +199,6 @@ class Action extends HTMLOutputter // lawsuit if (Event::handle('StartShowStatusNetStyles', array($this)) && Event::handle('StartShowLaconicaStyles', array($this))) { $this->cssLink('css/display.css',null,'screen, projection, tv'); - if (common_config('site', 'mobile')) { - // TODO: "handheld" CSS for other mobile devices - $this->cssLink('css/mobile.css','base','only screen and (max-device-width: 480px)'); // Mobile WebKit - } $this->cssLink('css/print.css','base','print'); Event::handle('EndShowStatusNetStyles', array($this)); Event::handle('EndShowLaconicaStyles', array($this)); diff --git a/theme/base/css/mobile.css b/theme/base/css/mobile.css deleted file mode 100644 index f6c53ea8dc..0000000000 --- a/theme/base/css/mobile.css +++ /dev/null @@ -1,150 +0,0 @@ -/** theme: base - * - * @package StatusNet - * @author Meitar Moscovitz - * @author Sarven Capadisli - * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 - * @link http://status.net/ - */ - -body { -font-size:2.5em; -} - -#wrap { -width:95%; -} - -#header, -#header address, -#anon_notice, -#site_nav_local_views .nav, -#form_notice, -#form_notice .form_data li, -#core, -#content_inner, -#notices_primary, -.notice, -.notice .entry-title, -.notice div.entry-content, -.notice-options, -.notice .notice-options a, -.pagination, -.pagination .nav, -.aside .section { -float:none; -} - -.notice-options .notice_reply, -.notice-options .notice_delete, -.notice-options .form_favor, -.notice-options .form_disfavor { -position:static; -} - -#form_notice, -#anon_notice, -#footer, -#form_notice .form_actions input.submit { -width:auto; -} - -.form_settings label { -width:25%; -} -.form_settings .form_data p.form_guide { -margin-left:26%; -} - -#site_nav_global_primary { -width:75%; -} - -.entity_profile { -width:65%; -} -.entity_actions { -margin-left:0; -} - -#form_notice, -#anon_notice { -clear:both; -} - -#content, -#aside_primary { -width:96%; -padding-left:2%; -padding-right:2%; -} - -#site_notice { -position:static; -float:right; -clear:right; -width:75%; -margin-right:0; -margin-bottom:11px; -} - -.notices { -font-size:1.5em; -} - -#form_notice textarea { -width:80%; -height:5em; -} -#form_notice .form_note { -right:20%; -top:6em; -} - - -.vcard .photo, -.section .vcard .photo { -margin-right:18px; -} -.notice, -.profile { -margin-bottom:18px; -} - -.notices .entry-title, -.notices div.entry-content { -width:90%; -} -.notice div.entry-content { -margin-left:0; -} - -.notice .author .photo { -height:4.5em; -width:4.5em; -} -.notice-options { -position:absolute; -top:0; -right:0; -padding-left:7%; -width:3%; -} - -.notice-options .notice_delete a { -float:left; -} -.pagination .nav { -overflow:auto; -} - -#export_data { -display:none; -} - -#site_nav_local_views li { -margin-right:4px; -} -#site_nav_local_views a { -padding:18px 11px; -} From 38fe4ad9586706c69b46d68612d5a20415433ae7 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Sun, 24 Jan 2010 15:34:40 +0100 Subject: [PATCH 023/134] Added version info for MobileProfile plugin --- plugins/MobileProfile/MobileProfilePlugin.php | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/plugins/MobileProfile/MobileProfilePlugin.php b/plugins/MobileProfile/MobileProfilePlugin.php index d426fc282b..5c913836dc 100644 --- a/plugins/MobileProfile/MobileProfilePlugin.php +++ b/plugins/MobileProfile/MobileProfilePlugin.php @@ -414,7 +414,15 @@ class MobileProfilePlugin extends WAP20Plugin return $proto.'://'.$serverpart.'/'.$pathpart.$relative; } + + function onPluginVersion(&$versions) + { + $versions[] = array('name' => 'MobileProfile', + 'version' => STATUSNET_VERSION, + 'author' => 'Sarven Capadisli', + 'homepage' => 'http://status.net/wiki/Plugin:MobileProfile', + 'rawdescription' => + _m('XHTML MobileProfile output for supporting user agents.')); + return true; + } } - - -?> From 238998eca017a3ddd6cc0c01a75f8ace37661b5d Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Sun, 24 Jan 2010 18:18:24 -0500 Subject: [PATCH 024/134] save nickname and wildcard when setting up status network --- classes/Status_network.php | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/classes/Status_network.php b/classes/Status_network.php index ef8e1ed431..445f8a5a3c 100644 --- a/classes/Status_network.php +++ b/classes/Status_network.php @@ -48,6 +48,7 @@ class Status_network extends DB_DataObject static $cache = null; static $base = null; + static $wildcard = null; /** * @param string $dbhost @@ -187,7 +188,12 @@ class Status_network extends DB_DataObject $config['db']['database'] = "mysqli://$dbuser:$dbpass@$dbhost/$dbname"; - $config['site']['name'] = $sn->sitename; + $config['site']['name'] = $sn->sitename; + $config['site']['nickname'] = $sn->nickname; + + self::$wildcard = $wildcard; + + $config['site']['wildcard'] =& self::$wildcard; if (!empty($sn->hostname)) { $config['site']['server'] = $sn->hostname; @@ -230,4 +236,13 @@ class Status_network extends DB_DataObject exit; } + + function getServerName() + { + if (!empty($this->hostname)) { + return $this->hostname; + } else { + return $this->nickname . '.' . self::$wildcard; + } + } } From 7cd666ae928b003a8096289009bfd7290f8f6c73 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Sun, 24 Jan 2010 18:19:13 -0500 Subject: [PATCH 025/134] defaults for nickname and wildcard --- lib/default.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/default.php b/lib/default.php index 0cb70de2d2..e3a043de12 100644 --- a/lib/default.php +++ b/lib/default.php @@ -30,6 +30,8 @@ $default = array('site' => array('name' => 'Just another StatusNet microblog', + 'nickname' => 'statusnet', + 'wildcard' => null, 'server' => $_server, 'theme' => 'default', 'path' => $_path, From 60ce2ff3d01f22900d62b3d30ed89bc5e9d55167 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Sun, 24 Jan 2010 15:44:09 -0800 Subject: [PATCH 026/134] Use new StatusNetwork->serverName() to get full domain for wildcard config until we rebuild queues to be based on nicknames. Fixes live bug with new *.status.net sites breaking queuedaemon.php --- lib/iomaster.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/iomaster.php b/lib/iomaster.php index 004e92b3ee..3bf82bc6b4 100644 --- a/lib/iomaster.php +++ b/lib/iomaster.php @@ -88,7 +88,7 @@ abstract class IoMaster $sn = new Status_network(); $sn->find(); while ($sn->fetch()) { - $hosts[] = $sn->hostname; + $hosts[] = $sn->getServerName(); } return $hosts; } From c0b832d19fc478d67752a6692bf71f178346e14a Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Tue, 10 Nov 2009 17:10:56 -0800 Subject: [PATCH 027/134] Add new OAuth application tables and DataObjects. Also add a new column for consumer secret to consumer table. --- classes/Consumer.php | 5 +++-- classes/Oauth_application.php | 33 ++++++++++++++++++++++++++++++ classes/Oauth_application_user.php | 24 ++++++++++++++++++++++ db/statusnet.sql | 26 +++++++++++++++++++++++ 4 files changed, 86 insertions(+), 2 deletions(-) create mode 100755 classes/Oauth_application.php create mode 100755 classes/Oauth_application_user.php diff --git a/classes/Consumer.php b/classes/Consumer.php index d5b7b7e33a..d17f183a88 100644 --- a/classes/Consumer.php +++ b/classes/Consumer.php @@ -11,9 +11,10 @@ class Consumer extends Memcached_DataObject public $__table = 'consumer'; // table name public $consumer_key; // varchar(255) primary_key not_null + public $consumer_secret; // varchar(255) not_null public $seed; // char(32) not_null - public $created; // datetime() not_null - public $modified; // timestamp() not_null default_CURRENT_TIMESTAMP + public $created; // datetime not_null + public $modified; // timestamp not_null default_CURRENT_TIMESTAMP /* Static get */ function staticGet($k,$v=null) diff --git a/classes/Oauth_application.php b/classes/Oauth_application.php new file mode 100755 index 0000000000..6ad2db6dde --- /dev/null +++ b/classes/Oauth_application.php @@ -0,0 +1,33 @@ + Date: Thu, 12 Nov 2009 19:34:13 -0800 Subject: [PATCH 028/134] Changed the OAuth app tables to refer to profiles instead of users. Added an owner column to oauth_application. --- classes/Oauth_application.php | 23 ++++++++++++----------- classes/Oauth_application_user.php | 14 +++++++------- db/statusnet.sql | 9 +++++---- 3 files changed, 24 insertions(+), 22 deletions(-) mode change 100755 => 100644 classes/Oauth_application.php mode change 100755 => 100644 classes/Oauth_application_user.php diff --git a/classes/Oauth_application.php b/classes/Oauth_application.php old mode 100755 new mode 100644 index 6ad2db6dde..e2862bf97f --- a/classes/Oauth_application.php +++ b/classes/Oauth_application.php @@ -2,32 +2,33 @@ /** * Table Definition for oauth_application */ -require_once 'classes/Memcached_DataObject'; +require_once INSTALLDIR.'/classes/Memcached_DataObject.php'; -class Oauth_application extends Memcached_DataObject +class Oauth_application extends Memcached_DataObject { ###START_AUTOCODE /* the code below is auto generated do not remove the above tag */ public $__table = 'oauth_application'; // table name public $id; // int(4) primary_key not_null + public $owner; // int(4) not_null public $consumer_key; // varchar(255) not_null public $name; // varchar(255) not_null - public $description; // varchar(255) + public $description; // varchar(255) public $icon; // varchar(255) not_null - public $source_url; // varchar(255) - public $organization; // varchar(255) - public $homepage; // varchar(255) + public $source_url; // varchar(255) + public $organization; // varchar(255) + public $homepage; // varchar(255) public $callback_url; // varchar(255) not_null - public $type; // tinyint(1) - public $access_type; // tinyint(1) + public $type; // tinyint(1) + public $access_type; // tinyint(1) public $created; // datetime not_null public $modified; // timestamp not_null default_CURRENT_TIMESTAMP /* Static get */ - function staticGet($k,$v=null) - { return Memcached_DataObject::staticGet('Oauth_application_user',$k,$v); } - + function staticGet($k,$v=NULL) { + return Memcached_DataObject::staticGet('Oauth_application',$k,$v); + } /* the code above is auto generated do not remove the tag below */ ###END_AUTOCODE } diff --git a/classes/Oauth_application_user.php b/classes/Oauth_application_user.php old mode 100755 new mode 100644 index a8922f5e77..9e45ece25f --- a/classes/Oauth_application_user.php +++ b/classes/Oauth_application_user.php @@ -2,23 +2,23 @@ /** * Table Definition for oauth_application_user */ -require_once 'classes/Memcached_DataObject'; +require_once INSTALLDIR.'/classes/Memcached_DataObject.php'; -class Oauth_application_user extends Memcached_DataObject +class Oauth_application_user extends Memcached_DataObject { ###START_AUTOCODE /* the code below is auto generated do not remove the above tag */ public $__table = 'oauth_application_user'; // table name - public $user_id; // int(4) primary_key not_null + public $profile_id; // int(4) primary_key not_null public $application_id; // int(4) primary_key not_null - public $access_type; // tinyint(1) + public $access_type; // tinyint(1) public $created; // datetime not_null /* Static get */ - function staticGet($k,$v=null) - { return Memcached_DataObject::staticGet('Oauth_application_user',$k,$v); } - + function staticGet($k,$v=NULL) { + return Memcached_DataObject::staticGet('Oauth_application_user',$k,$v); + } /* the code above is auto generated do not remove the tag below */ ###END_AUTOCODE } diff --git a/db/statusnet.sql b/db/statusnet.sql index be0d140927..03e6115e5f 100644 --- a/db/statusnet.sql +++ b/db/statusnet.sql @@ -210,6 +210,7 @@ create table nonce ( create table oauth_application ( id integer auto_increment primary key comment 'unique identifier', + owner integer not null comment 'owner of the application' references profile (id), consumer_key varchar(255) not null comment 'application consumer key' references consumer (consumer_key), name varchar(255) not null comment 'name of the application', description varchar(255) comment 'description of the application', @@ -219,18 +220,18 @@ create table oauth_application ( homepage varchar(255) comment 'homepage for the organization', callback_url varchar(255) not null comment 'url to redirect to after authentication', type tinyint default 0 comment 'type of app, 0 = browser, 1 = desktop', - access_type tinyint default 0 comment 'default access type, 0 = read-write, 1 = read-only', + access_type tinyint default 0 comment 'default access type, bit 1 = read, bit 2 = write', created datetime not null comment 'date this record was created', modified timestamp comment 'date this record was modified' ) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin; create table oauth_application_user ( - user_id integer not null comment 'id of the application user' references user (id), + profile_id integer not null comment 'user of the application' references profile (id), application_id integer not null comment 'id of the application' references oauth_application (id), - access_type tinyint default 0 comment 'access type, 0 = read-write, 1 = read-only', + access_type tinyint default 0 comment 'access type, bit 1 = read, bit 2 = write, bit 3 = revoked', created datetime not null comment 'date this record was created', - constraint primary key (user_id, application_id) + constraint primary key (profile_id, application_id) ) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin; /* These are used by JanRain OpenID library */ From ae46bc5fff21120ef867fb8ab59833a8f26adf47 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Thu, 12 Nov 2009 19:42:18 -0800 Subject: [PATCH 029/134] Started work on interface for displaying connected OAuth apps --- actions/applicationsettings.php | 135 ++++++++++++++++++++++++++++++++ actions/oauthclients.php | 108 +++++++++++++++++++++++++ classes/Profile.php | 23 ++++++ lib/applicationlist.php | 111 ++++++++++++++++++++++++++ lib/connectsettingsaction.php | 4 +- lib/router.php | 4 +- 6 files changed, 383 insertions(+), 2 deletions(-) create mode 100644 actions/applicationsettings.php create mode 100644 actions/oauthclients.php create mode 100644 lib/applicationlist.php diff --git a/actions/applicationsettings.php b/actions/applicationsettings.php new file mode 100644 index 0000000000..16c571feee --- /dev/null +++ b/actions/applicationsettings.php @@ -0,0 +1,135 @@ +. + * + * @category Settings + * @package StatusNet + * @author Zach Copley + * @copyright 2008-2009 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET') && !defined('LACONICA')) { + exit(1); +} + +require_once INSTALLDIR . '/lib/connectsettingsaction.php'; +require_once INSTALLDIR . '/lib/applicationlist.php'; + +/** + * Show connected OAuth applications + * + * @category Settings + * @package StatusNet + * @author Zach Copley + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + * + * @see SettingsAction + */ + +class ApplicationSettingsAction extends ConnectSettingsAction +{ + /** + * Title of the page + * + * @return string Title of the page + */ + + function title() + { + return _('Connected Applications'); + } + + /** + * Instructions for use + * + * @return instructions for use + */ + + function getInstructions() + { + return _('You have allowed the following applications to access you account.'); + } + + /** + * Content area of the page + * + * @return void + */ + + function showContent() + { + $user = common_current_user(); + $profile = $user->getProfile(); + + $offset = ($this->page - 1) * APPS_PER_PAGE; + $limit = APPS_PER_PAGE + 1; + + $application = $profile->getApplications($offset, $limit); + + if ($application) { + $al = new ApplicationList($application, $this->user, $this); + $cnt = $al->show(); + if (0 == $cnt) { + $this->showEmptyListMessage(); + } + } + + $this->pagination($this->page > 1, $cnt > APPS_PER_PAGE, + $this->page, 'applicationsettings', + array('nickname' => $this->user->nickname)); + } + + /** + * Handle posts to this form + * + * Based on the button that was pressed, muxes out to other functions + * to do the actual task requested. + * + * All sub-functions reload the form with a message -- success or failure. + * + * @return void + */ + + function handlePost() + { + // CSRF protection + + $token = $this->trimmed('token'); + if (!$token || $token != common_session_token()) { + $this->showForm(_('There was a problem with your session token. '. + 'Try again, please.')); + return; + } + + } + + function showEmptyListMessage() + { + $message = sprintf(_('You have not authorized any applications to use your account.')); + + $this->elementStart('div', 'guide'); + $this->raw(common_markup_to_html($message)); + $this->elementEnd('div'); + } + +} diff --git a/actions/oauthclients.php b/actions/oauthclients.php new file mode 100644 index 0000000000..9a29e158e1 --- /dev/null +++ b/actions/oauthclients.php @@ -0,0 +1,108 @@ +. + * + * @category Settings + * @package StatusNet + * @author Zach Copley + * @copyright 2008-2009 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET') && !defined('LACONICA')) { + exit(1); +} + +require_once INSTALLDIR . '/lib/connectsettingsaction.php'; + +/** + * Show a user's registered OAuth applications + * + * @category Settings + * @package StatusNet + * @author Zach Copley + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + * + * @see SettingsAction + */ + +class OauthClientsAction extends ConnectSettingsAction +{ + /** + * Title of the page + * + * @return string Title of the page + */ + + function title() + { + return _('Applications using %%site_name%%'); + } + + /** + * Instructions for use + * + * @return instructions for use + */ + + function getInstructions() + { + return _('Applications you have registered'); + } + + /** + * Content area of the page + * + * @return void + */ + + function showContent() + { + $user = common_current_user(); + + } + + /** + * Handle posts to this form + * + * Based on the button that was pressed, muxes out to other functions + * to do the actual task requested. + * + * All sub-functions reload the form with a message -- success or failure. + * + * @return void + */ + + function handlePost() + { + // CSRF protection + + $token = $this->trimmed('token'); + if (!$token || $token != common_session_token()) { + $this->showForm(_('There was a problem with your session token. '. + 'Try again, please.')); + return; + } + + } + +} diff --git a/classes/Profile.php b/classes/Profile.php index 25d908dbf9..687215b11b 100644 --- a/classes/Profile.php +++ b/classes/Profile.php @@ -352,6 +352,29 @@ class Profile extends Memcached_DataObject return $profile; } + function getApplications($offset = 0, $limit = null) + { + $qry = + 'SELECT oauth_application_user.* ' . + 'FROM oauth_application_user ' . + 'WHERE profile_id = %d ' . + 'ORDER BY created DESC '; + + if ($offset > 0) { + if (common_config('db','type') == 'pgsql') { + $qry .= ' LIMIT ' . $limit . ' OFFSET ' . $offset; + } else { + $qry .= ' LIMIT ' . $offset . ', ' . $limit; + } + } + + $application = new Oauth_application(); + + $cnt = $application->query(sprintf($qry, $this->id)); + + return $application; + } + function subscriptionCount() { $c = common_memcache(); diff --git a/lib/applicationlist.php b/lib/applicationlist.php new file mode 100644 index 0000000000..fed784bb63 --- /dev/null +++ b/lib/applicationlist.php @@ -0,0 +1,111 @@ +. + * + * @category Public + * @package StatusNet + * @author Zach Copley + * @copyright 2008-2009 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET') && !defined('LACONICA')) { + exit(1); +} + +require_once INSTALLDIR . '/lib/widget.php'; + +define('APPS_PER_PAGE', 20); + +/** + * Widget to show a list of OAuth applications + * + * @category Public + * @package StatusNet + * @author Zach Copley + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +class ApplicationList extends Widget +{ + /** Current application, application query */ + var $application = null; + + /** Owner of this list */ + var $owner = null; + + /** Action object using us. */ + var $action = null; + + function __construct($application, $owner=null, $action=null) + { + parent::__construct($action); + + $this->application = $application; + $this->owner = $owner; + $this->action = $action; + } + + function show() + { + $this->out->elementStart('ul', 'applications xoxo'); + + $cnt = 0; + + while ($this->application->fetch()) { + $cnt++; + if($cnt > APPS_PER_PAGE) { + break; + } + $this->showapplication(); + } + + $this->out->elementEnd('ul'); + + return $cnt; + } + + function showApplication() + { + $this->out->elementStart('li', array('class' => 'application', + 'id' => 'oauthclient-' . $this->application->id)); + + $user = common_current_user(); + + $this->out->raw($this->application->name); + + $this->out->elementEnd('li'); + } + + /* Override this in subclasses. */ + + function showOwnerControls() + { + return; + } + + function highlight($text) + { + return htmlspecialchars($text); + } +} diff --git a/lib/connectsettingsaction.php b/lib/connectsettingsaction.php index e5fb8727ba..4b5059540d 100644 --- a/lib/connectsettingsaction.php +++ b/lib/connectsettingsaction.php @@ -116,6 +116,9 @@ class ConnectSettingsNav extends Widget _('Updates by SMS')); } + $menu['applicationsettings'] = array(_('Applications'), + _('OAuth connected applications')); + foreach ($menu as $menuaction => $menudesc) { $this->action->menuItem(common_local_url($menuaction), $menudesc[0], @@ -131,4 +134,3 @@ class ConnectSettingsNav extends Widget } - diff --git a/lib/router.php b/lib/router.php index 6b87ed27f6..9b2aa025ef 100644 --- a/lib/router.php +++ b/lib/router.php @@ -140,11 +140,13 @@ class Router // settings - foreach (array('profile', 'avatar', 'password', 'im', + foreach (array('profile', 'avatar', 'password', 'im', 'application', 'email', 'sms', 'userdesign', 'other') as $s) { $m->connect('settings/'.$s, array('action' => $s.'settings')); } + $m->connect('settings/oauthclients', array('action' => 'oauthclients')); + // search foreach (array('group', 'people', 'notice') as $s) { From 9d958fd539ecb74356013c11a2fd2c4c8b6a0ed1 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Fri, 13 Nov 2009 19:02:18 -0800 Subject: [PATCH 030/134] Reorganized the OAuth app URLs and more work on the register app workflow --- actions/{oauthclients.php => apps.php} | 4 +- actions/newapplication.php | 202 ++++++++++++++++ ...tings.php => oauthconnectionssettings.php} | 4 +- lib/applicationeditform.php | 215 ++++++++++++++++++ lib/connectsettingsaction.php | 8 +- lib/router.php | 15 +- 6 files changed, 436 insertions(+), 12 deletions(-) rename actions/{oauthclients.php => apps.php} (96%) create mode 100644 actions/newapplication.php rename actions/{applicationsettings.php => oauthconnectionssettings.php} (96%) create mode 100644 lib/applicationeditform.php diff --git a/actions/oauthclients.php b/actions/apps.php similarity index 96% rename from actions/oauthclients.php rename to actions/apps.php index 9a29e158e1..d4cea1e3e9 100644 --- a/actions/oauthclients.php +++ b/actions/apps.php @@ -45,7 +45,7 @@ require_once INSTALLDIR . '/lib/connectsettingsaction.php'; * @see SettingsAction */ -class OauthClientsAction extends ConnectSettingsAction +class AppsAction extends ConnectSettingsAction { /** * Title of the page @@ -55,7 +55,7 @@ class OauthClientsAction extends ConnectSettingsAction function title() { - return _('Applications using %%site_name%%'); + return _('OAuth applications'); } /** diff --git a/actions/newapplication.php b/actions/newapplication.php new file mode 100644 index 0000000000..a78a856b18 --- /dev/null +++ b/actions/newapplication.php @@ -0,0 +1,202 @@ +. + * + * @category Applications + * @package StatusNet + * @author Zach Copley + * @copyright 2008-2009 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET') && !defined('LACONICA')) { + exit(1); +} + +/** + * Add a new application + * + * This is the form for adding a new application + * + * @category Application + * @package StatusNet + * @author Zach Copley + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +class NewApplicationAction extends Action +{ + var $msg; + + function title() + { + return _('New Application'); + } + + /** + * Prepare to run + */ + + function prepare($args) + { + parent::prepare($args); + + if (!common_logged_in()) { + $this->clientError(_('You must be logged in to create a group.')); + return false; + } + + return true; + } + + /** + * Handle the request + * + * On GET, show the form. On POST, try to save the group. + * + * @param array $args unused + * + * @return void + */ + + function handle($args) + { + parent::handle($args); + if ($_SERVER['REQUEST_METHOD'] == 'POST') { + $this->trySave(); + } else { + $this->showForm(); + } + } + + function showForm($msg=null) + { + $this->msg = $msg; + $this->showPage(); + } + + function showContent() + { + $form = new ApplicationEditForm($this); + $form->show(); + } + + function showPageNotice() + { + if ($this->msg) { + $this->element('p', 'error', $this->msg); + } else { + $this->element('p', 'instructions', + _('Use this form to register a new application.')); + } + } + + function trySave() + { + $name = $this->trimmed('name'); + $description = $this->trimmed('description'); + $source_url = $this->trimmed('source_url'); + $organization = $this->trimmed('organization'); + $homepage = $this->trimmed('application'); + $callback_url = $this->trimmed('callback_url'); + $this->type = $this->trimmed('type'); + $this->access_type = $this->trimmed('access_type'); + + if (!is_null($name) && mb_strlen($name) > 255) { + $this->showForm(_('Name is too long (max 255 chars).')); + return; + } else if (User_group::descriptionTooLong($description)) { + $this->showForm(sprintf( + _('description is too long (max %d chars).'), + Oauth_application::maxDescription())); + return; + } elseif (!is_null($source_url) + && (strlen($source_url) > 0) + && !Validate::uri( + $source_url, + array('allowed_schemes' => array('http', 'https')) + ) + ) + { + $this->showForm(_('Source URL is not valid.')); + return; + } elseif (!is_null($homepage) + && (strlen($homepage) > 0) + && !Validate::uri( + $homepage, + array('allowed_schemes' => array('http', 'https')) + ) + ) + { + $this->showForm(_('Homepage is not a valid URL.')); + return; + } elseif (!is_null($callback_url) + && (strlen($callback_url) > 0) + && !Validate::uri( + $source_url, + array('allowed_schemes' => array('http', 'https')) + ) + ) + { + $this->showForm(_('Callback URL is not valid.')); + return; + } + + $cur = common_current_user(); + + // Checked in prepare() above + + assert(!is_null($cur)); + + $app = new Oauth_application(); + + $app->query('BEGIN'); + + $app->name = $name; + $app->owner = $cur->id; + $app->description = $description; + $app->source_url = $souce_url; + $app->organization = $organization; + $app->homepage = $homepage; + $app->callback_url = $callback_url; + $app->type = $type; + $app->access_type = $access_type; + + // generate consumer key and secret + + $app->created = common_sql_now(); + + $result = $app->insert(); + + if (!$result) { + common_log_db_error($group, 'INSERT', __FILE__); + $this->serverError(_('Could not create application.')); + } + + $group->query('COMMIT'); + + common_redirect($group->homeUrl(), 303); + + } + +} + diff --git a/actions/applicationsettings.php b/actions/oauthconnectionssettings.php similarity index 96% rename from actions/applicationsettings.php rename to actions/oauthconnectionssettings.php index 16c571feee..6ec9f70273 100644 --- a/actions/applicationsettings.php +++ b/actions/oauthconnectionssettings.php @@ -46,7 +46,7 @@ require_once INSTALLDIR . '/lib/applicationlist.php'; * @see SettingsAction */ -class ApplicationSettingsAction extends ConnectSettingsAction +class OauthconnectionssettingsAction extends ConnectSettingsAction { /** * Title of the page @@ -95,7 +95,7 @@ class ApplicationSettingsAction extends ConnectSettingsAction } $this->pagination($this->page > 1, $cnt > APPS_PER_PAGE, - $this->page, 'applicationsettings', + $this->page, 'connectionssettings', array('nickname' => $this->user->nickname)); } diff --git a/lib/applicationeditform.php b/lib/applicationeditform.php new file mode 100644 index 0000000000..3fd45876a7 --- /dev/null +++ b/lib/applicationeditform.php @@ -0,0 +1,215 @@ +. + * + * @category Form + * @package StatusNet + * @author Zach Copley + * @copyright 2009 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET') && !defined('LACONICA')) { + exit(1); +} + +require_once INSTALLDIR . '/lib/form.php'; + +/** + * Form for editing an application + * + * @category Form + * @package StatusNet + * @author Zach Copley + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + * + */ + +class ApplicationEditForm extends Form +{ + /** + * group for user to join + */ + + var $application = null; + + /** + * Constructor + * + * @param Action $out output channel + * @param User_group $group group to join + */ + + function __construct($out=null, $application=null) + { + parent::__construct($out); + + $this->application = $application; + } + + /** + * ID of the form + * + * @return string ID of the form + */ + + function id() + { + if ($this->application) { + return 'form_application_edit-' . $this->application->id; + } else { + return 'form_application_add'; + } + } + + /** + * class of the form + * + * @return string of the form class + */ + + function formClass() + { + return 'form_settings'; + } + + /** + * Action of the form + * + * @return string URL of the action + */ + + function action() + { + if ($this->application) { + return common_local_url('editapplication', + array('id' => $this->application->id)); + } else { + return common_local_url('newapplication'); + } + } + + /** + * Name of the form + * + * @return void + */ + + function formLegend() + { + $this->out->element('legend', null, _('Register a new application')); + } + + /** + * Data elements of the form + * + * @return void + */ + + function formData() + { + if ($this->application) { + $id = $this->application->id; + $name = $this->application->name; + $description = $this->application->description; + $source_url = $this->application->source_url; + $organization = $this->application->organization; + $homepage = $this->application->homepage; + $callback_url = $this->application->callback_url; + $this->type = $this->application->type; + $this->access_type = $this->application->access_type; + } else { + $id = ''; + $name = ''; + $description = ''; + $source_url = ''; + $organization = ''; + $homepage = ''; + $callback_url = ''; + $this->type = ''; + $this->access_type = ''; + } + + $this->out->elementStart('ul', 'form_data'); + $this->out->elementStart('li'); + + $this->out->hidden('application_id', $id); + $this->out->input('name', _('Name'), + ($this->out->arg('name')) ? $this->out->arg('name') : $name); + + $this->out->elementEnd('li'); + + $this->out->elementStart('li'); + $this->out->input('description', _('Description'), + ($this->out->arg('Description')) ? $this->out->arg('discription') : $description); + $this->out->elementEnd('li'); + + $this->out->elementStart('li'); + $this->out->input('source_url', _('Source URL'), + ($this->out->arg('source_url')) ? $this->out->arg('source_url') : $source_url, + _('URL of the homepage of this application')); + $this->out->elementEnd('li'); + + $this->out->elementStart('li'); + $this->out->input('Organization', _('Organization'), + ($this->out->arg('organization')) ? $this->out->arg('organization') : $orgranization, + _('Organization responsible for this application')); + $this->out->elementEnd('li'); + + $this->out->elementStart('li'); + $this->out->input('homepage', _('Homepage'), + ($this->out->arg('homepage')) ? $this->out->arg('homepage') : $homepage, + _('URL of the homepage of the organization')); + $this->out->elementEnd('li'); + + $this->out->elementStart('li'); + $this->out->input('callback_url', ('Callback URL'), + ($this->out->arg('callback_url')) ? $this->out->arg('callback_url') : $callback_url, + _('URL to redirect to after authentication')); + $this->out->elementEnd('li'); + + $this->out->elementStart('li'); + $this->out->input('type', _('Application type'), + ($this->out->arg('type')) ? $this->out->arg('type') : $type, + _('Type of application, browser or desktop')); + $this->out->elementEnd('li'); + + $this->out->elementStart('li'); + $this->out->input('access_type', _('Default access'), + ($this->out->arg('access_type')) ? $this->out->arg('access_type') : $access_type, + _('Default access for this application: read-write, or read-only')); + $this->out->elementEnd('li'); + + $this->out->elementEnd('ul'); + } + + /** + * Action elements + * + * @return void + */ + + function formActions() + { + $this->out->submit('submit', _('Save')); + } +} diff --git a/lib/connectsettingsaction.php b/lib/connectsettingsaction.php index 4b5059540d..b9c14799e0 100644 --- a/lib/connectsettingsaction.php +++ b/lib/connectsettingsaction.php @@ -115,9 +115,11 @@ class ConnectSettingsNav extends Widget array(_('SMS'), _('Updates by SMS')); } - - $menu['applicationsettings'] = array(_('Applications'), - _('OAuth connected applications')); + + $menu['oauthconnectionssettings'] = array( + _('Connections'), + _('Authorized connected applications') + ); foreach ($menu as $menuaction => $menudesc) { $this->action->menuItem(common_local_url($menuaction), diff --git a/lib/router.php b/lib/router.php index 9b2aa025ef..7b65ae215c 100644 --- a/lib/router.php +++ b/lib/router.php @@ -140,13 +140,11 @@ class Router // settings - foreach (array('profile', 'avatar', 'password', 'im', 'application', + foreach (array('profile', 'avatar', 'password', 'im', 'oauthconnections', 'email', 'sms', 'userdesign', 'other') as $s) { $m->connect('settings/'.$s, array('action' => $s.'settings')); } - - $m->connect('settings/oauthclients', array('action' => 'oauthclients')); - + // search foreach (array('group', 'people', 'notice') as $s) { @@ -636,12 +634,19 @@ class Router // user stuff foreach (array('subscriptions', 'subscribers', - 'nudge', 'all', 'foaf', 'xrds', + 'nudge', 'all', 'foaf', 'xrds', 'apps', 'replies', 'inbox', 'outbox', 'microsummary') as $a) { $m->connect(':nickname/'.$a, array('action' => $a), array('nickname' => '[a-zA-Z0-9]{1,64}')); } + + $m->connect('apps/new', array('action' => 'newapplication')); + + $m->connect(':nickname/apps/edit', + array('action' => 'editapplication'), + array('nickname' => '['.NICKNAME_FMT.']{1,64}') + ); foreach (array('subscriptions', 'subscribers') as $a) { $m->connect(':nickname/'.$a.'/:tag', From 035c475b45959057099c503d2cdcff8c8145e198 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Fri, 13 Nov 2009 19:10:38 -0800 Subject: [PATCH 031/134] It might help if I checkd in statusnet.ini. --- classes/statusnet.ini | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/classes/statusnet.ini b/classes/statusnet.ini index 6ce4495be0..0cbe60a5a5 100644 --- a/classes/statusnet.ini +++ b/classes/statusnet.ini @@ -39,6 +39,7 @@ code = K [consumer] consumer_key = 130 +consumer_secret = 130 seed = 130 created = 142 modified = 384 @@ -348,6 +349,35 @@ created = 142 tag = K notice_id = K +[oauth_application] +id = 129 +owner = 129 +consumer_key = 130 +name = 130 +description = 2 +icon = 130 +source_url = 2 +organization = 2 +homepage = 2 +callback_url = 130 +type = 17 +access_type = 17 +created = 142 +modified = 384 + +[oauth_application__keys] +id = N + +[oauth_application_user] +profile_id = 129 +application_id = 129 +access_type = 17 +created = 142 + +[oauth_application_user__keys] +profile_id = K +application_id = K + [profile] id = 129 nickname = 130 From 3c2b05d222a55cd1e148f3f887bf55e924898f1b Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Mon, 16 Nov 2009 16:58:49 -0800 Subject: [PATCH 032/134] Workflow for registering new OAuth apps pretty much done. --- actions/apps.php | 63 +++++- actions/editapplication.php | 246 +++++++++++++++++++++ actions/newapplication.php | 133 ++++++++---- actions/oauthconnectionssettings.php | 13 ++ actions/showapplication.php | 306 +++++++++++++++++++++++++++ classes/Consumer.php | 16 +- classes/Oauth_application.php | 44 ++++ db/statusnet.sql | 2 +- lib/applicationeditform.php | 135 +++++++++--- lib/applicationlist.php | 46 +++- lib/default.php | 2 + lib/router.php | 27 ++- 12 files changed, 950 insertions(+), 83 deletions(-) create mode 100644 actions/editapplication.php create mode 100644 actions/showapplication.php diff --git a/actions/apps.php b/actions/apps.php index d4cea1e3e9..e6500599f7 100644 --- a/actions/apps.php +++ b/actions/apps.php @@ -31,7 +31,8 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } -require_once INSTALLDIR . '/lib/connectsettingsaction.php'; +require_once INSTALLDIR . '/lib/settingsaction.php'; +require_once INSTALLDIR . '/lib/applicationlist.php'; /** * Show a user's registered OAuth applications @@ -45,8 +46,23 @@ require_once INSTALLDIR . '/lib/connectsettingsaction.php'; * @see SettingsAction */ -class AppsAction extends ConnectSettingsAction +class AppsAction extends SettingsAction { + var $page = 0; + + function prepare($args) + { + parent::prepare($args); + $this->page = ($this->arg('page')) ? ($this->arg('page') + 0) : 1; + + if (!common_logged_in()) { + $this->clientError(_('You must be logged in to list your applications.')); + return false; + } + + return true; + } + /** * Title of the page * @@ -79,6 +95,49 @@ class AppsAction extends ConnectSettingsAction { $user = common_current_user(); + $offset = ($this->page - 1) * APPS_PER_PAGE; + $limit = APPS_PER_PAGE + 1; + + $application = new Oauth_application(); + $application->owner = $user->id; + $application->limit($offset, $limit); + $application->orderBy('created DESC'); + $application->find(); + + $cnt = 0; + + if ($application) { + $al = new ApplicationList($application, $user, $this); + $cnt = $al->show(); + if (0 == $cnt) { + $this->showEmptyListMessage(); + } + } + + $this->element('a', + array('href' => common_local_url( + 'newapplication', + array('nickname' => $user->nickname) + ) + ), + 'Register a new application »'); + + $this->pagination( + $this->page > 1, + $cnt > APPS_PER_PAGE, + $this->page, + 'apps', + array('nickname' => $user->nickname) + ); + } + + function showEmptyListMessage() + { + $message = sprintf(_('You have not registered any applications yet.')); + + $this->elementStart('div', 'guide'); + $this->raw(common_markup_to_html($message)); + $this->elementEnd('div'); } /** diff --git a/actions/editapplication.php b/actions/editapplication.php new file mode 100644 index 0000000000..3af482844f --- /dev/null +++ b/actions/editapplication.php @@ -0,0 +1,246 @@ +. + * + * @category Applications + * @package StatusNet + * @author Zach Copley + * @copyright 2008-2009 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET') && !defined('LACONICA')) { + exit(1); +} + +/** + * Edit the details of an OAuth application + * + * This is the form for editing an application + * + * @category Application + * @package StatusNet + * @author Zach Copley + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +class EditApplicationAction extends OwnerDesignAction +{ + var $msg = null; + + var $app = null; + + function title() + { + return _('Edit Application'); + } + + /** + * Prepare to run + */ + + function prepare($args) + { + parent::prepare($args); + + if (!common_logged_in()) { + $this->clientError(_('You must be logged in to edit an application.')); + return false; + } + + $id = (int)$this->arg('id'); + $this->app = Oauth_application::staticGet($id); + + if (!$this->app) { + $this->clientError(_('No such application.')); + return false; + } + + return true; + } + + /** + * Handle the request + * + * On GET, show the form. On POST, try to save the group. + * + * @param array $args unused + * + * @return void + */ + + function handle($args) + { + parent::handle($args); + if ($_SERVER['REQUEST_METHOD'] == 'POST') { + + // CSRF protection + $token = $this->trimmed('token'); + if (!$token || $token != common_session_token()) { + $this->clientError(_('There was a problem with your session token.')); + return; + } + + $cur = common_current_user(); + + if ($this->arg('cancel')) { + common_redirect(common_local_url('showapplication', + array( + 'nickname' => $cur->nickname, + 'id' => $this->app->id) + ), 303); + } elseif ($this->arg('save')) { + $this->trySave(); + } else { + $this->clientError(_('Unexpected form submission.')); + } + } else { + $this->showForm(); + } + } + + function showForm($msg=null) + { + $this->msg = $msg; + $this->showPage(); + } + + function showContent() + { + $form = new ApplicationEditForm($this, $this->app); + $form->show(); + } + + function showPageNotice() + { + if (!empty($this->msg)) { + $this->element('p', 'error', $this->msg); + } else { + $this->element('p', 'instructions', + _('Use this form to edit your application.')); + } + } + + function trySave() + { + $name = $this->trimmed('name'); + $description = $this->trimmed('description'); + $source_url = $this->trimmed('source_url'); + $organization = $this->trimmed('organization'); + $homepage = $this->trimmed('homepage'); + $callback_url = $this->trimmed('callback_url'); + $type = $this->arg('app_type'); + $access_type = $this->arg('access_type'); + + if (empty($name)) { + $this->showForm(_('Name is required.')); + return; + } elseif (mb_strlen($name) > 255) { + $this->showForm(_('Name is too long (max 255 chars).')); + return; + } elseif (empty($description)) { + $this->showForm(_('Description is required.')); + return; + } elseif (Oauth_application::descriptionTooLong($description)) { + $this->showForm(sprintf( + _('Description is too long (max %d chars).'), + Oauth_application::maxDescription())); + return; + } elseif (empty($source_url)) { + $this->showForm(_('Source URL is required.')); + return; + } elseif ((strlen($source_url) > 0) + && !Validate::uri( + $source_url, + array('allowed_schemes' => array('http', 'https')) + ) + ) + { + $this->showForm(_('Source URL is not valid.')); + return; + } elseif (empty($organization)) { + $this->showForm(_('Organization is required.')); + return; + } elseif (mb_strlen($organization) > 255) { + $this->showForm(_('Organization is too long (max 255 chars).')); + return; + } elseif (empty($homepage)) { + $this->showForm(_('Organization homepage is required.')); + return; + } elseif ((strlen($homepage) > 0) + && !Validate::uri( + $homepage, + array('allowed_schemes' => array('http', 'https')) + ) + ) + { + $this->showForm(_('Homepage is not a valid URL.')); + return; + } elseif (empty($callback_url)) { + $this->showForm(_('Callback is required.')); + return; + } elseif (strlen($callback_url) > 0 + && !Validate::uri( + $source_url, + array('allowed_schemes' => array('http', 'https')) + ) + ) + { + $this->showForm(_('Callback URL is not valid.')); + return; + } + + $cur = common_current_user(); + + // Checked in prepare() above + + assert(!is_null($cur)); + + $orig = clone($this->app); + + $this->app->name = $name; + $this->app->description = $description; + $this->app->source_url = $source_url; + $this->app->organization = $organization; + $this->app->homepage = $homepage; + $this->app->callback_url = $callback_url; + $this->app->type = $type; + + if ($access_type == 'r') { + $this->app->setAccessFlags(true, false); + } else { + $this->app->setAccessFlags(true, true); + } + + $result = $this->app->update($orig); + + if (!$result) { + common_log_db_error($app, 'UPDATE', __FILE__); + $this->serverError(_('Could not update application.')); + } + + common_redirect(common_local_url('apps', + array('nickname' => $cur->nickname)), 303); + } + +} + diff --git a/actions/newapplication.php b/actions/newapplication.php index a78a856b18..9d8635270a 100644 --- a/actions/newapplication.php +++ b/actions/newapplication.php @@ -43,7 +43,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { * @link http://status.net/ */ -class NewApplicationAction extends Action +class NewApplicationAction extends OwnerDesignAction { var $msg; @@ -61,7 +61,7 @@ class NewApplicationAction extends Action parent::prepare($args); if (!common_logged_in()) { - $this->clientError(_('You must be logged in to create a group.')); + $this->clientError(_('You must be logged in to register an application.')); return false; } @@ -81,8 +81,19 @@ class NewApplicationAction extends Action function handle($args) { parent::handle($args); + if ($_SERVER['REQUEST_METHOD'] == 'POST') { - $this->trySave(); + + $cur = common_current_user(); + + if ($this->arg('cancel')) { + common_redirect(common_local_url('apps', + array('nickname' => $cur->nickname)), 303); + } elseif ($this->arg('save')) { + $this->trySave(); + } else { + $this->clientError(_('Unexpected form submission.')); + } } else { $this->showForm(); } @@ -112,55 +123,73 @@ class NewApplicationAction extends Action function trySave() { - $name = $this->trimmed('name'); - $description = $this->trimmed('description'); - $source_url = $this->trimmed('source_url'); - $organization = $this->trimmed('organization'); - $homepage = $this->trimmed('application'); - $callback_url = $this->trimmed('callback_url'); - $this->type = $this->trimmed('type'); - $this->access_type = $this->trimmed('access_type'); - - if (!is_null($name) && mb_strlen($name) > 255) { + $name = $this->trimmed('name'); + $description = $this->trimmed('description'); + $source_url = $this->trimmed('source_url'); + $organization = $this->trimmed('organization'); + $homepage = $this->trimmed('homepage'); + $callback_url = $this->trimmed('callback_url'); + $type = $this->arg('app_type'); + $access_type = $this->arg('access_type'); + + if (empty($name)) { + $this->showForm(_('Name is required.')); + return; + } elseif (mb_strlen($name) > 255) { $this->showForm(_('Name is too long (max 255 chars).')); return; - } else if (User_group::descriptionTooLong($description)) { + } elseif (empty($description)) { + $this->showForm(_('Description is required.')); + return; + } elseif (Oauth_application::descriptionTooLong($description)) { $this->showForm(sprintf( - _('description is too long (max %d chars).'), + _('Description is too long (max %d chars).'), Oauth_application::maxDescription())); return; - } elseif (!is_null($source_url) - && (strlen($source_url) > 0) + } elseif (empty($source_url)) { + $this->showForm(_('Source URL is required.')); + return; + } elseif ((strlen($source_url) > 0) && !Validate::uri( $source_url, array('allowed_schemes' => array('http', 'https')) ) - ) + ) { $this->showForm(_('Source URL is not valid.')); return; - } elseif (!is_null($homepage) - && (strlen($homepage) > 0) + } elseif (empty($organization)) { + $this->showForm(_('Organization is required.')); + return; + } elseif (mb_strlen($organization) > 255) { + $this->showForm(_('Organization is too long (max 255 chars).')); + return; + } elseif (empty($homepage)) { + $this->showForm(_('Organization homepage is required.')); + return; + } elseif ((strlen($homepage) > 0) && !Validate::uri( $homepage, array('allowed_schemes' => array('http', 'https')) ) - ) + ) { $this->showForm(_('Homepage is not a valid URL.')); - return; - } elseif (!is_null($callback_url) - && (strlen($callback_url) > 0) + return; + } elseif (empty($callback_url)) { + $this->showForm(_('Callback is required.')); + return; + } elseif (strlen($callback_url) > 0 && !Validate::uri( $source_url, array('allowed_schemes' => array('http', 'https')) ) - ) + ) { $this->showForm(_('Callback URL is not valid.')); return; } - + $cur = common_current_user(); // Checked in prepare() above @@ -171,31 +200,53 @@ class NewApplicationAction extends Action $app->query('BEGIN'); - $app->name = $name; - $app->owner = $cur->id; - $app->description = $description; - $app->source_url = $souce_url; + $app->name = $name; + $app->owner = $cur->id; + $app->description = $description; + $app->source_url = $source_url; $app->organization = $organization; - $app->homepage = $homepage; + $app->homepage = $homepage; $app->callback_url = $callback_url; - $app->type = $type; - $app->access_type = $access_type; - + $app->type = $type; + + // Yeah, I dunno why I chose bit flags. I guess so I could + // copy this value directly to Oauth_application_user + // access_type which I think does need bit flags -- Z + + if ($access_type == 'r') { + $app->setAccessFlags(true, false); + } else { + $app->setAccessFlags(true, true); + } + + $app->created = common_sql_now(); + // generate consumer key and secret - - $app->created = common_sql_now(); + + $consumer = Consumer::generateNew(); + + $result = $consumer->insert(); + + if (!$result) { + common_log_db_error($consumer, 'INSERT', __FILE__); + $this->serverError(_('Could not create application.')); + } + + $app->consumer_key = $consumer->consumer_key; $result = $app->insert(); if (!$result) { - common_log_db_error($group, 'INSERT', __FILE__); + common_log_db_error($app, 'INSERT', __FILE__); $this->serverError(_('Could not create application.')); + $app->query('ROLLBACK'); } - - $group->query('COMMIT'); - common_redirect($group->homeUrl(), 303); - + $app->query('COMMIT'); + + common_redirect(common_local_url('apps', + array('nickname' => $cur->nickname)), 303); + } } diff --git a/actions/oauthconnectionssettings.php b/actions/oauthconnectionssettings.php index 6ec9f70273..e4b5af1586 100644 --- a/actions/oauthconnectionssettings.php +++ b/actions/oauthconnectionssettings.php @@ -132,4 +132,17 @@ class OauthconnectionssettingsAction extends ConnectSettingsAction $this->elementEnd('div'); } + function showSections() + { + $cur = common_current_user(); + + $this->element('h2', null, 'Developers'); + $this->elementStart('p'); + $this->raw(_('Developers can edit the registration settings for their applications ')); + $this->element('a', + array('href' => common_local_url('apps', array('nickname' => $cur->nickname))), + 'here.'); + $this->elementEnd('p'); + } + } diff --git a/actions/showapplication.php b/actions/showapplication.php new file mode 100644 index 0000000000..6b8eff4a60 --- /dev/null +++ b/actions/showapplication.php @@ -0,0 +1,306 @@ +. + * + * @category Application + * @package StatusNet + * @author Zach Copley + * @copyright 2008-2009 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET') && !defined('LACONICA')) { + exit(1); +} + +/** + * Show an OAuth application + * + * @category Application + * @package StatusNet + * @author Zach Copley + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +class ShowApplicationAction extends OwnerDesignAction +{ + /** + * Application to show + */ + + var $application = null; + + /** + * User who owns the app + */ + + var $owner = null; + + + var $msg = null; + + var $success = null; + + /** + * Load attributes based on database arguments + * + * Loads all the DB stuff + * + * @param array $args $_REQUEST array + * + * @return success flag + */ + + function prepare($args) + { + parent::prepare($args); + + $id = (int)$this->arg('id'); + + $this->application = Oauth_application::staticGet($id); + $this->owner = User::staticGet($this->application->owner); + + if (!common_logged_in()) { + $this->clientError(_('You must be logged in to view an application.')); + return false; + } + + if (empty($this->application)) { + $this->clientError(_('No such application.'), 404); + return false; + } + + $cur = common_current_user(); + + if ($cur->id != $this->owner->id) { + $this->clientError(_('You are not the owner of this application.'), 401); + } + + return true; + } + + /** + * Handle the request + * + * Shows info about the app + * + * @return void + */ + + function handle($args) + { + parent::handle($args); + + if ($_SERVER['REQUEST_METHOD'] == 'POST') { + + // CSRF protection + $token = $this->trimmed('token'); + if (!$token || $token != common_session_token()) { + $this->clientError(_('There was a problem with your session token.')); + return; + } + + if ($this->arg('reset')) { + $this->resetKey(); + } + } else { + $this->showPage(); + } + } + + /** + * Title of the page + * + * @return string title of the page + */ + + function title() + { + if (!empty($this->application->name)) { + return 'Application: ' . $this->application->name; + } + } + + function showPageNotice() + { + if (!empty($this->msg)) { + $this->element('div', ($this->success) ? 'success' : 'error', $this->msg); + } + } + + function showContent() + { + + $cur = common_current_user(); + + $this->elementStart('div', 'entity_actions'); + + $this->element('a', + array('href' => + common_local_url( + 'editapplication', + array( + 'nickname' => $this->owner->nickname, + 'id' => $this->application->id + ) + ) + ), 'Edit application'); + + $this->elementStart('form', array( + 'id' => 'forma_reset_key', + 'class' => 'form_reset_key', + 'method' => 'POST', + 'action' => common_local_url('showapplication', + array('nickname' => $cur->nickname, + 'id' => $this->application->id)))); + + $this->elementStart('fieldset'); + $this->hidden('token', common_session_token()); + $this->submit('reset', _('Reset Consumer key/secret')); + $this->elementEnd('fieldset'); + $this->elementEnd('form'); + + $this->elementEnd('div'); + + $consumer = $this->application->getConsumer(); + + $this->elementStart('div', 'entity-application'); + + $this->elementStart('ul', 'entity_application_details'); + + $this->elementStart('li', 'entity_application_name'); + $this->element('span', array('class' => 'big'), $this->application->name); + $this->raw(sprintf(_(' by %1$s'), $this->application->organization)); + $this->elementEnd('li'); + + $this->element('li', 'entity_application_description', $this->application->description); + + $this->elementStart('li', 'entity_application_statistics'); + + $defaultAccess = ($this->application->access_type & Oauth_application::$writeAccess) + ? 'read-write' : 'read-only'; + $profile = Profile::staticGet($this->application->owner); + $userCnt = 0; // XXX: count how many users use the app + + $this->raw(sprintf( + _('Created by %1$s - %2$s access by default - %3$d users.'), + $profile->getBestName(), + $defaultAccess, + $userCnt + )); + + $this->elementEnd('li'); + + $this->elementEnd('ul'); + + $this->elementStart('dl', 'entity_consumer_key'); + $this->element('dt', null, _('Consumer key')); + $this->element('dd', 'label', $consumer->consumer_key); + $this->elementEnd('dl'); + + $this->elementStart('dl', 'entity_consumer_secret'); + $this->element('dt', null, _('Consumer secret')); + $this->element('dd', 'label', $consumer->consumer_secret); + $this->elementEnd('dl'); + + $this->elementStart('dl', 'entity_request_token_url'); + $this->element('dt', null, _('Request token URL')); + $this->element('dd', 'label', common_local_url('oauthrequesttoken')); + $this->elementEnd('dl'); + + $this->elementStart('dl', 'entity_access_token_url'); + $this->element('dt', null, _('Access token URL')); + $this->element('dd', 'label', common_local_url('oauthaccesstoken')); + $this->elementEnd('dl'); + + $this->elementStart('dl', 'entity_authorize_url'); + $this->element('dt', null, _('Authorize URL')); + $this->element('dd', 'label', common_local_url('oauthauthorize')); + $this->elementEnd('dl'); + + $this->element('p', 'oauth-signature-note', + '*We support hmac-sha1 signatures. We do not support the plaintext signature method.'); + + $this->elementEnd('div'); + + $this->elementStart('div', 'entity-list-apps'); + $this->element('a', + array( + 'href' => common_local_url( + 'apps', + array('nickname' => $this->owner->nickname) + ) + ), + 'View your applications'); + $this->elementEnd('div'); + } + + function resetKey() + { + $this->application->query('BEGIN'); + + $consumer = $this->application->getConsumer(); + $result = $consumer->delete(); + + if (!$result) { + common_log_db_error($consumer, 'DELETE', __FILE__); + $this->success = false; + $this->msg = ('Unable to reset consumer key and secret.'); + $this->showPage(); + return; + } + + $consumer = Consumer::generateNew(); + + $result = $consumer->insert(); + + if (!$result) { + common_log_db_error($consumer, 'INSERT', __FILE__); + $this->application->query('ROLLBACK'); + $this->success = false; + $this->msg = ('Unable to reset consumer key and secret.'); + $this->showPage(); + return; + } + + $orig = clone($this->application); + $this->application->consumer_key = $consumer->consumer_key; + $result = $this->application->update($orig); + + if (!$result) { + common_log_db_error($application, 'UPDATE', __FILE__); + $this->application->query('ROLLBACK'); + $this->success = false; + $this->msg = ('Unable to reset consumer key and secret.'); + $this->showPage(); + return; + } + + $this->application->query('COMMIT'); + + $this->success = true; + $this->msg = ('Consumer key and secret reset.'); + $this->showPage(); + } + +} + diff --git a/classes/Consumer.php b/classes/Consumer.php index d17f183a88..ad64a8491b 100644 --- a/classes/Consumer.php +++ b/classes/Consumer.php @@ -4,7 +4,7 @@ */ require_once INSTALLDIR.'/classes/Memcached_DataObject.php'; -class Consumer extends Memcached_DataObject +class Consumer extends Memcached_DataObject { ###START_AUTOCODE /* the code below is auto generated do not remove the above tag */ @@ -22,4 +22,18 @@ class Consumer extends Memcached_DataObject /* the code above is auto generated do not remove the tag below */ ###END_AUTOCODE + + static function generateNew() + { + $cons = new Consumer(); + $rand = common_good_rand(16); + + $cons->seed = $rand; + $cons->consumer_key = md5(time() + $rand); + $cons->consumer_secret = md5(md5(time() + time() + $rand)); + $cons->created = common_sql_now(); + + return $cons; + } + } diff --git a/classes/Oauth_application.php b/classes/Oauth_application.php index e2862bf97f..ef1bbf6d95 100644 --- a/classes/Oauth_application.php +++ b/classes/Oauth_application.php @@ -31,4 +31,48 @@ class Oauth_application extends Memcached_DataObject } /* the code above is auto generated do not remove the tag below */ ###END_AUTOCODE + + // Bit flags + public static $readAccess = 1; + public static $writeAccess = 2; + + public static $browser = 1; + public static $desktop = 2; + + function getConsumer() + { + return Consumer::staticGet('consumer_key', $this->consumer_key); + } + + static function maxDesc() + { + $desclimit = common_config('application', 'desclimit'); + // null => use global limit (distinct from 0!) + if (is_null($desclimit)) { + $desclimit = common_config('site', 'textlimit'); + } + return $desclimit; + } + + static function descriptionTooLong($desc) + { + $desclimit = self::maxDesc(); + return ($desclimit > 0 && !empty($desc) && (mb_strlen($desc) > $desclimit)); + } + + function setAccessFlags($read, $write) + { + if ($read) { + $this->access_type |= self::$readAccess; + } else { + $this->access_type &= ~self::$readAccess; + } + + if ($write) { + $this->access_type |= self::$writeAccess; + } else { + $this->access_type &= ~self::$writeAccess; + } + } + } diff --git a/db/statusnet.sql b/db/statusnet.sql index 03e6115e5f..a2740b60cc 100644 --- a/db/statusnet.sql +++ b/db/statusnet.sql @@ -219,7 +219,7 @@ create table oauth_application ( organization varchar(255) comment 'name of the organization running the application', homepage varchar(255) comment 'homepage for the organization', callback_url varchar(255) not null comment 'url to redirect to after authentication', - type tinyint default 0 comment 'type of app, 0 = browser, 1 = desktop', + type tinyint default 0 comment 'type of app, 1 = browser, 2 = desktop', access_type tinyint default 0 comment 'default access type, bit 1 = read, bit 2 = write', created datetime not null comment 'date this record was created', modified timestamp comment 'date this record was modified' diff --git a/lib/applicationeditform.php b/lib/applicationeditform.php index 3fd45876a7..ed187ba0b4 100644 --- a/lib/applicationeditform.php +++ b/lib/applicationeditform.php @@ -100,11 +100,16 @@ class ApplicationEditForm extends Form function action() { - if ($this->application) { + $cur = common_current_user(); + + if (!empty($this->application)) { return common_local_url('editapplication', - array('id' => $this->application->id)); + array('id' => $this->application->id, + 'nickname' => $cur->nickname) + ); } else { - return common_local_url('newapplication'); + return common_local_url('newapplication', + array('nickname' => $cur->nickname)); } } @@ -116,7 +121,7 @@ class ApplicationEditForm extends Form function formLegend() { - $this->out->element('legend', null, _('Register a new application')); + $this->out->element('legend', null, _('Edit application')); } /** @@ -130,7 +135,7 @@ class ApplicationEditForm extends Form if ($this->application) { $id = $this->application->id; $name = $this->application->name; - $description = $this->application->description; + $description = $this->application->description; $source_url = $this->application->source_url; $organization = $this->application->organization; $homepage = $this->application->homepage; @@ -151,34 +156,46 @@ class ApplicationEditForm extends Form $this->out->elementStart('ul', 'form_data'); $this->out->elementStart('li'); - + $this->out->hidden('application_id', $id); + $this->out->hidden('token', common_session_token()); + $this->out->input('name', _('Name'), ($this->out->arg('name')) ? $this->out->arg('name') : $name); - + $this->out->elementEnd('li'); - + $this->out->elementStart('li'); - $this->out->input('description', _('Description'), - ($this->out->arg('Description')) ? $this->out->arg('discription') : $description); + + $maxDesc = Oauth_application::maxDesc(); + if ($maxDesc > 0) { + $descInstr = sprintf(_('Describe your application in %d chars'), + $maxDesc); + } else { + $descInstr = _('Describe your application'); + } + $this->out->textarea('description', _('Description'), + ($this->out->arg('description')) ? $this->out->arg('description') : $description, + $descInstr); + $this->out->elementEnd('li'); - + $this->out->elementStart('li'); $this->out->input('source_url', _('Source URL'), ($this->out->arg('source_url')) ? $this->out->arg('source_url') : $source_url, _('URL of the homepage of this application')); - $this->out->elementEnd('li'); + $this->out->elementEnd('li'); $this->out->elementStart('li'); - $this->out->input('Organization', _('Organization'), - ($this->out->arg('organization')) ? $this->out->arg('organization') : $orgranization, + $this->out->input('organization', _('Organization'), + ($this->out->arg('organization')) ? $this->out->arg('organization') : $organization, _('Organization responsible for this application')); $this->out->elementEnd('li'); $this->out->elementStart('li'); $this->out->input('homepage', _('Homepage'), ($this->out->arg('homepage')) ? $this->out->arg('homepage') : $homepage, - _('URL of the homepage of the organization')); + _('URL for the homepage of the organization')); $this->out->elementEnd('li'); $this->out->elementStart('li'); @@ -188,17 +205,86 @@ class ApplicationEditForm extends Form $this->out->elementEnd('li'); $this->out->elementStart('li'); - $this->out->input('type', _('Application type'), - ($this->out->arg('type')) ? $this->out->arg('type') : $type, - _('Type of application, browser or desktop')); + + $attrs = array('name' => 'app_type', + 'type' => 'radio', + 'id' => 'app_type-browser', + 'class' => 'radio', + 'value' => Oauth_application::$browser); + + // Default to Browser + + if ($this->application->type == Oauth_application::$browser + || empty($this->applicaiton->type)) { + $attrs['checked'] = 'checked'; + } + + $this->out->element('input', $attrs); + + $this->out->element('label', array('for' => 'app_type-browser', + 'class' => 'radio'), + _('Browser')); + + $attrs = array('name' => 'app_type', + 'type' => 'radio', + 'id' => 'app_type-dekstop', + 'class' => 'radio', + 'value' => Oauth_application::$desktop); + + if ($this->application->type == Oauth_application::$desktop) { + $attrs['checked'] = 'checked'; + } + + $this->out->element('input', $attrs); + + $this->out->element('label', array('for' => 'app_type-desktop', + 'class' => 'radio'), + _('Desktop')); + $this->out->element('p', 'form_guide', _('Type of application, browser or desktop')); $this->out->elementEnd('li'); - + $this->out->elementStart('li'); - $this->out->input('access_type', _('Default access'), - ($this->out->arg('access_type')) ? $this->out->arg('access_type') : $access_type, - _('Default access for this application: read-write, or read-only')); + + $attrs = array('name' => 'default_access_type', + 'type' => 'radio', + 'id' => 'default_access_type-r', + 'class' => 'radio', + 'value' => 'r'); + + // default to read-only access + + if ($this->application->access_type & Oauth_application::$readAccess + || empty($this->application->access_type)) { + $attrs['checked'] = 'checked'; + } + + $this->out->element('input', $attrs); + + $this->out->element('label', array('for' => 'default_access_type-ro', + 'class' => 'radio'), + _('Read-only')); + + $attrs = array('name' => 'default_access_type', + 'type' => 'radio', + 'id' => 'default_access_type-rw', + 'class' => 'radio', + 'value' => 'rw'); + + if ($this->application->access_type & Oauth_application::$readAccess + && $this->application->access_type & Oauth_application::$writeAccess + ) { + $attrs['checked'] = 'checked'; + } + + $this->out->element('input', $attrs); + + $this->out->element('label', array('for' => 'default_access_type-rw', + 'class' => 'radio'), + _('Read-write')); + $this->out->element('p', 'form_guide', _('Default access for this application: read-only, or read-write')); + $this->out->elementEnd('li'); - + $this->out->elementEnd('ul'); } @@ -210,6 +296,7 @@ class ApplicationEditForm extends Form function formActions() { - $this->out->submit('submit', _('Save')); + $this->out->submit('save', _('Save')); + $this->out->submit('cancel', _('Cancel')); } } diff --git a/lib/applicationlist.php b/lib/applicationlist.php index fed784bb63..3141ea9741 100644 --- a/lib/applicationlist.php +++ b/lib/applicationlist.php @@ -20,7 +20,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . * - * @category Public + * @category Application * @package StatusNet * @author Zach Copley * @copyright 2008-2009 StatusNet, Inc. @@ -39,7 +39,7 @@ define('APPS_PER_PAGE', 20); /** * Widget to show a list of OAuth applications * - * @category Public + * @category Application * @package StatusNet * @author Zach Copley * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 @@ -50,10 +50,10 @@ class ApplicationList extends Widget { /** Current application, application query */ var $application = null; - + /** Owner of this list */ var $owner = null; - + /** Action object using us. */ var $action = null; @@ -87,14 +87,42 @@ class ApplicationList extends Widget function showApplication() { - $this->out->elementStart('li', array('class' => 'application', - 'id' => 'oauthclient-' . $this->application->id)); $user = common_current_user(); - $this->out->raw($this->application->name); - - $this->out->elementEnd('li'); + $this->out->elementStart('li', array('class' => 'application', + 'id' => 'oauthclient-' . $this->application->id)); + + $this->out->elementStart('a', + array('href' => common_local_url( + 'showapplication', + array( + 'nickname' => $user->nickname, + 'id' => $this->application->id + ) + ), + 'class' => 'url') + ); + + $this->out->raw($this->application->name); + $this->out->elementEnd('a'); + + $this->out->raw(' by '); + + $this->out->elementStart('a', + array( + 'href' => $this->application->homepage, + 'class' => 'url' + ) + ); + $this->out->raw($this->application->organization); + $this->out->elementEnd('a'); + + $this->out->elementStart('p', 'note'); + $this->out->raw($this->application->description); + $this->out->elementEnd('p'); + + $this->out->elementEnd('li'); } /* Override this in subclasses. */ diff --git a/lib/default.php b/lib/default.php index e3a043de12..b6ee72279d 100644 --- a/lib/default.php +++ b/lib/default.php @@ -211,6 +211,8 @@ $default = 'uploads' => true, 'filecommand' => '/usr/bin/file', ), + 'application' => + array('desclimit' => null), 'group' => array('maxaliases' => 3, 'desclimit' => null), diff --git a/lib/router.php b/lib/router.php index 7b65ae215c..a8dbbf6d0f 100644 --- a/lib/router.php +++ b/lib/router.php @@ -641,12 +641,29 @@ class Router array('nickname' => '[a-zA-Z0-9]{1,64}')); } - $m->connect('apps/new', array('action' => 'newapplication')); - - $m->connect(':nickname/apps/edit', - array('action' => 'editapplication'), - array('nickname' => '['.NICKNAME_FMT.']{1,64}') + $m->connect(':nickname/apps', + array('action' => 'apps'), + array('nickname' => '['.NICKNAME_FMT.']{1,64}')); + $m->connect(':nickname/apps/show/:id', + array('action' => 'showapplication'), + array('nickname' => '['.NICKNAME_FMT.']{1,64}', + 'id' => '[0-9]+') ); + $m->connect(':nickname/apps/new', + array('action' => 'newapplication'), + array('nickname' => '['.NICKNAME_FMT.']{1,64}')); + $m->connect(':nickname/apps/edit/:id', + array('action' => 'editapplication'), + array('nickname' => '['.NICKNAME_FMT.']{1,64}', + 'id' => '[0-9]+') + ); + + $m->connect('oauth/request_token', + array('action' => 'oauthrequesttoken')); + $m->connect('oauth/access_token', + array('action' => 'oauthaccesstoken')); + $m->connect('oauth/authorize', + array('action' => 'oauthauthorize')); foreach (array('subscriptions', 'subscribers') as $a) { $m->connect(':nickname/'.$a.'/:tag', From 1e5b2a497e3c70e4af5f93e2326c93beed15fed1 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Mon, 16 Nov 2009 18:12:39 -0800 Subject: [PATCH 033/134] Added session token checking. --- actions/newapplication.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/actions/newapplication.php b/actions/newapplication.php index 9d8635270a..ec0f2e7af2 100644 --- a/actions/newapplication.php +++ b/actions/newapplication.php @@ -84,6 +84,13 @@ class NewApplicationAction extends OwnerDesignAction if ($_SERVER['REQUEST_METHOD'] == 'POST') { + // CSRF protection + $token = $this->trimmed('token'); + if (!$token || $token != common_session_token()) { + $this->clientError(_('There was a problem with your session token.')); + return; + } + $cur = common_current_user(); if ($this->arg('cancel')) { From 48e5f2b3c5164aa9e47289e5b243e2e1189b71ef Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Thu, 7 Jan 2010 01:55:57 -0800 Subject: [PATCH 034/134] Add icons/icon upload to Oauth apps --- actions/editapplication.php | 81 +++++++++++++++++---------- actions/newapplication.php | 100 ++++++++++++++++++++++++++-------- actions/showapplication.php | 9 ++- classes/Oauth_application.php | 13 +++++ lib/applicationeditform.php | 43 ++++++++++++++- lib/applicationlist.php | 4 ++ 6 files changed, 193 insertions(+), 57 deletions(-) diff --git a/actions/editapplication.php b/actions/editapplication.php index 3af482844f..6b8dd501c9 100644 --- a/actions/editapplication.php +++ b/actions/editapplication.php @@ -81,7 +81,7 @@ class EditApplicationAction extends OwnerDesignAction /** * Handle the request * - * On GET, show the form. On POST, try to save the group. + * On GET, show the form. On POST, try to save the app. * * @param array $args unused * @@ -91,31 +91,49 @@ class EditApplicationAction extends OwnerDesignAction function handle($args) { parent::handle($args); + if ($_SERVER['REQUEST_METHOD'] == 'POST') { + $this->handlePost($args); + } else { + $this->showForm(); + } + } - // CSRF protection - $token = $this->trimmed('token'); - if (!$token || $token != common_session_token()) { - $this->clientError(_('There was a problem with your session token.')); - return; - } + function handlePost($args) + { + // Workaround for PHP returning empty $_POST and $_FILES when POST + // length > post_max_size in php.ini - $cur = common_current_user(); - - if ($this->arg('cancel')) { - common_redirect(common_local_url('showapplication', - array( - 'nickname' => $cur->nickname, - 'id' => $this->app->id) - ), 303); - } elseif ($this->arg('save')) { - $this->trySave(); - } else { - $this->clientError(_('Unexpected form submission.')); - } - } else { - $this->showForm(); + if (empty($_FILES) + && empty($_POST) + && ($_SERVER['CONTENT_LENGTH'] > 0) + ) { + $msg = _('The server was unable to handle that much POST ' . + 'data (%s bytes) due to its current configuration.'); + $this->clientException(sprintf($msg, $_SERVER['CONTENT_LENGTH'])); + return; } + + // CSRF protection + $token = $this->trimmed('token'); + if (!$token || $token != common_session_token()) { + $this->clientError(_('There was a problem with your session token.')); + return; + } + + $cur = common_current_user(); + + if ($this->arg('cancel')) { + common_redirect(common_local_url('showapplication', + array( + 'nickname' => $cur->nickname, + 'id' => $this->app->id) + ), 303); + } elseif ($this->arg('save')) { + $this->trySave(); + } else { + $this->clientError(_('Unexpected form submission.')); + } } function showForm($msg=null) @@ -149,7 +167,7 @@ class EditApplicationAction extends OwnerDesignAction $homepage = $this->trimmed('homepage'); $callback_url = $this->trimmed('callback_url'); $type = $this->arg('app_type'); - $access_type = $this->arg('access_type'); + $access_type = $this->arg('default_access_type'); if (empty($name)) { $this->showForm(_('Name is required.')); @@ -214,6 +232,7 @@ class EditApplicationAction extends OwnerDesignAction // Checked in prepare() above assert(!is_null($cur)); + assert(!is_null($this->app)); $orig = clone($this->app); @@ -225,16 +244,18 @@ class EditApplicationAction extends OwnerDesignAction $this->app->callback_url = $callback_url; $this->app->type = $type; - if ($access_type == 'r') { - $this->app->setAccessFlags(true, false); - } else { - $this->app->setAccessFlags(true, true); - } - $result = $this->app->update($orig); + common_debug("access_type = $access_type"); + + if ($access_type == 'r') { + $this->app->access_type = 1; + } else { + $this->app->access_type = 3; + } + if (!$result) { - common_log_db_error($app, 'UPDATE', __FILE__); + common_log_db_error($this->app, 'UPDATE', __FILE__); $this->serverError(_('Could not update application.')); } diff --git a/actions/newapplication.php b/actions/newapplication.php index ec0f2e7af2..a0e61d288c 100644 --- a/actions/newapplication.php +++ b/actions/newapplication.php @@ -71,7 +71,7 @@ class NewApplicationAction extends OwnerDesignAction /** * Handle the request * - * On GET, show the form. On POST, try to save the group. + * On GET, show the form. On POST, try to save the app. * * @param array $args unused * @@ -83,29 +83,46 @@ class NewApplicationAction extends OwnerDesignAction parent::handle($args); if ($_SERVER['REQUEST_METHOD'] == 'POST') { - - // CSRF protection - $token = $this->trimmed('token'); - if (!$token || $token != common_session_token()) { - $this->clientError(_('There was a problem with your session token.')); - return; - } - - $cur = common_current_user(); - - if ($this->arg('cancel')) { - common_redirect(common_local_url('apps', - array('nickname' => $cur->nickname)), 303); - } elseif ($this->arg('save')) { - $this->trySave(); - } else { - $this->clientError(_('Unexpected form submission.')); - } + $this->handlePost($args); } else { $this->showForm(); } } + function handlePost($args) + { + // Workaround for PHP returning empty $_POST and $_FILES when POST + // length > post_max_size in php.ini + + if (empty($_FILES) + && empty($_POST) + && ($_SERVER['CONTENT_LENGTH'] > 0) + ) { + $msg = _('The server was unable to handle that much POST ' . + 'data (%s bytes) due to its current configuration.'); + $this->clientException(sprintf($msg, $_SERVER['CONTENT_LENGTH'])); + return; + } + + // CSRF protection + $token = $this->trimmed('token'); + if (!$token || $token != common_session_token()) { + $this->clientError(_('There was a problem with your session token.')); + return; + } + + $cur = common_current_user(); + + if ($this->arg('cancel')) { + common_redirect(common_local_url('apps', + array('nickname' => $cur->nickname)), 303); + } elseif ($this->arg('save')) { + $this->trySave(); + } else { + $this->clientError(_('Unexpected form submission.')); + } + } + function showForm($msg=null) { $this->msg = $msg; @@ -130,14 +147,14 @@ class NewApplicationAction extends OwnerDesignAction function trySave() { - $name = $this->trimmed('name'); + $name = $this->trimmed('name'); $description = $this->trimmed('description'); $source_url = $this->trimmed('source_url'); $organization = $this->trimmed('organization'); $homepage = $this->trimmed('homepage'); $callback_url = $this->trimmed('callback_url'); $type = $this->arg('app_type'); - $access_type = $this->arg('access_type'); + $access_type = $this->arg('default_access_type'); if (empty($name)) { $this->showForm(_('Name is required.')); @@ -241,14 +258,16 @@ class NewApplicationAction extends OwnerDesignAction $app->consumer_key = $consumer->consumer_key; - $result = $app->insert(); + $this->app_id = $app->insert(); - if (!$result) { + if (!$this->app_id) { common_log_db_error($app, 'INSERT', __FILE__); $this->serverError(_('Could not create application.')); $app->query('ROLLBACK'); } + $this->uploadLogo($app); + $app->query('COMMIT'); common_redirect(common_local_url('apps', @@ -256,5 +275,40 @@ class NewApplicationAction extends OwnerDesignAction } + /** + * Handle an image upload + * + * Does all the magic for handling an image upload, and crops the + * image by default. + * + * @return void + */ + + function uploadLogo($app) + { + if ($_FILES['app_icon']['error'] == + UPLOAD_ERR_OK) { + + try { + $imagefile = ImageFile::fromUpload('app_icon'); + } catch (Exception $e) { + common_debug("damn that sucks"); + $this->showForm($e->getMessage()); + return; + } + + $filename = Avatar::filename($app->id, + image_type_to_extension($imagefile->type), + null, + 'oauth-app-icon-'.common_timestamp()); + + $filepath = Avatar::path($filename); + + move_uploaded_file($imagefile->filepath, $filepath); + + $app->setOriginal($filename); + } + } + } diff --git a/actions/showapplication.php b/actions/showapplication.php index 6b8eff4a60..6d19b9561c 100644 --- a/actions/showapplication.php +++ b/actions/showapplication.php @@ -55,7 +55,6 @@ class ShowApplicationAction extends OwnerDesignAction var $owner = null; - var $msg = null; var $success = null; @@ -187,6 +186,14 @@ class ShowApplicationAction extends OwnerDesignAction $this->elementStart('ul', 'entity_application_details'); + $this->elementStart('li', 'entity_application-icon'); + + if (!empty($this->application->icon)) { + $this->element('img', array('src' => $this->application->icon)); + } + + $this->elementEnd('li'); + $this->elementStart('li', 'entity_application_name'); $this->element('span', array('class' => 'big'), $this->application->name); $this->raw(sprintf(_(' by %1$s'), $this->application->organization)); diff --git a/classes/Oauth_application.php b/classes/Oauth_application.php index ef1bbf6d95..d4de6d82e1 100644 --- a/classes/Oauth_application.php +++ b/classes/Oauth_application.php @@ -75,4 +75,17 @@ class Oauth_application extends Memcached_DataObject } } + function setOriginal($filename) + { + $imagefile = new ImageFile($this->id, Avatar::path($filename)); + + // XXX: Do we want to have a bunch of different size icons? homepage, stream, mini? + // or just one and control size via CSS? --Zach + + $orig = clone($this); + $this->icon = Avatar::url($filename); + common_debug(common_log_objstring($this)); + return $this->update($orig); + } + } diff --git a/lib/applicationeditform.php b/lib/applicationeditform.php index ed187ba0b4..4d3bb06e75 100644 --- a/lib/applicationeditform.php +++ b/lib/applicationeditform.php @@ -81,6 +81,21 @@ class ApplicationEditForm extends Form } } + /** + * HTTP method used to submit the form + * + * For image data we need to send multipart/form-data + * so we set that here too + * + * @return string the method to use for submitting + */ + + function method() + { + $this->enctype = 'multipart/form-data'; + return 'post'; + } + /** * class of the form * @@ -134,6 +149,7 @@ class ApplicationEditForm extends Form { if ($this->application) { $id = $this->application->id; + $icon = $this->application->icon; $name = $this->application->name; $description = $this->application->description; $source_url = $this->application->source_url; @@ -144,6 +160,7 @@ class ApplicationEditForm extends Form $this->access_type = $this->application->access_type; } else { $id = ''; + $icon = ''; $name = ''; $description = ''; $source_url = ''; @@ -154,11 +171,31 @@ class ApplicationEditForm extends Form $this->access_type = ''; } + $this->out->hidden('token', common_session_token()); + $this->out->elementStart('ul', 'form_data'); - $this->out->elementStart('li'); + + $this->out->elementStart('li'); + + if (!empty($icon)) { + $this->out->element('img', array('src' => $icon)); + } + + $this->out->element('label', array('for' => 'app_icon'), + _('Icon')); + $this->out->element('input', array('name' => 'app_icon', + 'type' => 'file', + 'id' => 'app_icon')); + $this->out->element('p', 'form_guide', _('Icon for this application')); + $this->out->element('input', array('name' => 'MAX_FILE_SIZE', + 'type' => 'hidden', + 'id' => 'MAX_FILE_SIZE', + 'value' => ImageFile::maxFileSizeInt())); + $this->out->elementEnd('li'); + + $this->out->elementStart('li'); $this->out->hidden('application_id', $id); - $this->out->hidden('token', common_session_token()); $this->out->input('name', _('Name'), ($this->out->arg('name')) ? $this->out->arg('name') : $name); @@ -215,7 +252,7 @@ class ApplicationEditForm extends Form // Default to Browser if ($this->application->type == Oauth_application::$browser - || empty($this->applicaiton->type)) { + || empty($this->application->type)) { $attrs['checked'] = 'checked'; } diff --git a/lib/applicationlist.php b/lib/applicationlist.php index 3141ea9741..5392ddab8c 100644 --- a/lib/applicationlist.php +++ b/lib/applicationlist.php @@ -93,6 +93,10 @@ class ApplicationList extends Widget $this->out->elementStart('li', array('class' => 'application', 'id' => 'oauthclient-' . $this->application->id)); + if (!empty($this->application->icon)) { + $this->out->element('img', array('src' => $this->application->icon)); + } + $this->out->elementStart('a', array('href' => common_local_url( 'showapplication', From 6472331be51bc6d0e670603b2a89fb66022f6b51 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Thu, 7 Jan 2010 13:19:21 -0800 Subject: [PATCH 035/134] Stubs for API OAuth token exchange stuff --- actions/apioauthaccesstoken.php | 49 ++++++++++++++++++++++++++++++++ actions/apioauthauthorize.php | 49 ++++++++++++++++++++++++++++++++ actions/apioauthrequesttoken.php | 49 ++++++++++++++++++++++++++++++++ lib/router.php | 6 ++-- 4 files changed, 150 insertions(+), 3 deletions(-) create mode 100644 actions/apioauthaccesstoken.php create mode 100644 actions/apioauthauthorize.php create mode 100644 actions/apioauthrequesttoken.php diff --git a/actions/apioauthaccesstoken.php b/actions/apioauthaccesstoken.php new file mode 100644 index 0000000000..db82f656ad --- /dev/null +++ b/actions/apioauthaccesstoken.php @@ -0,0 +1,49 @@ +. + * + * @category API + * @package StatusNet + * @author Zach Copley + * @copyright 2010 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET')) { + exit(1); +} + +require_once INSTALLDIR . '/lib/api.php'; + +/** + * Exchange an authorized OAuth request token for an access token + * + * @category API + * @package StatusNet + * @author Zach Copley + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +class ApiOauthAccessTokenAction extends ApiAction +{ + +} diff --git a/actions/apioauthauthorize.php b/actions/apioauthauthorize.php new file mode 100644 index 0000000000..8839d9571c --- /dev/null +++ b/actions/apioauthauthorize.php @@ -0,0 +1,49 @@ +. + * + * @category API + * @package StatusNet + * @author Zach Copley + * @copyright 2010 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET')) { + exit(1); +} + +require_once INSTALLDIR . '/lib/api.php'; + +/** + * Authorize an OAuth request token + * + * @category API + * @package StatusNet + * @author Zach Copley + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +class ApiOauthAuthorizeAction extends Action +{ + +} diff --git a/actions/apioauthrequesttoken.php b/actions/apioauthrequesttoken.php new file mode 100644 index 0000000000..c1ccd4b7d7 --- /dev/null +++ b/actions/apioauthrequesttoken.php @@ -0,0 +1,49 @@ +. + * + * @category API + * @package StatusNet + * @author Zach Copley + * @copyright 2010 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET')) { + exit(1); +} + +require_once INSTALLDIR . '/lib/api.php'; + +/** + * Get an OAuth request token + * + * @category API + * @package StatusNet + * @author Zach Copley + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +class ApiOauthRequestTokenAction extends ApiAction +{ + +} diff --git a/lib/router.php b/lib/router.php index a8dbbf6d0f..0703d75970 100644 --- a/lib/router.php +++ b/lib/router.php @@ -659,11 +659,11 @@ class Router ); $m->connect('oauth/request_token', - array('action' => 'oauthrequesttoken')); + array('action' => 'apioauthrequesttoken')); $m->connect('oauth/access_token', - array('action' => 'oauthaccesstoken')); + array('action' => 'apioauthaccesstoken')); $m->connect('oauth/authorize', - array('action' => 'oauthauthorize')); + array('action' => 'apioauthauthorize')); foreach (array('subscriptions', 'subscribers') as $a) { $m->connect(':nickname/'.$a.'/:tag', From fa81a580bb9eea76e7739f37010b35e4b919f410 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Thu, 7 Jan 2010 18:33:17 -0800 Subject: [PATCH 036/134] Action for issuing a request token --- actions/apioauthrequesttoken.php | 41 ++++++++++++++- lib/apioauthstore.php | 90 ++++++++++++++++++++++++++++++++ 2 files changed, 130 insertions(+), 1 deletion(-) create mode 100644 lib/apioauthstore.php diff --git a/actions/apioauthrequesttoken.php b/actions/apioauthrequesttoken.php index c1ccd4b7d7..1bbd7d295b 100644 --- a/actions/apioauthrequesttoken.php +++ b/actions/apioauthrequesttoken.php @@ -32,6 +32,7 @@ if (!defined('STATUSNET')) { } require_once INSTALLDIR . '/lib/api.php'; +require_once INSTALLDIR . '/lib/apioauthstore.php'; /** * Get an OAuth request token @@ -43,7 +44,45 @@ require_once INSTALLDIR . '/lib/api.php'; * @link http://status.net/ */ -class ApiOauthRequestTokenAction extends ApiAction +class ApiOauthRequestTokenAction extends Action { + /** + * Is read only? + * + * @return boolean false + */ + function isReadOnly() + { + return false; + } + + /** + * Class handler. + * + * @param array $args array of arguments + * + * @return void + */ + function handle($args) + { + parent::handle($args); + + $datastore = new ApiStatusNetOAuthDataStore(); + $server = new OAuthServer($datastore); + $hmac_method = new OAuthSignatureMethod_HMAC_SHA1(); + $server->add_signature_method($hmac_method); + + try { + $req = OAuthRequest::from_request(); + $token = $server->fetch_request_token($req); + print $token; + } catch (OAuthException $e) { + common_log(LOG_WARN, $e->getMessage()); + common_debug(var_export($req, true)); + header('HTTP/1.1 401 Unauthorized'); + header('Content-Type: text/html; charset=utf-8'); + print $e->getMessage() . "\n"; + } + } } diff --git a/lib/apioauthstore.php b/lib/apioauthstore.php new file mode 100644 index 0000000000..a92a4d6e49 --- /dev/null +++ b/lib/apioauthstore.php @@ -0,0 +1,90 @@ +. + */ + +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } + +require_once INSTALLDIR . '/lib/oauthstore.php'; + +class ApiStatusNetOAuthDataStore extends StatusNetOAuthDataStore +{ + + function lookup_consumer($consumer_key) + { + $con = Consumer::staticGet('consumer_key', $consumer_key); + + if (!$con) { + return null; + } + + return new OAuthConsumer($con->consumer_key, + $con->consumer_secret); + } + + function new_access_token($token, $consumer) + { + common_debug('new_access_token("'.$token->key.'","'.$consumer->key.'")', __FILE__); + $rt = new Token(); + $rt->consumer_key = $consumer->key; + $rt->tok = $token->key; + $rt->type = 0; // request + if ($rt->find(true) && $rt->state == 1) { // authorized + common_debug('request token found.', __FILE__); + $at = new Token(); + $at->consumer_key = $consumer->key; + $at->tok = common_good_rand(16); + $at->secret = common_good_rand(16); + $at->type = 1; // access + $at->created = DB_DataObject_Cast::dateTime(); + if (!$at->insert()) { + $e = $at->_lastError; + common_debug('access token "'.$at->tok.'" not inserted: "'.$e->message.'"', __FILE__); + return null; + } else { + common_debug('access token "'.$at->tok.'" inserted', __FILE__); + // burn the old one + $orig_rt = clone($rt); + $rt->state = 2; // used + if (!$rt->update($orig_rt)) { + return null; + } + common_debug('request token "'.$rt->tok.'" updated', __FILE__); + // Update subscription + // XXX: mixing levels here + $sub = Subscription::staticGet('token', $rt->tok); + if (!$sub) { + return null; + } + common_debug('subscription for request token found', __FILE__); + $orig_sub = clone($sub); + $sub->token = $at->tok; + $sub->secret = $at->secret; + if (!$sub->update($orig_sub)) { + return null; + } else { + common_debug('subscription updated to use access token', __FILE__); + return new OAuthToken($at->tok, $at->secret); + } + } + } else { + return null; + } + } + +} + From e9e448bcee69b0c39badf353faedb4c29af3f502 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Sun, 10 Jan 2010 21:35:46 -0800 Subject: [PATCH 037/134] Workflow for request tokens and authorizing request tokens --- actions/apioauthauthorize.php | 326 ++++++++++++++++++++++++++++++- actions/apioauthrequesttoken.php | 5 +- actions/showapplication.php | 6 +- lib/router.php | 19 +- 4 files changed, 338 insertions(+), 18 deletions(-) diff --git a/actions/apioauthauthorize.php b/actions/apioauthauthorize.php index 8839d9571c..895a0c6e53 100644 --- a/actions/apioauthauthorize.php +++ b/actions/apioauthauthorize.php @@ -31,7 +31,7 @@ if (!defined('STATUSNET')) { exit(1); } -require_once INSTALLDIR . '/lib/api.php'; +require_once INSTALLDIR . '/lib/apioauthstore.php'; /** * Authorize an OAuth request token @@ -45,5 +45,329 @@ require_once INSTALLDIR . '/lib/api.php'; class ApiOauthAuthorizeAction extends Action { + var $oauth_token; + var $callback; + var $app; + var $nickname; + var $password; + var $store; + + /** + * Is this a read-only action? + * + * @return boolean false + */ + + function isReadOnly($args) + { + return false; + } + + function prepare($args) + { + parent::prepare($args); + + common_debug(var_export($_REQUEST, true)); + + $this->nickname = $this->trimmed('nickname'); + $this->password = $this->arg('password'); + $this->oauth_token = $this->arg('oauth_token'); + $this->callback = $this->arg('oauth_callback'); + $this->store = new ApiStatusNetOAuthDataStore(); + + return true; + } + + function getApp() + { + // Look up the full req token + + $req_token = $this->store->lookup_token(null, + 'request', + $this->oauth_token); + + if (empty($req_token)) { + + common_debug("Couldn't find request token!"); + + $this->clientError(_('Bad request.')); + return; + } + + // Look up the app + + $app = new Oauth_application(); + $app->consumer_key = $req_token->consumer_key; + $result = $app->find(true); + + if (!empty($result)) { + $this->app = $app; + return true; + + } else { + common_debug("couldn't find the app!"); + return false; + } + } + + /** + * Handle input, produce output + * + * Switches on request method; either shows the form or handles its input. + * + * @param array $args $_REQUEST data + * + * @return void + */ + + function handle($args) + { + parent::handle($args); + + if ($_SERVER['REQUEST_METHOD'] == 'POST') { + /* Use a session token for CSRF protection. */ + $token = $this->trimmed('token'); + if (!$token || $token != common_session_token()) { + $this->showForm(_('There was a problem with your session token. '. + 'Try again, please.')); + return; + } + + $this->handlePost(); + + } else { + + common_debug('ApiOauthAuthorize::handle()'); + + if (empty($this->oauth_token)) { + + common_debug("No request token found."); + + $this->clientError(_('Bad request.')); + return; + } + + if (!$this->getApp()) { + $this->clientError(_('Bad request.')); + return; + } + + common_debug("Requesting auth for app: $app->name."); + + $this->showForm(); + } + } + + function handlePost() + { + /* Use a session token for CSRF protection. */ + + $token = $this->trimmed('token'); + + if (!$token || $token != common_session_token()) { + $this->showForm(_('There was a problem with your session token. '. + 'Try again, please.')); + return; + } + + if (!$this->getApp()) { + $this->clientError(_('Bad request.')); + return; + } + + // is the user already logged in? + + // check creds + + if (!common_logged_in()) { + $user = common_check_user($this->nickname, $this->password); + if (empty($user)) { + $this->showForm(_("Invalid nickname / password!")); + return; + } + } + + if ($this->arg('allow')) { + + $this->store->authorize_token($this->oauth_token); + + // if we have a callback redirect and provide the token + + if (!empty($this->callback)) { + $target_url = $this->callback . '?oauth_token=' . $this->oauth_token; + common_redirect($target_url, 303); + } + + // otherwise inform the user that the rt was authorized + + $this->elementStart('p'); + + // XXX: Do verifier code? + + $this->raw(sprintf(_("The request token %s has been authorized. " . + 'Please exchange it for an access token.'), + $this->oauth_token)); + + $this->elementEnd('p'); + + } else if ($this->arg('deny')) { + + $this->elementStart('p'); + + $this->raw(sprintf(_("The request token %s has been denied."), + $this->oauth_token)); + + $this->elementEnd('p'); + } else { + $this->clientError(_('Unexpected form submission.')); + return; + } + } + + function showForm($error=null) + { + $this->error = $error; + $this->showPage(); + } + + function showScripts() + { + parent::showScripts(); + // $this->autofocus('nickname'); + } + + /** + * Title of the page + * + * @return string title of the page + */ + + function title() + { + return _('An application would like to connect to your account'); + } + + /** + * Show page notice + * + * Display a notice for how to use the page, or the + * error if it exists. + * + * @return void + */ + + function showPageNotice() + { + if ($this->error) { + $this->element('p', 'error', $this->error); + } else { + $instr = $this->getInstructions(); + $output = common_markup_to_html($instr); + + $this->raw($output); + } + } + + /** + * Shows the authorization form. + * + * @return void + */ + + function showContent() + { + $this->elementStart('form', array('method' => 'post', + 'id' => 'form_login', + 'class' => 'form_settings', + 'action' => common_local_url('apioauthauthorize'))); + + $this->hidden('token', common_session_token()); + $this->hidden('oauth_token', $this->oauth_token); + $this->hidden('oauth_callback', $this->callback); + + $this->elementStart('fieldset'); + + $this->elementStart('ul'); + $this->elementStart('li'); + if (!empty($this->app->icon)) { + $this->element('img', array('src' => $this->app->icon)); + } + $this->elementEnd('li'); + $this->elementStart('li'); + + $access = ($this->app->access_type & Oauth_application::$writeAccess) ? + 'access and update' : 'access'; + + $msg = _("The application %s by %s would like " . + "the ability to %s your account data."); + + $this->raw(sprintf($msg, + $this->app->name, + $this->app->organization, + $access)); + + $this->elementEnd('li'); + $this->elementEnd('ul'); + + $this->elementEnd('fieldset'); + + if (!common_logged_in()) { + + $this->elementStart('fieldset'); + $this->element('legend', null, _('Login')); + $this->elementStart('ul', 'form_data'); + $this->elementStart('li'); + $this->input('nickname', _('Nickname')); + $this->elementEnd('li'); + $this->elementStart('li'); + $this->password('password', _('Password')); + $this->elementEnd('li'); + $this->elementEnd('ul'); + + $this->elementEnd('fieldset'); + + } + + $this->element('input', array('id' => 'deny_submit', + 'class' => 'submit', + 'name' => 'deny', + 'type' => 'submit', + 'value' => _('Deny'))); + + $this->element('input', array('id' => 'allow_submit', + 'class' => 'submit', + 'name' => 'allow', + 'type' => 'submit', + 'value' => _('Allow'))); + + $this->elementEnd('form'); + } + + /** + * Instructions for using the form + * + * For "remembered" logins, we make the user re-login when they + * try to change settings. Different instructions for this case. + * + * @return void + */ + + function getInstructions() + { + return _('Allow or deny access to your account information.'); + + } + + /** + * A local menu + * + * Shows different login/register actions. + * + * @return void + */ + + function showLocalNav() + { + } } diff --git a/actions/apioauthrequesttoken.php b/actions/apioauthrequesttoken.php index 1bbd7d295b..53aca6b96b 100644 --- a/actions/apioauthrequesttoken.php +++ b/actions/apioauthrequesttoken.php @@ -31,7 +31,6 @@ if (!defined('STATUSNET')) { exit(1); } -require_once INSTALLDIR . '/lib/api.php'; require_once INSTALLDIR . '/lib/apioauthstore.php'; /** @@ -70,6 +69,7 @@ class ApiOauthRequestTokenAction extends Action $datastore = new ApiStatusNetOAuthDataStore(); $server = new OAuthServer($datastore); $hmac_method = new OAuthSignatureMethod_HMAC_SHA1(); + $server->add_signature_method($hmac_method); try { @@ -77,8 +77,7 @@ class ApiOauthRequestTokenAction extends Action $token = $server->fetch_request_token($req); print $token; } catch (OAuthException $e) { - common_log(LOG_WARN, $e->getMessage()); - common_debug(var_export($req, true)); + common_log(LOG_WARN, 'API OAuthException - ' . $e->getMessage()); header('HTTP/1.1 401 Unauthorized'); header('Content-Type: text/html; charset=utf-8'); print $e->getMessage() . "\n"; diff --git a/actions/showapplication.php b/actions/showapplication.php index 6d19b9561c..5156fa6f0c 100644 --- a/actions/showapplication.php +++ b/actions/showapplication.php @@ -231,17 +231,17 @@ class ShowApplicationAction extends OwnerDesignAction $this->elementStart('dl', 'entity_request_token_url'); $this->element('dt', null, _('Request token URL')); - $this->element('dd', 'label', common_local_url('oauthrequesttoken')); + $this->element('dd', 'label', common_local_url('apioauthrequesttoken')); $this->elementEnd('dl'); $this->elementStart('dl', 'entity_access_token_url'); $this->element('dt', null, _('Access token URL')); - $this->element('dd', 'label', common_local_url('oauthaccesstoken')); + $this->element('dd', 'label', common_local_url('apioauthaccesstoken')); $this->elementEnd('dl'); $this->elementStart('dl', 'entity_authorize_url'); $this->element('dt', null, _('Authorize URL')); - $this->element('dd', 'label', common_local_url('oauthauthorize')); + $this->element('dd', 'label', common_local_url('apioauthauthorize')); $this->elementEnd('dl'); $this->element('p', 'oauth-signature-note', diff --git a/lib/router.php b/lib/router.php index 0703d75970..420f5a0a10 100644 --- a/lib/router.php +++ b/lib/router.php @@ -50,7 +50,8 @@ class Router var $m = null; static $inst = null; static $bare = array('requesttoken', 'accesstoken', 'userauthorization', - 'postnotice', 'updateprofile', 'finishremotesubscribe'); + 'postnotice', 'updateprofile', 'finishremotesubscribe', + 'apioauthrequesttoken', 'apioauthaccesstoken'); static function get() { @@ -144,7 +145,7 @@ class Router 'email', 'sms', 'userdesign', 'other') as $s) { $m->connect('settings/'.$s, array('action' => $s.'settings')); } - + // search foreach (array('group', 'people', 'notice') as $s) { @@ -640,11 +641,11 @@ class Router array('action' => $a), array('nickname' => '[a-zA-Z0-9]{1,64}')); } - - $m->connect(':nickname/apps', + + $m->connect(':nickname/apps', array('action' => 'apps'), array('nickname' => '['.NICKNAME_FMT.']{1,64}')); - $m->connect(':nickname/apps/show/:id', + $m->connect(':nickname/apps/show/:id', array('action' => 'showapplication'), array('nickname' => '['.NICKNAME_FMT.']{1,64}', 'id' => '[0-9]+') @@ -652,18 +653,14 @@ class Router $m->connect(':nickname/apps/new', array('action' => 'newapplication'), array('nickname' => '['.NICKNAME_FMT.']{1,64}')); - $m->connect(':nickname/apps/edit/:id', + $m->connect(':nickname/apps/edit/:id', array('action' => 'editapplication'), array('nickname' => '['.NICKNAME_FMT.']{1,64}', 'id' => '[0-9]+') ); - $m->connect('oauth/request_token', - array('action' => 'apioauthrequesttoken')); - $m->connect('oauth/access_token', - array('action' => 'apioauthaccesstoken')); $m->connect('oauth/authorize', - array('action' => 'apioauthauthorize')); + array('action' => 'apioauthauthorize')); foreach (array('subscriptions', 'subscribers') as $a) { $m->connect(':nickname/'.$a.'/:tag', From c473a39a7da07fbe5b80fec4c08111a554691c3a Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Sun, 10 Jan 2010 23:03:30 -0800 Subject: [PATCH 038/134] Associate request tokens with OAuth apps and app users --- actions/apioauthauthorize.php | 64 +++++++++++++++++++++++------- classes/Oauth_application_user.php | 24 ++++++++++- classes/statusnet.ini | 4 ++ db/statusnet.sql | 5 ++- 4 files changed, 81 insertions(+), 16 deletions(-) diff --git a/actions/apioauthauthorize.php b/actions/apioauthauthorize.php index 895a0c6e53..48d5087efc 100644 --- a/actions/apioauthauthorize.php +++ b/actions/apioauthauthorize.php @@ -125,19 +125,12 @@ class ApiOauthAuthorizeAction extends Action parent::handle($args); if ($_SERVER['REQUEST_METHOD'] == 'POST') { - /* Use a session token for CSRF protection. */ - $token = $this->trimmed('token'); - if (!$token || $token != common_session_token()) { - $this->showForm(_('There was a problem with your session token. '. - 'Try again, please.')); - return; - } $this->handlePost(); } else { - common_debug('ApiOauthAuthorize::handle()'); + // XXX: make better error messages if (empty($this->oauth_token)) { @@ -160,7 +153,7 @@ class ApiOauthAuthorizeAction extends Action function handlePost() { - /* Use a session token for CSRF protection. */ + // check session token for CSRF protection. $token = $this->trimmed('token'); @@ -175,25 +168,66 @@ class ApiOauthAuthorizeAction extends Action return; } - // is the user already logged in? - // check creds + $user = null; + if (!common_logged_in()) { $user = common_check_user($this->nickname, $this->password); if (empty($user)) { $this->showForm(_("Invalid nickname / password!")); return; } - } + } else { + $user = common_current_user(); + } if ($this->arg('allow')) { + // mark the req token as authorized + $this->store->authorize_token($this->oauth_token); + // Check to see if there was a previous token associated + // with this user/app and kill it. If you're doing this you + // probably don't want any old tokens anyway. + + $appUser = Oauth_application_user::getByKeys($user, $this->app); + + if (!empty($appUser)) { + $result = $appUser->delete(); + + if (!$result) { + common_log_db_error($appUser, 'DELETE', __FILE__); + throw new ServerException(_('DB error deleting OAuth app user.')); + return; + } + } + + // associated the new req token with the user and the app + + $appUser = new Oauth_application_user(); + + $appUser->profile_id = $user->id; + $appUser->application_id = $this->app->id; + $appUser->access_type = $this->app->access_type; + $appUser->token = $this->oauth_token; + $appUser->created = common_sql_now(); + + $result = $appUser->insert(); + + if (!$result) { + common_log_db_error($appUser, 'INSERT', __FILE__); + throw new ServerException(_('DB error inserting OAuth app user.')); + return; + } + // if we have a callback redirect and provide the token if (!empty($this->callback)) { + + // XXX: Need better way to build this redirect url. + $target_url = $this->callback . '?oauth_token=' . $this->oauth_token; common_redirect($target_url, 303); } @@ -202,7 +236,7 @@ class ApiOauthAuthorizeAction extends Action $this->elementStart('p'); - // XXX: Do verifier code? + // XXX: Do OAuth 1.0a verifier code? $this->raw(sprintf(_("The request token %s has been authorized. " . 'Please exchange it for an access token.'), @@ -233,7 +267,9 @@ class ApiOauthAuthorizeAction extends Action function showScripts() { parent::showScripts(); - // $this->autofocus('nickname'); + if (!common_logged_in()) { + $this->autofocus('nickname'); + } } /** diff --git a/classes/Oauth_application_user.php b/classes/Oauth_application_user.php index 9e45ece25f..e4c018f219 100644 --- a/classes/Oauth_application_user.php +++ b/classes/Oauth_application_user.php @@ -13,12 +13,34 @@ class Oauth_application_user extends Memcached_DataObject public $profile_id; // int(4) primary_key not_null public $application_id; // int(4) primary_key not_null public $access_type; // tinyint(1) + public $token; // varchar(255) + public $secret; // varchar(255) + public $verifier; // varchar(255) public $created; // datetime not_null + public $modified; // timestamp not_null default_CURRENT_TIMESTAMP /* Static get */ function staticGet($k,$v=NULL) { - return Memcached_DataObject::staticGet('Oauth_application_user',$k,$v); + return Memcached_DataObject::staticGet('Oauth_application_user',$k,$v); } /* the code above is auto generated do not remove the tag below */ ###END_AUTOCODE + + static function getByKeys($user, $app) + { + if (empty($user) || empty($app)) { + return null; + } + + $oau = new Oauth_application_user(); + + $oau->profile_id = $user->id; + $oau->application_id = $app->id; + $oau->limit(1); + + $result = $oau->find(true); + + return empty($result) ? null : $oau; + } + } diff --git a/classes/statusnet.ini b/classes/statusnet.ini index 0cbe60a5a5..43f6c4466d 100644 --- a/classes/statusnet.ini +++ b/classes/statusnet.ini @@ -372,7 +372,11 @@ id = N profile_id = 129 application_id = 129 access_type = 17 +token = 2 +secret = 2 +verifier = 2 created = 142 +modified = 384 [oauth_application_user__keys] profile_id = K diff --git a/db/statusnet.sql b/db/statusnet.sql index a2740b60cc..eb47060674 100644 --- a/db/statusnet.sql +++ b/db/statusnet.sql @@ -229,8 +229,11 @@ create table oauth_application_user ( profile_id integer not null comment 'user of the application' references profile (id), application_id integer not null comment 'id of the application' references oauth_application (id), access_type tinyint default 0 comment 'access type, bit 1 = read, bit 2 = write, bit 3 = revoked', + token varchar(255) comment 'authorization token', + secret varchar(255) comment 'token secret', + verifier varchar(255) not null comment 'verification code', created datetime not null comment 'date this record was created', - + modified timestamp comment 'date this record was modified', constraint primary key (profile_id, application_id) ) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin; From a0b84387737b016168eb3b9a1c6dee1980724f66 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Mon, 11 Jan 2010 01:11:50 -0800 Subject: [PATCH 039/134] Exchanging authorized request tokens for access tokens working --- actions/apioauthaccesstoken.php | 60 ++++++++++++++++++++++++++++- classes/Oauth_application.php | 14 +++++++ lib/apioauthstore.php | 68 +++++++++++++++++++++++---------- 3 files changed, 119 insertions(+), 23 deletions(-) diff --git a/actions/apioauthaccesstoken.php b/actions/apioauthaccesstoken.php index db82f656ad..9b99724d0c 100644 --- a/actions/apioauthaccesstoken.php +++ b/actions/apioauthaccesstoken.php @@ -31,7 +31,7 @@ if (!defined('STATUSNET')) { exit(1); } -require_once INSTALLDIR . '/lib/api.php'; +require_once INSTALLDIR . '/lib/apioauthstore.php'; /** * Exchange an authorized OAuth request token for an access token @@ -43,7 +43,63 @@ require_once INSTALLDIR . '/lib/api.php'; * @link http://status.net/ */ -class ApiOauthAccessTokenAction extends ApiAction +class ApiOauthAccessTokenAction extends Action { + /** + * Is read only? + * + * @return boolean false + */ + function isReadOnly() + { + return false; + } + + /** + * Class handler. + * + * @param array $args array of arguments + * + * @return void + */ + function handle($args) + { + parent::handle($args); + + $datastore = new ApiStatusNetOAuthDataStore(); + $server = new OAuthServer($datastore); + $hmac_method = new OAuthSignatureMethod_HMAC_SHA1(); + + $server->add_signature_method($hmac_method); + + $atok = null; + + try { + $req = OAuthRequest::from_request(); + $atok = $server->fetch_access_token($req); + + } catch (OAuthException $e) { + common_log(LOG_WARN, 'API OAuthException - ' . $e->getMessage()); + common_debug(var_export($req, true)); + $this->outputError($e->getMessage()); + return; + } + + if (empty($atok)) { + common_debug('couldn\'t get access token.'); + $this->outputError("Badness."); + return; + } + + print $atok; + } + + function outputError($msg) + { + header('HTTP/1.1 401 Unauthorized'); + header('Content-Type: text/html; charset=utf-8'); + print $msg . "\n"; + } } + diff --git a/classes/Oauth_application.php b/classes/Oauth_application.php index d4de6d82e1..5df8b9459c 100644 --- a/classes/Oauth_application.php +++ b/classes/Oauth_application.php @@ -88,4 +88,18 @@ class Oauth_application extends Memcached_DataObject return $this->update($orig); } + static function getByConsumerKey($key) + { + if (empty($key)) { + return null; + } + + $app = new Oauth_application(); + $app->consumer_key = $key; + $app->limit(1); + $result = $app->find(true); + + return empty($result) ? null : $app; + } + } diff --git a/lib/apioauthstore.php b/lib/apioauthstore.php index a92a4d6e49..290ce89730 100644 --- a/lib/apioauthstore.php +++ b/lib/apioauthstore.php @@ -39,19 +39,45 @@ class ApiStatusNetOAuthDataStore extends StatusNetOAuthDataStore function new_access_token($token, $consumer) { common_debug('new_access_token("'.$token->key.'","'.$consumer->key.'")', __FILE__); - $rt = new Token(); + + $rt = new Token(); $rt->consumer_key = $consumer->key; $rt->tok = $token->key; $rt->type = 0; // request - if ($rt->find(true) && $rt->state == 1) { // authorized + + $app = Oauth_application::getByConsumerKey($consumer->key); + + if (empty($app)) { + common_debug("empty app!"); + } + + if ($rt->find(true) && $rt->state == 1) { // authorized common_debug('request token found.', __FILE__); - $at = new Token(); + + // find the associated user of the app + + $appUser = new Oauth_application_user(); + $appUser->application_id = $app->id; + $appUser->token = $rt->tok; + $result = $appUser->find(true); + + if (!empty($result)) { + common_debug("Oath app user found."); + } else { + common_debug("Oauth app user not found."); + return null; + } + + // go ahead and make the access token + + $at = new Token(); $at->consumer_key = $consumer->key; $at->tok = common_good_rand(16); $at->secret = common_good_rand(16); $at->type = 1; // access $at->created = DB_DataObject_Cast::dateTime(); - if (!$at->insert()) { + + if (!$at->insert()) { $e = $at->_lastError; common_debug('access token "'.$at->tok.'" not inserted: "'.$e->message.'"', __FILE__); return null; @@ -64,23 +90,23 @@ class ApiStatusNetOAuthDataStore extends StatusNetOAuthDataStore return null; } common_debug('request token "'.$rt->tok.'" updated', __FILE__); - // Update subscription - // XXX: mixing levels here - $sub = Subscription::staticGet('token', $rt->tok); - if (!$sub) { - return null; - } - common_debug('subscription for request token found', __FILE__); - $orig_sub = clone($sub); - $sub->token = $at->tok; - $sub->secret = $at->secret; - if (!$sub->update($orig_sub)) { - return null; - } else { - common_debug('subscription updated to use access token', __FILE__); - return new OAuthToken($at->tok, $at->secret); - } - } + + // update the token from req to access for the user + + $orig = clone($appUser); + $appUser->token = $at->tok; + $result = $appUser->update($orig); + + if (empty($result)) { + common_debug('couldn\'t update OAuth app user.'); + return null; + } + + // Okay, good + + return new OAuthToken($at->tok, $at->secret); + } + } else { return null; } From c2337ab47c183ab9758f5db8632ac9cd480a282a Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Mon, 11 Jan 2010 12:17:36 -0800 Subject: [PATCH 040/134] Decided we didn't need to keep the token secret in the Oauth_application_user record --- classes/Oauth_application_user.php | 1 - classes/statusnet.ini | 1 - db/statusnet.sql | 3 +-- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/classes/Oauth_application_user.php b/classes/Oauth_application_user.php index e4c018f219..a05371f563 100644 --- a/classes/Oauth_application_user.php +++ b/classes/Oauth_application_user.php @@ -14,7 +14,6 @@ class Oauth_application_user extends Memcached_DataObject public $application_id; // int(4) primary_key not_null public $access_type; // tinyint(1) public $token; // varchar(255) - public $secret; // varchar(255) public $verifier; // varchar(255) public $created; // datetime not_null public $modified; // timestamp not_null default_CURRENT_TIMESTAMP diff --git a/classes/statusnet.ini b/classes/statusnet.ini index 43f6c4466d..b358bbf60a 100644 --- a/classes/statusnet.ini +++ b/classes/statusnet.ini @@ -373,7 +373,6 @@ profile_id = 129 application_id = 129 access_type = 17 token = 2 -secret = 2 verifier = 2 created = 142 modified = 384 diff --git a/db/statusnet.sql b/db/statusnet.sql index eb47060674..c3160bcf87 100644 --- a/db/statusnet.sql +++ b/db/statusnet.sql @@ -229,8 +229,7 @@ create table oauth_application_user ( profile_id integer not null comment 'user of the application' references profile (id), application_id integer not null comment 'id of the application' references oauth_application (id), access_type tinyint default 0 comment 'access type, bit 1 = read, bit 2 = write, bit 3 = revoked', - token varchar(255) comment 'authorization token', - secret varchar(255) comment 'token secret', + token varchar(255) comment 'request or access token', verifier varchar(255) not null comment 'verification code', created datetime not null comment 'date this record was created', modified timestamp comment 'date this record was modified', From 11bd98025c1e41921359b634461772d22a1c059f Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Mon, 11 Jan 2010 12:52:56 -0800 Subject: [PATCH 041/134] Issue a warning when someone tries to exchange an unauthorized or otherwise bad req token for an access token. --- actions/apioauthaccesstoken.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/actions/apioauthaccesstoken.php b/actions/apioauthaccesstoken.php index 9b99724d0c..67359d765d 100644 --- a/actions/apioauthaccesstoken.php +++ b/actions/apioauthaccesstoken.php @@ -88,11 +88,10 @@ class ApiOauthAccessTokenAction extends Action if (empty($atok)) { common_debug('couldn\'t get access token.'); - $this->outputError("Badness."); - return; + print "Token exchange failed. Has the request token been authorized?\n"; + } else { + print $atok; } - - print $atok; } function outputError($msg) From c78937537ed17eabb665ec6e4344b564799cbccc Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Mon, 11 Jan 2010 14:11:43 -0800 Subject: [PATCH 042/134] Better detial in connected OAuth applications list --- actions/oauthconnectionssettings.php | 32 +++++++++--- classes/Profile.php | 9 ++-- lib/applicationlist.php | 74 +++++++++++++++++++--------- 3 files changed, 82 insertions(+), 33 deletions(-) diff --git a/actions/oauthconnectionssettings.php b/actions/oauthconnectionssettings.php index e4b5af1586..56e7b02fba 100644 --- a/actions/oauthconnectionssettings.php +++ b/actions/oauthconnectionssettings.php @@ -48,6 +48,16 @@ require_once INSTALLDIR . '/lib/applicationlist.php'; class OauthconnectionssettingsAction extends ConnectSettingsAction { + + var $page = null; + + function prepare($args) + { + parent::prepare($args); + $this->page = ($this->arg('page')) ? ($this->arg('page') + 0) : 1; + return true; + } + /** * Title of the page * @@ -59,6 +69,11 @@ class OauthconnectionssettingsAction extends ConnectSettingsAction return _('Connected Applications'); } + function isReadOnly($args) + { + return true; + } + /** * Instructions for use * @@ -86,13 +101,16 @@ class OauthconnectionssettingsAction extends ConnectSettingsAction $application = $profile->getApplications($offset, $limit); - if ($application) { - $al = new ApplicationList($application, $this->user, $this); - $cnt = $al->show(); - if (0 == $cnt) { - $this->showEmptyListMessage(); - } - } + $cnt == 0; + + if (!empty($application)) { + $al = new ApplicationList($application, $user, $this, true); + $cnt = $al->show(); + } + + if ($cnt == 0) { + $this->showEmptyListMessage(); + } $this->pagination($this->page > 1, $cnt > APPS_PER_PAGE, $this->page, 'connectionssettings', diff --git a/classes/Profile.php b/classes/Profile.php index 687215b11b..fef2a21710 100644 --- a/classes/Profile.php +++ b/classes/Profile.php @@ -355,10 +355,11 @@ class Profile extends Memcached_DataObject function getApplications($offset = 0, $limit = null) { $qry = - 'SELECT oauth_application_user.* ' . - 'FROM oauth_application_user ' . - 'WHERE profile_id = %d ' . - 'ORDER BY created DESC '; + 'SELECT a.* ' . + 'FROM oauth_application_user u, oauth_application a ' . + 'WHERE u.profile_id = %d ' . + 'AND a.id = u.application_id ' . + 'ORDER BY u.created DESC '; if ($offset > 0) { if (common_config('db','type') == 'pgsql') { diff --git a/lib/applicationlist.php b/lib/applicationlist.php index 5392ddab8c..e305437f4c 100644 --- a/lib/applicationlist.php +++ b/lib/applicationlist.php @@ -57,13 +57,14 @@ class ApplicationList extends Widget /** Action object using us. */ var $action = null; - function __construct($application, $owner=null, $action=null) + function __construct($application, $owner=null, $action=null, $connections = false) { parent::__construct($action); $this->application = $application; $this->owner = $owner; $this->action = $action; + $this->connections = $connections; } function show() @@ -97,36 +98,65 @@ class ApplicationList extends Widget $this->out->element('img', array('src' => $this->application->icon)); } - $this->out->elementStart('a', - array('href' => common_local_url( - 'showapplication', - array( - 'nickname' => $user->nickname, - 'id' => $this->application->id - ) - ), - 'class' => 'url') - ); + if (!$this->connections) { + + $this->out->elementStart('a', + array('href' => + common_local_url('showapplication', + array('nickname' => $user->nickname, + 'id' => $this->application->id)), + 'class' => 'url') + ); $this->out->raw($this->application->name); $this->out->elementEnd('a'); - - $this->out->raw(' by '); - + } else { $this->out->elementStart('a', - array( - 'href' => $this->application->homepage, - 'class' => 'url' - ) - ); - $this->out->raw($this->application->organization); - $this->out->elementEnd('a'); + array('href' => $this->application->source_url, + 'class' => 'url')); - $this->out->elementStart('p', 'note'); + $this->out->raw($this->application->name); + $this->out->elementEnd('a'); + } + + $this->out->raw(' by '); + + $this->out->elementStart('a', + array( + 'href' => $this->application->homepage, + 'class' => 'url' + ) + ); + $this->out->raw($this->application->organization); + $this->out->elementEnd('a'); + + $this->out->elementStart('p', 'note'); $this->out->raw($this->application->description); $this->out->elementEnd('p'); + $this->out->elementEnd('li'); + + if ($this->connections) { + + $appUser = Oauth_application_user::getByKeys($this->owner, $this->application); + + if (empty($appUser)) { + common_debug("empty appUser!"); + } + + $this->out->elementStart('li'); + + $access = ($this->application->access_type & Oauth_application::$writeAccess) + ? 'read-write' : 'read-only'; + + $txt = 'Approved ' . common_exact_date($appUser->modified) . + " $access for access."; + + $this->out->raw($txt); $this->out->elementEnd('li'); + + // XXX: Add revoke access button + } } /* Override this in subclasses. */ From 4fb9b43aa2c174e0b5ac3e260cafd2b5fcfa9368 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Mon, 11 Jan 2010 22:46:35 +0000 Subject: [PATCH 043/134] Updated markup for application edit form submits --- lib/applicationeditform.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/applicationeditform.php b/lib/applicationeditform.php index 4d3bb06e75..f8fcb3e3f5 100644 --- a/lib/applicationeditform.php +++ b/lib/applicationeditform.php @@ -333,7 +333,9 @@ class ApplicationEditForm extends Form function formActions() { - $this->out->submit('save', _('Save')); - $this->out->submit('cancel', _('Cancel')); + $this->out->submit('cancel', _('Cancel'), 'submit form_action-primary', + 'cancel', _('Cancel')); + $this->out->submit('save', _('Save'), 'submit form_action-secondary', + 'save', _('Save')); } } From 61f71a4a597bb2eab2b56a80a71e867c1539739d Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Mon, 11 Jan 2010 22:54:46 +0000 Subject: [PATCH 044/134] Updated markup for application registration and view links --- actions/apps.php | 7 +++++-- actions/showapplication.php | 8 ++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/actions/apps.php b/actions/apps.php index e6500599f7..7c7b24570f 100644 --- a/actions/apps.php +++ b/actions/apps.php @@ -114,13 +114,16 @@ class AppsAction extends SettingsAction } } + $this->elementStart('p', array('id' => 'application_register')); $this->element('a', array('href' => common_local_url( 'newapplication', array('nickname' => $user->nickname) - ) + ), + 'class' => 'more' ), - 'Register a new application »'); + 'Register a new application'); + $this->elementEnd('p'); $this->pagination( $this->page > 1, diff --git a/actions/showapplication.php b/actions/showapplication.php index 5156fa6f0c..3e191148ae 100644 --- a/actions/showapplication.php +++ b/actions/showapplication.php @@ -249,16 +249,16 @@ class ShowApplicationAction extends OwnerDesignAction $this->elementEnd('div'); - $this->elementStart('div', 'entity-list-apps'); + $this->elementStart('p', array('id' => 'application_action')); $this->element('a', array( 'href' => common_local_url( 'apps', - array('nickname' => $this->owner->nickname) - ) + array('nickname' => $this->owner->nickname)), + 'class' => 'more' ), 'View your applications'); - $this->elementEnd('div'); + $this->elementEnd('p'); } function resetKey() From c8a4d0d6c2cafe1d3d4285c4b634f1dc52e91d8b Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Mon, 11 Jan 2010 23:51:12 +0000 Subject: [PATCH 045/134] Updated markup for application details --- actions/showapplication.php | 70 +++++++++++++++++++++---------------- 1 file changed, 40 insertions(+), 30 deletions(-) diff --git a/actions/showapplication.php b/actions/showapplication.php index 3e191148ae..33bc51f931 100644 --- a/actions/showapplication.php +++ b/actions/showapplication.php @@ -152,7 +152,8 @@ class ShowApplicationAction extends OwnerDesignAction $cur = common_current_user(); $this->elementStart('div', 'entity_actions'); - + $this->elementStart('ul'); + $this->elementStart('li'); $this->element('a', array('href' => common_local_url( @@ -163,7 +164,9 @@ class ShowApplicationAction extends OwnerDesignAction ) ) ), 'Edit application'); + $this->elementEnd('li'); + $this->elementStart('li'); $this->elementStart('form', array( 'id' => 'forma_reset_key', 'class' => 'form_reset_key', @@ -177,32 +180,39 @@ class ShowApplicationAction extends OwnerDesignAction $this->submit('reset', _('Reset Consumer key/secret')); $this->elementEnd('fieldset'); $this->elementEnd('form'); - + $this->elementEnd('li'); + $this->elementEnd('ul'); $this->elementEnd('div'); $consumer = $this->application->getConsumer(); - $this->elementStart('div', 'entity-application'); + $this->elementStart('div', 'entity_application'); + $this->element('h2', null, _('Application profile')); + $this->elementStart('dl', 'entity_depiction'); + $this->element('dt', null, _('Icon')); + $this->elementStart('dd'); + if (!empty($this->application->icon)) { + $this->element('img', array('src' => $this->application->icon)); + } + $this->elementEnd('dd'); + $this->elementEnd('dl'); - $this->elementStart('ul', 'entity_application_details'); - - $this->elementStart('li', 'entity_application-icon'); - - if (!empty($this->application->icon)) { - $this->element('img', array('src' => $this->application->icon)); - } - - $this->elementEnd('li'); - - $this->elementStart('li', 'entity_application_name'); - $this->element('span', array('class' => 'big'), $this->application->name); + $this->elementStart('dl', 'entity_fn'); + $this->element('dt', null, _('Name')); + $this->elementStart('dd'); + $this->element('span', null, $this->application->name); $this->raw(sprintf(_(' by %1$s'), $this->application->organization)); - $this->elementEnd('li'); + $this->elementEnd('dd'); + $this->elementEnd('dl'); - $this->element('li', 'entity_application_description', $this->application->description); - - $this->elementStart('li', 'entity_application_statistics'); + $this->elementStart('dl', 'entity_note'); + $this->element('dt', null, _('Description')); + $this->element('dd', null, $this->application->description); + $this->elementEnd('dl'); + $this->elementStart('dl', 'entity_statistics'); + $this->element('dt', null, _('Statistics')); + $this->elementStart('dd'); $defaultAccess = ($this->application->access_type & Oauth_application::$writeAccess) ? 'read-write' : 'read-only'; $profile = Profile::staticGet($this->application->owner); @@ -214,39 +224,39 @@ class ShowApplicationAction extends OwnerDesignAction $defaultAccess, $userCnt )); + $this->elementEnd('dd'); + $this->elementEnd('dl'); + $this->elementEnd('div'); - $this->elementEnd('li'); - - $this->elementEnd('ul'); - + $this->elementStart('div', array('id' => 'entity_data')); + $this->element('h2', null, _('Application info')); $this->elementStart('dl', 'entity_consumer_key'); $this->element('dt', null, _('Consumer key')); - $this->element('dd', 'label', $consumer->consumer_key); + $this->element('dd', null, $consumer->consumer_key); $this->elementEnd('dl'); $this->elementStart('dl', 'entity_consumer_secret'); $this->element('dt', null, _('Consumer secret')); - $this->element('dd', 'label', $consumer->consumer_secret); + $this->element('dd', null, $consumer->consumer_secret); $this->elementEnd('dl'); $this->elementStart('dl', 'entity_request_token_url'); $this->element('dt', null, _('Request token URL')); - $this->element('dd', 'label', common_local_url('apioauthrequesttoken')); + $this->element('dd', null, common_local_url('apioauthrequesttoken')); $this->elementEnd('dl'); $this->elementStart('dl', 'entity_access_token_url'); $this->element('dt', null, _('Access token URL')); - $this->element('dd', 'label', common_local_url('apioauthaccesstoken')); + $this->element('dd', null, common_local_url('apioauthaccesstoken')); $this->elementEnd('dl'); $this->elementStart('dl', 'entity_authorize_url'); $this->element('dt', null, _('Authorize URL')); - $this->element('dd', 'label', common_local_url('apioauthauthorize')); + $this->element('dd', null, common_local_url('apioauthauthorize')); $this->elementEnd('dl'); $this->element('p', 'oauth-signature-note', - '*We support hmac-sha1 signatures. We do not support the plaintext signature method.'); - + '* We support hmac-sha1 signatures. We do not support the plaintext signature method.'); $this->elementEnd('div'); $this->elementStart('p', array('id' => 'application_action')); From 0b90f7645e5bd54c99c6fb7c1fe105e183b9e8c1 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Tue, 12 Jan 2010 01:01:45 +0000 Subject: [PATCH 046/134] Updated class for application list --- lib/applicationlist.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/applicationlist.php b/lib/applicationlist.php index e305437f4c..23c727bd61 100644 --- a/lib/applicationlist.php +++ b/lib/applicationlist.php @@ -69,7 +69,7 @@ class ApplicationList extends Widget function show() { - $this->out->elementStart('ul', 'applications xoxo'); + $this->out->elementStart('ul', array('id' => 'applications')); $cnt = 0; From c2ffd6612887675e55a9d9398517e23ee95c9117 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Tue, 12 Jan 2010 01:02:25 +0000 Subject: [PATCH 047/134] Updated markup for application details page. Similar to user/group profile page. --- actions/showapplication.php | 90 +++++++++++++++++++------------------ 1 file changed, 47 insertions(+), 43 deletions(-) diff --git a/actions/showapplication.php b/actions/showapplication.php index 33bc51f931..db28395c29 100644 --- a/actions/showapplication.php +++ b/actions/showapplication.php @@ -151,63 +151,33 @@ class ShowApplicationAction extends OwnerDesignAction $cur = common_current_user(); - $this->elementStart('div', 'entity_actions'); - $this->elementStart('ul'); - $this->elementStart('li'); - $this->element('a', - array('href' => - common_local_url( - 'editapplication', - array( - 'nickname' => $this->owner->nickname, - 'id' => $this->application->id - ) - ) - ), 'Edit application'); - $this->elementEnd('li'); - - $this->elementStart('li'); - $this->elementStart('form', array( - 'id' => 'forma_reset_key', - 'class' => 'form_reset_key', - 'method' => 'POST', - 'action' => common_local_url('showapplication', - array('nickname' => $cur->nickname, - 'id' => $this->application->id)))); - - $this->elementStart('fieldset'); - $this->hidden('token', common_session_token()); - $this->submit('reset', _('Reset Consumer key/secret')); - $this->elementEnd('fieldset'); - $this->elementEnd('form'); - $this->elementEnd('li'); - $this->elementEnd('ul'); - $this->elementEnd('div'); - $consumer = $this->application->getConsumer(); - $this->elementStart('div', 'entity_application'); + $this->elementStart('div', 'entity_profile vcard'); $this->element('h2', null, _('Application profile')); $this->elementStart('dl', 'entity_depiction'); $this->element('dt', null, _('Icon')); $this->elementStart('dd'); if (!empty($this->application->icon)) { - $this->element('img', array('src' => $this->application->icon)); + $this->element('img', array('src' => $this->application->icon, + 'class' => 'photo logo')); } $this->elementEnd('dd'); $this->elementEnd('dl'); $this->elementStart('dl', 'entity_fn'); $this->element('dt', null, _('Name')); - $this->elementStart('dd'); - $this->element('span', null, $this->application->name); - $this->raw(sprintf(_(' by %1$s'), $this->application->organization)); - $this->elementEnd('dd'); + $this->element('dd', 'fn', $this->application->name); + $this->elementEnd('dl'); + + $this->elementStart('dl', 'entity_org'); + $this->element('dt', null, _('Organization')); + $this->element('dd', 'org', $this->application->organization); $this->elementEnd('dl'); $this->elementStart('dl', 'entity_note'); $this->element('dt', null, _('Description')); - $this->element('dd', null, $this->application->description); + $this->element('dd', 'note', $this->application->description); $this->elementEnd('dl'); $this->elementStart('dl', 'entity_statistics'); @@ -228,7 +198,41 @@ class ShowApplicationAction extends OwnerDesignAction $this->elementEnd('dl'); $this->elementEnd('div'); - $this->elementStart('div', array('id' => 'entity_data')); + $this->elementStart('div', 'entity_actions'); + $this->element('h2', null, _('Application actions')); + $this->elementStart('ul'); + $this->elementStart('li', 'entity_edit'); + $this->element('a', + array('href' => + common_local_url( + 'editapplication', + array( + 'nickname' => $this->owner->nickname, + 'id' => $this->application->id + ) + ) + ), 'Edit'); + $this->elementEnd('li'); + + $this->elementStart('li', 'entity_reset_keysecret'); + $this->elementStart('form', array( + 'id' => 'forma_reset_key', + 'class' => 'form_reset_key', + 'method' => 'POST', + 'action' => common_local_url('showapplication', + array('nickname' => $cur->nickname, + 'id' => $this->application->id)))); + + $this->elementStart('fieldset'); + $this->hidden('token', common_session_token()); + $this->submit('reset', _('Reset key & secret')); + $this->elementEnd('fieldset'); + $this->elementEnd('form'); + $this->elementEnd('li'); + $this->elementEnd('ul'); + $this->elementEnd('div'); + + $this->elementStart('div', 'entity_data'); $this->element('h2', null, _('Application info')); $this->elementStart('dl', 'entity_consumer_key'); $this->element('dt', null, _('Consumer key')); @@ -255,8 +259,8 @@ class ShowApplicationAction extends OwnerDesignAction $this->element('dd', null, common_local_url('apioauthauthorize')); $this->elementEnd('dl'); - $this->element('p', 'oauth-signature-note', - '* We support hmac-sha1 signatures. We do not support the plaintext signature method.'); + $this->element('p', 'note', + _('Note: We support hmac-sha1 signatures. We do not support the plaintext signature method.')); $this->elementEnd('div'); $this->elementStart('p', array('id' => 'application_action')); From ba0c82b391ad3ec71bb7efe60b03f4f95f9ecaf5 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Tue, 12 Jan 2010 01:13:36 +0000 Subject: [PATCH 048/134] Added anchors to application source and homepage --- actions/showapplication.php | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/actions/showapplication.php b/actions/showapplication.php index db28395c29..f2ff8b9002 100644 --- a/actions/showapplication.php +++ b/actions/showapplication.php @@ -167,12 +167,20 @@ class ShowApplicationAction extends OwnerDesignAction $this->elementStart('dl', 'entity_fn'); $this->element('dt', null, _('Name')); - $this->element('dd', 'fn', $this->application->name); + $this->elementStart('dd'); + $this->element('a', array('href' => $this->application->source_url, + 'class' => 'url fn'), + $this->application->name); + $this->elementEnd('dd'); $this->elementEnd('dl'); $this->elementStart('dl', 'entity_org'); $this->element('dt', null, _('Organization')); - $this->element('dd', 'org', $this->application->organization); + $this->elementStart('dd'); + $this->element('a', array('href' => $this->application->homepage, + 'class' => 'url'), + $this->application->organization); + $this->elementEnd('dd'); $this->elementEnd('dl'); $this->elementStart('dl', 'entity_note'); From d998c4b1b89492e02d56ba8a395387078472f163 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Tue, 12 Jan 2010 01:29:09 +0000 Subject: [PATCH 049/134] Fixed tabbing --- lib/applicationlist.php | 87 ++++++++++++++++++----------------------- 1 file changed, 38 insertions(+), 49 deletions(-) diff --git a/lib/applicationlist.php b/lib/applicationlist.php index 23c727bd61..b404767ba0 100644 --- a/lib/applicationlist.php +++ b/lib/applicationlist.php @@ -69,7 +69,7 @@ class ApplicationList extends Widget function show() { - $this->out->elementStart('ul', array('id' => 'applications')); + $this->out->elementStart('ul', 'applications'); $cnt = 0; @@ -94,69 +94,58 @@ class ApplicationList extends Widget $this->out->elementStart('li', array('class' => 'application', 'id' => 'oauthclient-' . $this->application->id)); - if (!empty($this->application->icon)) { - $this->out->element('img', array('src' => $this->application->icon)); - } + if (!empty($this->application->icon)) { + $this->out->element('img', array('src' => $this->application->icon)); + } - if (!$this->connections) { + if (!$this->connections) { + $this->out->elementStart('a', + array('href' => common_local_url('showapplication', + array('nickname' => $user->nickname, + 'id' => $this->application->id)), + 'class' => 'url')); - $this->out->elementStart('a', - array('href' => - common_local_url('showapplication', - array('nickname' => $user->nickname, - 'id' => $this->application->id)), - 'class' => 'url') - ); + $this->out->raw($this->application->name); + $this->out->elementEnd('a'); + } else { + $this->out->elementStart('a', array('href' => $this->application->source_url, + 'class' => 'url')); - $this->out->raw($this->application->name); - $this->out->elementEnd('a'); - } else { - $this->out->elementStart('a', - array('href' => $this->application->source_url, - 'class' => 'url')); + $this->out->raw($this->application->name); + $this->out->elementEnd('a'); + } - $this->out->raw($this->application->name); - $this->out->elementEnd('a'); - } + $this->out->raw(' by '); - $this->out->raw(' by '); + $this->out->elementStart('a', array('href' => $this->application->homepage, + 'class' => 'url')); + $this->out->raw($this->application->organization); + $this->out->elementEnd('a'); - $this->out->elementStart('a', - array( - 'href' => $this->application->homepage, - 'class' => 'url' - ) - ); - $this->out->raw($this->application->organization); - $this->out->elementEnd('a'); - - $this->out->elementStart('p', 'note'); + $this->out->elementStart('p', 'note'); $this->out->raw($this->application->description); $this->out->elementEnd('p'); - $this->out->elementEnd('li'); + if ($this->connections) { + $appUser = Oauth_application_user::getByKeys($this->owner, $this->application); - if ($this->connections) { + if (empty($appUser)) { + common_debug("empty appUser!"); + } - $appUser = Oauth_application_user::getByKeys($this->owner, $this->application); + $this->out->elementStart('li'); - if (empty($appUser)) { - common_debug("empty appUser!"); - } + $access = ($this->application->access_type & Oauth_application::$writeAccess) + ? 'read-write' : 'read-only'; - $this->out->elementStart('li'); + $txt = 'Approved ' . common_exact_date($appUser->modified) . + " $access for access."; - $access = ($this->application->access_type & Oauth_application::$writeAccess) - ? 'read-write' : 'read-only'; + $this->out->raw($txt); + $this->out->elementEnd('li'); - $txt = 'Approved ' . common_exact_date($appUser->modified) . - " $access for access."; - - $this->out->raw($txt); - $this->out->elementEnd('li'); - - // XXX: Add revoke access button - } + // XXX: Add revoke access button + } } /* Override this in subclasses. */ From 8e91e053923f395d4dc0ad7f3f328953c9b17145 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Mon, 11 Jan 2010 17:30:56 -0800 Subject: [PATCH 050/134] Make API auth handle OAuth requests w/access tokens --- lib/apiauth.php | 114 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 112 insertions(+), 2 deletions(-) diff --git a/lib/apiauth.php b/lib/apiauth.php index 7102764cba..3229ab19fd 100644 --- a/lib/apiauth.php +++ b/lib/apiauth.php @@ -28,7 +28,7 @@ * @author Evan Prodromou * @author mEDI * @author Sarven Capadisli - * @author Zach Copley + * @author Zach Copley * @copyright 2009 StatusNet, Inc. * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ @@ -39,6 +39,7 @@ if (!defined('STATUSNET')) { } require_once INSTALLDIR . '/lib/api.php'; +require_once INSTALLDIR . '/lib/apioauthstore.php'; /** * Actions extending this class will require auth @@ -52,6 +53,8 @@ require_once INSTALLDIR . '/lib/api.php'; class ApiAuthAction extends ApiAction { + var $access_token; + var $oauth_access_type; /** * Take arguments for running, and output basic auth header if needed @@ -67,12 +70,119 @@ class ApiAuthAction extends ApiAction parent::prepare($args); if ($this->requiresAuth()) { - $this->checkBasicAuthUser(); + + $this->consumer_key = $this->arg('oauth_consumer_key'); + $this->access_token = $this->arg('oauth_token'); + + if (!empty($this->access_token)) { + $this->checkOAuthRequest(); + } else { + $this->checkBasicAuthUser(); + } } return true; } + function checkOAuthRequest() + { + common_debug("We have an OAuth request."); + + $datastore = new ApiStatusNetOAuthDataStore(); + $server = new OAuthServer($datastore); + $hmac_method = new OAuthSignatureMethod_HMAC_SHA1(); + + $server->add_signature_method($hmac_method); + + $this->cleanRequest(); + + try { + + $req = OAuthRequest::from_request(); + $server->verify_request($req); + + common_debug("Good OAuth request!"); + + $app = Oauth_application::getByConsumerKey($this->consumer_key); + + if (empty($app)) { + + // this should really not happen + common_log(LOG_WARN, + "Couldn't find the OAuth app for consumer key: $this->consumer_key"); + + throw new OAuthException('No application for that consumer key.'); + } + + $appUser = Oauth_application_user::staticGet('token', + $this->access_token); + + // XXX: check that app->id and appUser->application_id and consumer all + // match? + + if (!empty($appUser)) { + + // read or read-write + $this->oauth_access_type = $appUser->access_type; + + // If access_type == 0 we have either a request token + // or a bad / revoked access token + + if ($this->oauth_access_type != 0) { + + $this->auth_user = User::staticGet('id', $appUser->profile_id); + + $msg = "API OAuth authentication for user '%s' (id: %d) on behalf of " . + "application '%s' (id: %d)."; + + common_log(LOG_INFO, sprintf($msg, + $this->auth_user->nickname, + $this->auth_user->id, + $app->name, + $app->id)); + return true; + } else { + throw new OAuthException('Bad access token.'); + } + } else { + + // also should not happen + throw new OAuthException('No user for that token.'); + } + + } catch (OAuthException $e) { + common_log(LOG_WARN, 'API OAuthException - ' . $e->getMessage()); + common_debug(var_export($req, true)); + $this->showOAuthError($e->getMessage()); + exit(); + } + } + + function showOAuthError($msg) + { + header('HTTP/1.1 401 Unauthorized'); + header('Content-Type: text/html; charset=utf-8'); + print $msg . "\n"; + } + + function cleanRequest() + { + // kill evil effects of magical slashing + + if(get_magic_quotes_gpc() == 1) { + $_POST = array_map('stripslashes', $_POST); + $_GET = array_map('stripslashes', $_GET); + } + + // strip out the p param added in index.php + + // XXX: should we strip anything else? Or alternatively + // only allow a known list of params? + + unset($_GET['p']); + unset($_POST['p']); + } + /** * Does this API resource require authentication? * From 40c6d09c9f3a3a1167015782ac4972681ce98772 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Tue, 12 Jan 2010 01:36:08 +0000 Subject: [PATCH 051/134] Added missing end tag --- lib/applicationlist.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/applicationlist.php b/lib/applicationlist.php index b404767ba0..b1dcc39a96 100644 --- a/lib/applicationlist.php +++ b/lib/applicationlist.php @@ -110,7 +110,6 @@ class ApplicationList extends Widget } else { $this->out->elementStart('a', array('href' => $this->application->source_url, 'class' => 'url')); - $this->out->raw($this->application->name); $this->out->elementEnd('a'); } @@ -125,6 +124,7 @@ class ApplicationList extends Widget $this->out->elementStart('p', 'note'); $this->out->raw($this->application->description); $this->out->elementEnd('p'); + $this->out->elementEnd('li'); if ($this->connections) { $appUser = Oauth_application_user::getByKeys($this->owner, $this->application); From 34cc03c61792792e9b23e9a28e7730268b22d3d1 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Tue, 12 Jan 2010 01:41:38 +0000 Subject: [PATCH 052/134] Moved application image inside the anchor --- lib/applicationlist.php | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/lib/applicationlist.php b/lib/applicationlist.php index b1dcc39a96..8961da4355 100644 --- a/lib/applicationlist.php +++ b/lib/applicationlist.php @@ -94,10 +94,6 @@ class ApplicationList extends Widget $this->out->elementStart('li', array('class' => 'application', 'id' => 'oauthclient-' . $this->application->id)); - if (!empty($this->application->icon)) { - $this->out->element('img', array('src' => $this->application->icon)); - } - if (!$this->connections) { $this->out->elementStart('a', array('href' => common_local_url('showapplication', @@ -105,15 +101,18 @@ class ApplicationList extends Widget 'id' => $this->application->id)), 'class' => 'url')); - $this->out->raw($this->application->name); - $this->out->elementEnd('a'); } else { $this->out->elementStart('a', array('href' => $this->application->source_url, 'class' => 'url')); - $this->out->raw($this->application->name); - $this->out->elementEnd('a'); } + if (!empty($this->application->icon)) { + $this->out->element('img', array('src' => $this->application->icon)); + } + + $this->out->raw($this->application->name); + $this->out->elementEnd('a'); + $this->out->raw(' by '); $this->out->elementStart('a', array('href' => $this->application->homepage, From 276c4a2a231cce0b449e97d2bdba0a822b898e08 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Tue, 12 Jan 2010 01:44:15 +0000 Subject: [PATCH 053/134] Added vcard and photo classes --- lib/applicationlist.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/applicationlist.php b/lib/applicationlist.php index 8961da4355..6ca210537a 100644 --- a/lib/applicationlist.php +++ b/lib/applicationlist.php @@ -94,6 +94,7 @@ class ApplicationList extends Widget $this->out->elementStart('li', array('class' => 'application', 'id' => 'oauthclient-' . $this->application->id)); + $this->out->elementStart('span', 'vcard author'); if (!$this->connections) { $this->out->elementStart('a', array('href' => common_local_url('showapplication', @@ -107,11 +108,13 @@ class ApplicationList extends Widget } if (!empty($this->application->icon)) { - $this->out->element('img', array('src' => $this->application->icon)); + $this->out->element('img', array('src' => $this->application->icon, + 'class' => 'photo')); } $this->out->raw($this->application->name); $this->out->elementEnd('a'); + $this->out->elementEnd('span'); $this->out->raw(' by '); From a009052036250d33b38329dd0363dd42652e89da Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Tue, 12 Jan 2010 01:52:59 +0000 Subject: [PATCH 054/134] A little minimization --- lib/applicationlist.php | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/lib/applicationlist.php b/lib/applicationlist.php index 6ca210537a..15c2d588a3 100644 --- a/lib/applicationlist.php +++ b/lib/applicationlist.php @@ -109,23 +109,20 @@ class ApplicationList extends Widget if (!empty($this->application->icon)) { $this->out->element('img', array('src' => $this->application->icon, - 'class' => 'photo')); + 'class' => 'photo avatar')); } - $this->out->raw($this->application->name); + $this->out->element('span', 'fn', $this->application->name); $this->out->elementEnd('a'); $this->out->elementEnd('span'); $this->out->raw(' by '); - $this->out->elementStart('a', array('href' => $this->application->homepage, - 'class' => 'url')); - $this->out->raw($this->application->organization); - $this->out->elementEnd('a'); + $this->out->element('a', array('href' => $this->application->homepage, + 'class' => 'url'), + $this->application->organization); - $this->out->elementStart('p', 'note'); - $this->out->raw($this->application->description); - $this->out->elementEnd('p'); + $this->out->element('p', 'note', $this->application->description); $this->out->elementEnd('li'); if ($this->connections) { From 8d02a897dc6269b44d529938b2c6298e19a2ec59 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Tue, 12 Jan 2010 02:50:54 +0000 Subject: [PATCH 055/134] Updated markup for application edit form; image, radios --- lib/applicationeditform.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/applicationeditform.php b/lib/applicationeditform.php index f8fcb3e3f5..e9ab467804 100644 --- a/lib/applicationeditform.php +++ b/lib/applicationeditform.php @@ -175,7 +175,7 @@ class ApplicationEditForm extends Form $this->out->elementStart('ul', 'form_data'); - $this->out->elementStart('li'); + $this->out->elementStart('li', array('id' => 'application_icon')); if (!empty($icon)) { $this->out->element('img', array('src' => $icon)); @@ -193,7 +193,7 @@ class ApplicationEditForm extends Form 'value' => ImageFile::maxFileSizeInt())); $this->out->elementEnd('li'); - $this->out->elementStart('li'); + $this->out->elementStart('li'); $this->out->hidden('application_id', $id); @@ -241,7 +241,7 @@ class ApplicationEditForm extends Form _('URL to redirect to after authentication')); $this->out->elementEnd('li'); - $this->out->elementStart('li'); + $this->out->elementStart('li', array('id' => 'application_types')); $attrs = array('name' => 'app_type', 'type' => 'radio', @@ -280,7 +280,7 @@ class ApplicationEditForm extends Form $this->out->element('p', 'form_guide', _('Type of application, browser or desktop')); $this->out->elementEnd('li'); - $this->out->elementStart('li'); + $this->out->elementStart('li', array('id' => 'default_access_types')); $attrs = array('name' => 'default_access_type', 'type' => 'radio', From 7694955cd654becf8f03dc4eca271d8188141596 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Wed, 13 Jan 2010 01:16:42 +0000 Subject: [PATCH 056/134] Callback URL can be null --- db/statusnet.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/statusnet.sql b/db/statusnet.sql index c3160bcf87..b1867e7f04 100644 --- a/db/statusnet.sql +++ b/db/statusnet.sql @@ -218,7 +218,7 @@ create table oauth_application ( source_url varchar(255) comment 'application homepage - used for source link', organization varchar(255) comment 'name of the organization running the application', homepage varchar(255) comment 'homepage for the organization', - callback_url varchar(255) not null comment 'url to redirect to after authentication', + callback_url varchar(255) comment 'url to redirect to after authentication', type tinyint default 0 comment 'type of app, 1 = browser, 2 = desktop', access_type tinyint default 0 comment 'default access type, bit 1 = read, bit 2 = write', created datetime not null comment 'date this record was created', From adfca0180847571b9474db76a0c4daa407acf22b Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Wed, 13 Jan 2010 01:22:37 +0000 Subject: [PATCH 057/134] Can now edit/change application icon --- actions/editapplication.php | 124 ++++++++++++++++------------------ actions/newapplication.php | 81 +++++++--------------- classes/Oauth_application.php | 53 ++++++++++++--- 3 files changed, 126 insertions(+), 132 deletions(-) diff --git a/actions/editapplication.php b/actions/editapplication.php index 6b8dd501c9..a0ed3117a7 100644 --- a/actions/editapplication.php +++ b/actions/editapplication.php @@ -93,47 +93,47 @@ class EditApplicationAction extends OwnerDesignAction parent::handle($args); if ($_SERVER['REQUEST_METHOD'] == 'POST') { - $this->handlePost($args); - } else { - $this->showForm(); - } + $this->handlePost($args); + } else { + $this->showForm(); + } } function handlePost($args) { - // Workaround for PHP returning empty $_POST and $_FILES when POST + // Workaround for PHP returning empty $_POST and $_FILES when POST // length > post_max_size in php.ini if (empty($_FILES) && empty($_POST) && ($_SERVER['CONTENT_LENGTH'] > 0) - ) { + ) { $msg = _('The server was unable to handle that much POST ' . - 'data (%s bytes) due to its current configuration.'); + 'data (%s bytes) due to its current configuration.'); $this->clientException(sprintf($msg, $_SERVER['CONTENT_LENGTH'])); return; } - // CSRF protection - $token = $this->trimmed('token'); - if (!$token || $token != common_session_token()) { - $this->clientError(_('There was a problem with your session token.')); - return; - } + // CSRF protection + $token = $this->trimmed('token'); + if (!$token || $token != common_session_token()) { + $this->clientError(_('There was a problem with your session token.')); + return; + } - $cur = common_current_user(); + $cur = common_current_user(); - if ($this->arg('cancel')) { - common_redirect(common_local_url('showapplication', - array( - 'nickname' => $cur->nickname, - 'id' => $this->app->id) - ), 303); - } elseif ($this->arg('save')) { - $this->trySave(); - } else { - $this->clientError(_('Unexpected form submission.')); - } + if ($this->arg('cancel')) { + common_redirect(common_local_url('showapplication', + array( + 'nickname' => $cur->nickname, + 'id' => $this->app->id) + ), 303); + } elseif ($this->arg('save')) { + $this->trySave(); + } else { + $this->clientError(_('Unexpected form submission.')); + } } function showForm($msg=null) @@ -170,8 +170,8 @@ class EditApplicationAction extends OwnerDesignAction $access_type = $this->arg('default_access_type'); if (empty($name)) { - $this->showForm(_('Name is required.')); - return; + $this->showForm(_('Name is required.')); + return; } elseif (mb_strlen($name) > 255) { $this->showForm(_('Name is too long (max 255 chars).')); return; @@ -181,20 +181,17 @@ class EditApplicationAction extends OwnerDesignAction } elseif (Oauth_application::descriptionTooLong($description)) { $this->showForm(sprintf( _('Description is too long (max %d chars).'), - Oauth_application::maxDescription())); + Oauth_application::maxDescription())); return; - } elseif (empty($source_url)) { - $this->showForm(_('Source URL is required.')); - return; - } elseif ((strlen($source_url) > 0) - && !Validate::uri( - $source_url, - array('allowed_schemes' => array('http', 'https')) - ) - ) - { - $this->showForm(_('Source URL is not valid.')); + } elseif (mb_strlen($source_url) > 255) { + $this->showForm(_('Source URL is too long.')); return; + } elseif ((mb_strlen($source_url) > 0) + && !Validate::uri($source_url, + array('allowed_schemes' => array('http', 'https')))) + { + $this->showForm(_('Source URL is not valid.')); + return; } elseif (empty($organization)) { $this->showForm(_('Organization is required.')); return; @@ -204,35 +201,30 @@ class EditApplicationAction extends OwnerDesignAction } elseif (empty($homepage)) { $this->showForm(_('Organization homepage is required.')); return; - } elseif ((strlen($homepage) > 0) - && !Validate::uri( - $homepage, - array('allowed_schemes' => array('http', 'https')) - ) - ) - { - $this->showForm(_('Homepage is not a valid URL.')); - return; - } elseif (empty($callback_url)) { - $this->showForm(_('Callback is required.')); - return; - } elseif (strlen($callback_url) > 0 - && !Validate::uri( - $source_url, - array('allowed_schemes' => array('http', 'https')) - ) - ) - { - $this->showForm(_('Callback URL is not valid.')); - return; - } + } elseif ((mb_strlen($homepage) > 0) + && !Validate::uri($homepage, + array('allowed_schemes' => array('http', 'https')))) + { + $this->showForm(_('Homepage is not a valid URL.')); + return; + } elseif (mb_strlen($callback_url) > 255) { + $this->showForm(_('Callback is too long.')); + return; + } elseif (mb_strlen($callback_url) > 0 + && !Validate::uri($source_url, + array('allowed_schemes' => array('http', 'https')) + )) + { + $this->showForm(_('Callback URL is not valid.')); + return; + } $cur = common_current_user(); // Checked in prepare() above assert(!is_null($cur)); - assert(!is_null($this->app)); + assert(!is_null($this->app)); $orig = clone($this->app); @@ -244,9 +236,7 @@ class EditApplicationAction extends OwnerDesignAction $this->app->callback_url = $callback_url; $this->app->type = $type; - $result = $this->app->update($orig); - - common_debug("access_type = $access_type"); + common_debug("access_type = $access_type"); if ($access_type == 'r') { $this->app->access_type = 1; @@ -254,11 +244,15 @@ class EditApplicationAction extends OwnerDesignAction $this->app->access_type = 3; } + $result = $this->app->update($orig); + if (!$result) { common_log_db_error($this->app, 'UPDATE', __FILE__); $this->serverError(_('Could not update application.')); } + $this->app->uploadLogo(); + common_redirect(common_local_url('apps', array('nickname' => $cur->nickname)), 303); } diff --git a/actions/newapplication.php b/actions/newapplication.php index a0e61d288c..3d42b657be 100644 --- a/actions/newapplication.php +++ b/actions/newapplication.php @@ -83,7 +83,7 @@ class NewApplicationAction extends OwnerDesignAction parent::handle($args); if ($_SERVER['REQUEST_METHOD'] == 'POST') { - $this->handlePost($args); + $this->handlePost($args); } else { $this->showForm(); } @@ -91,36 +91,36 @@ class NewApplicationAction extends OwnerDesignAction function handlePost($args) { - // Workaround for PHP returning empty $_POST and $_FILES when POST + // Workaround for PHP returning empty $_POST and $_FILES when POST // length > post_max_size in php.ini if (empty($_FILES) && empty($_POST) && ($_SERVER['CONTENT_LENGTH'] > 0) - ) { + ) { $msg = _('The server was unable to handle that much POST ' . - 'data (%s bytes) due to its current configuration.'); + 'data (%s bytes) due to its current configuration.'); $this->clientException(sprintf($msg, $_SERVER['CONTENT_LENGTH'])); return; } - // CSRF protection - $token = $this->trimmed('token'); - if (!$token || $token != common_session_token()) { - $this->clientError(_('There was a problem with your session token.')); - return; - } + // CSRF protection + $token = $this->trimmed('token'); + if (!$token || $token != common_session_token()) { + $this->clientError(_('There was a problem with your session token.')); + return; + } - $cur = common_current_user(); + $cur = common_current_user(); - if ($this->arg('cancel')) { - common_redirect(common_local_url('apps', - array('nickname' => $cur->nickname)), 303); - } elseif ($this->arg('save')) { - $this->trySave(); - } else { - $this->clientError(_('Unexpected form submission.')); - } + if ($this->arg('cancel')) { + common_redirect(common_local_url('apps', + array('nickname' => $cur->nickname)), 303); + } elseif ($this->arg('save')) { + $this->trySave(); + } else { + $this->clientError(_('Unexpected form submission.')); + } } function showForm($msg=null) @@ -147,7 +147,7 @@ class NewApplicationAction extends OwnerDesignAction function trySave() { - $name = $this->trimmed('name'); + $name = $this->trimmed('name'); $description = $this->trimmed('description'); $source_url = $this->trimmed('source_url'); $organization = $this->trimmed('organization'); @@ -200,8 +200,8 @@ class NewApplicationAction extends OwnerDesignAction { $this->showForm(_('Homepage is not a valid URL.')); return; - } elseif (empty($callback_url)) { - $this->showForm(_('Callback is required.')); + } elseif (mb_strlen($callback_url) > 255) { + $this->showForm(_('Callback is too long.')); return; } elseif (strlen($callback_url) > 0 && !Validate::uri( @@ -266,7 +266,7 @@ class NewApplicationAction extends OwnerDesignAction $app->query('ROLLBACK'); } - $this->uploadLogo($app); + $this->app->uploadLogo(); $app->query('COMMIT'); @@ -275,40 +275,5 @@ class NewApplicationAction extends OwnerDesignAction } - /** - * Handle an image upload - * - * Does all the magic for handling an image upload, and crops the - * image by default. - * - * @return void - */ - - function uploadLogo($app) - { - if ($_FILES['app_icon']['error'] == - UPLOAD_ERR_OK) { - - try { - $imagefile = ImageFile::fromUpload('app_icon'); - } catch (Exception $e) { - common_debug("damn that sucks"); - $this->showForm($e->getMessage()); - return; - } - - $filename = Avatar::filename($app->id, - image_type_to_extension($imagefile->type), - null, - 'oauth-app-icon-'.common_timestamp()); - - $filepath = Avatar::path($filename); - - move_uploaded_file($imagefile->filepath, $filepath); - - $app->setOriginal($filename); - } - } - } diff --git a/classes/Oauth_application.php b/classes/Oauth_application.php index 5df8b9459c..a6b5390872 100644 --- a/classes/Oauth_application.php +++ b/classes/Oauth_application.php @@ -27,7 +27,7 @@ class Oauth_application extends Memcached_DataObject /* Static get */ function staticGet($k,$v=NULL) { - return Memcached_DataObject::staticGet('Oauth_application',$k,$v); + return Memcached_DataObject::staticGet('Oauth_application',$k,$v); } /* the code above is auto generated do not remove the tag below */ ###END_AUTOCODE @@ -90,16 +90,51 @@ class Oauth_application extends Memcached_DataObject static function getByConsumerKey($key) { - if (empty($key)) { - return null; - } + if (empty($key)) { + return null; + } - $app = new Oauth_application(); - $app->consumer_key = $key; - $app->limit(1); - $result = $app->find(true); + $app = new Oauth_application(); + $app->consumer_key = $key; + $app->limit(1); + $result = $app->find(true); - return empty($result) ? null : $app; + return empty($result) ? null : $app; + } + + /** + * Handle an image upload + * + * Does all the magic for handling an image upload, and crops the + * image by default. + * + * @return void + */ + + function uploadLogo() + { + if ($_FILES['app_icon']['error'] == + UPLOAD_ERR_OK) { + + try { + $imagefile = ImageFile::fromUpload('app_icon'); + } catch (Exception $e) { + common_debug("damn that sucks"); + $this->showForm($e->getMessage()); + return; + } + + $filename = Avatar::filename($this->id, + image_type_to_extension($imagefile->type), + null, + 'oauth-app-icon-'.common_timestamp()); + + $filepath = Avatar::path($filename); + + move_uploaded_file($imagefile->filepath, $filepath); + + $this->setOriginal($filename); + } } } From 8da5e98cba12c32f0b75a90d1ff0007b73f0fc8d Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Wed, 13 Jan 2010 05:06:35 +0000 Subject: [PATCH 058/134] OAuth 1.0 working now --- actions/apioauthaccesstoken.php | 40 ++++----- actions/apioauthauthorize.php | 111 +++++++++++++++---------- actions/apioauthrequesttoken.php | 24 ++++-- lib/apiauth.php | 138 ++++++++++++++----------------- lib/apioauth.php | 122 +++++++++++++++++++++++++++ lib/apioauthstore.php | 69 +++++++++------- lib/router.php | 11 ++- 7 files changed, 330 insertions(+), 185 deletions(-) create mode 100644 lib/apioauth.php diff --git a/actions/apioauthaccesstoken.php b/actions/apioauthaccesstoken.php index 67359d765d..085ef6f0b1 100644 --- a/actions/apioauthaccesstoken.php +++ b/actions/apioauthaccesstoken.php @@ -31,7 +31,7 @@ if (!defined('STATUSNET')) { exit(1); } -require_once INSTALLDIR . '/lib/apioauthstore.php'; +require_once INSTALLDIR . '/lib/apioauth.php'; /** * Exchange an authorized OAuth request token for an access token @@ -43,19 +43,9 @@ require_once INSTALLDIR . '/lib/apioauthstore.php'; * @link http://status.net/ */ -class ApiOauthAccessTokenAction extends Action +class ApiOauthAccessTokenAction extends ApiOauthAction { - /** - * Is read only? - * - * @return boolean false - */ - function isReadOnly() - { - return false; - } - /** * Class handler. * @@ -73,7 +63,7 @@ class ApiOauthAccessTokenAction extends Action $server->add_signature_method($hmac_method); - $atok = null; + $atok = null; try { $req = OAuthRequest::from_request(); @@ -81,24 +71,24 @@ class ApiOauthAccessTokenAction extends Action } catch (OAuthException $e) { common_log(LOG_WARN, 'API OAuthException - ' . $e->getMessage()); - common_debug(var_export($req, true)); - $this->outputError($e->getMessage()); - return; + common_debug(var_export($req, true)); + $this->outputError($e->getMessage()); + return; } - if (empty($atok)) { - common_debug('couldn\'t get access token.'); - print "Token exchange failed. Has the request token been authorized?\n"; - } else { - print $atok; - } + if (empty($atok)) { + common_debug('couldn\'t get access token.'); + print "Token exchange failed. Has the request token been authorized?\n"; + } else { + print $atok; + } } function outputError($msg) { - header('HTTP/1.1 401 Unauthorized'); - header('Content-Type: text/html; charset=utf-8'); - print $msg . "\n"; + header('HTTP/1.1 401 Unauthorized'); + header('Content-Type: text/html; charset=utf-8'); + print $msg . "\n"; } } diff --git a/actions/apioauthauthorize.php b/actions/apioauthauthorize.php index 48d5087efc..cdf9cb7df3 100644 --- a/actions/apioauthauthorize.php +++ b/actions/apioauthauthorize.php @@ -31,7 +31,7 @@ if (!defined('STATUSNET')) { exit(1); } -require_once INSTALLDIR . '/lib/apioauthstore.php'; +require_once INSTALLDIR . '/lib/apioauth.php'; /** * Authorize an OAuth request token @@ -43,7 +43,7 @@ require_once INSTALLDIR . '/lib/apioauthstore.php'; * @link http://status.net/ */ -class ApiOauthAuthorizeAction extends Action +class ApiOauthAuthorizeAction extends ApiOauthAction { var $oauth_token; var $callback; @@ -67,7 +67,7 @@ class ApiOauthAuthorizeAction extends Action { parent::prepare($args); - common_debug(var_export($_REQUEST, true)); + common_debug("apioauthauthorize"); $this->nickname = $this->trimmed('nickname'); $this->password = $this->arg('password'); @@ -130,7 +130,7 @@ class ApiOauthAuthorizeAction extends Action } else { - // XXX: make better error messages + // XXX: make better error messages if (empty($this->oauth_token)) { @@ -145,7 +145,8 @@ class ApiOauthAuthorizeAction extends Action return; } - common_debug("Requesting auth for app: $app->name."); + $name = $this->app->name; + common_debug("Requesting auth for app: " . $name); $this->showForm(); } @@ -153,6 +154,8 @@ class ApiOauthAuthorizeAction extends Action function handlePost() { + common_debug("handlePost()"); + // check session token for CSRF protection. $token = $this->trimmed('token'); @@ -170,7 +173,7 @@ class ApiOauthAuthorizeAction extends Action // check creds - $user = null; + $user = null; if (!common_logged_in()) { $user = common_check_user($this->nickname, $this->password); @@ -179,64 +182,86 @@ class ApiOauthAuthorizeAction extends Action return; } } else { - $user = common_current_user(); - } + $user = common_current_user(); + } if ($this->arg('allow')) { - // mark the req token as authorized + // mark the req token as authorized $this->store->authorize_token($this->oauth_token); - // Check to see if there was a previous token associated - // with this user/app and kill it. If you're doing this you - // probably don't want any old tokens anyway. + // Check to see if there was a previous token associated + // with this user/app and kill it. If the user is doing this she + // probably doesn't want any old tokens anyway. - $appUser = Oauth_application_user::getByKeys($user, $this->app); + $appUser = Oauth_application_user::getByKeys($user, $this->app); - if (!empty($appUser)) { - $result = $appUser->delete(); + if (!empty($appUser)) { + $result = $appUser->delete(); - if (!$result) { - common_log_db_error($appUser, 'DELETE', __FILE__); - throw new ServerException(_('DB error deleting OAuth app user.')); - return; - } - } + if (!$result) { + common_log_db_error($appUser, 'DELETE', __FILE__); + throw new ServerException(_('DB error deleting OAuth app user.')); + return; + } + } - // associated the new req token with the user and the app + // associated the authorized req token with the user and the app - $appUser = new Oauth_application_user(); + $appUser = new Oauth_application_user(); - $appUser->profile_id = $user->id; - $appUser->application_id = $this->app->id; - $appUser->access_type = $this->app->access_type; - $appUser->token = $this->oauth_token; - $appUser->created = common_sql_now(); + $appUser->profile_id = $user->id; + $appUser->application_id = $this->app->id; - $result = $appUser->insert(); + // Note: do not copy the access type from the application. + // The access type should always be 0 when the OAuth app + // user record has a request token associated with it. + // Access type gets assigned once an access token has been + // granted. The OAuth app user record then gets updated + // with the new access token and access type. - if (!$result) { - common_log_db_error($appUser, 'INSERT', __FILE__); - throw new ServerException(_('DB error inserting OAuth app user.')); - return; - } + $appUser->token = $this->oauth_token; + $appUser->created = common_sql_now(); + + $result = $appUser->insert(); + + if (!$result) { + common_log_db_error($appUser, 'INSERT', __FILE__); + throw new ServerException(_('DB error inserting OAuth app user.')); + return; + } // if we have a callback redirect and provide the token + // A callback specified in the app setup overrides whatever + // is passed in with the request. + + common_debug("Req token is authorized - doing callback"); + + if (!empty($this->app->callback_url)) { + $this->callback = $this->app->callback_url; + } + if (!empty($this->callback)) { - // XXX: Need better way to build this redirect url. + // XXX: Need better way to build this redirect url. + + $target_url = $this->getCallback($this->callback, + array('oauth_token' => $this->oauth_token)); + + common_debug("Doing callback to $target_url"); - $target_url = $this->callback . '?oauth_token=' . $this->oauth_token; common_redirect($target_url, 303); + } else { + common_debug("callback was empty!"); } // otherwise inform the user that the rt was authorized $this->elementStart('p'); - // XXX: Do OAuth 1.0a verifier code? + // XXX: Do OAuth 1.0a verifier code $this->raw(sprintf(_("The request token %s has been authorized. " . 'Please exchange it for an access token.'), @@ -267,9 +292,9 @@ class ApiOauthAuthorizeAction extends Action function showScripts() { parent::showScripts(); - if (!common_logged_in()) { - $this->autofocus('nickname'); - } + if (!common_logged_in()) { + $this->autofocus('nickname'); + } } /** @@ -313,9 +338,9 @@ class ApiOauthAuthorizeAction extends Action function showContent() { $this->elementStart('form', array('method' => 'post', - 'id' => 'form_login', - 'class' => 'form_settings', - 'action' => common_local_url('apioauthauthorize'))); + 'id' => 'form_login', + 'class' => 'form_settings', + 'action' => common_local_url('apioauthauthorize'))); $this->hidden('token', common_session_token()); $this->hidden('oauth_token', $this->oauth_token); diff --git a/actions/apioauthrequesttoken.php b/actions/apioauthrequesttoken.php index 53aca6b96b..467640b9aa 100644 --- a/actions/apioauthrequesttoken.php +++ b/actions/apioauthrequesttoken.php @@ -31,7 +31,7 @@ if (!defined('STATUSNET')) { exit(1); } -require_once INSTALLDIR . '/lib/apioauthstore.php'; +require_once INSTALLDIR . '/lib/apioauth.php'; /** * Get an OAuth request token @@ -43,16 +43,28 @@ require_once INSTALLDIR . '/lib/apioauthstore.php'; * @link http://status.net/ */ -class ApiOauthRequestTokenAction extends Action +class ApiOauthRequestTokenAction extends ApiOauthAction { /** - * Is read only? + * Take arguments for running + * + * @param array $args $_REQUEST args + * + * @return boolean success flag * - * @return boolean false */ - function isReadOnly() + + function prepare($args) { - return false; + parent::prepare($args); + + $this->callback = $this->arg('oauth_callback'); + + if (!empty($this->callback)) { + common_debug("callback: $this->callback"); + } + + return true; } /** diff --git a/lib/apiauth.php b/lib/apiauth.php index 3229ab19fd..431f3ac4fd 100644 --- a/lib/apiauth.php +++ b/lib/apiauth.php @@ -39,7 +39,7 @@ if (!defined('STATUSNET')) { } require_once INSTALLDIR . '/lib/api.php'; -require_once INSTALLDIR . '/lib/apioauthstore.php'; +require_once INSTALLDIR . '/lib/apioauth.php'; /** * Actions extending this class will require auth @@ -71,14 +71,14 @@ class ApiAuthAction extends ApiAction if ($this->requiresAuth()) { - $this->consumer_key = $this->arg('oauth_consumer_key'); - $this->access_token = $this->arg('oauth_token'); + $this->consumer_key = $this->arg('oauth_consumer_key'); + $this->access_token = $this->arg('oauth_token'); - if (!empty($this->access_token)) { - $this->checkOAuthRequest(); - } else { - $this->checkBasicAuthUser(); - } + if (!empty($this->access_token)) { + $this->checkOAuthRequest(); + } else { + $this->checkBasicAuthUser(); + } } return true; @@ -86,101 +86,83 @@ class ApiAuthAction extends ApiAction function checkOAuthRequest() { - common_debug("We have an OAuth request."); + common_debug("We have an OAuth request."); - $datastore = new ApiStatusNetOAuthDataStore(); - $server = new OAuthServer($datastore); - $hmac_method = new OAuthSignatureMethod_HMAC_SHA1(); + $datastore = new ApiStatusNetOAuthDataStore(); + $server = new OAuthServer($datastore); + $hmac_method = new OAuthSignatureMethod_HMAC_SHA1(); - $server->add_signature_method($hmac_method); + $server->add_signature_method($hmac_method); - $this->cleanRequest(); + ApiOauthAction::cleanRequest(); - try { + try { - $req = OAuthRequest::from_request(); - $server->verify_request($req); + $req = OAuthRequest::from_request(); + $server->verify_request($req); - common_debug("Good OAuth request!"); + common_debug("Good OAuth request!"); - $app = Oauth_application::getByConsumerKey($this->consumer_key); + $app = Oauth_application::getByConsumerKey($this->consumer_key); - if (empty($app)) { + if (empty($app)) { - // this should really not happen - common_log(LOG_WARN, - "Couldn't find the OAuth app for consumer key: $this->consumer_key"); + // this should really not happen + common_log(LOG_WARN, + "Couldn't find the OAuth app for consumer key: $this->consumer_key"); - throw new OAuthException('No application for that consumer key.'); - } + throw new OAuthException('No application for that consumer key.'); + } - $appUser = Oauth_application_user::staticGet('token', - $this->access_token); + $appUser = Oauth_application_user::staticGet('token', + $this->access_token); - // XXX: check that app->id and appUser->application_id and consumer all - // match? + // XXX: check that app->id and appUser->application_id and consumer all + // match? - if (!empty($appUser)) { + if (!empty($appUser)) { - // read or read-write - $this->oauth_access_type = $appUser->access_type; + // read or read-write + $this->oauth_access_type = $appUser->access_type; - // If access_type == 0 we have either a request token - // or a bad / revoked access token + // If access_type == 0 we have either a request token + // or a bad / revoked access token - if ($this->oauth_access_type != 0) { + if ($this->oauth_access_type != 0) { - $this->auth_user = User::staticGet('id', $appUser->profile_id); + $this->auth_user = User::staticGet('id', $appUser->profile_id); - $msg = "API OAuth authentication for user '%s' (id: %d) on behalf of " . - "application '%s' (id: %d)."; + $msg = "API OAuth authentication for user '%s' (id: %d) on behalf of " . + "application '%s' (id: %d)."; - common_log(LOG_INFO, sprintf($msg, - $this->auth_user->nickname, - $this->auth_user->id, - $app->name, - $app->id)); - return true; - } else { - throw new OAuthException('Bad access token.'); - } - } else { + common_log(LOG_INFO, sprintf($msg, + $this->auth_user->nickname, + $this->auth_user->id, + $app->name, + $app->id)); + return true; + } else { + throw new OAuthException('Bad access token.'); + } + } else { - // also should not happen - throw new OAuthException('No user for that token.'); - } + // also should not happen + throw new OAuthException('No user for that token.'); + } - } catch (OAuthException $e) { - common_log(LOG_WARN, 'API OAuthException - ' . $e->getMessage()); - common_debug(var_export($req, true)); - $this->showOAuthError($e->getMessage()); - exit(); - } + } catch (OAuthException $e) { + common_log(LOG_WARN, 'API OAuthException - ' . $e->getMessage()); + common_debug(var_export($req, true)); + $this->showOAuthError($e->getMessage()); + exit(); + } } function showOAuthError($msg) { - header('HTTP/1.1 401 Unauthorized'); - header('Content-Type: text/html; charset=utf-8'); - print $msg . "\n"; - } - - function cleanRequest() - { - // kill evil effects of magical slashing - - if(get_magic_quotes_gpc() == 1) { - $_POST = array_map('stripslashes', $_POST); - $_GET = array_map('stripslashes', $_GET); - } - - // strip out the p param added in index.php - - // XXX: should we strip anything else? Or alternatively - // only allow a known list of params? - - unset($_GET['p']); - unset($_POST['p']); + header('HTTP/1.1 401 Unauthorized'); + header('Content-Type: text/html; charset=utf-8'); + print $msg . "\n"; } /** diff --git a/lib/apioauth.php b/lib/apioauth.php new file mode 100644 index 0000000000..4cb8a67754 --- /dev/null +++ b/lib/apioauth.php @@ -0,0 +1,122 @@ +. + * + * @category API + * @package StatusNet + * @author Zach Copley + * @copyright 2010 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET')) { + exit(1); +} + +require_once INSTALLDIR . '/lib/apioauthstore.php'; + +/** + * Base action for API OAuth enpoints. Clean up the + * the request, and possibly some other common things + * here. + * + * @category API + * @package StatusNet + * @author Zach Copley + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +class ApiOauthAction extends Action +{ + /** + * Is this a read-only action? + * + * @return boolean false + */ + + function isReadOnly($args) + { + return false; + } + + function prepare($args) + { + parent::prepare($args); + return true; + } + + /** + * Handle input, produce output + * + * Switches on request method; either shows the form or handles its input. + * + * @param array $args $_REQUEST data + * + * @return void + */ + + function handle($args) + { + parent::handle($args); + self::cleanRequest(); + } + + static function cleanRequest() + { + // kill evil effects of magical slashing + + if (get_magic_quotes_gpc() == 1) { + $_POST = array_map('stripslashes', $_POST); + $_GET = array_map('stripslashes', $_GET); + } + + // strip out the p param added in index.php + + // XXX: should we strip anything else? Or alternatively + // only allow a known list of params? + + unset($_GET['p']); + unset($_POST['p']); + } + + function getCallback($url, $params) + { + foreach ($params as $k => $v) { + $url = $this->appendQueryVar($url, + OAuthUtil::urlencode_rfc3986($k), + OAuthUtil::urlencode_rfc3986($v)); + } + + return $url; + } + + function appendQueryVar($url, $k, $v) { + $url = preg_replace('/(.*)(\?|&)' . $k . '=[^&]+?(&)(.*)/i', '$1$2$4', $url . '&'); + $url = substr($url, 0, -1); + if (strpos($url, '?') === false) { + return ($url . '?' . $k . '=' . $v); + } else { + return ($url . '&' . $k . '=' . $v); + } + } + +} diff --git a/lib/apioauthstore.php b/lib/apioauthstore.php index 290ce89730..c39ddbb0f3 100644 --- a/lib/apioauthstore.php +++ b/lib/apioauthstore.php @@ -40,44 +40,44 @@ class ApiStatusNetOAuthDataStore extends StatusNetOAuthDataStore { common_debug('new_access_token("'.$token->key.'","'.$consumer->key.'")', __FILE__); - $rt = new Token(); + $rt = new Token(); $rt->consumer_key = $consumer->key; $rt->tok = $token->key; $rt->type = 0; // request $app = Oauth_application::getByConsumerKey($consumer->key); - if (empty($app)) { - common_debug("empty app!"); - } + if (empty($app)) { + common_debug("empty app!"); + } - if ($rt->find(true) && $rt->state == 1) { // authorized + if ($rt->find(true) && $rt->state == 1) { // authorized common_debug('request token found.', __FILE__); - // find the associated user of the app + // find the associated user of the app - $appUser = new Oauth_application_user(); - $appUser->application_id = $app->id; - $appUser->token = $rt->tok; - $result = $appUser->find(true); + $appUser = new Oauth_application_user(); + $appUser->application_id = $app->id; + $appUser->token = $rt->tok; + $result = $appUser->find(true); - if (!empty($result)) { - common_debug("Oath app user found."); - } else { - common_debug("Oauth app user not found."); - return null; - } + if (!empty($result)) { + common_debug("Oath app user found."); + } else { + common_debug("Oauth app user not found."); + return null; + } - // go ahead and make the access token + // go ahead and make the access token - $at = new Token(); + $at = new Token(); $at->consumer_key = $consumer->key; $at->tok = common_good_rand(16); $at->secret = common_good_rand(16); $at->type = 1; // access $at->created = DB_DataObject_Cast::dateTime(); - if (!$at->insert()) { + if (!$at->insert()) { $e = $at->_lastError; common_debug('access token "'.$at->tok.'" not inserted: "'.$e->message.'"', __FILE__); return null; @@ -91,21 +91,30 @@ class ApiStatusNetOAuthDataStore extends StatusNetOAuthDataStore } common_debug('request token "'.$rt->tok.'" updated', __FILE__); - // update the token from req to access for the user + // update the token from req to access for the user - $orig = clone($appUser); - $appUser->token = $at->tok; - $result = $appUser->update($orig); + $orig = clone($appUser); + $appUser->token = $at->tok; - if (empty($result)) { - common_debug('couldn\'t update OAuth app user.'); - return null; - } + // It's at this point that we change the access type + // to whatever the application's access is. Request + // tokens should always have an access type of 0, and + // therefore be unuseable for making requests for + // protected resources. - // Okay, good + $appUser->access_type = $app->access_type; - return new OAuthToken($at->tok, $at->secret); - } + $result = $appUser->update($orig); + + if (empty($result)) { + common_debug('couldn\'t update OAuth app user.'); + return null; + } + + // Okay, good + + return new OAuthToken($at->tok, $at->secret); + } } else { return null; diff --git a/lib/router.php b/lib/router.php index 420f5a0a10..d6e448c2f9 100644 --- a/lib/router.php +++ b/lib/router.php @@ -50,8 +50,7 @@ class Router var $m = null; static $inst = null; static $bare = array('requesttoken', 'accesstoken', 'userauthorization', - 'postnotice', 'updateprofile', 'finishremotesubscribe', - 'apioauthrequesttoken', 'apioauthaccesstoken'); + 'postnotice', 'updateprofile', 'finishremotesubscribe'); static function get() { @@ -659,7 +658,13 @@ class Router 'id' => '[0-9]+') ); - $m->connect('oauth/authorize', + $m->connect('api/oauth/request_token', + array('action' => 'apioauthrequesttoken')); + + $m->connect('api/oauth/access_token', + array('action' => 'apioauthaccesstoken')); + + $m->connect('api/oauth/authorize', array('action' => 'apioauthauthorize')); foreach (array('subscriptions', 'subscribers') as $a) { From 693b16174ad4142d1a543f78878c84c552ce6d74 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Wed, 13 Jan 2010 05:31:48 +0000 Subject: [PATCH 059/134] Fix icon upload on new apps --- actions/newapplication.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/actions/newapplication.php b/actions/newapplication.php index 3d42b657be..7bb81095dd 100644 --- a/actions/newapplication.php +++ b/actions/newapplication.php @@ -266,7 +266,7 @@ class NewApplicationAction extends OwnerDesignAction $app->query('ROLLBACK'); } - $this->app->uploadLogo(); + $app->uploadLogo(); $app->query('COMMIT'); From e101a6df6ba1cbec4664bb81fc81655e5db18b0f Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Wed, 13 Jan 2010 07:33:51 +0000 Subject: [PATCH 060/134] Rework application registration workflow to be more private --- actions/editapplication.php | 8 +-- actions/newapplication.php | 8 +-- actions/{apps.php => oauthappssettings.php} | 10 +--- actions/oauthconnectionssettings.php | 2 +- actions/showapplication.php | 25 +++------ lib/applicationeditform.php | 61 ++++++++++----------- lib/applicationlist.php | 13 ++--- lib/router.php | 23 +++----- 8 files changed, 58 insertions(+), 92 deletions(-) rename actions/{apps.php => oauthappssettings.php} (94%) diff --git a/actions/editapplication.php b/actions/editapplication.php index a0ed3117a7..a6db87c61e 100644 --- a/actions/editapplication.php +++ b/actions/editapplication.php @@ -125,10 +125,7 @@ class EditApplicationAction extends OwnerDesignAction if ($this->arg('cancel')) { common_redirect(common_local_url('showapplication', - array( - 'nickname' => $cur->nickname, - 'id' => $this->app->id) - ), 303); + array('id' => $this->app->id)), 303); } elseif ($this->arg('save')) { $this->trySave(); } else { @@ -253,8 +250,7 @@ class EditApplicationAction extends OwnerDesignAction $this->app->uploadLogo(); - common_redirect(common_local_url('apps', - array('nickname' => $cur->nickname)), 303); + common_redirect(common_local_url('oauthappssettings'), 303); } } diff --git a/actions/newapplication.php b/actions/newapplication.php index 7bb81095dd..c499fe7c76 100644 --- a/actions/newapplication.php +++ b/actions/newapplication.php @@ -114,8 +114,7 @@ class NewApplicationAction extends OwnerDesignAction $cur = common_current_user(); if ($this->arg('cancel')) { - common_redirect(common_local_url('apps', - array('nickname' => $cur->nickname)), 303); + common_redirect(common_local_url('oauthappssettings'), 303); } elseif ($this->arg('save')) { $this->trySave(); } else { @@ -147,7 +146,7 @@ class NewApplicationAction extends OwnerDesignAction function trySave() { - $name = $this->trimmed('name'); + $name = $this->trimmed('name'); $description = $this->trimmed('description'); $source_url = $this->trimmed('source_url'); $organization = $this->trimmed('organization'); @@ -270,8 +269,7 @@ class NewApplicationAction extends OwnerDesignAction $app->query('COMMIT'); - common_redirect(common_local_url('apps', - array('nickname' => $cur->nickname)), 303); + common_redirect(common_local_url('oauthappssettings'), 303); } diff --git a/actions/apps.php b/actions/oauthappssettings.php similarity index 94% rename from actions/apps.php rename to actions/oauthappssettings.php index 7c7b24570f..6c0670b17b 100644 --- a/actions/apps.php +++ b/actions/oauthappssettings.php @@ -46,7 +46,7 @@ require_once INSTALLDIR . '/lib/applicationlist.php'; * @see SettingsAction */ -class AppsAction extends SettingsAction +class OauthappssettingsAction extends SettingsAction { var $page = 0; @@ -116,10 +116,7 @@ class AppsAction extends SettingsAction $this->elementStart('p', array('id' => 'application_register')); $this->element('a', - array('href' => common_local_url( - 'newapplication', - array('nickname' => $user->nickname) - ), + array('href' => common_local_url('newapplication'), 'class' => 'more' ), 'Register a new application'); @@ -129,8 +126,7 @@ class AppsAction extends SettingsAction $this->page > 1, $cnt > APPS_PER_PAGE, $this->page, - 'apps', - array('nickname' => $user->nickname) + 'oauthappssettings' ); } diff --git a/actions/oauthconnectionssettings.php b/actions/oauthconnectionssettings.php index 56e7b02fba..99bb9022b2 100644 --- a/actions/oauthconnectionssettings.php +++ b/actions/oauthconnectionssettings.php @@ -158,7 +158,7 @@ class OauthconnectionssettingsAction extends ConnectSettingsAction $this->elementStart('p'); $this->raw(_('Developers can edit the registration settings for their applications ')); $this->element('a', - array('href' => common_local_url('apps', array('nickname' => $cur->nickname))), + array('href' => common_local_url('oauthappssettings')), 'here.'); $this->elementEnd('p'); } diff --git a/actions/showapplication.php b/actions/showapplication.php index f2ff8b9002..bd33371368 100644 --- a/actions/showapplication.php +++ b/actions/showapplication.php @@ -211,15 +211,9 @@ class ShowApplicationAction extends OwnerDesignAction $this->elementStart('ul'); $this->elementStart('li', 'entity_edit'); $this->element('a', - array('href' => - common_local_url( - 'editapplication', - array( - 'nickname' => $this->owner->nickname, - 'id' => $this->application->id - ) - ) - ), 'Edit'); + array('href' => common_local_url('editapplication', + array('id' => $this->application->id))), + 'Edit'); $this->elementEnd('li'); $this->elementStart('li', 'entity_reset_keysecret'); @@ -228,8 +222,7 @@ class ShowApplicationAction extends OwnerDesignAction 'class' => 'form_reset_key', 'method' => 'POST', 'action' => common_local_url('showapplication', - array('nickname' => $cur->nickname, - 'id' => $this->application->id)))); + array('id' => $this->application->id)))); $this->elementStart('fieldset'); $this->hidden('token', common_session_token()); @@ -273,13 +266,9 @@ class ShowApplicationAction extends OwnerDesignAction $this->elementStart('p', array('id' => 'application_action')); $this->element('a', - array( - 'href' => common_local_url( - 'apps', - array('nickname' => $this->owner->nickname)), - 'class' => 'more' - ), - 'View your applications'); + array('href' => common_local_url('oauthappssettings'), + 'class' => 'more'), + 'View your applications'); $this->elementEnd('p'); } diff --git a/lib/applicationeditform.php b/lib/applicationeditform.php index e9ab467804..040d3bf74b 100644 --- a/lib/applicationeditform.php +++ b/lib/applicationeditform.php @@ -119,12 +119,9 @@ class ApplicationEditForm extends Form if (!empty($this->application)) { return common_local_url('editapplication', - array('id' => $this->application->id, - 'nickname' => $cur->nickname) - ); + array('id' => $this->application->id)); } else { - return common_local_url('newapplication', - array('nickname' => $cur->nickname)); + return common_local_url('newapplication'); } } @@ -149,7 +146,7 @@ class ApplicationEditForm extends Form { if ($this->application) { $id = $this->application->id; - $icon = $this->application->icon; + $icon = $this->application->icon; $name = $this->application->name; $description = $this->application->description; $source_url = $this->application->source_url; @@ -160,7 +157,7 @@ class ApplicationEditForm extends Form $this->access_type = $this->application->access_type; } else { $id = ''; - $icon = ''; + $icon = ''; $name = ''; $description = ''; $source_url = ''; @@ -171,26 +168,26 @@ class ApplicationEditForm extends Form $this->access_type = ''; } - $this->out->hidden('token', common_session_token()); + $this->out->hidden('token', common_session_token()); $this->out->elementStart('ul', 'form_data'); - $this->out->elementStart('li', array('id' => 'application_icon')); + $this->out->elementStart('li', array('id' => 'application_icon')); - if (!empty($icon)) { - $this->out->element('img', array('src' => $icon)); - } + if (!empty($icon)) { + $this->out->element('img', array('src' => $icon)); + } - $this->out->element('label', array('for' => 'app_icon'), - _('Icon')); + $this->out->element('label', array('for' => 'app_icon'), + _('Icon')); $this->out->element('input', array('name' => 'app_icon', - 'type' => 'file', - 'id' => 'app_icon')); + 'type' => 'file', + 'id' => 'app_icon')); $this->out->element('p', 'form_guide', _('Icon for this application')); $this->out->element('input', array('name' => 'MAX_FILE_SIZE', - 'type' => 'hidden', - 'id' => 'MAX_FILE_SIZE', - 'value' => ImageFile::maxFileSizeInt())); + 'type' => 'hidden', + 'id' => 'MAX_FILE_SIZE', + 'value' => ImageFile::maxFileSizeInt())); $this->out->elementEnd('li'); $this->out->elementStart('li'); @@ -207,13 +204,13 @@ class ApplicationEditForm extends Form $maxDesc = Oauth_application::maxDesc(); if ($maxDesc > 0) { $descInstr = sprintf(_('Describe your application in %d chars'), - $maxDesc); + $maxDesc); } else { $descInstr = _('Describe your application'); } $this->out->textarea('description', _('Description'), ($this->out->arg('description')) ? $this->out->arg('description') : $description, - $descInstr); + $descInstr); $this->out->elementEnd('li'); @@ -259,8 +256,8 @@ class ApplicationEditForm extends Form $this->out->element('input', $attrs); $this->out->element('label', array('for' => 'app_type-browser', - 'class' => 'radio'), - _('Browser')); + 'class' => 'radio'), + _('Browser')); $attrs = array('name' => 'app_type', 'type' => 'radio', @@ -275,8 +272,8 @@ class ApplicationEditForm extends Form $this->out->element('input', $attrs); $this->out->element('label', array('for' => 'app_type-desktop', - 'class' => 'radio'), - _('Desktop')); + 'class' => 'radio'), + _('Desktop')); $this->out->element('p', 'form_guide', _('Type of application, browser or desktop')); $this->out->elementEnd('li'); @@ -298,8 +295,8 @@ class ApplicationEditForm extends Form $this->out->element('input', $attrs); $this->out->element('label', array('for' => 'default_access_type-ro', - 'class' => 'radio'), - _('Read-only')); + 'class' => 'radio'), + _('Read-only')); $attrs = array('name' => 'default_access_type', 'type' => 'radio', @@ -309,15 +306,15 @@ class ApplicationEditForm extends Form if ($this->application->access_type & Oauth_application::$readAccess && $this->application->access_type & Oauth_application::$writeAccess - ) { + ) { $attrs['checked'] = 'checked'; } $this->out->element('input', $attrs); $this->out->element('label', array('for' => 'default_access_type-rw', - 'class' => 'radio'), - _('Read-write')); + 'class' => 'radio'), + _('Read-write')); $this->out->element('p', 'form_guide', _('Default access for this application: read-only, or read-write')); $this->out->elementEnd('li'); @@ -334,8 +331,8 @@ class ApplicationEditForm extends Form function formActions() { $this->out->submit('cancel', _('Cancel'), 'submit form_action-primary', - 'cancel', _('Cancel')); + 'cancel', _('Cancel')); $this->out->submit('save', _('Save'), 'submit form_action-secondary', - 'save', _('Save')); + 'save', _('Save')); } } diff --git a/lib/applicationlist.php b/lib/applicationlist.php index 15c2d588a3..f2eaefb401 100644 --- a/lib/applicationlist.php +++ b/lib/applicationlist.php @@ -64,7 +64,7 @@ class ApplicationList extends Widget $this->application = $application; $this->owner = $owner; $this->action = $action; - $this->connections = $connections; + $this->connections = $connections; } function show() @@ -97,10 +97,9 @@ class ApplicationList extends Widget $this->out->elementStart('span', 'vcard author'); if (!$this->connections) { $this->out->elementStart('a', - array('href' => common_local_url('showapplication', - array('nickname' => $user->nickname, - 'id' => $this->application->id)), - 'class' => 'url')); + array('href' => common_local_url('showapplication', + array('id' => $this->application->id)), + 'class' => 'url')); } else { $this->out->elementStart('a', array('href' => $this->application->source_url, @@ -154,8 +153,4 @@ class ApplicationList extends Widget return; } - function highlight($text) - { - return htmlspecialchars($text); - } } diff --git a/lib/router.php b/lib/router.php index d6e448c2f9..42bff27788 100644 --- a/lib/router.php +++ b/lib/router.php @@ -141,7 +141,7 @@ class Router // settings foreach (array('profile', 'avatar', 'password', 'im', 'oauthconnections', - 'email', 'sms', 'userdesign', 'other') as $s) { + 'oauthapps', 'email', 'sms', 'userdesign', 'other') as $s) { $m->connect('settings/'.$s, array('action' => $s.'settings')); } @@ -634,28 +634,23 @@ class Router // user stuff foreach (array('subscriptions', 'subscribers', - 'nudge', 'all', 'foaf', 'xrds', 'apps', + 'nudge', 'all', 'foaf', 'xrds', 'replies', 'inbox', 'outbox', 'microsummary') as $a) { $m->connect(':nickname/'.$a, array('action' => $a), array('nickname' => '[a-zA-Z0-9]{1,64}')); } - $m->connect(':nickname/apps', - array('action' => 'apps'), - array('nickname' => '['.NICKNAME_FMT.']{1,64}')); - $m->connect(':nickname/apps/show/:id', + $m->connect('settings/oauthapps/show/:id', array('action' => 'showapplication'), - array('nickname' => '['.NICKNAME_FMT.']{1,64}', - 'id' => '[0-9]+') + array('id' => '[0-9]+') ); - $m->connect(':nickname/apps/new', - array('action' => 'newapplication'), - array('nickname' => '['.NICKNAME_FMT.']{1,64}')); - $m->connect(':nickname/apps/edit/:id', + $m->connect('settings/oauthapps/new', + array('action' => 'newapplication') + ); + $m->connect('settings/oauthapps/edit/:id', array('action' => 'editapplication'), - array('nickname' => '['.NICKNAME_FMT.']{1,64}', - 'id' => '[0-9]+') + array('id' => '[0-9]+') ); $m->connect('api/oauth/request_token', From c0eee277d1058c9c291b3c4474cc8a72cb8c6d0e Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Wed, 13 Jan 2010 11:31:15 +0000 Subject: [PATCH 061/134] Make sure applications are really looked up by consumer key --- actions/apioauthauthorize.php | 42 +++-------------------------------- lib/apioauthstore.php | 40 ++++++++++++++++++++++++++++++++- 2 files changed, 42 insertions(+), 40 deletions(-) diff --git a/actions/apioauthauthorize.php b/actions/apioauthauthorize.php index cdf9cb7df3..0966ba1d71 100644 --- a/actions/apioauthauthorize.php +++ b/actions/apioauthauthorize.php @@ -74,42 +74,11 @@ class ApiOauthAuthorizeAction extends ApiOauthAction $this->oauth_token = $this->arg('oauth_token'); $this->callback = $this->arg('oauth_callback'); $this->store = new ApiStatusNetOAuthDataStore(); + $this->app = $this->store->getAppByRequestToken($this->oauth_token); return true; } - function getApp() - { - // Look up the full req token - - $req_token = $this->store->lookup_token(null, - 'request', - $this->oauth_token); - - if (empty($req_token)) { - - common_debug("Couldn't find request token!"); - - $this->clientError(_('Bad request.')); - return; - } - - // Look up the app - - $app = new Oauth_application(); - $app->consumer_key = $req_token->consumer_key; - $result = $app->find(true); - - if (!empty($result)) { - $this->app = $app; - return true; - - } else { - common_debug("couldn't find the app!"); - return false; - } - } - /** * Handle input, produce output * @@ -140,7 +109,8 @@ class ApiOauthAuthorizeAction extends ApiOauthAction return; } - if (!$this->getApp()) { + if (empty($this->app)) { + common_debug('No app for that token.'); $this->clientError(_('Bad request.')); return; } @@ -166,11 +136,6 @@ class ApiOauthAuthorizeAction extends ApiOauthAction return; } - if (!$this->getApp()) { - $this->clientError(_('Bad request.')); - return; - } - // check creds $user = null; @@ -416,7 +381,6 @@ class ApiOauthAuthorizeAction extends ApiOauthAction function getInstructions() { return _('Allow or deny access to your account information.'); - } /** diff --git a/lib/apioauthstore.php b/lib/apioauthstore.php index c39ddbb0f3..32110d0575 100644 --- a/lib/apioauthstore.php +++ b/lib/apioauthstore.php @@ -36,6 +36,44 @@ class ApiStatusNetOAuthDataStore extends StatusNetOAuthDataStore $con->consumer_secret); } + function getAppByRequestToken($token_key) + { + // Look up the full req tokenx + + $req_token = $this->lookup_token(null, + 'request', + $token_key); + + if (empty($req_token)) { + common_debug("couldn't get request token from oauth datastore"); + return null; + } + + // Look up the full Token + + $token = new Token(); + $token->tok = $req_token->key; + $result = $token->find(true); + + if (empty($result)) { + common_debug('Couldn\'t find req token in the token table.'); + return null; + } + + // Look up the app + + $app = new Oauth_application(); + $app->consumer_key = $token->consumer_key; + $result = $app->find(true); + + if (!empty($result)) { + return $app; + } else { + common_debug("Couldn't find the app!"); + return null; + } + } + function new_access_token($token, $consumer) { common_debug('new_access_token("'.$token->key.'","'.$consumer->key.'")', __FILE__); @@ -64,7 +102,7 @@ class ApiStatusNetOAuthDataStore extends StatusNetOAuthDataStore if (!empty($result)) { common_debug("Oath app user found."); } else { - common_debug("Oauth app user not found."); + common_debug("Oauth app user not found. app id $app->id token $rt->tok"); return null; } From ba68e042a8acb9dd1054e0bc1c5cd4dfd415642e Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Wed, 13 Jan 2010 17:52:25 +0000 Subject: [PATCH 062/134] Fix user count --- actions/showapplication.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/actions/showapplication.php b/actions/showapplication.php index bd33371368..b21b994aa2 100644 --- a/actions/showapplication.php +++ b/actions/showapplication.php @@ -194,10 +194,13 @@ class ShowApplicationAction extends OwnerDesignAction $defaultAccess = ($this->application->access_type & Oauth_application::$writeAccess) ? 'read-write' : 'read-only'; $profile = Profile::staticGet($this->application->owner); - $userCnt = 0; // XXX: count how many users use the app + + $appUsers = new Oauth_application_user(); + $appUsers->application_id = $this->application->id; + $userCnt = $appUsers->count(); $this->raw(sprintf( - _('Created by %1$s - %2$s access by default - %3$d users.'), + _('created by %1$s - %2$s access by default - %3$d users'), $profile->getBestName(), $defaultAccess, $userCnt @@ -222,7 +225,7 @@ class ShowApplicationAction extends OwnerDesignAction 'class' => 'form_reset_key', 'method' => 'POST', 'action' => common_local_url('showapplication', - array('id' => $this->application->id)))); + array('id' => $this->application->id)))); $this->elementStart('fieldset'); $this->hidden('token', common_session_token()); From 7b3c099f953c1569c18d81fdb8d4230e927d429e Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Wed, 13 Jan 2010 18:20:03 +0000 Subject: [PATCH 063/134] Ensure only the application's owner can edit it --- actions/editapplication.php | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/actions/editapplication.php b/actions/editapplication.php index a6db87c61e..9cc3e3cead 100644 --- a/actions/editapplication.php +++ b/actions/editapplication.php @@ -45,9 +45,9 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { class EditApplicationAction extends OwnerDesignAction { - var $msg = null; - - var $app = null; + var $msg = null; + var $owner = null; + var $app = null; function title() { @@ -68,7 +68,14 @@ class EditApplicationAction extends OwnerDesignAction } $id = (int)$this->arg('id'); - $this->app = Oauth_application::staticGet($id); + + $this->app = Oauth_application::staticGet($id); + $this->owner = User::staticGet($this->app->owner); + $cur = common_current_user(); + + if ($cur->id != $this->owner->id) { + $this->clientError(_('You are not the owner of this application.'), 401); + } if (!$this->app) { $this->clientError(_('No such application.')); From cff2cfd7a7566542ce860410e7ef006a84869c7e Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Wed, 13 Jan 2010 18:33:13 +0000 Subject: [PATCH 064/134] Fix approval date and label on apps list --- lib/applicationlist.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/applicationlist.php b/lib/applicationlist.php index f2eaefb401..6eae261353 100644 --- a/lib/applicationlist.php +++ b/lib/applicationlist.php @@ -136,8 +136,8 @@ class ApplicationList extends Widget $access = ($this->application->access_type & Oauth_application::$writeAccess) ? 'read-write' : 'read-only'; - $txt = 'Approved ' . common_exact_date($appUser->modified) . - " $access for access."; + $txt = 'Approved ' . common_date_string($appUser->modified) . + " - $access access."; $this->out->raw($txt); $this->out->elementEnd('li'); From 6d58ef4abb12d735b6be777ea79f99a07c68694a Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Wed, 13 Jan 2010 20:10:09 +0000 Subject: [PATCH 065/134] Updated apioauthauthorize markup and styles --- actions/apioauthauthorize.php | 46 +++++++++-------------------------- theme/base/css/display.css | 10 ++++++-- 2 files changed, 20 insertions(+), 36 deletions(-) diff --git a/actions/apioauthauthorize.php b/actions/apioauthauthorize.php index 0966ba1d71..72d1426511 100644 --- a/actions/apioauthauthorize.php +++ b/actions/apioauthauthorize.php @@ -273,27 +273,6 @@ class ApiOauthAuthorizeAction extends ApiOauthAction return _('An application would like to connect to your account'); } - /** - * Show page notice - * - * Display a notice for how to use the page, or the - * error if it exists. - * - * @return void - */ - - function showPageNotice() - { - if ($this->error) { - $this->element('p', 'error', $this->error); - } else { - $instr = $this->getInstructions(); - $output = common_markup_to_html($instr); - - $this->raw($output); - } - } - /** * Shows the authorization form. * @@ -303,40 +282,38 @@ class ApiOauthAuthorizeAction extends ApiOauthAction function showContent() { $this->elementStart('form', array('method' => 'post', - 'id' => 'form_login', + 'id' => 'form_apioauthauthorize', 'class' => 'form_settings', 'action' => common_local_url('apioauthauthorize'))); + $this->elementStart('fieldset'); + $this->element('legend', array('id' => 'apioauthauthorize_allowdeny'), + _('Allow or deny access')); $this->hidden('token', common_session_token()); $this->hidden('oauth_token', $this->oauth_token); $this->hidden('oauth_callback', $this->callback); - $this->elementStart('fieldset'); - - $this->elementStart('ul'); + $this->elementStart('ul', 'form_data'); $this->elementStart('li'); + $this->elementStart('p'); if (!empty($this->app->icon)) { $this->element('img', array('src' => $this->app->icon)); } - $this->elementEnd('li'); - $this->elementStart('li'); $access = ($this->app->access_type & Oauth_application::$writeAccess) ? 'access and update' : 'access'; - $msg = _("The application %s by %s would like " . - "the ability to %s your account data."); + $msg = _("The application %s by %s would like " . + "the ability to %s your account data."); $this->raw(sprintf($msg, $this->app->name, $this->app->organization, $access)); - + $this->elementEnd('p'); $this->elementEnd('li'); $this->elementEnd('ul'); - $this->elementEnd('fieldset'); - if (!common_logged_in()) { $this->elementStart('fieldset'); @@ -355,17 +332,18 @@ class ApiOauthAuthorizeAction extends ApiOauthAction } $this->element('input', array('id' => 'deny_submit', - 'class' => 'submit', + 'class' => 'submit submit form_action-primary', 'name' => 'deny', 'type' => 'submit', 'value' => _('Deny'))); $this->element('input', array('id' => 'allow_submit', - 'class' => 'submit', + 'class' => 'submit submit form_action-secondary', 'name' => 'allow', 'type' => 'submit', 'value' => _('Allow'))); + $this->elementEnd('fieldset'); $this->elementEnd('form'); } diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 82670c964a..ff81d37273 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -177,7 +177,8 @@ font-weight:bold; #form_password_recover legend, #form_password_change legend, .form_entity_block legend, -#form_filter_bytag legend { +#form_filter_bytag legend, +#apioauthauthorize_allowdeny { display:none; } @@ -906,10 +907,15 @@ list-style-type:none; } .application img, #showapplication .entity_profile img, -#editapplication .form_data #application_icon img { +#editapplication .form_data #application_icon, +#apioauthauthorize .form_data img { max-width:96px; max-height:96px; } +#apioauthauthorize .form_data img { +margin-right:18px; +float:left; +} #showapplication .entity_profile { width:68%; } From dbcbc2fe7ff0368910a49ed5675b0edc1e2bf18d Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Wed, 13 Jan 2010 20:43:23 +0000 Subject: [PATCH 066/134] Changed legend text from Login to Account because it is not really logging iny --- actions/apioauthauthorize.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/actions/apioauthauthorize.php b/actions/apioauthauthorize.php index 72d1426511..fa074c4e76 100644 --- a/actions/apioauthauthorize.php +++ b/actions/apioauthauthorize.php @@ -317,7 +317,7 @@ class ApiOauthAuthorizeAction extends ApiOauthAction if (!common_logged_in()) { $this->elementStart('fieldset'); - $this->element('legend', null, _('Login')); + $this->element('legend', null, _('Account')); $this->elementStart('ul', 'form_data'); $this->elementStart('li'); $this->input('nickname', _('Nickname')); From 9e7f47652d860d7f1e296dd369c4e68814bf2636 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Wed, 13 Jan 2010 21:11:08 +0000 Subject: [PATCH 067/134] Revoke access token UI --- actions/oauthconnectionssettings.php | 62 ++++++++++++++++++++++++---- actions/showapplication.php | 1 + classes/Oauth_application_user.php | 2 +- classes/Profile.php | 3 +- lib/applicationlist.php | 14 ++++++- 5 files changed, 71 insertions(+), 11 deletions(-) diff --git a/actions/oauthconnectionssettings.php b/actions/oauthconnectionssettings.php index 99bb9022b2..b17729b821 100644 --- a/actions/oauthconnectionssettings.php +++ b/actions/oauthconnectionssettings.php @@ -50,10 +50,12 @@ class OauthconnectionssettingsAction extends ConnectSettingsAction { var $page = null; + var $id = null; function prepare($args) { parent::prepare($args); + $this->id = (int)$this->arg('id'); $this->page = ($this->arg('page')) ? ($this->arg('page') + 0) : 1; return true; } @@ -101,16 +103,16 @@ class OauthconnectionssettingsAction extends ConnectSettingsAction $application = $profile->getApplications($offset, $limit); - $cnt == 0; + $cnt == 0; - if (!empty($application)) { - $al = new ApplicationList($application, $user, $this, true); - $cnt = $al->show(); - } + if (!empty($application)) { + $al = new ApplicationList($application, $user, $this, true); + $cnt = $al->show(); + } - if ($cnt == 0) { - $this->showEmptyListMessage(); - } + if ($cnt == 0) { + $this->showEmptyListMessage(); + } $this->pagination($this->page > 1, $cnt > APPS_PER_PAGE, $this->page, 'connectionssettings', @@ -139,6 +141,50 @@ class OauthconnectionssettingsAction extends ConnectSettingsAction return; } + if ($this->arg('revoke')) { + $this->revokeAccess($this->id); + + // XXX: Show some indicator to the user of what's been done. + + $this->showPage(); + } else { + $this->clientError(_('Unexpected form submission.'), 401); + return false; + } + } + + function revokeAccess($appId) + { + $cur = common_current_user(); + + $app = Oauth_application::staticGet('id', $appId); + + if (empty($app)) { + $this->clientError(_('No such application.'), 404); + return false; + } + + $appUser = Oauth_application_user::getByKeys($cur, $app); + + if (empty($appUser)) { + $this->clientError(_('You are not a user of that application.'), 401); + return false; + } + + $orig = clone($appUser); + $appUser->access_type = 0; // No access + $result = $appUser->update(); + + if (!$result) { + common_log_db_error($orig, 'UPDATE', __FILE__); + $this->clientError(_('Unable to revoke access for app: ' . $app->id)); + return false; + } + + $msg = 'User %s (id: %d) revoked access to app %s (id: %d)'; + common_log(LOG_INFO, sprintf($msg, $cur->nickname, + $cur->id, $app->name, $app->id)); + } function showEmptyListMessage() diff --git a/actions/showapplication.php b/actions/showapplication.php index b21b994aa2..049206375d 100644 --- a/actions/showapplication.php +++ b/actions/showapplication.php @@ -92,6 +92,7 @@ class ShowApplicationAction extends OwnerDesignAction if ($cur->id != $this->owner->id) { $this->clientError(_('You are not the owner of this application.'), 401); + return false; } return true; diff --git a/classes/Oauth_application_user.php b/classes/Oauth_application_user.php index a05371f563..618d68133c 100644 --- a/classes/Oauth_application_user.php +++ b/classes/Oauth_application_user.php @@ -34,7 +34,7 @@ class Oauth_application_user extends Memcached_DataObject $oau = new Oauth_application_user(); $oau->profile_id = $user->id; - $oau->application_id = $app->id; + $oau->application_id = $app->id; $oau->limit(1); $result = $oau->find(true); diff --git a/classes/Profile.php b/classes/Profile.php index fef2a21710..1076fb2cb3 100644 --- a/classes/Profile.php +++ b/classes/Profile.php @@ -358,7 +358,8 @@ class Profile extends Memcached_DataObject 'SELECT a.* ' . 'FROM oauth_application_user u, oauth_application a ' . 'WHERE u.profile_id = %d ' . - 'AND a.id = u.application_id ' . + 'AND a.id = u.application_id ' . + 'AND u.access_type > 0 ' . 'ORDER BY u.created DESC '; if ($offset > 0) { diff --git a/lib/applicationlist.php b/lib/applicationlist.php index 6eae261353..3abb1f8aa7 100644 --- a/lib/applicationlist.php +++ b/lib/applicationlist.php @@ -142,7 +142,19 @@ class ApplicationList extends Widget $this->out->raw($txt); $this->out->elementEnd('li'); - // XXX: Add revoke access button + $this->out->elementStart('li', 'entity_revoke'); + $this->out->elementStart('form', array('id' => 'form_revoke_app', + 'class' => 'form_revoke_app', + 'method' => 'POST', + 'action' => + common_local_url('oauthconnectionssettings'))); + $this->out->elementStart('fieldset'); + $this->out->hidden('id', $this->application->id); + $this->out->hidden('token', common_session_token()); + $this->out->submit('revoke', _('Revoke')); + $this->out->elementEnd('fieldset'); + $this->out->elementEnd('form'); + $this->out->elementEnd('li'); } } From d33040089d660d897183df8e94c2a65bb8c8c85f Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Wed, 13 Jan 2010 21:14:22 +0000 Subject: [PATCH 068/134] Remove verifier from Oauth_application_user (not needed there) --- classes/Oauth_application_user.php | 1 - classes/statusnet.ini | 1 - db/statusnet.sql | 1 - 3 files changed, 3 deletions(-) diff --git a/classes/Oauth_application_user.php b/classes/Oauth_application_user.php index 618d68133c..57986281f9 100644 --- a/classes/Oauth_application_user.php +++ b/classes/Oauth_application_user.php @@ -14,7 +14,6 @@ class Oauth_application_user extends Memcached_DataObject public $application_id; // int(4) primary_key not_null public $access_type; // tinyint(1) public $token; // varchar(255) - public $verifier; // varchar(255) public $created; // datetime not_null public $modified; // timestamp not_null default_CURRENT_TIMESTAMP diff --git a/classes/statusnet.ini b/classes/statusnet.ini index b358bbf60a..2b5f2c225b 100644 --- a/classes/statusnet.ini +++ b/classes/statusnet.ini @@ -373,7 +373,6 @@ profile_id = 129 application_id = 129 access_type = 17 token = 2 -verifier = 2 created = 142 modified = 384 diff --git a/db/statusnet.sql b/db/statusnet.sql index b1867e7f04..3a74f9d7a0 100644 --- a/db/statusnet.sql +++ b/db/statusnet.sql @@ -230,7 +230,6 @@ create table oauth_application_user ( application_id integer not null comment 'id of the application' references oauth_application (id), access_type tinyint default 0 comment 'access type, bit 1 = read, bit 2 = write, bit 3 = revoked', token varchar(255) comment 'request or access token', - verifier varchar(255) not null comment 'verification code', created datetime not null comment 'date this record was created', modified timestamp comment 'date this record was modified', constraint primary key (profile_id, application_id) From 6efbf2777ac1ba934829a8e9ae381ca280621c0c Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Wed, 13 Jan 2010 21:31:19 +0000 Subject: [PATCH 069/134] Add verifier and verified callback to token for OAuth 1.0a --- classes/Token.php | 6 ++++-- classes/statusnet.ini | 2 ++ db/statusnet.sql | 2 ++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/classes/Token.php b/classes/Token.php index 1fabd72f13..a129d1fd11 100644 --- a/classes/Token.php +++ b/classes/Token.php @@ -4,7 +4,7 @@ */ require_once INSTALLDIR.'/classes/Memcached_DataObject.php'; -class Token extends Memcached_DataObject +class Token extends Memcached_DataObject { ###START_AUTOCODE /* the code below is auto generated do not remove the above tag */ @@ -14,7 +14,9 @@ class Token extends Memcached_DataObject public $tok; // char(32) primary_key not_null public $secret; // char(32) not_null public $type; // tinyint(1) not_null - public $state; // tinyint(1) + public $state; // tinyint(1) + public $verifier; // varchar(255) + public $verified_callback; // varchar(255) public $created; // datetime() not_null public $modified; // timestamp() not_null default_CURRENT_TIMESTAMP diff --git a/classes/statusnet.ini b/classes/statusnet.ini index 2b5f2c225b..6203650a69 100644 --- a/classes/statusnet.ini +++ b/classes/statusnet.ini @@ -516,6 +516,8 @@ tok = 130 secret = 130 type = 145 state = 17 +verifier = 2 +verified_callback = 2 created = 142 modified = 384 diff --git a/db/statusnet.sql b/db/statusnet.sql index 3a74f9d7a0..17de4fd0d4 100644 --- a/db/statusnet.sql +++ b/db/statusnet.sql @@ -189,6 +189,8 @@ create table token ( secret char(32) not null comment 'secret value', type tinyint not null default 0 comment 'request or access', state tinyint default 0 comment 'for requests, 0 = initial, 1 = authorized, 2 = used', + verifier varchar(255) comment 'verifier string for OAuth 1.0a', + verified_callback varchar(255) comment 'verified callback URL for OAuth 1.0a', created datetime not null comment 'date this record was created', modified timestamp comment 'date this record was modified', From de70b91a3a42b07c86d3a0cd8868ded6510fd91c Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Wed, 13 Jan 2010 16:52:33 -0800 Subject: [PATCH 070/134] Some rough test scripts for poking at the OAuth system --- tests/oauth/README | 22 +++++++ tests/oauth/exchangetokens.php | 105 ++++++++++++++++++++++++++++++++ tests/oauth/getrequesttoken.php | 71 +++++++++++++++++++++ tests/oauth/oauth.ini | 10 +++ tests/oauth/verifycreds.php | 101 ++++++++++++++++++++++++++++++ 5 files changed, 309 insertions(+) create mode 100644 tests/oauth/README create mode 100755 tests/oauth/exchangetokens.php create mode 100755 tests/oauth/getrequesttoken.php create mode 100644 tests/oauth/oauth.ini create mode 100755 tests/oauth/verifycreds.php diff --git a/tests/oauth/README b/tests/oauth/README new file mode 100644 index 0000000000..ea4aabadbe --- /dev/null +++ b/tests/oauth/README @@ -0,0 +1,22 @@ +Some very rough test scripts for hitting up the OAuth endpoints. + +Note: this works best if you register an OAuth application, leaving +the callback URL blank. + +Put your instance info and consumer key and secret in oauth.ini + +Example usage: +-------------- + +php getrequesttoken.php + +Gets and request token, token secret and a url to authorize it. Once +you get the token/secret you can exchange it for an access token... + +php exchangetokens.php --oauth_token=b9a79548a88c1aa9a5bea73103c6d41d --token_secret=4a47d9337fc0202a14ab552e17a3b657 + +Once you have your access token, go ahead and try an protected API +resource: + +php verifycreds.php --oauth_token=cf2de7665f0dda0a82c2dc39b01be7f9 --token_secret=4524c3b712200138e1a4cff2e9ca83d8 + diff --git a/tests/oauth/exchangetokens.php b/tests/oauth/exchangetokens.php new file mode 100755 index 0000000000..2394826c7e --- /dev/null +++ b/tests/oauth/exchangetokens.php @@ -0,0 +1,105 @@ +#!/usr/bin/env php +. + */ + +define('INSTALLDIR', realpath(dirname(__FILE__) . '/../..')); + +require_once INSTALLDIR . '/extlib/OAuth.php'; + +$ini = parse_ini_file("oauth.ini"); + +$test_consumer = new OAuthConsumer($ini['consumer_key'], $ini['consumer_secret']); + +$at_endpoint = $ini['apiroot'] . $ini['access_token_url']; + +$shortoptions = 't:s:'; +$longoptions = array('oauth_token=', 'token_secret='); + +$helptext = <<sign_request($hmac_method, $test_consumer, $rt); + +$r = httpRequest($req_req->to_url()); + +common_debug("Exchange request token = " . var_export($rt, true)); +common_debug("Exchange tokens URL: " . $req_req->to_url()); + +$body = $r->getBody(); + +$token_stuff = array(); +parse_str($body, $token_stuff); + +print 'Access token : ' . $token_stuff['oauth_token'] . "\n"; +print 'Access token secret : ' . $token_stuff['oauth_token_secret'] . "\n"; + +function httpRequest($url) +{ + $request = HTTPClient::start(); + + $request->setConfig(array( + 'follow_redirects' => true, + 'connect_timeout' => 120, + 'timeout' => 120, + 'ssl_verify_peer' => false, + 'ssl_verify_host' => false + )); + + return $request->get($url); +} + diff --git a/tests/oauth/getrequesttoken.php b/tests/oauth/getrequesttoken.php new file mode 100755 index 0000000000..fc546a0f4c --- /dev/null +++ b/tests/oauth/getrequesttoken.php @@ -0,0 +1,71 @@ +#!/usr/bin/env php +. + */ + +define('INSTALLDIR', realpath(dirname(__FILE__) . '/../..')); + +require_once INSTALLDIR . '/scripts/commandline.inc'; +require_once INSTALLDIR . '/extlib/OAuth.php'; + +$ini = parse_ini_file("oauth.ini"); + +$test_consumer = new OAuthConsumer($ini['consumer_key'], $ini['consumer_secret']); + +$rt_endpoint = $ini['apiroot'] . $ini['request_token_url']; + +$parsed = parse_url($rt_endpoint); +$params = array(); + +parse_str($parsed['query'], $params); + +$hmac_method = new OAuthSignatureMethod_HMAC_SHA1(); + +$req_req = OAuthRequest::from_consumer_and_token($test_consumer, NULL, "GET", $rt_endpoint, $params); +$req_req->sign_request($hmac_method, $test_consumer, NULL); + +$r = httpRequest($req_req->to_url()); + +$body = $r->getBody(); + +$token_stuff = array(); +parse_str($body, $token_stuff); + +$authurl = $ini['apiroot'] . $ini['authorize_url'] . '?oauth_token=' . $token_stuff['oauth_token']; + +print 'Request token : ' . $token_stuff['oauth_token'] . "\n"; +print 'Request token secret : ' . $token_stuff['oauth_token_secret'] . "\n"; +print "Authorize URL : $authurl\n"; + +//var_dump($req_req); + +function httpRequest($url) +{ + $request = HTTPClient::start(); + + $request->setConfig(array( + 'follow_redirects' => true, + 'connect_timeout' => 120, + 'timeout' => 120, + 'ssl_verify_peer' => false, + 'ssl_verify_host' => false + )); + + return $request->get($url); +} + diff --git a/tests/oauth/oauth.ini b/tests/oauth/oauth.ini new file mode 100644 index 0000000000..5ef0e571eb --- /dev/null +++ b/tests/oauth/oauth.ini @@ -0,0 +1,10 @@ +; Setup OAuth info here +apiroot = "http://dev.controlyourself.ca/zach/api" + +request_token_url = "/oauth/request_token" +authorize_url = "/oauth/authorize" +access_token_url = "/oauth/access_token" + +consumer_key = "b748968e9bea81a53f3a3c15aa0c686f" +consumer_secret = "5434e18cce05d9e53cdd48029a62fa41" + diff --git a/tests/oauth/verifycreds.php b/tests/oauth/verifycreds.php new file mode 100755 index 0000000000..873bdb8bdd --- /dev/null +++ b/tests/oauth/verifycreds.php @@ -0,0 +1,101 @@ +#!/usr/bin/env php +. + */ + +define('INSTALLDIR', realpath(dirname(__FILE__) . '/../..')); + +require_once INSTALLDIR . '/extlib/OAuth.php'; + +$shortoptions = 'o:s:'; +$longoptions = array('oauth_token=', 'token_secret='); + +$helptext = <<sign_request($hmac_method, $test_consumer, $at); + +$r = httpRequest($req_req->to_url()); + +$body = $r->getBody(); + +print "$body\n"; + +//print $req_req->to_url() . "\n\n"; + +function httpRequest($url) +{ + $request = HTTPClient::start(); + + $request->setConfig(array( + 'follow_redirects' => true, + 'connect_timeout' => 120, + 'timeout' => 120, + 'ssl_verify_peer' => false, + 'ssl_verify_host' => false + )); + + return $request->get($url); +} + From c2c930a8556cca866dfa0eba2fe1a8242eef71f2 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Wed, 13 Jan 2010 16:56:52 -0800 Subject: [PATCH 071/134] Fixed some spelling mistakes in the README --- tests/oauth/README | 6 +++--- tests/oauth/oauth.ini | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/oauth/README b/tests/oauth/README index ea4aabadbe..dd76feb0c6 100644 --- a/tests/oauth/README +++ b/tests/oauth/README @@ -10,12 +10,12 @@ Example usage: php getrequesttoken.php -Gets and request token, token secret and a url to authorize it. Once -you get the token/secret you can exchange it for an access token... +Gets a request token, token secret and a url to authorize it. Once +you authorize the request token you can exchange it for an access token... php exchangetokens.php --oauth_token=b9a79548a88c1aa9a5bea73103c6d41d --token_secret=4a47d9337fc0202a14ab552e17a3b657 -Once you have your access token, go ahead and try an protected API +Once you have your access token, go ahead and try a protected API resource: php verifycreds.php --oauth_token=cf2de7665f0dda0a82c2dc39b01be7f9 --token_secret=4524c3b712200138e1a4cff2e9ca83d8 diff --git a/tests/oauth/oauth.ini b/tests/oauth/oauth.ini index 5ef0e571eb..16b747fe43 100644 --- a/tests/oauth/oauth.ini +++ b/tests/oauth/oauth.ini @@ -1,5 +1,5 @@ ; Setup OAuth info here -apiroot = "http://dev.controlyourself.ca/zach/api" +apiroot = "http://YOURSTATUSNET/api" request_token_url = "/oauth/request_token" authorize_url = "/oauth/authorize" From 1f8ddf716d0b54cc40aa89e595fe2232a10e7a2a Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Thu, 14 Jan 2010 02:16:03 +0000 Subject: [PATCH 072/134] Check for read vs. read-write access on OAuth authenticated API mehtods. --- lib/api.php | 5 +++++ lib/apiauth.php | 20 ++++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/lib/api.php b/lib/api.php index 707e4ac21a..794b140507 100644 --- a/lib/api.php +++ b/lib/api.php @@ -53,6 +53,9 @@ if (!defined('STATUSNET')) { class ApiAction extends Action { + const READ_ONLY = 1; + const READ_WRITE = 2; + var $format = null; var $user = null; var $auth_user = null; @@ -62,6 +65,8 @@ class ApiAction extends Action var $since_id = null; var $since = null; + var $access = self::READ_ONLY; // read (default) or read-write + /** * Initialization. * diff --git a/lib/apiauth.php b/lib/apiauth.php index 431f3ac4fd..8374c24a7f 100644 --- a/lib/apiauth.php +++ b/lib/apiauth.php @@ -78,12 +78,27 @@ class ApiAuthAction extends ApiAction $this->checkOAuthRequest(); } else { $this->checkBasicAuthUser(); + // By default, all basic auth users have read and write access + + $this->access = self::READ_WRITE; } } return true; } + function handle($args) + { + parent::handle($args); + + if ($this->isReadOnly($args) == false) { + if ($this->access == self::READ_ONLY) { + $this->clientError(_('API method requires write access.'), 401); + exit(); + } + } + } + function checkOAuthRequest() { common_debug("We have an OAuth request."); @@ -130,6 +145,10 @@ class ApiAuthAction extends ApiAction if ($this->oauth_access_type != 0) { + // Set the read or read-write access for the api call + $this->access = ($appUser->access_type & Oauth_application::$writeAccess) + ? self::READ_WRITE : self::READ_ONLY; + $this->auth_user = User::staticGet('id', $appUser->profile_id); $msg = "API OAuth authentication for user '%s' (id: %d) on behalf of " . @@ -220,6 +239,7 @@ class ApiAuthAction extends ApiAction exit; } } + return true; } From 6a4c88afe723b246cf3a2158ac2c1ad4161bdd43 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Thu, 14 Jan 2010 02:32:59 +0000 Subject: [PATCH 073/134] More relaxed selector for application icon and form checkbox --- theme/base/css/display.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/theme/base/css/display.css b/theme/base/css/display.css index ff81d37273..84e9426c77 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -907,7 +907,7 @@ list-style-type:none; } .application img, #showapplication .entity_profile img, -#editapplication .form_data #application_icon, +.form_data #application_icon img, #apioauthauthorize .form_data img { max-width:96px; max-height:96px; @@ -944,9 +944,9 @@ margin-left:1.795%; font-family:monospace; font-size:1.3em; } -#editapplication .form_data #application_types label.radio, -#editapplication .form_data #default_access_types label.radio { -width:15%; +.form_data #application_types label.radio, +.form_data #default_access_types label.radio { +width:14.5%; } /* NOTICE */ From 8b24b5ac7bea2098d3c85e342526c2102e2a6fb9 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Wed, 20 Jan 2010 18:01:07 -0800 Subject: [PATCH 074/134] Add Start/EndSetApiUser events when setting API user via OAuth --- lib/apiauth.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/apiauth.php b/lib/apiauth.php index 8374c24a7f..f513ed2c9a 100644 --- a/lib/apiauth.php +++ b/lib/apiauth.php @@ -149,7 +149,10 @@ class ApiAuthAction extends ApiAction $this->access = ($appUser->access_type & Oauth_application::$writeAccess) ? self::READ_WRITE : self::READ_ONLY; - $this->auth_user = User::staticGet('id', $appUser->profile_id); + if (Event::handle('StartSetApiUser', array(&$user))) { + $this->auth_user = User::staticGet('id', $appUser->profile_id); + Event::handle('EndSetApiUser', array($user)); + } $msg = "API OAuth authentication for user '%s' (id: %d) on behalf of " . "application '%s' (id: %d)."; From 4daf76212a6802863d20c6af7597eddded227ae8 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Thu, 14 Jan 2010 02:38:01 +0000 Subject: [PATCH 075/134] - Had to remove checking read vs. read-write in OAuth authenticated methods - Will now pick up source attr from OAuth app --- actions/apiaccountverifycredentials.php | 14 ++++++++++++++ actions/apistatusesupdate.php | 5 +++++ lib/apiauth.php | 14 +++++--------- 3 files changed, 24 insertions(+), 9 deletions(-) diff --git a/actions/apiaccountverifycredentials.php b/actions/apiaccountverifycredentials.php index 08b201dbff..1095d51626 100644 --- a/actions/apiaccountverifycredentials.php +++ b/actions/apiaccountverifycredentials.php @@ -82,4 +82,18 @@ class ApiAccountVerifyCredentialsAction extends ApiAuthAction } + /** + * Is this action read only? + * + * @param array $args other arguments + * + * @return boolean true + * + **/ + + function isReadOnly($args) + { + return true; + } + } diff --git a/actions/apistatusesupdate.php b/actions/apistatusesupdate.php index f594bbf393..f8bf7cf874 100644 --- a/actions/apistatusesupdate.php +++ b/actions/apistatusesupdate.php @@ -85,6 +85,11 @@ class ApiStatusesUpdateAction extends ApiAuthAction $this->lat = $this->trimmed('lat'); $this->lon = $this->trimmed('long'); + // try to set the source attr from OAuth app + if (empty($this->source)) { + $this->source = $this->oauth_source; + } + if (empty($this->source) || in_array($this->source, self::$reserved_sources)) { $this->source = 'api'; } diff --git a/lib/apiauth.php b/lib/apiauth.php index f513ed2c9a..37070d212f 100644 --- a/lib/apiauth.php +++ b/lib/apiauth.php @@ -55,6 +55,7 @@ class ApiAuthAction extends ApiAction { var $access_token; var $oauth_access_type; + var $oauth_source; /** * Take arguments for running, and output basic auth header if needed @@ -90,13 +91,6 @@ class ApiAuthAction extends ApiAction function handle($args) { parent::handle($args); - - if ($this->isReadOnly($args) == false) { - if ($this->access == self::READ_ONLY) { - $this->clientError(_('API method requires write access.'), 401); - exit(); - } - } } function checkOAuthRequest() @@ -116,8 +110,6 @@ class ApiAuthAction extends ApiAction $req = OAuthRequest::from_request(); $server->verify_request($req); - common_debug("Good OAuth request!"); - $app = Oauth_application::getByConsumerKey($this->consumer_key); if (empty($app)) { @@ -129,6 +121,10 @@ class ApiAuthAction extends ApiAction throw new OAuthException('No application for that consumer key.'); } + // set the source attr + + $this->oauth_source = $app->name; + $appUser = Oauth_application_user::staticGet('token', $this->access_token); From e6cf293db8c465b21899fd328152a991501a5038 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Sun, 24 Jan 2010 22:39:32 -0500 Subject: [PATCH 076/134] Recover caching logic lost in bad merge I made a bad merge on Jan 10th from master to 0.9.x. This lost a number of memcache enhancements made on the 0.9.x branch. I've been able to re-do the manual merge, and this represents the changes. Most of them are related to caching on insert. --- classes/Memcached_DataObject.php | 148 +++++++++++++++++++++---------- 1 file changed, 100 insertions(+), 48 deletions(-) diff --git a/classes/Memcached_DataObject.php b/classes/Memcached_DataObject.php index 33645a3e8b..f59213c2cb 100644 --- a/classes/Memcached_DataObject.php +++ b/classes/Memcached_DataObject.php @@ -66,7 +66,6 @@ class Memcached_DataObject extends DB_DataObject // Clear this out so we don't accidentally break global // state in *this* process. $this->_DB_resultid = null; - // We don't have any local DBO refs, so clear these out. $this->_link_loaded = false; } @@ -91,9 +90,7 @@ class Memcached_DataObject extends DB_DataObject unset($i); } $i = Memcached_DataObject::getcached($cls, $k, $v); - if ($i) { - return $i; - } else { + if ($i === false) { // false == cache miss $i = DB_DataObject::factory($cls); if (empty($i)) { $i = false; @@ -101,22 +98,34 @@ class Memcached_DataObject extends DB_DataObject } $result = $i->get($k, $v); if ($result) { + // Hit! $i->encache(); - return $i; } else { + // save the fact that no such row exists + $c = self::memcache(); + if (!empty($c)) { + $ck = self::cachekey($cls, $k, $v); + $c->set($ck, null); + } $i = false; - return $i; } } + return $i; } - function &pkeyGet($cls, $kv) + /** + * @fixme Should this return false on lookup fail to match staticGet? + */ + function pkeyGet($cls, $kv) { $i = Memcached_DataObject::multicache($cls, $kv); - if ($i) { + if ($i !== false) { // false == cache miss return $i; } else { - $i = new $cls(); + $i = DB_DataObject::factory($cls); + if (empty($i)) { + return false; + } foreach ($kv as $k => $v) { $i->$k = $v; } @@ -124,6 +133,11 @@ class Memcached_DataObject extends DB_DataObject $i->encache(); } else { $i = null; + $c = self::memcache(); + if (!empty($c)) { + $ck = self::multicacheKey($cls, $kv); + $c->set($ck, null); + } } return $i; } @@ -132,6 +146,9 @@ class Memcached_DataObject extends DB_DataObject function insert() { $result = parent::insert(); + if ($result) { + $this->encache(); // in case of cached negative lookups + } return $result; } @@ -186,6 +203,17 @@ class Memcached_DataObject extends DB_DataObject function keyTypes() { + // ini-based classes return number-indexed arrays. handbuilt + // classes return column => keytype. Make this uniform. + + $keys = $this->keys(); + + $keyskeys = array_keys($keys); + + if (is_string($keyskeys[0])) { + return $keys; + } + global $_DB_DATAOBJECT; if (!isset($_DB_DATAOBJECT['INI'][$this->_database][$this->__table."__keys"])) { $this->databaseStructure(); @@ -197,6 +225,7 @@ class Memcached_DataObject extends DB_DataObject function encache() { $c = $this->memcache(); + if (!$c) { return false; } else if ($this->tableName() == 'user' && is_object($this->id)) { @@ -206,64 +235,86 @@ class Memcached_DataObject extends DB_DataObject str_replace("\n", " ", $e->getTraceAsString())); return false; } else { - $pkey = array(); - $pval = array(); - $types = $this->keyTypes(); - ksort($types); - foreach ($types as $key => $type) { - if ($type == 'K') { - $pkey[] = $key; - $pval[] = $this->$key; - } else { - $c->set($this->cacheKey($this->tableName(), $key, $this->$key), $this); - } - } - # XXX: should work for both compound and scalar pkeys - $pvals = implode(',', $pval); - $pkeys = implode(',', $pkey); - $c->set($this->cacheKey($this->tableName(), $pkeys, $pvals), $this); + $keys = $this->_allCacheKeys(); + + foreach ($keys as $key) { + $c->set($key, $this); + } } } function decache() { $c = $this->memcache(); + if (!$c) { return false; - } else { - $pkey = array(); - $pval = array(); - $types = $this->keyTypes(); - ksort($types); - foreach ($types as $key => $type) { - if ($type == 'K') { - $pkey[] = $key; - $pval[] = $this->$key; - } else { - $c->delete($this->cacheKey($this->tableName(), $key, $this->$key)); - } - } - # should work for both compound and scalar pkeys - # XXX: comma works for now but may not be safe separator for future keys - $pvals = implode(',', $pval); - $pkeys = implode(',', $pkey); - $c->delete($this->cacheKey($this->tableName(), $pkeys, $pvals)); } + + $keys = $this->_allCacheKeys(); + + foreach ($keys as $key) { + $c->delete($key, $this); + } + } + + function _allCacheKeys() + { + $ckeys = array(); + + $types = $this->keyTypes(); + ksort($types); + + $pkey = array(); + $pval = array(); + + foreach ($types as $key => $type) { + + assert(!empty($key)); + + if ($type == 'U') { + if (empty($this->$key)) { + continue; + } + $ckeys[] = $this->cacheKey($this->tableName(), $key, $this->$key); + } else if ($type == 'K' || $type == 'N') { + $pkey[] = $key; + $pval[] = $this->$key; + } else { + throw new Exception("Unknown key type $key => $type for " . $this->tableName()); + } + } + + assert(count($pkey) > 0); + + // XXX: should work for both compound and scalar pkeys + $pvals = implode(',', $pval); + $pkeys = implode(',', $pkey); + + $ckeys[] = $this->cacheKey($this->tableName(), $pkeys, $pvals); + + return $ckeys; } function multicache($cls, $kv) { ksort($kv); - $c = Memcached_DataObject::memcache(); + $c = self::memcache(); if (!$c) { return false; } else { - $pkeys = implode(',', array_keys($kv)); - $pvals = implode(',', array_values($kv)); - return $c->get(Memcached_DataObject::cacheKey($cls, $pkeys, $pvals)); + return $c->get(self::multicacheKey($cls, $kv)); } } + static function multicacheKey($cls, $kv) + { + ksort($kv); + $pkeys = implode(',', array_keys($kv)); + $pvals = implode(',', array_values($kv)); + return self::cacheKey($cls, $pkeys, $pvals); + } + function getSearchEngine($table) { require_once INSTALLDIR.'/lib/search_engines.php'; @@ -298,7 +349,8 @@ class Memcached_DataObject extends DB_DataObject $key_part = common_keyize($cls).':'.md5($qry); $ckey = common_cache_key($key_part); $stored = $c->get($ckey); - if ($stored) { + + if ($stored !== false) { return new ArrayWrapper($stored); } From e400437d5783a5a1a03feb3ea3e5b6a40a71ed60 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Sun, 24 Jan 2010 22:50:07 -0500 Subject: [PATCH 077/134] fix interpolation for positional arguments in showstream --- actions/showstream.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/actions/showstream.php b/actions/showstream.php index 75e10858d0..90ff67073a 100644 --- a/actions/showstream.php +++ b/actions/showstream.php @@ -76,7 +76,7 @@ class ShowstreamAction extends ProfileAction if ($this->page == 1) { return $base; } else { - return sprintf(_("%1$s, page %2$d"), + return sprintf(_('%1$s, page %2$d'), $base, $this->page); } From fc7afed92478117d009d835a4d1cd0565ada1089 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Sun, 24 Jan 2010 22:52:03 -0500 Subject: [PATCH 078/134] fix interpolation for positional arguments in replies --- actions/replies.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/actions/replies.php b/actions/replies.php index 2e50f1c3c4..164c328db3 100644 --- a/actions/replies.php +++ b/actions/replies.php @@ -124,7 +124,7 @@ class RepliesAction extends OwnerDesignAction if ($this->page == 1) { return sprintf(_("Replies to %s"), $this->user->nickname); } else { - return sprintf(_("Replies to %1$s, page %2$d"), + return sprintf(_('Replies to %1$s, page %2$d'), $this->user->nickname, $this->page); } From 02526f1100621aa522ccb6beccc0a4e507da328a Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Sun, 24 Jan 2010 22:53:29 -0500 Subject: [PATCH 079/134] fix interpolation of positional arguments to sprintf in outbox --- actions/outbox.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/actions/outbox.php b/actions/outbox.php index de30de0183..b81d4b9d0d 100644 --- a/actions/outbox.php +++ b/actions/outbox.php @@ -55,10 +55,10 @@ class OutboxAction extends MailboxAction function title() { if ($this->page > 1) { - return sprintf(_("Outbox for %1$s - page %2$d"), + return sprintf(_('Outbox for %1$s - page %2$d'), $this->user->nickname, $page); } else { - return sprintf(_("Outbox for %s"), $this->user->nickname); + return sprintf(_('Outbox for %s'), $this->user->nickname); } } From 9077db00a50a6123ece70eb690b658c19c5aeb27 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Sun, 24 Jan 2010 22:54:25 -0500 Subject: [PATCH 080/134] fix interpolation of positional arguments to sprintf in inbox --- actions/inbox.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/actions/inbox.php b/actions/inbox.php index f605cc9e8b..8330f753ff 100644 --- a/actions/inbox.php +++ b/actions/inbox.php @@ -56,10 +56,10 @@ class InboxAction extends MailboxAction function title() { if ($this->page > 1) { - return sprintf(_("Inbox for %1$s - page %2$d"), $this->user->nickname, + return sprintf(_('Inbox for %1$s - page %2$d'), $this->user->nickname, $this->page); } else { - return sprintf(_("Inbox for %s"), $this->user->nickname); + return sprintf(_('Inbox for %s'), $this->user->nickname); } } From 73fdec6c12c308732f0673f2d10ab1542c927a33 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Sun, 24 Jan 2010 22:55:29 -0500 Subject: [PATCH 081/134] fix interpolation of positional arguments to sprintf in usergroups --- actions/usergroups.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/actions/usergroups.php b/actions/usergroups.php index 5042261432..97faabae65 100644 --- a/actions/usergroups.php +++ b/actions/usergroups.php @@ -59,9 +59,9 @@ class UsergroupsAction extends OwnerDesignAction function title() { if ($this->page == 1) { - return sprintf(_("%s groups"), $this->user->nickname); + return sprintf(_('%s groups'), $this->user->nickname); } else { - return sprintf(_("%1$s groups, page %2$d"), + return sprintf(_('%1$s groups, page %2$d'), $this->user->nickname, $this->page); } From 019dad95e12191632a3828fb0950a80f305bbf01 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Sun, 24 Jan 2010 22:56:41 -0500 Subject: [PATCH 082/134] fix interpolation of positional arguments to sprintf in show favorites --- actions/showfavorites.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/actions/showfavorites.php b/actions/showfavorites.php index 6023f01567..f2d0822936 100644 --- a/actions/showfavorites.php +++ b/actions/showfavorites.php @@ -74,9 +74,9 @@ class ShowfavoritesAction extends OwnerDesignAction function title() { if ($this->page == 1) { - return sprintf(_("%s's favorite notices"), $this->user->nickname); + return sprintf(_('%s\'s favorite notices'), $this->user->nickname); } else { - return sprintf(_("%1$s's favorite notices, page %2$d"), + return sprintf(_('%1$s\'s favorite notices, page %2$d'), $this->user->nickname, $this->page); } From a9da43a41644b3e1ff27e8250fd858d2c2840e7b Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Sun, 24 Jan 2010 22:57:33 -0500 Subject: [PATCH 083/134] fix interpolation of positional arguments to sprintf in show group --- actions/showgroup.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/actions/showgroup.php b/actions/showgroup.php index 06ae572e81..8042a49513 100644 --- a/actions/showgroup.php +++ b/actions/showgroup.php @@ -79,9 +79,9 @@ class ShowgroupAction extends GroupDesignAction } if ($this->page == 1) { - return sprintf(_("%s group"), $base); + return sprintf(_('%s group'), $base); } else { - return sprintf(_("%1$s group, page %2$d"), + return sprintf(_('%1$s group, page %2$d'), $base, $this->page); } From 089305ac7a89ba42286973feb14ca23687ec0995 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Sun, 24 Jan 2010 22:59:22 -0500 Subject: [PATCH 084/134] fix interpolation of positional arguments to sprintf in tag action --- actions/tag.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/actions/tag.php b/actions/tag.php index 12857236ef..e91df6ea97 100644 --- a/actions/tag.php +++ b/actions/tag.php @@ -63,9 +63,9 @@ class TagAction extends Action function title() { if ($this->page == 1) { - return sprintf(_("Notices tagged with %s"), $this->tag); + return sprintf(_('Notices tagged with %s'), $this->tag); } else { - return sprintf(_("Notices tagged with %1$s, page %2$d"), + return sprintf(_('Notices tagged with %1$s, page %2$d'), $this->tag, $this->page); } @@ -85,7 +85,7 @@ class TagAction extends Action array('tag' => $this->tag)), sprintf(_('Notice feed for tag %s (RSS 1.0)'), $this->tag)), - new Feed(Feed::RSS2, + new Feed(Feed::RSS2, common_local_url('ApiTimelineTag', array('format' => 'rss', 'tag' => $this->tag)), From 73f6250b9d8a1f65bfcbf76b05f087bd6e118bea Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Mon, 25 Jan 2010 14:55:04 +0000 Subject: [PATCH 085/134] An update to geolocation cookie to use a single file and set the expiry date to 30 days from now. --- js/util.js | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/js/util.js b/js/util.js index a7339010a7..8d52d859b7 100644 --- a/js/util.js +++ b/js/util.js @@ -495,7 +495,7 @@ var SN = { // StatusNet $('#'+SN.C.S.NoticeLocationId).val(''); $('#'+SN.C.S.NoticeDataGeo).attr('checked', false); - $.cookie(SN.C.S.NoticeDataGeoCookie, 'disabled'); + $.cookie(SN.C.S.NoticeDataGeoCookie, 'disabled', { path: '/', expires: SN.U.GetDateFromNow(30) }); } function getJSONgeocodeURL(geocodeURL, data) { @@ -537,7 +537,8 @@ var SN = { // StatusNet NLNU: location.url, NDG: true }; - $.cookie(SN.C.S.NoticeDataGeoCookie, JSON.stringify(cookieValue)); + + $.cookie(SN.C.S.NoticeDataGeoCookie, JSON.stringify(cookieValue), { path: '/', expires: SN.U.GetDateFromNow(30) }); }); } @@ -658,6 +659,13 @@ var SN = { // StatusNet } return false; }); + }, + + GetDateFromNow: function(days) { + var date = new Date(); + date.setTime(date.getTime() + (days * 24 * 60 * 60 * 1000)); + + return date; } }, From c10d5320dd5b308795c5a5bda2441fabfe278a84 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Mon, 25 Jan 2010 09:07:24 -0800 Subject: [PATCH 086/134] Disable PubSubHubBub hub pings automatically on private site (hub wouldn't be able to read feeds anyway) [Might be good to think of a core way to mark a plugin as disabled when it initializes.] --- plugins/PubSubHubBub/PubSubHubBubPlugin.php | 44 ++++++++++++++++----- 1 file changed, 35 insertions(+), 9 deletions(-) diff --git a/plugins/PubSubHubBub/PubSubHubBubPlugin.php b/plugins/PubSubHubBub/PubSubHubBubPlugin.php index ce6086df94..a880dc8666 100644 --- a/plugins/PubSubHubBub/PubSubHubBubPlugin.php +++ b/plugins/PubSubHubBub/PubSubHubBubPlugin.php @@ -79,6 +79,21 @@ class PubSubHubBubPlugin extends Plugin parent::__construct(); } + /** + * Check if plugin should be active; may be mass-enabled. + * @return boolean + */ + + function enabled() + { + if (common_config('site', 'private')) { + // PuSH relies on public feeds + return false; + } + // @fixme check for being on a private network? + return true; + } + /** * Hooks the StartApiAtom event * @@ -92,8 +107,9 @@ class PubSubHubBubPlugin extends Plugin function onStartApiAtom($action) { - $action->element('link', array('rel' => 'hub', 'href' => $this->hub), null); - + if ($this->enabled()) { + $action->element('link', array('rel' => 'hub', 'href' => $this->hub), null); + } return true; } @@ -110,9 +126,11 @@ class PubSubHubBubPlugin extends Plugin function onStartApiRss($action) { - $action->element('atom:link', array('rel' => 'hub', - 'href' => $this->hub), - null); + if ($this->enabled()) { + $action->element('atom:link', array('rel' => 'hub', + 'href' => $this->hub), + null); + } return true; } @@ -130,6 +148,9 @@ class PubSubHubBubPlugin extends Plugin function onHandleQueuedNotice($notice) { + if (!$this->enabled()) { + return false; + } $publisher = new Publisher($this->hub); $feeds = array(); @@ -243,16 +264,21 @@ class PubSubHubBubPlugin extends Plugin function onPluginVersion(&$versions) { + $about = _m('The PubSubHubBub plugin pushes RSS/Atom updates '. + 'to a PubSubHubBub hub.'); + if (!$this->enabled()) { + $about = '' . $about . ' ' . + _m('(inactive on private site)'); + } $versions[] = array('name' => 'PubSubHubBub', 'version' => STATUSNET_VERSION, 'author' => 'Craig Andrews', 'homepage' => 'http://status.net/wiki/Plugin:PubSubHubBub', 'rawdescription' => - _m('The PubSubHubBub plugin pushes RSS/Atom updates '. - 'to a PubSubHubBub hub.')); + $about); return true; } From 055a00bcaeaa50c36143bd151bf4433c5c87d174 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Mon, 25 Jan 2010 09:36:20 -0800 Subject: [PATCH 087/134] drop now-unused --skip-xmpp and --xmpp-only options from queuedaemon.php --- scripts/queuedaemon.php | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/scripts/queuedaemon.php b/scripts/queuedaemon.php index a9cfda6d72..bedd14b1a3 100755 --- a/scripts/queuedaemon.php +++ b/scripts/queuedaemon.php @@ -21,7 +21,7 @@ define('INSTALLDIR', realpath(dirname(__FILE__) . '/..')); $shortoptions = 'fi:at:'; -$longoptions = array('id=', 'foreground', 'all', 'threads=', 'skip-xmpp', 'xmpp-only'); +$longoptions = array('id=', 'foreground', 'all', 'threads='); /** * Attempts to get a count of the processors available on the current system @@ -163,13 +163,6 @@ if (!$threads) { $daemonize = !(have_option('f') || have_option('--foreground')); $all = have_option('a') || have_option('--all'); -if (have_option('--skip-xmpp')) { - define('XMPP_EMERGENCY_FLAG', true); -} -if (have_option('--xmpp-only')) { - define('XMPP_ONLY_FLAG', true); -} - $daemon = new QueueDaemon($id, $daemonize, $threads, $all); $daemon->runOnce(); From ee4ca8f2601bc5a2dd258fea176037e03e23feb8 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Mon, 25 Jan 2010 09:41:40 -0800 Subject: [PATCH 088/134] quick fix to console.php: don't save blank lines into readline history --- scripts/console.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/scripts/console.php b/scripts/console.php index 8b62a3a967..4d207c261b 100755 --- a/scripts/console.php +++ b/scripts/console.php @@ -45,10 +45,12 @@ function read_input_line($prompt) if (CONSOLE_INTERACTIVE) { if (CONSOLE_READLINE) { $line = readline($prompt); - readline_add_history($line); - if (defined('CONSOLE_HISTORY')) { - // Save often; it's easy to hit fatal errors. - readline_write_history(CONSOLE_HISTORY); + if (trim($line) != '') { + readline_add_history($line); + if (defined('CONSOLE_HISTORY')) { + // Save often; it's easy to hit fatal errors. + readline_write_history(CONSOLE_HISTORY); + } } return $line; } else { From 1ab24832960eef698731cf0d3e72fccfa336392d Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Mon, 25 Jan 2010 13:48:24 -0800 Subject: [PATCH 089/134] Fix presence notification on XMPP thread (now foreground, not background) --- lib/xmppmanager.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/xmppmanager.php b/lib/xmppmanager.php index 299175dd7d..985e7c32e4 100644 --- a/lib/xmppmanager.php +++ b/lib/xmppmanager.php @@ -101,7 +101,7 @@ class XmppManager extends IoManager $this->conn->addEventHandler('reconnect', 'handle_reconnect', $this); $this->conn->setReconnectTimeout(600); - jabber_send_presence("Send me a message to post a notice", 'available', null, 'available', -1); + jabber_send_presence("Send me a message to post a notice", 'available', null, 'available', 100); return !is_null($this->conn); } @@ -233,7 +233,7 @@ class XmppManager extends IoManager common_log(LOG_NOTICE, 'XMPP reconnected'); $this->conn->processUntil('session_start'); - $this->conn->presence(null, 'available', null, 'available', -1); + $this->conn->presence(null, 'available', null, 'available', 100); } From d17b7fa19ba2bfec9aa3d734c0f30e001256ddc0 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Tue, 26 Jan 2010 01:58:10 +0100 Subject: [PATCH 090/134] Setting the geo location cookie expire date far into the future: 2029 ;) --- js/util.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/js/util.js b/js/util.js index 8d52d859b7..b864867fd1 100644 --- a/js/util.js +++ b/js/util.js @@ -495,7 +495,7 @@ var SN = { // StatusNet $('#'+SN.C.S.NoticeLocationId).val(''); $('#'+SN.C.S.NoticeDataGeo).attr('checked', false); - $.cookie(SN.C.S.NoticeDataGeoCookie, 'disabled', { path: '/', expires: SN.U.GetDateFromNow(30) }); + $.cookie(SN.C.S.NoticeDataGeoCookie, 'disabled', { path: '/', expires: SN.U.GetFullYear(2029, 0, 1) }); } function getJSONgeocodeURL(geocodeURL, data) { @@ -538,7 +538,7 @@ var SN = { // StatusNet NDG: true }; - $.cookie(SN.C.S.NoticeDataGeoCookie, JSON.stringify(cookieValue), { path: '/', expires: SN.U.GetDateFromNow(30) }); + $.cookie(SN.C.S.NoticeDataGeoCookie, JSON.stringify(cookieValue), { path: '/', expires: SN.U.GetFullYear(2029, 0, 1) }); }); } @@ -661,9 +661,9 @@ var SN = { // StatusNet }); }, - GetDateFromNow: function(days) { + GetFullYear: function(year, month, day) { var date = new Date(); - date.setTime(date.getTime() + (days * 24 * 60 * 60 * 1000)); + date.setFullYear(year, month, day); return date; } From 655573c213113861cfd82a42ef999dde1aeea149 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Tue, 26 Jan 2010 00:21:05 -0500 Subject: [PATCH 091/134] Single-user mode New configuration options to define a single-user mode. This hides most of the "community" pages, like the public timeline and groups. The main user's timeline becomes the main page, and most other URLs are changed. Switching back and forth between 1-user and multi-user mode is probably hazardous. Squashed commit of the following: commit d814aa5c92d14a27a12baba7893f3f8bf63f1d08 Author: Evan Prodromou Date: Tue Jan 26 00:17:27 2010 -0500 don't show inbox and outbox in single-user mode commit 47f19b9523a7015d4c6e460b73ea32c839e00aa1 Author: Evan Prodromou Date: Tue Jan 26 00:15:22 2010 -0500 show correct URL for logo in single-user mode commit 552010cffc33eadbc512ec5a67619dbc2015239a Author: Evan Prodromou Date: Tue Jan 26 00:15:06 2010 -0500 make singleuser its own config section commit 786ab260a3ca172e57b555c75ca10946d8f258a1 Author: Evan Prodromou Date: Tue Jan 26 00:05:19 2010 -0500 make single-user mode work commit 5b21d7309b3a8dd5a4e0f29aea76f7897f1818b1 Author: Evan Prodromou Date: Mon Jan 25 23:45:55 2010 -0500 add single-user mode --- README | 9 ++ lib/action.php | 8 +- lib/default.php | 5 +- lib/personalgroupnav.php | 7 +- lib/router.php | 215 +++++++++++++++++++++++++-------------- 5 files changed, 161 insertions(+), 83 deletions(-) diff --git a/README b/README index 6022887899..f83873ca84 100644 --- a/README +++ b/README @@ -1492,6 +1492,15 @@ disabled: whether to enable this command. If enabled, users who send should enable it only after you've convinced yourself that it is safe. Default is 'false'. +singleuser +---------- + +If an installation has only one user, this can simplify a lot of the +interface. It also makes the user's profile the root URL. + +enabled: Whether to run in "single user mode". Default false. +nickname: nickname of the single user. + Plugins ======= diff --git a/lib/action.php b/lib/action.php index e242775585..3ffc452dec 100644 --- a/lib/action.php +++ b/lib/action.php @@ -392,8 +392,14 @@ class Action extends HTMLOutputter // lawsuit $this->elementStart('address', array('id' => 'site_contact', 'class' => 'vcard')); if (Event::handle('StartAddressData', array($this))) { + if (common_config('singleuser', 'enabled')) { + $url = common_local_url('showstream', + array('nickname' => common_config('singleuser', 'nickname'))); + } else { + $url = common_local_url('public'); + } $this->elementStart('a', array('class' => 'url home bookmark', - 'href' => common_local_url('public'))); + 'href' => $url)); if (common_config('site', 'logo') || file_exists(Theme::file('logo.png'))) { $this->element('img', array('class' => 'logo photo', 'src' => (common_config('site', 'logo')) ? common_config('site', 'logo') : Theme::path('logo.png'), diff --git a/lib/default.php b/lib/default.php index b6ee72279d..35115542f2 100644 --- a/lib/default.php +++ b/lib/default.php @@ -56,7 +56,7 @@ $default = 'dupelimit' => 60, # default for same person saying the same thing 'textlimit' => 140, 'indent' => true, - 'use_x_sendfile' => false, + 'use_x_sendfile' => false ), 'db' => array('database' => 'YOU HAVE TO SET THIS IN config.php', @@ -260,4 +260,7 @@ $default = ), 'admin' => array('panels' => array('design', 'site', 'user', 'paths')), + 'singleuser' => + array('enabled' => false, + 'nickname' => null), ); diff --git a/lib/personalgroupnav.php b/lib/personalgroupnav.php index cdde1feca0..25db5baa92 100644 --- a/lib/personalgroupnav.php +++ b/lib/personalgroupnav.php @@ -78,9 +78,9 @@ class PersonalGroupNav extends Widget function show() { $user = null; - + // FIXME: we should probably pass this in - + $action = $this->action->trimmed('action'); $nickname = $this->action->trimmed('nickname'); @@ -117,7 +117,8 @@ class PersonalGroupNav extends Widget $cur = common_current_user(); - if ($cur && $cur->id == $user->id) { + if ($cur && $cur->id == $user->id && + !common_config('singleuser', 'enabled')) { $this->out->menuItem(common_local_url('inbox', array('nickname' => $nickname)), diff --git a/lib/router.php b/lib/router.php index 42bff27788..c0ddc8db38 100644 --- a/lib/router.php +++ b/lib/router.php @@ -73,12 +73,6 @@ class Router if (Event::handle('StartInitializeRouter', array(&$m))) { - // In the "root" - - $m->connect('', array('action' => 'public')); - $m->connect('rss', array('action' => 'publicrss')); - $m->connect('featuredrss', array('action' => 'featuredrss')); - $m->connect('favoritedrss', array('action' => 'favoritedrss')); $m->connect('opensearch/people', array('action' => 'opensearch', 'type' => 'people')); $m->connect('opensearch/notice', array('action' => 'opensearch', @@ -145,6 +139,18 @@ class Router $m->connect('settings/'.$s, array('action' => $s.'settings')); } + $m->connect('settings/oauthapps/show/:id', + array('action' => 'showapplication'), + array('id' => '[0-9]+') + ); + $m->connect('settings/oauthapps/new', + array('action' => 'newapplication') + ); + $m->connect('settings/oauthapps/edit/:id', + array('action' => 'editapplication'), + array('id' => '[0-9]+') + ); + // search foreach (array('group', 'people', 'notice') as $s) { @@ -227,11 +233,6 @@ class Router array('action' => 'peopletag'), array('tag' => '[a-zA-Z0-9]+')); - $m->connect('featured/', array('action' => 'featured')); - $m->connect('featured', array('action' => 'featured')); - $m->connect('favorited/', array('action' => 'favorited')); - $m->connect('favorited', array('action' => 'favorited')); - // groups $m->connect('group/new', array('action' => 'newgroup')); @@ -622,37 +623,6 @@ class Router $m->connect('api/search.json', array('action' => 'twitapisearchjson')); $m->connect('api/trends.json', array('action' => 'twitapitrends')); - $m->connect('admin/site', array('action' => 'siteadminpanel')); - $m->connect('admin/design', array('action' => 'designadminpanel')); - $m->connect('admin/user', array('action' => 'useradminpanel')); - $m->connect('admin/paths', array('action' => 'pathsadminpanel')); - - $m->connect('getfile/:filename', - array('action' => 'getfile'), - array('filename' => '[A-Za-z0-9._-]+')); - - // user stuff - - foreach (array('subscriptions', 'subscribers', - 'nudge', 'all', 'foaf', 'xrds', - 'replies', 'inbox', 'outbox', 'microsummary') as $a) { - $m->connect(':nickname/'.$a, - array('action' => $a), - array('nickname' => '[a-zA-Z0-9]{1,64}')); - } - - $m->connect('settings/oauthapps/show/:id', - array('action' => 'showapplication'), - array('id' => '[0-9]+') - ); - $m->connect('settings/oauthapps/new', - array('action' => 'newapplication') - ); - $m->connect('settings/oauthapps/edit/:id', - array('action' => 'editapplication'), - array('id' => '[0-9]+') - ); - $m->connect('api/oauth/request_token', array('action' => 'apioauthrequesttoken')); @@ -662,47 +632,136 @@ class Router $m->connect('api/oauth/authorize', array('action' => 'apioauthauthorize')); - foreach (array('subscriptions', 'subscribers') as $a) { - $m->connect(':nickname/'.$a.'/:tag', - array('action' => $a), - array('tag' => '[a-zA-Z0-9]+', + // Admin + + $m->connect('admin/site', array('action' => 'siteadminpanel')); + $m->connect('admin/design', array('action' => 'designadminpanel')); + $m->connect('admin/user', array('action' => 'useradminpanel')); + $m->connect('admin/paths', array('action' => 'pathsadminpanel')); + + $m->connect('getfile/:filename', + array('action' => 'getfile'), + array('filename' => '[A-Za-z0-9._-]+')); + + // In the "root" + + if (common_config('singleuser', 'enabled')) { + + $nickname = common_config('singleuser', 'nickname'); + + foreach (array('subscriptions', 'subscribers', + 'all', 'foaf', 'xrds', + 'replies', 'microsummary') as $a) { + $m->connect($a, + array('action' => $a, + 'nickname' => $nickname)); + } + + foreach (array('subscriptions', 'subscribers') as $a) { + $m->connect($a.'/:tag', + array('action' => $a, + 'nickname' => $nickname), + array('tag' => '[a-zA-Z0-9]+')); + } + + foreach (array('rss', 'groups') as $a) { + $m->connect($a, + array('action' => 'user'.$a, + 'nickname' => $nickname)); + } + + foreach (array('all', 'replies', 'favorites') as $a) { + $m->connect($a.'/rss', + array('action' => $a.'rss', + 'nickname' => $nickname)); + } + + $m->connect('favorites', + array('action' => 'showfavorites', + 'nickname' => $nickname)); + + $m->connect('avatar/:size', + array('action' => 'avatarbynickname', + 'nickname' => $nickname), + array('size' => '(original|96|48|24)')); + + $m->connect('tag/:tag/rss', + array('action' => 'userrss', + 'nickname' => $nickname), + array('tag' => '[a-zA-Z0-9]+')); + + $m->connect('tag/:tag', + array('action' => 'showstream', + 'nickname' => $nickname), + array('tag' => '[a-zA-Z0-9]+')); + + $m->connect('', + array('action' => 'showstream', + 'nickname' => $nickname)); + + } else { + + $m->connect('', array('action' => 'public')); + $m->connect('rss', array('action' => 'publicrss')); + $m->connect('featuredrss', array('action' => 'featuredrss')); + $m->connect('favoritedrss', array('action' => 'favoritedrss')); + $m->connect('featured/', array('action' => 'featured')); + $m->connect('featured', array('action' => 'featured')); + $m->connect('favorited/', array('action' => 'favorited')); + $m->connect('favorited', array('action' => 'favorited')); + + foreach (array('subscriptions', 'subscribers', + 'nudge', 'all', 'foaf', 'xrds', + 'replies', 'inbox', 'outbox', 'microsummary') as $a) { + $m->connect(':nickname/'.$a, + array('action' => $a), + 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' => '[a-zA-Z0-9]{1,64}')); + } + + foreach (array('rss', 'groups') as $a) { + $m->connect(':nickname/'.$a, + array('action' => 'user'.$a), + array('nickname' => '[a-zA-Z0-9]{1,64}')); + } + + foreach (array('all', 'replies', 'favorites') as $a) { + $m->connect(':nickname/'.$a.'/rss', + array('action' => $a.'rss'), + array('nickname' => '[a-zA-Z0-9]{1,64}')); + } + + $m->connect(':nickname/favorites', + array('action' => 'showfavorites'), + array('nickname' => '[a-zA-Z0-9]{1,64}')); + + $m->connect(':nickname/avatar/:size', + array('action' => 'avatarbynickname'), + array('size' => '(original|96|48|24)', 'nickname' => '[a-zA-Z0-9]{1,64}')); - } - foreach (array('rss', 'groups') as $a) { - $m->connect(':nickname/'.$a, - array('action' => 'user'.$a), + $m->connect(':nickname/tag/:tag/rss', + array('action' => 'userrss'), + array('nickname' => '[a-zA-Z0-9]{1,64}'), + array('tag' => '[a-zA-Z0-9]+')); + + $m->connect(':nickname/tag/:tag', + array('action' => 'showstream'), + array('nickname' => '[a-zA-Z0-9]{1,64}'), + array('tag' => '[a-zA-Z0-9]+')); + + $m->connect(':nickname', + array('action' => 'showstream'), array('nickname' => '[a-zA-Z0-9]{1,64}')); } - foreach (array('all', 'replies', 'favorites') as $a) { - $m->connect(':nickname/'.$a.'/rss', - array('action' => $a.'rss'), - array('nickname' => '[a-zA-Z0-9]{1,64}')); - } - - $m->connect(':nickname/favorites', - array('action' => 'showfavorites'), - array('nickname' => '[a-zA-Z0-9]{1,64}')); - - $m->connect(':nickname/avatar/:size', - array('action' => 'avatarbynickname'), - array('size' => '(original|96|48|24)', - 'nickname' => '[a-zA-Z0-9]{1,64}')); - - $m->connect(':nickname/tag/:tag/rss', - array('action' => 'userrss'), - array('nickname' => '[a-zA-Z0-9]{1,64}'), - array('tag' => '[a-zA-Z0-9]+')); - - $m->connect(':nickname/tag/:tag', - array('action' => 'showstream'), - array('nickname' => '[a-zA-Z0-9]{1,64}'), - array('tag' => '[a-zA-Z0-9]+')); - - $m->connect(':nickname', - array('action' => 'showstream'), - array('nickname' => '[a-zA-Z0-9]{1,64}')); + // user stuff Event::handle('RouterInitialized', array($m)); } From 7fc5588c5dfc0a74cbc1c791bc445e399207c443 Mon Sep 17 00:00:00 2001 From: Julien C Date: Tue, 8 Dec 2009 22:16:03 +0100 Subject: [PATCH 092/134] Allow logging in using Twitter Signed-off-by: Julien C --- plugins/TwitterBridge/TwitterBridgePlugin.php | 26 ++ plugins/TwitterBridge/twitter_connect.gif | Bin 0 -> 2205 bytes .../TwitterBridge/twitterauthorization.php | 431 ++++++++++++++++-- plugins/TwitterBridge/twitterlogin.php | 95 ++++ 4 files changed, 526 insertions(+), 26 deletions(-) create mode 100644 plugins/TwitterBridge/twitter_connect.gif create mode 100644 plugins/TwitterBridge/twitterlogin.php diff --git a/plugins/TwitterBridge/TwitterBridgePlugin.php b/plugins/TwitterBridge/TwitterBridgePlugin.php index 57b3c1c995..e39ec7be03 100644 --- a/plugins/TwitterBridge/TwitterBridgePlugin.php +++ b/plugins/TwitterBridge/TwitterBridgePlugin.php @@ -72,9 +72,34 @@ class TwitterBridgePlugin extends Plugin $m->connect('twitter/authorization', array('action' => 'twitterauthorization')); $m->connect('settings/twitter', array('action' => 'twittersettings')); + + $m->connect('main/twitterlogin', array('action' => 'twitterlogin')); return true; } + + + + /* + * Add a login tab for Twitter Connect + * + * @param Action &action the current action + * + * @return void + */ + function onEndLoginGroupNav(&$action) + { + + $action_name = $action->trimmed('action'); + + $action->menuItem(common_local_url('twitterlogin'), + _('Twitter'), + _('Login or register using Twitter'), + 'twitterlogin' === $action_name); + + return true; + } + /** * Add the Twitter Settings page to the Connect Settings menu @@ -108,6 +133,7 @@ class TwitterBridgePlugin extends Plugin switch ($cls) { case 'TwittersettingsAction': case 'TwitterauthorizationAction': + case 'TwitterloginAction': include_once INSTALLDIR . '/plugins/TwitterBridge/' . strtolower(mb_substr($cls, 0, -6)) . '.php'; return false; diff --git a/plugins/TwitterBridge/twitter_connect.gif b/plugins/TwitterBridge/twitter_connect.gif new file mode 100644 index 0000000000000000000000000000000000000000..e3d8f3ed7b88b41d67b37f8be92f7af532f25816 GIT binary patch literal 2205 zcmV;O2x9j~Nk%w1VZ#6!0OkMyGOg67-0df;(tOI~iqPgGrqG4s`T%UCxby!1|NoiR z>U7=s1AMdT`u<+N-BG#QRK4EB^Zq5M(rv}y7M#u^rO(Ca^Et8E-TMFJ`~FDL^d_m& z)9v;kq|V9r{#DfX;`8}Eve_!A)uZeE@&5l)!QoB5-kj|Hw&L)u@BPyF{urLnAE(ej zver1x^fa&6@cH}_k-@g%?_j{*LbTXLwcN7q{)x}#PPo~V>HH9lzii$4dEogls@Ef@ z(E0rS-uM5??Dvb&=MRp+5RbqptJ5f}(jTPHD6G>UrqCXx&m^ePDXh~Wr_djz&`rMG z1ADR_rq3s=(oVnL0BfTlrO+Rx&mN@CO1Rt;na)PI-NfheLbBN*rqCj!(?ho0A)wG- zz~3pS)Fi0Y8lTW0q|+p;(Lb@)GqKb?wcH||$@%#F&h7Z^_W4e?*)_7;!|(k;&-9nt z@g}IzF09r>x7hLd{3WB(_W1j|?EUrq{-*H$)babK<@2rL@&Et+A^8LV00000EC2ui z0K)(o000O7fKX5jgM|!-g@cESjEIDaj*Ehmh>(_+jgx|ejhv5>mywd2pP!1Dq@s+Q zn4XZ5kEEKZu&<7Zhf`BeySu!;Pr<)WCcbLA$h^P0!ph9Ty~xSW!N9}P)X&k?%e~#e zy(ZVg&d}b?;>^0m=DySC&C$ityX@B6hekz6MNCHgNB{;D$b<>N7)A;zT*$DY!-o(f zN}SlRh{cN-Giuz(F{6=>AVZ2ANwVa~B1QyZS;?}c%a(bL!m5v!~CW zKzZ66N)+V2Lt2v7NXoRS)220Ibeu}Hs@1DiDQexy5UW>?2?x~}OIFU0KWre7UCTCx z!Ju&e;~sqrU)3KbX(}ykl+JX3MK>yFa*#gfF+{vfEi|>fkFZ> zC~)2cbHXsddI?x?o|b-2kU#(%AV{cSVesjvaVQvP!2=RRDnW$z zDSJXF8mR(eqVPhY$64TKiw{b0NC+>)`ods)Xo$eAx1Nx}8r8`f!xHZWkbs@;m1qH` zFsvvT2ttS%pmBA!X&wi4&KaPfg9;IbmV*v(-V3E|fGG$Y2s^M*}&ekirQRQ)~eL26!~g zFcCg@c_n}z3kt%O!UnK}U=u7c@Dj!;umrX*C+L94K9op+4>40Eg(g}cxAkfg~5}hvbbkk)by~NZYIN$)jG!#sx$7rXmwwE0r zqA?u_WRSxMBiLYr#3LXuC>#0v%LmFC;$M&B!e3SU;-7m!M|<*Lws#v z02Rn#4q*TT5LAGE2{=OzcUA!#;t+i|sKC~ASb;PA%K;T|1Dyg;0WtY7h6&h06Q5Yb zEDoRw=;Oc*6p%z2YLSU(Orsjts6#?{;f-GCK^s)Cg9qy22X-Jq0|Zk7IKEK_1?Ykx z2ib)r3;=yw8bA`j#6lbha%WwDUl&Z6gslk@2Qm;72Vhu*0hCDpPZgMez0g=PEOJ1H zL=@$q&X+#-v5x@w8i4s?SpfPe;C)$qA1zfG02KxRUmz%B7THM5V(PF9gBSxG0bmCV zeBgl#;K2eGumc_lW(>-FBN39&gl>BCo8SzmILArOa+>p;-AsZy*U8Ryy7QgzjHf!$ zNzZetlMrG6gFf#Ngamxx1Ja!4G+i))1c)J@`Wylaww79YPYEK+~Gq^rkq?sZMEHg`WEK zr$7y=P=`uXpYHUiNKL9zmx|OX9N`cmT|r30Aeaci!KxAZ$ODx6AW|}{z=B5zt60ZM z*0P%QtY}TETGz_fwz_q!#*C|6b!deS41xl9%_{}ozz4^bMh;%p>kumN*2123u82*n zViRlF#*(!HRyc%SCrjDNQeX&5$gE~J%h}F)_OqH5s})8|+R~c#w5Uz3YNNo~*1Gn! zu#K&3S$l=r+V-}%&8=>Cn_DGB;SgB}u5gD-+~Njz2v-2Da+k~8<~sMe(2cHVXG`7c zS~m(xIK% + * @author Zach Copley * @copyright 2009 StatusNet, Inc. * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ @@ -50,6 +50,10 @@ require_once INSTALLDIR . '/plugins/TwitterBridge/twitter.php'; */ class TwitterauthorizationAction extends Action { + var $twuid = null; + var $tw_fields = null; + var $access_token = null; + /** * Initialize class members. Looks for 'oauth_token' parameter. * @@ -76,29 +80,56 @@ class TwitterauthorizationAction extends Action function handle($args) { parent::handle($args); - - if (!common_logged_in()) { - $this->clientError(_m('Not logged in.'), 403); + + if (common_logged_in()) { + $user = common_current_user(); + $flink = Foreign_link::getByUserID($user->id, TWITTER_SERVICE); + + // If there's already a foreign link record, it means we already + // have an access token, and this is unecessary. So go back. + + if (isset($flink)) { + common_redirect(common_local_url('twittersettings')); + } } + + + if ($_SERVER['REQUEST_METHOD'] == 'POST') { + // User was not logged in to StatusNet before + $this->twuid = $this->trimmed('twuid'); + $this->tw_fields = array("name" => $this->trimmed('name'), "fullname" => $this->trimmed('fullname')); + $this->access_token = new OAuthToken($this->trimmed('access_token_key'), $this->trimmed('access_token_secret')); - $user = common_current_user(); - $flink = Foreign_link::getByUserID($user->id, TWITTER_SERVICE); - - // If there's already a foreign link record, it means we already - // have an access token, and this is unecessary. So go back. - - if (isset($flink)) { - common_redirect(common_local_url('twittersettings')); - } - - // $this->oauth_token is only populated once Twitter authorizes our - // request token. If it's empty we're at the beginning of the auth - // process - - if (empty($this->oauth_token)) { - $this->authorizeRequestToken(); + $token = $this->trimmed('token'); + if (!$token || $token != common_session_token()) { + $this->showForm(_('There was a problem with your session token. Try again, please.')); + return; + } + if ($this->arg('create')) { + if (!$this->boolean('license')) { + $this->showForm(_('You can\'t register if you don\'t agree to the license.'), + $this->trimmed('newname')); + return; + } + $this->createNewUser(); + } else if ($this->arg('connect')) { + $this->connectNewUser(); + } else { + common_debug('Twitter Connect Plugin - ' . + print_r($this->args, true)); + $this->showForm(_('Something weird happened.'), + $this->trimmed('newname')); + } } else { - $this->saveAccessToken(); + // $this->oauth_token is only populated once Twitter authorizes our + // request token. If it's empty we're at the beginning of the auth + // process + + if (empty($this->oauth_token)) { + $this->authorizeRequestToken(); + } else { + $this->saveAccessToken(); + } } } @@ -170,16 +201,25 @@ class TwitterauthorizationAction extends Action $this->serverError(_m('Couldn\'t link your Twitter account.')); } - // Save the access token and Twitter user info - - $this->saveForeignLink($atok, $twitter_user); + if (common_logged_in()) { + // Save the access token and Twitter user info + $this->saveForeignLink($atok, $twitter_user); + } + else{ + $this->twuid = $twitter_user->id; + $this->tw_fields = array("name" => $twitter_user->screen_name, "fullname" => $twitter_user->name); + $this->access_token = $atok; + $this->tryLogin(); + } // Clean up the the mess we made in the session unset($_SESSION['twitter_request_token']); unset($_SESSION['twitter_request_token_secret']); - - common_redirect(common_local_url('twittersettings')); + + if (common_logged_in()) { + common_redirect(common_local_url('twittersettings')); + } } /** @@ -220,5 +260,344 @@ class TwitterauthorizationAction extends Action save_twitter_user($twitter_user->id, $twitter_user->screen_name); } + + + + function showPageNotice() + { + if ($this->error) { + $this->element('div', array('class' => 'error'), $this->error); + } else { + $this->element('div', 'instructions', + sprintf(_('This is the first time you\'ve logged into %s so we must connect your Twitter account to a local account. You can either create a new account, or connect with your existing account, if you have one.'), common_config('site', 'name'))); + } + } + + function title() + { + return _('Twitter Account Setup'); + } + + function showForm($error=null, $username=null) + { + $this->error = $error; + $this->username = $username; + + $this->showPage(); + } + + function showPage() + { + parent::showPage(); + } + + function showContent() + { + if (!empty($this->message_text)) { + $this->element('p', null, $this->message); + return; + } + + $this->elementStart('form', array('method' => 'post', + 'id' => 'form_settings_twitter_connect', + 'class' => 'form_settings', + 'action' => common_local_url('twitterauthorization'))); + $this->elementStart('fieldset', array('id' => 'settings_twitter_connect_options')); + $this->element('legend', null, _('Connection options')); + $this->elementStart('ul', 'form_data'); + $this->elementStart('li'); + $this->element('input', array('type' => 'checkbox', + 'id' => 'license', + 'class' => 'checkbox', + 'name' => 'license', + 'value' => 'true')); + $this->elementStart('label', array('class' => 'checkbox', 'for' => 'license')); + $this->text(_('My text and files are available under ')); + $this->element('a', array('href' => common_config('license', 'url')), + common_config('license', 'title')); + $this->text(_(' except this private data: password, email address, IM address, phone number.')); + $this->elementEnd('label'); + $this->elementEnd('li'); + $this->elementEnd('ul'); + $this->hidden('access_token_key', $this->access_token->key); + $this->hidden('access_token_secret', $this->access_token->secret); + $this->hidden('twuid', $this->twuid); + $this->hidden('tw_fields_name', $this->tw_fields['name']); + $this->hidden('tw_fields_fullname', $this->tw_fields['fullname']); + + $this->elementStart('fieldset'); + $this->hidden('token', common_session_token()); + $this->element('legend', null, + _('Create new account')); + $this->element('p', null, + _('Create a new user with this nickname.')); + $this->elementStart('ul', 'form_data'); + $this->elementStart('li'); + $this->input('newname', _('New nickname'), + ($this->username) ? $this->username : '', + _('1-64 lowercase letters or numbers, no punctuation or spaces')); + $this->elementEnd('li'); + $this->elementEnd('ul'); + $this->submit('create', _('Create')); + $this->elementEnd('fieldset'); + + $this->elementStart('fieldset'); + $this->element('legend', null, + _('Connect existing account')); + $this->element('p', null, + _('If you already have an account, login with your username and password to connect it to your Twitter account.')); + $this->elementStart('ul', 'form_data'); + $this->elementStart('li'); + $this->input('nickname', _('Existing nickname')); + $this->elementEnd('li'); + $this->elementStart('li'); + $this->password('password', _('Password')); + $this->elementEnd('li'); + $this->elementEnd('ul'); + $this->submit('connect', _('Connect')); + $this->elementEnd('fieldset'); + + $this->elementEnd('fieldset'); + $this->elementEnd('form'); + } + + function message($msg) + { + $this->message_text = $msg; + $this->showPage(); + } + + function createNewUser() + { + if (common_config('site', 'closed')) { + $this->clientError(_('Registration not allowed.')); + return; + } + + $invite = null; + + if (common_config('site', 'inviteonly')) { + $code = $_SESSION['invitecode']; + if (empty($code)) { + $this->clientError(_('Registration not allowed.')); + return; + } + + $invite = Invitation::staticGet($code); + + if (empty($invite)) { + $this->clientError(_('Not a valid invitation code.')); + return; + } + } + + $nickname = $this->trimmed('newname'); + + if (!Validate::string($nickname, array('min_length' => 1, + 'max_length' => 64, + 'format' => NICKNAME_FMT))) { + $this->showForm(_('Nickname must have only lowercase letters and numbers and no spaces.')); + return; + } + + if (!User::allowed_nickname($nickname)) { + $this->showForm(_('Nickname not allowed.')); + return; + } + + if (User::staticGet('nickname', $nickname)) { + $this->showForm(_('Nickname already in use. Try another one.')); + return; + } + + $fullname = trim($this->tw_fields['fullname']); + + $args = array('nickname' => $nickname, 'fullname' => $fullname); + + if (!empty($invite)) { + $args['code'] = $invite->code; + } + + $user = User::register($args); + + $result = $this->flinkUser($user->id, $this->twuid); + + if (!$result) { + $this->serverError(_('Error connecting user to Twitter.')); + return; + } + + common_set_user($user); + common_real_login(true); + + common_debug('Twitter Connect Plugin - ' . + "Registered new user $user->id from Twitter user $this->fbuid"); + + common_redirect(common_local_url('showstream', array('nickname' => $user->nickname)), + 303); + } + + function connectNewUser() + { + $nickname = $this->trimmed('nickname'); + $password = $this->trimmed('password'); + + if (!common_check_user($nickname, $password)) { + $this->showForm(_('Invalid username or password.')); + return; + } + + $user = User::staticGet('nickname', $nickname); + + if (!empty($user)) { + common_debug('Twitter Connect Plugin - ' . + "Legit user to connect to Twitter: $nickname"); + } + + $result = $this->flinkUser($user->id, $this->twuid); + + if (!$result) { + $this->serverError(_('Error connecting user to Twitter.')); + return; + } + + common_debug('Twitter Connnect Plugin - ' . + "Connected Twitter user $this->fbuid to local user $user->id"); + + common_set_user($user); + common_real_login(true); + + $this->goHome($user->nickname); + } + + function connectUser() + { + $user = common_current_user(); + + $result = $this->flinkUser($user->id, $this->twuid); + + if (empty($result)) { + $this->serverError(_('Error connecting user to Twitter.')); + return; + } + + common_debug('Twitter Connect Plugin - ' . + "Connected Twitter user $this->fbuid to local user $user->id"); + + // Return to Twitter connection settings tab + common_redirect(common_local_url('twittersettings'), 303); + } + + function tryLogin() + { + common_debug('Twitter Connect Plugin - ' . + "Trying login for Twitter user $this->fbuid."); + + $flink = Foreign_link::getByForeignID($this->twuid, TWITTER_SERVICE); + + if (!empty($flink)) { + $user = $flink->getUser(); + + if (!empty($user)) { + + common_debug('Twitter Connect Plugin - ' . + "Logged in Twitter user $flink->foreign_id as user $user->id ($user->nickname)"); + + common_set_user($user); + common_real_login(true); + $this->goHome($user->nickname); + } + + } else { + + common_debug('Twitter Connect Plugin - ' . + "No flink found for twuid: $this->twuid - new user"); + + $this->showForm(null, $this->bestNewNickname()); + } + } + + function goHome($nickname) + { + $url = common_get_returnto(); + if ($url) { + // We don't have to return to it again + common_set_returnto(null); + } else { + $url = common_local_url('all', + array('nickname' => + $nickname)); + } + + common_redirect($url, 303); + } + + function flinkUser($user_id, $twuid) + { + $flink = new Foreign_link(); + + $flink->user_id = $user_id; + $flink->foreign_id = $twuid; + $flink->service = TWITTER_SERVICE; + + $creds = TwitterOAuthClient::packToken($this->access_token); + + $flink->credentials = $creds; + $flink->created = common_sql_now(); + + // Defaults: noticesync on, everything else off + + $flink->set_flags(true, false, false, false); + + $flink_id = $flink->insert(); + + if (empty($flink_id)) { + common_log_db_error($flink, 'INSERT', __FILE__); + $this->serverError(_('Couldn\'t link your Twitter account.')); + } + + save_twitter_user($twuid, $this->tw_fields['name']); + + return $flink_id; + } + + + function bestNewNickname() + { + if (!empty($this->tw_fields['name'])) { + $nickname = $this->nicknamize($this->tw_fields['name']); + if ($this->isNewNickname($nickname)) { + return $nickname; + } + } + + return null; + } + + // Given a string, try to make it work as a nickname + + function nicknamize($str) + { + $str = preg_replace('/\W/', '', $str); + $str = str_replace(array('-', '_'), '', $str); + return strtolower($str); + } + + function isNewNickname($str) + { + if (!Validate::string($str, array('min_length' => 1, + 'max_length' => 64, + 'format' => NICKNAME_FMT))) { + return false; + } + if (!User::allowed_nickname($str)) { + return false; + } + if (User::staticGet('nickname', $str)) { + return false; + } + return true; + } + } diff --git a/plugins/TwitterBridge/twitterlogin.php b/plugins/TwitterBridge/twitterlogin.php new file mode 100644 index 0000000000..ae468ea15c --- /dev/null +++ b/plugins/TwitterBridge/twitterlogin.php @@ -0,0 +1,95 @@ +. + * + * @category Settings + * @package StatusNet + * @author Evan Prodromou + * @copyright 2008-2009 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET') && !defined('LACONICA')) { + exit(1); +} + +require_once INSTALLDIR . '/plugins/TwitterBridge/twitter.php'; + +/** + * Settings for Twitter integration + * + * @category Settings + * @package StatusNet + * @author Evan Prodromou + * @author Julien Chaumond + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + * + * @see SettingsAction + */ + + +class TwitterloginAction extends Action +{ + function handle($args) + { + parent::handle($args); + + if (common_is_real_login()) { + $this->clientError(_('Already logged in.')); + } + + $this->showPage(); + } + + function title() + { + return _('Twitter Login'); + } + + function getInstructions() + { + return _('Login with your Twitter Account'); + } + + function showPageNotice() + { + $instr = $this->getInstructions(); + $output = common_markup_to_html($instr); + $this->elementStart('div', 'instructions'); + $this->raw($output); + $this->elementEnd('div'); + } + + function showContent() + { + $this->elementStart('a', array('href' => common_local_url('twitterauthorization'))); + $this->element('img', array('src' => common_path('plugins/TwitterBridge/twitter_connect.gif'), + 'alt' => 'Connect my Twitter account')); + $this->elementEnd('a'); + } + + function showLocalNav() + { + $nav = new LoginGroupNav($this); + $nav->show(); + } +} From 2d97e15cd6b5fbda82218b97ce287a56e2665fb9 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Tue, 26 Jan 2010 01:25:33 +0000 Subject: [PATCH 093/134] - Twitter username wasn't getting stored in Foreign_user when linking Twitter account (fixed) - Updates to comments --- .../TwitterBridge/twitterauthorization.php | 109 ++++++++++-------- 1 file changed, 58 insertions(+), 51 deletions(-) diff --git a/plugins/TwitterBridge/twitterauthorization.php b/plugins/TwitterBridge/twitterauthorization.php index 8ae725374f..3f7316b7a4 100644 --- a/plugins/TwitterBridge/twitterauthorization.php +++ b/plugins/TwitterBridge/twitterauthorization.php @@ -53,7 +53,7 @@ class TwitterauthorizationAction extends Action var $twuid = null; var $tw_fields = null; var $access_token = null; - + /** * Initialize class members. Looks for 'oauth_token' parameter. * @@ -80,31 +80,37 @@ class TwitterauthorizationAction extends Action function handle($args) { parent::handle($args); - + if (common_logged_in()) { $user = common_current_user(); $flink = Foreign_link::getByUserID($user->id, TWITTER_SERVICE); - + // If there's already a foreign link record, it means we already // have an access token, and this is unecessary. So go back. - + if (isset($flink)) { common_redirect(common_local_url('twittersettings')); } } - - + if ($_SERVER['REQUEST_METHOD'] == 'POST') { + // User was not logged in to StatusNet before + $this->twuid = $this->trimmed('twuid'); - $this->tw_fields = array("name" => $this->trimmed('name'), "fullname" => $this->trimmed('fullname')); + + $this->tw_fields = array('name' => $this->trimmed('tw_fields_name'), + 'fullname' => $this->trimmed('tw_fields_fullname')); + $this->access_token = new OAuthToken($this->trimmed('access_token_key'), $this->trimmed('access_token_secret')); $token = $this->trimmed('token'); + if (!$token || $token != common_session_token()) { $this->showForm(_('There was a problem with your session token. Try again, please.')); return; } + if ($this->arg('create')) { if (!$this->boolean('license')) { $this->showForm(_('You can\'t register if you don\'t agree to the license.'), @@ -124,7 +130,7 @@ class TwitterauthorizationAction extends Action // $this->oauth_token is only populated once Twitter authorizes our // request token. If it's empty we're at the beginning of the auth // process - + if (empty($this->oauth_token)) { $this->authorizeRequestToken(); } else { @@ -181,6 +187,8 @@ class TwitterauthorizationAction extends Action $this->serverError(_m('Couldn\'t link your Twitter account.')); } + $twitter_user = null; + try { $client = new TwitterOAuthClient($_SESSION['twitter_request_token'], @@ -196,16 +204,19 @@ class TwitterauthorizationAction extends Action $twitter_user = $client->verifyCredentials(); } catch (OAuthClientException $e) { - $msg = sprintf('OAuth client cURL error - code: %1$s, msg: %2$s', + $msg = sprintf('OAuth client error - code: %1$s, msg: %2$s', $e->getCode(), $e->getMessage()); $this->serverError(_m('Couldn\'t link your Twitter account.')); } if (common_logged_in()) { + // Save the access token and Twitter user info + $this->saveForeignLink($atok, $twitter_user); - } - else{ + + } else { + $this->twuid = $twitter_user->id; $this->tw_fields = array("name" => $twitter_user->screen_name, "fullname" => $twitter_user->name); $this->access_token = $atok; @@ -216,7 +227,7 @@ class TwitterauthorizationAction extends Action unset($_SESSION['twitter_request_token']); unset($_SESSION['twitter_request_token_secret']); - + if (common_logged_in()) { common_redirect(common_local_url('twittersettings')); } @@ -260,8 +271,34 @@ class TwitterauthorizationAction extends Action save_twitter_user($twitter_user->id, $twitter_user->screen_name); } + function flinkUser($user_id, $twuid) + { + $flink = new Foreign_link(); + $flink->user_id = $user_id; + $flink->foreign_id = $twuid; + $flink->service = TWITTER_SERVICE; + $creds = TwitterOAuthClient::packToken($this->access_token); + + $flink->credentials = $creds; + $flink->created = common_sql_now(); + + // Defaults: noticesync on, everything else off + + $flink->set_flags(true, false, false, false); + + $flink_id = $flink->insert(); + + if (empty($flink_id)) { + common_log_db_error($flink, 'INSERT', __FILE__); + $this->serverError(_('Couldn\'t link your Twitter account.')); + } + + save_twitter_user($twuid, $this->tw_fields['name']); + + return $flink_id; + } function showPageNotice() { @@ -430,7 +467,7 @@ class TwitterauthorizationAction extends Action common_set_user($user); common_real_login(true); - common_debug('Twitter Connect Plugin - ' . + common_debug('TwitterBridge Plugin - ' . "Registered new user $user->id from Twitter user $this->fbuid"); common_redirect(common_local_url('showstream', array('nickname' => $user->nickname)), @@ -450,7 +487,7 @@ class TwitterauthorizationAction extends Action $user = User::staticGet('nickname', $nickname); if (!empty($user)) { - common_debug('Twitter Connect Plugin - ' . + common_debug('TwitterBridge Plugin - ' . "Legit user to connect to Twitter: $nickname"); } @@ -461,7 +498,7 @@ class TwitterauthorizationAction extends Action return; } - common_debug('Twitter Connnect Plugin - ' . + common_debug('TwitterBridge Plugin - ' . "Connected Twitter user $this->fbuid to local user $user->id"); common_set_user($user); @@ -481,17 +518,17 @@ class TwitterauthorizationAction extends Action return; } - common_debug('Twitter Connect Plugin - ' . + common_debug('TwitterBridge Plugin - ' . "Connected Twitter user $this->fbuid to local user $user->id"); // Return to Twitter connection settings tab common_redirect(common_local_url('twittersettings'), 303); } - + function tryLogin() { - common_debug('Twitter Connect Plugin - ' . - "Trying login for Twitter user $this->fbuid."); + common_debug('TwitterBridge Plugin - ' . + "Trying login for Twitter user $this->twuid."); $flink = Foreign_link::getByForeignID($this->twuid, TWITTER_SERVICE); @@ -500,7 +537,7 @@ class TwitterauthorizationAction extends Action if (!empty($user)) { - common_debug('Twitter Connect Plugin - ' . + common_debug('TwitterBridge Plugin - ' . "Logged in Twitter user $flink->foreign_id as user $user->id ($user->nickname)"); common_set_user($user); @@ -510,7 +547,7 @@ class TwitterauthorizationAction extends Action } else { - common_debug('Twitter Connect Plugin - ' . + common_debug('TwitterBridge Plugin - ' . "No flink found for twuid: $this->twuid - new user"); $this->showForm(null, $this->bestNewNickname()); @@ -531,37 +568,7 @@ class TwitterauthorizationAction extends Action common_redirect($url, 303); } - - function flinkUser($user_id, $twuid) - { - $flink = new Foreign_link(); - $flink->user_id = $user_id; - $flink->foreign_id = $twuid; - $flink->service = TWITTER_SERVICE; - - $creds = TwitterOAuthClient::packToken($this->access_token); - - $flink->credentials = $creds; - $flink->created = common_sql_now(); - - // Defaults: noticesync on, everything else off - - $flink->set_flags(true, false, false, false); - - $flink_id = $flink->insert(); - - if (empty($flink_id)) { - common_log_db_error($flink, 'INSERT', __FILE__); - $this->serverError(_('Couldn\'t link your Twitter account.')); - } - - save_twitter_user($twuid, $this->tw_fields['name']); - - return $flink_id; - } - - function bestNewNickname() { if (!empty($this->tw_fields['name'])) { From 1c1abfc284c3b81cfcd4cd95b80a0e5c120bd962 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Tue, 26 Jan 2010 01:51:40 +0000 Subject: [PATCH 094/134] Ask the user to set a password before disconnecting from Twitter --- plugins/TwitterBridge/twittersettings.php | 33 ++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/plugins/TwitterBridge/twittersettings.php b/plugins/TwitterBridge/twittersettings.php index bc9a636a15..0137060e9c 100644 --- a/plugins/TwitterBridge/twittersettings.php +++ b/plugins/TwitterBridge/twittersettings.php @@ -121,8 +121,35 @@ class TwittersettingsAction extends ConnectSettingsAction $this->elementEnd('p'); $this->element('p', 'form_note', _m('Connected Twitter account')); + $this->elementEnd('fieldset'); - $this->submit('remove', _m('Remove')); + $this->elementStart('fieldset'); + + $this->element('legend', null, _m('Disconnect my account from Twitter')); + + if (!$user->password) { + + $this->elementStart('p', array('class' => 'form_guide')); + $this->text(_m('Disconnecting your Twitter ' . + 'could make it impossible to log in! Please ')); + $this->element('a', + array('href' => common_local_url('passwordsettings')), + _m('set a password')); + + $this->text(_m(' first.')); + $this->elementEnd('p'); + } else { + + $note = _m('Keep your %1$s account but disconnect from Twitter. ' . + 'You can use your %1$s password to log in.'); + + $site = common_config('site', 'name'); + + $this->element('p', 'instructions', + sprintf($note, $site)); + + $this->submit('disconnect', _m('Disconnect')); + } $this->elementEnd('fieldset'); @@ -205,7 +232,7 @@ class TwittersettingsAction extends ConnectSettingsAction if ($this->arg('save')) { $this->savePreferences(); - } else if ($this->arg('remove')) { + } else if ($this->arg('disconnect')) { $this->removeTwitterAccount(); } else { $this->showForm(_m('Unexpected form submission.')); @@ -231,7 +258,7 @@ class TwittersettingsAction extends ConnectSettingsAction return; } - $this->showForm(_m('Twitter account removed.'), true); + $this->showForm(_m('Twitter account disconnected.'), true); } /** From ce44008d13e39d3e3a95af7d422a82f5ecce61e0 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Tue, 26 Jan 2010 02:40:44 +0000 Subject: [PATCH 095/134] Use "Sign in with Twitter" auth pattern and official Twitter button for Twitter-based login. See: http://apiwiki.twitter.com/Sign-in-with-Twitter --- plugins/TwitterBridge/twitter_connect.gif | Bin 2205 -> 0 bytes plugins/TwitterBridge/twitterauthorization.php | 8 +++++--- plugins/TwitterBridge/twitterlogin.php | 11 ++++++----- plugins/TwitterBridge/twitteroauthclient.php | 7 +++++-- 4 files changed, 16 insertions(+), 10 deletions(-) delete mode 100644 plugins/TwitterBridge/twitter_connect.gif diff --git a/plugins/TwitterBridge/twitter_connect.gif b/plugins/TwitterBridge/twitter_connect.gif deleted file mode 100644 index e3d8f3ed7b88b41d67b37f8be92f7af532f25816..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2205 zcmV;O2x9j~Nk%w1VZ#6!0OkMyGOg67-0df;(tOI~iqPgGrqG4s`T%UCxby!1|NoiR z>U7=s1AMdT`u<+N-BG#QRK4EB^Zq5M(rv}y7M#u^rO(Ca^Et8E-TMFJ`~FDL^d_m& z)9v;kq|V9r{#DfX;`8}Eve_!A)uZeE@&5l)!QoB5-kj|Hw&L)u@BPyF{urLnAE(ej zver1x^fa&6@cH}_k-@g%?_j{*LbTXLwcN7q{)x}#PPo~V>HH9lzii$4dEogls@Ef@ z(E0rS-uM5??Dvb&=MRp+5RbqptJ5f}(jTPHD6G>UrqCXx&m^ePDXh~Wr_djz&`rMG z1ADR_rq3s=(oVnL0BfTlrO+Rx&mN@CO1Rt;na)PI-NfheLbBN*rqCj!(?ho0A)wG- zz~3pS)Fi0Y8lTW0q|+p;(Lb@)GqKb?wcH||$@%#F&h7Z^_W4e?*)_7;!|(k;&-9nt z@g}IzF09r>x7hLd{3WB(_W1j|?EUrq{-*H$)babK<@2rL@&Et+A^8LV00000EC2ui z0K)(o000O7fKX5jgM|!-g@cESjEIDaj*Ehmh>(_+jgx|ejhv5>mywd2pP!1Dq@s+Q zn4XZ5kEEKZu&<7Zhf`BeySu!;Pr<)WCcbLA$h^P0!ph9Ty~xSW!N9}P)X&k?%e~#e zy(ZVg&d}b?;>^0m=DySC&C$ityX@B6hekz6MNCHgNB{;D$b<>N7)A;zT*$DY!-o(f zN}SlRh{cN-Giuz(F{6=>AVZ2ANwVa~B1QyZS;?}c%a(bL!m5v!~CW zKzZ66N)+V2Lt2v7NXoRS)220Ibeu}Hs@1DiDQexy5UW>?2?x~}OIFU0KWre7UCTCx z!Ju&e;~sqrU)3KbX(}ykl+JX3MK>yFa*#gfF+{vfEi|>fkFZ> zC~)2cbHXsddI?x?o|b-2kU#(%AV{cSVesjvaVQvP!2=RRDnW$z zDSJXF8mR(eqVPhY$64TKiw{b0NC+>)`ods)Xo$eAx1Nx}8r8`f!xHZWkbs@;m1qH` zFsvvT2ttS%pmBA!X&wi4&KaPfg9;IbmV*v(-V3E|fGG$Y2s^M*}&ekirQRQ)~eL26!~g zFcCg@c_n}z3kt%O!UnK}U=u7c@Dj!;umrX*C+L94K9op+4>40Eg(g}cxAkfg~5}hvbbkk)by~NZYIN$)jG!#sx$7rXmwwE0r zqA?u_WRSxMBiLYr#3LXuC>#0v%LmFC;$M&B!e3SU;-7m!M|<*Lws#v z02Rn#4q*TT5LAGE2{=OzcUA!#;t+i|sKC~ASb;PA%K;T|1Dyg;0WtY7h6&h06Q5Yb zEDoRw=;Oc*6p%z2YLSU(Orsjts6#?{;f-GCK^s)Cg9qy22X-Jq0|Zk7IKEK_1?Ykx z2ib)r3;=yw8bA`j#6lbha%WwDUl&Z6gslk@2Qm;72Vhu*0hCDpPZgMez0g=PEOJ1H zL=@$q&X+#-v5x@w8i4s?SpfPe;C)$qA1zfG02KxRUmz%B7THM5V(PF9gBSxG0bmCV zeBgl#;K2eGumc_lW(>-FBN39&gl>BCo8SzmILArOa+>p;-AsZy*U8Ryy7QgzjHf!$ zNzZetlMrG6gFf#Ngamxx1Ja!4G+i))1c)J@`Wylaww79YPYEK+~Gq^rkq?sZMEHg`WEK zr$7y=P=`uXpYHUiNKL9zmx|OX9N`cmT|r30Aeaci!KxAZ$ODx6AW|}{z=B5zt60ZM z*0P%QtY}TETGz_fwz_q!#*C|6b!deS41xl9%_{}ozz4^bMh;%p>kumN*2123u82*n zViRlF#*(!HRyc%SCrjDNQeX&5$gE~J%h}F)_OqH5s})8|+R~c#w5Uz3YNNo~*1Gn! zu#K&3S$l=r+V-}%&8=>Cn_DGB;SgB}u5gD-+~Njz2v-2Da+k~8<~sMe(2cHVXG`7c zS~m(xIK%signin = $this->boolean('signin'); $this->oauth_token = $this->arg('oauth_token'); return true; @@ -160,7 +162,7 @@ class TwitterauthorizationAction extends Action $_SESSION['twitter_request_token'] = $req_tok->key; $_SESSION['twitter_request_token_secret'] = $req_tok->secret; - $auth_link = $client->getAuthorizeLink($req_tok); + $auth_link = $client->getAuthorizeLink($req_tok, $this->signin); } catch (OAuthClientException $e) { $msg = sprintf('OAuth client cURL error - code: %1s, msg: %2s', diff --git a/plugins/TwitterBridge/twitterlogin.php b/plugins/TwitterBridge/twitterlogin.php index ae468ea15c..ae67b4c154 100644 --- a/plugins/TwitterBridge/twitterlogin.php +++ b/plugins/TwitterBridge/twitterlogin.php @@ -46,7 +46,6 @@ require_once INSTALLDIR . '/plugins/TwitterBridge/twitter.php'; * @see SettingsAction */ - class TwitterloginAction extends Action { function handle($args) @@ -67,7 +66,7 @@ class TwitterloginAction extends Action function getInstructions() { - return _('Login with your Twitter Account'); + return _('Login with your Twitter account'); } function showPageNotice() @@ -81,9 +80,11 @@ class TwitterloginAction extends Action function showContent() { - $this->elementStart('a', array('href' => common_local_url('twitterauthorization'))); - $this->element('img', array('src' => common_path('plugins/TwitterBridge/twitter_connect.gif'), - 'alt' => 'Connect my Twitter account')); + $this->elementStart('a', array('href' => common_local_url('twitterauthorization', + null, + array('signin' => true)))); + $this->element('img', array('src' => common_path('plugins/TwitterBridge/Sign-in-with-Twitter-lighter.png'), + 'alt' => 'Sign in with Twitter')); $this->elementEnd('a'); } diff --git a/plugins/TwitterBridge/twitteroauthclient.php b/plugins/TwitterBridge/twitteroauthclient.php index bad2b74ca3..277e7ab409 100644 --- a/plugins/TwitterBridge/twitteroauthclient.php +++ b/plugins/TwitterBridge/twitteroauthclient.php @@ -45,6 +45,7 @@ class TwitterOAuthClient extends OAuthClient { public static $requestTokenURL = 'https://twitter.com/oauth/request_token'; public static $authorizeURL = 'https://twitter.com/oauth/authorize'; + public static $signinUrl = 'https://twitter.com/oauth/authenticate'; public static $accessTokenURL = 'https://twitter.com/oauth/access_token'; /** @@ -97,9 +98,11 @@ class TwitterOAuthClient extends OAuthClient * * @return the link */ - function getAuthorizeLink($request_token) + function getAuthorizeLink($request_token, $signin = false) { - return parent::getAuthorizeLink(self::$authorizeURL, + $url = ($signin) ? self::$signinUrl : self::$authorizeURL; + + return parent::getAuthorizeLink($url, $request_token, common_local_url('twitterauthorization')); } From f7450d2ca8b420260caf69bf1cded687d8eaf7b5 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Tue, 26 Jan 2010 07:29:40 +0000 Subject: [PATCH 096/134] - Remove redundant function - clean up log msgs --- .../TwitterBridge/twitterauthorization.php | 76 +++++++------------ 1 file changed, 29 insertions(+), 47 deletions(-) diff --git a/plugins/TwitterBridge/twitterauthorization.php b/plugins/TwitterBridge/twitterauthorization.php index 15408668fc..a95cdebb97 100644 --- a/plugins/TwitterBridge/twitterauthorization.php +++ b/plugins/TwitterBridge/twitterauthorization.php @@ -101,7 +101,7 @@ class TwitterauthorizationAction extends Action $this->twuid = $this->trimmed('twuid'); - $this->tw_fields = array('name' => $this->trimmed('tw_fields_name'), + $this->tw_fields = array('screen_name' => $this->trimmed('tw_fields_screen_name'), 'fullname' => $this->trimmed('tw_fields_fullname')); $this->access_token = new OAuthToken($this->trimmed('access_token_key'), $this->trimmed('access_token_secret')); @@ -215,12 +215,15 @@ class TwitterauthorizationAction extends Action // Save the access token and Twitter user info - $this->saveForeignLink($atok, $twitter_user); + $user = common_current_user(); + $this->saveForeignLink($user->id, $twitter_user->id, $atok); + save_twitter_user($twitter_user->id, $twitter_user->name); } else { $this->twuid = $twitter_user->id; - $this->tw_fields = array("name" => $twitter_user->screen_name, "fullname" => $twitter_user->name); + $this->tw_fields = array("screen_name" => $twitter_user->screen_name, + "name" => $twitter_user->name); $this->access_token = $atok; $this->tryLogin(); } @@ -239,19 +242,18 @@ class TwitterauthorizationAction extends Action * Saves a Foreign_link between Twitter user and local user, * which includes the access token and secret. * - * @param OAuthToken $access_token the access token to save - * @param mixed $twitter_user twitter API user object + * @param int $user_id StatusNet user ID + * @param int $twuid Twitter user ID + * @param OAuthToken $token the access token to save * * @return nothing */ - function saveForeignLink($access_token, $twitter_user) + function saveForeignLink($user_id, $twuid, $access_token) { - $user = common_current_user(); - $flink = new Foreign_link(); - $flink->user_id = $user->id; - $flink->foreign_id = $twitter_user->id; + $flink->user_id = $user_id; + $flink->foreign_id = $twuid; $flink->service = TWITTER_SERVICE; $creds = TwitterOAuthClient::packToken($access_token); @@ -265,40 +267,11 @@ class TwitterauthorizationAction extends Action $flink_id = $flink->insert(); - if (empty($flink_id)) { - common_log_db_error($flink, 'INSERT', __FILE__); - $this->serverError(_m('Couldn\'t link your Twitter account.')); - } - - save_twitter_user($twitter_user->id, $twitter_user->screen_name); - } - - function flinkUser($user_id, $twuid) - { - $flink = new Foreign_link(); - - $flink->user_id = $user_id; - $flink->foreign_id = $twuid; - $flink->service = TWITTER_SERVICE; - - $creds = TwitterOAuthClient::packToken($this->access_token); - - $flink->credentials = $creds; - $flink->created = common_sql_now(); - - // Defaults: noticesync on, everything else off - - $flink->set_flags(true, false, false, false); - - $flink_id = $flink->insert(); - if (empty($flink_id)) { common_log_db_error($flink, 'INSERT', __FILE__); $this->serverError(_('Couldn\'t link your Twitter account.')); } - save_twitter_user($twuid, $this->tw_fields['name']); - return $flink_id; } @@ -361,8 +334,8 @@ class TwitterauthorizationAction extends Action $this->hidden('access_token_key', $this->access_token->key); $this->hidden('access_token_secret', $this->access_token->secret); $this->hidden('twuid', $this->twuid); + $this->hidden('tw_fields_screen_name', $this->tw_fields['screen_name']); $this->hidden('tw_fields_name', $this->tw_fields['name']); - $this->hidden('tw_fields_fullname', $this->tw_fields['fullname']); $this->elementStart('fieldset'); $this->hidden('token', common_session_token()); @@ -449,7 +422,7 @@ class TwitterauthorizationAction extends Action return; } - $fullname = trim($this->tw_fields['fullname']); + $fullname = trim($this->tw_fields['name']); $args = array('nickname' => $nickname, 'fullname' => $fullname); @@ -459,7 +432,11 @@ class TwitterauthorizationAction extends Action $user = User::register($args); - $result = $this->flinkUser($user->id, $this->twuid); + $result = $this->saveForeignLink($user->id, + $this->twuid, + $this->access_token); + + save_twitter_user($this->twuid, $this->tw_fields['screen_name']); if (!$result) { $this->serverError(_('Error connecting user to Twitter.')); @@ -470,7 +447,7 @@ class TwitterauthorizationAction extends Action common_real_login(true); common_debug('TwitterBridge Plugin - ' . - "Registered new user $user->id from Twitter user $this->fbuid"); + "Registered new user $user->id from Twitter user $this->twuid"); common_redirect(common_local_url('showstream', array('nickname' => $user->nickname)), 303); @@ -493,7 +470,11 @@ class TwitterauthorizationAction extends Action "Legit user to connect to Twitter: $nickname"); } - $result = $this->flinkUser($user->id, $this->twuid); + $result = $this->saveForeignLink($user->id, + $this->twuid, + $this->access_token); + + save_twitter_user($this->twuid, $this->tw_fields['screen_name']); if (!$result) { $this->serverError(_('Error connecting user to Twitter.')); @@ -501,7 +482,7 @@ class TwitterauthorizationAction extends Action } common_debug('TwitterBridge Plugin - ' . - "Connected Twitter user $this->fbuid to local user $user->id"); + "Connected Twitter user $this->twuid to local user $user->id"); common_set_user($user); common_real_login(true); @@ -521,7 +502,7 @@ class TwitterauthorizationAction extends Action } common_debug('TwitterBridge Plugin - ' . - "Connected Twitter user $this->fbuid to local user $user->id"); + "Connected Twitter user $this->twuid to local user $user->id"); // Return to Twitter connection settings tab common_redirect(common_local_url('twittersettings'), 303); @@ -532,7 +513,8 @@ class TwitterauthorizationAction extends Action common_debug('TwitterBridge Plugin - ' . "Trying login for Twitter user $this->twuid."); - $flink = Foreign_link::getByForeignID($this->twuid, TWITTER_SERVICE); + $flink = Foreign_link::getByForeignID($this->twuid, + TWITTER_SERVICE); if (!empty($flink)) { $user = $flink->getUser(); From 02957d28541b3164df117d54788d1152c85ff00b Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Tue, 26 Jan 2010 07:50:01 +0000 Subject: [PATCH 097/134] Add Julien C to author comments --- plugins/TwitterBridge/TwitterBridgePlugin.php | 12 +++++------- plugins/TwitterBridge/twitterauthorization.php | 8 +++++--- plugins/TwitterBridge/twitterlogin.php | 15 ++++++++------- 3 files changed, 18 insertions(+), 17 deletions(-) diff --git a/plugins/TwitterBridge/TwitterBridgePlugin.php b/plugins/TwitterBridge/TwitterBridgePlugin.php index e39ec7be03..c7f57ffc77 100644 --- a/plugins/TwitterBridge/TwitterBridgePlugin.php +++ b/plugins/TwitterBridge/TwitterBridgePlugin.php @@ -20,7 +20,8 @@ * @category Plugin * @package StatusNet * @author Zach Copley - * @copyright 2009 Control Yourself, Inc. + * @author Julien C + * @copyright 2009-2010 Control Yourself, Inc. * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://laconi.ca/ */ @@ -41,6 +42,7 @@ define('TWITTERBRIDGEPLUGIN_VERSION', '0.9'); * @category Plugin * @package StatusNet * @author Zach Copley + * @author Julien C * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://laconi.ca/ * @link http://twitter.com/ @@ -72,16 +74,13 @@ class TwitterBridgePlugin extends Plugin $m->connect('twitter/authorization', array('action' => 'twitterauthorization')); $m->connect('settings/twitter', array('action' => 'twittersettings')); - $m->connect('main/twitterlogin', array('action' => 'twitterlogin')); return true; } - - - + /* - * Add a login tab for Twitter Connect + * Add a login tab for 'Sign in with Twitter' * * @param Action &action the current action * @@ -99,7 +98,6 @@ class TwitterBridgePlugin extends Plugin return true; } - /** * Add the Twitter Settings page to the Connect Settings menu diff --git a/plugins/TwitterBridge/twitterauthorization.php b/plugins/TwitterBridge/twitterauthorization.php index a95cdebb97..b2657ff61f 100644 --- a/plugins/TwitterBridge/twitterauthorization.php +++ b/plugins/TwitterBridge/twitterauthorization.php @@ -19,10 +19,11 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . * - * @category TwitterauthorizationAction + * @category Plugin * @package StatusNet * @author Zach Copley - * @copyright 2009 StatusNet, Inc. + * @author Julien C + * @copyright 2009-2010 StatusNet, Inc. * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ @@ -41,9 +42,10 @@ require_once INSTALLDIR . '/plugins/TwitterBridge/twitter.php'; * (Foreign_link) between the StatusNet user and Twitter user and stores the * access token and secret in the link. * - * @category Twitter + * @category Plugin * @package StatusNet * @author Zach Copley + * @author Julien C * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://laconi.ca/ * diff --git a/plugins/TwitterBridge/twitterlogin.php b/plugins/TwitterBridge/twitterlogin.php index ae67b4c154..79421fb27d 100644 --- a/plugins/TwitterBridge/twitterlogin.php +++ b/plugins/TwitterBridge/twitterlogin.php @@ -2,7 +2,7 @@ /** * StatusNet, the distributed open-source microblogging tool * - * Settings for Twitter integration + * 'Sign in with Twitter' login page * * PHP version 5 * @@ -19,10 +19,11 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . * - * @category Settings + * @category Login * @package StatusNet - * @author Evan Prodromou - * @copyright 2008-2009 StatusNet, Inc. + * @author Julien Chaumond + * @author Zach Copley + * @copyright 2010 StatusNet, Inc. * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ @@ -34,12 +35,12 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { require_once INSTALLDIR . '/plugins/TwitterBridge/twitter.php'; /** - * Settings for Twitter integration + * Page for logging in with Twitter * - * @category Settings + * @category Login * @package StatusNet - * @author Evan Prodromou * @author Julien Chaumond + * @author Zach Copley * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ * From e05c32572234dc0b4adb19be7bbe9879f49ec7ee Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Tue, 26 Jan 2010 19:13:05 +0100 Subject: [PATCH 098/134] Updated geolocation sharing in notice form for Realtime pop --- plugins/Realtime/realtimeupdate.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/Realtime/realtimeupdate.css b/plugins/Realtime/realtimeupdate.css index 56f869354d..31e7c2ae66 100644 --- a/plugins/Realtime/realtimeupdate.css +++ b/plugins/Realtime/realtimeupdate.css @@ -18,7 +18,8 @@ display:none; } .realtime-popup #form_notice label[for=notice_data-attach], -.realtime-popup #form_notice #notice_data-attach { +.realtime-popup #form_notice #notice_data-attach, +.realtime-popup #form_notice label[for=notice_data-geo] { top:0; } From ad6f0501ff24cb287dedd21271d58c91e64b6b43 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Tue, 26 Jan 2010 09:25:39 -0800 Subject: [PATCH 099/134] Site metadata tags in status_network: single 'tags' field, pipe-separated. $sn->tags() returns tag list as array; $sn->hasTag('blah') to check for a particular tag only Could be used to control things in config file: $sn = Status_network::setupSite($_server, $_path, $_wildcard); if (!$sn) { die("No such site"); } if ($sn->hasTag('individual')) { /* blah */ } Note memcached keys are unchanged; if tags are changed from an external tool clear: statusnet::status_network:: for s 'nickname', 'hostname', and 'pathname' --- classes/Status_network.php | 20 ++++++++++++++++++++ db/site.sql | 2 ++ 2 files changed, 22 insertions(+) diff --git a/classes/Status_network.php b/classes/Status_network.php index 445f8a5a3c..f1314d6151 100644 --- a/classes/Status_network.php +++ b/classes/Status_network.php @@ -39,6 +39,7 @@ class Status_network extends DB_DataObject public $logo; // varchar(255) public $created; // datetime() not_null public $modified; // timestamp() not_null default_CURRENT_TIMESTAMP + public $tags; // text /* Static get */ function staticGet($k,$v=NULL) { return DB_DataObject::staticGet('Status_network',$k,$v); } @@ -245,4 +246,23 @@ class Status_network extends DB_DataObject return $this->nickname . '.' . self::$wildcard; } } + + /** + * Return site meta-info tags as an array + * @return array of strings + */ + function getTags() + { + return array_filter(explode("|", strval($this->tags))); + } + + /** + * Check if this site record has a particular meta-info tag attached. + * @param string $tag + * @return bool + */ + function hasTag($tag) + { + return in_array($tag, $this->getTags()); + } } diff --git a/db/site.sql b/db/site.sql index a9f64e5a5d..791303bd54 100644 --- a/db/site.sql +++ b/db/site.sql @@ -14,6 +14,8 @@ create table status_network ( sitename varchar(255) comment 'display name', theme varchar(255) comment 'theme name', logo varchar(255) comment 'site logo', + + tags text comment 'site meta-info tags (pipe-separated)', created datetime not null comment 'date this record was created', modified timestamp comment 'date this record was modified' From 58be61b6417119de1b03ef50e166369c4005e4d1 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Tue, 26 Jan 2010 11:49:49 -0800 Subject: [PATCH 100/134] Control channel for queue daemons to request graceful shutdown, restart, or update to listen to a newly added or reconfigured site. queuectl.php --update -s queuectl.php --stop queuectl.php --restart Default control channel is /topic/statusnet-control. For external utilities to send a site update ping direct to the queue server, connect via Stomp and send a message formatted thus: update: (Nickname here, *not* server hostname! The rest of the queues will be updated to use nicknames later.) Note that all currently-connected queue daemons will get these notifications, including both queuedaemon.php and xmppdaemon.php. (XMPP will ignore site update requests for sites that it's not handling.) Limitations: * only implemented for stomp queue manager so far * --update may not yet handle a changed server name properly * --restart won't reload PHP code files that were already loaded at startup. Still need to stop and restart the daemons from 'outside' when updating code base. --- classes/Status_network.php | 11 ++- lib/default.php | 1 + lib/iomaster.php | 53 ++++++++++--- lib/queuemanager.php | 17 ++++ lib/spawningdaemon.php | 58 ++++++++++---- lib/stompqueuemanager.php | 159 ++++++++++++++++++++++++++++++++++--- scripts/queuectl.php | 85 ++++++++++++++++++++ scripts/queuedaemon.php | 2 +- scripts/xmppdaemon.php | 2 +- 9 files changed, 347 insertions(+), 41 deletions(-) create mode 100755 scripts/queuectl.php diff --git a/classes/Status_network.php b/classes/Status_network.php index f1314d6151..4bda24b6a0 100644 --- a/classes/Status_network.php +++ b/classes/Status_network.php @@ -42,7 +42,16 @@ class Status_network extends DB_DataObject public $tags; // text /* Static get */ - function staticGet($k,$v=NULL) { return DB_DataObject::staticGet('Status_network',$k,$v); } + function staticGet($k,$v=NULL) { + $i = DB_DataObject::staticGet('Status_network',$k,$v); + + // Don't use local process cache; if we're fetching multiple + // times it's because we're reloading it in a long-running + // process; we need a fresh copy! + global $_DB_DATAOBJECT; + unset($_DB_DATAOBJECT['CACHE']['status_network']); + return $i; + } /* the code above is auto generated do not remove the tag below */ ###END_AUTOCODE diff --git a/lib/default.php b/lib/default.php index 35115542f2..d2dd8ab33c 100644 --- a/lib/default.php +++ b/lib/default.php @@ -81,6 +81,7 @@ $default = 'subsystem' => 'db', # default to database, or 'stomp' 'stomp_server' => null, 'queue_basename' => '/queue/statusnet/', + 'control_channel' => '/topic/statusnet-control', // broadcasts to all queue daemons 'stomp_username' => null, 'stomp_password' => null, 'monitor' => null, // URL to monitor ping endpoint (work in progress) diff --git a/lib/iomaster.php b/lib/iomaster.php index 3bf82bc6b4..bcab3542be 100644 --- a/lib/iomaster.php +++ b/lib/iomaster.php @@ -38,6 +38,9 @@ abstract class IoMaster protected $pollTimeouts = array(); protected $lastPoll = array(); + public $shutdown = false; // Did we do a graceful shutdown? + public $respawn = true; // Should we respawn after shutdown? + /** * @param string $id process ID to use in logging/monitoring */ @@ -144,7 +147,7 @@ abstract class IoMaster $this->logState('init'); $this->start(); - while (true) { + while (!$this->shutdown) { $timeouts = array_values($this->pollTimeouts); $timeouts[] = 60; // default max timeout @@ -196,22 +199,31 @@ abstract class IoMaster $this->logState('idle'); $this->idle(); - $memoryLimit = $this->softMemoryLimit(); - if ($memoryLimit > 0) { - $usage = memory_get_usage(); - if ($usage > $memoryLimit) { - common_log(LOG_INFO, "Queue thread hit soft memory limit ($usage > $memoryLimit); gracefully restarting."); - break; - } else if (common_config('queue', 'debug_memory')) { - common_log(LOG_DEBUG, "Memory usage $usage"); - } - } + $this->checkMemory(); } $this->logState('shutdown'); $this->finish(); } + /** + * Check runtime memory usage, possibly triggering a graceful shutdown + * and thread respawn if we've crossed the soft limit. + */ + protected function checkMemory() + { + $memoryLimit = $this->softMemoryLimit(); + if ($memoryLimit > 0) { + $usage = memory_get_usage(); + if ($usage > $memoryLimit) { + common_log(LOG_INFO, "Queue thread hit soft memory limit ($usage > $memoryLimit); gracefully restarting."); + $this->requestRestart(); + } else if (common_config('queue', 'debug_memory')) { + common_log(LOG_DEBUG, "Memory usage $usage"); + } + } + } + /** * Return fully-parsed soft memory limit in bytes. * @return intval 0 or -1 if not set @@ -354,5 +366,24 @@ abstract class IoMaster $owners[] = "thread:" . $this->id; $this->monitor->stats($key, $owners); } + + /** + * For IoManagers to request a graceful shutdown at end of event loop. + */ + public function requestShutdown() + { + $this->shutdown = true; + $this->respawn = false; + } + + /** + * For IoManagers to request a graceful restart at end of event loop. + */ + public function requestRestart() + { + $this->shutdown = true; + $this->respawn = true; + } + } diff --git a/lib/queuemanager.php b/lib/queuemanager.php index 1bc8de1f78..afe710e884 100644 --- a/lib/queuemanager.php +++ b/lib/queuemanager.php @@ -100,6 +100,23 @@ abstract class QueueManager extends IoManager $this->initialize(); } + /** + * Optional; ping any running queue handler daemons with a notification + * such as announcing a new site to handle or requesting clean shutdown. + * This avoids having to restart all the daemons manually to update configs + * and such. + * + * Called from scripts/queuectl.php controller utility. + * + * @param string $event event key + * @param string $param optional parameter to append to key + * @return boolean success + */ + public function sendControlSignal($event, $param='') + { + throw new Exception(get_class($this) . " does not support control signals."); + } + /** * Store an object (usually/always a Notice) into the given queue * for later processing. No guarantee is made on when it will be diff --git a/lib/spawningdaemon.php b/lib/spawningdaemon.php index 8baefe88e8..b1961d6880 100644 --- a/lib/spawningdaemon.php +++ b/lib/spawningdaemon.php @@ -36,6 +36,11 @@ abstract class SpawningDaemon extends Daemon { protected $threads=1; + const EXIT_OK = 0; + const EXIT_ERR = 1; + const EXIT_SHUTDOWN = 100; + const EXIT_RESTART = 101; + function __construct($id=null, $daemonize=true, $threads=1) { parent::__construct($daemonize); @@ -49,7 +54,7 @@ abstract class SpawningDaemon extends Daemon /** * Perform some actual work! * - * @return boolean true on success, false on failure + * @return int exit code; use self::EXIT_SHUTDOWN to request not to respawn. */ public abstract function runThread(); @@ -84,23 +89,30 @@ abstract class SpawningDaemon extends Daemon while (count($children) > 0) { $status = null; $pid = pcntl_wait($status); - if ($pid > 0) { + if ($pid > 0 && pcntl_wifexited($status)) { + $exitCode = pcntl_wexitstatus($status); + $i = array_search($pid, $children); if ($i === false) { - $this->log(LOG_ERR, "Unrecognized child pid $pid exited!"); + $this->log(LOG_ERR, "Unrecognized child pid $pid exited with status $exitCode"); continue; } unset($children[$i]); - $this->log(LOG_INFO, "Thread $i pid $pid exited."); - - $pid = pcntl_fork(); - if ($pid < 0) { - $this->log(LOG_ERROR, "Couldn't fork to respawn thread $i; aborting thread.\n"); - } else if ($pid == 0) { - $this->initAndRunChild($i); + + if ($this->shouldRespawn($exitCode)) { + $this->log(LOG_INFO, "Thread $i pid $pid exited with status $exitCode; respawing."); + + $pid = pcntl_fork(); + if ($pid < 0) { + $this->log(LOG_ERROR, "Couldn't fork to respawn thread $i; aborting thread.\n"); + } else if ($pid == 0) { + $this->initAndRunChild($i); + } else { + $this->log(LOG_INFO, "Respawned thread $i as pid $pid"); + $children[$i] = $pid; + } } else { - $this->log(LOG_INFO, "Respawned thread $i as pid $pid"); - $children[$i] = $pid; + $this->log(LOG_INFO, "Thread $i pid $pid exited with status $exitCode; closing out thread."); } } } @@ -108,6 +120,24 @@ abstract class SpawningDaemon extends Daemon return true; } + /** + * Determine whether to respawn an exited subprocess based on its exit code. + * Otherwise we'll respawn all exits by default. + * + * @param int $exitCode + * @return boolean true to respawn + */ + protected function shouldRespawn($exitCode) + { + if ($exitCode == self::EXIT_SHUTDOWN) { + // Thread requested a clean shutdown. + return false; + } else { + // Otherwise we should always respawn! + return true; + } + } + /** * Initialize things for a fresh thread, call runThread(), and * exit at completion with appropriate return value. @@ -116,8 +146,8 @@ abstract class SpawningDaemon extends Daemon { $this->set_id($this->get_id() . "." . $thread); $this->resetDb(); - $ok = $this->runThread(); - exit($ok ? 0 : 1); + $exitCode = $this->runThread(); + exit($exitCode); } /** diff --git a/lib/stompqueuemanager.php b/lib/stompqueuemanager.php index 8f0091a138..89f3d74cce 100644 --- a/lib/stompqueuemanager.php +++ b/lib/stompqueuemanager.php @@ -38,8 +38,10 @@ class StompQueueManager extends QueueManager var $password = null; var $base = null; var $con = null; + protected $control; protected $sites = array(); + protected $subscriptions = array(); protected $useTransactions = true; protected $transaction = null; @@ -52,6 +54,7 @@ class StompQueueManager extends QueueManager $this->username = common_config('queue', 'stomp_username'); $this->password = common_config('queue', 'stomp_password'); $this->base = common_config('queue', 'queue_basename'); + $this->control = common_config('queue', 'control_channel'); } /** @@ -77,6 +80,36 @@ class StompQueueManager extends QueueManager $this->initialize(); } + /** + * Optional; ping any running queue handler daemons with a notification + * such as announcing a new site to handle or requesting clean shutdown. + * This avoids having to restart all the daemons manually to update configs + * and such. + * + * Currently only relevant for multi-site queue managers such as Stomp. + * + * @param string $event event key + * @param string $param optional parameter to append to key + * @return boolean success + */ + public function sendControlSignal($event, $param='') + { + $message = $event; + if ($param != '') { + $message .= ':' . $param; + } + $this->_connect(); + $result = $this->con->send($this->control, + $message, + array ('created' => common_sql_now())); + if ($result) { + $this->_log(LOG_INFO, "Sent control ping to queue daemons: $message"); + return true; + } else { + $this->_log(LOG_ERR, "Failed sending control ping to queue daemons: $message"); + return false; + } + } /** * Instantiate the appropriate QueueHandler class for the given queue. @@ -86,7 +119,7 @@ class StompQueueManager extends QueueManager */ function getHandler($queue) { - $handlers = $this->handlers[common_config('site', 'server')]; + $handlers = $this->handlers[$this->currentSite()]; if (isset($handlers[$queue])) { $class = $handlers[$queue]; if (class_exists($class)) { @@ -108,7 +141,7 @@ class StompQueueManager extends QueueManager function getQueues() { $group = $this->activeGroup(); - $site = common_config('site', 'server'); + $site = $this->currentSite(); if (empty($this->groups[$site][$group])) { return array(); } else { @@ -126,8 +159,8 @@ class StompQueueManager extends QueueManager */ public function connect($transport, $class, $group='queuedaemon') { - $this->handlers[common_config('site', 'server')][$transport] = $class; - $this->groups[common_config('site', 'server')][$group][$transport] = $class; + $this->handlers[$this->currentSite()][$transport] = $class; + $this->groups[$this->currentSite()][$group][$transport] = $class; } /** @@ -180,7 +213,16 @@ class StompQueueManager extends QueueManager $ok = true; $frames = $this->con->readFrames(); foreach ($frames as $frame) { - $ok = $ok && $this->_handleItem($frame); + $dest = $frame->headers['destination']; + if ($dest == $this->control) { + if (!$this->handleControlSignal($frame)) { + // We got a control event that requests a shutdown; + // close out and stop handling anything else! + break; + } + } else { + $ok = $ok && $this->handleItem($frame); + } } return $ok; } @@ -197,6 +239,9 @@ class StompQueueManager extends QueueManager public function start($master) { parent::start($master); + $this->_connect(); + + $this->con->subscribe($this->control); if ($this->sites) { foreach ($this->sites as $server) { StatusNet::init($server); @@ -221,6 +266,7 @@ class StompQueueManager extends QueueManager // If there are any outstanding delivered messages we haven't processed, // free them for another thread to take. $this->rollback(); + $this->con->unsubscribe($this->control); if ($this->sites) { foreach ($this->sites as $server) { StatusNet::init($server); @@ -231,7 +277,16 @@ class StompQueueManager extends QueueManager } return true; } - + + /** + * Get identifier of the currently active site configuration + * @return string + */ + protected function currentSite() + { + return common_config('site', 'server'); // @fixme switch to nickname + } + /** * Lazy open connection to Stomp queue server. */ @@ -255,22 +310,29 @@ class StompQueueManager extends QueueManager */ protected function doSubscribe() { + $site = $this->currentSite(); $this->_connect(); foreach ($this->getQueues() as $queue) { $rawqueue = $this->queueName($queue); + $this->subscriptions[$site][$queue] = $rawqueue; $this->_log(LOG_INFO, "Subscribing to $rawqueue"); $this->con->subscribe($rawqueue); } } - + /** * Subscribe from all enabled notice queues for the current site. */ protected function doUnsubscribe() { + $site = $this->currentSite(); $this->_connect(); - foreach ($this->getQueues() as $queue) { - $this->con->unsubscribe($this->queueName($queue)); + if (!empty($this->subscriptions[$site])) { + foreach ($this->subscriptions[$site] as $queue => $rawqueue) { + $this->_log(LOG_INFO, "Unsubscribing from $rawqueue"); + $this->con->unsubscribe($rawqueue); + unset($this->subscriptions[$site][$queue]); + } } } @@ -286,10 +348,10 @@ class StompQueueManager extends QueueManager * @param StompFrame $frame * @return bool */ - protected function _handleItem($frame) + protected function handleItem($frame) { list($site, $queue) = $this->parseDestination($frame->headers['destination']); - if ($site != common_config('site', 'server')) { + if ($site != $this->currentSite()) { $this->stats('switch'); StatusNet::init($site); } @@ -317,7 +379,7 @@ class StompQueueManager extends QueueManager $handler = $this->getHandler($queue); if (!$handler) { - $this->_log(LOG_ERROR, "Missing handler class; skipping $info"); + $this->_log(LOG_ERR, "Missing handler class; skipping $info"); $this->ack($frame); $this->commit(); $this->begin(); @@ -348,6 +410,77 @@ class StompQueueManager extends QueueManager return true; } + /** + * Process a control signal broadcast. + * + * @param array $frame Stomp frame + * @return bool true to continue; false to stop further processing. + */ + protected function handleControlSignal($frame) + { + $message = trim($frame->body); + if (strpos($message, ':') !== false) { + list($event, $param) = explode(':', $message, 2); + } else { + $event = $message; + $param = ''; + } + + $shutdown = false; + + if ($event == 'shutdown') { + $this->master->requestShutdown(); + $shutdown = true; + } else if ($event == 'restart') { + $this->master->requestRestart(); + $shutdown = true; + } else if ($event == 'update') { + $this->updateSiteConfig($param); + } else { + $this->_log(LOG_ERR, "Ignoring unrecognized control message: $message"); + } + + $this->ack($frame); + $this->commit(); + $this->begin(); + return $shutdown; + } + + /** + * Set us up with queue subscriptions for a new site added at runtime, + * triggered by a broadcast to the 'statusnet-control' topic. + * + * @param array $frame Stomp frame + * @return bool true to continue; false to stop further processing. + */ + protected function updateSiteConfig($nickname) + { + if (empty($this->sites)) { + if ($nickname == common_config('site', 'nickname')) { + StatusNet::init(common_config('site', 'server')); + $this->doUnsubscribe(); + $this->doSubscribe(); + } else { + $this->_log(LOG_INFO, "Ignoring update ping for other site $nickname"); + } + } else { + $sn = Status_network::staticGet($nickname); + if ($sn) { + $server = $sn->getServerName(); // @fixme do config-by-nick + StatusNet::init($server); + if (empty($this->sites[$server])) { + $this->addSite($server); + } + $this->_log(LOG_INFO, "(Re)subscribing to queues for site $nickname / $server"); + $this->doUnsubscribe(); + $this->doSubscribe(); + $this->stats('siteupdate'); + } else { + $this->_log(LOG_ERR, "Ignoring ping for unrecognized new site $nickname"); + } + } + } + /** * Combines the queue_basename from configuration with the * site server name and queue name to give eg: @@ -360,7 +493,7 @@ class StompQueueManager extends QueueManager protected function queueName($queue) { return common_config('queue', 'queue_basename') . - common_config('site', 'server') . '/' . $queue; + $this->currentSite() . '/' . $queue; } /** diff --git a/scripts/queuectl.php b/scripts/queuectl.php new file mode 100755 index 0000000000..1c9ea33536 --- /dev/null +++ b/scripts/queuectl.php @@ -0,0 +1,85 @@ +#!/usr/bin/env php +. + */ + +/** + * Sends control signals to running queue daemons. + * + * @author Brion Vibber + * @package QueueHandler + */ + +define('INSTALLDIR', realpath(dirname(__FILE__) . '/..')); + +$shortoptions = 'ur'; +$longoptions = array('update', 'restart', 'stop'); + +$helptext = <<sendControlSignal($event, $param)) { + print " sent.\n"; + } else { + print " FAILED.\n"; + } +} + +$actions = 0; + +if (have_option('u') || have_option('--update')) { + $nickname = common_config('site', 'nickname'); + doSendControl("Sending site update signal to queue daemons for $nickname", + "update", $nickname); + $actions++; +} + +if (have_option('r') || have_option('--restart')) { + doSendControl("Sending graceful restart signal to queue daemons...", + "restart"); + $actions++; +} + +if (have_option('--stop')) { + doSendControl("Sending graceful shutdown signal to queue daemons...", + "shutdown"); + $actions++; +} + +if (!$actions) { + show_help(); +} + diff --git a/scripts/queuedaemon.php b/scripts/queuedaemon.php index bedd14b1a3..c2e2351c39 100755 --- a/scripts/queuedaemon.php +++ b/scripts/queuedaemon.php @@ -115,7 +115,7 @@ class QueueDaemon extends SpawningDaemon $this->log(LOG_INFO, 'terminating normally'); - return true; + return $master->respawn ? self::EXIT_RESTART : self::EXIT_SHUTDOWN; } } diff --git a/scripts/xmppdaemon.php b/scripts/xmppdaemon.php index fd7cf055b4..46dd9b90cc 100755 --- a/scripts/xmppdaemon.php +++ b/scripts/xmppdaemon.php @@ -56,7 +56,7 @@ class XMPPDaemon extends SpawningDaemon common_log(LOG_INFO, 'terminating normally'); - return true; + return $master->respawn ? self::EXIT_RESTART : self::EXIT_SHUTDOWN; } } From 03685bba1ea6c1b8f2c3db8d2f095a221b29a464 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Tue, 26 Jan 2010 15:11:09 -0800 Subject: [PATCH 101/134] - Remove redudant/unused 'server' setting from site admin panel - Move 'fancy urls' checkbox from site admin panel to paths admin panel --- actions/pathsadminpanel.php | 33 ++++++++++++++++++++++++++++++--- actions/siteadminpanel.php | 21 +++------------------ 2 files changed, 33 insertions(+), 21 deletions(-) diff --git a/actions/pathsadminpanel.php b/actions/pathsadminpanel.php index 3779fcfaaa..9155a7e428 100644 --- a/actions/pathsadminpanel.php +++ b/actions/pathsadminpanel.php @@ -24,7 +24,7 @@ * @author Evan Prodromou * @author Zach Copley * @author Sarven Capadisli - * @copyright 2008-2009 StatusNet, Inc. + * @copyright 2008-2010 StatusNet, Inc. * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ @@ -98,6 +98,11 @@ class PathsadminpanelAction extends AdminPanelAction 'background' => array('server', 'dir', 'path') ); + // XXX: If we're only going to have one boolean on thi page we + // can remove some of the boolean processing code --Z + + static $booleans = array('site' => array('fancy')); + $values = array(); foreach ($settings as $section => $parts) { @@ -106,6 +111,12 @@ class PathsadminpanelAction extends AdminPanelAction } } + foreach ($booleans as $section => $parts) { + foreach ($parts as $setting) { + $values[$section][$setting] = ($this->boolean($setting)) ? 1 : 0; + } + } + $this->validate($values); // assert(all values are valid); @@ -120,7 +131,13 @@ class PathsadminpanelAction extends AdminPanelAction } } - $config->query('COMMIT'); + foreach ($booleans as $section => $parts) { + foreach ($parts as $setting) { + Config::save($section, $setting, $values[$section][$setting]); + } + } + + $config->query('COMMIT'); return; } @@ -213,10 +230,14 @@ class PathsAdminPanelForm extends AdminForm function formData() { - $this->out->elementStart('fieldset', array('id' => 'settings_paths_locale')); + $this->out->elementStart('fieldset', array('id' => 'settings_paths_locale')); $this->out->element('legend', null, _('Site'), 'site'); $this->out->elementStart('ul', 'form_data'); + $this->li(); + $this->input('server', _('Server'), _('Site\'s server hostname.')); + $this->unli(); + $this->li(); $this->input('path', _('Path'), _('Site path')); $this->unli(); @@ -225,6 +246,12 @@ class PathsAdminPanelForm extends AdminForm $this->input('locale_path', _('Path to locales'), _('Directory path to locales'), 'site'); $this->unli(); + $this->li(); + $this->out->checkbox('fancy', _('Fancy URLs'), + (bool) $this->value('fancy'), + _('Use fancy (more readable and memorable) URLs?')); + $this->unli(); + $this->out->elementEnd('ul'); $this->out->elementEnd('fieldset'); diff --git a/actions/siteadminpanel.php b/actions/siteadminpanel.php index dd388a18a2..1cb57ec091 100644 --- a/actions/siteadminpanel.php +++ b/actions/siteadminpanel.php @@ -24,7 +24,7 @@ * @author Evan Prodromou * @author Zach Copley * @author Sarven Capadisli - * @copyright 2008-2009 StatusNet, Inc. + * @copyright 2008-2010 StatusNet, Inc. * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ @@ -95,7 +95,7 @@ class SiteadminpanelAction extends AdminPanelAction 'site', 'textlimit', 'dupelimit'), 'snapshot' => array('run', 'reporturl', 'frequency')); - static $booleans = array('site' => array('private', 'inviteonly', 'closed', 'fancy')); + static $booleans = array('site' => array('private', 'inviteonly', 'closed')); $values = array(); @@ -299,22 +299,7 @@ class SiteAdminPanelForm extends AdminForm $this->out->elementEnd('ul'); $this->out->elementEnd('fieldset'); - $this->out->elementStart('fieldset', array('id' => 'settings_admin_urls')); - $this->out->element('legend', null, _('URLs')); - $this->out->elementStart('ul', 'form_data'); - $this->li(); - $this->input('server', _('Server'), _('Site\'s server hostname.')); - $this->unli(); - - $this->li(); - $this->out->checkbox('fancy', _('Fancy URLs'), - (bool) $this->value('fancy'), - _('Use fancy (more readable and memorable) URLs?')); - $this->unli(); - $this->out->elementEnd('ul'); - $this->out->elementEnd('fieldset'); - - $this->out->elementStart('fieldset', array('id' => 'settings_admin_access')); + $this->out->elementStart('fieldset', array('id' => 'settings_admin_access')); $this->out->element('legend', null, _('Access')); $this->out->elementStart('ul', 'form_data'); $this->li(); From aad42427ccd4d3824efcbce43d8e9dba6d5b475d Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Tue, 26 Jan 2010 15:56:19 -0800 Subject: [PATCH 102/134] New access admin panel for site registration settings --- actions/accessadminpanel.php | 192 +++++++++++++++++++++++++++++++++++ actions/siteadminpanel.php | 37 ------- lib/adminpanelaction.php | 13 ++- lib/default.php | 2 +- lib/router.php | 1 + 5 files changed, 203 insertions(+), 42 deletions(-) create mode 100644 actions/accessadminpanel.php diff --git a/actions/accessadminpanel.php b/actions/accessadminpanel.php new file mode 100644 index 0000000000..4768e2faf9 --- /dev/null +++ b/actions/accessadminpanel.php @@ -0,0 +1,192 @@ +. + * + * @category Settings + * @package StatusNet + * @author Zach Copley + * @copyright 2010 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET')) { + exit(1); +} + +/** + * Administer site access settings + * + * @category Admin + * @package StatusNet + * @author Zach Copley + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +class AccessadminpanelAction extends AdminPanelAction +{ + /** + * Returns the page title + * + * @return string page title + */ + + function title() + { + return _('Access'); + } + + /** + * Instructions for using this form. + * + * @return string instructions + */ + + function getInstructions() + { + return _('Site access settings'); + } + + /** + * Show the site admin panel form + * + * @return void + */ + + function showForm() + { + $form = new AccessAdminPanelForm($this); + $form->show(); + return; + } + + /** + * Save settings from the form + * + * @return void + */ + + function saveSettings() + { + static $booleans = array('site' => array('private', 'inviteonly', 'closed')); + + foreach ($booleans as $section => $parts) { + foreach ($parts as $setting) { + $values[$section][$setting] = ($this->boolean($setting)) ? 1 : 0; + } + } + + $config = new Config(); + + $config->query('BEGIN'); + + foreach ($booleans as $section => $parts) { + foreach ($parts as $setting) { + Config::save($section, $setting, $values[$section][$setting]); + } + } + + $config->query('COMMIT'); + + return; + } + +} + +class AccessAdminPanelForm extends AdminForm +{ + /** + * ID of the form + * + * @return int ID of the form + */ + + function id() + { + return 'form_site_admin_panel'; + } + + /** + * class of the form + * + * @return string class of the form + */ + + function formClass() + { + return 'form_settings'; + } + + /** + * Action of the form + * + * @return string URL of the action + */ + + function action() + { + return common_local_url('accessadminpanel'); + } + + /** + * Data elements of the form + * + * @return void + */ + + function formData() + { + $this->out->elementStart('fieldset', array('id' => 'settings_admin_access')); + $this->out->element('legend', null, _('Registration')); + $this->out->elementStart('ul', 'form_data'); + $this->li(); + $this->out->checkbox('private', _('Private'), + (bool) $this->value('private'), + _('Prohibit anonymous users (not logged in) from viewing site?')); + $this->unli(); + + $this->li(); + $this->out->checkbox('inviteonly', _('Invite only'), + (bool) $this->value('inviteonly'), + _('Make registration invitation only.')); + $this->unli(); + + $this->li(); + $this->out->checkbox('closed', _('Closed'), + (bool) $this->value('closed'), + _('Disable new registrations.')); + $this->unli(); + $this->out->elementEnd('ul'); + $this->out->elementEnd('fieldset'); + } + + /** + * Action elements + * + * @return void + */ + + function formActions() + { + $this->out->submit('submit', _('Save'), 'submit', null, _('Save access settings')); + } + +} diff --git a/actions/siteadminpanel.php b/actions/siteadminpanel.php index 1cb57ec091..8c8f8b3742 100644 --- a/actions/siteadminpanel.php +++ b/actions/siteadminpanel.php @@ -95,8 +95,6 @@ class SiteadminpanelAction extends AdminPanelAction 'site', 'textlimit', 'dupelimit'), 'snapshot' => array('run', 'reporturl', 'frequency')); - static $booleans = array('site' => array('private', 'inviteonly', 'closed')); - $values = array(); foreach ($settings as $section => $parts) { @@ -105,12 +103,6 @@ class SiteadminpanelAction extends AdminPanelAction } } - foreach ($booleans as $section => $parts) { - foreach ($parts as $setting) { - $values[$section][$setting] = ($this->boolean($setting)) ? 1 : 0; - } - } - // This throws an exception on validation errors $this->validate($values); @@ -127,12 +119,6 @@ class SiteadminpanelAction extends AdminPanelAction } } - foreach ($booleans as $section => $parts) { - foreach ($parts as $setting) { - Config::save($section, $setting, $values[$section][$setting]); - } - } - $config->query('COMMIT'); return; @@ -299,29 +285,6 @@ class SiteAdminPanelForm extends AdminForm $this->out->elementEnd('ul'); $this->out->elementEnd('fieldset'); - $this->out->elementStart('fieldset', array('id' => 'settings_admin_access')); - $this->out->element('legend', null, _('Access')); - $this->out->elementStart('ul', 'form_data'); - $this->li(); - $this->out->checkbox('private', _('Private'), - (bool) $this->value('private'), - _('Prohibit anonymous users (not logged in) from viewing site?')); - $this->unli(); - - $this->li(); - $this->out->checkbox('inviteonly', _('Invite only'), - (bool) $this->value('inviteonly'), - _('Make registration invitation only.')); - $this->unli(); - - $this->li(); - $this->out->checkbox('closed', _('Closed'), - (bool) $this->value('closed'), - _('Disable new registrations.')); - $this->unli(); - $this->out->elementEnd('ul'); - $this->out->elementEnd('fieldset'); - $this->out->elementStart('fieldset', array('id' => 'settings_admin_snapshots')); $this->out->element('legend', null, _('Snapshots')); $this->out->elementStart('ul', 'form_data'); diff --git a/lib/adminpanelaction.php b/lib/adminpanelaction.php index a6981ac611..f62bfa458a 100644 --- a/lib/adminpanelaction.php +++ b/lib/adminpanelaction.php @@ -319,12 +319,17 @@ class AdminPanelNav extends Widget if ($this->canAdmin('user')) { $this->out->menuItem(common_local_url('useradminpanel'), _('User'), - _('Paths configuration'), $action_name == 'useradminpanel', 'nav_design_admin_panel'); + _('User configuration'), $action_name == 'useradminpanel', 'nav_design_admin_panel'); } - if ($this->canAdmin('paths')) { - $this->out->menuItem(common_local_url('pathsadminpanel'), _('Paths'), - _('Paths configuration'), $action_name == 'pathsadminpanel', 'nav_design_admin_panel'); + if ($this->canAdmin('access')) { + $this->out->menuItem(common_local_url('accessadminpanel'), _('Access'), + _('Access configuration'), $action_name == 'accessadminpanel', 'nav_design_admin_panel'); + } + + if ($this->canAdmin('paths')) { + $this->out->menuItem(common_local_url('pathsadminpanel'), _('Paths'), + _('Paths configuration'), $action_name == 'pathsadminpanel', 'nav_design_admin_panel'); } Event::handle('EndAdminPanelNav', array($this)); diff --git a/lib/default.php b/lib/default.php index d2dd8ab33c..37fb65b533 100644 --- a/lib/default.php +++ b/lib/default.php @@ -260,7 +260,7 @@ $default = 'OpenID' => null), ), 'admin' => - array('panels' => array('design', 'site', 'user', 'paths')), + array('panels' => array('design', 'site', 'user', 'paths', 'access')), 'singleuser' => array('enabled' => false, 'nickname' => null), diff --git a/lib/router.php b/lib/router.php index c0ddc8db38..03765b39dd 100644 --- a/lib/router.php +++ b/lib/router.php @@ -637,6 +637,7 @@ class Router $m->connect('admin/site', array('action' => 'siteadminpanel')); $m->connect('admin/design', array('action' => 'designadminpanel')); $m->connect('admin/user', array('action' => 'useradminpanel')); + $m->connect('admin/access', array('action' => 'accessadminpanel')); $m->connect('admin/paths', array('action' => 'pathsadminpanel')); $m->connect('getfile/:filename', From 492950b784ccf76ad96a24732c4329e3b1ca5ac8 Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Thu, 14 Jan 2010 23:36:13 +0100 Subject: [PATCH 103/134] Fix inconsistent title case in page title --- actions/oauthconnectionssettings.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/actions/oauthconnectionssettings.php b/actions/oauthconnectionssettings.php index b17729b821..c2e8d441b0 100644 --- a/actions/oauthconnectionssettings.php +++ b/actions/oauthconnectionssettings.php @@ -68,7 +68,7 @@ class OauthconnectionssettingsAction extends ConnectSettingsAction function title() { - return _('Connected Applications'); + return _('Connected applications'); } function isReadOnly($args) From 97e1acdc329c3f4dbabce37ff5985f655aa91541 Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Thu, 14 Jan 2010 23:37:06 +0100 Subject: [PATCH 104/134] Fix casing for HMAC-SHA1. --- actions/showapplication.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/actions/showapplication.php b/actions/showapplication.php index 049206375d..a6ff425c7c 100644 --- a/actions/showapplication.php +++ b/actions/showapplication.php @@ -265,7 +265,7 @@ class ShowApplicationAction extends OwnerDesignAction $this->elementEnd('dl'); $this->element('p', 'note', - _('Note: We support hmac-sha1 signatures. We do not support the plaintext signature method.')); + _('Note: We support HMAC-SHA1 signatures. We do not support the plaintext signature method.')); $this->elementEnd('div'); $this->elementStart('p', array('id' => 'application_action')); @@ -325,4 +325,3 @@ class ShowApplicationAction extends OwnerDesignAction } } - From 4202ffff9184eaf0934184309ef8f3b9a90d60d9 Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Thu, 14 Jan 2010 23:38:29 +0100 Subject: [PATCH 105/134] Make more complete sentence. --- lib/applicationeditform.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/applicationeditform.php b/lib/applicationeditform.php index 040d3bf74b..6f03a9beda 100644 --- a/lib/applicationeditform.php +++ b/lib/applicationeditform.php @@ -203,7 +203,7 @@ class ApplicationEditForm extends Form $maxDesc = Oauth_application::maxDesc(); if ($maxDesc > 0) { - $descInstr = sprintf(_('Describe your application in %d chars'), + $descInstr = sprintf(_('Describe your application in %d characters'), $maxDesc); } else { $descInstr = _('Describe your application'); From 923b7de3c661098cfe3d5bdc0878d9329e1ee2bf Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Wed, 27 Jan 2010 08:41:26 +0000 Subject: [PATCH 106/134] - Check for read-only vs. read-write access to protected API resources (OAuth) - Some cleanup --- actions/apistatusesupdate.php | 18 +++-- lib/apiauth.php | 126 ++++++++++++++++++---------------- 2 files changed, 75 insertions(+), 69 deletions(-) diff --git a/actions/apistatusesupdate.php b/actions/apistatusesupdate.php index 31c9b20ce2..bf367e1e18 100644 --- a/actions/apistatusesupdate.php +++ b/actions/apistatusesupdate.php @@ -28,7 +28,7 @@ * @author Mike Cochrane * @author Robin Millette * @author Zach Copley - * @copyright 2009 StatusNet, Inc. + * @copyright 2009-2010 StatusNet, Inc. * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ @@ -79,7 +79,6 @@ class ApiStatusesUpdateAction extends ApiAuthAction { parent::prepare($args); - $this->user = $this->auth_user; $this->status = $this->trimmed('status'); $this->source = $this->trimmed('source'); $this->lat = $this->trimmed('lat'); @@ -145,7 +144,7 @@ class ApiStatusesUpdateAction extends ApiAuthAction return; } - if (empty($this->user)) { + if (empty($this->auth_user)) { $this->clientError(_('No such user.'), 404, $this->format); return; } @@ -172,7 +171,7 @@ class ApiStatusesUpdateAction extends ApiAuthAction // Check for commands $inter = new CommandInterpreter(); - $cmd = $inter->handle_command($this->user, $status_shortened); + $cmd = $inter->handle_command($this->auth_user, $status_shortened); if ($cmd) { @@ -184,7 +183,7 @@ class ApiStatusesUpdateAction extends ApiAuthAction // And, it returns your last status whether the cmd was successful // or not! - $this->notice = $this->user->getCurrentNotice(); + $this->notice = $this->auth_user->getCurrentNotice(); } else { @@ -211,7 +210,7 @@ class ApiStatusesUpdateAction extends ApiAuthAction $upload = null; try { - $upload = MediaFile::fromUpload('media', $this->user); + $upload = MediaFile::fromUpload('media', $this->auth_user); } catch (ClientException $ce) { $this->clientError($ce->getMessage()); return; @@ -234,19 +233,19 @@ class ApiStatusesUpdateAction extends ApiAuthAction $options = array('reply_to' => $reply_to); - if ($this->user->shareLocation()) { + if ($this->auth_user->shareLocation()) { $locOptions = Notice::locationOptions($this->lat, $this->lon, null, null, - $this->user->getProfile()); + $this->auth_user->getProfile()); $options = array_merge($options, $locOptions); } $this->notice = - Notice::saveNew($this->user->id, + Notice::saveNew($this->auth_user->id, $content, $this->source, $options); @@ -255,7 +254,6 @@ class ApiStatusesUpdateAction extends ApiAuthAction $upload->attachToNotice($this->notice); } - } $this->showNotice(); diff --git a/lib/apiauth.php b/lib/apiauth.php index 37070d212f..ad9651ff26 100644 --- a/lib/apiauth.php +++ b/lib/apiauth.php @@ -29,7 +29,7 @@ * @author mEDI * @author Sarven Capadisli * @author Zach Copley - * @copyright 2009 StatusNet, Inc. + * @copyright 2009-2010 StatusNet, Inc. * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ @@ -53,9 +53,11 @@ require_once INSTALLDIR . '/lib/apioauth.php'; class ApiAuthAction extends ApiAction { - var $access_token; - var $oauth_access_type; - var $oauth_source; + var $auth_user_nickname = null; + var $auth_user_password = null; + var $access_token = null; + var $oauth_source = null; + var $auth_user = null; /** * Take arguments for running, and output basic auth header if needed @@ -70,18 +72,28 @@ class ApiAuthAction extends ApiAction { parent::prepare($args); + $this->consumer_key = $this->arg('oauth_consumer_key'); + $this->access_token = $this->arg('oauth_token'); + + // NOTE: $this->auth_user has to get set in prepare(), not handle(), + // because subclasses do stuff with it in their prepares. + if ($this->requiresAuth()) { - - $this->consumer_key = $this->arg('oauth_consumer_key'); - $this->access_token = $this->arg('oauth_token'); - if (!empty($this->access_token)) { $this->checkOAuthRequest(); } else { $this->checkBasicAuthUser(); - // By default, all basic auth users have read and write access + } - $this->access = self::READ_WRITE; + // Reject API calls with the wrong access level + + if ($this->isReadOnly($args) == false) { + if ($this->access != self::READ_WRITE) { + $msg = 'API resource requires read-write access, ' . + 'but you only have read access.'; + $this->clientError($msg, 401, $this->format); + exit(); + } } } @@ -95,8 +107,6 @@ class ApiAuthAction extends ApiAction function checkOAuthRequest() { - common_debug("We have an OAuth request."); - $datastore = new ApiStatusNetOAuthDataStore(); $server = new OAuthServer($datastore); $hmac_method = new OAuthSignatureMethod_HMAC_SHA1(); @@ -114,9 +124,10 @@ class ApiAuthAction extends ApiAction if (empty($app)) { - // this should really not happen - common_log(LOG_WARN, - "Couldn't find the OAuth app for consumer key: $this->consumer_key"); + // this should probably not happen + common_log(LOG_WARNING, + 'Couldn\'t find the OAuth app for consumer key: ' . + $this->consumer_key); throw new OAuthException('No application for that consumer key.'); } @@ -128,20 +139,18 @@ class ApiAuthAction extends ApiAction $appUser = Oauth_application_user::staticGet('token', $this->access_token); - // XXX: check that app->id and appUser->application_id and consumer all + // XXX: Check that app->id and appUser->application_id and consumer all // match? if (!empty($appUser)) { - // read or read-write - $this->oauth_access_type = $appUser->access_type; - // If access_type == 0 we have either a request token // or a bad / revoked access token - if ($this->oauth_access_type != 0) { + if ($appUser->access_type != 0) { + + // Set the access level for the api call - // Set the read or read-write access for the api call $this->access = ($appUser->access_type & Oauth_application::$writeAccess) ? self::READ_WRITE : self::READ_ONLY; @@ -151,38 +160,34 @@ class ApiAuthAction extends ApiAction } $msg = "API OAuth authentication for user '%s' (id: %d) on behalf of " . - "application '%s' (id: %d)."; + "application '%s' (id: %d) with %s access."; common_log(LOG_INFO, sprintf($msg, $this->auth_user->nickname, $this->auth_user->id, $app->name, - $app->id)); + $app->id, + ($this->access = self::READ_WRITE) ? + 'read-write' : 'read-only' + )); return true; } else { throw new OAuthException('Bad access token.'); } } else { - // also should not happen + // Also should not happen + throw new OAuthException('No user for that token.'); - } + } } catch (OAuthException $e) { - common_log(LOG_WARN, 'API OAuthException - ' . $e->getMessage()); - common_debug(var_export($req, true)); - $this->showOAuthError($e->getMessage()); - exit(); + common_log(LOG_WARNING, 'API OAuthException - ' . $e->getMessage()); + $this->showAuthError(); + exit; } } - function showOAuthError($msg) - { - header('HTTP/1.1 401 Unauthorized'); - header('Content-Type: text/html; charset=utf-8'); - print $msg . "\n"; - } - /** * Does this API resource require authentication? * @@ -207,39 +212,44 @@ class ApiAuthAction extends ApiAction $realm = common_config('site', 'name') . ' API'; - if (!isset($this->auth_user)) { + if (!isset($this->auth_user_nickname)) { header('WWW-Authenticate: Basic realm="' . $realm . '"'); // show error if the user clicks 'cancel' - $this->showBasicAuthError(); + $this->showAuthError(); exit; } else { - $nickname = $this->auth_user; - $password = $this->auth_pw; - $user = common_check_user($nickname, $password); + + $user = common_check_user($this->auth_user_nickname, + $this->auth_user_password); + if (Event::handle('StartSetApiUser', array(&$user))) { $this->auth_user = $user; Event::handle('EndSetApiUser', array($user)); } + // By default, basic auth users have rw access + + $this->access = self::READ_WRITE; + if (empty($this->auth_user)) { // basic authentication failed list($proxy, $ip) = common_client_ip(); + common_log( LOG_WARNING, 'Failed API auth attempt, nickname = ' . "$nickname, proxy = $proxy, ip = $ip." ); - $this->showBasicAuthError(); + + $this->showAuthError(); exit; } } - - return true; } /** @@ -253,32 +263,30 @@ class ApiAuthAction extends ApiAction { if (isset($_SERVER['AUTHORIZATION']) || isset($_SERVER['HTTP_AUTHORIZATION']) - ) { - $authorization_header = isset($_SERVER['HTTP_AUTHORIZATION']) - ? $_SERVER['HTTP_AUTHORIZATION'] : $_SERVER['AUTHORIZATION']; + ) { + $authorization_header = isset($_SERVER['HTTP_AUTHORIZATION']) + ? $_SERVER['HTTP_AUTHORIZATION'] : $_SERVER['AUTHORIZATION']; } if (isset($_SERVER['PHP_AUTH_USER'])) { - $this->auth_user = $_SERVER['PHP_AUTH_USER']; - $this->auth_pw = $_SERVER['PHP_AUTH_PW']; + $this->auth_user_nickname = $_SERVER['PHP_AUTH_USER']; + $this->auth_user_password = $_SERVER['PHP_AUTH_PW']; } elseif (isset($authorization_header) && strstr(substr($authorization_header, 0, 5), 'Basic')) { - // decode the HTTP_AUTHORIZATION header on php-cgi server self + // Decode the HTTP_AUTHORIZATION header on php-cgi server self // on fcgid server the header name is AUTHORIZATION $auth_hash = base64_decode(substr($authorization_header, 6)); - list($this->auth_user, $this->auth_pw) = explode(':', $auth_hash); + list($this->auth_user_nickname, + $this->auth_user_password) = explode(':', $auth_hash); - // set all to null on a empty basic auth request + // Set all to null on a empty basic auth request - if ($this->auth_user == "") { - $this->auth_user = null; - $this->auth_pw = null; + if (empty($this->auth_user_nickname)) { + $this->auth_user_nickname = null; + $this->auth_password = null; } - } else { - $this->auth_user = null; - $this->auth_pw = null; } } @@ -289,7 +297,7 @@ class ApiAuthAction extends ApiAction * @return void */ - function showBasicAuthError() + function showAuthError() { header('HTTP/1.1 401 Unauthorized'); $msg = 'Could not authenticate you.'; From 756da7bc5174f58f714c858f0100f04b3561a250 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Wed, 27 Jan 2010 08:45:56 +0000 Subject: [PATCH 107/134] s/LOG_WARN/LOG_WARNING/ --- actions/apioauthaccesstoken.php | 2 +- actions/apioauthrequesttoken.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/actions/apioauthaccesstoken.php b/actions/apioauthaccesstoken.php index 085ef6f0b1..887df4c20d 100644 --- a/actions/apioauthaccesstoken.php +++ b/actions/apioauthaccesstoken.php @@ -70,7 +70,7 @@ class ApiOauthAccessTokenAction extends ApiOauthAction $atok = $server->fetch_access_token($req); } catch (OAuthException $e) { - common_log(LOG_WARN, 'API OAuthException - ' . $e->getMessage()); + common_log(LOG_WARNING, 'API OAuthException - ' . $e->getMessage()); common_debug(var_export($req, true)); $this->outputError($e->getMessage()); return; diff --git a/actions/apioauthrequesttoken.php b/actions/apioauthrequesttoken.php index 467640b9aa..4fa626d866 100644 --- a/actions/apioauthrequesttoken.php +++ b/actions/apioauthrequesttoken.php @@ -89,7 +89,7 @@ class ApiOauthRequestTokenAction extends ApiOauthAction $token = $server->fetch_request_token($req); print $token; } catch (OAuthException $e) { - common_log(LOG_WARN, 'API OAuthException - ' . $e->getMessage()); + common_log(LOG_WARNING, 'API OAuthException - ' . $e->getMessage()); header('HTTP/1.1 401 Unauthorized'); header('Content-Type: text/html; charset=utf-8'); print $e->getMessage() . "\n"; From 54d04a0c911269036a1fc3708fec6d70c33d5032 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Wed, 27 Jan 2010 09:59:40 +0000 Subject: [PATCH 108/134] Test script to update your status via OAuth --- tests/oauth/statusupdate.php | 115 +++++++++++++++++++++++++++++++++++ 1 file changed, 115 insertions(+) create mode 100644 tests/oauth/statusupdate.php diff --git a/tests/oauth/statusupdate.php b/tests/oauth/statusupdate.php new file mode 100644 index 0000000000..4aa230e280 --- /dev/null +++ b/tests/oauth/statusupdate.php @@ -0,0 +1,115 @@ +#!/usr/bin/env php +. + **/ + +define('INSTALLDIR', realpath(dirname(__FILE__) . '/../..')); + +require_once INSTALLDIR . '/extlib/OAuth.php'; + +$shortoptions = 'o:s:u:'; +$longoptions = array('oauth_token=', 'token_secret=', 'update='); + +$helptext = <<sign_request($hmac_method, $test_consumer, $at); + +$r = httpRequest($req_req->to_url()); + +$body = $r->getBody(); + +print "$body\n"; + +//print $req_req->to_url() . "\n\n"; + +function httpRequest($url) +{ + $request = HTTPClient::start(); + + $request->setConfig(array( + 'follow_redirects' => true, + 'connect_timeout' => 120, + 'timeout' => 120, + 'ssl_verify_peer' => false, + 'ssl_verify_host' => false + )); + + return $request->post($url); +} + From 04a37fa1c703955a51862033d83e59836c35d74f Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Wed, 27 Jan 2010 15:08:33 +0000 Subject: [PATCH 109/134] Better alignment for notice in shownotice page --- theme/base/css/display.css | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 84e9426c77..65dd159900 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -1039,12 +1039,13 @@ overflow:visible; #showstream .notice div.entry-content { margin-left:0; } -#shownotice .notice .entry-title, -#shownotice .notice div.entry-content { -margin-left:110px; -} #shownotice .notice .entry-title { +margin-left:110px; font-size:2.2em; +min-height:123px; +} +#shownotice .notice div.entry-content { +margin-left:0; } .notice p.entry-content { From c52951cef5508452733f84dec7815daf4aca1016 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Wed, 27 Jan 2010 11:37:22 -0500 Subject: [PATCH 110/134] Optionally set a separate Javascript server and path We have about 10-12 JavaScript pages per Web page. They usually are based on the same server as the Web pages, but since they're static files, it makes sense to offload them to a lite server that handles static files well. This commit lets you set a separate Javascript server and path for the default Javascript code in StatusNet. Squashed commit of the following: commit 139d1622fdafe5ad00c820224416d9021efc3234 Author: Evan Prodromou Date: Wed Jan 27 11:30:24 2010 -0500 modules that call htmloutputter::script() don't prescribe js/ path commit c6ca3174af73efed55eaed5ff1e2a3bdc77d2d87 Author: Evan Prodromou Date: Wed Jan 27 11:28:07 2010 -0500 configurable server and path for javascript files --- actions/avatarsettings.php | 4 ++-- actions/designadminpanel.php | 4 ++-- actions/grouplogo.php | 4 ++-- lib/action.php | 16 ++++++++-------- lib/default.php | 3 +++ lib/designsettings.php | 4 ++-- lib/htmloutputter.php | 28 +++++++++++++++++++++++++++- plugins/Facebook/facebookaction.php | 2 +- 8 files changed, 47 insertions(+), 18 deletions(-) diff --git a/actions/avatarsettings.php b/actions/avatarsettings.php index cf45255520..6a7398746a 100644 --- a/actions/avatarsettings.php +++ b/actions/avatarsettings.php @@ -416,8 +416,8 @@ class AvatarsettingsAction extends AccountSettingsAction parent::showScripts(); if ($this->mode == 'crop') { - $this->script('js/jcrop/jquery.Jcrop.min.js'); - $this->script('js/jcrop/jquery.Jcrop.go.js'); + $this->script('jcrop/jquery.Jcrop.min.js'); + $this->script('jcrop/jquery.Jcrop.go.js'); } $this->autofocus('avatarfile'); diff --git a/actions/designadminpanel.php b/actions/designadminpanel.php index 72ad6ade2a..30e8bde1a4 100644 --- a/actions/designadminpanel.php +++ b/actions/designadminpanel.php @@ -302,8 +302,8 @@ class DesignadminpanelAction extends AdminPanelAction { parent::showScripts(); - $this->script('js/farbtastic/farbtastic.js'); - $this->script('js/userdesign.go.js'); + $this->script('farbtastic/farbtastic.js'); + $this->script('userdesign.go.js'); $this->autofocus('design_background-image_file'); } diff --git a/actions/grouplogo.php b/actions/grouplogo.php index f197aef33e..3c9b562962 100644 --- a/actions/grouplogo.php +++ b/actions/grouplogo.php @@ -437,8 +437,8 @@ class GrouplogoAction extends GroupDesignAction parent::showScripts(); if ($this->mode == 'crop') { - $this->script('js/jcrop/jquery.Jcrop.min.js'); - $this->script('js/jcrop/jquery.Jcrop.go.js'); + $this->script('jcrop/jquery.Jcrop.min.js'); + $this->script('jcrop/jquery.Jcrop.go.js'); } $this->autofocus('avatarfile'); diff --git a/lib/action.php b/lib/action.php index 3ffc452dec..cc4f4aad07 100644 --- a/lib/action.php +++ b/lib/action.php @@ -246,18 +246,18 @@ class Action extends HTMLOutputter // lawsuit { if (Event::handle('StartShowScripts', array($this))) { if (Event::handle('StartShowJQueryScripts', array($this))) { - $this->script('js/jquery.min.js'); - $this->script('js/jquery.form.js'); - $this->script('js/jquery.cookie.js'); - $this->script('js/json2.js'); - $this->script('js/jquery.joverlay.min.js'); + $this->script('jquery.min.js'); + $this->script('jquery.form.js'); + $this->script('jquery.cookie.js'); + $this->script('json2.js'); + $this->script('jquery.joverlay.min.js'); Event::handle('EndShowJQueryScripts', array($this)); } if (Event::handle('StartShowStatusNetScripts', array($this)) && Event::handle('StartShowLaconicaScripts', array($this))) { - $this->script('js/xbImportNode.js'); - $this->script('js/util.js'); - $this->script('js/geometa.js'); + $this->script('xbImportNode.js'); + $this->script('util.js'); + $this->script('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/default.php b/lib/default.php index 37fb65b533..10ea348640 100644 --- a/lib/default.php +++ b/lib/default.php @@ -120,6 +120,9 @@ $default = array('server' => null, 'dir' => null, 'path'=> null), + 'javascript' => + array('server' => null, + 'path'=> null), 'throttle' => array('enabled' => false, // whether to throttle edits; false by default 'count' => 20, // number of allowed messages in timespan diff --git a/lib/designsettings.php b/lib/designsettings.php index 8e44c03a92..4955e92199 100644 --- a/lib/designsettings.php +++ b/lib/designsettings.php @@ -327,8 +327,8 @@ class DesignSettingsAction extends AccountSettingsAction { parent::showScripts(); - $this->script('js/farbtastic/farbtastic.js'); - $this->script('js/userdesign.go.js'); + $this->script('farbtastic/farbtastic.js'); + $this->script('userdesign.go.js'); $this->autofocus('design_background-image_file'); } diff --git a/lib/htmloutputter.php b/lib/htmloutputter.php index 31660ce954..317f5ea612 100644 --- a/lib/htmloutputter.php +++ b/lib/htmloutputter.php @@ -351,14 +351,40 @@ class HTMLOutputter extends XMLOutputter function script($src, $type='text/javascript') { if(Event::handle('StartScriptElement', array($this,&$src,&$type))) { + $url = parse_url($src); + if( empty($url['scheme']) && empty($url['host']) && empty($url['query']) && empty($url['fragment'])) { - $src = common_path($src) . '?version=' . STATUSNET_VERSION; + $path = common_config('javascript', 'path'); + + if (empty($path)) { + $path = common_config('site', 'path') . '/js/'; + } + + if ($path[strlen($path)-1] != '/') { + $path .= '/'; + } + + if ($path[0] != '/') { + $path = '/'.$path; + } + + $server = common_config('javascript', 'server'); + + if (empty($server)) { + $server = common_config('site', 'server'); + } + + // XXX: protocol + + $src = 'http://'.$server.$path.$src . '?version=' . STATUSNET_VERSION; } + $this->element('script', array('type' => $type, 'src' => $src), ' '); + Event::handle('EndScriptElement', array($this,$src,$type)); } } diff --git a/plugins/Facebook/facebookaction.php b/plugins/Facebook/facebookaction.php index 815fee094c..389e1ea81f 100644 --- a/plugins/Facebook/facebookaction.php +++ b/plugins/Facebook/facebookaction.php @@ -89,7 +89,7 @@ class FacebookAction extends Action function showScripts() { - $this->script('js/facebookapp.js'); + $this->script('facebookapp.js'); } /** From 7aeb03f7277de247a642b613775383480bccc63f Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Wed, 27 Jan 2010 08:53:55 -0800 Subject: [PATCH 111/134] quick fix: use common_path() on realtime update JS so it works with the new JS path code (will pull from main server for now) --- plugins/Realtime/RealtimePlugin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/Realtime/RealtimePlugin.php b/plugins/Realtime/RealtimePlugin.php index 89640f5beb..16e28e94d3 100644 --- a/plugins/Realtime/RealtimePlugin.php +++ b/plugins/Realtime/RealtimePlugin.php @@ -87,7 +87,7 @@ class RealtimePlugin extends Plugin $scripts = $this->_getScripts(); foreach ($scripts as $script) { - $action->script($script); + $action->script(common_path($script)); } $user = common_current_user(); From c51539804a7f6f63b3f47fd838b9527262440e3d Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Wed, 27 Jan 2010 09:24:59 -0800 Subject: [PATCH 112/134] Add persistent:true property to Stomp messages so ActiveMQ doesn't decide to discard them even though persistence is enabled on the broker. :) (Thanks Aric!) --- lib/stompqueuemanager.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/stompqueuemanager.php b/lib/stompqueuemanager.php index 89f3d74cce..19e8c49b5c 100644 --- a/lib/stompqueuemanager.php +++ b/lib/stompqueuemanager.php @@ -178,7 +178,8 @@ class StompQueueManager extends QueueManager $result = $this->con->send($this->queueName($queue), $msg, // BODY of the message - array ('created' => common_sql_now())); + array ('created' => common_sql_now(), + 'persistent' => 'true')); if (!$result) { common_log(LOG_ERR, "Error sending $rep to $queue queue"); From 61a7a7b36b4f4b504dde880695dff5113dbe2a48 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Thu, 21 Jan 2010 18:18:32 +0100 Subject: [PATCH 113/134] Plugin for Universal Ad Package. Outputs four most widely used ad types. --- plugins/UAP/UAPPlugin.php | 176 ++++++++++++++++++++++++++++++++++++++ plugins/UAP/uap.css | 50 +++++++++++ 2 files changed, 226 insertions(+) create mode 100644 plugins/UAP/UAPPlugin.php create mode 100644 plugins/UAP/uap.css diff --git a/plugins/UAP/UAPPlugin.php b/plugins/UAP/UAPPlugin.php new file mode 100644 index 0000000000..13c1017230 --- /dev/null +++ b/plugins/UAP/UAPPlugin.php @@ -0,0 +1,176 @@ +. + * + * @category Action + * @package StatusNet + * @author Sarven Capadisli + * @copyright 2010 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET') && !defined('LACONICA')) { + exit(1); +} + +/** + * Outputs the following ad types (based on UAP): + * Medium Rectangle 300x250 + * Rectangle 180x150 + * Leaderboard 728x90 + * Wide Skyscraper 160x600 + * + * Any number of ad types can be used. Enable all using example: + * addPlugin('UAP', array( + * 'MediumRectangle' => '', + * 'Rectangle' => '', + * 'Leaderboard' => '', + * 'WideSkyscraper' => '' + * ) + * ); + * + * @category Plugin + * @package StatusNet + * @author Sarven Capadisli + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +class UAPPlugin extends Plugin +{ + public $MediumRectangle = null; + public $Rectangle = null; + public $Leaderboard = null; + public $WideSkyscraper = null; + + function __construct($uap = array()) + { + $this->uap = $uap; + + parent::__construct(); + } + + function onInitializePlugin() + { + foreach($this->uap as $key => $value) { + switch(strtolower($key)) { + case 'MediumRectangle': default: + $this->MediumRectangle = $value; + break; + case 'Rectangle': + $this->Rectangle = $value; + break; + case 'Leaderboard': + $this->Leaderboard = $value; + break; + case 'WideSkyscraper': + $this->WideSkyscraper = $value; + break; + } + } + } + + function onEndShowStatusNetStyles($action) + { + $action->cssLink(common_path('plugins/UAP/uap.css'), + null, 'screen, projection, tv'); + return true; + } + + //MediumRectangle ad + function onStartShowAside($action) + { + if (!$this->MediumRectangle) { + return true; + } + + $this->showAd($action, array('id' => 'ad_medium-rectangle'), + $this->MediumRectangle); + + return true; + } + +/* + //Rectangle ad + function onEndShowSiteNotice($action) + { + if (!$this->Rectangle) { + return true; + } + + $this->showAd($action, array('id' => 'ad_rectangle'), + $this->Rectangle); + + return true; + } +*/ + + //Leaderboard and Rectangle ad + function onStartShowHeader($action) + { + if ($this->Leaderboard) { + $this->showAd($action, array('id' => 'ad_leaderboard'), + $this->Leaderboard); + } + + if ($this->Rectangle) { + $this->showAd($action, array('id' => 'ad_rectangle'), + $this->Rectangle); + } + + return true; + } + + //WideSkyscraper ad + function onEndShowAside($action) + { + if (!$this->WideSkyscraper) { + return true; + } + + $this->showAd($action, array('id' => 'ad_wide-skyscraper'), + $this->WideSkyscraper); + + return true; + } + + //Output ad container + function showAd($action, $attr=array(), $value) + { + $classes = ($attr['class']) ? $attr['class'].' ' : ''; + + $action->elementStart('div', array('id' => $attr['id'], + 'class' => $classes.'ad')); + $action->raw($value); + $action->elementEnd('div'); + } + + function onPluginVersion(&$versions) + { + $versions[] = array('name' => 'UAP', + 'version' => STATUSNET_VERSION, + 'author' => 'Sarven Capadisli', + 'homepage' => 'http://status.net/wiki/Plugin:UAP', + 'rawdescription' => + _m('Outputs ad placements based on Universal Ad Package')); + return true; + } +} diff --git a/plugins/UAP/uap.css b/plugins/UAP/uap.css new file mode 100644 index 0000000000..90abe51807 --- /dev/null +++ b/plugins/UAP/uap.css @@ -0,0 +1,50 @@ +/** Universal Ad Package styles: + * Medium Rectangle 300x250 + * Rectangle 180x150 + * Leaderboard 728x90 + * Wide Skyscraper 160x600 + * + * @package StatusNet + * @author Sarven Capadisli + * @copyright 2010 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + + +.ad { +border:1px solid #CCC; +float:left; +} + +#ad_medium-rectangle { +width:300px; +height:250px; + +margin-left:1.35%; +margin-bottom:18px; +} + +#ad_rectangle { +width:180px; +height:150px; + +float:right; +margin-right:18px; +} + +#ad_leaderboard { +width:728px; +height:90px; + +margin:29px 18px 0 0; +clear:both; +} + +#ad_wide-skyscraper { +width:160px; +height:600px; + +margin-top:18px; +margin-left:8.5%; +} From 58fde0dcb5342cb3d3ff44c2e54a077eea0e063e Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Thu, 21 Jan 2010 18:28:02 +0100 Subject: [PATCH 114/134] Lowercased switch cases in UAP Plugin --- plugins/UAP/UAPPlugin.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/UAP/UAPPlugin.php b/plugins/UAP/UAPPlugin.php index 13c1017230..f3b16548d2 100644 --- a/plugins/UAP/UAPPlugin.php +++ b/plugins/UAP/UAPPlugin.php @@ -72,16 +72,16 @@ class UAPPlugin extends Plugin { foreach($this->uap as $key => $value) { switch(strtolower($key)) { - case 'MediumRectangle': default: + case 'mediumrectangle': default: $this->MediumRectangle = $value; break; - case 'Rectangle': + case 'rectangle': $this->Rectangle = $value; break; - case 'Leaderboard': + case 'leaderboard': $this->Leaderboard = $value; break; - case 'WideSkyscraper': + case 'wideskyscraper': $this->WideSkyscraper = $value; break; } From 1758ed453bcf2abd11bc2fde8768632099fe0de3 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Wed, 27 Jan 2010 06:25:22 -0500 Subject: [PATCH 115/134] move UAP plugin to core --- plugins/UAP/UAPPlugin.php => lib/uapplugin.php | 0 {plugins/UAP => theme/base/css}/uap.css | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename plugins/UAP/UAPPlugin.php => lib/uapplugin.php (100%) rename {plugins/UAP => theme/base/css}/uap.css (100%) diff --git a/plugins/UAP/UAPPlugin.php b/lib/uapplugin.php similarity index 100% rename from plugins/UAP/UAPPlugin.php rename to lib/uapplugin.php diff --git a/plugins/UAP/uap.css b/theme/base/css/uap.css similarity index 100% rename from plugins/UAP/uap.css rename to theme/base/css/uap.css From 7c54591472b4ff997ea099792c95d40b98798381 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Wed, 27 Jan 2010 07:19:36 -0500 Subject: [PATCH 116/134] make uapplugin an abstract class --- lib/uapplugin.php | 199 ++++++++++++++++++++++++---------------------- 1 file changed, 105 insertions(+), 94 deletions(-) diff --git a/lib/uapplugin.php b/lib/uapplugin.php index f3b16548d2..5160d96629 100644 --- a/lib/uapplugin.php +++ b/lib/uapplugin.php @@ -22,6 +22,7 @@ * @category Action * @package StatusNet * @author Sarven Capadisli + * @author Evan Prodromou * @copyright 2010 StatusNet, Inc. * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ @@ -32,145 +33,155 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { } /** + * Abstract superclass for advertising plugins + * + * Plugins for showing ads should derive from this plugin. + * * Outputs the following ad types (based on UAP): + * * Medium Rectangle 300x250 * Rectangle 180x150 * Leaderboard 728x90 * Wide Skyscraper 160x600 * - * Any number of ad types can be used. Enable all using example: - * addPlugin('UAP', array( - * 'MediumRectangle' => '', - * 'Rectangle' => '', - * 'Leaderboard' => '', - * 'WideSkyscraper' => '' - * ) - * ); - * * @category Plugin * @package StatusNet * @author Sarven Capadisli + * @author Evan Prodromou * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ -class UAPPlugin extends Plugin +abstract class UAPPlugin extends Plugin { public $MediumRectangle = null; - public $Rectangle = null; - public $Leaderboard = null; - public $WideSkyscraper = null; + public $Rectangle = null; + public $Leaderboard = null; + public $WideSkyscraper = null; - function __construct($uap = array()) - { - $this->uap = $uap; - - parent::__construct(); - } - - function onInitializePlugin() - { - foreach($this->uap as $key => $value) { - switch(strtolower($key)) { - case 'mediumrectangle': default: - $this->MediumRectangle = $value; - break; - case 'rectangle': - $this->Rectangle = $value; - break; - case 'leaderboard': - $this->Leaderboard = $value; - break; - case 'wideskyscraper': - $this->WideSkyscraper = $value; - break; - } - } - } + /** + * Output our dedicated stylesheet + * + * @param Action $action Action being shown + * + * @return boolean hook flag + */ function onEndShowStatusNetStyles($action) { - $action->cssLink(common_path('plugins/UAP/uap.css'), - null, 'screen, projection, tv'); + // XXX: allow override by theme + $action->cssLink('css/uap.css', 'base', 'screen, projection, tv'); return true; } - //MediumRectangle ad + /** + * Add a medium rectangle ad at the beginning of sidebar + * + * @param Action $action Action being shown + * + * @return boolean hook flag + */ + function onStartShowAside($action) { - if (!$this->MediumRectangle) { - return true; - } + if (!is_null($this->mediumRectangle)) { - $this->showAd($action, array('id' => 'ad_medium-rectangle'), - $this->MediumRectangle); + $action->elementStart('div', + array('class' => 'ad_medium-rectangle ad')); + + $this->showMediumRectangle($action); + + $action->elementEnd('div'); + } return true; } -/* - //Rectangle ad - function onEndShowSiteNotice($action) - { - if (!$this->Rectangle) { - return true; - } + /** + * Add a leaderboard and/or rectangle in the header + * + * @param Action $action Action being shown + * + * @return boolean hook flag + */ - $this->showAd($action, array('id' => 'ad_rectangle'), - $this->Rectangle); - - return true; - } -*/ - - //Leaderboard and Rectangle ad function onStartShowHeader($action) { - if ($this->Leaderboard) { - $this->showAd($action, array('id' => 'ad_leaderboard'), - $this->Leaderboard); + if (!is_null($this->leaderboard)) { + $action->elementStart('div', + array('class' => 'ad_leaderboard ad')); + $this->showLeaderboard($action); + $action->elementEnd('div'); } - if ($this->Rectangle) { - $this->showAd($action, array('id' => 'ad_rectangle'), - $this->Rectangle); + if (!is_null($this->rectangle)) { + $action->elementStart('div', + array('class' => 'ad_rectangle ad')); + $this->showRectangle($action); + $action->elementEnd('div'); } return true; } - //WideSkyscraper ad + /** + * Add a wide skyscraper after the aside + * + * @param Action $action Action being shown + * + * @return boolean hook flag + */ + function onEndShowAside($action) { - if (!$this->WideSkyscraper) { - return true; + if (!is_null($this->wideSkyscraper)) { + $action->elementStart('div', + array('class' => 'ad_wide-skyscraper ad')); + + $this->showWideSkyscraper($action); + + $action->elementEnd('div'); } - - $this->showAd($action, array('id' => 'ad_wide-skyscraper'), - $this->WideSkyscraper); - return true; } - //Output ad container - function showAd($action, $attr=array(), $value) - { - $classes = ($attr['class']) ? $attr['class'].' ' : ''; + /** + * Show a medium rectangle ad + * + * @param Action $action Action being shown + * + * @return void + */ - $action->elementStart('div', array('id' => $attr['id'], - 'class' => $classes.'ad')); - $action->raw($value); - $action->elementEnd('div'); - } + abstract protected function showMediumRectangle($action); - function onPluginVersion(&$versions) - { - $versions[] = array('name' => 'UAP', - 'version' => STATUSNET_VERSION, - 'author' => 'Sarven Capadisli', - 'homepage' => 'http://status.net/wiki/Plugin:UAP', - 'rawdescription' => - _m('Outputs ad placements based on Universal Ad Package')); - return true; - } + /** + * Show a rectangle ad + * + * @param Action $action Action being shown + * + * @return void + */ + + abstract protected function showRectangle($action); + + /** + * Show a wide skyscraper ad + * + * @param Action $action Action being shown + * + * @return void + */ + + abstract protected function showWideSkyscraper($action); + + /** + * Show a leaderboard ad + * + * @param Action $action Action being shown + * + * @return void + */ + + abstract protected function showLeaderboard($action); } From 9decd9806c675ce820a1443507846ba9c57ec72b Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Wed, 27 Jan 2010 07:26:32 -0500 Subject: [PATCH 117/134] Add BlankAdPlugin to test ad layout in different themes --- plugins/BlankAdPlugin.php | 121 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 121 insertions(+) create mode 100644 plugins/BlankAdPlugin.php diff --git a/plugins/BlankAdPlugin.php b/plugins/BlankAdPlugin.php new file mode 100644 index 0000000000..bf3a225c01 --- /dev/null +++ b/plugins/BlankAdPlugin.php @@ -0,0 +1,121 @@ +. + * + * @category Ads + * @package StatusNet + * @author Evan Prodromou + * @copyright 2010 StatusNet Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET')) { + exit(1); +} + +/** + * Plugin for testing ad layout + * + * This plugin uses the UAPPlugin framework to output ad content. However, + * its ad content is just paragraphs with defined background colors. It's + * mostly useful for debugging theme layout. + * + * To use this plugin, set the parameter for the ad size you want to use + * to the background you want to use. For example, to make a leaderboard + * that's red: + * + * addPlugin('BlankAd', array('leaderboard' => 'red')); + * + * @category Plugin + * @package StatusNet + * @author Evan Prodromou + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + * + * @seeAlso Location + */ + +class BlankAdPlugin extends UAPPlugin +{ + /** + * Show a medium rectangle 'ad' + * + * @param Action $action Action being shown + * + * @return void + */ + + protected function showMediumRectangle($action) + { + $style = 'width: 300px; height: 250px; background-color: ' . + $this->mediumRectangle; + + $action->element('p', array('style' => $style), ''); + } + + /** + * Show a rectangle 'ad' + * + * @param Action $action Action being shown + * + * @return void + */ + + protected function showRectangle($action) + { + $style = 'width: 180px; height: 150px; background-color: ' . + $this->rectangle; + + $action->element('p', array('style' => $style), ''); + } + + /** + * Show a wide skyscraper ad + * + * @param Action $action Action being shown + * + * @return void + */ + + protected function showWideSkyscraper($action) + { + $style = 'width: 160px; height: 600px; background-color: ' . + $this->wideSkyscraper; + + $action->element('p', array('style' => $style), ''); + } + + /** + * Show a leaderboard ad + * + * @param Action $action Action being shown + * + * @return void + */ + + protected function showLeaderboard($action) + { + $style = 'width: 728px; height: 90px; background-color: ' . + $this->leaderboard; + + $action->element('p', array('style' => $style), ''); + } +} \ No newline at end of file From b412ebab11e4ef55bc06b6ea5dfe11fd66614f50 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Wed, 27 Jan 2010 07:34:31 -0500 Subject: [PATCH 118/134] move BlankAdPlugin to its own dir --- plugins/BlankAd/BlankAdPlugin.php | 121 ++++++++++++++++++++++++++++++ 1 file changed, 121 insertions(+) create mode 100644 plugins/BlankAd/BlankAdPlugin.php diff --git a/plugins/BlankAd/BlankAdPlugin.php b/plugins/BlankAd/BlankAdPlugin.php new file mode 100644 index 0000000000..bf3a225c01 --- /dev/null +++ b/plugins/BlankAd/BlankAdPlugin.php @@ -0,0 +1,121 @@ +. + * + * @category Ads + * @package StatusNet + * @author Evan Prodromou + * @copyright 2010 StatusNet Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET')) { + exit(1); +} + +/** + * Plugin for testing ad layout + * + * This plugin uses the UAPPlugin framework to output ad content. However, + * its ad content is just paragraphs with defined background colors. It's + * mostly useful for debugging theme layout. + * + * To use this plugin, set the parameter for the ad size you want to use + * to the background you want to use. For example, to make a leaderboard + * that's red: + * + * addPlugin('BlankAd', array('leaderboard' => 'red')); + * + * @category Plugin + * @package StatusNet + * @author Evan Prodromou + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + * + * @seeAlso Location + */ + +class BlankAdPlugin extends UAPPlugin +{ + /** + * Show a medium rectangle 'ad' + * + * @param Action $action Action being shown + * + * @return void + */ + + protected function showMediumRectangle($action) + { + $style = 'width: 300px; height: 250px; background-color: ' . + $this->mediumRectangle; + + $action->element('p', array('style' => $style), ''); + } + + /** + * Show a rectangle 'ad' + * + * @param Action $action Action being shown + * + * @return void + */ + + protected function showRectangle($action) + { + $style = 'width: 180px; height: 150px; background-color: ' . + $this->rectangle; + + $action->element('p', array('style' => $style), ''); + } + + /** + * Show a wide skyscraper ad + * + * @param Action $action Action being shown + * + * @return void + */ + + protected function showWideSkyscraper($action) + { + $style = 'width: 160px; height: 600px; background-color: ' . + $this->wideSkyscraper; + + $action->element('p', array('style' => $style), ''); + } + + /** + * Show a leaderboard ad + * + * @param Action $action Action being shown + * + * @return void + */ + + protected function showLeaderboard($action) + { + $style = 'width: 728px; height: 90px; background-color: ' . + $this->leaderboard; + + $action->element('p', array('style' => $style), ''); + } +} \ No newline at end of file From b2b95bd21fa3995b77af5096da80d52bf6938c3b Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Wed, 27 Jan 2010 07:41:12 -0500 Subject: [PATCH 119/134] make BlankAd dir and change to use a 1x1 image --- plugins/BlankAd/redpixel.png | Bin 0 -> 159 bytes plugins/BlankAdPlugin.php | 121 ----------------------------------- 2 files changed, 121 deletions(-) create mode 100644 plugins/BlankAd/redpixel.png delete mode 100644 plugins/BlankAdPlugin.php diff --git a/plugins/BlankAd/redpixel.png b/plugins/BlankAd/redpixel.png new file mode 100644 index 0000000000000000000000000000000000000000..26299a552574ed7b95a6eba5270067f44ad765eb GIT binary patch literal 159 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1SBVv2j2s6ii6yp7}lMWc?slj7I;J!Gca%q zgD@k*tT_@uLG}_)Usv{9jM6-cJf2o(vVlU9C9V-A&iT2ysd*&~&PAz-C8;S2<(VZJ w3hti10pX2&;y^__o-U3d9M_Y7oIk+8z|6?VAaS>M15lj7)78&qol`;+06pa;zW@LL literal 0 HcmV?d00001 diff --git a/plugins/BlankAdPlugin.php b/plugins/BlankAdPlugin.php deleted file mode 100644 index bf3a225c01..0000000000 --- a/plugins/BlankAdPlugin.php +++ /dev/null @@ -1,121 +0,0 @@ -. - * - * @category Ads - * @package StatusNet - * @author Evan Prodromou - * @copyright 2010 StatusNet Inc. - * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 - * @link http://status.net/ - */ - -if (!defined('STATUSNET')) { - exit(1); -} - -/** - * Plugin for testing ad layout - * - * This plugin uses the UAPPlugin framework to output ad content. However, - * its ad content is just paragraphs with defined background colors. It's - * mostly useful for debugging theme layout. - * - * To use this plugin, set the parameter for the ad size you want to use - * to the background you want to use. For example, to make a leaderboard - * that's red: - * - * addPlugin('BlankAd', array('leaderboard' => 'red')); - * - * @category Plugin - * @package StatusNet - * @author Evan Prodromou - * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 - * @link http://status.net/ - * - * @seeAlso Location - */ - -class BlankAdPlugin extends UAPPlugin -{ - /** - * Show a medium rectangle 'ad' - * - * @param Action $action Action being shown - * - * @return void - */ - - protected function showMediumRectangle($action) - { - $style = 'width: 300px; height: 250px; background-color: ' . - $this->mediumRectangle; - - $action->element('p', array('style' => $style), ''); - } - - /** - * Show a rectangle 'ad' - * - * @param Action $action Action being shown - * - * @return void - */ - - protected function showRectangle($action) - { - $style = 'width: 180px; height: 150px; background-color: ' . - $this->rectangle; - - $action->element('p', array('style' => $style), ''); - } - - /** - * Show a wide skyscraper ad - * - * @param Action $action Action being shown - * - * @return void - */ - - protected function showWideSkyscraper($action) - { - $style = 'width: 160px; height: 600px; background-color: ' . - $this->wideSkyscraper; - - $action->element('p', array('style' => $style), ''); - } - - /** - * Show a leaderboard ad - * - * @param Action $action Action being shown - * - * @return void - */ - - protected function showLeaderboard($action) - { - $style = 'width: 728px; height: 90px; background-color: ' . - $this->leaderboard; - - $action->element('p', array('style' => $style), ''); - } -} \ No newline at end of file From e4393ee6dbcfbcf660d898dd1eb5fe91c4e3b80d Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Wed, 27 Jan 2010 07:51:25 -0500 Subject: [PATCH 120/134] Add the moved BlankAdPlugin --- plugins/BlankAd/BlankAdPlugin.php | 45 ++++++++++++++++--------------- 1 file changed, 24 insertions(+), 21 deletions(-) diff --git a/plugins/BlankAd/BlankAdPlugin.php b/plugins/BlankAd/BlankAdPlugin.php index bf3a225c01..5f46ddd48d 100644 --- a/plugins/BlankAd/BlankAdPlugin.php +++ b/plugins/BlankAd/BlankAdPlugin.php @@ -35,14 +35,13 @@ if (!defined('STATUSNET')) { * Plugin for testing ad layout * * This plugin uses the UAPPlugin framework to output ad content. However, - * its ad content is just paragraphs with defined background colors. It's - * mostly useful for debugging theme layout. + * its ad content is just images with one red pixel stretched to the + * right size. It's mostly useful for debugging theme layout. * * To use this plugin, set the parameter for the ad size you want to use - * to the background you want to use. For example, to make a leaderboard - * that's red: + * to true (or anything non-null). For example, to make a leaderboard: * - * addPlugin('BlankAd', array('leaderboard' => 'red')); + * addPlugin('BlankAd', array('leaderboard' => true)); * * @category Plugin * @package StatusNet @@ -65,10 +64,11 @@ class BlankAdPlugin extends UAPPlugin protected function showMediumRectangle($action) { - $style = 'width: 300px; height: 250px; background-color: ' . - $this->mediumRectangle; - - $action->element('p', array('style' => $style), ''); + $action->element('img', + array('width' => 300, + 'height' => 250, + 'src' => common_path('plugins/BlankAd/redpixel.png')), + ''); } /** @@ -81,10 +81,11 @@ class BlankAdPlugin extends UAPPlugin protected function showRectangle($action) { - $style = 'width: 180px; height: 150px; background-color: ' . - $this->rectangle; - - $action->element('p', array('style' => $style), ''); + $action->element('img', + array('width' => 180, + 'height' => 50, + 'src' => common_path('plugins/BlankAd/redpixel.png')), + ''); } /** @@ -97,10 +98,11 @@ class BlankAdPlugin extends UAPPlugin protected function showWideSkyscraper($action) { - $style = 'width: 160px; height: 600px; background-color: ' . - $this->wideSkyscraper; - - $action->element('p', array('style' => $style), ''); + $action->element('img', + array('width' => 160, + 'height' => 600, + 'src' => common_path('plugins/BlankAd/redpixel.png')), + ''); } /** @@ -113,9 +115,10 @@ class BlankAdPlugin extends UAPPlugin protected function showLeaderboard($action) { - $style = 'width: 728px; height: 90px; background-color: ' . - $this->leaderboard; - - $action->element('p', array('style' => $style), ''); + $action->element('img', + array('width' => 728, + 'height' => 90, + 'src' => common_path('plugins/BlankAd/redpixel.png')), + ''); } } \ No newline at end of file From 4ad931ad38f1eba1f5b00a923854544dcb4aa0d6 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Wed, 27 Jan 2010 08:13:05 -0500 Subject: [PATCH 121/134] wrong height for rectangle in BlankAd --- plugins/BlankAd/BlankAdPlugin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/BlankAd/BlankAdPlugin.php b/plugins/BlankAd/BlankAdPlugin.php index 5f46ddd48d..0e2719aed0 100644 --- a/plugins/BlankAd/BlankAdPlugin.php +++ b/plugins/BlankAd/BlankAdPlugin.php @@ -83,7 +83,7 @@ class BlankAdPlugin extends UAPPlugin { $action->element('img', array('width' => 180, - 'height' => 50, + 'height' => 150, 'src' => common_path('plugins/BlankAd/redpixel.png')), ''); } From e9feafc3ca4641bf5c51bbced3454962ed89b8ef Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Wed, 27 Jan 2010 08:13:24 -0500 Subject: [PATCH 122/134] CSS ids and classes fixed in UAPPlugin --- lib/uapplugin.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/uapplugin.php b/lib/uapplugin.php index 5160d96629..4364b1e190 100644 --- a/lib/uapplugin.php +++ b/lib/uapplugin.php @@ -87,7 +87,8 @@ abstract class UAPPlugin extends Plugin if (!is_null($this->mediumRectangle)) { $action->elementStart('div', - array('class' => 'ad_medium-rectangle ad')); + array('id' => 'ad_medium-rectangle', + 'class' => 'ad')); $this->showMediumRectangle($action); @@ -109,14 +110,16 @@ abstract class UAPPlugin extends Plugin { if (!is_null($this->leaderboard)) { $action->elementStart('div', - array('class' => 'ad_leaderboard ad')); + array('id' => 'ad_leaderboard', + 'class' => 'ad')); $this->showLeaderboard($action); $action->elementEnd('div'); } if (!is_null($this->rectangle)) { $action->elementStart('div', - array('class' => 'ad_rectangle ad')); + array('id' => 'ad_rectangle', + 'class' => 'ad')); $this->showRectangle($action); $action->elementEnd('div'); } @@ -136,7 +139,8 @@ abstract class UAPPlugin extends Plugin { if (!is_null($this->wideSkyscraper)) { $action->elementStart('div', - array('class' => 'ad_wide-skyscraper ad')); + array('id' => 'ad_wide-skyscraper', + 'class' => 'ad')); $this->showWideSkyscraper($action); From e3bd97bfe46ee7d063a45eec282b28faee1ca83f Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Wed, 27 Jan 2010 15:14:00 +0100 Subject: [PATCH 123/134] Aligning wide skyscraper to the right instead of left --- theme/base/css/uap.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/theme/base/css/uap.css b/theme/base/css/uap.css index 90abe51807..b95e9b2ce4 100644 --- a/theme/base/css/uap.css +++ b/theme/base/css/uap.css @@ -45,6 +45,7 @@ clear:both; width:160px; height:600px; +float:right; margin-top:18px; -margin-left:8.5%; +margin-right:8.25%; } From 1c875a53952506ca95716992511421d110a37d4d Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Wed, 27 Jan 2010 15:32:59 +0100 Subject: [PATCH 124/134] Moved rectangle ad into aside and leaderboard to the right in header. Intention for this layout was to reduce whitespace in header area --- lib/uapplugin.php | 15 ++++++++++++++- theme/base/css/uap.css | 9 ++++++--- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/lib/uapplugin.php b/lib/uapplugin.php index 4364b1e190..69b68f9367 100644 --- a/lib/uapplugin.php +++ b/lib/uapplugin.php @@ -99,7 +99,7 @@ abstract class UAPPlugin extends Plugin } /** - * Add a leaderboard and/or rectangle in the header + * Add a leaderboard in the header * * @param Action $action Action being shown * @@ -116,6 +116,19 @@ abstract class UAPPlugin extends Plugin $action->elementEnd('div'); } + return true; + } + + /** + * Add a rectangle before aside sections + * + * @param Action $action Action being shown + * + * @return boolean hook flag + */ + + function onStartShowSections($action) + { if (!is_null($this->rectangle)) { $action->elementStart('div', array('id' => 'ad_rectangle', diff --git a/theme/base/css/uap.css b/theme/base/css/uap.css index b95e9b2ce4..d7fa02c7f9 100644 --- a/theme/base/css/uap.css +++ b/theme/base/css/uap.css @@ -29,15 +29,18 @@ margin-bottom:18px; width:180px; height:150px; -float:right; -margin-right:18px; +float:none; +clear:both; +margin:0 auto; +margin-bottom:29px; } #ad_leaderboard { width:728px; height:90px; -margin:29px 18px 0 0; +margin:11px 18px 0 0; +float:right; clear:both; } From ea123800e991352d862c05a2f81e82ef53e72eeb Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Wed, 27 Jan 2010 10:44:49 -0500 Subject: [PATCH 125/134] move leaderboard to after the header --- lib/uapplugin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/uapplugin.php b/lib/uapplugin.php index 69b68f9367..e3801f08ae 100644 --- a/lib/uapplugin.php +++ b/lib/uapplugin.php @@ -106,7 +106,7 @@ abstract class UAPPlugin extends Plugin * @return boolean hook flag */ - function onStartShowHeader($action) + function onEndShowHeader($action) { if (!is_null($this->leaderboard)) { $action->elementStart('div', From 760be76fc000c546ac38e96fa1cc5f822b7e6993 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Wed, 27 Jan 2010 10:45:44 -0500 Subject: [PATCH 126/134] camelcase the uap param names --- lib/uapplugin.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/uapplugin.php b/lib/uapplugin.php index e3801f08ae..ef35bafbfb 100644 --- a/lib/uapplugin.php +++ b/lib/uapplugin.php @@ -54,10 +54,10 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { abstract class UAPPlugin extends Plugin { - public $MediumRectangle = null; - public $Rectangle = null; - public $Leaderboard = null; - public $WideSkyscraper = null; + public $mediumRectangle = null; + public $rectangle = null; + public $leaderboard = null; + public $wideSkyscraper = null; /** * Output our dedicated stylesheet From 5e31ecd82aaf102382380b1352503303893cf9ba Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Wed, 27 Jan 2010 16:52:18 +0100 Subject: [PATCH 127/134] Centred leaderboard ad --- theme/base/css/uap.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/theme/base/css/uap.css b/theme/base/css/uap.css index d7fa02c7f9..73be5f0c14 100644 --- a/theme/base/css/uap.css +++ b/theme/base/css/uap.css @@ -39,8 +39,8 @@ margin-bottom:29px; width:728px; height:90px; -margin:11px 18px 0 0; -float:right; +margin:0 auto 18px; +float:none; clear:both; } From 47645228da4a9af8ffb0dc1f11c1da995f4791cb Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Wed, 27 Jan 2010 13:58:55 -0800 Subject: [PATCH 128/134] Add new oauth tables and modifications to 'consumer' table for rc4 --- db/rc3to09.sql | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/db/rc3to09.sql b/db/rc3to09.sql index 02dc7a6e2e..8342c4bc6f 100644 --- a/db/rc3to09.sql +++ b/db/rc3to09.sql @@ -14,3 +14,35 @@ insert into queue_item_new (frame,transport,created,claimed) alter table queue_item rename to queue_item_old; alter table queue_item_new rename to queue_item; +alter table consumer + add consumer_secret varchar(255) not null comment 'secret value', + add verifier varchar(255) comment 'verifier string for OAuth 1.0a', + add verified_callback varchar(255) comment 'verified callback URL for OAuth 1.0a'; + +create table oauth_application ( + id integer auto_increment primary key comment 'unique identifier', + owner integer not null comment 'owner of the application' references profile (id), + consumer_key varchar(255) not null comment 'application consumer key' references consumer (consumer_key), + name varchar(255) not null comment 'name of the application', + description varchar(255) comment 'description of the application', + icon varchar(255) not null comment 'application icon', + source_url varchar(255) comment 'application homepage - used for source link', + organization varchar(255) comment 'name of the organization running the application', + homepage varchar(255) comment 'homepage for the organization', + callback_url varchar(255) comment 'url to redirect to after authentication', + type tinyint default 0 comment 'type of app, 1 = browser, 2 = desktop', + access_type tinyint default 0 comment 'default access type, bit 1 = read, bit 2 = write', + created datetime not null comment 'date this record was created', + modified timestamp comment 'date this record was modified' +) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin; + +create table oauth_application_user ( + profile_id integer not null comment 'user of the application' references profile (id), + application_id integer not null comment 'id of the application' references oauth_application (id), + access_type tinyint default 0 comment 'access type, bit 1 = read, bit 2 = write, bit 3 = revoked', + token varchar(255) comment 'request or access token', + created datetime not null comment 'date this record was created', + modified timestamp comment 'date this record was modified', + constraint primary key (profile_id, application_id) +) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin; + From 9a54745fcd252e27cc664da7cee67b48d0f4f501 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Wed, 27 Jan 2010 13:59:58 -0800 Subject: [PATCH 129/134] Rename rc3to09.sql to rc3torc4.sql to avoid confusion if we add a last-minute change after this! --- db/{rc3to09.sql => rc3torc4.sql} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename db/{rc3to09.sql => rc3torc4.sql} (100%) diff --git a/db/rc3to09.sql b/db/rc3torc4.sql similarity index 100% rename from db/rc3to09.sql rename to db/rc3torc4.sql From b0a325f7d0418575cdb46b7074c4cd2317f04980 Mon Sep 17 00:00:00 2001 From: Michele Date: Sun, 17 Jan 2010 11:21:07 +0100 Subject: [PATCH 130/134] HTTP auth provided is evaluated even if it's not required --- lib/apiauth.php | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/lib/apiauth.php b/lib/apiauth.php index ad9651ff26..ac5e997c78 100644 --- a/lib/apiauth.php +++ b/lib/apiauth.php @@ -84,16 +84,22 @@ class ApiAuthAction extends ApiAction } else { $this->checkBasicAuthUser(); } + } else { - // Reject API calls with the wrong access level + // Check to see if a basic auth user is there even + // if one's not required - if ($this->isReadOnly($args) == false) { - if ($this->access != self::READ_WRITE) { - $msg = 'API resource requires read-write access, ' . - 'but you only have read access.'; - $this->clientError($msg, 401, $this->format); - exit(); - } + $this->checkBasicAuthUser(false); + } + + // Reject API calls with the wrong access level + + if ($this->isReadOnly($args) == false) { + if ($this->access != self::READ_WRITE) { + $msg = 'API resource requires read-write access, ' . + 'but you only have read access.'; + $this->clientError($msg, 401, $this->format); + exit; } } @@ -206,13 +212,13 @@ class ApiAuthAction extends ApiAction * @return boolean true or false */ - function checkBasicAuthUser() + function checkBasicAuthUser($required = true) { $this->basicAuthProcessHeader(); $realm = common_config('site', 'name') . ' API'; - if (!isset($this->auth_user_nickname)) { + if (!isset($this->auth_user_nickname) && $required) { header('WWW-Authenticate: Basic realm="' . $realm . '"'); // show error if the user clicks 'cancel' @@ -222,11 +228,10 @@ class ApiAuthAction extends ApiAction } else { - $user = common_check_user($this->auth_user_nickname, - $this->auth_user_password); - if (Event::handle('StartSetApiUser', array(&$user))) { - $this->auth_user = $user; + $this->auth_user = common_check_user($this->auth_user_nickname, + $this->auth_user_password); + Event::handle('EndSetApiUser', array($user)); } From b6de415f9dc2127e83ab1f14d1e8eba4b9446710 Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Thu, 28 Jan 2010 01:07:28 +0100 Subject: [PATCH 131/134] Localisation updates for !StatusNet from !translatewiki.net !sntrans --- locale/ar/LC_MESSAGES/statusnet.po | 532 +++++++++++-------- locale/arz/LC_MESSAGES/statusnet.po | 537 +++++++++++-------- locale/bg/LC_MESSAGES/statusnet.po | 534 +++++++++++-------- locale/ca/LC_MESSAGES/statusnet.po | 571 +++++++++++--------- locale/cs/LC_MESSAGES/statusnet.po | 560 +++++++++++--------- locale/de/LC_MESSAGES/statusnet.po | 545 ++++++++++--------- locale/el/LC_MESSAGES/statusnet.po | 569 +++++++++++--------- locale/en_GB/LC_MESSAGES/statusnet.po | 664 ++++++++++++----------- locale/es/LC_MESSAGES/statusnet.po | 563 +++++++++++--------- locale/fa/LC_MESSAGES/statusnet.po | 534 +++++++++++-------- locale/fi/LC_MESSAGES/statusnet.po | 563 +++++++++++--------- locale/fr/LC_MESSAGES/statusnet.po | 555 ++++++++++--------- locale/ga/LC_MESSAGES/statusnet.po | 562 +++++++++++--------- locale/he/LC_MESSAGES/statusnet.po | 560 +++++++++++--------- locale/hsb/LC_MESSAGES/statusnet.po | 533 +++++++++++-------- locale/ia/LC_MESSAGES/statusnet.po | 532 +++++++++++-------- locale/is/LC_MESSAGES/statusnet.po | 561 +++++++++++--------- locale/it/LC_MESSAGES/statusnet.po | 538 +++++++++++-------- locale/ja/LC_MESSAGES/statusnet.po | 532 +++++++++++-------- locale/ko/LC_MESSAGES/statusnet.po | 563 +++++++++++--------- locale/mk/LC_MESSAGES/statusnet.po | 534 +++++++++++-------- locale/nb/LC_MESSAGES/statusnet.po | 553 ++++++++++--------- locale/nl/LC_MESSAGES/statusnet.po | 536 +++++++++++-------- locale/nn/LC_MESSAGES/statusnet.po | 563 +++++++++++--------- locale/pl/LC_MESSAGES/statusnet.po | 540 +++++++++++-------- locale/pt/LC_MESSAGES/statusnet.po | 534 +++++++++++-------- locale/pt_BR/LC_MESSAGES/statusnet.po | 536 +++++++++++-------- locale/ru/LC_MESSAGES/statusnet.po | 731 ++++++++++++++------------ locale/statusnet.po | 536 ++++++++++--------- locale/sv/LC_MESSAGES/statusnet.po | 534 +++++++++++-------- locale/te/LC_MESSAGES/statusnet.po | 680 +++++++++++++----------- locale/tr/LC_MESSAGES/statusnet.po | 560 +++++++++++--------- locale/uk/LC_MESSAGES/statusnet.po | 541 +++++++++++-------- locale/vi/LC_MESSAGES/statusnet.po | 562 +++++++++++--------- locale/zh_CN/LC_MESSAGES/statusnet.po | 563 +++++++++++--------- locale/zh_TW/LC_MESSAGES/statusnet.po | 556 +++++++++++--------- 36 files changed, 11396 insertions(+), 8771 deletions(-) diff --git a/locale/ar/LC_MESSAGES/statusnet.po b/locale/ar/LC_MESSAGES/statusnet.po index bbe2597a25..f6aa348cc7 100644 --- a/locale/ar/LC_MESSAGES/statusnet.po +++ b/locale/ar/LC_MESSAGES/statusnet.po @@ -9,18 +9,72 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-21 22:36+0000\n" -"PO-Revision-Date: 2010-01-21 22:37:00+0000\n" +"POT-Creation-Date: 2010-01-27 23:58+0000\n" +"PO-Revision-Date: 2010-01-27 23:58:20+0000\n" "Language-Team: Arabic\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r61339); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61595); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ar\n" "X-Message-Group: out-statusnet\n" "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" +#: actions/accessadminpanel.php:54 lib/adminpanelaction.php:326 +msgid "Access" +msgstr "نفاذ" + +#: actions/accessadminpanel.php:65 +#, fuzzy +msgid "Site access settings" +msgstr "اذف إعدادت الموقع" + +#: actions/accessadminpanel.php:158 +#, fuzzy +msgid "Registration" +msgstr "سجّل" + +#: actions/accessadminpanel.php:161 +msgid "Private" +msgstr "خاص" + +#: actions/accessadminpanel.php:163 +msgid "Prohibit anonymous users (not logged in) from viewing site?" +msgstr "أأمنع المستخدمين المجهولين (غير الوالجين) من عرض الموقع؟" + +#: actions/accessadminpanel.php:167 +msgid "Invite only" +msgstr "بالدعوة فقط" + +#: actions/accessadminpanel.php:169 +msgid "Make registration invitation only." +msgstr "" + +#: actions/accessadminpanel.php:173 +msgid "Closed" +msgstr "مُغلق" + +#: actions/accessadminpanel.php:175 +msgid "Disable new registrations." +msgstr "عطّل التسجيل الجديد." + +#: actions/accessadminpanel.php:189 actions/designadminpanel.php:586 +#: actions/emailsettings.php:195 actions/imsettings.php:163 +#: actions/othersettings.php:126 actions/pathsadminpanel.php:351 +#: actions/profilesettings.php:174 actions/siteadminpanel.php:336 +#: actions/smssettings.php:181 actions/subscriptions.php:203 +#: actions/tagother.php:154 actions/useradminpanel.php:313 +#: lib/applicationeditform.php:335 lib/applicationeditform.php:336 +#: lib/designsettings.php:256 lib/groupeditform.php:202 +msgid "Save" +msgstr "أرسل" + +#: actions/accessadminpanel.php:189 +#, fuzzy +msgid "Save access settings" +msgstr "اذف إعدادت الموقع" + #: actions/all.php:63 actions/public.php:97 actions/replies.php:92 #: actions/showfavorites.php:137 actions/tag.php:51 msgid "No such page" @@ -35,7 +89,7 @@ msgstr "لا صفحة كهذه" #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:149 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 @@ -134,8 +188,7 @@ msgstr "" #: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 #: actions/apitimelinefriends.php:155 actions/apitimelinegroup.php:150 #: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 -#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found." @@ -151,7 +204,7 @@ msgstr "لم يتم العثور على وسيلة API." #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:119 +#: actions/apistatusesupdate.php:118 msgid "This method requires a POST." msgstr "تتطلب هذه الطريقة POST." @@ -180,7 +233,7 @@ msgstr "لم يمكن حفظ الملف." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:132 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 #: actions/designadminpanel.php:122 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -476,7 +529,14 @@ msgstr "" msgid "Allow or deny access" msgstr "" -#: actions/apioauthauthorize.php:320 lib/action.php:435 +#: actions/apioauthauthorize.php:306 +#, php-format +msgid "" +"The application %s by %s would like the " +"ability to %s your account data." +msgstr "" + +#: actions/apioauthauthorize.php:320 lib/action.php:441 msgid "Account" msgstr "الحساب" @@ -533,17 +593,17 @@ msgstr "حُذِفت الحالة." msgid "No status with that ID found." msgstr "لا حالة وُجدت بهذه الهوية." -#: actions/apistatusesupdate.php:162 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "" -#: actions/apistatusesupdate.php:203 +#: actions/apistatusesupdate.php:202 msgid "Not found" msgstr "لم يوجد" -#: actions/apistatusesupdate.php:226 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -594,11 +654,6 @@ msgstr "مسار %s الزمني العام" msgid "%s updates from everyone!" msgstr "" -#: actions/apitimelineretweetedbyme.php:112 -#, php-format -msgid "Repeated by %s" -msgstr "كرّره %s" - #: actions/apitimelineretweetedtome.php:111 #, php-format msgid "Repeated to %s" @@ -997,17 +1052,6 @@ msgstr "استعد التصميمات المبدئية" msgid "Reset back to default" msgstr "ارجع إلى المبدئي" -#: actions/designadminpanel.php:586 actions/emailsettings.php:195 -#: actions/imsettings.php:163 actions/othersettings.php:126 -#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174 -#: actions/siteadminpanel.php:388 actions/smssettings.php:181 -#: actions/subscriptions.php:203 actions/tagother.php:154 -#: actions/useradminpanel.php:313 lib/applicationeditform.php:335 -#: lib/applicationeditform.php:336 lib/designsettings.php:256 -#: lib/groupeditform.php:202 -msgid "Save" -msgstr "أرسل" - #: actions/designadminpanel.php:587 lib/designsettings.php:257 msgid "Save design" msgstr "احفظ التصميم" @@ -1020,12 +1064,14 @@ msgstr "هذا الشعار ليس مفضلًا!" msgid "Add to favorites" msgstr "أضف إلى المفضلات" -#: actions/doc.php:69 -msgid "No such document." +#: actions/doc.php:155 +#, fuzzy, php-format +msgid "No such document \"%s\"" msgstr "لا مستند كهذا." -#: actions/editapplication.php:54 lib/applicationeditform.php:136 -msgid "Edit application" +#: actions/editapplication.php:54 +#, fuzzy +msgid "Edit Application" msgstr "عدّل التطبيق" #: actions/editapplication.php:66 @@ -1042,7 +1088,7 @@ msgid "No such application." msgstr "لا تطبيق كهذا." #: actions/editapplication.php:127 actions/newapplication.php:110 -#: actions/showapplication.php:118 lib/action.php:1189 +#: actions/showapplication.php:118 lib/action.php:1195 msgid "There was a problem with your session token." msgstr "" @@ -1241,7 +1287,7 @@ msgid "Cannot normalize that email address" msgstr "" #: actions/emailsettings.php:331 actions/register.php:201 -#: actions/siteadminpanel.php:157 +#: actions/siteadminpanel.php:143 msgid "Not a valid email address." msgstr "ليس عنوان بريد صالح." @@ -1253,7 +1299,7 @@ msgstr "هذا هو عنوان بريدك الإكتروني سابقًا." msgid "That email address already belongs to another user." msgstr "هذا البريد الإلكتروني ملك مستخدم آخر بالفعل." -#: actions/emailsettings.php:353 actions/imsettings.php:317 +#: actions/emailsettings.php:353 actions/imsettings.php:319 #: actions/smssettings.php:337 msgid "Couldn't insert confirmation code." msgstr "تعذّر إدراج رمز التأكيد." @@ -1545,7 +1591,7 @@ msgstr "%1$s أعضاء المجموعة, الصفحة %2$d" msgid "A list of the users in this group." msgstr "قائمة بمستخدمي هذه المجموعة." -#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107 +#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107 msgid "Admin" msgstr "إداري" @@ -1720,6 +1766,11 @@ msgstr "" msgid "That is not your Jabber ID." msgstr "هذه ليست هويتك في جابر." +#: actions/inbox.php:59 +#, php-format +msgid "Inbox for %1$s - page %2$d" +msgstr "" + #: actions/inbox.php:62 #, php-format msgid "Inbox for %s" @@ -1870,7 +1921,7 @@ msgstr "اسم المستخدم أو كلمة السر غير صحيحان." msgid "Error setting user. You are probably not authorized." msgstr "خطأ أثناء ضبط المستخدم. لست مُصرحًا على الأرجح." -#: actions/login.php:188 actions/login.php:241 lib/action.php:460 +#: actions/login.php:188 actions/login.php:241 lib/action.php:466 #: lib/logingroupnav.php:79 msgid "Login" msgstr "لُج" @@ -1928,7 +1979,8 @@ msgid "No current status" msgstr "لا حالة حالية" #: actions/newapplication.php:52 -msgid "New application" +#, fuzzy +msgid "New Application" msgstr "تطبيق جديد" #: actions/newapplication.php:64 @@ -2102,7 +2154,7 @@ msgstr "" #: actions/oembed.php:86 actions/shownotice.php:180 #, php-format msgid "%1$s's status on %2$s" -msgstr "" +msgstr "حالة %1$s في يوم %2$s" #: actions/oembed.php:157 msgid "content type " @@ -2112,8 +2164,8 @@ msgstr "نوع المحتوى " msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1038 -#: lib/api.php:1066 lib/api.php:1176 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1039 +#: lib/api.php:1067 lib/api.php:1177 msgid "Not a supported data format." msgstr "ليس نسق بيانات مدعوم." @@ -2177,6 +2229,11 @@ msgstr "توكن دخول غير صحيح محدد." msgid "Login token expired." msgstr "توكن الدخول انتهى." +#: actions/outbox.php:58 +#, php-format +msgid "Outbox for %1$s - page %2$d" +msgstr "" + #: actions/outbox.php:61 #, php-format msgid "Outbox for %s" @@ -2247,7 +2304,7 @@ msgstr "تعذّر حفظ كلمة السر الجديدة." msgid "Password saved." msgstr "حُفظت كلمة السر." -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:331 msgid "Paths" msgstr "المسارات" @@ -2255,132 +2312,148 @@ msgstr "المسارات" msgid "Path and server settings for this StatusNet site." msgstr "" -#: actions/pathsadminpanel.php:140 +#: actions/pathsadminpanel.php:157 #, php-format msgid "Theme directory not readable: %s" msgstr "لا يمكن قراءة دليل السمات: %s" -#: actions/pathsadminpanel.php:146 +#: actions/pathsadminpanel.php:163 #, php-format msgid "Avatar directory not writable: %s" msgstr "لا يمكن الكتابة في دليل الأفتارات: %s" -#: actions/pathsadminpanel.php:152 +#: actions/pathsadminpanel.php:169 #, php-format msgid "Background directory not writable: %s" msgstr "لا يمكن الكتابة في دليل الخلفيات: %s" -#: actions/pathsadminpanel.php:160 +#: actions/pathsadminpanel.php:177 #, php-format msgid "Locales directory not readable: %s" msgstr "لا يمكن قراءة دليل المحليات: %s" -#: actions/pathsadminpanel.php:166 +#: actions/pathsadminpanel.php:183 msgid "Invalid SSL server. The maximum length is 255 characters." msgstr "" -#: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58 +#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58 #: lib/adminpanelaction.php:311 msgid "Site" msgstr "الموقع" -#: actions/pathsadminpanel.php:221 +#: actions/pathsadminpanel.php:238 +msgid "Server" +msgstr "خادوم" + +#: actions/pathsadminpanel.php:238 +msgid "Site's server hostname." +msgstr "اسم مضيف خادوم الموقع." + +#: actions/pathsadminpanel.php:242 msgid "Path" msgstr "المسار" -#: actions/pathsadminpanel.php:221 +#: actions/pathsadminpanel.php:242 msgid "Site path" msgstr "مسار الموقع" -#: actions/pathsadminpanel.php:225 +#: actions/pathsadminpanel.php:246 msgid "Path to locales" msgstr "مسار المحليات" -#: actions/pathsadminpanel.php:225 +#: actions/pathsadminpanel.php:246 msgid "Directory path to locales" msgstr "مسار دليل المحليات" -#: actions/pathsadminpanel.php:232 +#: actions/pathsadminpanel.php:250 +msgid "Fancy URLs" +msgstr "مسارات فاخرة" + +#: actions/pathsadminpanel.php:252 +msgid "Use fancy (more readable and memorable) URLs?" +msgstr "أأستخدم مسارات فاخرة (يمكن قراءتها وتذكرها بسهولة أكبر)؟" + +#: actions/pathsadminpanel.php:259 msgid "Theme" msgstr "السمة" -#: actions/pathsadminpanel.php:237 +#: actions/pathsadminpanel.php:264 msgid "Theme server" msgstr "خادوم السمات" -#: actions/pathsadminpanel.php:241 +#: actions/pathsadminpanel.php:268 msgid "Theme path" msgstr "مسار السمات" -#: actions/pathsadminpanel.php:245 +#: actions/pathsadminpanel.php:272 msgid "Theme directory" msgstr "دليل السمات" -#: actions/pathsadminpanel.php:252 +#: actions/pathsadminpanel.php:279 msgid "Avatars" msgstr "أفتارات" -#: actions/pathsadminpanel.php:257 +#: actions/pathsadminpanel.php:284 msgid "Avatar server" msgstr "خادوم الأفتارات" -#: actions/pathsadminpanel.php:261 +#: actions/pathsadminpanel.php:288 msgid "Avatar path" msgstr "مسار الأفتارات" -#: actions/pathsadminpanel.php:265 +#: actions/pathsadminpanel.php:292 msgid "Avatar directory" msgstr "دليل الأفتار." -#: actions/pathsadminpanel.php:274 +#: actions/pathsadminpanel.php:301 msgid "Backgrounds" msgstr "خلفيات" -#: actions/pathsadminpanel.php:278 +#: actions/pathsadminpanel.php:305 msgid "Background server" msgstr "خادوم الخلفيات" -#: actions/pathsadminpanel.php:282 +#: actions/pathsadminpanel.php:309 msgid "Background path" msgstr "مسار الخلفيات" -#: actions/pathsadminpanel.php:286 +#: actions/pathsadminpanel.php:313 msgid "Background directory" msgstr "دليل الخلفيات" -#: actions/pathsadminpanel.php:293 +#: actions/pathsadminpanel.php:320 msgid "SSL" msgstr "SSL" -#: actions/pathsadminpanel.php:296 actions/siteadminpanel.php:346 +#: actions/pathsadminpanel.php:323 actions/siteadminpanel.php:294 msgid "Never" msgstr "مطلقا" -#: actions/pathsadminpanel.php:297 +#: actions/pathsadminpanel.php:324 msgid "Sometimes" msgstr "أحيانًا" -#: actions/pathsadminpanel.php:298 +#: actions/pathsadminpanel.php:325 msgid "Always" msgstr "دائمًا" -#: actions/pathsadminpanel.php:302 +#: actions/pathsadminpanel.php:329 msgid "Use SSL" msgstr "استخدم SSL" -#: actions/pathsadminpanel.php:303 +#: actions/pathsadminpanel.php:330 msgid "When to use SSL" msgstr "" -#: actions/pathsadminpanel.php:308 +#: actions/pathsadminpanel.php:335 msgid "SSL server" msgstr "خادم SSL" -#: actions/pathsadminpanel.php:309 +#: actions/pathsadminpanel.php:336 msgid "Server to direct SSL requests to" msgstr "" -#: actions/pathsadminpanel.php:325 +#: actions/pathsadminpanel.php:352 msgid "Save paths" msgstr "احفظ المسارات" @@ -2485,7 +2558,7 @@ msgid "" "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated" msgstr "" -#: actions/profilesettings.php:151 actions/siteadminpanel.php:294 +#: actions/profilesettings.php:151 actions/siteadminpanel.php:280 msgid "Language" msgstr "اللغة" @@ -2511,7 +2584,7 @@ msgstr "" msgid "Bio is too long (max %d chars)." msgstr "" -#: actions/profilesettings.php:235 actions/siteadminpanel.php:164 +#: actions/profilesettings.php:235 actions/siteadminpanel.php:150 msgid "Timezone not selected." msgstr "لم تُختر المنطقة الزمنية." @@ -2775,7 +2848,7 @@ msgstr "عذرا، رمز دعوة غير صالح." msgid "Registration successful" msgstr "نجح التسجيل" -#: actions/register.php:114 actions/register.php:503 lib/action.php:457 +#: actions/register.php:114 actions/register.php:503 lib/action.php:463 #: lib/logingroupnav.php:85 msgid "Register" msgstr "سجّل" @@ -2815,7 +2888,7 @@ msgid "Same as password above. Required." msgstr "نفس كلمة السر أعلاه. مطلوب." #: actions/register.php:438 actions/register.php:442 -#: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120 +#: actions/siteadminpanel.php:256 lib/accountsettingsaction.php:120 msgid "Email" msgstr "البريد الإلكتروني" @@ -2949,6 +3022,11 @@ msgstr "مكرر!" msgid "Replies to %s" msgstr "الردود على %s" +#: actions/replies.php:127 +#, fuzzy, php-format +msgid "Replies to %1$s, page %2$d" +msgstr "الردود على %s" + #: actions/replies.php:144 #, php-format msgid "Replies feed for %s (RSS 1.0)" @@ -3072,6 +3150,11 @@ msgid "" "signature method." msgstr "" +#: actions/showfavorites.php:79 +#, fuzzy, php-format +msgid "%1$s's favorite notices, page %2$d" +msgstr "إشعارات %s المُفضلة" + #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "" @@ -3125,6 +3208,11 @@ msgstr "إنها إحدى وسائل مشاركة ما تحب." msgid "%s group" msgstr "مجموعة %s" +#: actions/showgroup.php:84 +#, fuzzy, php-format +msgid "%1$s group, page %2$d" +msgstr "%1$s أعضاء المجموعة, الصفحة %2$d" + #: actions/showgroup.php:218 msgid "Group profile" msgstr "ملف المجموعة الشخصي" @@ -3235,6 +3323,11 @@ msgstr "حُذف الإشعار." msgid " tagged %s" msgstr "" +#: actions/showstream.php:79 +#, fuzzy, php-format +msgid "%1$s, page %2$d" +msgstr "%1$s والأصدقاء, الصفحة %2$d" + #: actions/showstream.php:122 #, php-format msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" @@ -3312,192 +3405,144 @@ msgstr "المستخدم مسكت من قبل." msgid "Basic settings for this StatusNet site." msgstr "الإعدادات الأساسية لموقع StatusNet هذا." -#: actions/siteadminpanel.php:146 +#: actions/siteadminpanel.php:132 msgid "Site name must have non-zero length." msgstr "يجب ألا يكون طول اسم الموقع صفرًا." -#: actions/siteadminpanel.php:154 +#: actions/siteadminpanel.php:140 msgid "You must have a valid contact email address." msgstr "يجب أن تملك عنوان بريد إلكتروني صحيح." -#: actions/siteadminpanel.php:172 +#: actions/siteadminpanel.php:158 #, php-format msgid "Unknown language \"%s\"." msgstr "لغة غير معروفة \"%s\"." -#: actions/siteadminpanel.php:179 +#: actions/siteadminpanel.php:165 msgid "Invalid snapshot report URL." msgstr "" -#: actions/siteadminpanel.php:185 +#: actions/siteadminpanel.php:171 msgid "Invalid snapshot run value." msgstr "" -#: actions/siteadminpanel.php:191 +#: actions/siteadminpanel.php:177 msgid "Snapshot frequency must be a number." msgstr "" -#: actions/siteadminpanel.php:197 +#: actions/siteadminpanel.php:183 msgid "Minimum text limit is 140 characters." msgstr "حد النص الأدنى هو 140 حرفًا." -#: actions/siteadminpanel.php:203 +#: actions/siteadminpanel.php:189 msgid "Dupe limit must 1 or more seconds." msgstr "" -#: actions/siteadminpanel.php:253 +#: actions/siteadminpanel.php:239 msgid "General" msgstr "عام" -#: actions/siteadminpanel.php:256 +#: actions/siteadminpanel.php:242 msgid "Site name" msgstr "اسم الموقع" -#: actions/siteadminpanel.php:257 +#: actions/siteadminpanel.php:243 msgid "The name of your site, like \"Yourcompany Microblog\"" msgstr "اسم موقعك، \"التدوين المصغر لشركتك\" مثلا" -#: actions/siteadminpanel.php:261 +#: actions/siteadminpanel.php:247 msgid "Brought by" msgstr "" -#: actions/siteadminpanel.php:262 +#: actions/siteadminpanel.php:248 msgid "Text used for credits link in footer of each page" msgstr "" -#: actions/siteadminpanel.php:266 +#: actions/siteadminpanel.php:252 msgid "Brought by URL" msgstr "" -#: actions/siteadminpanel.php:267 +#: actions/siteadminpanel.php:253 msgid "URL used for credits link in footer of each page" msgstr "" -#: actions/siteadminpanel.php:271 +#: actions/siteadminpanel.php:257 msgid "Contact email address for your site" msgstr "عنوان البريد الإلكتروني للاتصال بموقعك" -#: actions/siteadminpanel.php:277 +#: actions/siteadminpanel.php:263 msgid "Local" msgstr "محلي" -#: actions/siteadminpanel.php:288 +#: actions/siteadminpanel.php:274 msgid "Default timezone" msgstr "المنطقة الزمنية المبدئية" -#: actions/siteadminpanel.php:289 +#: actions/siteadminpanel.php:275 msgid "Default timezone for the site; usually UTC." msgstr "المنطقة الزمنية المبدئية للموقع؛ ت‌ع‌م عادة." -#: actions/siteadminpanel.php:295 +#: actions/siteadminpanel.php:281 msgid "Default site language" msgstr "لغة الموقع المبدئية" -#: actions/siteadminpanel.php:303 -msgid "URLs" -msgstr "مسارات" - -#: actions/siteadminpanel.php:306 -msgid "Server" -msgstr "خادوم" - -#: actions/siteadminpanel.php:306 -msgid "Site's server hostname." -msgstr "اسم مضيف خادوم الموقع." - -#: actions/siteadminpanel.php:310 -msgid "Fancy URLs" -msgstr "مسارات فاخرة" - -#: actions/siteadminpanel.php:312 -msgid "Use fancy (more readable and memorable) URLs?" -msgstr "أأستخدم مسارات فاخرة (يمكن قراءتها وتذكرها بسهولة أكبر)؟" - -#: actions/siteadminpanel.php:318 -msgid "Access" -msgstr "نفاذ" - -#: actions/siteadminpanel.php:321 -msgid "Private" -msgstr "خاص" - -#: actions/siteadminpanel.php:323 -msgid "Prohibit anonymous users (not logged in) from viewing site?" -msgstr "أأمنع المستخدمين المجهولين (غير الوالجين) من عرض الموقع؟" - -#: actions/siteadminpanel.php:327 -msgid "Invite only" -msgstr "بالدعوة فقط" - -#: actions/siteadminpanel.php:329 -msgid "Make registration invitation only." -msgstr "" - -#: actions/siteadminpanel.php:333 -msgid "Closed" -msgstr "مُغلق" - -#: actions/siteadminpanel.php:335 -msgid "Disable new registrations." -msgstr "عطّل التسجيل الجديد." - -#: actions/siteadminpanel.php:341 +#: actions/siteadminpanel.php:289 msgid "Snapshots" msgstr "" -#: actions/siteadminpanel.php:344 +#: actions/siteadminpanel.php:292 msgid "Randomly during Web hit" msgstr "" -#: actions/siteadminpanel.php:345 +#: actions/siteadminpanel.php:293 msgid "In a scheduled job" msgstr "في مهمة مُجدولة" -#: actions/siteadminpanel.php:347 +#: actions/siteadminpanel.php:295 msgid "Data snapshots" msgstr "" -#: actions/siteadminpanel.php:348 +#: actions/siteadminpanel.php:296 msgid "When to send statistical data to status.net servers" msgstr "" -#: actions/siteadminpanel.php:353 +#: actions/siteadminpanel.php:301 msgid "Frequency" msgstr "التكرار" -#: actions/siteadminpanel.php:354 +#: actions/siteadminpanel.php:302 msgid "Snapshots will be sent once every N web hits" msgstr "" -#: actions/siteadminpanel.php:359 +#: actions/siteadminpanel.php:307 msgid "Report URL" msgstr "بلّغ عن المسار" -#: actions/siteadminpanel.php:360 +#: actions/siteadminpanel.php:308 msgid "Snapshots will be sent to this URL" msgstr "" -#: actions/siteadminpanel.php:367 +#: actions/siteadminpanel.php:315 msgid "Limits" msgstr "الحدود" -#: actions/siteadminpanel.php:370 +#: actions/siteadminpanel.php:318 msgid "Text limit" msgstr "حد النص" -#: actions/siteadminpanel.php:370 +#: actions/siteadminpanel.php:318 msgid "Maximum number of characters for notices." msgstr "أقصى عدد للحروف في الإشعارات." -#: actions/siteadminpanel.php:374 +#: actions/siteadminpanel.php:322 msgid "Dupe limit" msgstr "" -#: actions/siteadminpanel.php:374 +#: actions/siteadminpanel.php:322 msgid "How long users must wait (in seconds) to post the same thing again." msgstr "" -#: actions/siteadminpanel.php:388 actions/useradminpanel.php:313 +#: actions/siteadminpanel.php:336 actions/useradminpanel.php:313 msgid "Save site settings" msgstr "اذف إعدادت الموقع" @@ -3688,6 +3733,11 @@ msgstr "جابر" msgid "SMS" msgstr "رسائل قصيرة" +#: actions/tag.php:68 +#, fuzzy, php-format +msgid "Notices tagged with %1$s, page %2$d" +msgstr "الإشعارات الموسومة ب%s" + #: actions/tag.php:86 #, php-format msgid "Notice feed for tag %s (RSS 1.0)" @@ -3971,6 +4021,11 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "استمتع بالنقانق!" +#: actions/usergroups.php:64 +#, fuzzy, php-format +msgid "%1$s groups, page %2$d" +msgstr "%1$s أعضاء المجموعة, الصفحة %2$d" + #: actions/usergroups.php:130 msgid "Search for more groups" msgstr "ابحث عن المزيد من المجموعات" @@ -4032,7 +4087,7 @@ msgstr "" msgid "Plugins" msgstr "ملحقات" -#: actions/version.php:196 lib/action.php:741 +#: actions/version.php:196 lib/action.php:747 msgid "Version" msgstr "النسخة" @@ -4086,44 +4141,49 @@ msgstr "تعذّر إدراج الرسالة." msgid "Could not update message with new URI." msgstr "" -#: classes/Notice.php:171 +#: classes/Notice.php:157 #, php-format msgid "DB error inserting hashtag: %s" msgstr "" -#: classes/Notice.php:225 +#: classes/Notice.php:214 msgid "Problem saving notice. Too long." msgstr "مشكلة في حفظ الإشعار. طويل جدًا." -#: classes/Notice.php:229 +#: classes/Notice.php:218 msgid "Problem saving notice. Unknown user." msgstr "مشكلة في حفظ الإشعار. مستخدم غير معروف." -#: classes/Notice.php:234 +#: classes/Notice.php:223 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:240 +#: classes/Notice.php:229 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:246 +#: classes/Notice.php:235 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:305 classes/Notice.php:330 +#: classes/Notice.php:294 classes/Notice.php:319 msgid "Problem saving notice." msgstr "مشكلة أثناء حفظ الإشعار." -#: classes/Notice.php:1059 +#: classes/Notice.php:790 +#, fuzzy +msgid "Problem saving group inbox." +msgstr "مشكلة أثناء حفظ الإشعار." + +#: classes/Notice.php:850 #, php-format msgid "DB error inserting reply: %s" msgstr "" -#: classes/Notice.php:1441 +#: classes/Notice.php:1233 #, php-format msgid "RT @%1$s %2$s" msgstr "آر تي @%1$s %2$s" @@ -4178,124 +4238,124 @@ msgstr "%1$s - %2$s" msgid "Untitled page" msgstr "صفحة غير مُعنونة" -#: lib/action.php:427 +#: lib/action.php:433 msgid "Primary site navigation" msgstr "" -#: lib/action.php:433 +#: lib/action.php:439 msgid "Home" msgstr "الرئيسية" -#: lib/action.php:433 +#: lib/action.php:439 msgid "Personal profile and friends timeline" msgstr "الملف الشخصي ومسار الأصدقاء الزمني" -#: lib/action.php:435 +#: lib/action.php:441 msgid "Change your email, avatar, password, profile" msgstr "" -#: lib/action.php:438 +#: lib/action.php:444 msgid "Connect" msgstr "اتصل" -#: lib/action.php:438 +#: lib/action.php:444 msgid "Connect to services" msgstr "" -#: lib/action.php:442 +#: lib/action.php:448 msgid "Change site configuration" msgstr "غيّر ضبط الموقع" -#: lib/action.php:446 lib/subgroupnav.php:105 +#: lib/action.php:452 lib/subgroupnav.php:105 msgid "Invite" msgstr "ادعُ" -#: lib/action.php:447 lib/subgroupnav.php:106 +#: lib/action.php:453 lib/subgroupnav.php:106 #, php-format msgid "Invite friends and colleagues to join you on %s" msgstr "" -#: lib/action.php:452 +#: lib/action.php:458 msgid "Logout" msgstr "اخرج" -#: lib/action.php:452 +#: lib/action.php:458 msgid "Logout from the site" msgstr "اخرج من الموقع" -#: lib/action.php:457 +#: lib/action.php:463 msgid "Create an account" msgstr "أنشئ حسابًا" -#: lib/action.php:460 +#: lib/action.php:466 msgid "Login to the site" msgstr "لُج إلى الموقع" -#: lib/action.php:463 lib/action.php:726 +#: lib/action.php:469 lib/action.php:732 msgid "Help" msgstr "مساعدة" -#: lib/action.php:463 +#: lib/action.php:469 msgid "Help me!" msgstr "ساعدني!" -#: lib/action.php:466 lib/searchaction.php:127 +#: lib/action.php:472 lib/searchaction.php:127 msgid "Search" msgstr "ابحث" -#: lib/action.php:466 +#: lib/action.php:472 msgid "Search for people or text" msgstr "ابحث عن أشخاص أو نص" -#: lib/action.php:487 +#: lib/action.php:493 msgid "Site notice" msgstr "إشعار الموقع" -#: lib/action.php:553 +#: lib/action.php:559 msgid "Local views" msgstr "المشاهدات المحلية" -#: lib/action.php:619 +#: lib/action.php:625 msgid "Page notice" msgstr "إشعار الصفحة" -#: lib/action.php:721 +#: lib/action.php:727 msgid "Secondary site navigation" msgstr "" -#: lib/action.php:728 +#: lib/action.php:734 msgid "About" msgstr "عن" -#: lib/action.php:730 +#: lib/action.php:736 msgid "FAQ" msgstr "الأسئلة المكررة" -#: lib/action.php:734 +#: lib/action.php:740 msgid "TOS" msgstr "الشروط" -#: lib/action.php:737 +#: lib/action.php:743 msgid "Privacy" msgstr "خصوصية" -#: lib/action.php:739 +#: lib/action.php:745 msgid "Source" msgstr "المصدر" -#: lib/action.php:743 +#: lib/action.php:749 msgid "Contact" msgstr "اتصل" -#: lib/action.php:745 +#: lib/action.php:751 msgid "Badge" msgstr "" -#: lib/action.php:773 +#: lib/action.php:779 msgid "StatusNet software license" msgstr "رخصة برنامج StatusNet" -#: lib/action.php:776 +#: lib/action.php:782 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -4304,12 +4364,12 @@ msgstr "" "**%%site.name%%** خدمة تدوين مصغر يقدمها لك [%%site.broughtby%%](%%site." "broughtbyurl%%). " -#: lib/action.php:778 +#: lib/action.php:784 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "" -#: lib/action.php:780 +#: lib/action.php:786 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4320,41 +4380,41 @@ msgstr "" "المتوفر تحت [رخصة غنو أفيرو العمومية](http://www.fsf.org/licensing/licenses/" "agpl-3.0.html)." -#: lib/action.php:795 +#: lib/action.php:801 msgid "Site content license" msgstr "رخصة محتوى الموقع" -#: lib/action.php:800 +#: lib/action.php:806 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "" -#: lib/action.php:805 +#: lib/action.php:811 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" -#: lib/action.php:808 +#: lib/action.php:814 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" -#: lib/action.php:820 +#: lib/action.php:826 msgid "All " msgstr "" -#: lib/action.php:825 +#: lib/action.php:831 msgid "license." msgstr "الرخصة." -#: lib/action.php:1124 +#: lib/action.php:1130 msgid "Pagination" msgstr "" -#: lib/action.php:1133 +#: lib/action.php:1139 msgid "After" msgstr "بعد" -#: lib/action.php:1141 +#: lib/action.php:1147 msgid "Before" msgstr "قبل" @@ -4386,10 +4446,24 @@ msgstr "ضبط الموقع الأساسي" msgid "Design configuration" msgstr "ضبط التصميم" -#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327 +#: lib/adminpanelaction.php:322 +#, fuzzy +msgid "User configuration" +msgstr "ضبط المسارات" + +#: lib/adminpanelaction.php:327 +#, fuzzy +msgid "Access configuration" +msgstr "ضبط التصميم" + +#: lib/adminpanelaction.php:332 msgid "Paths configuration" msgstr "ضبط المسارات" +#: lib/applicationeditform.php:136 +msgid "Edit application" +msgstr "عدّل التطبيق" + #: lib/applicationeditform.php:186 msgid "Icon for this application" msgstr "" @@ -4970,12 +5044,12 @@ msgstr "ميجابايت" msgid "kB" msgstr "كيلوبايت" -#: lib/jabber.php:202 +#: lib/jabber.php:220 #, php-format msgid "[%s]" msgstr "[%s]" -#: lib/jabber.php:385 +#: lib/jabber.php:400 #, php-format msgid "Unknown inbox source %d." msgstr "مصدر صندوق وارد غير معروف %d." @@ -5393,19 +5467,19 @@ msgstr "الردود" msgid "Favorites" msgstr "المفضلات" -#: lib/personalgroupnav.php:124 +#: lib/personalgroupnav.php:125 msgid "Inbox" msgstr "صندوق الوارد" -#: lib/personalgroupnav.php:125 +#: lib/personalgroupnav.php:126 msgid "Your incoming messages" msgstr "رسائلك الواردة" -#: lib/personalgroupnav.php:129 +#: lib/personalgroupnav.php:130 msgid "Outbox" msgstr "صندوق الصادر" -#: lib/personalgroupnav.php:130 +#: lib/personalgroupnav.php:131 msgid "Your sent messages" msgstr "رسائلك المُرسلة" @@ -5647,47 +5721,47 @@ msgstr "رسالة" msgid "Moderate" msgstr "" -#: lib/util.php:875 +#: lib/util.php:868 msgid "a few seconds ago" msgstr "قبل لحظات قليلة" -#: lib/util.php:877 +#: lib/util.php:870 msgid "about a minute ago" msgstr "قبل دقيقة تقريبًا" -#: lib/util.php:879 +#: lib/util.php:872 #, php-format msgid "about %d minutes ago" msgstr "" -#: lib/util.php:881 +#: lib/util.php:874 msgid "about an hour ago" msgstr "قبل ساعة تقريبًا" -#: lib/util.php:883 +#: lib/util.php:876 #, php-format msgid "about %d hours ago" msgstr "" -#: lib/util.php:885 +#: lib/util.php:878 msgid "about a day ago" msgstr "قبل يوم تقريبا" -#: lib/util.php:887 +#: lib/util.php:880 #, php-format msgid "about %d days ago" msgstr "" -#: lib/util.php:889 +#: lib/util.php:882 msgid "about a month ago" msgstr "قبل شهر تقريبًا" -#: lib/util.php:891 +#: lib/util.php:884 #, php-format msgid "about %d months ago" msgstr "" -#: lib/util.php:893 +#: lib/util.php:886 msgid "about a year ago" msgstr "قبل سنة تقريبًا" @@ -5701,7 +5775,7 @@ msgstr "%s ليس لونًا صحيحًا!" msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "" -#: scripts/xmppdaemon.php:301 +#: lib/xmppmanager.php:402 #, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" diff --git a/locale/arz/LC_MESSAGES/statusnet.po b/locale/arz/LC_MESSAGES/statusnet.po index 20bb7a4b2e..9ac285b14c 100644 --- a/locale/arz/LC_MESSAGES/statusnet.po +++ b/locale/arz/LC_MESSAGES/statusnet.po @@ -9,18 +9,72 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-21 22:36+0000\n" -"PO-Revision-Date: 2010-01-21 22:37:03+0000\n" +"POT-Creation-Date: 2010-01-27 23:58+0000\n" +"PO-Revision-Date: 2010-01-27 23:58:23+0000\n" "Language-Team: Egyptian Spoken Arabic\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r61339); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61595); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: arz\n" "X-Message-Group: out-statusnet\n" "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" +#: actions/accessadminpanel.php:54 lib/adminpanelaction.php:326 +msgid "Access" +msgstr "نفاذ" + +#: actions/accessadminpanel.php:65 +#, fuzzy +msgid "Site access settings" +msgstr "اذف إعدادت الموقع" + +#: actions/accessadminpanel.php:158 +#, fuzzy +msgid "Registration" +msgstr "سجّل" + +#: actions/accessadminpanel.php:161 +msgid "Private" +msgstr "خاص" + +#: actions/accessadminpanel.php:163 +msgid "Prohibit anonymous users (not logged in) from viewing site?" +msgstr "أأمنع المستخدمين المجهولين (غير الوالجين) من عرض الموقع؟" + +#: actions/accessadminpanel.php:167 +msgid "Invite only" +msgstr "بالدعوه فقط" + +#: actions/accessadminpanel.php:169 +msgid "Make registration invitation only." +msgstr "" + +#: actions/accessadminpanel.php:173 +msgid "Closed" +msgstr "مُغلق" + +#: actions/accessadminpanel.php:175 +msgid "Disable new registrations." +msgstr "عطّل التسجيل الجديد." + +#: actions/accessadminpanel.php:189 actions/designadminpanel.php:586 +#: actions/emailsettings.php:195 actions/imsettings.php:163 +#: actions/othersettings.php:126 actions/pathsadminpanel.php:351 +#: actions/profilesettings.php:174 actions/siteadminpanel.php:336 +#: actions/smssettings.php:181 actions/subscriptions.php:203 +#: actions/tagother.php:154 actions/useradminpanel.php:313 +#: lib/applicationeditform.php:335 lib/applicationeditform.php:336 +#: lib/designsettings.php:256 lib/groupeditform.php:202 +msgid "Save" +msgstr "أرسل" + +#: actions/accessadminpanel.php:189 +#, fuzzy +msgid "Save access settings" +msgstr "اذف إعدادت الموقع" + #: actions/all.php:63 actions/public.php:97 actions/replies.php:92 #: actions/showfavorites.php:137 actions/tag.php:51 msgid "No such page" @@ -35,7 +89,7 @@ msgstr "لا صفحه كهذه" #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:149 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 @@ -134,8 +188,7 @@ msgstr "" #: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 #: actions/apitimelinefriends.php:155 actions/apitimelinegroup.php:150 #: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 -#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found." @@ -151,7 +204,7 @@ msgstr "لم يتم العثور على وسيله API." #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:119 +#: actions/apistatusesupdate.php:118 msgid "This method requires a POST." msgstr "تتطلب هذه الطريقه POST." @@ -180,7 +233,7 @@ msgstr "لم يمكن حفظ الملف." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:132 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 #: actions/designadminpanel.php:122 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -476,7 +529,14 @@ msgstr "" msgid "Allow or deny access" msgstr "" -#: actions/apioauthauthorize.php:320 lib/action.php:435 +#: actions/apioauthauthorize.php:306 +#, php-format +msgid "" +"The application %s by %s would like the " +"ability to %s your account data." +msgstr "" + +#: actions/apioauthauthorize.php:320 lib/action.php:441 msgid "Account" msgstr "الحساب" @@ -533,17 +593,17 @@ msgstr "حُذِفت الحاله." msgid "No status with that ID found." msgstr "" -#: actions/apistatusesupdate.php:162 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "" -#: actions/apistatusesupdate.php:203 +#: actions/apistatusesupdate.php:202 msgid "Not found" msgstr "لم يوجد" -#: actions/apistatusesupdate.php:226 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -594,11 +654,6 @@ msgstr "مسار %s الزمنى العام" msgid "%s updates from everyone!" msgstr "" -#: actions/apitimelineretweetedbyme.php:112 -#, php-format -msgid "Repeated by %s" -msgstr "" - #: actions/apitimelineretweetedtome.php:111 #, php-format msgid "Repeated to %s" @@ -997,17 +1052,6 @@ msgstr "استعد التصميمات المبدئية" msgid "Reset back to default" msgstr "ارجع إلى المبدئي" -#: actions/designadminpanel.php:586 actions/emailsettings.php:195 -#: actions/imsettings.php:163 actions/othersettings.php:126 -#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174 -#: actions/siteadminpanel.php:388 actions/smssettings.php:181 -#: actions/subscriptions.php:203 actions/tagother.php:154 -#: actions/useradminpanel.php:313 lib/applicationeditform.php:335 -#: lib/applicationeditform.php:336 lib/designsettings.php:256 -#: lib/groupeditform.php:202 -msgid "Save" -msgstr "أرسل" - #: actions/designadminpanel.php:587 lib/designsettings.php:257 msgid "Save design" msgstr "احفظ التصميم" @@ -1020,13 +1064,15 @@ msgstr "هذا الشعار ليس مفضلًا!" msgid "Add to favorites" msgstr "أضف إلى المفضلات" -#: actions/doc.php:69 -msgid "No such document." +#: actions/doc.php:155 +#, fuzzy, php-format +msgid "No such document \"%s\"" msgstr "لا مستند كهذا." -#: actions/editapplication.php:54 lib/applicationeditform.php:136 -msgid "Edit application" -msgstr "" +#: actions/editapplication.php:54 +#, fuzzy +msgid "Edit Application" +msgstr "تطبيقات OAuth" #: actions/editapplication.php:66 msgid "You must be logged in to edit an application." @@ -1042,7 +1088,7 @@ msgid "No such application." msgstr "لا تطبيق كهذا." #: actions/editapplication.php:127 actions/newapplication.php:110 -#: actions/showapplication.php:118 lib/action.php:1189 +#: actions/showapplication.php:118 lib/action.php:1195 msgid "There was a problem with your session token." msgstr "" @@ -1241,7 +1287,7 @@ msgid "Cannot normalize that email address" msgstr "" #: actions/emailsettings.php:331 actions/register.php:201 -#: actions/siteadminpanel.php:157 +#: actions/siteadminpanel.php:143 msgid "Not a valid email address." msgstr "ليس عنوان بريد صالح." @@ -1253,7 +1299,7 @@ msgstr "هذا هو عنوان بريدك الإكترونى سابقًا." msgid "That email address already belongs to another user." msgstr "هذا البريد الإلكترونى ملك مستخدم آخر بالفعل." -#: actions/emailsettings.php:353 actions/imsettings.php:317 +#: actions/emailsettings.php:353 actions/imsettings.php:319 #: actions/smssettings.php:337 msgid "Couldn't insert confirmation code." msgstr "تعذّر إدراج رمز التأكيد." @@ -1545,7 +1591,7 @@ msgstr "%1$s أعضاء المجموعة, الصفحه %2$d" msgid "A list of the users in this group." msgstr "قائمه بمستخدمى هذه المجموعه." -#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107 +#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107 msgid "Admin" msgstr "إداري" @@ -1720,6 +1766,11 @@ msgstr "" msgid "That is not your Jabber ID." msgstr "هذه ليست هويتك فى جابر." +#: actions/inbox.php:59 +#, php-format +msgid "Inbox for %1$s - page %2$d" +msgstr "" + #: actions/inbox.php:62 #, php-format msgid "Inbox for %s" @@ -1870,7 +1921,7 @@ msgstr "اسم المستخدم أو كلمه السر غير صحيحان." msgid "Error setting user. You are probably not authorized." msgstr "خطأ أثناء ضبط المستخدم. لست مُصرحًا على الأرجح." -#: actions/login.php:188 actions/login.php:241 lib/action.php:460 +#: actions/login.php:188 actions/login.php:241 lib/action.php:466 #: lib/logingroupnav.php:79 msgid "Login" msgstr "لُج" @@ -1928,8 +1979,9 @@ msgid "No current status" msgstr "لا حاله حالية" #: actions/newapplication.php:52 -msgid "New application" -msgstr "" +#, fuzzy +msgid "New Application" +msgstr "لا تطبيق كهذا." #: actions/newapplication.php:64 msgid "You must be logged in to register an application." @@ -2110,8 +2162,8 @@ msgstr "نوع المحتوى " msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1038 -#: lib/api.php:1066 lib/api.php:1176 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1039 +#: lib/api.php:1067 lib/api.php:1177 msgid "Not a supported data format." msgstr " مش نظام بيانات مدعوم." @@ -2175,6 +2227,11 @@ msgstr "توكن دخول غير صحيح محدد." msgid "Login token expired." msgstr "توكن الدخول انتهى." +#: actions/outbox.php:58 +#, php-format +msgid "Outbox for %1$s - page %2$d" +msgstr "" + #: actions/outbox.php:61 #, php-format msgid "Outbox for %s" @@ -2245,7 +2302,7 @@ msgstr "تعذّر حفظ كلمه السر الجديده." msgid "Password saved." msgstr "حُفظت كلمه السر." -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:331 msgid "Paths" msgstr "المسارات" @@ -2253,132 +2310,148 @@ msgstr "المسارات" msgid "Path and server settings for this StatusNet site." msgstr "" -#: actions/pathsadminpanel.php:140 +#: actions/pathsadminpanel.php:157 #, php-format msgid "Theme directory not readable: %s" msgstr "لا يمكن قراءه دليل السمات: %s" -#: actions/pathsadminpanel.php:146 +#: actions/pathsadminpanel.php:163 #, php-format msgid "Avatar directory not writable: %s" msgstr "لا يمكن الكتابه فى دليل الأفتارات: %s" -#: actions/pathsadminpanel.php:152 +#: actions/pathsadminpanel.php:169 #, php-format msgid "Background directory not writable: %s" msgstr "لا يمكن الكتابه فى دليل الخلفيات: %s" -#: actions/pathsadminpanel.php:160 +#: actions/pathsadminpanel.php:177 #, php-format msgid "Locales directory not readable: %s" msgstr "لا يمكن قراءه دليل المحليات: %s" -#: actions/pathsadminpanel.php:166 +#: actions/pathsadminpanel.php:183 msgid "Invalid SSL server. The maximum length is 255 characters." msgstr "" -#: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58 +#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58 #: lib/adminpanelaction.php:311 msgid "Site" msgstr "الموقع" -#: actions/pathsadminpanel.php:221 +#: actions/pathsadminpanel.php:238 +msgid "Server" +msgstr "خادوم" + +#: actions/pathsadminpanel.php:238 +msgid "Site's server hostname." +msgstr "اسم مضيف خادوم الموقع." + +#: actions/pathsadminpanel.php:242 msgid "Path" msgstr "المسار" -#: actions/pathsadminpanel.php:221 +#: actions/pathsadminpanel.php:242 msgid "Site path" msgstr "مسار الموقع" -#: actions/pathsadminpanel.php:225 +#: actions/pathsadminpanel.php:246 msgid "Path to locales" msgstr "مسار المحليات" -#: actions/pathsadminpanel.php:225 +#: actions/pathsadminpanel.php:246 msgid "Directory path to locales" msgstr "مسار دليل المحليات" -#: actions/pathsadminpanel.php:232 +#: actions/pathsadminpanel.php:250 +msgid "Fancy URLs" +msgstr "مسارات فاخرة" + +#: actions/pathsadminpanel.php:252 +msgid "Use fancy (more readable and memorable) URLs?" +msgstr "أأستخدم مسارات فاخره (يمكن قراءتها وتذكرها بسهوله أكبر)؟" + +#: actions/pathsadminpanel.php:259 msgid "Theme" msgstr "السمة" -#: actions/pathsadminpanel.php:237 +#: actions/pathsadminpanel.php:264 msgid "Theme server" msgstr "خادوم السمات" -#: actions/pathsadminpanel.php:241 +#: actions/pathsadminpanel.php:268 msgid "Theme path" msgstr "مسار السمات" -#: actions/pathsadminpanel.php:245 +#: actions/pathsadminpanel.php:272 msgid "Theme directory" msgstr "دليل السمات" -#: actions/pathsadminpanel.php:252 +#: actions/pathsadminpanel.php:279 msgid "Avatars" msgstr "أفتارات" -#: actions/pathsadminpanel.php:257 +#: actions/pathsadminpanel.php:284 msgid "Avatar server" msgstr "خادوم الأفتارات" -#: actions/pathsadminpanel.php:261 +#: actions/pathsadminpanel.php:288 msgid "Avatar path" msgstr "مسار الأفتارات" -#: actions/pathsadminpanel.php:265 +#: actions/pathsadminpanel.php:292 msgid "Avatar directory" msgstr "دليل الأفتار." -#: actions/pathsadminpanel.php:274 +#: actions/pathsadminpanel.php:301 msgid "Backgrounds" msgstr "خلفيات" -#: actions/pathsadminpanel.php:278 +#: actions/pathsadminpanel.php:305 msgid "Background server" msgstr "خادوم الخلفيات" -#: actions/pathsadminpanel.php:282 +#: actions/pathsadminpanel.php:309 msgid "Background path" msgstr "مسار الخلفيات" -#: actions/pathsadminpanel.php:286 +#: actions/pathsadminpanel.php:313 msgid "Background directory" msgstr "دليل الخلفيات" -#: actions/pathsadminpanel.php:293 +#: actions/pathsadminpanel.php:320 msgid "SSL" msgstr "SSL" -#: actions/pathsadminpanel.php:296 actions/siteadminpanel.php:346 +#: actions/pathsadminpanel.php:323 actions/siteadminpanel.php:294 msgid "Never" msgstr "مطلقا" -#: actions/pathsadminpanel.php:297 +#: actions/pathsadminpanel.php:324 msgid "Sometimes" msgstr "أحيانًا" -#: actions/pathsadminpanel.php:298 +#: actions/pathsadminpanel.php:325 msgid "Always" msgstr "دائمًا" -#: actions/pathsadminpanel.php:302 +#: actions/pathsadminpanel.php:329 msgid "Use SSL" msgstr "استخدم SSL" -#: actions/pathsadminpanel.php:303 +#: actions/pathsadminpanel.php:330 msgid "When to use SSL" msgstr "" -#: actions/pathsadminpanel.php:308 +#: actions/pathsadminpanel.php:335 msgid "SSL server" msgstr "خادم SSL" -#: actions/pathsadminpanel.php:309 +#: actions/pathsadminpanel.php:336 msgid "Server to direct SSL requests to" msgstr "" -#: actions/pathsadminpanel.php:325 +#: actions/pathsadminpanel.php:352 msgid "Save paths" msgstr "احفظ المسارات" @@ -2483,7 +2556,7 @@ msgid "" "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated" msgstr "" -#: actions/profilesettings.php:151 actions/siteadminpanel.php:294 +#: actions/profilesettings.php:151 actions/siteadminpanel.php:280 msgid "Language" msgstr "اللغة" @@ -2509,7 +2582,7 @@ msgstr "" msgid "Bio is too long (max %d chars)." msgstr "" -#: actions/profilesettings.php:235 actions/siteadminpanel.php:164 +#: actions/profilesettings.php:235 actions/siteadminpanel.php:150 msgid "Timezone not selected." msgstr "لم تُختر المنطقه الزمنيه." @@ -2773,7 +2846,7 @@ msgstr "عذرا، رمز دعوه غير صالح." msgid "Registration successful" msgstr "نجح التسجيل" -#: actions/register.php:114 actions/register.php:503 lib/action.php:457 +#: actions/register.php:114 actions/register.php:503 lib/action.php:463 #: lib/logingroupnav.php:85 msgid "Register" msgstr "سجّل" @@ -2813,7 +2886,7 @@ msgid "Same as password above. Required." msgstr "نفس كلمه السر أعلاه. مطلوب." #: actions/register.php:438 actions/register.php:442 -#: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120 +#: actions/siteadminpanel.php:256 lib/accountsettingsaction.php:120 msgid "Email" msgstr "البريد الإلكتروني" @@ -2947,6 +3020,11 @@ msgstr "مكرر!" msgid "Replies to %s" msgstr "الردود على %s" +#: actions/replies.php:127 +#, fuzzy, php-format +msgid "Replies to %1$s, page %2$d" +msgstr "الردود على %s" + #: actions/replies.php:144 #, php-format msgid "Replies feed for %s (RSS 1.0)" @@ -3070,6 +3148,11 @@ msgid "" "signature method." msgstr "" +#: actions/showfavorites.php:79 +#, fuzzy, php-format +msgid "%1$s's favorite notices, page %2$d" +msgstr "إشعارات %s المُفضلة" + #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "" @@ -3123,6 +3206,11 @@ msgstr "إنها إحدى وسائل مشاركه ما تحب." msgid "%s group" msgstr "مجموعه %s" +#: actions/showgroup.php:84 +#, fuzzy, php-format +msgid "%1$s group, page %2$d" +msgstr "%1$s أعضاء المجموعة, الصفحه %2$d" + #: actions/showgroup.php:218 msgid "Group profile" msgstr "ملف المجموعه الشخصي" @@ -3233,6 +3321,11 @@ msgstr "حُذف الإشعار." msgid " tagged %s" msgstr "" +#: actions/showstream.php:79 +#, fuzzy, php-format +msgid "%1$s, page %2$d" +msgstr "%1$s والأصدقاء, الصفحه %2$d" + #: actions/showstream.php:122 #, php-format msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" @@ -3310,192 +3403,144 @@ msgstr "المستخدم مسكت من قبل." msgid "Basic settings for this StatusNet site." msgstr "الإعدادات الأساسيه لموقع StatusNet هذا." -#: actions/siteadminpanel.php:146 +#: actions/siteadminpanel.php:132 msgid "Site name must have non-zero length." msgstr "يجب ألا يكون طول اسم الموقع صفرًا." -#: actions/siteadminpanel.php:154 +#: actions/siteadminpanel.php:140 msgid "You must have a valid contact email address." msgstr "يجب أن تملك عنوان بريد إلكترونى صحيح." -#: actions/siteadminpanel.php:172 +#: actions/siteadminpanel.php:158 #, php-format msgid "Unknown language \"%s\"." msgstr "لغه غير معروفه \"%s\"." -#: actions/siteadminpanel.php:179 +#: actions/siteadminpanel.php:165 msgid "Invalid snapshot report URL." msgstr "" -#: actions/siteadminpanel.php:185 +#: actions/siteadminpanel.php:171 msgid "Invalid snapshot run value." msgstr "" -#: actions/siteadminpanel.php:191 +#: actions/siteadminpanel.php:177 msgid "Snapshot frequency must be a number." msgstr "" -#: actions/siteadminpanel.php:197 +#: actions/siteadminpanel.php:183 msgid "Minimum text limit is 140 characters." msgstr "حد النص الأدنى هو 140 حرفًا." -#: actions/siteadminpanel.php:203 +#: actions/siteadminpanel.php:189 msgid "Dupe limit must 1 or more seconds." msgstr "" -#: actions/siteadminpanel.php:253 +#: actions/siteadminpanel.php:239 msgid "General" msgstr "عام" -#: actions/siteadminpanel.php:256 +#: actions/siteadminpanel.php:242 msgid "Site name" msgstr "اسم الموقع" -#: actions/siteadminpanel.php:257 +#: actions/siteadminpanel.php:243 msgid "The name of your site, like \"Yourcompany Microblog\"" msgstr "اسم موقعك، \"التدوين المصغر لشركتك\" مثلا" -#: actions/siteadminpanel.php:261 +#: actions/siteadminpanel.php:247 msgid "Brought by" msgstr "" -#: actions/siteadminpanel.php:262 +#: actions/siteadminpanel.php:248 msgid "Text used for credits link in footer of each page" msgstr "" -#: actions/siteadminpanel.php:266 +#: actions/siteadminpanel.php:252 msgid "Brought by URL" msgstr "" -#: actions/siteadminpanel.php:267 +#: actions/siteadminpanel.php:253 msgid "URL used for credits link in footer of each page" msgstr "" -#: actions/siteadminpanel.php:271 +#: actions/siteadminpanel.php:257 msgid "Contact email address for your site" msgstr "عنوان البريد الإلكترونى للاتصال بموقعك" -#: actions/siteadminpanel.php:277 +#: actions/siteadminpanel.php:263 msgid "Local" msgstr "محلي" -#: actions/siteadminpanel.php:288 +#: actions/siteadminpanel.php:274 msgid "Default timezone" msgstr "المنطقه الزمنيه المبدئية" -#: actions/siteadminpanel.php:289 +#: actions/siteadminpanel.php:275 msgid "Default timezone for the site; usually UTC." msgstr "المنطقه الزمنيه المبدئيه للموقع؛ ت‌ع‌م عاده." -#: actions/siteadminpanel.php:295 +#: actions/siteadminpanel.php:281 msgid "Default site language" msgstr "لغه الموقع المبدئية" -#: actions/siteadminpanel.php:303 -msgid "URLs" -msgstr "مسارات" - -#: actions/siteadminpanel.php:306 -msgid "Server" -msgstr "خادوم" - -#: actions/siteadminpanel.php:306 -msgid "Site's server hostname." -msgstr "اسم مضيف خادوم الموقع." - -#: actions/siteadminpanel.php:310 -msgid "Fancy URLs" -msgstr "مسارات فاخرة" - -#: actions/siteadminpanel.php:312 -msgid "Use fancy (more readable and memorable) URLs?" -msgstr "أأستخدم مسارات فاخره (يمكن قراءتها وتذكرها بسهوله أكبر)؟" - -#: actions/siteadminpanel.php:318 -msgid "Access" -msgstr "نفاذ" - -#: actions/siteadminpanel.php:321 -msgid "Private" -msgstr "خاص" - -#: actions/siteadminpanel.php:323 -msgid "Prohibit anonymous users (not logged in) from viewing site?" -msgstr "أأمنع المستخدمين المجهولين (غير الوالجين) من عرض الموقع؟" - -#: actions/siteadminpanel.php:327 -msgid "Invite only" -msgstr "بالدعوه فقط" - -#: actions/siteadminpanel.php:329 -msgid "Make registration invitation only." -msgstr "" - -#: actions/siteadminpanel.php:333 -msgid "Closed" -msgstr "مُغلق" - -#: actions/siteadminpanel.php:335 -msgid "Disable new registrations." -msgstr "عطّل التسجيل الجديد." - -#: actions/siteadminpanel.php:341 +#: actions/siteadminpanel.php:289 msgid "Snapshots" msgstr "" -#: actions/siteadminpanel.php:344 +#: actions/siteadminpanel.php:292 msgid "Randomly during Web hit" msgstr "" -#: actions/siteadminpanel.php:345 +#: actions/siteadminpanel.php:293 msgid "In a scheduled job" msgstr "فى مهمه مُجدولة" -#: actions/siteadminpanel.php:347 +#: actions/siteadminpanel.php:295 msgid "Data snapshots" msgstr "" -#: actions/siteadminpanel.php:348 +#: actions/siteadminpanel.php:296 msgid "When to send statistical data to status.net servers" msgstr "" -#: actions/siteadminpanel.php:353 +#: actions/siteadminpanel.php:301 msgid "Frequency" msgstr "التكرار" -#: actions/siteadminpanel.php:354 +#: actions/siteadminpanel.php:302 msgid "Snapshots will be sent once every N web hits" msgstr "" -#: actions/siteadminpanel.php:359 +#: actions/siteadminpanel.php:307 msgid "Report URL" msgstr "بلّغ عن المسار" -#: actions/siteadminpanel.php:360 +#: actions/siteadminpanel.php:308 msgid "Snapshots will be sent to this URL" msgstr "" -#: actions/siteadminpanel.php:367 +#: actions/siteadminpanel.php:315 msgid "Limits" msgstr "الحدود" -#: actions/siteadminpanel.php:370 +#: actions/siteadminpanel.php:318 msgid "Text limit" msgstr "حد النص" -#: actions/siteadminpanel.php:370 +#: actions/siteadminpanel.php:318 msgid "Maximum number of characters for notices." msgstr "أقصى عدد للحروف فى الإشعارات." -#: actions/siteadminpanel.php:374 +#: actions/siteadminpanel.php:322 msgid "Dupe limit" msgstr "" -#: actions/siteadminpanel.php:374 +#: actions/siteadminpanel.php:322 msgid "How long users must wait (in seconds) to post the same thing again." msgstr "" -#: actions/siteadminpanel.php:388 actions/useradminpanel.php:313 +#: actions/siteadminpanel.php:336 actions/useradminpanel.php:313 msgid "Save site settings" msgstr "اذف إعدادت الموقع" @@ -3686,6 +3731,11 @@ msgstr "جابر" msgid "SMS" msgstr "رسائل قصيرة" +#: actions/tag.php:68 +#, fuzzy, php-format +msgid "Notices tagged with %1$s, page %2$d" +msgstr "الإشعارات الموسومه ب%s" + #: actions/tag.php:86 #, php-format msgid "Notice feed for tag %s (RSS 1.0)" @@ -3969,6 +4019,11 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "استمتع بالنقانق!" +#: actions/usergroups.php:64 +#, fuzzy, php-format +msgid "%1$s groups, page %2$d" +msgstr "%1$s أعضاء المجموعة, الصفحه %2$d" + #: actions/usergroups.php:130 msgid "Search for more groups" msgstr "" @@ -4030,7 +4085,7 @@ msgstr "" msgid "Plugins" msgstr "" -#: actions/version.php:196 lib/action.php:741 +#: actions/version.php:196 lib/action.php:747 msgid "Version" msgstr "النسخة" @@ -4084,44 +4139,49 @@ msgstr "تعذّر إدراج الرساله." msgid "Could not update message with new URI." msgstr "" -#: classes/Notice.php:171 +#: classes/Notice.php:157 #, php-format msgid "DB error inserting hashtag: %s" msgstr "" -#: classes/Notice.php:225 +#: classes/Notice.php:214 msgid "Problem saving notice. Too long." msgstr "مشكله فى حفظ الإشعار. طويل جدًا." -#: classes/Notice.php:229 +#: classes/Notice.php:218 msgid "Problem saving notice. Unknown user." msgstr "مشكله فى حفظ الإشعار. مستخدم غير معروف." -#: classes/Notice.php:234 +#: classes/Notice.php:223 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:240 +#: classes/Notice.php:229 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:246 +#: classes/Notice.php:235 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:305 classes/Notice.php:330 +#: classes/Notice.php:294 classes/Notice.php:319 msgid "Problem saving notice." msgstr "مشكله أثناء حفظ الإشعار." -#: classes/Notice.php:1059 +#: classes/Notice.php:790 +#, fuzzy +msgid "Problem saving group inbox." +msgstr "مشكله أثناء حفظ الإشعار." + +#: classes/Notice.php:850 #, php-format msgid "DB error inserting reply: %s" msgstr "" -#: classes/Notice.php:1441 +#: classes/Notice.php:1233 #, php-format msgid "RT @%1$s %2$s" msgstr "آر تى @%1$s %2$s" @@ -4176,124 +4236,124 @@ msgstr "%1$s - %2$s" msgid "Untitled page" msgstr "صفحه غير مُعنونة" -#: lib/action.php:427 +#: lib/action.php:433 msgid "Primary site navigation" msgstr "" -#: lib/action.php:433 +#: lib/action.php:439 msgid "Home" msgstr "الرئيسية" -#: lib/action.php:433 +#: lib/action.php:439 msgid "Personal profile and friends timeline" msgstr "الملف الشخصى ومسار الأصدقاء الزمني" -#: lib/action.php:435 +#: lib/action.php:441 msgid "Change your email, avatar, password, profile" msgstr "" -#: lib/action.php:438 +#: lib/action.php:444 msgid "Connect" msgstr "اتصل" -#: lib/action.php:438 +#: lib/action.php:444 msgid "Connect to services" msgstr "" -#: lib/action.php:442 +#: lib/action.php:448 msgid "Change site configuration" msgstr "غيّر ضبط الموقع" -#: lib/action.php:446 lib/subgroupnav.php:105 +#: lib/action.php:452 lib/subgroupnav.php:105 msgid "Invite" msgstr "ادعُ" -#: lib/action.php:447 lib/subgroupnav.php:106 +#: lib/action.php:453 lib/subgroupnav.php:106 #, php-format msgid "Invite friends and colleagues to join you on %s" msgstr "" -#: lib/action.php:452 +#: lib/action.php:458 msgid "Logout" msgstr "اخرج" -#: lib/action.php:452 +#: lib/action.php:458 msgid "Logout from the site" msgstr "اخرج من الموقع" -#: lib/action.php:457 +#: lib/action.php:463 msgid "Create an account" msgstr "أنشئ حسابًا" -#: lib/action.php:460 +#: lib/action.php:466 msgid "Login to the site" msgstr "لُج إلى الموقع" -#: lib/action.php:463 lib/action.php:726 +#: lib/action.php:469 lib/action.php:732 msgid "Help" msgstr "مساعدة" -#: lib/action.php:463 +#: lib/action.php:469 msgid "Help me!" msgstr "ساعدني!" -#: lib/action.php:466 lib/searchaction.php:127 +#: lib/action.php:472 lib/searchaction.php:127 msgid "Search" msgstr "ابحث" -#: lib/action.php:466 +#: lib/action.php:472 msgid "Search for people or text" msgstr "ابحث عن أشخاص أو نص" -#: lib/action.php:487 +#: lib/action.php:493 msgid "Site notice" msgstr "إشعار الموقع" -#: lib/action.php:553 +#: lib/action.php:559 msgid "Local views" msgstr "المشاهدات المحلية" -#: lib/action.php:619 +#: lib/action.php:625 msgid "Page notice" msgstr "إشعار الصفحة" -#: lib/action.php:721 +#: lib/action.php:727 msgid "Secondary site navigation" msgstr "" -#: lib/action.php:728 +#: lib/action.php:734 msgid "About" msgstr "عن" -#: lib/action.php:730 +#: lib/action.php:736 msgid "FAQ" msgstr "الأسئله المكررة" -#: lib/action.php:734 +#: lib/action.php:740 msgid "TOS" msgstr "الشروط" -#: lib/action.php:737 +#: lib/action.php:743 msgid "Privacy" msgstr "خصوصية" -#: lib/action.php:739 +#: lib/action.php:745 msgid "Source" msgstr "المصدر" -#: lib/action.php:743 +#: lib/action.php:749 msgid "Contact" msgstr "اتصل" -#: lib/action.php:745 +#: lib/action.php:751 msgid "Badge" msgstr "" -#: lib/action.php:773 +#: lib/action.php:779 msgid "StatusNet software license" msgstr "" -#: lib/action.php:776 +#: lib/action.php:782 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -4302,12 +4362,12 @@ msgstr "" "**%%site.name%%** خدمه تدوين مصغر يقدمها لك [%%site.broughtby%%](%%site." "broughtbyurl%%). " -#: lib/action.php:778 +#: lib/action.php:784 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "" -#: lib/action.php:780 +#: lib/action.php:786 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4318,41 +4378,41 @@ msgstr "" "المتوفر تحت [رخصه غنو أفيرو العمومية](http://www.fsf.org/licensing/licenses/" "agpl-3.0.html)." -#: lib/action.php:795 +#: lib/action.php:801 msgid "Site content license" msgstr "رخصه محتوى الموقع" -#: lib/action.php:800 +#: lib/action.php:806 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "" -#: lib/action.php:805 +#: lib/action.php:811 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" -#: lib/action.php:808 +#: lib/action.php:814 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" -#: lib/action.php:820 +#: lib/action.php:826 msgid "All " msgstr "" -#: lib/action.php:825 +#: lib/action.php:831 msgid "license." msgstr "الرخصه." -#: lib/action.php:1124 +#: lib/action.php:1130 msgid "Pagination" msgstr "" -#: lib/action.php:1133 +#: lib/action.php:1139 msgid "After" msgstr "بعد" -#: lib/action.php:1141 +#: lib/action.php:1147 msgid "Before" msgstr "قبل" @@ -4384,10 +4444,24 @@ msgstr "ضبط الموقع الأساسي" msgid "Design configuration" msgstr "ضبط التصميم" -#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327 +#: lib/adminpanelaction.php:322 +#, fuzzy +msgid "User configuration" +msgstr "ضبط المسارات" + +#: lib/adminpanelaction.php:327 +#, fuzzy +msgid "Access configuration" +msgstr "ضبط التصميم" + +#: lib/adminpanelaction.php:332 msgid "Paths configuration" msgstr "ضبط المسارات" +#: lib/applicationeditform.php:136 +msgid "Edit application" +msgstr "" + #: lib/applicationeditform.php:186 msgid "Icon for this application" msgstr "" @@ -4398,9 +4472,8 @@ msgid "Describe your application in %d characters" msgstr "" #: lib/applicationeditform.php:209 -#, fuzzy msgid "Describe your application" -msgstr "صف تطبيقك" +msgstr "اوصف تطبيقك" #: lib/applicationeditform.php:218 msgid "Source URL" @@ -4969,12 +5042,12 @@ msgstr "ميجابايت" msgid "kB" msgstr "كيلوبايت" -#: lib/jabber.php:202 +#: lib/jabber.php:220 #, php-format msgid "[%s]" msgstr "[%s]" -#: lib/jabber.php:385 +#: lib/jabber.php:400 #, php-format msgid "Unknown inbox source %d." msgstr "مصدر صندوق وارد غير معروف %d." @@ -5382,19 +5455,19 @@ msgstr "الردود" msgid "Favorites" msgstr "المفضلات" -#: lib/personalgroupnav.php:124 +#: lib/personalgroupnav.php:125 msgid "Inbox" msgstr "صندوق الوارد" -#: lib/personalgroupnav.php:125 +#: lib/personalgroupnav.php:126 msgid "Your incoming messages" msgstr "رسائلك الواردة" -#: lib/personalgroupnav.php:129 +#: lib/personalgroupnav.php:130 msgid "Outbox" msgstr "صندوق الصادر" -#: lib/personalgroupnav.php:130 +#: lib/personalgroupnav.php:131 msgid "Your sent messages" msgstr "رسائلك المُرسلة" @@ -5636,47 +5709,47 @@ msgstr "رسالة" msgid "Moderate" msgstr "" -#: lib/util.php:875 +#: lib/util.php:868 msgid "a few seconds ago" msgstr "قبل لحظات قليلة" -#: lib/util.php:877 +#: lib/util.php:870 msgid "about a minute ago" msgstr "قبل دقيقه تقريبًا" -#: lib/util.php:879 +#: lib/util.php:872 #, php-format msgid "about %d minutes ago" msgstr "" -#: lib/util.php:881 +#: lib/util.php:874 msgid "about an hour ago" msgstr "قبل ساعه تقريبًا" -#: lib/util.php:883 +#: lib/util.php:876 #, php-format msgid "about %d hours ago" msgstr "" -#: lib/util.php:885 +#: lib/util.php:878 msgid "about a day ago" msgstr "قبل يوم تقريبا" -#: lib/util.php:887 +#: lib/util.php:880 #, php-format msgid "about %d days ago" msgstr "" -#: lib/util.php:889 +#: lib/util.php:882 msgid "about a month ago" msgstr "قبل شهر تقريبًا" -#: lib/util.php:891 +#: lib/util.php:884 #, php-format msgid "about %d months ago" msgstr "" -#: lib/util.php:893 +#: lib/util.php:886 msgid "about a year ago" msgstr "قبل سنه تقريبًا" @@ -5690,7 +5763,7 @@ msgstr "%s ليس لونًا صحيحًا!" msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "" -#: scripts/xmppdaemon.php:301 +#: lib/xmppmanager.php:402 #, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" diff --git a/locale/bg/LC_MESSAGES/statusnet.po b/locale/bg/LC_MESSAGES/statusnet.po index e7bc79a133..f7d2c9b345 100644 --- a/locale/bg/LC_MESSAGES/statusnet.po +++ b/locale/bg/LC_MESSAGES/statusnet.po @@ -9,17 +9,71 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-21 22:36+0000\n" -"PO-Revision-Date: 2010-01-21 22:37:06+0000\n" +"POT-Creation-Date: 2010-01-27 23:58+0000\n" +"PO-Revision-Date: 2010-01-27 23:58:26+0000\n" "Language-Team: Bulgarian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r61339); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61595); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: bg\n" "X-Message-Group: out-statusnet\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#: actions/accessadminpanel.php:54 lib/adminpanelaction.php:326 +msgid "Access" +msgstr "Достъп" + +#: actions/accessadminpanel.php:65 +#, fuzzy +msgid "Site access settings" +msgstr "Запазване настройките на сайта" + +#: actions/accessadminpanel.php:158 +#, fuzzy +msgid "Registration" +msgstr "Регистриране" + +#: actions/accessadminpanel.php:161 +msgid "Private" +msgstr "Частен" + +#: actions/accessadminpanel.php:163 +msgid "Prohibit anonymous users (not logged in) from viewing site?" +msgstr "" + +#: actions/accessadminpanel.php:167 +msgid "Invite only" +msgstr "Само с покани" + +#: actions/accessadminpanel.php:169 +msgid "Make registration invitation only." +msgstr "Новите регистрации да са само с покани." + +#: actions/accessadminpanel.php:173 +msgid "Closed" +msgstr "Затворен" + +#: actions/accessadminpanel.php:175 +msgid "Disable new registrations." +msgstr "Изключване на новите регистрации." + +#: actions/accessadminpanel.php:189 actions/designadminpanel.php:586 +#: actions/emailsettings.php:195 actions/imsettings.php:163 +#: actions/othersettings.php:126 actions/pathsadminpanel.php:351 +#: actions/profilesettings.php:174 actions/siteadminpanel.php:336 +#: actions/smssettings.php:181 actions/subscriptions.php:203 +#: actions/tagother.php:154 actions/useradminpanel.php:313 +#: lib/applicationeditform.php:335 lib/applicationeditform.php:336 +#: lib/designsettings.php:256 lib/groupeditform.php:202 +msgid "Save" +msgstr "Запазване" + +#: actions/accessadminpanel.php:189 +#, fuzzy +msgid "Save access settings" +msgstr "Запазване настройките на сайта" + #: actions/all.php:63 actions/public.php:97 actions/replies.php:92 #: actions/showfavorites.php:137 actions/tag.php:51 msgid "No such page" @@ -34,7 +88,7 @@ msgstr "Няма такака страница." #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:149 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 @@ -133,8 +187,7 @@ msgstr "Бележки от %1$s и приятели в %2$s." #: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 #: actions/apitimelinefriends.php:155 actions/apitimelinegroup.php:150 #: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 -#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found." @@ -150,7 +203,7 @@ msgstr "Не е открит методът в API." #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:119 +#: actions/apistatusesupdate.php:118 msgid "This method requires a POST." msgstr "Този метод изисква заявка POST." @@ -179,7 +232,7 @@ msgstr "Грешка при запазване на профила." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:132 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 #: actions/designadminpanel.php:122 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -488,7 +541,14 @@ msgstr "" msgid "Allow or deny access" msgstr "" -#: actions/apioauthauthorize.php:320 lib/action.php:435 +#: actions/apioauthauthorize.php:306 +#, php-format +msgid "" +"The application %s by %s would like the " +"ability to %s your account data." +msgstr "" + +#: actions/apioauthauthorize.php:320 lib/action.php:441 msgid "Account" msgstr "Сметка" @@ -546,17 +606,17 @@ msgstr "Бележката е изтрита." msgid "No status with that ID found." msgstr "Не е открита бележка с такъв идентификатор." -#: actions/apistatusesupdate.php:162 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Твърде дълга бележка. Трябва да е най-много 140 знака." -#: actions/apistatusesupdate.php:203 +#: actions/apistatusesupdate.php:202 msgid "Not found" msgstr "Не е открито." -#: actions/apistatusesupdate.php:226 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -607,11 +667,6 @@ msgstr "Общ поток на %s" msgid "%s updates from everyone!" msgstr "" -#: actions/apitimelineretweetedbyme.php:112 -#, php-format -msgid "Repeated by %s" -msgstr "Повторено от %s" - #: actions/apitimelineretweetedtome.php:111 #, php-format msgid "Repeated to %s" @@ -1020,17 +1075,6 @@ msgstr "" msgid "Reset back to default" msgstr "" -#: actions/designadminpanel.php:586 actions/emailsettings.php:195 -#: actions/imsettings.php:163 actions/othersettings.php:126 -#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174 -#: actions/siteadminpanel.php:388 actions/smssettings.php:181 -#: actions/subscriptions.php:203 actions/tagother.php:154 -#: actions/useradminpanel.php:313 lib/applicationeditform.php:335 -#: lib/applicationeditform.php:336 lib/designsettings.php:256 -#: lib/groupeditform.php:202 -msgid "Save" -msgstr "Запазване" - #: actions/designadminpanel.php:587 lib/designsettings.php:257 msgid "Save design" msgstr "" @@ -1043,13 +1087,15 @@ msgstr "Тази бележка не е отбелязана като любим msgid "Add to favorites" msgstr "Добавяне към любимите" -#: actions/doc.php:69 -msgid "No such document." +#: actions/doc.php:155 +#, fuzzy, php-format +msgid "No such document \"%s\"" msgstr "Няма такъв документ." -#: actions/editapplication.php:54 lib/applicationeditform.php:136 -msgid "Edit application" -msgstr "" +#: actions/editapplication.php:54 +#, fuzzy +msgid "Edit Application" +msgstr "Други настройки" #: actions/editapplication.php:66 #, fuzzy @@ -1068,7 +1114,7 @@ msgid "No such application." msgstr "Няма такава бележка." #: actions/editapplication.php:127 actions/newapplication.php:110 -#: actions/showapplication.php:118 lib/action.php:1189 +#: actions/showapplication.php:118 lib/action.php:1195 msgid "There was a problem with your session token." msgstr "Имаше проблем със сесията ви в сайта." @@ -1281,7 +1327,7 @@ msgid "Cannot normalize that email address" msgstr "Грешка при нормализиране адреса на е-пощата" #: actions/emailsettings.php:331 actions/register.php:201 -#: actions/siteadminpanel.php:157 +#: actions/siteadminpanel.php:143 msgid "Not a valid email address." msgstr "Неправилен адрес на е-поща." @@ -1293,7 +1339,7 @@ msgstr "Това и сега е адресът на е-пощата ви." msgid "That email address already belongs to another user." msgstr "Тази е-поща вече се използва от друг потребител." -#: actions/emailsettings.php:353 actions/imsettings.php:317 +#: actions/emailsettings.php:353 actions/imsettings.php:319 #: actions/smssettings.php:337 msgid "Couldn't insert confirmation code." msgstr "Не може да се вмъкне код за потвърждение." @@ -1602,7 +1648,7 @@ msgstr "Членове на групата %s, страница %d" msgid "A list of the users in this group." msgstr "Списък с потребителите в тази група." -#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107 +#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107 msgid "Admin" msgstr "Настройки" @@ -1793,6 +1839,11 @@ msgstr "" msgid "That is not your Jabber ID." msgstr "Това не е вашият Jabber ID." +#: actions/inbox.php:59 +#, fuzzy, php-format +msgid "Inbox for %1$s - page %2$d" +msgstr "Входяща кутия за %s" + #: actions/inbox.php:62 #, php-format msgid "Inbox for %s" @@ -1974,7 +2025,7 @@ msgstr "Грешно име или парола." msgid "Error setting user. You are probably not authorized." msgstr "Забранено." -#: actions/login.php:188 actions/login.php:241 lib/action.php:460 +#: actions/login.php:188 actions/login.php:241 lib/action.php:466 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Вход" @@ -2036,8 +2087,9 @@ msgid "No current status" msgstr "" #: actions/newapplication.php:52 -msgid "New application" -msgstr "" +#, fuzzy +msgid "New Application" +msgstr "Няма такава бележка." #: actions/newapplication.php:64 #, fuzzy @@ -2228,8 +2280,8 @@ msgstr "вид съдържание " msgid "Only " msgstr "Само " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1038 -#: lib/api.php:1066 lib/api.php:1176 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1039 +#: lib/api.php:1067 lib/api.php:1177 msgid "Not a supported data format." msgstr "Неподдържан формат на данните" @@ -2300,6 +2352,11 @@ msgstr "Невалидно съдържание на бележка" msgid "Login token expired." msgstr "Влизане в сайта" +#: actions/outbox.php:58 +#, fuzzy, php-format +msgid "Outbox for %1$s - page %2$d" +msgstr "Изходяща кутия за %s" + #: actions/outbox.php:61 #, php-format msgid "Outbox for %s" @@ -2371,7 +2428,7 @@ msgstr "Грешка при запазване на новата парола." msgid "Password saved." msgstr "Паролата е записана." -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:331 msgid "Paths" msgstr "Пътища" @@ -2379,133 +2436,149 @@ msgstr "Пътища" msgid "Path and server settings for this StatusNet site." msgstr "Пътища и сървърни настройки за тази инсталация на StatusNet." -#: actions/pathsadminpanel.php:140 +#: actions/pathsadminpanel.php:157 #, fuzzy, php-format msgid "Theme directory not readable: %s" msgstr "Страницата не е достъпна във вида медия, който приемате" -#: actions/pathsadminpanel.php:146 +#: actions/pathsadminpanel.php:163 #, php-format msgid "Avatar directory not writable: %s" msgstr "" -#: actions/pathsadminpanel.php:152 +#: actions/pathsadminpanel.php:169 #, php-format msgid "Background directory not writable: %s" msgstr "" -#: actions/pathsadminpanel.php:160 +#: actions/pathsadminpanel.php:177 #, php-format msgid "Locales directory not readable: %s" msgstr "" -#: actions/pathsadminpanel.php:166 +#: actions/pathsadminpanel.php:183 msgid "Invalid SSL server. The maximum length is 255 characters." msgstr "" -#: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58 +#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58 #: lib/adminpanelaction.php:311 msgid "Site" msgstr "Сайт" -#: actions/pathsadminpanel.php:221 +#: actions/pathsadminpanel.php:238 +msgid "Server" +msgstr "Сървър" + +#: actions/pathsadminpanel.php:238 +msgid "Site's server hostname." +msgstr "" + +#: actions/pathsadminpanel.php:242 msgid "Path" msgstr "Път" -#: actions/pathsadminpanel.php:221 +#: actions/pathsadminpanel.php:242 msgid "Site path" msgstr "Път до сайта" -#: actions/pathsadminpanel.php:225 +#: actions/pathsadminpanel.php:246 msgid "Path to locales" msgstr "" -#: actions/pathsadminpanel.php:225 +#: actions/pathsadminpanel.php:246 msgid "Directory path to locales" msgstr "" -#: actions/pathsadminpanel.php:232 +#: actions/pathsadminpanel.php:250 +msgid "Fancy URLs" +msgstr "Кратки URL-адреси" + +#: actions/pathsadminpanel.php:252 +msgid "Use fancy (more readable and memorable) URLs?" +msgstr "" + +#: actions/pathsadminpanel.php:259 msgid "Theme" msgstr "" -#: actions/pathsadminpanel.php:237 +#: actions/pathsadminpanel.php:264 msgid "Theme server" msgstr "" -#: actions/pathsadminpanel.php:241 +#: actions/pathsadminpanel.php:268 msgid "Theme path" msgstr "" -#: actions/pathsadminpanel.php:245 +#: actions/pathsadminpanel.php:272 msgid "Theme directory" msgstr "" -#: actions/pathsadminpanel.php:252 +#: actions/pathsadminpanel.php:279 msgid "Avatars" msgstr "Аватари" -#: actions/pathsadminpanel.php:257 +#: actions/pathsadminpanel.php:284 msgid "Avatar server" msgstr "Сървър на аватара" -#: actions/pathsadminpanel.php:261 +#: actions/pathsadminpanel.php:288 msgid "Avatar path" msgstr "Път до аватара" -#: actions/pathsadminpanel.php:265 +#: actions/pathsadminpanel.php:292 msgid "Avatar directory" msgstr "Директория на аватара" -#: actions/pathsadminpanel.php:274 +#: actions/pathsadminpanel.php:301 msgid "Backgrounds" msgstr "Фонове" -#: actions/pathsadminpanel.php:278 +#: actions/pathsadminpanel.php:305 msgid "Background server" msgstr "Сървър на фона" -#: actions/pathsadminpanel.php:282 +#: actions/pathsadminpanel.php:309 msgid "Background path" msgstr "Път до фона" -#: actions/pathsadminpanel.php:286 +#: actions/pathsadminpanel.php:313 msgid "Background directory" msgstr "Директория на фона" -#: actions/pathsadminpanel.php:293 +#: actions/pathsadminpanel.php:320 msgid "SSL" msgstr "SSL" -#: actions/pathsadminpanel.php:296 actions/siteadminpanel.php:346 +#: actions/pathsadminpanel.php:323 actions/siteadminpanel.php:294 msgid "Never" msgstr "Никога" -#: actions/pathsadminpanel.php:297 +#: actions/pathsadminpanel.php:324 msgid "Sometimes" msgstr "Понякога" -#: actions/pathsadminpanel.php:298 +#: actions/pathsadminpanel.php:325 msgid "Always" msgstr "Винаги" -#: actions/pathsadminpanel.php:302 +#: actions/pathsadminpanel.php:329 msgid "Use SSL" msgstr "Използване на SSL" -#: actions/pathsadminpanel.php:303 +#: actions/pathsadminpanel.php:330 msgid "When to use SSL" msgstr "Кога да се използва SSL" -#: actions/pathsadminpanel.php:308 +#: actions/pathsadminpanel.php:335 #, fuzzy msgid "SSL server" msgstr "SSL-сървър" -#: actions/pathsadminpanel.php:309 +#: actions/pathsadminpanel.php:336 msgid "Server to direct SSL requests to" msgstr "" -#: actions/pathsadminpanel.php:325 +#: actions/pathsadminpanel.php:352 msgid "Save paths" msgstr "Запазване на пътищата" @@ -2612,7 +2685,7 @@ msgid "" "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated" msgstr "" -#: actions/profilesettings.php:151 actions/siteadminpanel.php:294 +#: actions/profilesettings.php:151 actions/siteadminpanel.php:280 msgid "Language" msgstr "Език" @@ -2640,7 +2713,7 @@ msgstr "" msgid "Bio is too long (max %d chars)." msgstr "Биографията е твърде дълга (до %d символа)." -#: actions/profilesettings.php:235 actions/siteadminpanel.php:164 +#: actions/profilesettings.php:235 actions/siteadminpanel.php:150 msgid "Timezone not selected." msgstr "Не е избран часови пояс" @@ -2903,7 +2976,7 @@ msgstr "Грешка в кода за потвърждение." msgid "Registration successful" msgstr "Записването е успешно." -#: actions/register.php:114 actions/register.php:503 lib/action.php:457 +#: actions/register.php:114 actions/register.php:503 lib/action.php:463 #: lib/logingroupnav.php:85 msgid "Register" msgstr "Регистриране" @@ -2945,7 +3018,7 @@ msgid "Same as password above. Required." msgstr "Същото като паролата по-горе. Задължително поле." #: actions/register.php:438 actions/register.php:442 -#: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120 +#: actions/siteadminpanel.php:256 lib/accountsettingsaction.php:120 msgid "Email" msgstr "Е-поща" @@ -3102,6 +3175,11 @@ msgstr "Повторено!" msgid "Replies to %s" msgstr "Отговори на %s" +#: actions/replies.php:127 +#, fuzzy, php-format +msgid "Replies to %1$s, page %2$d" +msgstr "Отговори до %1$s в %2$s!" + #: actions/replies.php:144 #, php-format msgid "Replies feed for %s (RSS 1.0)" @@ -3232,6 +3310,11 @@ msgid "" "signature method." msgstr "" +#: actions/showfavorites.php:79 +#, fuzzy, php-format +msgid "%1$s's favorite notices, page %2$d" +msgstr "Любими бележки на %s" + #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "Грешка при изтегляне на любимите бележки" @@ -3281,6 +3364,11 @@ msgstr "Така можете да споделите какво харесва msgid "%s group" msgstr "Група %s" +#: actions/showgroup.php:84 +#, fuzzy, php-format +msgid "%1$s group, page %2$d" +msgstr "Членове на групата %s, страница %d" + #: actions/showgroup.php:218 msgid "Group profile" msgstr "Профил на групата" @@ -3391,6 +3479,11 @@ msgstr "Бележката е изтрита." msgid " tagged %s" msgstr "Бележки с етикет %s" +#: actions/showstream.php:79 +#, fuzzy, php-format +msgid "%1$s, page %2$d" +msgstr "Блокирани за %s, страница %d" + #: actions/showstream.php:122 #, fuzzy, php-format msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" @@ -3468,194 +3561,146 @@ msgstr "Потребителят вече е заглушен." msgid "Basic settings for this StatusNet site." msgstr "Основни настройки на тази инсталация на StatusNet." -#: actions/siteadminpanel.php:146 +#: actions/siteadminpanel.php:132 msgid "Site name must have non-zero length." msgstr "Името на сайта е задължително." -#: actions/siteadminpanel.php:154 +#: actions/siteadminpanel.php:140 #, fuzzy msgid "You must have a valid contact email address." msgstr "Адресът на е-поща за контакт е задължителен" -#: actions/siteadminpanel.php:172 +#: actions/siteadminpanel.php:158 #, fuzzy, php-format msgid "Unknown language \"%s\"." msgstr "Непознат език \"%s\"" -#: actions/siteadminpanel.php:179 +#: actions/siteadminpanel.php:165 msgid "Invalid snapshot report URL." msgstr "" -#: actions/siteadminpanel.php:185 +#: actions/siteadminpanel.php:171 msgid "Invalid snapshot run value." msgstr "" -#: actions/siteadminpanel.php:191 +#: actions/siteadminpanel.php:177 msgid "Snapshot frequency must be a number." msgstr "" -#: actions/siteadminpanel.php:197 +#: actions/siteadminpanel.php:183 msgid "Minimum text limit is 140 characters." msgstr "Минималното ограничение на текста е 140 знака." -#: actions/siteadminpanel.php:203 +#: actions/siteadminpanel.php:189 msgid "Dupe limit must 1 or more seconds." msgstr "" -#: actions/siteadminpanel.php:253 +#: actions/siteadminpanel.php:239 msgid "General" msgstr "Общи" -#: actions/siteadminpanel.php:256 +#: actions/siteadminpanel.php:242 msgid "Site name" msgstr "Име на сайта" -#: actions/siteadminpanel.php:257 +#: actions/siteadminpanel.php:243 msgid "The name of your site, like \"Yourcompany Microblog\"" msgstr "" -#: actions/siteadminpanel.php:261 +#: actions/siteadminpanel.php:247 msgid "Brought by" msgstr "" -#: actions/siteadminpanel.php:262 +#: actions/siteadminpanel.php:248 msgid "Text used for credits link in footer of each page" msgstr "" -#: actions/siteadminpanel.php:266 +#: actions/siteadminpanel.php:252 msgid "Brought by URL" msgstr "" -#: actions/siteadminpanel.php:267 +#: actions/siteadminpanel.php:253 msgid "URL used for credits link in footer of each page" msgstr "" -#: actions/siteadminpanel.php:271 +#: actions/siteadminpanel.php:257 msgid "Contact email address for your site" msgstr "Адрес на е-поща за контакт със сайта" -#: actions/siteadminpanel.php:277 +#: actions/siteadminpanel.php:263 #, fuzzy msgid "Local" msgstr "Местоположение" -#: actions/siteadminpanel.php:288 +#: actions/siteadminpanel.php:274 msgid "Default timezone" msgstr "Часови пояс по подразбиране" -#: actions/siteadminpanel.php:289 +#: actions/siteadminpanel.php:275 msgid "Default timezone for the site; usually UTC." msgstr "Часови пояс по подразбиране за сайта (обикновено UTC)." -#: actions/siteadminpanel.php:295 +#: actions/siteadminpanel.php:281 msgid "Default site language" msgstr "Език по подразбиране за сайта" -#: actions/siteadminpanel.php:303 -msgid "URLs" -msgstr "" - -#: actions/siteadminpanel.php:306 -msgid "Server" -msgstr "Сървър" - -#: actions/siteadminpanel.php:306 -msgid "Site's server hostname." -msgstr "" - -#: actions/siteadminpanel.php:310 -msgid "Fancy URLs" -msgstr "Кратки URL-адреси" - -#: actions/siteadminpanel.php:312 -msgid "Use fancy (more readable and memorable) URLs?" -msgstr "" - -#: actions/siteadminpanel.php:318 -msgid "Access" -msgstr "Достъп" - -#: actions/siteadminpanel.php:321 -msgid "Private" -msgstr "Частен" - -#: actions/siteadminpanel.php:323 -msgid "Prohibit anonymous users (not logged in) from viewing site?" -msgstr "" - -#: actions/siteadminpanel.php:327 -msgid "Invite only" -msgstr "Само с покани" - -#: actions/siteadminpanel.php:329 -msgid "Make registration invitation only." -msgstr "Новите регистрации да са само с покани." - -#: actions/siteadminpanel.php:333 -msgid "Closed" -msgstr "Затворен" - -#: actions/siteadminpanel.php:335 -msgid "Disable new registrations." -msgstr "Изключване на новите регистрации." - -#: actions/siteadminpanel.php:341 +#: actions/siteadminpanel.php:289 msgid "Snapshots" msgstr "" -#: actions/siteadminpanel.php:344 +#: actions/siteadminpanel.php:292 msgid "Randomly during Web hit" msgstr "" -#: actions/siteadminpanel.php:345 +#: actions/siteadminpanel.php:293 msgid "In a scheduled job" msgstr "" -#: actions/siteadminpanel.php:347 +#: actions/siteadminpanel.php:295 msgid "Data snapshots" msgstr "" -#: actions/siteadminpanel.php:348 +#: actions/siteadminpanel.php:296 msgid "When to send statistical data to status.net servers" msgstr "" -#: actions/siteadminpanel.php:353 +#: actions/siteadminpanel.php:301 msgid "Frequency" msgstr "Честота" -#: actions/siteadminpanel.php:354 +#: actions/siteadminpanel.php:302 msgid "Snapshots will be sent once every N web hits" msgstr "" -#: actions/siteadminpanel.php:359 +#: actions/siteadminpanel.php:307 msgid "Report URL" msgstr "" -#: actions/siteadminpanel.php:360 +#: actions/siteadminpanel.php:308 msgid "Snapshots will be sent to this URL" msgstr "" -#: actions/siteadminpanel.php:367 +#: actions/siteadminpanel.php:315 msgid "Limits" msgstr "Ограничения" -#: actions/siteadminpanel.php:370 +#: actions/siteadminpanel.php:318 msgid "Text limit" msgstr "" -#: actions/siteadminpanel.php:370 +#: actions/siteadminpanel.php:318 msgid "Maximum number of characters for notices." msgstr "" -#: actions/siteadminpanel.php:374 +#: actions/siteadminpanel.php:322 msgid "Dupe limit" msgstr "" -#: actions/siteadminpanel.php:374 +#: actions/siteadminpanel.php:322 msgid "How long users must wait (in seconds) to post the same thing again." msgstr "" -#: actions/siteadminpanel.php:388 actions/useradminpanel.php:313 +#: actions/siteadminpanel.php:336 actions/useradminpanel.php:313 msgid "Save site settings" msgstr "Запазване настройките на сайта" @@ -3859,6 +3904,11 @@ msgstr "Jabber" msgid "SMS" msgstr "SMS" +#: actions/tag.php:68 +#, fuzzy, php-format +msgid "Notices tagged with %1$s, page %2$d" +msgstr "Бележки с етикет %s, страница %d" + #: actions/tag.php:86 #, fuzzy, php-format msgid "Notice feed for tag %s (RSS 1.0)" @@ -4162,6 +4212,11 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "" +#: actions/usergroups.php:64 +#, fuzzy, php-format +msgid "%1$s groups, page %2$d" +msgstr "Членове на групата %s, страница %d" + #: actions/usergroups.php:130 #, fuzzy msgid "Search for more groups" @@ -4225,7 +4280,7 @@ msgstr "" msgid "Plugins" msgstr "" -#: actions/version.php:196 lib/action.php:741 +#: actions/version.php:196 lib/action.php:747 #, fuzzy msgid "Version" msgstr "Сесии" @@ -4285,28 +4340,28 @@ msgstr "Грешка при вмъкване на съобщението." msgid "Could not update message with new URI." msgstr "Грешка при обновяване на бележката с нов URL-адрес." -#: classes/Notice.php:171 +#: classes/Notice.php:157 #, php-format msgid "DB error inserting hashtag: %s" msgstr "" -#: classes/Notice.php:225 +#: classes/Notice.php:214 #, fuzzy msgid "Problem saving notice. Too long." msgstr "Проблем при записване на бележката." -#: classes/Notice.php:229 +#: classes/Notice.php:218 msgid "Problem saving notice. Unknown user." msgstr "Грешка при записване на бележката. Непознат потребител." -#: classes/Notice.php:234 +#: classes/Notice.php:223 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Твърде много бележки за кратко време. Спрете, поемете дъх и публикувайте " "отново след няколко минути." -#: classes/Notice.php:240 +#: classes/Notice.php:229 #, fuzzy msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " @@ -4315,20 +4370,25 @@ msgstr "" "Твърде много бележки за кратко време. Спрете, поемете дъх и публикувайте " "отново след няколко минути." -#: classes/Notice.php:246 +#: classes/Notice.php:235 msgid "You are banned from posting notices on this site." msgstr "Забранено ви е да публикувате бележки в този сайт." -#: classes/Notice.php:305 classes/Notice.php:330 +#: classes/Notice.php:294 classes/Notice.php:319 msgid "Problem saving notice." msgstr "Проблем при записване на бележката." -#: classes/Notice.php:1059 +#: classes/Notice.php:790 +#, fuzzy +msgid "Problem saving group inbox." +msgstr "Проблем при записване на бележката." + +#: classes/Notice.php:850 #, php-format msgid "DB error inserting reply: %s" msgstr "Грешка в базата от данни — отговор при вмъкването: %s" -#: classes/Notice.php:1441 +#: classes/Notice.php:1233 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -4385,128 +4445,128 @@ msgstr "%1$s (%2$s)" msgid "Untitled page" msgstr "Неозаглавена страница" -#: lib/action.php:427 +#: lib/action.php:433 msgid "Primary site navigation" msgstr "" -#: lib/action.php:433 +#: lib/action.php:439 msgid "Home" msgstr "Начало" -#: lib/action.php:433 +#: lib/action.php:439 msgid "Personal profile and friends timeline" msgstr "" -#: lib/action.php:435 +#: lib/action.php:441 msgid "Change your email, avatar, password, profile" msgstr "Промяна на поща, аватар, парола, профил" -#: lib/action.php:438 +#: lib/action.php:444 msgid "Connect" msgstr "Свързване" -#: lib/action.php:438 +#: lib/action.php:444 msgid "Connect to services" msgstr "Свързване към услуги" -#: lib/action.php:442 +#: lib/action.php:448 msgid "Change site configuration" msgstr "Промяна настройките на сайта" -#: lib/action.php:446 lib/subgroupnav.php:105 +#: lib/action.php:452 lib/subgroupnav.php:105 msgid "Invite" msgstr "Покани" -#: lib/action.php:447 lib/subgroupnav.php:106 +#: lib/action.php:453 lib/subgroupnav.php:106 #, php-format msgid "Invite friends and colleagues to join you on %s" msgstr "Поканете приятели и колеги да се присъединят към вас в %s" -#: lib/action.php:452 +#: lib/action.php:458 msgid "Logout" msgstr "Изход" -#: lib/action.php:452 +#: lib/action.php:458 msgid "Logout from the site" msgstr "Излизане от сайта" -#: lib/action.php:457 +#: lib/action.php:463 msgid "Create an account" msgstr "Създаване на нова сметка" -#: lib/action.php:460 +#: lib/action.php:466 msgid "Login to the site" msgstr "Влизане в сайта" -#: lib/action.php:463 lib/action.php:726 +#: lib/action.php:469 lib/action.php:732 msgid "Help" msgstr "Помощ" -#: lib/action.php:463 +#: lib/action.php:469 #, fuzzy msgid "Help me!" msgstr "Помощ" -#: lib/action.php:466 lib/searchaction.php:127 +#: lib/action.php:472 lib/searchaction.php:127 msgid "Search" msgstr "Търсене" -#: lib/action.php:466 +#: lib/action.php:472 msgid "Search for people or text" msgstr "Търсене за хора или бележки" -#: lib/action.php:487 +#: lib/action.php:493 #, fuzzy msgid "Site notice" msgstr "Нова бележка" -#: lib/action.php:553 +#: lib/action.php:559 msgid "Local views" msgstr "" -#: lib/action.php:619 +#: lib/action.php:625 #, fuzzy msgid "Page notice" msgstr "Нова бележка" -#: lib/action.php:721 +#: lib/action.php:727 #, fuzzy msgid "Secondary site navigation" msgstr "Абонаменти" -#: lib/action.php:728 +#: lib/action.php:734 msgid "About" msgstr "Относно" -#: lib/action.php:730 +#: lib/action.php:736 msgid "FAQ" msgstr "Въпроси" -#: lib/action.php:734 +#: lib/action.php:740 msgid "TOS" msgstr "Условия" -#: lib/action.php:737 +#: lib/action.php:743 msgid "Privacy" msgstr "Поверителност" -#: lib/action.php:739 +#: lib/action.php:745 msgid "Source" msgstr "Изходен код" -#: lib/action.php:743 +#: lib/action.php:749 msgid "Contact" msgstr "Контакт" -#: lib/action.php:745 +#: lib/action.php:751 msgid "Badge" msgstr "Табелка" -#: lib/action.php:773 +#: lib/action.php:779 msgid "StatusNet software license" msgstr "Лиценз на програмата StatusNet" -#: lib/action.php:776 +#: lib/action.php:782 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -4515,12 +4575,12 @@ msgstr "" "**%%site.name%%** е услуга за микроблогване, предоставена ви от [%%site." "broughtby%%](%%site.broughtbyurl%%). " -#: lib/action.php:778 +#: lib/action.php:784 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "**%%site.name%%** е услуга за микроблогване. " -#: lib/action.php:780 +#: lib/action.php:786 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4531,41 +4591,41 @@ msgstr "" "достъпна под [GNU Affero General Public License](http://www.fsf.org/" "licensing/licenses/agpl-3.0.html)." -#: lib/action.php:795 +#: lib/action.php:801 msgid "Site content license" msgstr "Лиценз на съдържанието" -#: lib/action.php:800 +#: lib/action.php:806 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "" -#: lib/action.php:805 +#: lib/action.php:811 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" -#: lib/action.php:808 +#: lib/action.php:814 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" -#: lib/action.php:820 +#: lib/action.php:826 msgid "All " msgstr "Всички " -#: lib/action.php:825 +#: lib/action.php:831 msgid "license." msgstr "лиценз." -#: lib/action.php:1124 +#: lib/action.php:1130 msgid "Pagination" msgstr "Страниране" -#: lib/action.php:1133 +#: lib/action.php:1139 msgid "After" msgstr "След" -#: lib/action.php:1141 +#: lib/action.php:1147 msgid "Before" msgstr "Преди" @@ -4601,10 +4661,24 @@ msgstr "Основна настройка на сайта" msgid "Design configuration" msgstr "Настройка на оформлението" -#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327 +#: lib/adminpanelaction.php:322 +#, fuzzy +msgid "User configuration" +msgstr "Настройка на пътищата" + +#: lib/adminpanelaction.php:327 +#, fuzzy +msgid "Access configuration" +msgstr "Настройка на оформлението" + +#: lib/adminpanelaction.php:332 msgid "Paths configuration" msgstr "Настройка на пътищата" +#: lib/applicationeditform.php:136 +msgid "Edit application" +msgstr "" + #: lib/applicationeditform.php:186 msgid "Icon for this application" msgstr "" @@ -5190,12 +5264,12 @@ msgstr "MB" msgid "kB" msgstr "kB" -#: lib/jabber.php:202 +#: lib/jabber.php:220 #, php-format msgid "[%s]" msgstr "" -#: lib/jabber.php:385 +#: lib/jabber.php:400 #, fuzzy, php-format msgid "Unknown inbox source %d." msgstr "Непознат език \"%s\"" @@ -5620,19 +5694,19 @@ msgstr "Отговори" msgid "Favorites" msgstr "Любими" -#: lib/personalgroupnav.php:124 +#: lib/personalgroupnav.php:125 msgid "Inbox" msgstr "Входящи" -#: lib/personalgroupnav.php:125 +#: lib/personalgroupnav.php:126 msgid "Your incoming messages" msgstr "Получените от вас съобщения" -#: lib/personalgroupnav.php:129 +#: lib/personalgroupnav.php:130 msgid "Outbox" msgstr "Изходящи" -#: lib/personalgroupnav.php:130 +#: lib/personalgroupnav.php:131 msgid "Your sent messages" msgstr "Изпратените от вас съобщения" @@ -5885,47 +5959,47 @@ msgstr "Съобщение" msgid "Moderate" msgstr "" -#: lib/util.php:875 +#: lib/util.php:868 msgid "a few seconds ago" msgstr "преди няколко секунди" -#: lib/util.php:877 +#: lib/util.php:870 msgid "about a minute ago" msgstr "преди около минута" -#: lib/util.php:879 +#: lib/util.php:872 #, php-format msgid "about %d minutes ago" msgstr "преди около %d минути" -#: lib/util.php:881 +#: lib/util.php:874 msgid "about an hour ago" msgstr "преди около час" -#: lib/util.php:883 +#: lib/util.php:876 #, php-format msgid "about %d hours ago" msgstr "преди около %d часа" -#: lib/util.php:885 +#: lib/util.php:878 msgid "about a day ago" msgstr "преди около ден" -#: lib/util.php:887 +#: lib/util.php:880 #, php-format msgid "about %d days ago" msgstr "преди около %d дни" -#: lib/util.php:889 +#: lib/util.php:882 msgid "about a month ago" msgstr "преди около месец" -#: lib/util.php:891 +#: lib/util.php:884 #, php-format msgid "about %d months ago" msgstr "преди около %d месеца" -#: lib/util.php:893 +#: lib/util.php:886 msgid "about a year ago" msgstr "преди около година" @@ -5939,7 +6013,7 @@ msgstr "%s не е допустим цвят!" msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "%s не е допустим цвят! Използвайте 3 или 6 шестнадесетични знака." -#: scripts/xmppdaemon.php:301 +#: lib/xmppmanager.php:402 #, fuzzy, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" diff --git a/locale/ca/LC_MESSAGES/statusnet.po b/locale/ca/LC_MESSAGES/statusnet.po index ef08bf3f1f..2ae0c33117 100644 --- a/locale/ca/LC_MESSAGES/statusnet.po +++ b/locale/ca/LC_MESSAGES/statusnet.po @@ -9,17 +9,73 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-21 22:36+0000\n" -"PO-Revision-Date: 2010-01-21 22:37:10+0000\n" +"POT-Creation-Date: 2010-01-27 23:58+0000\n" +"PO-Revision-Date: 2010-01-27 23:58:29+0000\n" "Language-Team: Catalan\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r61339); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61595); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ca\n" "X-Message-Group: out-statusnet\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#: actions/accessadminpanel.php:54 lib/adminpanelaction.php:326 +msgid "Access" +msgstr "Accés" + +#: actions/accessadminpanel.php:65 +#, fuzzy +msgid "Site access settings" +msgstr "Desa els paràmetres del lloc" + +#: actions/accessadminpanel.php:158 +#, fuzzy +msgid "Registration" +msgstr "Registre" + +#: actions/accessadminpanel.php:161 +msgid "Private" +msgstr "Privat" + +#: actions/accessadminpanel.php:163 +msgid "Prohibit anonymous users (not logged in) from viewing site?" +msgstr "" +"Voleu prohibir als usuaris anònims (que no han iniciat cap sessió) " +"visualitzar el lloc?" + +#: actions/accessadminpanel.php:167 +msgid "Invite only" +msgstr "Només invitació" + +#: actions/accessadminpanel.php:169 +msgid "Make registration invitation only." +msgstr "Fes que el registre sigui només amb invitacions." + +#: actions/accessadminpanel.php:173 +msgid "Closed" +msgstr "Tancat" + +#: actions/accessadminpanel.php:175 +msgid "Disable new registrations." +msgstr "Inhabilita els nous registres." + +#: actions/accessadminpanel.php:189 actions/designadminpanel.php:586 +#: actions/emailsettings.php:195 actions/imsettings.php:163 +#: actions/othersettings.php:126 actions/pathsadminpanel.php:351 +#: actions/profilesettings.php:174 actions/siteadminpanel.php:336 +#: actions/smssettings.php:181 actions/subscriptions.php:203 +#: actions/tagother.php:154 actions/useradminpanel.php:313 +#: lib/applicationeditform.php:335 lib/applicationeditform.php:336 +#: lib/designsettings.php:256 lib/groupeditform.php:202 +msgid "Save" +msgstr "Guardar" + +#: actions/accessadminpanel.php:189 +#, fuzzy +msgid "Save access settings" +msgstr "Desa els paràmetres del lloc" + #: actions/all.php:63 actions/public.php:97 actions/replies.php:92 #: actions/showfavorites.php:137 actions/tag.php:51 msgid "No such page" @@ -34,7 +90,7 @@ msgstr "No existeix la pàgina." #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:149 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 @@ -135,8 +191,7 @@ msgstr "Actualitzacions de %1$s i amics a %2$s!" #: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 #: actions/apitimelinefriends.php:155 actions/apitimelinegroup.php:150 #: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 -#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 #, fuzzy @@ -153,7 +208,7 @@ msgstr "No s'ha trobat el mètode API!" #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:119 +#: actions/apistatusesupdate.php:118 msgid "This method requires a POST." msgstr "Aquest mètode requereix POST." @@ -184,7 +239,7 @@ msgstr "No s'ha pogut guardar el perfil." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:132 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 #: actions/designadminpanel.php:122 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -498,7 +553,14 @@ msgstr "" msgid "Allow or deny access" msgstr "" -#: actions/apioauthauthorize.php:320 lib/action.php:435 +#: actions/apioauthauthorize.php:306 +#, php-format +msgid "" +"The application %s by %s would like the " +"ability to %s your account data." +msgstr "" + +#: actions/apioauthauthorize.php:320 lib/action.php:441 msgid "Account" msgstr "Compte" @@ -559,17 +621,17 @@ msgstr "S'ha suprimit l'estat." msgid "No status with that ID found." msgstr "No s'ha trobat cap estatus amb la ID trobada." -#: actions/apistatusesupdate.php:162 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Massa llarg. La longitud màxima és de %d caràcters." -#: actions/apistatusesupdate.php:203 +#: actions/apistatusesupdate.php:202 msgid "Not found" msgstr "No s'ha trobat" -#: actions/apistatusesupdate.php:226 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -620,11 +682,6 @@ msgstr "%s línia temporal pública" msgid "%s updates from everyone!" msgstr "%s notificacions de tots!" -#: actions/apitimelineretweetedbyme.php:112 -#, php-format -msgid "Repeated by %s" -msgstr "Repetit per %s" - #: actions/apitimelineretweetedtome.php:111 #, fuzzy, php-format msgid "Repeated to %s" @@ -1033,17 +1090,6 @@ msgstr "" msgid "Reset back to default" msgstr "" -#: actions/designadminpanel.php:586 actions/emailsettings.php:195 -#: actions/imsettings.php:163 actions/othersettings.php:126 -#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174 -#: actions/siteadminpanel.php:388 actions/smssettings.php:181 -#: actions/subscriptions.php:203 actions/tagother.php:154 -#: actions/useradminpanel.php:313 lib/applicationeditform.php:335 -#: lib/applicationeditform.php:336 lib/designsettings.php:256 -#: lib/groupeditform.php:202 -msgid "Save" -msgstr "Guardar" - #: actions/designadminpanel.php:587 lib/designsettings.php:257 msgid "Save design" msgstr "Desa el disseny" @@ -1056,13 +1102,15 @@ msgstr "Aquesta notificació no és un favorit!" msgid "Add to favorites" msgstr "Afegeix als preferits" -#: actions/doc.php:69 -msgid "No such document." +#: actions/doc.php:155 +#, fuzzy, php-format +msgid "No such document \"%s\"" msgstr "No existeix aquest document." -#: actions/editapplication.php:54 lib/applicationeditform.php:136 -msgid "Edit application" -msgstr "" +#: actions/editapplication.php:54 +#, fuzzy +msgid "Edit Application" +msgstr "Altres opcions" #: actions/editapplication.php:66 #, fuzzy @@ -1081,7 +1129,7 @@ msgid "No such application." msgstr "No existeix aquest avís." #: actions/editapplication.php:127 actions/newapplication.php:110 -#: actions/showapplication.php:118 lib/action.php:1189 +#: actions/showapplication.php:118 lib/action.php:1195 msgid "There was a problem with your session token." msgstr "Ha ocorregut algun problema amb la teva sessió." @@ -1297,7 +1345,7 @@ msgid "Cannot normalize that email address" msgstr "No es pot normalitzar l'adreça electrònica." #: actions/emailsettings.php:331 actions/register.php:201 -#: actions/siteadminpanel.php:157 +#: actions/siteadminpanel.php:143 msgid "Not a valid email address." msgstr "Adreça de correu electrònic no vàlida." @@ -1309,7 +1357,7 @@ msgstr "Ja és la vostra adreça electrònica." msgid "That email address already belongs to another user." msgstr "L'adreça electrònica ja pertany a un altre usuari." -#: actions/emailsettings.php:353 actions/imsettings.php:317 +#: actions/emailsettings.php:353 actions/imsettings.php:319 #: actions/smssettings.php:337 msgid "Couldn't insert confirmation code." msgstr "No s'ha pogut inserir el codi de confirmació." @@ -1613,7 +1661,7 @@ msgstr "%s membre/s en el grup, pàgina %d" msgid "A list of the users in this group." msgstr "La llista dels usuaris d'aquest grup." -#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107 +#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107 msgid "Admin" msgstr "Admin" @@ -1802,6 +1850,11 @@ msgstr "" msgid "That is not your Jabber ID." msgstr "Aquest no és el teu Jabber ID." +#: actions/inbox.php:59 +#, fuzzy, php-format +msgid "Inbox for %1$s - page %2$d" +msgstr "Safata d'entrada per %s" + #: actions/inbox.php:62 #, php-format msgid "Inbox for %s" @@ -1988,7 +2041,7 @@ msgstr "Nom d'usuari o contrasenya incorrectes." msgid "Error setting user. You are probably not authorized." msgstr "No autoritzat." -#: actions/login.php:188 actions/login.php:241 lib/action.php:460 +#: actions/login.php:188 actions/login.php:241 lib/action.php:466 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Inici de sessió" @@ -2053,8 +2106,9 @@ msgid "No current status" msgstr "No té cap estatus ara mateix" #: actions/newapplication.php:52 -msgid "New application" -msgstr "" +#, fuzzy +msgid "New Application" +msgstr "No existeix aquest avís." #: actions/newapplication.php:64 #, fuzzy @@ -2246,8 +2300,8 @@ msgstr "tipus de contingut " msgid "Only " msgstr "Només " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1038 -#: lib/api.php:1066 lib/api.php:1176 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1039 +#: lib/api.php:1067 lib/api.php:1177 msgid "Not a supported data format." msgstr "Format de data no suportat." @@ -2318,6 +2372,11 @@ msgstr "El contingut de l'avís és invàlid" msgid "Login token expired." msgstr "Accedir al lloc" +#: actions/outbox.php:58 +#, fuzzy, php-format +msgid "Outbox for %1$s - page %2$d" +msgstr "Safata de sortida per %s" + #: actions/outbox.php:61 #, php-format msgid "Outbox for %s" @@ -2390,7 +2449,7 @@ msgstr "No es pot guardar la nova contrasenya." msgid "Password saved." msgstr "Contrasenya guardada." -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:331 msgid "Paths" msgstr "Camins" @@ -2398,133 +2457,149 @@ msgstr "Camins" msgid "Path and server settings for this StatusNet site." msgstr "" -#: actions/pathsadminpanel.php:140 +#: actions/pathsadminpanel.php:157 #, fuzzy, php-format msgid "Theme directory not readable: %s" msgstr "Aquesta pàgina no està disponible en " -#: actions/pathsadminpanel.php:146 +#: actions/pathsadminpanel.php:163 #, php-format msgid "Avatar directory not writable: %s" msgstr "" -#: actions/pathsadminpanel.php:152 +#: actions/pathsadminpanel.php:169 #, php-format msgid "Background directory not writable: %s" msgstr "No es pot escriure al directori de fons: %s" -#: actions/pathsadminpanel.php:160 +#: actions/pathsadminpanel.php:177 #, php-format msgid "Locales directory not readable: %s" msgstr "" -#: actions/pathsadminpanel.php:166 +#: actions/pathsadminpanel.php:183 msgid "Invalid SSL server. The maximum length is 255 characters." msgstr "" -#: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58 +#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58 #: lib/adminpanelaction.php:311 msgid "Site" msgstr "Lloc" -#: actions/pathsadminpanel.php:221 +#: actions/pathsadminpanel.php:238 +msgid "Server" +msgstr "Servidor" + +#: actions/pathsadminpanel.php:238 +msgid "Site's server hostname." +msgstr "Servidor central del lloc." + +#: actions/pathsadminpanel.php:242 msgid "Path" msgstr "Camí" -#: actions/pathsadminpanel.php:221 +#: actions/pathsadminpanel.php:242 msgid "Site path" msgstr "Camí del lloc" -#: actions/pathsadminpanel.php:225 +#: actions/pathsadminpanel.php:246 msgid "Path to locales" msgstr "" -#: actions/pathsadminpanel.php:225 +#: actions/pathsadminpanel.php:246 msgid "Directory path to locales" msgstr "" -#: actions/pathsadminpanel.php:232 +#: actions/pathsadminpanel.php:250 +msgid "Fancy URLs" +msgstr "" + +#: actions/pathsadminpanel.php:252 +msgid "Use fancy (more readable and memorable) URLs?" +msgstr "" + +#: actions/pathsadminpanel.php:259 msgid "Theme" msgstr "Tema" -#: actions/pathsadminpanel.php:237 +#: actions/pathsadminpanel.php:264 msgid "Theme server" msgstr "Servidor dels temes" -#: actions/pathsadminpanel.php:241 +#: actions/pathsadminpanel.php:268 msgid "Theme path" msgstr "Camí dels temes" -#: actions/pathsadminpanel.php:245 +#: actions/pathsadminpanel.php:272 msgid "Theme directory" msgstr "Directori de temes" -#: actions/pathsadminpanel.php:252 +#: actions/pathsadminpanel.php:279 msgid "Avatars" msgstr "Avatars" -#: actions/pathsadminpanel.php:257 +#: actions/pathsadminpanel.php:284 msgid "Avatar server" msgstr "Servidor d'avatars" -#: actions/pathsadminpanel.php:261 +#: actions/pathsadminpanel.php:288 msgid "Avatar path" msgstr "Camí de l'avatar" -#: actions/pathsadminpanel.php:265 +#: actions/pathsadminpanel.php:292 msgid "Avatar directory" msgstr "Directori d'avatars" -#: actions/pathsadminpanel.php:274 +#: actions/pathsadminpanel.php:301 msgid "Backgrounds" msgstr "Fons" -#: actions/pathsadminpanel.php:278 +#: actions/pathsadminpanel.php:305 msgid "Background server" msgstr "Servidor de fons" -#: actions/pathsadminpanel.php:282 +#: actions/pathsadminpanel.php:309 msgid "Background path" msgstr "Camí dels fons" -#: actions/pathsadminpanel.php:286 +#: actions/pathsadminpanel.php:313 msgid "Background directory" msgstr "Directori de fons" -#: actions/pathsadminpanel.php:293 +#: actions/pathsadminpanel.php:320 msgid "SSL" msgstr "SSL" -#: actions/pathsadminpanel.php:296 actions/siteadminpanel.php:346 +#: actions/pathsadminpanel.php:323 actions/siteadminpanel.php:294 msgid "Never" msgstr "Mai" -#: actions/pathsadminpanel.php:297 +#: actions/pathsadminpanel.php:324 msgid "Sometimes" msgstr "A vegades" -#: actions/pathsadminpanel.php:298 +#: actions/pathsadminpanel.php:325 msgid "Always" msgstr "Sempre" -#: actions/pathsadminpanel.php:302 +#: actions/pathsadminpanel.php:329 msgid "Use SSL" msgstr "Utilitza l'SSL" -#: actions/pathsadminpanel.php:303 +#: actions/pathsadminpanel.php:330 msgid "When to use SSL" msgstr "" -#: actions/pathsadminpanel.php:308 +#: actions/pathsadminpanel.php:335 #, fuzzy msgid "SSL server" msgstr "Servidor SSL" -#: actions/pathsadminpanel.php:309 +#: actions/pathsadminpanel.php:336 msgid "Server to direct SSL requests to" msgstr "" -#: actions/pathsadminpanel.php:325 +#: actions/pathsadminpanel.php:352 #, fuzzy msgid "Save paths" msgstr "Avís del lloc" @@ -2638,7 +2713,7 @@ msgstr "" "Etiquetes per a tu mateix (lletres, números, -, ., i _), per comes o separat " "por espais" -#: actions/profilesettings.php:151 actions/siteadminpanel.php:294 +#: actions/profilesettings.php:151 actions/siteadminpanel.php:280 msgid "Language" msgstr "Idioma" @@ -2666,7 +2741,7 @@ msgstr "" msgid "Bio is too long (max %d chars)." msgstr "La biografia és massa llarga (màx. %d caràcters)." -#: actions/profilesettings.php:235 actions/siteadminpanel.php:164 +#: actions/profilesettings.php:235 actions/siteadminpanel.php:150 msgid "Timezone not selected." msgstr "Franja horària no seleccionada." @@ -2936,7 +3011,7 @@ msgstr "El codi d'invitació no és vàlid." msgid "Registration successful" msgstr "Registre satisfactori" -#: actions/register.php:114 actions/register.php:503 lib/action.php:457 +#: actions/register.php:114 actions/register.php:503 lib/action.php:463 #: lib/logingroupnav.php:85 msgid "Register" msgstr "Registre" @@ -2979,7 +3054,7 @@ msgid "Same as password above. Required." msgstr "Igual a la contrasenya de dalt. Requerit." #: actions/register.php:438 actions/register.php:442 -#: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120 +#: actions/siteadminpanel.php:256 lib/accountsettingsaction.php:120 msgid "Email" msgstr "Correu electrònic" @@ -3142,6 +3217,11 @@ msgstr "Repetit!" msgid "Replies to %s" msgstr "Respostes a %s" +#: actions/replies.php:127 +#, fuzzy, php-format +msgid "Replies to %1$s, page %2$d" +msgstr "Respostes a %1$s el %2$s!" + #: actions/replies.php:144 #, fuzzy, php-format msgid "Replies feed for %s (RSS 1.0)" @@ -3273,6 +3353,11 @@ msgid "" "signature method." msgstr "" +#: actions/showfavorites.php:79 +#, fuzzy, php-format +msgid "%1$s's favorite notices, page %2$d" +msgstr "%s's notes favorites" + #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "No s'han pogut recuperar els avisos preferits." @@ -3322,6 +3407,11 @@ msgstr "És una forma de compartir allò que us agrada." msgid "%s group" msgstr "%s grup" +#: actions/showgroup.php:84 +#, fuzzy, php-format +msgid "%1$s group, page %2$d" +msgstr "%s membre/s en el grup, pàgina %d" + #: actions/showgroup.php:218 msgid "Group profile" msgstr "Perfil del grup" @@ -3435,6 +3525,11 @@ msgstr "Notificació publicada" msgid " tagged %s" msgstr "Aviso etiquetats amb %s" +#: actions/showstream.php:79 +#, fuzzy, php-format +msgid "%1$s, page %2$d" +msgstr "%s perfils blocats, pàgina %d" + #: actions/showstream.php:122 #, fuzzy, php-format msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" @@ -3516,204 +3611,153 @@ msgstr "L'usuari ja està silenciat." msgid "Basic settings for this StatusNet site." msgstr "Paràmetres bàsic d'aquest lloc basat en l'StatusNet." -#: actions/siteadminpanel.php:146 +#: actions/siteadminpanel.php:132 msgid "Site name must have non-zero length." msgstr "El nom del lloc ha de tenir una longitud superior a zero." -#: actions/siteadminpanel.php:154 +#: actions/siteadminpanel.php:140 #, fuzzy msgid "You must have a valid contact email address." msgstr "Heu de tenir una adreça electrònica de contacte vàlida" -#: actions/siteadminpanel.php:172 +#: actions/siteadminpanel.php:158 #, fuzzy, php-format msgid "Unknown language \"%s\"." msgstr "Llengua desconeguda «%s»" -#: actions/siteadminpanel.php:179 +#: actions/siteadminpanel.php:165 msgid "Invalid snapshot report URL." msgstr "" -#: actions/siteadminpanel.php:185 +#: actions/siteadminpanel.php:171 msgid "Invalid snapshot run value." msgstr "" -#: actions/siteadminpanel.php:191 +#: actions/siteadminpanel.php:177 msgid "Snapshot frequency must be a number." msgstr "" -#: actions/siteadminpanel.php:197 +#: actions/siteadminpanel.php:183 msgid "Minimum text limit is 140 characters." msgstr "" -#: actions/siteadminpanel.php:203 +#: actions/siteadminpanel.php:189 msgid "Dupe limit must 1 or more seconds." msgstr "" -#: actions/siteadminpanel.php:253 +#: actions/siteadminpanel.php:239 msgid "General" msgstr "General" -#: actions/siteadminpanel.php:256 +#: actions/siteadminpanel.php:242 msgid "Site name" msgstr "Nom del lloc" -#: actions/siteadminpanel.php:257 +#: actions/siteadminpanel.php:243 msgid "The name of your site, like \"Yourcompany Microblog\"" msgstr "El nom del vostre lloc, com ara «El microblog de l'empresa»" -#: actions/siteadminpanel.php:261 +#: actions/siteadminpanel.php:247 msgid "Brought by" msgstr "" -#: actions/siteadminpanel.php:262 +#: actions/siteadminpanel.php:248 msgid "Text used for credits link in footer of each page" msgstr "El text que s'utilitza a l'enllaç dels crèdits al peu de cada pàgina" -#: actions/siteadminpanel.php:266 +#: actions/siteadminpanel.php:252 msgid "Brought by URL" msgstr "" -#: actions/siteadminpanel.php:267 +#: actions/siteadminpanel.php:253 msgid "URL used for credits link in footer of each page" msgstr "" -#: actions/siteadminpanel.php:271 +#: actions/siteadminpanel.php:257 msgid "Contact email address for your site" msgstr "Adreça electrònica de contacte del vostre lloc" -#: actions/siteadminpanel.php:277 +#: actions/siteadminpanel.php:263 msgid "Local" msgstr "Local" -#: actions/siteadminpanel.php:288 +#: actions/siteadminpanel.php:274 msgid "Default timezone" msgstr "Fus horari per defecte" -#: actions/siteadminpanel.php:289 +#: actions/siteadminpanel.php:275 msgid "Default timezone for the site; usually UTC." msgstr "Fus horari per defecte del lloc; normalment UTC." -#: actions/siteadminpanel.php:295 +#: actions/siteadminpanel.php:281 msgid "Default site language" msgstr "Llengua per defecte del lloc" -#: actions/siteadminpanel.php:303 -msgid "URLs" -msgstr "URL" - -#: actions/siteadminpanel.php:306 -msgid "Server" -msgstr "Servidor" - -#: actions/siteadminpanel.php:306 -msgid "Site's server hostname." -msgstr "Servidor central del lloc." - -#: actions/siteadminpanel.php:310 -msgid "Fancy URLs" -msgstr "" - -#: actions/siteadminpanel.php:312 -msgid "Use fancy (more readable and memorable) URLs?" -msgstr "" - -#: actions/siteadminpanel.php:318 -msgid "Access" -msgstr "Accés" - -#: actions/siteadminpanel.php:321 -msgid "Private" -msgstr "Privat" - -#: actions/siteadminpanel.php:323 -msgid "Prohibit anonymous users (not logged in) from viewing site?" -msgstr "" -"Voleu prohibir als usuaris anònims (que no han iniciat cap sessió) " -"visualitzar el lloc?" - -#: actions/siteadminpanel.php:327 -msgid "Invite only" -msgstr "Només invitació" - -#: actions/siteadminpanel.php:329 -msgid "Make registration invitation only." -msgstr "Fes que el registre sigui només amb invitacions." - -#: actions/siteadminpanel.php:333 -msgid "Closed" -msgstr "Tancat" - -#: actions/siteadminpanel.php:335 -msgid "Disable new registrations." -msgstr "Inhabilita els nous registres." - -#: actions/siteadminpanel.php:341 +#: actions/siteadminpanel.php:289 msgid "Snapshots" msgstr "Instantànies" -#: actions/siteadminpanel.php:344 +#: actions/siteadminpanel.php:292 msgid "Randomly during Web hit" msgstr "" -#: actions/siteadminpanel.php:345 +#: actions/siteadminpanel.php:293 msgid "In a scheduled job" msgstr "En una tasca planificada" -#: actions/siteadminpanel.php:347 +#: actions/siteadminpanel.php:295 msgid "Data snapshots" msgstr "Instantànies de dades" -#: actions/siteadminpanel.php:348 +#: actions/siteadminpanel.php:296 msgid "When to send statistical data to status.net servers" msgstr "" -#: actions/siteadminpanel.php:353 +#: actions/siteadminpanel.php:301 msgid "Frequency" msgstr "Freqüència" -#: actions/siteadminpanel.php:354 +#: actions/siteadminpanel.php:302 msgid "Snapshots will be sent once every N web hits" msgstr "" -#: actions/siteadminpanel.php:359 +#: actions/siteadminpanel.php:307 msgid "Report URL" msgstr "" -#: actions/siteadminpanel.php:360 +#: actions/siteadminpanel.php:308 msgid "Snapshots will be sent to this URL" msgstr "Les instantànies s'enviaran a aquest URL" -#: actions/siteadminpanel.php:367 +#: actions/siteadminpanel.php:315 msgid "Limits" msgstr "Límits" -#: actions/siteadminpanel.php:370 +#: actions/siteadminpanel.php:318 msgid "Text limit" msgstr "Límits del text" -#: actions/siteadminpanel.php:370 +#: actions/siteadminpanel.php:318 msgid "Maximum number of characters for notices." msgstr "" -#: actions/siteadminpanel.php:374 +#: actions/siteadminpanel.php:322 msgid "Dupe limit" msgstr "Límit de duplicats" -#: actions/siteadminpanel.php:374 +#: actions/siteadminpanel.php:322 msgid "How long users must wait (in seconds) to post the same thing again." msgstr "" "Quant de temps cal que esperin els usuaris (en segons) per enviar el mateix " "de nou." -#: actions/siteadminpanel.php:388 actions/useradminpanel.php:313 +#: actions/siteadminpanel.php:336 actions/useradminpanel.php:313 msgid "Save site settings" msgstr "Desa els paràmetres del lloc" #: actions/smssettings.php:58 -#, fuzzy msgid "SMS settings" -msgstr "Configuració SMS" +msgstr "Paràmetres de l'SMS" #: actions/smssettings.php:69 #, php-format @@ -3743,9 +3787,8 @@ msgid "Enter the code you received on your phone." msgstr "Escriu el codi que has rebut en el teu telèfon mòbil." #: actions/smssettings.php:138 -#, fuzzy msgid "SMS phone number" -msgstr "Número de telèfon pels SMS" +msgstr "Número de telèfon per als SMS" #: actions/smssettings.php:140 msgid "Phone number, no punctuation or spaces, with area code" @@ -3914,6 +3957,11 @@ msgstr "Jabber" msgid "SMS" msgstr "SMS" +#: actions/tag.php:68 +#, fuzzy, php-format +msgid "Notices tagged with %1$s, page %2$d" +msgstr "Usuaris que s'han etiquetat %s - pàgina %d" + #: actions/tag.php:86 #, fuzzy, php-format msgid "Notice feed for tag %s (RSS 1.0)" @@ -4218,6 +4266,11 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "Gaudiu de l'entrepà!" +#: actions/usergroups.php:64 +#, fuzzy, php-format +msgid "%1$s groups, page %2$d" +msgstr "%s membre/s en el grup, pàgina %d" + #: actions/usergroups.php:130 msgid "Search for more groups" msgstr "Cerca més grups" @@ -4280,7 +4333,7 @@ msgstr "" msgid "Plugins" msgstr "Connectors" -#: actions/version.php:196 lib/action.php:741 +#: actions/version.php:196 lib/action.php:747 #, fuzzy msgid "Version" msgstr "Sessions" @@ -4339,28 +4392,28 @@ msgstr "No s'ha pogut inserir el missatge." msgid "Could not update message with new URI." msgstr "No s'ha pogut inserir el missatge amb la nova URI." -#: classes/Notice.php:171 +#: classes/Notice.php:157 #, php-format msgid "DB error inserting hashtag: %s" msgstr "Hashtag de l'error de la base de dades:%s" -#: classes/Notice.php:225 +#: classes/Notice.php:214 #, fuzzy msgid "Problem saving notice. Too long." msgstr "Problema en guardar l'avís." -#: classes/Notice.php:229 +#: classes/Notice.php:218 msgid "Problem saving notice. Unknown user." msgstr "Problema al guardar la notificació. Usuari desconegut." -#: classes/Notice.php:234 +#: classes/Notice.php:223 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Masses notificacions massa ràpid; pren un respir i publica de nou en uns " "minuts." -#: classes/Notice.php:240 +#: classes/Notice.php:229 #, fuzzy msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " @@ -4369,20 +4422,25 @@ msgstr "" "Masses notificacions massa ràpid; pren un respir i publica de nou en uns " "minuts." -#: classes/Notice.php:246 +#: classes/Notice.php:235 msgid "You are banned from posting notices on this site." msgstr "Ha estat bandejat de publicar notificacions en aquest lloc." -#: classes/Notice.php:305 classes/Notice.php:330 +#: classes/Notice.php:294 classes/Notice.php:319 msgid "Problem saving notice." msgstr "Problema en guardar l'avís." -#: classes/Notice.php:1059 +#: classes/Notice.php:790 +#, fuzzy +msgid "Problem saving group inbox." +msgstr "Problema en guardar l'avís." + +#: classes/Notice.php:850 #, php-format msgid "DB error inserting reply: %s" msgstr "Error de BD en inserir resposta: %s" -#: classes/Notice.php:1441 +#: classes/Notice.php:1233 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" @@ -4438,125 +4496,125 @@ msgstr "%1$s (%2$s)" msgid "Untitled page" msgstr "Pàgina sense titol" -#: lib/action.php:427 +#: lib/action.php:433 msgid "Primary site navigation" msgstr "Navegació primària del lloc" -#: lib/action.php:433 +#: lib/action.php:439 msgid "Home" msgstr "Inici" -#: lib/action.php:433 +#: lib/action.php:439 msgid "Personal profile and friends timeline" msgstr "Perfil personal i línia temporal dels amics" -#: lib/action.php:435 +#: lib/action.php:441 msgid "Change your email, avatar, password, profile" msgstr "Canviar correu electrònic, avatar, contrasenya, perfil" -#: lib/action.php:438 +#: lib/action.php:444 msgid "Connect" msgstr "Connexió" -#: lib/action.php:438 +#: lib/action.php:444 #, fuzzy msgid "Connect to services" msgstr "No s'ha pogut redirigir al servidor: %s" -#: lib/action.php:442 +#: lib/action.php:448 msgid "Change site configuration" msgstr "Canvia la configuració del lloc" -#: lib/action.php:446 lib/subgroupnav.php:105 +#: lib/action.php:452 lib/subgroupnav.php:105 msgid "Invite" msgstr "Convida" -#: lib/action.php:447 lib/subgroupnav.php:106 +#: lib/action.php:453 lib/subgroupnav.php:106 #, php-format msgid "Invite friends and colleagues to join you on %s" msgstr "Convidar amics i companys perquè participin a %s" -#: lib/action.php:452 +#: lib/action.php:458 msgid "Logout" msgstr "Finalitza la sessió" -#: lib/action.php:452 +#: lib/action.php:458 msgid "Logout from the site" msgstr "Finalitza la sessió del lloc" -#: lib/action.php:457 +#: lib/action.php:463 msgid "Create an account" msgstr "Crea un compte" -#: lib/action.php:460 +#: lib/action.php:466 msgid "Login to the site" msgstr "Inicia una sessió al lloc" -#: lib/action.php:463 lib/action.php:726 +#: lib/action.php:469 lib/action.php:732 msgid "Help" msgstr "Ajuda" -#: lib/action.php:463 +#: lib/action.php:469 msgid "Help me!" msgstr "Ajuda'm" -#: lib/action.php:466 lib/searchaction.php:127 +#: lib/action.php:472 lib/searchaction.php:127 msgid "Search" msgstr "Cerca" -#: lib/action.php:466 +#: lib/action.php:472 msgid "Search for people or text" msgstr "Cerca gent o text" -#: lib/action.php:487 +#: lib/action.php:493 msgid "Site notice" msgstr "Avís del lloc" -#: lib/action.php:553 +#: lib/action.php:559 msgid "Local views" msgstr "Vistes locals" -#: lib/action.php:619 +#: lib/action.php:625 msgid "Page notice" msgstr "Notificació pàgina" -#: lib/action.php:721 +#: lib/action.php:727 msgid "Secondary site navigation" msgstr "Navegació del lloc secundària" -#: lib/action.php:728 +#: lib/action.php:734 msgid "About" msgstr "Quant a" -#: lib/action.php:730 +#: lib/action.php:736 msgid "FAQ" msgstr "Preguntes més freqüents" -#: lib/action.php:734 +#: lib/action.php:740 msgid "TOS" msgstr "" -#: lib/action.php:737 +#: lib/action.php:743 msgid "Privacy" msgstr "Privadesa" -#: lib/action.php:739 +#: lib/action.php:745 msgid "Source" msgstr "Font" -#: lib/action.php:743 +#: lib/action.php:749 msgid "Contact" msgstr "Contacte" -#: lib/action.php:745 +#: lib/action.php:751 msgid "Badge" msgstr "Insígnia" -#: lib/action.php:773 +#: lib/action.php:779 msgid "StatusNet software license" msgstr "Llicència del programari StatusNet" -#: lib/action.php:776 +#: lib/action.php:782 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -4565,12 +4623,12 @@ msgstr "" "**%%site.name%%** és un servei de microblogging de [%%site.broughtby%%**](%%" "site.broughtbyurl%%)." -#: lib/action.php:778 +#: lib/action.php:784 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "**%%site.name%%** és un servei de microblogging." -#: lib/action.php:780 +#: lib/action.php:786 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4581,41 +4639,41 @@ msgstr "" "%s, disponible sota la [GNU Affero General Public License](http://www.fsf." "org/licensing/licenses/agpl-3.0.html)." -#: lib/action.php:795 +#: lib/action.php:801 msgid "Site content license" msgstr "Llicència de contingut del lloc" -#: lib/action.php:800 +#: lib/action.php:806 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "" -#: lib/action.php:805 +#: lib/action.php:811 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" -#: lib/action.php:808 +#: lib/action.php:814 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" -#: lib/action.php:820 +#: lib/action.php:826 msgid "All " msgstr "Tot " -#: lib/action.php:825 +#: lib/action.php:831 msgid "license." msgstr "llicència." -#: lib/action.php:1124 +#: lib/action.php:1130 msgid "Pagination" msgstr "Paginació" -#: lib/action.php:1133 +#: lib/action.php:1139 msgid "After" msgstr "Posteriors" -#: lib/action.php:1141 +#: lib/action.php:1147 msgid "Before" msgstr "Anteriors" @@ -4651,10 +4709,24 @@ msgstr "Configuració bàsica del lloc" msgid "Design configuration" msgstr "Configuració del disseny" -#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327 +#: lib/adminpanelaction.php:322 +#, fuzzy +msgid "User configuration" +msgstr "Configuració dels camins" + +#: lib/adminpanelaction.php:327 +#, fuzzy +msgid "Access configuration" +msgstr "Configuració del disseny" + +#: lib/adminpanelaction.php:332 msgid "Paths configuration" msgstr "Configuració dels camins" +#: lib/applicationeditform.php:136 +msgid "Edit application" +msgstr "" + #: lib/applicationeditform.php:186 msgid "Icon for this application" msgstr "" @@ -5044,13 +5116,12 @@ msgid "Updates by SMS" msgstr "Actualitzacions per SMS" #: lib/connectsettingsaction.php:120 -#, fuzzy msgid "Connections" -msgstr "Connexió" +msgstr "Connexions" #: lib/connectsettingsaction.php:121 msgid "Authorized connected applications" -msgstr "" +msgstr "Aplicacions de connexió autoritzades" #: lib/dberroraction.php:60 msgid "Database error" @@ -5111,9 +5182,8 @@ msgid "All" msgstr "Tot" #: lib/galleryaction.php:139 -#, fuzzy msgid "Select tag to filter" -msgstr "Selecciona un transport" +msgstr "Seleccioneu l'etiqueta per filtrar" #: lib/galleryaction.php:140 msgid "Tag" @@ -5132,14 +5202,13 @@ msgid "URL of the homepage or blog of the group or topic" msgstr "URL del teu web, blog del grup u tema" #: lib/groupeditform.php:168 -#, fuzzy msgid "Describe the group or topic" -msgstr "Descriu el grup amb 140 caràcters" +msgstr "Descriviu el grup o el tema" #: lib/groupeditform.php:170 -#, fuzzy, php-format +#, php-format msgid "Describe the group or topic in %d characters" -msgstr "Descriu el grup amb 140 caràcters" +msgstr "Descriviu el grup o el tema en %d caràcters" #: lib/groupeditform.php:179 msgid "" @@ -5161,9 +5230,9 @@ msgid "Blocked" msgstr "Blocat" #: lib/groupnav.php:102 -#, fuzzy, php-format +#, php-format msgid "%s blocked users" -msgstr "Usuari bloquejat." +msgstr "%susuaris blocats" #: lib/groupnav.php:108 #, php-format @@ -5180,9 +5249,9 @@ msgid "Add or edit %s logo" msgstr "Afegir o editar logo %s" #: lib/groupnav.php:120 -#, fuzzy, php-format +#, php-format msgid "Add or edit %s design" -msgstr "Afegir o editar logo %s" +msgstr "Afegeix o edita el disseny %s" #: lib/groupsbymemberssection.php:71 msgid "Groups with most members" @@ -5232,18 +5301,18 @@ msgstr "Tipus de fitxer desconegut" #: lib/imagefile.php:217 msgid "MB" -msgstr "" +msgstr "MB" #: lib/imagefile.php:219 msgid "kB" -msgstr "" +msgstr "kB" -#: lib/jabber.php:202 +#: lib/jabber.php:220 #, php-format msgid "[%s]" msgstr "" -#: lib/jabber.php:385 +#: lib/jabber.php:400 #, fuzzy, php-format msgid "Unknown inbox source %d." msgstr "Llengua desconeguda «%s»" @@ -5673,19 +5742,19 @@ msgstr "Respostes" msgid "Favorites" msgstr "Preferits" -#: lib/personalgroupnav.php:124 +#: lib/personalgroupnav.php:125 msgid "Inbox" msgstr "Safata d'entrada" -#: lib/personalgroupnav.php:125 +#: lib/personalgroupnav.php:126 msgid "Your incoming messages" msgstr "Els teus missatges rebuts" -#: lib/personalgroupnav.php:129 +#: lib/personalgroupnav.php:130 msgid "Outbox" msgstr "Safata de sortida" -#: lib/personalgroupnav.php:130 +#: lib/personalgroupnav.php:131 msgid "Your sent messages" msgstr "Els teus missatges enviats" @@ -5935,47 +6004,47 @@ msgstr "Missatge" msgid "Moderate" msgstr "Modera" -#: lib/util.php:875 +#: lib/util.php:868 msgid "a few seconds ago" msgstr "fa pocs segons" -#: lib/util.php:877 +#: lib/util.php:870 msgid "about a minute ago" msgstr "fa un minut" -#: lib/util.php:879 +#: lib/util.php:872 #, php-format msgid "about %d minutes ago" msgstr "fa %d minuts" -#: lib/util.php:881 +#: lib/util.php:874 msgid "about an hour ago" msgstr "fa una hora" -#: lib/util.php:883 +#: lib/util.php:876 #, php-format msgid "about %d hours ago" msgstr "fa %d hores" -#: lib/util.php:885 +#: lib/util.php:878 msgid "about a day ago" msgstr "fa un dia" -#: lib/util.php:887 +#: lib/util.php:880 #, php-format msgid "about %d days ago" msgstr "fa %d dies" -#: lib/util.php:889 +#: lib/util.php:882 msgid "about a month ago" msgstr "fa un mes" -#: lib/util.php:891 +#: lib/util.php:884 #, php-format msgid "about %d months ago" msgstr "fa %d mesos" -#: lib/util.php:893 +#: lib/util.php:886 msgid "about a year ago" msgstr "fa un any" @@ -5989,7 +6058,7 @@ msgstr "%s no és un color vàlid!" msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "%s no és un color vàlid! Feu servir 3 o 6 caràcters hexadecimals." -#: scripts/xmppdaemon.php:301 +#: lib/xmppmanager.php:402 #, fuzzy, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "Missatge massa llarg - màxim és 140 caràcters, tu has enviat %d" diff --git a/locale/cs/LC_MESSAGES/statusnet.po b/locale/cs/LC_MESSAGES/statusnet.po index 6fbec682bd..9059001d72 100644 --- a/locale/cs/LC_MESSAGES/statusnet.po +++ b/locale/cs/LC_MESSAGES/statusnet.po @@ -9,17 +9,74 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-21 22:36+0000\n" -"PO-Revision-Date: 2010-01-21 22:37:13+0000\n" +"POT-Creation-Date: 2010-01-27 23:58+0000\n" +"PO-Revision-Date: 2010-01-27 23:58:33+0000\n" "Language-Team: Czech\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r61339); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61595); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: cs\n" "X-Message-Group: out-statusnet\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n< =4) ? 1 : 2 ;\n" +#: actions/accessadminpanel.php:54 lib/adminpanelaction.php:326 +#, fuzzy +msgid "Access" +msgstr "Přijmout" + +#: actions/accessadminpanel.php:65 +#, fuzzy +msgid "Site access settings" +msgstr "Nastavení" + +#: actions/accessadminpanel.php:158 +#, fuzzy +msgid "Registration" +msgstr "Registrovat" + +#: actions/accessadminpanel.php:161 +#, fuzzy +msgid "Private" +msgstr "Soukromí" + +#: actions/accessadminpanel.php:163 +msgid "Prohibit anonymous users (not logged in) from viewing site?" +msgstr "" + +#: actions/accessadminpanel.php:167 +msgid "Invite only" +msgstr "" + +#: actions/accessadminpanel.php:169 +msgid "Make registration invitation only." +msgstr "" + +#: actions/accessadminpanel.php:173 +#, fuzzy +msgid "Closed" +msgstr "Žádný takový uživatel." + +#: actions/accessadminpanel.php:175 +msgid "Disable new registrations." +msgstr "" + +#: actions/accessadminpanel.php:189 actions/designadminpanel.php:586 +#: actions/emailsettings.php:195 actions/imsettings.php:163 +#: actions/othersettings.php:126 actions/pathsadminpanel.php:351 +#: actions/profilesettings.php:174 actions/siteadminpanel.php:336 +#: actions/smssettings.php:181 actions/subscriptions.php:203 +#: actions/tagother.php:154 actions/useradminpanel.php:313 +#: lib/applicationeditform.php:335 lib/applicationeditform.php:336 +#: lib/designsettings.php:256 lib/groupeditform.php:202 +msgid "Save" +msgstr "Uložit" + +#: actions/accessadminpanel.php:189 +#, fuzzy +msgid "Save access settings" +msgstr "Nastavení" + #: actions/all.php:63 actions/public.php:97 actions/replies.php:92 #: actions/showfavorites.php:137 actions/tag.php:51 #, fuzzy @@ -35,7 +92,7 @@ msgstr "Žádné takové oznámení." #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:149 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 @@ -135,8 +192,7 @@ msgstr "" #: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 #: actions/apitimelinefriends.php:155 actions/apitimelinegroup.php:150 #: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 -#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 #, fuzzy @@ -153,7 +209,7 @@ msgstr "Potvrzující kód nebyl nalezen" #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:119 +#: actions/apistatusesupdate.php:118 msgid "This method requires a POST." msgstr "" @@ -184,7 +240,7 @@ msgstr "Nelze uložit profil" #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:132 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 #: actions/designadminpanel.php:122 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -493,7 +549,14 @@ msgstr "" msgid "Allow or deny access" msgstr "" -#: actions/apioauthauthorize.php:320 lib/action.php:435 +#: actions/apioauthauthorize.php:306 +#, php-format +msgid "" +"The application %s by %s would like the " +"ability to %s your account data." +msgstr "" + +#: actions/apioauthauthorize.php:320 lib/action.php:441 #, fuzzy msgid "Account" msgstr "O nás" @@ -555,17 +618,17 @@ msgstr "Obrázek nahrán" msgid "No status with that ID found." msgstr "" -#: actions/apistatusesupdate.php:162 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Je to příliš dlouhé. Maximální sdělení délka je 140 znaků" -#: actions/apistatusesupdate.php:203 +#: actions/apistatusesupdate.php:202 msgid "Not found" msgstr "" -#: actions/apistatusesupdate.php:226 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -617,11 +680,6 @@ msgstr "" msgid "%s updates from everyone!" msgstr "" -#: actions/apitimelineretweetedbyme.php:112 -#, php-format -msgid "Repeated by %s" -msgstr "" - #: actions/apitimelineretweetedtome.php:111 #, fuzzy, php-format msgid "Repeated to %s" @@ -1040,17 +1098,6 @@ msgstr "" msgid "Reset back to default" msgstr "" -#: actions/designadminpanel.php:586 actions/emailsettings.php:195 -#: actions/imsettings.php:163 actions/othersettings.php:126 -#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174 -#: actions/siteadminpanel.php:388 actions/smssettings.php:181 -#: actions/subscriptions.php:203 actions/tagother.php:154 -#: actions/useradminpanel.php:313 lib/applicationeditform.php:335 -#: lib/applicationeditform.php:336 lib/designsettings.php:256 -#: lib/groupeditform.php:202 -msgid "Save" -msgstr "Uložit" - #: actions/designadminpanel.php:587 lib/designsettings.php:257 msgid "Save design" msgstr "" @@ -1063,13 +1110,15 @@ msgstr "" msgid "Add to favorites" msgstr "Přidat do oblíbených" -#: actions/doc.php:69 -msgid "No such document." +#: actions/doc.php:155 +#, fuzzy, php-format +msgid "No such document \"%s\"" msgstr "Žádný takový dokument." -#: actions/editapplication.php:54 lib/applicationeditform.php:136 -msgid "Edit application" -msgstr "" +#: actions/editapplication.php:54 +#, fuzzy +msgid "Edit Application" +msgstr "Sdělení nemá profil" #: actions/editapplication.php:66 msgid "You must be logged in to edit an application." @@ -1087,7 +1136,7 @@ msgid "No such application." msgstr "Žádné takové oznámení." #: actions/editapplication.php:127 actions/newapplication.php:110 -#: actions/showapplication.php:118 lib/action.php:1189 +#: actions/showapplication.php:118 lib/action.php:1195 msgid "There was a problem with your session token." msgstr "" @@ -1295,7 +1344,7 @@ msgid "Cannot normalize that email address" msgstr "" #: actions/emailsettings.php:331 actions/register.php:201 -#: actions/siteadminpanel.php:157 +#: actions/siteadminpanel.php:143 msgid "Not a valid email address." msgstr "Není platnou mailovou adresou." @@ -1307,7 +1356,7 @@ msgstr "" msgid "That email address already belongs to another user." msgstr "" -#: actions/emailsettings.php:353 actions/imsettings.php:317 +#: actions/emailsettings.php:353 actions/imsettings.php:319 #: actions/smssettings.php:337 msgid "Couldn't insert confirmation code." msgstr "Nelze vložit potvrzující kód" @@ -1621,7 +1670,7 @@ msgstr "" msgid "A list of the users in this group." msgstr "" -#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107 +#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107 msgid "Admin" msgstr "" @@ -1814,6 +1863,11 @@ msgstr "" msgid "That is not your Jabber ID." msgstr "Toto není váš Jabber" +#: actions/inbox.php:59 +#, php-format +msgid "Inbox for %1$s - page %2$d" +msgstr "" + #: actions/inbox.php:62 #, php-format msgid "Inbox for %s" @@ -1966,7 +2020,7 @@ msgstr "Neplatné jméno nebo heslo" msgid "Error setting user. You are probably not authorized." msgstr "Neautorizován." -#: actions/login.php:188 actions/login.php:241 lib/action.php:460 +#: actions/login.php:188 actions/login.php:241 lib/action.php:466 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Přihlásit" @@ -2027,8 +2081,9 @@ msgid "No current status" msgstr "" #: actions/newapplication.php:52 -msgid "New application" -msgstr "" +#, fuzzy +msgid "New Application" +msgstr "Žádné takové oznámení." #: actions/newapplication.php:64 msgid "You must be logged in to register an application." @@ -2215,8 +2270,8 @@ msgstr "Připojit" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1038 -#: lib/api.php:1066 lib/api.php:1176 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1039 +#: lib/api.php:1067 lib/api.php:1177 msgid "Not a supported data format." msgstr "" @@ -2287,6 +2342,11 @@ msgstr "Neplatný obsah sdělení" msgid "Login token expired." msgstr "" +#: actions/outbox.php:58 +#, php-format +msgid "Outbox for %1$s - page %2$d" +msgstr "" + #: actions/outbox.php:61 #, php-format msgid "Outbox for %s" @@ -2359,7 +2419,7 @@ msgstr "Nelze uložit nové heslo" msgid "Password saved." msgstr "Heslo uloženo" -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:331 msgid "Paths" msgstr "" @@ -2367,140 +2427,157 @@ msgstr "" msgid "Path and server settings for this StatusNet site." msgstr "" -#: actions/pathsadminpanel.php:140 +#: actions/pathsadminpanel.php:157 #, 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/pathsadminpanel.php:146 +#: actions/pathsadminpanel.php:163 #, php-format msgid "Avatar directory not writable: %s" msgstr "" -#: actions/pathsadminpanel.php:152 +#: actions/pathsadminpanel.php:169 #, php-format msgid "Background directory not writable: %s" msgstr "" -#: actions/pathsadminpanel.php:160 +#: actions/pathsadminpanel.php:177 #, php-format msgid "Locales directory not readable: %s" msgstr "" -#: actions/pathsadminpanel.php:166 +#: actions/pathsadminpanel.php:183 msgid "Invalid SSL server. The maximum length is 255 characters." msgstr "" -#: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58 +#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58 #: lib/adminpanelaction.php:311 msgid "Site" msgstr "" -#: actions/pathsadminpanel.php:221 +#: actions/pathsadminpanel.php:238 +#, fuzzy +msgid "Server" +msgstr "Obnovit" + +#: actions/pathsadminpanel.php:238 +msgid "Site's server hostname." +msgstr "" + +#: actions/pathsadminpanel.php:242 msgid "Path" msgstr "" -#: actions/pathsadminpanel.php:221 +#: actions/pathsadminpanel.php:242 #, fuzzy msgid "Site path" msgstr "Nové sdělení" -#: actions/pathsadminpanel.php:225 +#: actions/pathsadminpanel.php:246 msgid "Path to locales" msgstr "" -#: actions/pathsadminpanel.php:225 +#: actions/pathsadminpanel.php:246 msgid "Directory path to locales" msgstr "" -#: actions/pathsadminpanel.php:232 -msgid "Theme" -msgstr "" - -#: actions/pathsadminpanel.php:237 -msgid "Theme server" -msgstr "" - -#: actions/pathsadminpanel.php:241 -msgid "Theme path" -msgstr "" - -#: actions/pathsadminpanel.php:245 -msgid "Theme directory" +#: actions/pathsadminpanel.php:250 +msgid "Fancy URLs" msgstr "" #: actions/pathsadminpanel.php:252 +msgid "Use fancy (more readable and memorable) URLs?" +msgstr "" + +#: actions/pathsadminpanel.php:259 +msgid "Theme" +msgstr "" + +#: actions/pathsadminpanel.php:264 +msgid "Theme server" +msgstr "" + +#: actions/pathsadminpanel.php:268 +msgid "Theme path" +msgstr "" + +#: actions/pathsadminpanel.php:272 +msgid "Theme directory" +msgstr "" + +#: actions/pathsadminpanel.php:279 #, fuzzy msgid "Avatars" msgstr "Obrázek" -#: actions/pathsadminpanel.php:257 +#: actions/pathsadminpanel.php:284 #, fuzzy msgid "Avatar server" msgstr "Nastavení" -#: actions/pathsadminpanel.php:261 +#: actions/pathsadminpanel.php:288 #, fuzzy msgid "Avatar path" msgstr "Obrázek nahrán" -#: actions/pathsadminpanel.php:265 +#: actions/pathsadminpanel.php:292 #, fuzzy msgid "Avatar directory" msgstr "Obrázek nahrán" -#: actions/pathsadminpanel.php:274 +#: actions/pathsadminpanel.php:301 msgid "Backgrounds" msgstr "" -#: actions/pathsadminpanel.php:278 +#: actions/pathsadminpanel.php:305 msgid "Background server" msgstr "" -#: actions/pathsadminpanel.php:282 +#: actions/pathsadminpanel.php:309 msgid "Background path" msgstr "" -#: actions/pathsadminpanel.php:286 +#: actions/pathsadminpanel.php:313 msgid "Background directory" msgstr "" -#: actions/pathsadminpanel.php:293 +#: actions/pathsadminpanel.php:320 msgid "SSL" msgstr "" -#: actions/pathsadminpanel.php:296 actions/siteadminpanel.php:346 +#: actions/pathsadminpanel.php:323 actions/siteadminpanel.php:294 #, fuzzy msgid "Never" msgstr "Obnovit" -#: actions/pathsadminpanel.php:297 +#: actions/pathsadminpanel.php:324 #, fuzzy msgid "Sometimes" msgstr "Sdělení" -#: actions/pathsadminpanel.php:298 +#: actions/pathsadminpanel.php:325 msgid "Always" msgstr "" -#: actions/pathsadminpanel.php:302 +#: actions/pathsadminpanel.php:329 msgid "Use SSL" msgstr "" -#: actions/pathsadminpanel.php:303 +#: actions/pathsadminpanel.php:330 msgid "When to use SSL" msgstr "" -#: actions/pathsadminpanel.php:308 +#: actions/pathsadminpanel.php:335 #, fuzzy msgid "SSL server" msgstr "Obnovit" -#: actions/pathsadminpanel.php:309 +#: actions/pathsadminpanel.php:336 msgid "Server to direct SSL requests to" msgstr "" -#: actions/pathsadminpanel.php:325 +#: actions/pathsadminpanel.php:352 #, fuzzy msgid "Save paths" msgstr "Nové sdělení" @@ -2611,7 +2688,7 @@ msgid "" "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated" msgstr "" -#: actions/profilesettings.php:151 actions/siteadminpanel.php:294 +#: actions/profilesettings.php:151 actions/siteadminpanel.php:280 msgid "Language" msgstr "Jazyk" @@ -2637,7 +2714,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:235 actions/siteadminpanel.php:164 +#: actions/profilesettings.php:235 actions/siteadminpanel.php:150 msgid "Timezone not selected." msgstr "" @@ -2904,7 +2981,7 @@ msgstr "Chyba v ověřovacím kódu" msgid "Registration successful" msgstr "Registrace úspěšná" -#: actions/register.php:114 actions/register.php:503 lib/action.php:457 +#: actions/register.php:114 actions/register.php:503 lib/action.php:463 #: lib/logingroupnav.php:85 msgid "Register" msgstr "Registrovat" @@ -2944,7 +3021,7 @@ msgid "Same as password above. Required." msgstr "" #: actions/register.php:438 actions/register.php:442 -#: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120 +#: actions/siteadminpanel.php:256 lib/accountsettingsaction.php:120 msgid "Email" msgstr "Email" @@ -3092,6 +3169,11 @@ msgstr "Vytvořit" msgid "Replies to %s" msgstr "Odpovědi na %s" +#: actions/replies.php:127 +#, fuzzy, php-format +msgid "Replies to %1$s, page %2$d" +msgstr "Odpovědi na %s" + #: actions/replies.php:144 #, fuzzy, php-format msgid "Replies feed for %s (RSS 1.0)" @@ -3221,6 +3303,11 @@ msgid "" "signature method." msgstr "" +#: actions/showfavorites.php:79 +#, fuzzy, php-format +msgid "%1$s's favorite notices, page %2$d" +msgstr "%s a přátelé" + #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "" @@ -3270,6 +3357,11 @@ msgstr "" msgid "%s group" msgstr "" +#: actions/showgroup.php:84 +#, fuzzy, php-format +msgid "%1$s group, page %2$d" +msgstr "Všechny odběry" + #: actions/showgroup.php:218 #, fuzzy msgid "Group profile" @@ -3384,6 +3476,11 @@ msgstr "Sdělení" msgid " tagged %s" msgstr "" +#: actions/showstream.php:79 +#, fuzzy, php-format +msgid "%1$s, page %2$d" +msgstr "%s a přátelé" + #: actions/showstream.php:122 #, fuzzy, php-format msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" @@ -3462,200 +3559,148 @@ msgstr "Uživatel nemá profil." msgid "Basic settings for this StatusNet site." msgstr "" -#: actions/siteadminpanel.php:146 +#: actions/siteadminpanel.php:132 msgid "Site name must have non-zero length." msgstr "" -#: actions/siteadminpanel.php:154 +#: actions/siteadminpanel.php:140 #, fuzzy msgid "You must have a valid contact email address." msgstr "Není platnou mailovou adresou." -#: actions/siteadminpanel.php:172 +#: actions/siteadminpanel.php:158 #, php-format msgid "Unknown language \"%s\"." msgstr "" -#: actions/siteadminpanel.php:179 +#: actions/siteadminpanel.php:165 msgid "Invalid snapshot report URL." msgstr "" -#: actions/siteadminpanel.php:185 +#: actions/siteadminpanel.php:171 msgid "Invalid snapshot run value." msgstr "" -#: actions/siteadminpanel.php:191 +#: actions/siteadminpanel.php:177 msgid "Snapshot frequency must be a number." msgstr "" -#: actions/siteadminpanel.php:197 +#: actions/siteadminpanel.php:183 msgid "Minimum text limit is 140 characters." msgstr "" -#: actions/siteadminpanel.php:203 +#: actions/siteadminpanel.php:189 msgid "Dupe limit must 1 or more seconds." msgstr "" -#: actions/siteadminpanel.php:253 +#: actions/siteadminpanel.php:239 msgid "General" msgstr "" -#: actions/siteadminpanel.php:256 +#: actions/siteadminpanel.php:242 #, fuzzy msgid "Site name" msgstr "Nové sdělení" -#: actions/siteadminpanel.php:257 +#: actions/siteadminpanel.php:243 msgid "The name of your site, like \"Yourcompany Microblog\"" msgstr "" -#: actions/siteadminpanel.php:261 +#: actions/siteadminpanel.php:247 msgid "Brought by" msgstr "" -#: actions/siteadminpanel.php:262 +#: actions/siteadminpanel.php:248 msgid "Text used for credits link in footer of each page" msgstr "" -#: actions/siteadminpanel.php:266 +#: actions/siteadminpanel.php:252 msgid "Brought by URL" msgstr "" -#: actions/siteadminpanel.php:267 +#: actions/siteadminpanel.php:253 msgid "URL used for credits link in footer of each page" msgstr "" -#: actions/siteadminpanel.php:271 +#: actions/siteadminpanel.php:257 #, fuzzy msgid "Contact email address for your site" msgstr "Žádný registrovaný email pro tohoto uživatele." -#: actions/siteadminpanel.php:277 +#: actions/siteadminpanel.php:263 #, fuzzy msgid "Local" msgstr "Umístění" -#: actions/siteadminpanel.php:288 +#: actions/siteadminpanel.php:274 msgid "Default timezone" msgstr "" -#: actions/siteadminpanel.php:289 +#: actions/siteadminpanel.php:275 msgid "Default timezone for the site; usually UTC." msgstr "" -#: actions/siteadminpanel.php:295 +#: actions/siteadminpanel.php:281 msgid "Default site language" msgstr "" -#: actions/siteadminpanel.php:303 -msgid "URLs" -msgstr "" - -#: actions/siteadminpanel.php:306 -#, fuzzy -msgid "Server" -msgstr "Obnovit" - -#: actions/siteadminpanel.php:306 -msgid "Site's server hostname." -msgstr "" - -#: actions/siteadminpanel.php:310 -msgid "Fancy URLs" -msgstr "" - -#: actions/siteadminpanel.php:312 -msgid "Use fancy (more readable and memorable) URLs?" -msgstr "" - -#: actions/siteadminpanel.php:318 -#, fuzzy -msgid "Access" -msgstr "Přijmout" - -#: actions/siteadminpanel.php:321 -#, fuzzy -msgid "Private" -msgstr "Soukromí" - -#: actions/siteadminpanel.php:323 -msgid "Prohibit anonymous users (not logged in) from viewing site?" -msgstr "" - -#: actions/siteadminpanel.php:327 -msgid "Invite only" -msgstr "" - -#: actions/siteadminpanel.php:329 -msgid "Make registration invitation only." -msgstr "" - -#: actions/siteadminpanel.php:333 -#, fuzzy -msgid "Closed" -msgstr "Žádný takový uživatel." - -#: actions/siteadminpanel.php:335 -msgid "Disable new registrations." -msgstr "" - -#: actions/siteadminpanel.php:341 +#: actions/siteadminpanel.php:289 msgid "Snapshots" msgstr "" -#: actions/siteadminpanel.php:344 +#: actions/siteadminpanel.php:292 msgid "Randomly during Web hit" msgstr "" -#: actions/siteadminpanel.php:345 +#: actions/siteadminpanel.php:293 msgid "In a scheduled job" msgstr "" -#: actions/siteadminpanel.php:347 +#: actions/siteadminpanel.php:295 msgid "Data snapshots" msgstr "" -#: actions/siteadminpanel.php:348 +#: actions/siteadminpanel.php:296 msgid "When to send statistical data to status.net servers" msgstr "" -#: actions/siteadminpanel.php:353 +#: actions/siteadminpanel.php:301 msgid "Frequency" msgstr "" -#: actions/siteadminpanel.php:354 +#: actions/siteadminpanel.php:302 msgid "Snapshots will be sent once every N web hits" msgstr "" -#: actions/siteadminpanel.php:359 +#: actions/siteadminpanel.php:307 msgid "Report URL" msgstr "" -#: actions/siteadminpanel.php:360 +#: actions/siteadminpanel.php:308 msgid "Snapshots will be sent to this URL" msgstr "" -#: actions/siteadminpanel.php:367 +#: actions/siteadminpanel.php:315 msgid "Limits" msgstr "" -#: actions/siteadminpanel.php:370 +#: actions/siteadminpanel.php:318 msgid "Text limit" msgstr "" -#: actions/siteadminpanel.php:370 +#: actions/siteadminpanel.php:318 msgid "Maximum number of characters for notices." msgstr "" -#: actions/siteadminpanel.php:374 +#: actions/siteadminpanel.php:322 msgid "Dupe limit" msgstr "" -#: actions/siteadminpanel.php:374 +#: actions/siteadminpanel.php:322 msgid "How long users must wait (in seconds) to post the same thing again." msgstr "" -#: actions/siteadminpanel.php:388 actions/useradminpanel.php:313 +#: actions/siteadminpanel.php:336 actions/useradminpanel.php:313 #, fuzzy msgid "Save site settings" msgstr "Nastavení" @@ -3856,6 +3901,11 @@ msgstr "Žádné Jabber ID." msgid "SMS" msgstr "" +#: actions/tag.php:68 +#, fuzzy, php-format +msgid "Notices tagged with %1$s, page %2$d" +msgstr "Mikroblog od %s" + #: actions/tag.php:86 #, fuzzy, php-format msgid "Notice feed for tag %s (RSS 1.0)" @@ -4165,6 +4215,11 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "" +#: actions/usergroups.php:64 +#, fuzzy, php-format +msgid "%1$s groups, page %2$d" +msgstr "Všechny odběry" + #: actions/usergroups.php:130 msgid "Search for more groups" msgstr "" @@ -4227,7 +4282,7 @@ msgstr "" msgid "Plugins" msgstr "" -#: actions/version.php:196 lib/action.php:741 +#: actions/version.php:196 lib/action.php:747 #, fuzzy msgid "Version" msgstr "Osobní" @@ -4285,46 +4340,51 @@ msgstr "" msgid "Could not update message with new URI." msgstr "" -#: classes/Notice.php:171 +#: classes/Notice.php:157 #, php-format msgid "DB error inserting hashtag: %s" msgstr "" -#: classes/Notice.php:225 +#: classes/Notice.php:214 #, fuzzy msgid "Problem saving notice. Too long." msgstr "Problém při ukládání sdělení" -#: classes/Notice.php:229 +#: classes/Notice.php:218 #, fuzzy msgid "Problem saving notice. Unknown user." msgstr "Problém při ukládání sdělení" -#: classes/Notice.php:234 +#: classes/Notice.php:223 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:240 +#: classes/Notice.php:229 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:246 +#: classes/Notice.php:235 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:305 classes/Notice.php:330 +#: classes/Notice.php:294 classes/Notice.php:319 msgid "Problem saving notice." msgstr "Problém při ukládání sdělení" -#: classes/Notice.php:1059 +#: classes/Notice.php:790 +#, fuzzy +msgid "Problem saving group inbox." +msgstr "Problém při ukládání sdělení" + +#: classes/Notice.php:850 #, php-format msgid "DB error inserting reply: %s" msgstr "Chyba v DB při vkládání odpovědi: %s" -#: classes/Notice.php:1441 +#: classes/Notice.php:1233 #, php-format msgid "RT @%1$s %2$s" msgstr "" @@ -4383,130 +4443,130 @@ msgstr "%1 statusů na %2" msgid "Untitled page" msgstr "" -#: lib/action.php:427 +#: lib/action.php:433 msgid "Primary site navigation" msgstr "" -#: lib/action.php:433 +#: lib/action.php:439 msgid "Home" msgstr "Domů" -#: lib/action.php:433 +#: lib/action.php:439 msgid "Personal profile and friends timeline" msgstr "" -#: lib/action.php:435 +#: lib/action.php:441 msgid "Change your email, avatar, password, profile" msgstr "" -#: lib/action.php:438 +#: lib/action.php:444 msgid "Connect" msgstr "Připojit" -#: lib/action.php:438 +#: lib/action.php:444 #, fuzzy msgid "Connect to services" msgstr "Nelze přesměrovat na server: %s" -#: lib/action.php:442 +#: lib/action.php:448 #, fuzzy msgid "Change site configuration" msgstr "Odběry" -#: lib/action.php:446 lib/subgroupnav.php:105 +#: lib/action.php:452 lib/subgroupnav.php:105 msgid "Invite" msgstr "" -#: lib/action.php:447 lib/subgroupnav.php:106 +#: lib/action.php:453 lib/subgroupnav.php:106 #, php-format msgid "Invite friends and colleagues to join you on %s" msgstr "" -#: lib/action.php:452 +#: lib/action.php:458 msgid "Logout" msgstr "Odhlásit" -#: lib/action.php:452 +#: lib/action.php:458 msgid "Logout from the site" msgstr "" -#: lib/action.php:457 +#: lib/action.php:463 #, fuzzy msgid "Create an account" msgstr "Vytvořit nový účet" -#: lib/action.php:460 +#: lib/action.php:466 msgid "Login to the site" msgstr "" -#: lib/action.php:463 lib/action.php:726 +#: lib/action.php:469 lib/action.php:732 msgid "Help" msgstr "Nápověda" -#: lib/action.php:463 +#: lib/action.php:469 msgid "Help me!" msgstr "Pomoci mi!" -#: lib/action.php:466 lib/searchaction.php:127 +#: lib/action.php:472 lib/searchaction.php:127 msgid "Search" msgstr "Hledat" -#: lib/action.php:466 +#: lib/action.php:472 msgid "Search for people or text" msgstr "" -#: lib/action.php:487 +#: lib/action.php:493 #, fuzzy msgid "Site notice" msgstr "Nové sdělení" -#: lib/action.php:553 +#: lib/action.php:559 msgid "Local views" msgstr "" -#: lib/action.php:619 +#: lib/action.php:625 #, fuzzy msgid "Page notice" msgstr "Nové sdělení" -#: lib/action.php:721 +#: lib/action.php:727 #, fuzzy msgid "Secondary site navigation" msgstr "Odběry" -#: lib/action.php:728 +#: lib/action.php:734 msgid "About" msgstr "O nás" -#: lib/action.php:730 +#: lib/action.php:736 msgid "FAQ" msgstr "FAQ" -#: lib/action.php:734 +#: lib/action.php:740 msgid "TOS" msgstr "" -#: lib/action.php:737 +#: lib/action.php:743 msgid "Privacy" msgstr "Soukromí" -#: lib/action.php:739 +#: lib/action.php:745 msgid "Source" msgstr "Zdroj" -#: lib/action.php:743 +#: lib/action.php:749 msgid "Contact" msgstr "Kontakt" -#: lib/action.php:745 +#: lib/action.php:751 msgid "Badge" msgstr "" -#: lib/action.php:773 +#: lib/action.php:779 msgid "StatusNet software license" msgstr "" -#: lib/action.php:776 +#: lib/action.php:782 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -4515,12 +4575,12 @@ msgstr "" "**%%site.name%%** je služba microblogů, kterou pro vás poskytuje [%%site." "broughtby%%](%%site.broughtbyurl%%). " -#: lib/action.php:778 +#: lib/action.php:784 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "**%%site.name%%** je služba mikroblogů." -#: lib/action.php:780 +#: lib/action.php:786 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4531,43 +4591,43 @@ msgstr "" "dostupná pod [GNU Affero General Public License](http://www.fsf.org/" "licensing/licenses/agpl-3.0.html)." -#: lib/action.php:795 +#: lib/action.php:801 #, fuzzy msgid "Site content license" msgstr "Nové sdělení" -#: lib/action.php:800 +#: lib/action.php:806 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "" -#: lib/action.php:805 +#: lib/action.php:811 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" -#: lib/action.php:808 +#: lib/action.php:814 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" -#: lib/action.php:820 +#: lib/action.php:826 msgid "All " msgstr "" -#: lib/action.php:825 +#: lib/action.php:831 msgid "license." msgstr "" -#: lib/action.php:1124 +#: lib/action.php:1130 msgid "Pagination" msgstr "" -#: lib/action.php:1133 +#: lib/action.php:1139 #, fuzzy msgid "After" msgstr "« Novější" -#: lib/action.php:1141 +#: lib/action.php:1147 #, fuzzy msgid "Before" msgstr "Starší »" @@ -4602,11 +4662,25 @@ msgstr "Potvrzení emailové adresy" msgid "Design configuration" msgstr "Potvrzení emailové adresy" -#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327 +#: lib/adminpanelaction.php:322 +#, fuzzy +msgid "User configuration" +msgstr "Potvrzení emailové adresy" + +#: lib/adminpanelaction.php:327 +#, fuzzy +msgid "Access configuration" +msgstr "Potvrzení emailové adresy" + +#: lib/adminpanelaction.php:332 #, fuzzy msgid "Paths configuration" msgstr "Potvrzení emailové adresy" +#: lib/applicationeditform.php:136 +msgid "Edit application" +msgstr "" + #: lib/applicationeditform.php:186 msgid "Icon for this application" msgstr "" @@ -5202,12 +5276,12 @@ msgstr "" msgid "kB" msgstr "" -#: lib/jabber.php:202 +#: lib/jabber.php:220 #, php-format msgid "[%s]" msgstr "" -#: lib/jabber.php:385 +#: lib/jabber.php:400 #, php-format msgid "Unknown inbox source %d." msgstr "" @@ -5635,19 +5709,19 @@ msgstr "Odpovědi" msgid "Favorites" msgstr "Oblíbené" -#: lib/personalgroupnav.php:124 +#: lib/personalgroupnav.php:125 msgid "Inbox" msgstr "" -#: lib/personalgroupnav.php:125 +#: lib/personalgroupnav.php:126 msgid "Your incoming messages" msgstr "" -#: lib/personalgroupnav.php:129 +#: lib/personalgroupnav.php:130 msgid "Outbox" msgstr "" -#: lib/personalgroupnav.php:130 +#: lib/personalgroupnav.php:131 msgid "Your sent messages" msgstr "" @@ -5904,47 +5978,47 @@ msgstr "Zpráva" msgid "Moderate" msgstr "" -#: lib/util.php:875 +#: lib/util.php:868 msgid "a few seconds ago" msgstr "před pár sekundami" -#: lib/util.php:877 +#: lib/util.php:870 msgid "about a minute ago" msgstr "asi před minutou" -#: lib/util.php:879 +#: lib/util.php:872 #, php-format msgid "about %d minutes ago" msgstr "asi před %d minutami" -#: lib/util.php:881 +#: lib/util.php:874 msgid "about an hour ago" msgstr "asi před hodinou" -#: lib/util.php:883 +#: lib/util.php:876 #, php-format msgid "about %d hours ago" msgstr "asi před %d hodinami" -#: lib/util.php:885 +#: lib/util.php:878 msgid "about a day ago" msgstr "asi přede dnem" -#: lib/util.php:887 +#: lib/util.php:880 #, php-format msgid "about %d days ago" msgstr "před %d dny" -#: lib/util.php:889 +#: lib/util.php:882 msgid "about a month ago" msgstr "asi před měsícem" -#: lib/util.php:891 +#: lib/util.php:884 #, php-format msgid "about %d months ago" msgstr "asi před %d mesíci" -#: lib/util.php:893 +#: lib/util.php:886 msgid "about a year ago" msgstr "asi před rokem" @@ -5958,7 +6032,7 @@ msgstr "Stránka není platnou URL." msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "" -#: scripts/xmppdaemon.php:301 +#: lib/xmppmanager.php:402 #, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" diff --git a/locale/de/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po index e1ea37636e..e000f3406f 100644 --- a/locale/de/LC_MESSAGES/statusnet.po +++ b/locale/de/LC_MESSAGES/statusnet.po @@ -12,17 +12,75 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-21 22:36+0000\n" -"PO-Revision-Date: 2010-01-21 22:37:16+0000\n" +"POT-Creation-Date: 2010-01-27 23:58+0000\n" +"PO-Revision-Date: 2010-01-27 23:58:36+0000\n" "Language-Team: German\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r61339); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61595); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: de\n" "X-Message-Group: out-statusnet\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#: actions/accessadminpanel.php:54 lib/adminpanelaction.php:326 +#, fuzzy +msgid "Access" +msgstr "Akzeptieren" + +#: actions/accessadminpanel.php:65 +#, fuzzy +msgid "Site access settings" +msgstr "Site-Einstellungen speichern" + +#: actions/accessadminpanel.php:158 +#, fuzzy +msgid "Registration" +msgstr "Registrieren" + +#: actions/accessadminpanel.php:161 +#, fuzzy +msgid "Private" +msgstr "Privatsphäre" + +#: actions/accessadminpanel.php:163 +msgid "Prohibit anonymous users (not logged in) from viewing site?" +msgstr "" + +#: actions/accessadminpanel.php:167 +#, fuzzy +msgid "Invite only" +msgstr "Einladen" + +#: actions/accessadminpanel.php:169 +msgid "Make registration invitation only." +msgstr "" + +#: actions/accessadminpanel.php:173 +#, fuzzy +msgid "Closed" +msgstr "Blockieren" + +#: actions/accessadminpanel.php:175 +msgid "Disable new registrations." +msgstr "" + +#: actions/accessadminpanel.php:189 actions/designadminpanel.php:586 +#: actions/emailsettings.php:195 actions/imsettings.php:163 +#: actions/othersettings.php:126 actions/pathsadminpanel.php:351 +#: actions/profilesettings.php:174 actions/siteadminpanel.php:336 +#: actions/smssettings.php:181 actions/subscriptions.php:203 +#: actions/tagother.php:154 actions/useradminpanel.php:313 +#: lib/applicationeditform.php:335 lib/applicationeditform.php:336 +#: lib/designsettings.php:256 lib/groupeditform.php:202 +msgid "Save" +msgstr "Speichern" + +#: actions/accessadminpanel.php:189 +#, fuzzy +msgid "Save access settings" +msgstr "Site-Einstellungen speichern" + #: actions/all.php:63 actions/public.php:97 actions/replies.php:92 #: actions/showfavorites.php:137 actions/tag.php:51 msgid "No such page" @@ -37,7 +95,7 @@ msgstr "Seite nicht vorhanden" #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:149 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 @@ -146,8 +204,7 @@ msgstr "Aktualisierungen von %1$s und Freunden auf %2$s!" #: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 #: actions/apitimelinefriends.php:155 actions/apitimelinegroup.php:150 #: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 -#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found." @@ -163,7 +220,7 @@ msgstr "API-Methode nicht gefunden." #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:119 +#: actions/apistatusesupdate.php:118 msgid "This method requires a POST." msgstr "Diese Methode benötigt ein POST." @@ -192,7 +249,7 @@ msgstr "Konnte Profil nicht speichern." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:132 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 #: actions/designadminpanel.php:122 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -497,7 +554,14 @@ msgstr "" msgid "Allow or deny access" msgstr "" -#: actions/apioauthauthorize.php:320 lib/action.php:435 +#: actions/apioauthauthorize.php:306 +#, php-format +msgid "" +"The application %s by %s would like the " +"ability to %s your account data." +msgstr "" + +#: actions/apioauthauthorize.php:320 lib/action.php:441 msgid "Account" msgstr "Konto" @@ -555,18 +619,18 @@ msgstr "Status gelöscht." msgid "No status with that ID found." msgstr "Keine Nachricht mit dieser ID gefunden." -#: actions/apistatusesupdate.php:162 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "" "Das war zu lang. Die Länge einer Nachricht ist auf %d Zeichen beschränkt." -#: actions/apistatusesupdate.php:203 +#: actions/apistatusesupdate.php:202 msgid "Not found" msgstr "Nicht gefunden" -#: actions/apistatusesupdate.php:226 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -619,11 +683,6 @@ msgstr "%s öffentliche Zeitleiste" msgid "%s updates from everyone!" msgstr "%s Nachrichten von allen!" -#: actions/apitimelineretweetedbyme.php:112 -#, php-format -msgid "Repeated by %s" -msgstr "Von %s wiederholt" - #: actions/apitimelineretweetedtome.php:111 #, fuzzy, php-format msgid "Repeated to %s" @@ -1029,17 +1088,6 @@ msgstr "Standard-Design wiederherstellen" msgid "Reset back to default" msgstr "Standard wiederherstellen" -#: actions/designadminpanel.php:586 actions/emailsettings.php:195 -#: actions/imsettings.php:163 actions/othersettings.php:126 -#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174 -#: actions/siteadminpanel.php:388 actions/smssettings.php:181 -#: actions/subscriptions.php:203 actions/tagother.php:154 -#: actions/useradminpanel.php:313 lib/applicationeditform.php:335 -#: lib/applicationeditform.php:336 lib/designsettings.php:256 -#: lib/groupeditform.php:202 -msgid "Save" -msgstr "Speichern" - #: actions/designadminpanel.php:587 lib/designsettings.php:257 msgid "Save design" msgstr "Design speichern" @@ -1052,13 +1100,15 @@ msgstr "Diese Nachricht ist kein Favorit!" msgid "Add to favorites" msgstr "Zu Favoriten hinzufügen" -#: actions/doc.php:69 -msgid "No such document." +#: actions/doc.php:155 +#, fuzzy, php-format +msgid "No such document \"%s\"" msgstr "Unbekanntes Dokument." -#: actions/editapplication.php:54 lib/applicationeditform.php:136 -msgid "Edit application" -msgstr "" +#: actions/editapplication.php:54 +#, fuzzy +msgid "Edit Application" +msgstr "Sonstige Optionen" #: actions/editapplication.php:66 #, fuzzy @@ -1077,7 +1127,7 @@ msgid "No such application." msgstr "Unbekannte Nachricht." #: actions/editapplication.php:127 actions/newapplication.php:110 -#: actions/showapplication.php:118 lib/action.php:1189 +#: actions/showapplication.php:118 lib/action.php:1195 msgid "There was a problem with your session token." msgstr "Es gab ein Problem mit deinem Sessiontoken." @@ -1293,7 +1343,7 @@ msgid "Cannot normalize that email address" msgstr "Konnte diese E-Mail-Adresse nicht normalisieren" #: actions/emailsettings.php:331 actions/register.php:201 -#: actions/siteadminpanel.php:157 +#: actions/siteadminpanel.php:143 msgid "Not a valid email address." msgstr "Ungültige E-Mail-Adresse." @@ -1305,7 +1355,7 @@ msgstr "Dies ist bereits deine E-Mail-Adresse." msgid "That email address already belongs to another user." msgstr "Diese E-Mail-Adresse gehört einem anderen Nutzer." -#: actions/emailsettings.php:353 actions/imsettings.php:317 +#: actions/emailsettings.php:353 actions/imsettings.php:319 #: actions/smssettings.php:337 msgid "Couldn't insert confirmation code." msgstr "Konnte keinen Bestätigungscode einfügen." @@ -1604,7 +1654,7 @@ msgstr "%s Gruppen-Mitglieder, Seite %d" msgid "A list of the users in this group." msgstr "Liste der Benutzer in dieser Gruppe." -#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107 +#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107 msgid "Admin" msgstr "Admin" @@ -1800,6 +1850,11 @@ msgstr "" msgid "That is not your Jabber ID." msgstr "Dies ist nicht deine JabberID." +#: actions/inbox.php:59 +#, fuzzy, php-format +msgid "Inbox for %1$s - page %2$d" +msgstr "Posteingang von %s" + #: actions/inbox.php:62 #, php-format msgid "Inbox for %s" @@ -1987,7 +2042,7 @@ msgid "Error setting user. You are probably not authorized." msgstr "" "Fehler beim setzen des Benutzers. Du bist vermutlich nicht autorisiert." -#: actions/login.php:188 actions/login.php:241 lib/action.php:460 +#: actions/login.php:188 actions/login.php:241 lib/action.php:466 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Anmelden" @@ -2049,8 +2104,9 @@ msgid "No current status" msgstr "Kein aktueller Status" #: actions/newapplication.php:52 -msgid "New application" -msgstr "" +#, fuzzy +msgid "New Application" +msgstr "Unbekannte Nachricht." #: actions/newapplication.php:64 #, fuzzy @@ -2243,8 +2299,8 @@ msgstr "Content-Typ " msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1038 -#: lib/api.php:1066 lib/api.php:1176 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1039 +#: lib/api.php:1067 lib/api.php:1177 msgid "Not a supported data format." msgstr "Kein unterstütztes Datenformat." @@ -2314,6 +2370,11 @@ msgstr "Token ungültig oder abgelaufen." msgid "Login token expired." msgstr "An Seite anmelden" +#: actions/outbox.php:58 +#, fuzzy, php-format +msgid "Outbox for %1$s - page %2$d" +msgstr "Postausgang von %s" + #: actions/outbox.php:61 #, php-format msgid "Outbox for %s" @@ -2385,7 +2446,7 @@ msgstr "Konnte neues Passwort nicht speichern" msgid "Password saved." msgstr "Passwort gespeichert." -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:331 msgid "Paths" msgstr "" @@ -2393,134 +2454,151 @@ msgstr "" msgid "Path and server settings for this StatusNet site." msgstr "" -#: actions/pathsadminpanel.php:140 +#: actions/pathsadminpanel.php:157 #, php-format msgid "Theme directory not readable: %s" msgstr "Theme-Verzeichnis nicht lesbar: %s" -#: actions/pathsadminpanel.php:146 +#: actions/pathsadminpanel.php:163 #, php-format msgid "Avatar directory not writable: %s" msgstr "Avatar-Verzeichnis ist nicht beschreibbar: %s" -#: actions/pathsadminpanel.php:152 +#: actions/pathsadminpanel.php:169 #, php-format msgid "Background directory not writable: %s" msgstr "Hintergrund Verzeichnis ist nicht beschreibbar: %s" -#: actions/pathsadminpanel.php:160 +#: actions/pathsadminpanel.php:177 #, php-format msgid "Locales directory not readable: %s" msgstr "" -#: actions/pathsadminpanel.php:166 +#: actions/pathsadminpanel.php:183 msgid "Invalid SSL server. The maximum length is 255 characters." msgstr "Ungültiger SSL-Server. Die maximale Länge ist 255 Zeichen." -#: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58 +#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58 #: lib/adminpanelaction.php:311 msgid "Site" msgstr "Seite" -#: actions/pathsadminpanel.php:221 +#: actions/pathsadminpanel.php:238 +#, fuzzy +msgid "Server" +msgstr "Wiederherstellung" + +#: actions/pathsadminpanel.php:238 +msgid "Site's server hostname." +msgstr "" + +#: actions/pathsadminpanel.php:242 msgid "Path" msgstr "Pfad" -#: actions/pathsadminpanel.php:221 +#: actions/pathsadminpanel.php:242 msgid "Site path" msgstr "Seitenpfad" -#: actions/pathsadminpanel.php:225 +#: actions/pathsadminpanel.php:246 msgid "Path to locales" msgstr "" -#: actions/pathsadminpanel.php:225 +#: actions/pathsadminpanel.php:246 msgid "Directory path to locales" msgstr "" -#: actions/pathsadminpanel.php:232 +#: actions/pathsadminpanel.php:250 +msgid "Fancy URLs" +msgstr "Schicke URLs." + +#: actions/pathsadminpanel.php:252 +msgid "Use fancy (more readable and memorable) URLs?" +msgstr "Schicke URLs (lesbarer und besser zu merken) verwenden?" + +#: actions/pathsadminpanel.php:259 msgid "Theme" msgstr "" -#: actions/pathsadminpanel.php:237 +#: actions/pathsadminpanel.php:264 msgid "Theme server" msgstr "" -#: actions/pathsadminpanel.php:241 +#: actions/pathsadminpanel.php:268 msgid "Theme path" msgstr "" -#: actions/pathsadminpanel.php:245 +#: actions/pathsadminpanel.php:272 msgid "Theme directory" msgstr "Theme-Verzeichnis" -#: actions/pathsadminpanel.php:252 +#: actions/pathsadminpanel.php:279 msgid "Avatars" msgstr "Avatare" -#: actions/pathsadminpanel.php:257 +#: actions/pathsadminpanel.php:284 msgid "Avatar server" msgstr "Avatar-Server" -#: actions/pathsadminpanel.php:261 +#: actions/pathsadminpanel.php:288 msgid "Avatar path" msgstr "Avatarpfad" -#: actions/pathsadminpanel.php:265 +#: actions/pathsadminpanel.php:292 msgid "Avatar directory" msgstr "Avatarverzeichnis" -#: actions/pathsadminpanel.php:274 +#: actions/pathsadminpanel.php:301 msgid "Backgrounds" msgstr "" -#: actions/pathsadminpanel.php:278 +#: actions/pathsadminpanel.php:305 msgid "Background server" msgstr "" -#: actions/pathsadminpanel.php:282 +#: actions/pathsadminpanel.php:309 msgid "Background path" msgstr "" -#: actions/pathsadminpanel.php:286 +#: actions/pathsadminpanel.php:313 msgid "Background directory" msgstr "Hintergrund Verzeichnis" -#: actions/pathsadminpanel.php:293 +#: actions/pathsadminpanel.php:320 msgid "SSL" msgstr "SSL" -#: actions/pathsadminpanel.php:296 actions/siteadminpanel.php:346 +#: actions/pathsadminpanel.php:323 actions/siteadminpanel.php:294 #, fuzzy msgid "Never" msgstr "Wiederherstellung" -#: actions/pathsadminpanel.php:297 +#: actions/pathsadminpanel.php:324 msgid "Sometimes" msgstr "Manchmal" -#: actions/pathsadminpanel.php:298 +#: actions/pathsadminpanel.php:325 msgid "Always" msgstr "Immer" -#: actions/pathsadminpanel.php:302 +#: actions/pathsadminpanel.php:329 msgid "Use SSL" msgstr "SSL verwenden" -#: actions/pathsadminpanel.php:303 +#: actions/pathsadminpanel.php:330 msgid "When to use SSL" msgstr "Wann soll SSL verwendet werden" -#: actions/pathsadminpanel.php:308 +#: actions/pathsadminpanel.php:335 #, fuzzy msgid "SSL server" msgstr "SSL-Server" -#: actions/pathsadminpanel.php:309 +#: actions/pathsadminpanel.php:336 msgid "Server to direct SSL requests to" msgstr "Server an den SSL Anfragen gerichtet werden sollen" -#: actions/pathsadminpanel.php:325 +#: actions/pathsadminpanel.php:352 msgid "Save paths" msgstr "Speicherpfade" @@ -2635,7 +2713,7 @@ msgstr "" "Tags über dich selbst (Buchstaben, Zahlen, -, ., und _) durch Kommas oder " "Leerzeichen getrennt" -#: actions/profilesettings.php:151 actions/siteadminpanel.php:294 +#: actions/profilesettings.php:151 actions/siteadminpanel.php:280 msgid "Language" msgstr "Sprache" @@ -2663,7 +2741,7 @@ msgstr "" msgid "Bio is too long (max %d chars)." msgstr "Die Biografie ist zu lang (max. %d Zeichen)" -#: actions/profilesettings.php:235 actions/siteadminpanel.php:164 +#: actions/profilesettings.php:235 actions/siteadminpanel.php:150 msgid "Timezone not selected." msgstr "Keine Zeitzone ausgewählt." @@ -2927,7 +3005,7 @@ msgstr "Entschuldigung, ungültiger Bestätigungscode." msgid "Registration successful" msgstr "Registrierung erfolgreich" -#: actions/register.php:114 actions/register.php:503 lib/action.php:457 +#: actions/register.php:114 actions/register.php:503 lib/action.php:463 #: lib/logingroupnav.php:85 msgid "Register" msgstr "Registrieren" @@ -2970,7 +3048,7 @@ msgid "Same as password above. Required." msgstr "Gleiches Passwort wie zuvor. Pflichteingabe." #: actions/register.php:438 actions/register.php:442 -#: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120 +#: actions/siteadminpanel.php:256 lib/accountsettingsaction.php:120 msgid "Email" msgstr "E-Mail" @@ -3137,6 +3215,11 @@ msgstr "Erstellt" msgid "Replies to %s" msgstr "Antworten an %s" +#: actions/replies.php:127 +#, fuzzy, php-format +msgid "Replies to %1$s, page %2$d" +msgstr "Antworten an %1$s auf %2$s!" + #: actions/replies.php:144 #, php-format msgid "Replies feed for %s (RSS 1.0)" @@ -3272,6 +3355,11 @@ msgid "" "signature method." msgstr "" +#: actions/showfavorites.php:79 +#, fuzzy, php-format +msgid "%1$s's favorite notices, page %2$d" +msgstr "%ss favorisierte Nachrichten" + #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "Konnte Favoriten nicht abrufen." @@ -3321,6 +3409,11 @@ msgstr "" msgid "%s group" msgstr "%s Gruppe" +#: actions/showgroup.php:84 +#, fuzzy, php-format +msgid "%1$s group, page %2$d" +msgstr "%s Gruppen-Mitglieder, Seite %d" + #: actions/showgroup.php:218 msgid "Group profile" msgstr "Gruppenprofil" @@ -3435,6 +3528,11 @@ msgstr "Nachricht gelöscht." msgid " tagged %s" msgstr "Nachrichten, die mit %s getagt sind" +#: actions/showstream.php:79 +#, fuzzy, php-format +msgid "%1$s, page %2$d" +msgstr "%s blockierte Benutzerprofile, Seite %d" + #: actions/showstream.php:122 #, fuzzy, php-format msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" @@ -3522,202 +3620,148 @@ msgstr "Dieser Benutzer hat dich blockiert." msgid "Basic settings for this StatusNet site." msgstr "" -#: actions/siteadminpanel.php:146 +#: actions/siteadminpanel.php:132 msgid "Site name must have non-zero length." msgstr "" -#: actions/siteadminpanel.php:154 +#: actions/siteadminpanel.php:140 #, fuzzy msgid "You must have a valid contact email address." msgstr "Du musst eine gültige E-Mail-Adresse haben" -#: actions/siteadminpanel.php:172 +#: actions/siteadminpanel.php:158 #, fuzzy, php-format msgid "Unknown language \"%s\"." msgstr "Unbekannte Sprache „%s“" -#: actions/siteadminpanel.php:179 +#: actions/siteadminpanel.php:165 msgid "Invalid snapshot report URL." msgstr "" -#: actions/siteadminpanel.php:185 +#: actions/siteadminpanel.php:171 msgid "Invalid snapshot run value." msgstr "" -#: actions/siteadminpanel.php:191 +#: actions/siteadminpanel.php:177 msgid "Snapshot frequency must be a number." msgstr "" -#: actions/siteadminpanel.php:197 +#: actions/siteadminpanel.php:183 msgid "Minimum text limit is 140 characters." msgstr "" -#: actions/siteadminpanel.php:203 +#: actions/siteadminpanel.php:189 msgid "Dupe limit must 1 or more seconds." msgstr "" -#: actions/siteadminpanel.php:253 +#: actions/siteadminpanel.php:239 msgid "General" msgstr "" -#: actions/siteadminpanel.php:256 +#: actions/siteadminpanel.php:242 #, fuzzy msgid "Site name" msgstr "Seitennachricht" -#: actions/siteadminpanel.php:257 +#: actions/siteadminpanel.php:243 msgid "The name of your site, like \"Yourcompany Microblog\"" msgstr "" -#: actions/siteadminpanel.php:261 +#: actions/siteadminpanel.php:247 msgid "Brought by" msgstr "" -#: actions/siteadminpanel.php:262 +#: actions/siteadminpanel.php:248 msgid "Text used for credits link in footer of each page" msgstr "" -#: actions/siteadminpanel.php:266 +#: actions/siteadminpanel.php:252 msgid "Brought by URL" msgstr "" -#: actions/siteadminpanel.php:267 +#: actions/siteadminpanel.php:253 msgid "URL used for credits link in footer of each page" msgstr "" -#: actions/siteadminpanel.php:271 +#: actions/siteadminpanel.php:257 msgid "Contact email address for your site" msgstr "Kontakt-E-Mail-Adresse für Deine Site." -#: actions/siteadminpanel.php:277 +#: actions/siteadminpanel.php:263 #, fuzzy msgid "Local" msgstr "Lokale Ansichten" -#: actions/siteadminpanel.php:288 +#: actions/siteadminpanel.php:274 msgid "Default timezone" msgstr "" -#: actions/siteadminpanel.php:289 +#: actions/siteadminpanel.php:275 msgid "Default timezone for the site; usually UTC." msgstr "" -#: actions/siteadminpanel.php:295 +#: actions/siteadminpanel.php:281 #, fuzzy msgid "Default site language" msgstr "Bevorzugte Sprache" -#: actions/siteadminpanel.php:303 -#, fuzzy -msgid "URLs" -msgstr "URL" - -#: actions/siteadminpanel.php:306 -#, fuzzy -msgid "Server" -msgstr "Wiederherstellung" - -#: actions/siteadminpanel.php:306 -msgid "Site's server hostname." -msgstr "" - -#: actions/siteadminpanel.php:310 -msgid "Fancy URLs" -msgstr "Schicke URLs." - -#: actions/siteadminpanel.php:312 -msgid "Use fancy (more readable and memorable) URLs?" -msgstr "Schicke URLs (lesbarer und besser zu merken) verwenden?" - -#: actions/siteadminpanel.php:318 -#, fuzzy -msgid "Access" -msgstr "Akzeptieren" - -#: actions/siteadminpanel.php:321 -#, fuzzy -msgid "Private" -msgstr "Privatsphäre" - -#: actions/siteadminpanel.php:323 -msgid "Prohibit anonymous users (not logged in) from viewing site?" -msgstr "" - -#: actions/siteadminpanel.php:327 -#, fuzzy -msgid "Invite only" -msgstr "Einladen" - -#: actions/siteadminpanel.php:329 -msgid "Make registration invitation only." -msgstr "" - -#: actions/siteadminpanel.php:333 -#, fuzzy -msgid "Closed" -msgstr "Blockieren" - -#: actions/siteadminpanel.php:335 -msgid "Disable new registrations." -msgstr "" - -#: actions/siteadminpanel.php:341 +#: actions/siteadminpanel.php:289 msgid "Snapshots" msgstr "" -#: actions/siteadminpanel.php:344 +#: actions/siteadminpanel.php:292 msgid "Randomly during Web hit" msgstr "" -#: actions/siteadminpanel.php:345 +#: actions/siteadminpanel.php:293 msgid "In a scheduled job" msgstr "" -#: actions/siteadminpanel.php:347 +#: actions/siteadminpanel.php:295 msgid "Data snapshots" msgstr "" -#: actions/siteadminpanel.php:348 +#: actions/siteadminpanel.php:296 msgid "When to send statistical data to status.net servers" msgstr "" -#: actions/siteadminpanel.php:353 +#: actions/siteadminpanel.php:301 msgid "Frequency" msgstr "Frequenz" -#: actions/siteadminpanel.php:354 +#: actions/siteadminpanel.php:302 msgid "Snapshots will be sent once every N web hits" msgstr "" -#: actions/siteadminpanel.php:359 +#: actions/siteadminpanel.php:307 msgid "Report URL" msgstr "" -#: actions/siteadminpanel.php:360 +#: actions/siteadminpanel.php:308 msgid "Snapshots will be sent to this URL" msgstr "" -#: actions/siteadminpanel.php:367 +#: actions/siteadminpanel.php:315 msgid "Limits" msgstr "" -#: actions/siteadminpanel.php:370 +#: actions/siteadminpanel.php:318 msgid "Text limit" msgstr "" -#: actions/siteadminpanel.php:370 +#: actions/siteadminpanel.php:318 msgid "Maximum number of characters for notices." msgstr "" -#: actions/siteadminpanel.php:374 +#: actions/siteadminpanel.php:322 msgid "Dupe limit" msgstr "" -#: actions/siteadminpanel.php:374 +#: actions/siteadminpanel.php:322 msgid "How long users must wait (in seconds) to post the same thing again." msgstr "" -#: actions/siteadminpanel.php:388 actions/useradminpanel.php:313 +#: actions/siteadminpanel.php:336 actions/useradminpanel.php:313 msgid "Save site settings" msgstr "Site-Einstellungen speichern" @@ -3923,6 +3967,11 @@ msgstr "Jabber" msgid "SMS" msgstr "SMS" +#: actions/tag.php:68 +#, fuzzy, php-format +msgid "Notices tagged with %1$s, page %2$d" +msgstr "Benutzer die sich selbst mit %s getagged haben - Seite %d" + #: actions/tag.php:86 #, fuzzy, php-format msgid "Notice feed for tag %s (RSS 1.0)" @@ -4236,6 +4285,11 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "" +#: actions/usergroups.php:64 +#, fuzzy, php-format +msgid "%1$s groups, page %2$d" +msgstr "%s Gruppen-Mitglieder, Seite %d" + #: actions/usergroups.php:130 msgid "Search for more groups" msgstr "Suche nach weiteren Gruppen" @@ -4298,7 +4352,7 @@ msgstr "" msgid "Plugins" msgstr "" -#: actions/version.php:196 lib/action.php:741 +#: actions/version.php:196 lib/action.php:747 #, fuzzy msgid "Version" msgstr "Eigene" @@ -4358,27 +4412,27 @@ msgstr "Konnte Nachricht nicht einfügen." msgid "Could not update message with new URI." msgstr "Konnte Nachricht nicht mit neuer URI versehen." -#: classes/Notice.php:171 +#: classes/Notice.php:157 #, php-format msgid "DB error inserting hashtag: %s" msgstr "Datenbankfehler beim Einfügen des Hashtags: %s" -#: classes/Notice.php:225 +#: classes/Notice.php:214 msgid "Problem saving notice. Too long." msgstr "Problem bei Speichern der Nachricht. Sie ist zu lang." -#: classes/Notice.php:229 +#: classes/Notice.php:218 msgid "Problem saving notice. Unknown user." msgstr "Problem bei Speichern der Nachricht. Unbekannter Benutzer." -#: classes/Notice.php:234 +#: classes/Notice.php:223 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Zu schnell zu viele Nachrichten; atme kurz durch und schicke sie erneut in " "ein paar Minuten ab." -#: classes/Notice.php:240 +#: classes/Notice.php:229 #, fuzzy msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " @@ -4387,21 +4441,26 @@ msgstr "" "Zu schnell zu viele Nachrichten; atme kurz durch und schicke sie erneut in " "ein paar Minuten ab." -#: classes/Notice.php:246 +#: classes/Notice.php:235 msgid "You are banned from posting notices on this site." msgstr "" "Du wurdest für das Schreiben von Nachrichten auf dieser Seite gesperrt." -#: classes/Notice.php:305 classes/Notice.php:330 +#: classes/Notice.php:294 classes/Notice.php:319 msgid "Problem saving notice." msgstr "Problem bei Speichern der Nachricht." -#: classes/Notice.php:1059 +#: classes/Notice.php:790 +#, fuzzy +msgid "Problem saving group inbox." +msgstr "Problem bei Speichern der Nachricht." + +#: classes/Notice.php:850 #, php-format msgid "DB error inserting reply: %s" msgstr "Datenbankfehler beim Einfügen der Antwort: %s" -#: classes/Notice.php:1441 +#: classes/Notice.php:1233 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" @@ -4457,127 +4516,127 @@ msgstr "%1$s (%2$s)" msgid "Untitled page" msgstr "Seite ohne Titel" -#: lib/action.php:427 +#: lib/action.php:433 msgid "Primary site navigation" msgstr "Hauptnavigation" -#: lib/action.php:433 +#: lib/action.php:439 msgid "Home" msgstr "Startseite" -#: lib/action.php:433 +#: lib/action.php:439 msgid "Personal profile and friends timeline" msgstr "Persönliches Profil und Freundes-Zeitleiste" -#: lib/action.php:435 +#: lib/action.php:441 msgid "Change your email, avatar, password, profile" msgstr "Ändere deine E-Mail, dein Avatar, Passwort, Profil" -#: lib/action.php:438 +#: lib/action.php:444 msgid "Connect" msgstr "Verbinden" -#: lib/action.php:438 +#: lib/action.php:444 #, fuzzy msgid "Connect to services" msgstr "Konnte nicht zum Server umleiten: %s" -#: lib/action.php:442 +#: lib/action.php:448 #, fuzzy msgid "Change site configuration" msgstr "Hauptnavigation" -#: lib/action.php:446 lib/subgroupnav.php:105 +#: lib/action.php:452 lib/subgroupnav.php:105 msgid "Invite" msgstr "Einladen" -#: lib/action.php:447 lib/subgroupnav.php:106 +#: lib/action.php:453 lib/subgroupnav.php:106 #, php-format msgid "Invite friends and colleagues to join you on %s" msgstr "Lade Freunde und Kollegen ein dir auf %s zu folgen" -#: lib/action.php:452 +#: lib/action.php:458 msgid "Logout" msgstr "Abmelden" -#: lib/action.php:452 +#: lib/action.php:458 msgid "Logout from the site" msgstr "Von der Seite abmelden" -#: lib/action.php:457 +#: lib/action.php:463 msgid "Create an account" msgstr "Neues Konto erstellen" -#: lib/action.php:460 +#: lib/action.php:466 msgid "Login to the site" msgstr "Auf der Seite anmelden" -#: lib/action.php:463 lib/action.php:726 +#: lib/action.php:469 lib/action.php:732 msgid "Help" msgstr "Hilfe" -#: lib/action.php:463 +#: lib/action.php:469 msgid "Help me!" msgstr "Hilf mir!" -#: lib/action.php:466 lib/searchaction.php:127 +#: lib/action.php:472 lib/searchaction.php:127 msgid "Search" msgstr "Suchen" -#: lib/action.php:466 +#: lib/action.php:472 msgid "Search for people or text" msgstr "Suche nach Leuten oder Text" -#: lib/action.php:487 +#: lib/action.php:493 msgid "Site notice" msgstr "Seitennachricht" -#: lib/action.php:553 +#: lib/action.php:559 msgid "Local views" msgstr "Lokale Ansichten" -#: lib/action.php:619 +#: lib/action.php:625 msgid "Page notice" msgstr "Neue Nachricht" -#: lib/action.php:721 +#: lib/action.php:727 msgid "Secondary site navigation" msgstr "Unternavigation" -#: lib/action.php:728 +#: lib/action.php:734 msgid "About" msgstr "Über" -#: lib/action.php:730 +#: lib/action.php:736 msgid "FAQ" msgstr "FAQ" -#: lib/action.php:734 +#: lib/action.php:740 msgid "TOS" msgstr "AGB" -#: lib/action.php:737 +#: lib/action.php:743 msgid "Privacy" msgstr "Privatsphäre" -#: lib/action.php:739 +#: lib/action.php:745 msgid "Source" msgstr "Quellcode" -#: lib/action.php:743 +#: lib/action.php:749 msgid "Contact" msgstr "Kontakt" -#: lib/action.php:745 +#: lib/action.php:751 #, fuzzy msgid "Badge" msgstr "Stups" -#: lib/action.php:773 +#: lib/action.php:779 msgid "StatusNet software license" msgstr "StatusNet-Software-Lizenz" -#: lib/action.php:776 +#: lib/action.php:782 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -4586,12 +4645,12 @@ msgstr "" "**%%site.name%%** ist ein Microbloggingdienst von [%%site.broughtby%%](%%" "site.broughtbyurl%%)." -#: lib/action.php:778 +#: lib/action.php:784 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "**%%site.name%%** ist ein Microbloggingdienst." -#: lib/action.php:780 +#: lib/action.php:786 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4602,42 +4661,42 @@ msgstr "" "(Version %s) betrieben, die unter der [GNU Affero General Public License]" "(http://www.fsf.org/licensing/licenses/agpl-3.0.html) erhältlich ist." -#: lib/action.php:795 +#: lib/action.php:801 msgid "Site content license" msgstr "StatusNet-Software-Lizenz" -#: lib/action.php:800 +#: lib/action.php:806 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "" -#: lib/action.php:805 +#: lib/action.php:811 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" -#: lib/action.php:808 +#: lib/action.php:814 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" -#: lib/action.php:820 +#: lib/action.php:826 #, fuzzy msgid "All " msgstr "Alle " -#: lib/action.php:825 +#: lib/action.php:831 msgid "license." msgstr "Lizenz." -#: lib/action.php:1124 +#: lib/action.php:1130 msgid "Pagination" msgstr "Seitenerstellung" -#: lib/action.php:1133 +#: lib/action.php:1139 msgid "After" msgstr "Später" -#: lib/action.php:1141 +#: lib/action.php:1147 msgid "Before" msgstr "Vorher" @@ -4673,11 +4732,25 @@ msgstr "Bestätigung der E-Mail-Adresse" msgid "Design configuration" msgstr "SMS-Konfiguration" -#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327 +#: lib/adminpanelaction.php:322 +#, fuzzy +msgid "User configuration" +msgstr "SMS-Konfiguration" + +#: lib/adminpanelaction.php:327 +#, fuzzy +msgid "Access configuration" +msgstr "SMS-Konfiguration" + +#: lib/adminpanelaction.php:332 #, fuzzy msgid "Paths configuration" msgstr "SMS-Konfiguration" +#: lib/applicationeditform.php:136 +msgid "Edit application" +msgstr "" + #: lib/applicationeditform.php:186 msgid "Icon for this application" msgstr "" @@ -5263,12 +5336,12 @@ msgstr "" msgid "kB" msgstr "" -#: lib/jabber.php:202 +#: lib/jabber.php:220 #, php-format msgid "[%s]" msgstr "" -#: lib/jabber.php:385 +#: lib/jabber.php:400 #, fuzzy, php-format msgid "Unknown inbox source %d." msgstr "Unbekannte Sprache „%s“" @@ -5752,19 +5825,19 @@ msgstr "Antworten" msgid "Favorites" msgstr "Favoriten" -#: lib/personalgroupnav.php:124 +#: lib/personalgroupnav.php:125 msgid "Inbox" msgstr "Posteingang" -#: lib/personalgroupnav.php:125 +#: lib/personalgroupnav.php:126 msgid "Your incoming messages" msgstr "Deine eingehenden Nachrichten" -#: lib/personalgroupnav.php:129 +#: lib/personalgroupnav.php:130 msgid "Outbox" msgstr "Postausgang" -#: lib/personalgroupnav.php:130 +#: lib/personalgroupnav.php:131 msgid "Your sent messages" msgstr "Deine gesendeten Nachrichten" @@ -6019,47 +6092,47 @@ msgstr "Nachricht" msgid "Moderate" msgstr "" -#: lib/util.php:875 +#: lib/util.php:868 msgid "a few seconds ago" msgstr "vor wenigen Sekunden" -#: lib/util.php:877 +#: lib/util.php:870 msgid "about a minute ago" msgstr "vor einer Minute" -#: lib/util.php:879 +#: lib/util.php:872 #, php-format msgid "about %d minutes ago" msgstr "vor %d Minuten" -#: lib/util.php:881 +#: lib/util.php:874 msgid "about an hour ago" msgstr "vor einer Stunde" -#: lib/util.php:883 +#: lib/util.php:876 #, php-format msgid "about %d hours ago" msgstr "vor %d Stunden" -#: lib/util.php:885 +#: lib/util.php:878 msgid "about a day ago" msgstr "vor einem Tag" -#: lib/util.php:887 +#: lib/util.php:880 #, php-format msgid "about %d days ago" msgstr "vor %d Tagen" -#: lib/util.php:889 +#: lib/util.php:882 msgid "about a month ago" msgstr "vor einem Monat" -#: lib/util.php:891 +#: lib/util.php:884 #, php-format msgid "about %d months ago" msgstr "vor %d Monaten" -#: lib/util.php:893 +#: lib/util.php:886 msgid "about a year ago" msgstr "vor einem Jahr" @@ -6073,7 +6146,7 @@ msgstr "%s ist keine gültige Farbe!" msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "%s ist keine gültige Farbe! Verwenden Sie 3 oder 6 Hex-Zeichen." -#: scripts/xmppdaemon.php:301 +#: lib/xmppmanager.php:402 #, fuzzy, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "Nachricht zu lang - maximal %d Zeichen erlaubt, du hast %d gesendet" diff --git a/locale/el/LC_MESSAGES/statusnet.po b/locale/el/LC_MESSAGES/statusnet.po index 91ea543053..23034c0a8c 100644 --- a/locale/el/LC_MESSAGES/statusnet.po +++ b/locale/el/LC_MESSAGES/statusnet.po @@ -9,21 +9,75 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-21 22:36+0000\n" -"PO-Revision-Date: 2010-01-21 22:37:20+0000\n" +"POT-Creation-Date: 2010-01-27 23:58+0000\n" +"PO-Revision-Date: 2010-01-27 23:58:39+0000\n" "Language-Team: Greek\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r61339); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61595); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: el\n" "X-Message-Group: out-statusnet\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#: actions/accessadminpanel.php:54 lib/adminpanelaction.php:326 +msgid "Access" +msgstr "Πρόσβαση" + +#: actions/accessadminpanel.php:65 +#, fuzzy +msgid "Site access settings" +msgstr "Ρυθμίσεις OpenID" + +#: actions/accessadminpanel.php:158 +#, fuzzy +msgid "Registration" +msgstr "Περιγραφή" + +#: actions/accessadminpanel.php:161 +msgid "Private" +msgstr "" + +#: actions/accessadminpanel.php:163 +msgid "Prohibit anonymous users (not logged in) from viewing site?" +msgstr "" + +#: actions/accessadminpanel.php:167 +msgid "Invite only" +msgstr "" + +#: actions/accessadminpanel.php:169 +msgid "Make registration invitation only." +msgstr "" + +#: actions/accessadminpanel.php:173 +msgid "Closed" +msgstr "" + +#: actions/accessadminpanel.php:175 +msgid "Disable new registrations." +msgstr "" + +#: actions/accessadminpanel.php:189 actions/designadminpanel.php:586 +#: actions/emailsettings.php:195 actions/imsettings.php:163 +#: actions/othersettings.php:126 actions/pathsadminpanel.php:351 +#: actions/profilesettings.php:174 actions/siteadminpanel.php:336 +#: actions/smssettings.php:181 actions/subscriptions.php:203 +#: actions/tagother.php:154 actions/useradminpanel.php:313 +#: lib/applicationeditform.php:335 lib/applicationeditform.php:336 +#: lib/designsettings.php:256 lib/groupeditform.php:202 +msgid "Save" +msgstr "" + +#: actions/accessadminpanel.php:189 +#, fuzzy +msgid "Save access settings" +msgstr "Ρυθμίσεις OpenID" + #: actions/all.php:63 actions/public.php:97 actions/replies.php:92 #: actions/showfavorites.php:137 actions/tag.php:51 msgid "No such page" -msgstr "Δεν υπάρχει τέτοιο σελίδα." +msgstr "Δεν υπάρχει τέτοια σελίδα" #: actions/all.php:74 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 @@ -34,7 +88,7 @@ msgstr "Δεν υπάρχει τέτοιο σελίδα." #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:149 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 @@ -133,8 +187,7 @@ msgstr "" #: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 #: actions/apitimelinefriends.php:155 actions/apitimelinegroup.php:150 #: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 -#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 #, fuzzy @@ -151,7 +204,7 @@ msgstr "Η μέθοδος του ΑΡΙ δε βρέθηκε!" #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:119 +#: actions/apistatusesupdate.php:118 msgid "This method requires a POST." msgstr "" @@ -182,7 +235,7 @@ msgstr "Απέτυχε η αποθήκευση του προφίλ." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:132 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 #: actions/designadminpanel.php:122 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -210,7 +263,7 @@ msgstr "Απέτυχε η ενημέρωση του χρήστη." #: actions/apiblockcreate.php:105 msgid "You cannot block yourself!" -msgstr "Δεν μπορείτε να εμποδίσετε τον εαυτό σας!" +msgstr "Δεν μπορείτε να κάνετε φραγή στον εαυτό σας!" #: actions/apiblockcreate.php:126 msgid "Block user failed." @@ -382,7 +435,7 @@ msgstr "" #: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 #: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91 msgid "Group not found!" -msgstr "Ομάδα δεν βρέθηκε!" +msgstr "Η ομάδα δεν βρέθηκε!" #: actions/apigroupjoin.php:110 actions/joingroup.php:90 msgid "You are already a member of that group." @@ -486,7 +539,14 @@ msgstr "" msgid "Allow or deny access" msgstr "" -#: actions/apioauthauthorize.php:320 lib/action.php:435 +#: actions/apioauthauthorize.php:306 +#, php-format +msgid "" +"The application %s by %s would like the " +"ability to %s your account data." +msgstr "" + +#: actions/apioauthauthorize.php:320 lib/action.php:441 msgid "Account" msgstr "Λογαριασμός" @@ -539,23 +599,23 @@ msgstr "Αδυναμία διαγραφής αυτού του μηνύματος #: actions/apistatusesshow.php:138 msgid "Status deleted." -msgstr "Η κατάσταση διαγράφεται." +msgstr "Η κατάσταση διεγράφη." #: actions/apistatusesshow.php:144 msgid "No status with that ID found." msgstr "" -#: actions/apistatusesupdate.php:162 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "" -#: actions/apistatusesupdate.php:203 +#: actions/apistatusesupdate.php:202 msgid "Not found" msgstr "" -#: actions/apistatusesupdate.php:226 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -606,11 +666,6 @@ msgstr "" msgid "%s updates from everyone!" msgstr "" -#: actions/apitimelineretweetedbyme.php:112 -#, php-format -msgid "Repeated by %s" -msgstr "" - #: actions/apitimelineretweetedtome.php:111 #, php-format msgid "Repeated to %s" @@ -750,7 +805,7 @@ msgstr "Αδυναμία διαγραφής αυτού του μηνύματος #: actions/deleteuser.php:148 actions/groupblock.php:179 #: lib/repeatform.php:132 msgid "Yes" -msgstr "Ναί" +msgstr "Ναι" #: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80 msgid "Block this user" @@ -1020,17 +1075,6 @@ msgstr "" msgid "Reset back to default" msgstr "" -#: actions/designadminpanel.php:586 actions/emailsettings.php:195 -#: actions/imsettings.php:163 actions/othersettings.php:126 -#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174 -#: actions/siteadminpanel.php:388 actions/smssettings.php:181 -#: actions/subscriptions.php:203 actions/tagother.php:154 -#: actions/useradminpanel.php:313 lib/applicationeditform.php:335 -#: lib/applicationeditform.php:336 lib/designsettings.php:256 -#: lib/groupeditform.php:202 -msgid "Save" -msgstr "" - #: actions/designadminpanel.php:587 lib/designsettings.php:257 msgid "Save design" msgstr "" @@ -1043,13 +1087,15 @@ msgstr "" msgid "Add to favorites" msgstr "" -#: actions/doc.php:69 -msgid "No such document." +#: actions/doc.php:155 +#, php-format +msgid "No such document \"%s\"" msgstr "" -#: actions/editapplication.php:54 lib/applicationeditform.php:136 -msgid "Edit application" -msgstr "" +#: actions/editapplication.php:54 +#, fuzzy +msgid "Edit Application" +msgstr "Δεν υπάρχει τέτοιο σελίδα." #: actions/editapplication.php:66 msgid "You must be logged in to edit an application." @@ -1067,7 +1113,7 @@ msgid "No such application." msgstr "Δεν υπάρχει τέτοιο σελίδα." #: actions/editapplication.php:127 actions/newapplication.php:110 -#: actions/showapplication.php:118 lib/action.php:1189 +#: actions/showapplication.php:118 lib/action.php:1195 msgid "There was a problem with your session token." msgstr "" @@ -1278,7 +1324,7 @@ msgid "Cannot normalize that email address" msgstr "Αδυναμία κανονικοποίησης αυτής της email διεύθυνσης" #: actions/emailsettings.php:331 actions/register.php:201 -#: actions/siteadminpanel.php:157 +#: actions/siteadminpanel.php:143 msgid "Not a valid email address." msgstr "" @@ -1290,7 +1336,7 @@ msgstr "" msgid "That email address already belongs to another user." msgstr "" -#: actions/emailsettings.php:353 actions/imsettings.php:317 +#: actions/emailsettings.php:353 actions/imsettings.php:319 #: actions/smssettings.php:337 msgid "Couldn't insert confirmation code." msgstr "Απέτυχε η εισαγωγή κωδικού επιβεβαίωσης." @@ -1593,7 +1639,7 @@ msgstr "" msgid "A list of the users in this group." msgstr "" -#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107 +#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107 msgid "Admin" msgstr "Διαχειριστής" @@ -1778,6 +1824,11 @@ msgstr "" msgid "That is not your Jabber ID." msgstr "" +#: actions/inbox.php:59 +#, php-format +msgid "Inbox for %1$s - page %2$d" +msgstr "" + #: actions/inbox.php:62 #, php-format msgid "Inbox for %s" @@ -1928,7 +1979,7 @@ msgstr "Λάθος όνομα χρήστη ή κωδικός" msgid "Error setting user. You are probably not authorized." msgstr "" -#: actions/login.php:188 actions/login.php:241 lib/action.php:460 +#: actions/login.php:188 actions/login.php:241 lib/action.php:466 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Σύνδεση" @@ -1991,8 +2042,9 @@ msgid "No current status" msgstr "" #: actions/newapplication.php:52 -msgid "New application" -msgstr "" +#, fuzzy +msgid "New Application" +msgstr "Δεν υπάρχει τέτοιο σελίδα." #: actions/newapplication.php:64 msgid "You must be logged in to register an application." @@ -2176,8 +2228,8 @@ msgstr "Σύνδεση" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1038 -#: lib/api.php:1066 lib/api.php:1176 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1039 +#: lib/api.php:1067 lib/api.php:1177 msgid "Not a supported data format." msgstr "" @@ -2246,6 +2298,11 @@ msgstr "Μήνυμα" msgid "Login token expired." msgstr "" +#: actions/outbox.php:58 +#, php-format +msgid "Outbox for %1$s - page %2$d" +msgstr "" + #: actions/outbox.php:61 #, php-format msgid "Outbox for %s" @@ -2318,7 +2375,7 @@ msgstr "Αδύνατη η αποθήκευση του νέου κωδικού" msgid "Password saved." msgstr "Ο κωδικός αποθηκεύτηκε." -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:331 msgid "Paths" msgstr "" @@ -2326,138 +2383,155 @@ msgstr "" msgid "Path and server settings for this StatusNet site." msgstr "" -#: actions/pathsadminpanel.php:140 +#: actions/pathsadminpanel.php:157 #, fuzzy, php-format msgid "Theme directory not readable: %s" msgstr "Η αρχική σελίδα δεν είναι έγκυρο URL." -#: actions/pathsadminpanel.php:146 +#: actions/pathsadminpanel.php:163 #, php-format msgid "Avatar directory not writable: %s" msgstr "" -#: actions/pathsadminpanel.php:152 +#: actions/pathsadminpanel.php:169 #, php-format msgid "Background directory not writable: %s" msgstr "" -#: actions/pathsadminpanel.php:160 +#: actions/pathsadminpanel.php:177 #, php-format msgid "Locales directory not readable: %s" msgstr "" -#: actions/pathsadminpanel.php:166 +#: actions/pathsadminpanel.php:183 msgid "Invalid SSL server. The maximum length is 255 characters." msgstr "" -#: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58 +#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58 #: lib/adminpanelaction.php:311 msgid "Site" msgstr "" -#: actions/pathsadminpanel.php:221 +#: actions/pathsadminpanel.php:238 +#, fuzzy +msgid "Server" +msgstr "Αποχώρηση" + +#: actions/pathsadminpanel.php:238 +msgid "Site's server hostname." +msgstr "" + +#: actions/pathsadminpanel.php:242 msgid "Path" msgstr "" -#: actions/pathsadminpanel.php:221 +#: actions/pathsadminpanel.php:242 msgid "Site path" msgstr "" -#: actions/pathsadminpanel.php:225 +#: actions/pathsadminpanel.php:246 msgid "Path to locales" msgstr "" -#: actions/pathsadminpanel.php:225 +#: actions/pathsadminpanel.php:246 msgid "Directory path to locales" msgstr "" -#: actions/pathsadminpanel.php:232 -msgid "Theme" -msgstr "" - -#: actions/pathsadminpanel.php:237 -msgid "Theme server" -msgstr "" - -#: actions/pathsadminpanel.php:241 -msgid "Theme path" -msgstr "" - -#: actions/pathsadminpanel.php:245 -msgid "Theme directory" +#: actions/pathsadminpanel.php:250 +msgid "Fancy URLs" msgstr "" #: actions/pathsadminpanel.php:252 +msgid "Use fancy (more readable and memorable) URLs?" +msgstr "" + +#: actions/pathsadminpanel.php:259 +msgid "Theme" +msgstr "" + +#: actions/pathsadminpanel.php:264 +msgid "Theme server" +msgstr "" + +#: actions/pathsadminpanel.php:268 +msgid "Theme path" +msgstr "" + +#: actions/pathsadminpanel.php:272 +msgid "Theme directory" +msgstr "" + +#: actions/pathsadminpanel.php:279 #, fuzzy msgid "Avatars" msgstr "Ρυθμίσεις OpenID" -#: actions/pathsadminpanel.php:257 +#: actions/pathsadminpanel.php:284 #, fuzzy msgid "Avatar server" msgstr "Ρυθμίσεις OpenID" -#: actions/pathsadminpanel.php:261 +#: actions/pathsadminpanel.php:288 #, fuzzy msgid "Avatar path" msgstr "Ρυθμίσεις OpenID" -#: actions/pathsadminpanel.php:265 +#: actions/pathsadminpanel.php:292 #, fuzzy msgid "Avatar directory" msgstr "Ρυθμίσεις OpenID" -#: actions/pathsadminpanel.php:274 +#: actions/pathsadminpanel.php:301 msgid "Backgrounds" msgstr "" -#: actions/pathsadminpanel.php:278 +#: actions/pathsadminpanel.php:305 msgid "Background server" msgstr "" -#: actions/pathsadminpanel.php:282 +#: actions/pathsadminpanel.php:309 msgid "Background path" msgstr "" -#: actions/pathsadminpanel.php:286 +#: actions/pathsadminpanel.php:313 msgid "Background directory" msgstr "" -#: actions/pathsadminpanel.php:293 +#: actions/pathsadminpanel.php:320 msgid "SSL" msgstr "" -#: actions/pathsadminpanel.php:296 actions/siteadminpanel.php:346 +#: actions/pathsadminpanel.php:323 actions/siteadminpanel.php:294 #, fuzzy msgid "Never" msgstr "Αποχώρηση" -#: actions/pathsadminpanel.php:297 +#: actions/pathsadminpanel.php:324 msgid "Sometimes" msgstr "" -#: actions/pathsadminpanel.php:298 +#: actions/pathsadminpanel.php:325 msgid "Always" msgstr "" -#: actions/pathsadminpanel.php:302 +#: actions/pathsadminpanel.php:329 msgid "Use SSL" msgstr "" -#: actions/pathsadminpanel.php:303 +#: actions/pathsadminpanel.php:330 msgid "When to use SSL" msgstr "" -#: actions/pathsadminpanel.php:308 +#: actions/pathsadminpanel.php:335 #, fuzzy msgid "SSL server" msgstr "Αποχώρηση" -#: actions/pathsadminpanel.php:309 +#: actions/pathsadminpanel.php:336 msgid "Server to direct SSL requests to" msgstr "" -#: actions/pathsadminpanel.php:325 +#: actions/pathsadminpanel.php:352 msgid "Save paths" msgstr "" @@ -2563,7 +2637,7 @@ msgid "" "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated" msgstr "" -#: actions/profilesettings.php:151 actions/siteadminpanel.php:294 +#: actions/profilesettings.php:151 actions/siteadminpanel.php:280 msgid "Language" msgstr "" @@ -2592,7 +2666,7 @@ msgstr "" msgid "Bio is too long (max %d chars)." msgstr "Το βιογραφικό είναι πολύ μεγάλο (μέγιστο 140 χαρακτ.)." -#: actions/profilesettings.php:235 actions/siteadminpanel.php:164 +#: actions/profilesettings.php:235 actions/siteadminpanel.php:150 msgid "Timezone not selected." msgstr "" @@ -2855,7 +2929,7 @@ msgstr "" msgid "Registration successful" msgstr "" -#: actions/register.php:114 actions/register.php:503 lib/action.php:457 +#: actions/register.php:114 actions/register.php:503 lib/action.php:463 #: lib/logingroupnav.php:85 msgid "Register" msgstr "" @@ -2895,7 +2969,7 @@ msgid "Same as password above. Required." msgstr "" #: actions/register.php:438 actions/register.php:442 -#: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120 +#: actions/siteadminpanel.php:256 lib/accountsettingsaction.php:120 msgid "Email" msgstr "Email" @@ -3055,6 +3129,11 @@ msgstr "Δημιουργία" msgid "Replies to %s" msgstr "" +#: actions/replies.php:127 +#, php-format +msgid "Replies to %1$s, page %2$d" +msgstr "" + #: actions/replies.php:144 #, fuzzy, php-format msgid "Replies feed for %s (RSS 1.0)" @@ -3180,6 +3259,11 @@ msgid "" "signature method." msgstr "" +#: actions/showfavorites.php:79 +#, fuzzy, php-format +msgid "%1$s's favorite notices, page %2$d" +msgstr "%s και οι φίλοι του/της" + #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "" @@ -3229,6 +3313,11 @@ msgstr "" msgid "%s group" msgstr "" +#: actions/showgroup.php:84 +#, fuzzy, php-format +msgid "%1$s group, page %2$d" +msgstr "Αδύνατη η αποθήκευση των νέων πληροφοριών του προφίλ" + #: actions/showgroup.php:218 #, fuzzy msgid "Group profile" @@ -3341,6 +3430,11 @@ msgstr "Ρυθμίσεις OpenID" msgid " tagged %s" msgstr "" +#: actions/showstream.php:79 +#, fuzzy, php-format +msgid "%1$s, page %2$d" +msgstr "%s και οι φίλοι του/της" + #: actions/showstream.php:122 #, fuzzy, php-format msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" @@ -3418,195 +3512,146 @@ msgstr "" msgid "Basic settings for this StatusNet site." msgstr "" -#: actions/siteadminpanel.php:146 +#: actions/siteadminpanel.php:132 msgid "Site name must have non-zero length." msgstr "" -#: actions/siteadminpanel.php:154 +#: actions/siteadminpanel.php:140 #, fuzzy msgid "You must have a valid contact email address." msgstr "Αδυναμία κανονικοποίησης αυτής της email διεύθυνσης" -#: actions/siteadminpanel.php:172 +#: actions/siteadminpanel.php:158 #, php-format msgid "Unknown language \"%s\"." msgstr "" -#: actions/siteadminpanel.php:179 +#: actions/siteadminpanel.php:165 msgid "Invalid snapshot report URL." msgstr "" -#: actions/siteadminpanel.php:185 +#: actions/siteadminpanel.php:171 msgid "Invalid snapshot run value." msgstr "" -#: actions/siteadminpanel.php:191 +#: actions/siteadminpanel.php:177 msgid "Snapshot frequency must be a number." msgstr "" -#: actions/siteadminpanel.php:197 +#: actions/siteadminpanel.php:183 msgid "Minimum text limit is 140 characters." msgstr "" -#: actions/siteadminpanel.php:203 +#: actions/siteadminpanel.php:189 msgid "Dupe limit must 1 or more seconds." msgstr "" -#: actions/siteadminpanel.php:253 +#: actions/siteadminpanel.php:239 msgid "General" msgstr "" -#: actions/siteadminpanel.php:256 +#: actions/siteadminpanel.php:242 msgid "Site name" msgstr "" -#: actions/siteadminpanel.php:257 +#: actions/siteadminpanel.php:243 msgid "The name of your site, like \"Yourcompany Microblog\"" msgstr "" -#: actions/siteadminpanel.php:261 +#: actions/siteadminpanel.php:247 msgid "Brought by" msgstr "" -#: actions/siteadminpanel.php:262 +#: actions/siteadminpanel.php:248 msgid "Text used for credits link in footer of each page" msgstr "" -#: actions/siteadminpanel.php:266 +#: actions/siteadminpanel.php:252 msgid "Brought by URL" msgstr "" -#: actions/siteadminpanel.php:267 +#: actions/siteadminpanel.php:253 msgid "URL used for credits link in footer of each page" msgstr "" -#: actions/siteadminpanel.php:271 +#: actions/siteadminpanel.php:257 #, fuzzy msgid "Contact email address for your site" msgstr "Η διεύθυνση του εισερχόμενου email αφαιρέθηκε." -#: actions/siteadminpanel.php:277 +#: actions/siteadminpanel.php:263 msgid "Local" msgstr "Τοπικός" -#: actions/siteadminpanel.php:288 +#: actions/siteadminpanel.php:274 msgid "Default timezone" msgstr "" -#: actions/siteadminpanel.php:289 +#: actions/siteadminpanel.php:275 msgid "Default timezone for the site; usually UTC." msgstr "" -#: actions/siteadminpanel.php:295 +#: actions/siteadminpanel.php:281 msgid "Default site language" msgstr "" -#: actions/siteadminpanel.php:303 -msgid "URLs" -msgstr "" - -#: actions/siteadminpanel.php:306 -#, fuzzy -msgid "Server" -msgstr "Αποχώρηση" - -#: actions/siteadminpanel.php:306 -msgid "Site's server hostname." -msgstr "" - -#: actions/siteadminpanel.php:310 -msgid "Fancy URLs" -msgstr "" - -#: actions/siteadminpanel.php:312 -msgid "Use fancy (more readable and memorable) URLs?" -msgstr "" - -#: actions/siteadminpanel.php:318 -msgid "Access" -msgstr "Πρόσβαση" - -#: actions/siteadminpanel.php:321 -msgid "Private" -msgstr "" - -#: actions/siteadminpanel.php:323 -msgid "Prohibit anonymous users (not logged in) from viewing site?" -msgstr "" - -#: actions/siteadminpanel.php:327 -msgid "Invite only" -msgstr "" - -#: actions/siteadminpanel.php:329 -msgid "Make registration invitation only." -msgstr "" - -#: actions/siteadminpanel.php:333 -msgid "Closed" -msgstr "" - -#: actions/siteadminpanel.php:335 -msgid "Disable new registrations." -msgstr "" - -#: actions/siteadminpanel.php:341 +#: actions/siteadminpanel.php:289 msgid "Snapshots" msgstr "" -#: actions/siteadminpanel.php:344 +#: actions/siteadminpanel.php:292 msgid "Randomly during Web hit" msgstr "" -#: actions/siteadminpanel.php:345 +#: actions/siteadminpanel.php:293 msgid "In a scheduled job" msgstr "" -#: actions/siteadminpanel.php:347 +#: actions/siteadminpanel.php:295 msgid "Data snapshots" msgstr "" -#: actions/siteadminpanel.php:348 +#: actions/siteadminpanel.php:296 msgid "When to send statistical data to status.net servers" msgstr "" -#: actions/siteadminpanel.php:353 +#: actions/siteadminpanel.php:301 msgid "Frequency" msgstr "" -#: actions/siteadminpanel.php:354 +#: actions/siteadminpanel.php:302 msgid "Snapshots will be sent once every N web hits" msgstr "" -#: actions/siteadminpanel.php:359 +#: actions/siteadminpanel.php:307 msgid "Report URL" msgstr "" -#: actions/siteadminpanel.php:360 +#: actions/siteadminpanel.php:308 msgid "Snapshots will be sent to this URL" msgstr "" -#: actions/siteadminpanel.php:367 +#: actions/siteadminpanel.php:315 msgid "Limits" msgstr "" -#: actions/siteadminpanel.php:370 +#: actions/siteadminpanel.php:318 msgid "Text limit" msgstr "" -#: actions/siteadminpanel.php:370 +#: actions/siteadminpanel.php:318 msgid "Maximum number of characters for notices." msgstr "" -#: actions/siteadminpanel.php:374 +#: actions/siteadminpanel.php:322 msgid "Dupe limit" msgstr "" -#: actions/siteadminpanel.php:374 +#: actions/siteadminpanel.php:322 msgid "How long users must wait (in seconds) to post the same thing again." msgstr "" -#: actions/siteadminpanel.php:388 actions/useradminpanel.php:313 +#: actions/siteadminpanel.php:336 actions/useradminpanel.php:313 #, fuzzy msgid "Save site settings" msgstr "Ρυθμίσεις OpenID" @@ -3805,6 +3850,11 @@ msgstr "" msgid "SMS" msgstr "" +#: actions/tag.php:68 +#, php-format +msgid "Notices tagged with %1$s, page %2$d" +msgstr "" + #: actions/tag.php:86 #, php-format msgid "Notice feed for tag %s (RSS 1.0)" @@ -4095,6 +4145,11 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "" +#: actions/usergroups.php:64 +#, fuzzy, php-format +msgid "%1$s groups, page %2$d" +msgstr "Αδύνατη η αποθήκευση των νέων πληροφοριών του προφίλ" + #: actions/usergroups.php:130 msgid "Search for more groups" msgstr "" @@ -4157,7 +4212,7 @@ msgstr "" msgid "Plugins" msgstr "" -#: actions/version.php:196 lib/action.php:741 +#: actions/version.php:196 lib/action.php:747 #, fuzzy msgid "Version" msgstr "Προσωπικά" @@ -4215,44 +4270,48 @@ msgstr "" msgid "Could not update message with new URI." msgstr "" -#: classes/Notice.php:171 +#: classes/Notice.php:157 #, php-format msgid "DB error inserting hashtag: %s" msgstr "Σφάλμα στη βάση δεδομένων κατά την εισαγωγή hashtag: %s" -#: classes/Notice.php:225 +#: classes/Notice.php:214 msgid "Problem saving notice. Too long." msgstr "" -#: classes/Notice.php:229 +#: classes/Notice.php:218 msgid "Problem saving notice. Unknown user." msgstr "" -#: classes/Notice.php:234 +#: classes/Notice.php:223 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:240 +#: classes/Notice.php:229 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:246 +#: classes/Notice.php:235 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:305 classes/Notice.php:330 +#: classes/Notice.php:294 classes/Notice.php:319 msgid "Problem saving notice." msgstr "" -#: classes/Notice.php:1059 +#: classes/Notice.php:790 +msgid "Problem saving group inbox." +msgstr "" + +#: classes/Notice.php:850 #, php-format msgid "DB error inserting reply: %s" msgstr "Σφάλμα βάσης δεδομένων κατά την εισαγωγή απάντησης: %s" -#: classes/Notice.php:1441 +#: classes/Notice.php:1233 #, php-format msgid "RT @%1$s %2$s" msgstr "" @@ -4308,125 +4367,125 @@ msgstr "" msgid "Untitled page" msgstr "" -#: lib/action.php:427 +#: lib/action.php:433 msgid "Primary site navigation" msgstr "" -#: lib/action.php:433 +#: lib/action.php:439 msgid "Home" msgstr "Αρχή" -#: lib/action.php:433 +#: lib/action.php:439 msgid "Personal profile and friends timeline" msgstr "" -#: lib/action.php:435 +#: lib/action.php:441 msgid "Change your email, avatar, password, profile" msgstr "" -#: lib/action.php:438 +#: lib/action.php:444 msgid "Connect" msgstr "Σύνδεση" -#: lib/action.php:438 +#: lib/action.php:444 #, fuzzy msgid "Connect to services" msgstr "Αδυναμία ανακατεύθηνσης στο διακομιστή: %s" -#: lib/action.php:442 +#: lib/action.php:448 msgid "Change site configuration" msgstr "" -#: lib/action.php:446 lib/subgroupnav.php:105 +#: lib/action.php:452 lib/subgroupnav.php:105 msgid "Invite" msgstr "" -#: lib/action.php:447 lib/subgroupnav.php:106 +#: lib/action.php:453 lib/subgroupnav.php:106 #, php-format msgid "Invite friends and colleagues to join you on %s" msgstr "Προσκάλεσε φίλους και συναδέλφους σου να γίνουν μέλη στο %s" -#: lib/action.php:452 +#: lib/action.php:458 msgid "Logout" msgstr "Αποσύνδεση" -#: lib/action.php:452 +#: lib/action.php:458 msgid "Logout from the site" msgstr "" -#: lib/action.php:457 +#: lib/action.php:463 msgid "Create an account" -msgstr "Δημιουργία έναν λογαριασμού" +msgstr "Δημιουργία ενός λογαριασμού" -#: lib/action.php:460 +#: lib/action.php:466 msgid "Login to the site" msgstr "" -#: lib/action.php:463 lib/action.php:726 +#: lib/action.php:469 lib/action.php:732 msgid "Help" msgstr "Βοήθεια" -#: lib/action.php:463 +#: lib/action.php:469 msgid "Help me!" msgstr "Βοηθήστε με!" -#: lib/action.php:466 lib/searchaction.php:127 +#: lib/action.php:472 lib/searchaction.php:127 msgid "Search" msgstr "" -#: lib/action.php:466 +#: lib/action.php:472 msgid "Search for people or text" msgstr "" -#: lib/action.php:487 +#: lib/action.php:493 msgid "Site notice" msgstr "" -#: lib/action.php:553 +#: lib/action.php:559 msgid "Local views" msgstr "" -#: lib/action.php:619 +#: lib/action.php:625 msgid "Page notice" msgstr "" -#: lib/action.php:721 +#: lib/action.php:727 msgid "Secondary site navigation" msgstr "" -#: lib/action.php:728 +#: lib/action.php:734 msgid "About" msgstr "Περί" -#: lib/action.php:730 +#: lib/action.php:736 msgid "FAQ" msgstr "Συχνές ερωτήσεις" -#: lib/action.php:734 +#: lib/action.php:740 msgid "TOS" msgstr "" -#: lib/action.php:737 +#: lib/action.php:743 msgid "Privacy" msgstr "" -#: lib/action.php:739 +#: lib/action.php:745 msgid "Source" msgstr "" -#: lib/action.php:743 +#: lib/action.php:749 msgid "Contact" msgstr "Επικοινωνία" -#: lib/action.php:745 +#: lib/action.php:751 msgid "Badge" msgstr "" -#: lib/action.php:773 +#: lib/action.php:779 msgid "StatusNet software license" msgstr "" -#: lib/action.php:776 +#: lib/action.php:782 #, fuzzy, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -4435,13 +4494,13 @@ msgstr "" "To **%%site.name%%** είναι μία υπηρεσία microblogging (μικρο-ιστολογίου) που " "έφερε κοντά σας το [%%site.broughtby%%](%%site.broughtbyurl%%). " -#: lib/action.php:778 +#: lib/action.php:784 #, fuzzy, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "" "Το **%%site.name%%** είναι μία υπηρεσία microblogging (μικρο-ιστολογίου). " -#: lib/action.php:780 +#: lib/action.php:786 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4449,41 +4508,41 @@ msgid "" "org/licensing/licenses/agpl-3.0.html)." msgstr "" -#: lib/action.php:795 +#: lib/action.php:801 msgid "Site content license" msgstr "" -#: lib/action.php:800 +#: lib/action.php:806 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "" -#: lib/action.php:805 +#: lib/action.php:811 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" -#: lib/action.php:808 +#: lib/action.php:814 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" -#: lib/action.php:820 +#: lib/action.php:826 msgid "All " msgstr "" -#: lib/action.php:825 +#: lib/action.php:831 msgid "license." msgstr "" -#: lib/action.php:1124 +#: lib/action.php:1130 msgid "Pagination" msgstr "" -#: lib/action.php:1133 +#: lib/action.php:1139 msgid "After" msgstr "" -#: lib/action.php:1141 +#: lib/action.php:1147 msgid "Before" msgstr "" @@ -4517,11 +4576,25 @@ msgstr "Επιβεβαίωση διεύθυνσης email" msgid "Design configuration" msgstr "Επιβεβαίωση διεύθυνσης email" -#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327 +#: lib/adminpanelaction.php:322 +#, fuzzy +msgid "User configuration" +msgstr "Επιβεβαίωση διεύθυνσης email" + +#: lib/adminpanelaction.php:327 +#, fuzzy +msgid "Access configuration" +msgstr "Επιβεβαίωση διεύθυνσης email" + +#: lib/adminpanelaction.php:332 #, fuzzy msgid "Paths configuration" msgstr "Επιβεβαίωση διεύθυνσης email" +#: lib/applicationeditform.php:136 +msgid "Edit application" +msgstr "" + #: lib/applicationeditform.php:186 msgid "Icon for this application" msgstr "" @@ -5000,7 +5073,7 @@ msgstr "Περιγράψτε την ομάδα ή το θέμα" #: lib/groupeditform.php:170 #, php-format msgid "Describe the group or topic in %d characters" -msgstr "Περιγράψτε την ομάδα ή το θέμα μέχρι %d χαρακτήρες" +msgstr "Περιγράψτε την ομάδα ή το θέμα χρησιμοποιώντας μέχρι %d χαρακτήρες" #: lib/groupeditform.php:179 msgid "" @@ -5099,12 +5172,12 @@ msgstr "" msgid "kB" msgstr "" -#: lib/jabber.php:202 +#: lib/jabber.php:220 #, php-format msgid "[%s]" msgstr "" -#: lib/jabber.php:385 +#: lib/jabber.php:400 #, php-format msgid "Unknown inbox source %d." msgstr "" @@ -5519,19 +5592,19 @@ msgstr "" msgid "Favorites" msgstr "" -#: lib/personalgroupnav.php:124 +#: lib/personalgroupnav.php:125 msgid "Inbox" msgstr "" -#: lib/personalgroupnav.php:125 +#: lib/personalgroupnav.php:126 msgid "Your incoming messages" msgstr "" -#: lib/personalgroupnav.php:129 +#: lib/personalgroupnav.php:130 msgid "Outbox" msgstr "" -#: lib/personalgroupnav.php:130 +#: lib/personalgroupnav.php:131 msgid "Your sent messages" msgstr "" @@ -5781,61 +5854,61 @@ msgstr "Μήνυμα" msgid "Moderate" msgstr "" -#: lib/util.php:875 +#: lib/util.php:868 msgid "a few seconds ago" msgstr "" -#: lib/util.php:877 +#: lib/util.php:870 msgid "about a minute ago" msgstr "" -#: lib/util.php:879 +#: lib/util.php:872 #, php-format msgid "about %d minutes ago" msgstr "" -#: lib/util.php:881 +#: lib/util.php:874 msgid "about an hour ago" msgstr "" -#: lib/util.php:883 +#: lib/util.php:876 #, php-format msgid "about %d hours ago" msgstr "" -#: lib/util.php:885 +#: lib/util.php:878 msgid "about a day ago" msgstr "" -#: lib/util.php:887 +#: lib/util.php:880 #, php-format msgid "about %d days ago" msgstr "" -#: lib/util.php:889 +#: lib/util.php:882 msgid "about a month ago" msgstr "" -#: lib/util.php:891 +#: lib/util.php:884 #, php-format msgid "about %d months ago" msgstr "" -#: lib/util.php:893 +#: lib/util.php:886 msgid "about a year ago" msgstr "" #: lib/webcolor.php:82 #, php-format msgid "%s is not a valid color!" -msgstr "%s δεν είναι ένα έγκυρο χρώμα!" +msgstr "Το %s δεν είναι ένα έγκυρο χρώμα!" #: lib/webcolor.php:123 #, php-format msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "" -#: scripts/xmppdaemon.php:301 +#: lib/xmppmanager.php:402 #, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po index 11257ae752..4c5e4efdf8 100644 --- a/locale/en_GB/LC_MESSAGES/statusnet.po +++ b/locale/en_GB/LC_MESSAGES/statusnet.po @@ -10,17 +10,71 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-21 22:36+0000\n" -"PO-Revision-Date: 2010-01-21 22:37:23+0000\n" +"POT-Creation-Date: 2010-01-27 23:58+0000\n" +"PO-Revision-Date: 2010-01-27 23:58:42+0000\n" "Language-Team: British English\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r61339); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61595); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: en-gb\n" "X-Message-Group: out-statusnet\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#: actions/accessadminpanel.php:54 lib/adminpanelaction.php:326 +msgid "Access" +msgstr "Access" + +#: actions/accessadminpanel.php:65 +#, fuzzy +msgid "Site access settings" +msgstr "Save site settings" + +#: actions/accessadminpanel.php:158 +#, fuzzy +msgid "Registration" +msgstr "Register" + +#: actions/accessadminpanel.php:161 +msgid "Private" +msgstr "Private" + +#: actions/accessadminpanel.php:163 +msgid "Prohibit anonymous users (not logged in) from viewing site?" +msgstr "" + +#: actions/accessadminpanel.php:167 +msgid "Invite only" +msgstr "Invite only" + +#: actions/accessadminpanel.php:169 +msgid "Make registration invitation only." +msgstr "" + +#: actions/accessadminpanel.php:173 +msgid "Closed" +msgstr "Closed" + +#: actions/accessadminpanel.php:175 +msgid "Disable new registrations." +msgstr "" + +#: actions/accessadminpanel.php:189 actions/designadminpanel.php:586 +#: actions/emailsettings.php:195 actions/imsettings.php:163 +#: actions/othersettings.php:126 actions/pathsadminpanel.php:351 +#: actions/profilesettings.php:174 actions/siteadminpanel.php:336 +#: actions/smssettings.php:181 actions/subscriptions.php:203 +#: actions/tagother.php:154 actions/useradminpanel.php:313 +#: lib/applicationeditform.php:335 lib/applicationeditform.php:336 +#: lib/designsettings.php:256 lib/groupeditform.php:202 +msgid "Save" +msgstr "Save" + +#: actions/accessadminpanel.php:189 +#, fuzzy +msgid "Save access settings" +msgstr "Save site settings" + #: actions/all.php:63 actions/public.php:97 actions/replies.php:92 #: actions/showfavorites.php:137 actions/tag.php:51 msgid "No such page" @@ -35,7 +89,7 @@ msgstr "No such page" #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:149 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 @@ -53,9 +107,9 @@ msgid "No such user." msgstr "No such user." #: actions/all.php:84 -#, fuzzy, php-format +#, php-format msgid "%1$s and friends, page %2$d" -msgstr "%s blocked profiles, page %d" +msgstr "%1$s and friends, page %2$d" #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 #: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 @@ -96,13 +150,13 @@ msgstr "" "something yourself." #: actions/all.php:134 -#, fuzzy, php-format +#, php-format msgid "" "You can try to [nudge %1$s](../%2$s) from his profile or [post something to " "his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" -"You can try to [nudge %s](../%s) from his profile or [post something to his " -"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)." +"You can try to [nudge %1$s](../%2$s) from his profile or [post something to " +"his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." #: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202 #, php-format @@ -141,8 +195,7 @@ msgstr "Updates from %1$s and friends on %2$s!" #: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 #: actions/apitimelinefriends.php:155 actions/apitimelinegroup.php:150 #: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 -#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found." @@ -158,7 +211,7 @@ msgstr "API method not found." #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:119 +#: actions/apistatusesupdate.php:118 msgid "This method requires a POST." msgstr "This method requires a POST." @@ -191,7 +244,7 @@ msgstr "Couldn't save profile." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:132 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 #: actions/designadminpanel.php:122 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -273,18 +326,16 @@ msgid "No status found with that ID." msgstr "No status found with that ID." #: actions/apifavoritecreate.php:119 -#, fuzzy msgid "This status is already a favorite." -msgstr "This status is already a favourite!" +msgstr "This status is already a favourite." #: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 msgid "Could not create favorite." msgstr "Could not create favourite." #: actions/apifavoritedestroy.php:122 -#, fuzzy msgid "That status is not a favorite." -msgstr "That status is not a favourite!" +msgstr "That status is not a favourite." #: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 msgid "Could not delete favorite." @@ -304,9 +355,8 @@ msgid "Could not unfollow user: User not found." msgstr "Could not unfollow user: User not found." #: actions/apifriendshipsdestroy.php:120 -#, fuzzy msgid "You cannot unfollow yourself." -msgstr "You cannot unfollow yourself!" +msgstr "You cannot unfollow yourself." #: actions/apifriendshipsexists.php:94 msgid "Two user ids or screen_names must be supplied." @@ -401,18 +451,18 @@ msgid "You have been blocked from that group by the admin." msgstr "You have been blocked from that group by the admin." #: actions/apigroupjoin.php:138 actions/joingroup.php:124 -#, fuzzy, php-format +#, php-format msgid "Could not join user %1$s to group %2$s." -msgstr "Could not join user %s to group %s." +msgstr "Could not join user %1$s to group %2$s." #: actions/apigroupleave.php:114 msgid "You are not a member of this group." msgstr "You are not a member of this group." #: actions/apigroupleave.php:124 actions/leavegroup.php:119 -#, fuzzy, php-format +#, php-format msgid "Could not remove user %1$s from group %2$s." -msgstr "Could not remove user %s to group %s." +msgstr "Could not remove user %1$s to group %2$s." #: actions/apigrouplist.php:95 #, php-format @@ -431,7 +481,7 @@ msgstr "groups on %s" #: actions/apioauthauthorize.php:108 actions/apioauthauthorize.php:114 msgid "Bad request." -msgstr "" +msgstr "Bad request." #: actions/apioauthauthorize.php:134 actions/avatarsettings.php:268 #: actions/deletenotice.php:157 actions/disfavor.php:74 @@ -452,19 +502,16 @@ 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/apioauthauthorize.php:146 -#, fuzzy msgid "Invalid nickname / password!" -msgstr "Invalid username or password." +msgstr "Invalid nickname / password!" #: actions/apioauthauthorize.php:170 -#, fuzzy msgid "DB error deleting OAuth app user." -msgstr "Error setting user." +msgstr "DB error deleting OAuth app user." #: actions/apioauthauthorize.php:196 -#, fuzzy msgid "DB error inserting OAuth app user." -msgstr "DB error inserting hashtag: %s" +msgstr "DB error inserting OAuth app user." #: actions/apioauthauthorize.php:231 #, php-format @@ -472,11 +519,13 @@ msgid "" "The request token %s has been authorized. Please exchange it for an access " "token." msgstr "" +"The request token %s has been authorised. Please exchange it for an access " +"token." #: actions/apioauthauthorize.php:241 #, php-format msgid "The request token %s has been denied." -msgstr "" +msgstr "The request token %s has been denied." #: actions/apioauthauthorize.php:246 actions/avatarsettings.php:281 #: actions/designadminpanel.php:103 actions/editapplication.php:139 @@ -495,7 +544,14 @@ msgstr "" msgid "Allow or deny access" msgstr "" -#: actions/apioauthauthorize.php:320 lib/action.php:435 +#: actions/apioauthauthorize.php:306 +#, php-format +msgid "" +"The application %s by %s would like the " +"ability to %s your account data." +msgstr "" + +#: actions/apioauthauthorize.php:320 lib/action.php:441 msgid "Account" msgstr "Account" @@ -512,18 +568,16 @@ msgid "Password" msgstr "Password" #: actions/apioauthauthorize.php:338 -#, fuzzy msgid "Deny" -msgstr "Design" +msgstr "Deny" #: actions/apioauthauthorize.php:344 -#, fuzzy msgid "Allow" -msgstr "All" +msgstr "Allow" #: actions/apioauthauthorize.php:361 msgid "Allow or deny access to your account information." -msgstr "" +msgstr "Allow or deny access to your account information." #: actions/apistatusesdestroy.php:107 msgid "This method requires a POST or DELETE." @@ -554,17 +608,17 @@ msgstr "Status deleted." msgid "No status with that ID found." msgstr "No status with that ID found." -#: actions/apistatusesupdate.php:162 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "That's too long. Max notice size is %d chars." -#: actions/apistatusesupdate.php:203 +#: actions/apistatusesupdate.php:202 msgid "Not found" msgstr "Not found" -#: actions/apistatusesupdate.php:226 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "Max notice size is %d chars, including attachment URL." @@ -574,14 +628,14 @@ msgid "Unsupported format." msgstr "Unsupported format." #: actions/apitimelinefavorites.php:108 -#, fuzzy, php-format +#, php-format msgid "%1$s / Favorites from %2$s" -msgstr "%s / Favourites from %s" +msgstr "%1$s / Favourites from %2$s" #: actions/apitimelinefavorites.php:120 -#, fuzzy, php-format +#, php-format msgid "%1$s updates favorited by %2$s / %2$s." -msgstr "%s updates favourited by %s / %s." +msgstr "%1$s updates favourited by %2$s / %2$s." #: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118 #: actions/grouprss.php:131 actions/userrss.php:90 @@ -615,11 +669,6 @@ msgstr "%s public timeline" msgid "%s updates from everyone!" msgstr "%s updates from everyone!" -#: actions/apitimelineretweetedbyme.php:112 -#, php-format -msgid "Repeated by %s" -msgstr "Repeated by %s" - #: actions/apitimelineretweetedtome.php:111 #, php-format msgid "Repeated to %s" @@ -785,9 +834,9 @@ msgid "%s blocked profiles" msgstr "%s blocked profiles" #: actions/blockedfromgroup.php:93 -#, fuzzy, php-format +#, php-format msgid "%1$s blocked profiles, page %2$d" -msgstr "%s blocked profiles, page %d" +msgstr "%1$s blocked profiles, page %2$d" #: actions/blockedfromgroup.php:108 msgid "A list of the users blocked from joining this group." @@ -844,9 +893,8 @@ msgid "Couldn't delete email confirmation." msgstr "Couldn't delete e-mail confirmation." #: actions/confirmaddress.php:144 -#, fuzzy msgid "Confirm address" -msgstr "Confirm Address" +msgstr "Confirm address" #: actions/confirmaddress.php:159 #, php-format @@ -951,18 +999,16 @@ msgid "Site logo" msgstr "Site logo" #: actions/designadminpanel.php:387 -#, fuzzy msgid "Change theme" -msgstr "Change" +msgstr "Change theme" #: actions/designadminpanel.php:404 msgid "Site theme" msgstr "Site theme" #: actions/designadminpanel.php:405 -#, fuzzy msgid "Theme for the site." -msgstr "Logout from the site" +msgstr "Theme for the site." #: actions/designadminpanel.php:417 lib/designsettings.php:101 msgid "Change background image" @@ -974,11 +1020,13 @@ msgid "Background" msgstr "Background" #: actions/designadminpanel.php:427 -#, fuzzy, php-format +#, php-format msgid "" "You can upload a background image for the site. The maximum file size is %1" "$s." -msgstr "You can upload a logo image for your group." +msgstr "" +"You can upload a background image for the site. The maximum file size is %1" +"$s." #: actions/designadminpanel.php:457 lib/designsettings.php:139 msgid "On" @@ -1030,17 +1078,6 @@ msgstr "Restore default designs" msgid "Reset back to default" msgstr "Reset back to default" -#: actions/designadminpanel.php:586 actions/emailsettings.php:195 -#: actions/imsettings.php:163 actions/othersettings.php:126 -#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174 -#: actions/siteadminpanel.php:388 actions/smssettings.php:181 -#: actions/subscriptions.php:203 actions/tagother.php:154 -#: actions/useradminpanel.php:313 lib/applicationeditform.php:335 -#: lib/applicationeditform.php:336 lib/designsettings.php:256 -#: lib/groupeditform.php:202 -msgid "Save" -msgstr "Save" - #: actions/designadminpanel.php:587 lib/designsettings.php:257 msgid "Save design" msgstr "Save design" @@ -1053,13 +1090,15 @@ msgstr "This notice is not a favourite!" msgid "Add to favorites" msgstr "Add to favourites" -#: actions/doc.php:69 -msgid "No such document." +#: actions/doc.php:155 +#, fuzzy, php-format +msgid "No such document \"%s\"" msgstr "No such document." -#: actions/editapplication.php:54 lib/applicationeditform.php:136 -msgid "Edit application" -msgstr "" +#: actions/editapplication.php:54 +#, fuzzy +msgid "Edit Application" +msgstr "Other options" #: actions/editapplication.php:66 #, fuzzy @@ -1078,7 +1117,7 @@ msgid "No such application." msgstr "No such notice." #: actions/editapplication.php:127 actions/newapplication.php:110 -#: actions/showapplication.php:118 lib/action.php:1189 +#: actions/showapplication.php:118 lib/action.php:1195 msgid "There was a problem with your session token." msgstr "There was a problem with your session token." @@ -1113,7 +1152,7 @@ msgstr "Homepage is not a valid URL." #: actions/editapplication.php:200 actions/newapplication.php:185 msgid "Organization is required." -msgstr "" +msgstr "Organisation is required." #: actions/editapplication.php:203 actions/newapplication.php:188 #, fuzzy @@ -1122,7 +1161,7 @@ msgstr "Location is too long (max 255 chars)." #: actions/editapplication.php:206 actions/newapplication.php:191 msgid "Organization homepage is required." -msgstr "" +msgstr "Organisation homepage is required." #: actions/editapplication.php:215 actions/newapplication.php:203 msgid "Callback is too long." @@ -1174,9 +1213,8 @@ msgid "Options saved." msgstr "Options saved." #: actions/emailsettings.php:60 -#, fuzzy msgid "Email settings" -msgstr "E-mail Settings" +msgstr "E-mail settings" #: actions/emailsettings.php:71 #, php-format @@ -1213,9 +1251,8 @@ msgid "Cancel" msgstr "Cancel" #: actions/emailsettings.php:121 -#, fuzzy msgid "Email address" -msgstr "E-mail addresses" +msgstr "E-mail address" #: actions/emailsettings.php:123 msgid "Email address, like \"UserName@example.org\"" @@ -1289,7 +1326,7 @@ msgid "Cannot normalize that email address" msgstr "Cannot normalise that e-mail address" #: actions/emailsettings.php:331 actions/register.php:201 -#: actions/siteadminpanel.php:157 +#: actions/siteadminpanel.php:143 msgid "Not a valid email address." msgstr "Not a valid e-mail address." @@ -1301,7 +1338,7 @@ msgstr "That is already your e-mail address." msgid "That email address already belongs to another user." msgstr "That e-mail address already belongs to another user." -#: actions/emailsettings.php:353 actions/imsettings.php:317 +#: actions/emailsettings.php:353 actions/imsettings.php:319 #: actions/smssettings.php:337 msgid "Couldn't insert confirmation code." msgstr "Couldn't insert confirmation code." @@ -1523,15 +1560,15 @@ msgid "Block user from group" msgstr "Block user" #: actions/groupblock.php:162 -#, fuzzy, php-format +#, php-format msgid "" "Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They " "will be removed from the group, unable to post, and unable to subscribe to " "the group in the future." msgstr "" -"Are you sure you want to block user \"%s\" from the group \"%s\"? They will " -"be removed from the group, unable to post, and unable to subscribe to the " -"group in the future." +"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They " +"will be removed from the group, unable to post and unable to subscribe to " +"the group in the future." #: actions/groupblock.php:178 msgid "Do not block this user from this group" @@ -1621,7 +1658,7 @@ msgstr "%s group members, page %d" msgid "A list of the users in this group." msgstr "A list of the users in this group." -#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107 +#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107 msgid "Admin" msgstr "Admin" @@ -1667,6 +1704,11 @@ msgid "" "for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup" "%%%%)" msgstr "" +"%%%%site.name%%%% groups let you find and talk with people of similar " +"interests. After you join a group you can send messages to all other members " +"using the syntax \"!groupname\". Don't see a group you like? Try [searching " +"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup" +"%%%%)" #: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 msgid "Create a new group" @@ -1749,9 +1791,8 @@ msgstr "" "message with further instructions. (Did you add %s to your buddy list?)" #: actions/imsettings.php:124 -#, fuzzy msgid "IM address" -msgstr "I.M. Address" +msgstr "IM address" #: actions/imsettings.php:126 #, php-format @@ -1812,6 +1853,11 @@ msgstr "" msgid "That is not your Jabber ID." msgstr "That is not your Jabber ID." +#: actions/inbox.php:59 +#, fuzzy, php-format +msgid "Inbox for %1$s - page %2$d" +msgstr "Inbox for %s" + #: actions/inbox.php:62 #, php-format msgid "Inbox for %s" @@ -1989,11 +2035,10 @@ msgid "Incorrect username or password." msgstr "Incorrect username or password." #: actions/login.php:132 actions/otp.php:120 -#, fuzzy msgid "Error setting user. You are probably not authorized." -msgstr "You are not authorised." +msgstr "Error setting user. You are probably not authorised." -#: actions/login.php:188 actions/login.php:241 lib/action.php:460 +#: actions/login.php:188 actions/login.php:241 lib/action.php:466 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Login" @@ -2055,8 +2100,9 @@ msgid "No current status" msgstr "No current status" #: actions/newapplication.php:52 -msgid "New application" -msgstr "" +#, fuzzy +msgid "New Application" +msgstr "No such notice." #: actions/newapplication.php:64 #, fuzzy @@ -2160,6 +2206,8 @@ msgid "" "Why not [register an account](%%%%action.register%%%%) and be the first to " "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!" msgstr "" +"Why not [register an account](%%%%action.register%%%%) and be the first to " +"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!" #: actions/noticesearchrss.php:96 #, php-format @@ -2224,7 +2272,7 @@ msgstr "" #: actions/oauthconnectionssettings.php:192 #, php-format msgid "You have not authorized any applications to use your account." -msgstr "" +msgstr "You have not authorised any applications to use your account." #: actions/oauthconnectionssettings.php:205 msgid "Developers can edit the registration settings for their applications " @@ -2248,8 +2296,8 @@ msgstr "Connect" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1038 -#: lib/api.php:1066 lib/api.php:1176 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1039 +#: lib/api.php:1067 lib/api.php:1177 msgid "Not a supported data format." msgstr "Not a supported data format." @@ -2276,7 +2324,7 @@ msgstr "" #: actions/othersettings.php:116 msgid "Shorten URLs with" -msgstr "" +msgstr "Shorten URLs with" #: actions/othersettings.php:117 msgid "Automatic shortening service to use." @@ -2320,6 +2368,11 @@ msgstr "Invalid notice content" msgid "Login token expired." msgstr "Login to site" +#: actions/outbox.php:58 +#, fuzzy, php-format +msgid "Outbox for %1$s - page %2$d" +msgstr "Outbox for %s" + #: actions/outbox.php:61 #, php-format msgid "Outbox for %s" @@ -2390,7 +2443,7 @@ msgstr "Can't save new password." msgid "Password saved." msgstr "Password saved." -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:331 msgid "Paths" msgstr "" @@ -2398,138 +2451,154 @@ msgstr "" msgid "Path and server settings for this StatusNet site." msgstr "" -#: actions/pathsadminpanel.php:140 +#: actions/pathsadminpanel.php:157 #, php-format msgid "Theme directory not readable: %s" msgstr "Theme directory not readable: %s" -#: actions/pathsadminpanel.php:146 +#: actions/pathsadminpanel.php:163 #, php-format msgid "Avatar directory not writable: %s" msgstr "" -#: actions/pathsadminpanel.php:152 +#: actions/pathsadminpanel.php:169 #, php-format msgid "Background directory not writable: %s" msgstr "" -#: actions/pathsadminpanel.php:160 +#: actions/pathsadminpanel.php:177 #, php-format msgid "Locales directory not readable: %s" msgstr "" -#: actions/pathsadminpanel.php:166 +#: actions/pathsadminpanel.php:183 msgid "Invalid SSL server. The maximum length is 255 characters." msgstr "" -#: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58 +#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58 #: lib/adminpanelaction.php:311 #, fuzzy msgid "Site" msgstr "Invite" -#: actions/pathsadminpanel.php:221 +#: actions/pathsadminpanel.php:238 +msgid "Server" +msgstr "Server" + +#: actions/pathsadminpanel.php:238 +msgid "Site's server hostname." +msgstr "" + +#: actions/pathsadminpanel.php:242 msgid "Path" msgstr "" -#: actions/pathsadminpanel.php:221 +#: actions/pathsadminpanel.php:242 msgid "Site path" msgstr "Site path" -#: actions/pathsadminpanel.php:225 +#: actions/pathsadminpanel.php:246 msgid "Path to locales" msgstr "" -#: actions/pathsadminpanel.php:225 +#: actions/pathsadminpanel.php:246 msgid "Directory path to locales" msgstr "" -#: actions/pathsadminpanel.php:232 -msgid "Theme" -msgstr "" - -#: actions/pathsadminpanel.php:237 -msgid "Theme server" -msgstr "" - -#: actions/pathsadminpanel.php:241 -msgid "Theme path" -msgstr "" - -#: actions/pathsadminpanel.php:245 -msgid "Theme directory" +#: actions/pathsadminpanel.php:250 +msgid "Fancy URLs" msgstr "" #: actions/pathsadminpanel.php:252 +msgid "Use fancy (more readable and memorable) URLs?" +msgstr "" + +#: actions/pathsadminpanel.php:259 +msgid "Theme" +msgstr "" + +#: actions/pathsadminpanel.php:264 +msgid "Theme server" +msgstr "" + +#: actions/pathsadminpanel.php:268 +msgid "Theme path" +msgstr "" + +#: actions/pathsadminpanel.php:272 +msgid "Theme directory" +msgstr "" + +#: actions/pathsadminpanel.php:279 #, fuzzy msgid "Avatars" msgstr "Avatar" -#: actions/pathsadminpanel.php:257 +#: actions/pathsadminpanel.php:284 #, fuzzy msgid "Avatar server" msgstr "Avatar settings" -#: actions/pathsadminpanel.php:261 +#: actions/pathsadminpanel.php:288 #, fuzzy msgid "Avatar path" msgstr "Avatar updated." -#: actions/pathsadminpanel.php:265 +#: actions/pathsadminpanel.php:292 #, fuzzy msgid "Avatar directory" msgstr "Avatar updated." -#: actions/pathsadminpanel.php:274 +#: actions/pathsadminpanel.php:301 msgid "Backgrounds" msgstr "" -#: actions/pathsadminpanel.php:278 +#: actions/pathsadminpanel.php:305 msgid "Background server" msgstr "" -#: actions/pathsadminpanel.php:282 +#: actions/pathsadminpanel.php:309 msgid "Background path" msgstr "" -#: actions/pathsadminpanel.php:286 +#: actions/pathsadminpanel.php:313 msgid "Background directory" msgstr "" -#: actions/pathsadminpanel.php:293 +#: actions/pathsadminpanel.php:320 msgid "SSL" msgstr "SSL" -#: actions/pathsadminpanel.php:296 actions/siteadminpanel.php:346 +#: actions/pathsadminpanel.php:323 actions/siteadminpanel.php:294 msgid "Never" msgstr "Never" -#: actions/pathsadminpanel.php:297 +#: actions/pathsadminpanel.php:324 msgid "Sometimes" msgstr "Sometimes" -#: actions/pathsadminpanel.php:298 +#: actions/pathsadminpanel.php:325 msgid "Always" msgstr "" -#: actions/pathsadminpanel.php:302 +#: actions/pathsadminpanel.php:329 msgid "Use SSL" msgstr "" -#: actions/pathsadminpanel.php:303 +#: actions/pathsadminpanel.php:330 msgid "When to use SSL" msgstr "" -#: actions/pathsadminpanel.php:308 +#: actions/pathsadminpanel.php:335 #, fuzzy msgid "SSL server" msgstr "Server" -#: actions/pathsadminpanel.php:309 +#: actions/pathsadminpanel.php:336 msgid "Server to direct SSL requests to" msgstr "" -#: actions/pathsadminpanel.php:325 +#: actions/pathsadminpanel.php:352 msgid "Save paths" msgstr "Save paths" @@ -2638,7 +2707,7 @@ msgid "" msgstr "" "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated" -#: actions/profilesettings.php:151 actions/siteadminpanel.php:294 +#: actions/profilesettings.php:151 actions/siteadminpanel.php:280 msgid "Language" msgstr "Language" @@ -2665,7 +2734,7 @@ msgstr "" msgid "Bio is too long (max %d chars)." msgstr "Bio is too long (max %d chars)." -#: actions/profilesettings.php:235 actions/siteadminpanel.php:164 +#: actions/profilesettings.php:235 actions/siteadminpanel.php:150 msgid "Timezone not selected." msgstr "Timezone not selected." @@ -2937,7 +3006,7 @@ msgstr "Error with confirmation code." msgid "Registration successful" msgstr "Registration successful" -#: actions/register.php:114 actions/register.php:503 lib/action.php:457 +#: actions/register.php:114 actions/register.php:503 lib/action.php:463 #: lib/logingroupnav.php:85 msgid "Register" msgstr "Register" @@ -2977,7 +3046,7 @@ msgid "Same as password above. Required." msgstr "Same as password above. Required." #: actions/register.php:438 actions/register.php:442 -#: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120 +#: actions/siteadminpanel.php:256 lib/accountsettingsaction.php:120 msgid "Email" msgstr "E-mail" @@ -3142,6 +3211,11 @@ msgstr "Created" msgid "Replies to %s" msgstr "Replies to %s" +#: actions/replies.php:127 +#, fuzzy, php-format +msgid "Replies to %1$s, page %2$d" +msgstr "Replies to %1$s on %2$s!" + #: actions/replies.php:144 #, php-format msgid "Replies feed for %s (RSS 1.0)" @@ -3272,6 +3346,11 @@ msgid "" "signature method." msgstr "" +#: actions/showfavorites.php:79 +#, fuzzy, php-format +msgid "%1$s's favorite notices, page %2$d" +msgstr "%s's favourite notices" + #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "Could not retrieve favourite notices." @@ -3321,6 +3400,11 @@ msgstr "" msgid "%s group" msgstr "%s group" +#: actions/showgroup.php:84 +#, fuzzy, php-format +msgid "%1$s group, page %2$d" +msgstr "%s group members, page %d" + #: actions/showgroup.php:218 msgid "Group profile" msgstr "Group profile" @@ -3434,6 +3518,11 @@ msgstr "Notice deleted." msgid " tagged %s" msgstr " tagged %s" +#: actions/showstream.php:79 +#, fuzzy, php-format +msgid "%1$s, page %2$d" +msgstr "%1$s and friends, page %2$d" + #: actions/showstream.php:122 #, fuzzy, php-format msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" @@ -3519,195 +3608,147 @@ msgstr "User is already blocked from group." msgid "Basic settings for this StatusNet site." msgstr "" -#: actions/siteadminpanel.php:146 +#: actions/siteadminpanel.php:132 msgid "Site name must have non-zero length." msgstr "" -#: actions/siteadminpanel.php:154 +#: actions/siteadminpanel.php:140 #, fuzzy msgid "You must have a valid contact email address." msgstr "Not a valid e-mail address." -#: actions/siteadminpanel.php:172 +#: actions/siteadminpanel.php:158 #, php-format msgid "Unknown language \"%s\"." msgstr "" -#: actions/siteadminpanel.php:179 +#: actions/siteadminpanel.php:165 msgid "Invalid snapshot report URL." msgstr "" -#: actions/siteadminpanel.php:185 +#: actions/siteadminpanel.php:171 msgid "Invalid snapshot run value." msgstr "" -#: actions/siteadminpanel.php:191 +#: actions/siteadminpanel.php:177 msgid "Snapshot frequency must be a number." msgstr "" -#: actions/siteadminpanel.php:197 +#: actions/siteadminpanel.php:183 msgid "Minimum text limit is 140 characters." msgstr "" -#: actions/siteadminpanel.php:203 +#: actions/siteadminpanel.php:189 msgid "Dupe limit must 1 or more seconds." msgstr "" -#: actions/siteadminpanel.php:253 +#: actions/siteadminpanel.php:239 msgid "General" msgstr "" -#: actions/siteadminpanel.php:256 +#: actions/siteadminpanel.php:242 msgid "Site name" msgstr "Site name" -#: actions/siteadminpanel.php:257 +#: actions/siteadminpanel.php:243 msgid "The name of your site, like \"Yourcompany Microblog\"" msgstr "" -#: actions/siteadminpanel.php:261 +#: actions/siteadminpanel.php:247 msgid "Brought by" msgstr "" -#: actions/siteadminpanel.php:262 +#: actions/siteadminpanel.php:248 msgid "Text used for credits link in footer of each page" msgstr "" -#: actions/siteadminpanel.php:266 +#: actions/siteadminpanel.php:252 msgid "Brought by URL" msgstr "" -#: actions/siteadminpanel.php:267 +#: actions/siteadminpanel.php:253 msgid "URL used for credits link in footer of each page" msgstr "" -#: actions/siteadminpanel.php:271 +#: actions/siteadminpanel.php:257 #, fuzzy msgid "Contact email address for your site" msgstr "New e-mail address for posting to %s" -#: actions/siteadminpanel.php:277 +#: actions/siteadminpanel.php:263 #, fuzzy msgid "Local" msgstr "Local views" -#: actions/siteadminpanel.php:288 +#: actions/siteadminpanel.php:274 msgid "Default timezone" msgstr "" -#: actions/siteadminpanel.php:289 +#: actions/siteadminpanel.php:275 msgid "Default timezone for the site; usually UTC." msgstr "" -#: actions/siteadminpanel.php:295 +#: actions/siteadminpanel.php:281 msgid "Default site language" msgstr "Default site language" -#: actions/siteadminpanel.php:303 -msgid "URLs" -msgstr "URLs" - -#: actions/siteadminpanel.php:306 -msgid "Server" -msgstr "Server" - -#: actions/siteadminpanel.php:306 -msgid "Site's server hostname." -msgstr "" - -#: actions/siteadminpanel.php:310 -msgid "Fancy URLs" -msgstr "" - -#: actions/siteadminpanel.php:312 -msgid "Use fancy (more readable and memorable) URLs?" -msgstr "" - -#: actions/siteadminpanel.php:318 -msgid "Access" -msgstr "Access" - -#: actions/siteadminpanel.php:321 -msgid "Private" -msgstr "Private" - -#: actions/siteadminpanel.php:323 -msgid "Prohibit anonymous users (not logged in) from viewing site?" -msgstr "" - -#: actions/siteadminpanel.php:327 -msgid "Invite only" -msgstr "Invite only" - -#: actions/siteadminpanel.php:329 -msgid "Make registration invitation only." -msgstr "" - -#: actions/siteadminpanel.php:333 -msgid "Closed" -msgstr "Closed" - -#: actions/siteadminpanel.php:335 -msgid "Disable new registrations." -msgstr "" - -#: actions/siteadminpanel.php:341 +#: actions/siteadminpanel.php:289 msgid "Snapshots" msgstr "" -#: actions/siteadminpanel.php:344 +#: actions/siteadminpanel.php:292 msgid "Randomly during Web hit" msgstr "" -#: actions/siteadminpanel.php:345 +#: actions/siteadminpanel.php:293 msgid "In a scheduled job" msgstr "" -#: actions/siteadminpanel.php:347 +#: actions/siteadminpanel.php:295 msgid "Data snapshots" msgstr "" -#: actions/siteadminpanel.php:348 +#: actions/siteadminpanel.php:296 msgid "When to send statistical data to status.net servers" msgstr "" -#: actions/siteadminpanel.php:353 +#: actions/siteadminpanel.php:301 msgid "Frequency" msgstr "" -#: actions/siteadminpanel.php:354 +#: actions/siteadminpanel.php:302 msgid "Snapshots will be sent once every N web hits" msgstr "" -#: actions/siteadminpanel.php:359 +#: actions/siteadminpanel.php:307 msgid "Report URL" msgstr "" -#: actions/siteadminpanel.php:360 +#: actions/siteadminpanel.php:308 msgid "Snapshots will be sent to this URL" msgstr "" -#: actions/siteadminpanel.php:367 +#: actions/siteadminpanel.php:315 msgid "Limits" msgstr "" -#: actions/siteadminpanel.php:370 +#: actions/siteadminpanel.php:318 msgid "Text limit" msgstr "" -#: actions/siteadminpanel.php:370 +#: actions/siteadminpanel.php:318 msgid "Maximum number of characters for notices." msgstr "" -#: actions/siteadminpanel.php:374 +#: actions/siteadminpanel.php:322 msgid "Dupe limit" msgstr "" -#: actions/siteadminpanel.php:374 +#: actions/siteadminpanel.php:322 msgid "How long users must wait (in seconds) to post the same thing again." msgstr "" -#: actions/siteadminpanel.php:388 actions/useradminpanel.php:313 +#: actions/siteadminpanel.php:336 actions/useradminpanel.php:313 msgid "Save site settings" msgstr "Save site settings" @@ -3912,6 +3953,11 @@ msgstr "Jabber" msgid "SMS" msgstr "SMS" +#: actions/tag.php:68 +#, fuzzy, php-format +msgid "Notices tagged with %1$s, page %2$d" +msgstr "Users self-tagged with %s - page %d" + #: actions/tag.php:86 #, fuzzy, php-format msgid "Notice feed for tag %s (RSS 1.0)" @@ -4219,6 +4265,11 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "" +#: actions/usergroups.php:64 +#, fuzzy, php-format +msgid "%1$s groups, page %2$d" +msgstr "%s group members, page %d" + #: actions/usergroups.php:130 #, fuzzy msgid "Search for more groups" @@ -4282,7 +4333,7 @@ msgstr "" msgid "Plugins" msgstr "" -#: actions/version.php:196 lib/action.php:741 +#: actions/version.php:196 lib/action.php:747 #, fuzzy msgid "Version" msgstr "Personal" @@ -4341,27 +4392,27 @@ msgstr "Could not insert message." msgid "Could not update message with new URI." msgstr "Could not update message with new URI." -#: classes/Notice.php:171 +#: classes/Notice.php:157 #, php-format msgid "DB error inserting hashtag: %s" msgstr "DB error inserting hashtag: %s" -#: classes/Notice.php:225 +#: classes/Notice.php:214 #, fuzzy msgid "Problem saving notice. Too long." msgstr "Problem saving notice." -#: classes/Notice.php:229 +#: classes/Notice.php:218 msgid "Problem saving notice. Unknown user." msgstr "Problem saving notice. Unknown user." -#: classes/Notice.php:234 +#: classes/Notice.php:223 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Too many notices too fast; take a breather and post again in a few minutes." -#: classes/Notice.php:240 +#: classes/Notice.php:229 #, fuzzy msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " @@ -4369,20 +4420,25 @@ msgid "" msgstr "" "Too many notices too fast; take a breather and post again in a few minutes." -#: classes/Notice.php:246 +#: classes/Notice.php:235 msgid "You are banned from posting notices on this site." msgstr "You are banned from posting notices on this site." -#: classes/Notice.php:305 classes/Notice.php:330 +#: classes/Notice.php:294 classes/Notice.php:319 msgid "Problem saving notice." msgstr "Problem saving notice." -#: classes/Notice.php:1059 +#: classes/Notice.php:790 +#, fuzzy +msgid "Problem saving group inbox." +msgstr "Problem saving notice." + +#: classes/Notice.php:850 #, php-format msgid "DB error inserting reply: %s" msgstr "DB error inserting reply: %s" -#: classes/Notice.php:1441 +#: classes/Notice.php:1233 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" @@ -4437,126 +4493,126 @@ msgstr "%1$s (%2$s)" msgid "Untitled page" msgstr "Untitled page" -#: lib/action.php:427 +#: lib/action.php:433 msgid "Primary site navigation" msgstr "Primary site navigation" -#: lib/action.php:433 +#: lib/action.php:439 msgid "Home" msgstr "Home" -#: lib/action.php:433 +#: lib/action.php:439 msgid "Personal profile and friends timeline" msgstr "Personal profile and friends timeline" -#: lib/action.php:435 +#: lib/action.php:441 msgid "Change your email, avatar, password, profile" msgstr "Change your e-mail, avatar, password, profile" -#: lib/action.php:438 +#: lib/action.php:444 msgid "Connect" msgstr "Connect" -#: lib/action.php:438 +#: lib/action.php:444 #, fuzzy msgid "Connect to services" msgstr "Could not redirect to server: %s" -#: lib/action.php:442 +#: lib/action.php:448 #, fuzzy msgid "Change site configuration" msgstr "Primary site navigation" -#: lib/action.php:446 lib/subgroupnav.php:105 +#: lib/action.php:452 lib/subgroupnav.php:105 msgid "Invite" msgstr "Invite" -#: lib/action.php:447 lib/subgroupnav.php:106 +#: lib/action.php:453 lib/subgroupnav.php:106 #, php-format msgid "Invite friends and colleagues to join you on %s" msgstr "Invite friends and colleagues to join you on %s" -#: lib/action.php:452 +#: lib/action.php:458 msgid "Logout" msgstr "Logout" -#: lib/action.php:452 +#: lib/action.php:458 msgid "Logout from the site" msgstr "Logout from the site" -#: lib/action.php:457 +#: lib/action.php:463 msgid "Create an account" msgstr "Create an account" -#: lib/action.php:460 +#: lib/action.php:466 msgid "Login to the site" msgstr "Login to the site" -#: lib/action.php:463 lib/action.php:726 +#: lib/action.php:469 lib/action.php:732 msgid "Help" msgstr "Help" -#: lib/action.php:463 +#: lib/action.php:469 msgid "Help me!" msgstr "Help me!" -#: lib/action.php:466 lib/searchaction.php:127 +#: lib/action.php:472 lib/searchaction.php:127 msgid "Search" msgstr "Search" -#: lib/action.php:466 +#: lib/action.php:472 msgid "Search for people or text" msgstr "Search for people or text" -#: lib/action.php:487 +#: lib/action.php:493 msgid "Site notice" msgstr "Site notice" -#: lib/action.php:553 +#: lib/action.php:559 msgid "Local views" msgstr "Local views" -#: lib/action.php:619 +#: lib/action.php:625 msgid "Page notice" msgstr "Page notice" -#: lib/action.php:721 +#: lib/action.php:727 msgid "Secondary site navigation" msgstr "Secondary site navigation" -#: lib/action.php:728 +#: lib/action.php:734 msgid "About" msgstr "About" -#: lib/action.php:730 +#: lib/action.php:736 msgid "FAQ" msgstr "F.A.Q." -#: lib/action.php:734 +#: lib/action.php:740 msgid "TOS" msgstr "" -#: lib/action.php:737 +#: lib/action.php:743 msgid "Privacy" msgstr "Privacy" -#: lib/action.php:739 +#: lib/action.php:745 msgid "Source" msgstr "Source" -#: lib/action.php:743 +#: lib/action.php:749 msgid "Contact" msgstr "Contact" -#: lib/action.php:745 +#: lib/action.php:751 msgid "Badge" msgstr "Badge" -#: lib/action.php:773 +#: lib/action.php:779 msgid "StatusNet software license" msgstr "StatusNet software licence" -#: lib/action.php:776 +#: lib/action.php:782 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -4565,12 +4621,12 @@ msgstr "" "**%%site.name%%** is a microblogging service brought to you by [%%site." "broughtby%%](%%site.broughtbyurl%%)." -#: lib/action.php:778 +#: lib/action.php:784 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "**%%site.name%%** is a microblogging service." -#: lib/action.php:780 +#: lib/action.php:786 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4581,41 +4637,41 @@ msgstr "" "s, available under the [GNU Affero General Public Licence](http://www.fsf." "org/licensing/licenses/agpl-3.0.html)." -#: lib/action.php:795 +#: lib/action.php:801 msgid "Site content license" msgstr "Site content license" -#: lib/action.php:800 +#: lib/action.php:806 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "" -#: lib/action.php:805 +#: lib/action.php:811 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" -#: lib/action.php:808 +#: lib/action.php:814 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" -#: lib/action.php:820 +#: lib/action.php:826 msgid "All " msgstr "All " -#: lib/action.php:825 +#: lib/action.php:831 msgid "license." msgstr "licence." -#: lib/action.php:1124 +#: lib/action.php:1130 msgid "Pagination" msgstr "Pagination" -#: lib/action.php:1133 +#: lib/action.php:1139 msgid "After" msgstr "After" -#: lib/action.php:1141 +#: lib/action.php:1147 msgid "Before" msgstr "Before" @@ -4653,11 +4709,25 @@ msgstr "E-mail address confirmation" msgid "Design configuration" msgstr "Design configuration" -#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327 +#: lib/adminpanelaction.php:322 +#, fuzzy +msgid "User configuration" +msgstr "SMS confirmation" + +#: lib/adminpanelaction.php:327 +#, fuzzy +msgid "Access configuration" +msgstr "Design configuration" + +#: lib/adminpanelaction.php:332 #, fuzzy msgid "Paths configuration" msgstr "SMS confirmation" +#: lib/applicationeditform.php:136 +msgid "Edit application" +msgstr "" + #: lib/applicationeditform.php:186 msgid "Icon for this application" msgstr "" @@ -5240,12 +5310,12 @@ msgstr "" msgid "kB" msgstr "" -#: lib/jabber.php:202 +#: lib/jabber.php:220 #, php-format msgid "[%s]" msgstr "" -#: lib/jabber.php:385 +#: lib/jabber.php:400 #, php-format msgid "Unknown inbox source %d." msgstr "" @@ -5680,19 +5750,19 @@ msgstr "Replies" msgid "Favorites" msgstr "Favourites" -#: lib/personalgroupnav.php:124 +#: lib/personalgroupnav.php:125 msgid "Inbox" msgstr "Inbox" -#: lib/personalgroupnav.php:125 +#: lib/personalgroupnav.php:126 msgid "Your incoming messages" msgstr "Your incoming messages" -#: lib/personalgroupnav.php:129 +#: lib/personalgroupnav.php:130 msgid "Outbox" msgstr "Outbox" -#: lib/personalgroupnav.php:130 +#: lib/personalgroupnav.php:131 msgid "Your sent messages" msgstr "Your sent messages" @@ -5941,47 +6011,47 @@ msgstr "Message" msgid "Moderate" msgstr "" -#: lib/util.php:875 +#: lib/util.php:868 msgid "a few seconds ago" msgstr "a few seconds ago" -#: lib/util.php:877 +#: lib/util.php:870 msgid "about a minute ago" msgstr "about a minute ago" -#: lib/util.php:879 +#: lib/util.php:872 #, php-format msgid "about %d minutes ago" msgstr "about %d minutes ago" -#: lib/util.php:881 +#: lib/util.php:874 msgid "about an hour ago" msgstr "about an hour ago" -#: lib/util.php:883 +#: lib/util.php:876 #, php-format msgid "about %d hours ago" msgstr "about %d hours ago" -#: lib/util.php:885 +#: lib/util.php:878 msgid "about a day ago" msgstr "about a day ago" -#: lib/util.php:887 +#: lib/util.php:880 #, php-format msgid "about %d days ago" msgstr "about %d days ago" -#: lib/util.php:889 +#: lib/util.php:882 msgid "about a month ago" msgstr "about a month ago" -#: lib/util.php:891 +#: lib/util.php:884 #, php-format msgid "about %d months ago" msgstr "about %d months ago" -#: lib/util.php:893 +#: lib/util.php:886 msgid "about a year ago" msgstr "about a year ago" @@ -5995,7 +6065,7 @@ msgstr "%s is not a valid colour!" msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "%s is not a valid colour! Use 3 or 6 hex chars." -#: scripts/xmppdaemon.php:301 +#: lib/xmppmanager.php:402 #, fuzzy, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "Message too long - maximum is %d characters, you sent %d" diff --git a/locale/es/LC_MESSAGES/statusnet.po b/locale/es/LC_MESSAGES/statusnet.po index 3afbc4e980..22d6ccf9d7 100644 --- a/locale/es/LC_MESSAGES/statusnet.po +++ b/locale/es/LC_MESSAGES/statusnet.po @@ -12,17 +12,75 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-21 22:36+0000\n" -"PO-Revision-Date: 2010-01-21 22:37:27+0000\n" +"POT-Creation-Date: 2010-01-27 23:58+0000\n" +"PO-Revision-Date: 2010-01-27 23:58:44+0000\n" "Language-Team: Spanish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r61339); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61595); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: es\n" "X-Message-Group: out-statusnet\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#: actions/accessadminpanel.php:54 lib/adminpanelaction.php:326 +#, fuzzy +msgid "Access" +msgstr "Aceptar" + +#: actions/accessadminpanel.php:65 +#, fuzzy +msgid "Site access settings" +msgstr "Configuración de Avatar" + +#: actions/accessadminpanel.php:158 +#, fuzzy +msgid "Registration" +msgstr "Registrarse" + +#: actions/accessadminpanel.php:161 +#, fuzzy +msgid "Private" +msgstr "Privacidad" + +#: actions/accessadminpanel.php:163 +msgid "Prohibit anonymous users (not logged in) from viewing site?" +msgstr "" + +#: actions/accessadminpanel.php:167 +#, fuzzy +msgid "Invite only" +msgstr "Invitar" + +#: actions/accessadminpanel.php:169 +msgid "Make registration invitation only." +msgstr "" + +#: actions/accessadminpanel.php:173 +#, fuzzy +msgid "Closed" +msgstr "Bloqueado" + +#: actions/accessadminpanel.php:175 +msgid "Disable new registrations." +msgstr "" + +#: actions/accessadminpanel.php:189 actions/designadminpanel.php:586 +#: actions/emailsettings.php:195 actions/imsettings.php:163 +#: actions/othersettings.php:126 actions/pathsadminpanel.php:351 +#: actions/profilesettings.php:174 actions/siteadminpanel.php:336 +#: actions/smssettings.php:181 actions/subscriptions.php:203 +#: actions/tagother.php:154 actions/useradminpanel.php:313 +#: lib/applicationeditform.php:335 lib/applicationeditform.php:336 +#: lib/designsettings.php:256 lib/groupeditform.php:202 +msgid "Save" +msgstr "Guardar" + +#: actions/accessadminpanel.php:189 +#, fuzzy +msgid "Save access settings" +msgstr "Configuración de Avatar" + #: actions/all.php:63 actions/public.php:97 actions/replies.php:92 #: actions/showfavorites.php:137 actions/tag.php:51 msgid "No such page" @@ -37,7 +95,7 @@ msgstr "No existe tal página" #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:149 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 @@ -136,8 +194,7 @@ msgstr "¡Actualizaciones de %1$s y amigos en %2$s!" #: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 #: actions/apitimelinefriends.php:155 actions/apitimelinegroup.php:150 #: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 -#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 #, fuzzy @@ -154,7 +211,7 @@ msgstr "¡No se encontró el método de la API!" #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:119 +#: actions/apistatusesupdate.php:118 msgid "This method requires a POST." msgstr "Este método requiere un POST." @@ -185,7 +242,7 @@ msgstr "No se pudo guardar el perfil." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:132 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 #: actions/designadminpanel.php:122 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -492,7 +549,14 @@ msgstr "" msgid "Allow or deny access" msgstr "" -#: actions/apioauthauthorize.php:320 lib/action.php:435 +#: actions/apioauthauthorize.php:306 +#, php-format +msgid "" +"The application %s by %s would like the " +"ability to %s your account data." +msgstr "" + +#: actions/apioauthauthorize.php:320 lib/action.php:441 msgid "Account" msgstr "Cuenta" @@ -552,17 +616,17 @@ msgstr "Status borrado." msgid "No status with that ID found." msgstr "No hay estado para ese ID" -#: actions/apistatusesupdate.php:162 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Demasiado largo. La longitud máxima es de 140 caracteres. " -#: actions/apistatusesupdate.php:203 +#: actions/apistatusesupdate.php:202 msgid "Not found" msgstr "No encontrado" -#: actions/apistatusesupdate.php:226 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -613,11 +677,6 @@ msgstr "línea temporal pública de %s" msgid "%s updates from everyone!" msgstr "¡Actualizaciones de todos en %s!" -#: actions/apitimelineretweetedbyme.php:112 -#, php-format -msgid "Repeated by %s" -msgstr "" - #: actions/apitimelineretweetedtome.php:111 #, fuzzy, php-format msgid "Repeated to %s" @@ -1034,17 +1093,6 @@ msgstr "" msgid "Reset back to default" msgstr "" -#: actions/designadminpanel.php:586 actions/emailsettings.php:195 -#: actions/imsettings.php:163 actions/othersettings.php:126 -#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174 -#: actions/siteadminpanel.php:388 actions/smssettings.php:181 -#: actions/subscriptions.php:203 actions/tagother.php:154 -#: actions/useradminpanel.php:313 lib/applicationeditform.php:335 -#: lib/applicationeditform.php:336 lib/designsettings.php:256 -#: lib/groupeditform.php:202 -msgid "Save" -msgstr "Guardar" - #: actions/designadminpanel.php:587 lib/designsettings.php:257 msgid "Save design" msgstr "" @@ -1057,13 +1105,15 @@ msgstr "¡Este aviso no es un favorito!" msgid "Add to favorites" msgstr "Agregar a favoritos" -#: actions/doc.php:69 -msgid "No such document." +#: actions/doc.php:155 +#, fuzzy, php-format +msgid "No such document \"%s\"" msgstr "No existe ese documento." -#: actions/editapplication.php:54 lib/applicationeditform.php:136 -msgid "Edit application" -msgstr "" +#: actions/editapplication.php:54 +#, fuzzy +msgid "Edit Application" +msgstr "Otras opciones" #: actions/editapplication.php:66 #, fuzzy @@ -1082,7 +1132,7 @@ msgid "No such application." msgstr "No existe ese aviso." #: actions/editapplication.php:127 actions/newapplication.php:110 -#: actions/showapplication.php:118 lib/action.php:1189 +#: actions/showapplication.php:118 lib/action.php:1195 msgid "There was a problem with your session token." msgstr "Hubo problemas con tu clave de sesión." @@ -1298,7 +1348,7 @@ msgid "Cannot normalize that email address" msgstr "No se puede normalizar esta dirección de correo electrónico." #: actions/emailsettings.php:331 actions/register.php:201 -#: actions/siteadminpanel.php:157 +#: actions/siteadminpanel.php:143 msgid "Not a valid email address." msgstr "Correo electrónico no válido" @@ -1310,7 +1360,7 @@ msgstr "Esa ya es tu dirección de correo electrónico" msgid "That email address already belongs to another user." msgstr "Esa dirección de correo pertenece a otro usuario." -#: actions/emailsettings.php:353 actions/imsettings.php:317 +#: actions/emailsettings.php:353 actions/imsettings.php:319 #: actions/smssettings.php:337 msgid "Couldn't insert confirmation code." msgstr "No se pudo insertar el código de confirmación." @@ -1617,7 +1667,7 @@ msgstr "Miembros del grupo %s, página %d" msgid "A list of the users in this group." msgstr "Lista de los usuarios en este grupo." -#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107 +#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107 msgid "Admin" msgstr "Admin" @@ -1815,6 +1865,11 @@ msgstr "" msgid "That is not your Jabber ID." msgstr "Ese no es tu Jabber ID." +#: actions/inbox.php:59 +#, fuzzy, php-format +msgid "Inbox for %1$s - page %2$d" +msgstr "Bandeja de entrada para %s" + #: actions/inbox.php:62 #, php-format msgid "Inbox for %s" @@ -1998,7 +2053,7 @@ msgstr "Nombre de usuario o contraseña incorrectos." msgid "Error setting user. You are probably not authorized." msgstr "No autorizado." -#: actions/login.php:188 actions/login.php:241 lib/action.php:460 +#: actions/login.php:188 actions/login.php:241 lib/action.php:466 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Inicio de sesión" @@ -2063,8 +2118,9 @@ msgid "No current status" msgstr "No existe estado actual" #: actions/newapplication.php:52 -msgid "New application" -msgstr "" +#, fuzzy +msgid "New Application" +msgstr "No existe ese aviso." #: actions/newapplication.php:64 #, fuzzy @@ -2259,8 +2315,8 @@ msgstr "Conectarse" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1038 -#: lib/api.php:1066 lib/api.php:1176 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1039 +#: lib/api.php:1067 lib/api.php:1177 msgid "Not a supported data format." msgstr "No es un formato de dato soportado" @@ -2332,6 +2388,11 @@ msgstr "El contenido del aviso es inválido" msgid "Login token expired." msgstr "Ingresar a sitio" +#: actions/outbox.php:58 +#, fuzzy, php-format +msgid "Outbox for %1$s - page %2$d" +msgstr "Bandeja de salida para %s" + #: actions/outbox.php:61 #, php-format msgid "Outbox for %s" @@ -2405,7 +2466,7 @@ msgstr "No se puede guardar la nueva contraseña." msgid "Password saved." msgstr "Se guardó Contraseña." -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:331 msgid "Paths" msgstr "" @@ -2413,142 +2474,159 @@ msgstr "" msgid "Path and server settings for this StatusNet site." msgstr "" -#: actions/pathsadminpanel.php:140 +#: actions/pathsadminpanel.php:157 #, fuzzy, php-format msgid "Theme directory not readable: %s" msgstr "Esta página no está disponible en un " -#: actions/pathsadminpanel.php:146 +#: actions/pathsadminpanel.php:163 #, php-format msgid "Avatar directory not writable: %s" msgstr "" -#: actions/pathsadminpanel.php:152 +#: actions/pathsadminpanel.php:169 #, php-format msgid "Background directory not writable: %s" msgstr "" -#: actions/pathsadminpanel.php:160 +#: actions/pathsadminpanel.php:177 #, php-format msgid "Locales directory not readable: %s" msgstr "" -#: actions/pathsadminpanel.php:166 +#: actions/pathsadminpanel.php:183 msgid "Invalid SSL server. The maximum length is 255 characters." msgstr "" -#: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58 +#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58 #: lib/adminpanelaction.php:311 #, fuzzy msgid "Site" msgstr "Invitar" -#: actions/pathsadminpanel.php:221 +#: actions/pathsadminpanel.php:238 +#, fuzzy +msgid "Server" +msgstr "Recuperar" + +#: actions/pathsadminpanel.php:238 +msgid "Site's server hostname." +msgstr "" + +#: actions/pathsadminpanel.php:242 msgid "Path" msgstr "" -#: actions/pathsadminpanel.php:221 +#: actions/pathsadminpanel.php:242 #, fuzzy msgid "Site path" msgstr "Aviso de sitio" -#: actions/pathsadminpanel.php:225 +#: actions/pathsadminpanel.php:246 msgid "Path to locales" msgstr "" -#: actions/pathsadminpanel.php:225 +#: actions/pathsadminpanel.php:246 msgid "Directory path to locales" msgstr "" -#: actions/pathsadminpanel.php:232 -msgid "Theme" -msgstr "" - -#: actions/pathsadminpanel.php:237 -msgid "Theme server" -msgstr "" - -#: actions/pathsadminpanel.php:241 -msgid "Theme path" -msgstr "" - -#: actions/pathsadminpanel.php:245 -msgid "Theme directory" +#: actions/pathsadminpanel.php:250 +msgid "Fancy URLs" msgstr "" #: actions/pathsadminpanel.php:252 +msgid "Use fancy (more readable and memorable) URLs?" +msgstr "" + +#: actions/pathsadminpanel.php:259 +msgid "Theme" +msgstr "" + +#: actions/pathsadminpanel.php:264 +msgid "Theme server" +msgstr "" + +#: actions/pathsadminpanel.php:268 +msgid "Theme path" +msgstr "" + +#: actions/pathsadminpanel.php:272 +msgid "Theme directory" +msgstr "" + +#: actions/pathsadminpanel.php:279 #, fuzzy msgid "Avatars" msgstr "Avatar" -#: actions/pathsadminpanel.php:257 +#: actions/pathsadminpanel.php:284 #, fuzzy msgid "Avatar server" msgstr "Configuración de Avatar" -#: actions/pathsadminpanel.php:261 +#: actions/pathsadminpanel.php:288 #, fuzzy msgid "Avatar path" msgstr "Avatar actualizado" -#: actions/pathsadminpanel.php:265 +#: actions/pathsadminpanel.php:292 #, fuzzy msgid "Avatar directory" msgstr "Avatar actualizado" -#: actions/pathsadminpanel.php:274 +#: actions/pathsadminpanel.php:301 msgid "Backgrounds" msgstr "" -#: actions/pathsadminpanel.php:278 +#: actions/pathsadminpanel.php:305 msgid "Background server" msgstr "" -#: actions/pathsadminpanel.php:282 +#: actions/pathsadminpanel.php:309 msgid "Background path" msgstr "" -#: actions/pathsadminpanel.php:286 +#: actions/pathsadminpanel.php:313 msgid "Background directory" msgstr "" -#: actions/pathsadminpanel.php:293 +#: actions/pathsadminpanel.php:320 #, fuzzy msgid "SSL" msgstr "SMS" -#: actions/pathsadminpanel.php:296 actions/siteadminpanel.php:346 +#: actions/pathsadminpanel.php:323 actions/siteadminpanel.php:294 #, fuzzy msgid "Never" msgstr "Recuperar" -#: actions/pathsadminpanel.php:297 +#: actions/pathsadminpanel.php:324 #, fuzzy msgid "Sometimes" msgstr "Avisos" -#: actions/pathsadminpanel.php:298 +#: actions/pathsadminpanel.php:325 msgid "Always" msgstr "" -#: actions/pathsadminpanel.php:302 +#: actions/pathsadminpanel.php:329 msgid "Use SSL" msgstr "" -#: actions/pathsadminpanel.php:303 +#: actions/pathsadminpanel.php:330 msgid "When to use SSL" msgstr "" -#: actions/pathsadminpanel.php:308 +#: actions/pathsadminpanel.php:335 #, fuzzy msgid "SSL server" msgstr "Recuperar" -#: actions/pathsadminpanel.php:309 +#: actions/pathsadminpanel.php:336 msgid "Server to direct SSL requests to" msgstr "" -#: actions/pathsadminpanel.php:325 +#: actions/pathsadminpanel.php:352 #, fuzzy msgid "Save paths" msgstr "Aviso de sitio" @@ -2661,7 +2739,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:151 actions/siteadminpanel.php:294 +#: actions/profilesettings.php:151 actions/siteadminpanel.php:280 msgid "Language" msgstr "Idioma" @@ -2689,7 +2767,7 @@ msgstr "" msgid "Bio is too long (max %d chars)." msgstr "La biografía es demasiado larga (máx. 140 caracteres)." -#: actions/profilesettings.php:235 actions/siteadminpanel.php:164 +#: actions/profilesettings.php:235 actions/siteadminpanel.php:150 msgid "Timezone not selected." msgstr "Zona horaria no seleccionada" @@ -2962,7 +3040,7 @@ msgstr "Error con el código de confirmación." msgid "Registration successful" msgstr "Registro exitoso." -#: actions/register.php:114 actions/register.php:503 lib/action.php:457 +#: actions/register.php:114 actions/register.php:503 lib/action.php:463 #: lib/logingroupnav.php:85 msgid "Register" msgstr "Registrarse" @@ -3004,7 +3082,7 @@ msgid "Same as password above. Required." msgstr "Igual a la contraseña de arriba. Requerida" #: actions/register.php:438 actions/register.php:442 -#: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120 +#: actions/siteadminpanel.php:256 lib/accountsettingsaction.php:120 msgid "Email" msgstr "Correo electrónico" @@ -3172,6 +3250,11 @@ msgstr "Crear" msgid "Replies to %s" msgstr "Respuestas a %s" +#: actions/replies.php:127 +#, fuzzy, php-format +msgid "Replies to %1$s, page %2$d" +msgstr "Respuestas a %1$s en %2$s!" + #: actions/replies.php:144 #, fuzzy, php-format msgid "Replies feed for %s (RSS 1.0)" @@ -3301,6 +3384,11 @@ msgid "" "signature method." msgstr "" +#: actions/showfavorites.php:79 +#, fuzzy, php-format +msgid "%1$s's favorite notices, page %2$d" +msgstr "Avisos favoritos de %s" + #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "No se pudo recibir avisos favoritos." @@ -3350,6 +3438,11 @@ msgstr "" msgid "%s group" msgstr "Grupo %s" +#: actions/showgroup.php:84 +#, fuzzy, php-format +msgid "%1$s group, page %2$d" +msgstr "Miembros del grupo %s, página %d" + #: actions/showgroup.php:218 #, fuzzy msgid "Group profile" @@ -3467,6 +3560,11 @@ msgstr "Aviso borrado" msgid " tagged %s" msgstr "Avisos marcados con %s" +#: actions/showstream.php:79 +#, fuzzy, php-format +msgid "%1$s, page %2$d" +msgstr "%s y amigos, página %d" + #: actions/showstream.php:122 #, fuzzy, php-format msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" @@ -3548,203 +3646,149 @@ msgstr "El usuario te ha bloqueado." msgid "Basic settings for this StatusNet site." msgstr "" -#: actions/siteadminpanel.php:146 +#: actions/siteadminpanel.php:132 msgid "Site name must have non-zero length." msgstr "" -#: actions/siteadminpanel.php:154 +#: actions/siteadminpanel.php:140 #, 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:172 +#: actions/siteadminpanel.php:158 #, php-format msgid "Unknown language \"%s\"." msgstr "" -#: actions/siteadminpanel.php:179 +#: actions/siteadminpanel.php:165 msgid "Invalid snapshot report URL." msgstr "" -#: actions/siteadminpanel.php:185 +#: actions/siteadminpanel.php:171 msgid "Invalid snapshot run value." msgstr "" -#: actions/siteadminpanel.php:191 +#: actions/siteadminpanel.php:177 msgid "Snapshot frequency must be a number." msgstr "" -#: actions/siteadminpanel.php:197 +#: actions/siteadminpanel.php:183 msgid "Minimum text limit is 140 characters." msgstr "" -#: actions/siteadminpanel.php:203 +#: actions/siteadminpanel.php:189 msgid "Dupe limit must 1 or more seconds." msgstr "" -#: actions/siteadminpanel.php:253 +#: actions/siteadminpanel.php:239 msgid "General" msgstr "" -#: actions/siteadminpanel.php:256 +#: actions/siteadminpanel.php:242 #, fuzzy msgid "Site name" msgstr "Aviso de sitio" -#: actions/siteadminpanel.php:257 +#: actions/siteadminpanel.php:243 msgid "The name of your site, like \"Yourcompany Microblog\"" msgstr "" -#: actions/siteadminpanel.php:261 +#: actions/siteadminpanel.php:247 msgid "Brought by" msgstr "" -#: actions/siteadminpanel.php:262 +#: actions/siteadminpanel.php:248 msgid "Text used for credits link in footer of each page" msgstr "" -#: actions/siteadminpanel.php:266 +#: actions/siteadminpanel.php:252 msgid "Brought by URL" msgstr "" -#: actions/siteadminpanel.php:267 +#: actions/siteadminpanel.php:253 msgid "URL used for credits link in footer of each page" msgstr "" -#: actions/siteadminpanel.php:271 +#: actions/siteadminpanel.php:257 #, fuzzy msgid "Contact email address for your site" msgstr "Nueva dirección de correo para postear a %s" -#: actions/siteadminpanel.php:277 +#: actions/siteadminpanel.php:263 #, fuzzy msgid "Local" msgstr "Vistas locales" -#: actions/siteadminpanel.php:288 +#: actions/siteadminpanel.php:274 msgid "Default timezone" msgstr "" -#: actions/siteadminpanel.php:289 +#: actions/siteadminpanel.php:275 msgid "Default timezone for the site; usually UTC." msgstr "" -#: actions/siteadminpanel.php:295 +#: actions/siteadminpanel.php:281 #, fuzzy msgid "Default site language" msgstr "Lenguaje de preferencia" -#: actions/siteadminpanel.php:303 -#, fuzzy -msgid "URLs" -msgstr "URL" - -#: actions/siteadminpanel.php:306 -#, fuzzy -msgid "Server" -msgstr "Recuperar" - -#: actions/siteadminpanel.php:306 -msgid "Site's server hostname." -msgstr "" - -#: actions/siteadminpanel.php:310 -msgid "Fancy URLs" -msgstr "" - -#: actions/siteadminpanel.php:312 -msgid "Use fancy (more readable and memorable) URLs?" -msgstr "" - -#: actions/siteadminpanel.php:318 -#, fuzzy -msgid "Access" -msgstr "Aceptar" - -#: actions/siteadminpanel.php:321 -#, fuzzy -msgid "Private" -msgstr "Privacidad" - -#: actions/siteadminpanel.php:323 -msgid "Prohibit anonymous users (not logged in) from viewing site?" -msgstr "" - -#: actions/siteadminpanel.php:327 -#, fuzzy -msgid "Invite only" -msgstr "Invitar" - -#: actions/siteadminpanel.php:329 -msgid "Make registration invitation only." -msgstr "" - -#: actions/siteadminpanel.php:333 -#, fuzzy -msgid "Closed" -msgstr "Bloqueado" - -#: actions/siteadminpanel.php:335 -msgid "Disable new registrations." -msgstr "" - -#: actions/siteadminpanel.php:341 +#: actions/siteadminpanel.php:289 msgid "Snapshots" msgstr "" -#: actions/siteadminpanel.php:344 +#: actions/siteadminpanel.php:292 msgid "Randomly during Web hit" msgstr "" -#: actions/siteadminpanel.php:345 +#: actions/siteadminpanel.php:293 msgid "In a scheduled job" msgstr "" -#: actions/siteadminpanel.php:347 +#: actions/siteadminpanel.php:295 msgid "Data snapshots" msgstr "" -#: actions/siteadminpanel.php:348 +#: actions/siteadminpanel.php:296 msgid "When to send statistical data to status.net servers" msgstr "" -#: actions/siteadminpanel.php:353 +#: actions/siteadminpanel.php:301 msgid "Frequency" msgstr "" -#: actions/siteadminpanel.php:354 +#: actions/siteadminpanel.php:302 msgid "Snapshots will be sent once every N web hits" msgstr "" -#: actions/siteadminpanel.php:359 +#: actions/siteadminpanel.php:307 msgid "Report URL" msgstr "" -#: actions/siteadminpanel.php:360 +#: actions/siteadminpanel.php:308 msgid "Snapshots will be sent to this URL" msgstr "" -#: actions/siteadminpanel.php:367 +#: actions/siteadminpanel.php:315 msgid "Limits" msgstr "" -#: actions/siteadminpanel.php:370 +#: actions/siteadminpanel.php:318 msgid "Text limit" msgstr "" -#: actions/siteadminpanel.php:370 +#: actions/siteadminpanel.php:318 msgid "Maximum number of characters for notices." msgstr "" -#: actions/siteadminpanel.php:374 +#: actions/siteadminpanel.php:322 msgid "Dupe limit" msgstr "" -#: actions/siteadminpanel.php:374 +#: actions/siteadminpanel.php:322 msgid "How long users must wait (in seconds) to post the same thing again." msgstr "" -#: actions/siteadminpanel.php:388 actions/useradminpanel.php:313 +#: actions/siteadminpanel.php:336 actions/useradminpanel.php:313 #, fuzzy msgid "Save site settings" msgstr "Configuración de Avatar" @@ -3954,6 +3998,11 @@ msgstr "Jabber " msgid "SMS" msgstr "SMS" +#: actions/tag.php:68 +#, fuzzy, php-format +msgid "Notices tagged with %1$s, page %2$d" +msgstr "Usuarios auto marcados con %s - página %d" + #: actions/tag.php:86 #, fuzzy, php-format msgid "Notice feed for tag %s (RSS 1.0)" @@ -4265,6 +4314,11 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "" +#: actions/usergroups.php:64 +#, fuzzy, php-format +msgid "%1$s groups, page %2$d" +msgstr "Miembros del grupo %s, página %d" + #: actions/usergroups.php:130 #, fuzzy msgid "Search for more groups" @@ -4328,7 +4382,7 @@ msgstr "" msgid "Plugins" msgstr "" -#: actions/version.php:196 lib/action.php:741 +#: actions/version.php:196 lib/action.php:747 #, fuzzy msgid "Version" msgstr "Sesiones" @@ -4387,29 +4441,29 @@ msgstr "No se pudo insertar mensaje." msgid "Could not update message with new URI." msgstr "No se pudo actualizar mensaje con nuevo URI." -#: classes/Notice.php:171 +#: classes/Notice.php:157 #, php-format msgid "DB error inserting hashtag: %s" msgstr "Error de la BD al insertar la etiqueta clave: %s" -#: classes/Notice.php:225 +#: classes/Notice.php:214 #, fuzzy msgid "Problem saving notice. Too long." msgstr "Hubo un problema al guardar el aviso." -#: classes/Notice.php:229 +#: classes/Notice.php:218 #, fuzzy msgid "Problem saving notice. Unknown user." msgstr "Hubo problemas al guardar el aviso. Usuario desconocido." -#: classes/Notice.php:234 +#: classes/Notice.php:223 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Demasiados avisos demasiado rápido; para y publicar nuevamente en unos " "minutos." -#: classes/Notice.php:240 +#: classes/Notice.php:229 #, fuzzy msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " @@ -4418,20 +4472,25 @@ msgstr "" "Demasiados avisos demasiado rápido; para y publicar nuevamente en unos " "minutos." -#: classes/Notice.php:246 +#: classes/Notice.php:235 msgid "You are banned from posting notices on this site." msgstr "Tienes prohibido publicar avisos en este sitio." -#: classes/Notice.php:305 classes/Notice.php:330 +#: classes/Notice.php:294 classes/Notice.php:319 msgid "Problem saving notice." msgstr "Hubo un problema al guardar el aviso." -#: classes/Notice.php:1059 +#: classes/Notice.php:790 +#, fuzzy +msgid "Problem saving group inbox." +msgstr "Hubo un problema al guardar el aviso." + +#: classes/Notice.php:850 #, php-format msgid "DB error inserting reply: %s" msgstr "Error de BD al insertar respuesta: %s" -#: classes/Notice.php:1441 +#: classes/Notice.php:1233 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -4487,125 +4546,125 @@ msgstr "%1$s (%2$s)" msgid "Untitled page" msgstr "Página sin título" -#: lib/action.php:427 +#: lib/action.php:433 msgid "Primary site navigation" msgstr "Navegación de sitio primario" -#: lib/action.php:433 +#: lib/action.php:439 msgid "Home" msgstr "Inicio" -#: lib/action.php:433 +#: lib/action.php:439 msgid "Personal profile and friends timeline" msgstr "Perfil personal y línea de tiempo de amigos" -#: lib/action.php:435 +#: lib/action.php:441 msgid "Change your email, avatar, password, profile" msgstr "Cambia tu correo electrónico, avatar, contraseña, perfil" -#: lib/action.php:438 +#: lib/action.php:444 msgid "Connect" msgstr "Conectarse" -#: lib/action.php:438 +#: lib/action.php:444 msgid "Connect to services" msgstr "Conectar a los servicios" -#: lib/action.php:442 +#: lib/action.php:448 #, fuzzy msgid "Change site configuration" msgstr "Navegación de sitio primario" -#: lib/action.php:446 lib/subgroupnav.php:105 +#: lib/action.php:452 lib/subgroupnav.php:105 msgid "Invite" msgstr "Invitar" -#: lib/action.php:447 lib/subgroupnav.php:106 +#: lib/action.php:453 lib/subgroupnav.php:106 #, php-format msgid "Invite friends and colleagues to join you on %s" msgstr "Invita a amigos y colegas a unirse a %s" -#: lib/action.php:452 +#: lib/action.php:458 msgid "Logout" msgstr "Salir" -#: lib/action.php:452 +#: lib/action.php:458 msgid "Logout from the site" msgstr "Salir de sitio" -#: lib/action.php:457 +#: lib/action.php:463 msgid "Create an account" msgstr "Crear una cuenta" -#: lib/action.php:460 +#: lib/action.php:466 msgid "Login to the site" msgstr "Ingresar a sitio" -#: lib/action.php:463 lib/action.php:726 +#: lib/action.php:469 lib/action.php:732 msgid "Help" msgstr "Ayuda" -#: lib/action.php:463 +#: lib/action.php:469 msgid "Help me!" msgstr "Ayúdame!" -#: lib/action.php:466 lib/searchaction.php:127 +#: lib/action.php:472 lib/searchaction.php:127 msgid "Search" msgstr "Buscar" -#: lib/action.php:466 +#: lib/action.php:472 msgid "Search for people or text" msgstr "Buscar personas o texto" -#: lib/action.php:487 +#: lib/action.php:493 msgid "Site notice" msgstr "Aviso de sitio" -#: lib/action.php:553 +#: lib/action.php:559 msgid "Local views" msgstr "Vistas locales" -#: lib/action.php:619 +#: lib/action.php:625 msgid "Page notice" msgstr "Aviso de página" -#: lib/action.php:721 +#: lib/action.php:727 msgid "Secondary site navigation" msgstr "Navegación de sitio secundario" -#: lib/action.php:728 +#: lib/action.php:734 msgid "About" msgstr "Acerca de" -#: lib/action.php:730 +#: lib/action.php:736 msgid "FAQ" msgstr "Preguntas Frecuentes" -#: lib/action.php:734 +#: lib/action.php:740 msgid "TOS" msgstr "" -#: lib/action.php:737 +#: lib/action.php:743 msgid "Privacy" msgstr "Privacidad" -#: lib/action.php:739 +#: lib/action.php:745 msgid "Source" msgstr "Fuente" -#: lib/action.php:743 +#: lib/action.php:749 msgid "Contact" msgstr "Ponerse en contacto" -#: lib/action.php:745 +#: lib/action.php:751 msgid "Badge" msgstr "Insignia" -#: lib/action.php:773 +#: lib/action.php:779 msgid "StatusNet software license" msgstr "Licencia de software de StatusNet" -#: lib/action.php:776 +#: lib/action.php:782 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -4614,12 +4673,12 @@ msgstr "" "**%%site.name%%** es un servicio de microblogueo de [%%site.broughtby%%**](%%" "site.broughtbyurl%%)." -#: lib/action.php:778 +#: lib/action.php:784 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "**%%site.name%%** es un servicio de microblogueo." -#: lib/action.php:780 +#: lib/action.php:786 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4630,41 +4689,41 @@ msgstr "" "disponible bajo la [GNU Affero General Public License](http://www.fsf.org/" "licensing/licenses/agpl-3.0.html)." -#: lib/action.php:795 +#: lib/action.php:801 msgid "Site content license" msgstr "Licencia de contenido del sitio" -#: lib/action.php:800 +#: lib/action.php:806 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "" -#: lib/action.php:805 +#: lib/action.php:811 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" -#: lib/action.php:808 +#: lib/action.php:814 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" -#: lib/action.php:820 +#: lib/action.php:826 msgid "All " msgstr "Todo" -#: lib/action.php:825 +#: lib/action.php:831 msgid "license." msgstr "Licencia." -#: lib/action.php:1124 +#: lib/action.php:1130 msgid "Pagination" msgstr "Paginación" -#: lib/action.php:1133 +#: lib/action.php:1139 msgid "After" msgstr "Después" -#: lib/action.php:1141 +#: lib/action.php:1147 msgid "Before" msgstr "Antes" @@ -4703,11 +4762,25 @@ msgstr "Confirmación de correo electrónico" msgid "Design configuration" msgstr "SMS confirmación" -#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327 +#: lib/adminpanelaction.php:322 +#, fuzzy +msgid "User configuration" +msgstr "SMS confirmación" + +#: lib/adminpanelaction.php:327 +#, fuzzy +msgid "Access configuration" +msgstr "SMS confirmación" + +#: lib/adminpanelaction.php:332 #, fuzzy msgid "Paths configuration" msgstr "SMS confirmación" +#: lib/applicationeditform.php:136 +msgid "Edit application" +msgstr "" + #: lib/applicationeditform.php:186 msgid "Icon for this application" msgstr "" @@ -5293,12 +5366,12 @@ msgstr "MB" msgid "kB" msgstr "kB" -#: lib/jabber.php:202 +#: lib/jabber.php:220 #, php-format msgid "[%s]" msgstr "" -#: lib/jabber.php:385 +#: lib/jabber.php:400 #, php-format msgid "Unknown inbox source %d." msgstr "" @@ -5729,19 +5802,19 @@ msgstr "Respuestas" msgid "Favorites" msgstr "Favoritos" -#: lib/personalgroupnav.php:124 +#: lib/personalgroupnav.php:125 msgid "Inbox" msgstr "Bandeja de Entrada" -#: lib/personalgroupnav.php:125 +#: lib/personalgroupnav.php:126 msgid "Your incoming messages" msgstr "Mensajes entrantes" -#: lib/personalgroupnav.php:129 +#: lib/personalgroupnav.php:130 msgid "Outbox" msgstr "Bandeja de Salida" -#: lib/personalgroupnav.php:130 +#: lib/personalgroupnav.php:131 msgid "Your sent messages" msgstr "Mensajes enviados" @@ -5997,47 +6070,47 @@ msgstr "Mensaje" msgid "Moderate" msgstr "Moderar" -#: lib/util.php:875 +#: lib/util.php:868 msgid "a few seconds ago" msgstr "hace unos segundos" -#: lib/util.php:877 +#: lib/util.php:870 msgid "about a minute ago" msgstr "hace un minuto" -#: lib/util.php:879 +#: lib/util.php:872 #, php-format msgid "about %d minutes ago" msgstr "hace %d minutos" -#: lib/util.php:881 +#: lib/util.php:874 msgid "about an hour ago" msgstr "hace una hora" -#: lib/util.php:883 +#: lib/util.php:876 #, php-format msgid "about %d hours ago" msgstr "hace %d horas" -#: lib/util.php:885 +#: lib/util.php:878 msgid "about a day ago" msgstr "hace un día" -#: lib/util.php:887 +#: lib/util.php:880 #, php-format msgid "about %d days ago" msgstr "hace %d días" -#: lib/util.php:889 +#: lib/util.php:882 msgid "about a month ago" msgstr "hace un mes" -#: lib/util.php:891 +#: lib/util.php:884 #, php-format msgid "about %d months ago" msgstr "hace %d meses" -#: lib/util.php:893 +#: lib/util.php:886 msgid "about a year ago" msgstr "hace un año" @@ -6051,7 +6124,7 @@ msgstr "" msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "" -#: scripts/xmppdaemon.php:301 +#: lib/xmppmanager.php:402 #, fuzzy, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "Mensaje muy largo - máximo 140 caracteres, enviaste %d" diff --git a/locale/fa/LC_MESSAGES/statusnet.po b/locale/fa/LC_MESSAGES/statusnet.po index 2c826643aa..9526d702f7 100644 --- a/locale/fa/LC_MESSAGES/statusnet.po +++ b/locale/fa/LC_MESSAGES/statusnet.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-21 22:36+0000\n" -"PO-Revision-Date: 2010-01-21 22:37:33+0000\n" +"POT-Creation-Date: 2010-01-27 23:58+0000\n" +"PO-Revision-Date: 2010-01-27 23:58:50+0000\n" "Last-Translator: Ahmad Sufi Mahmudi\n" "Language-Team: Persian\n" "MIME-Version: 1.0\n" @@ -20,9 +20,63 @@ msgstr "" "X-Language-Code: fa\n" "X-Message-Group: out-statusnet\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: MediaWiki 1.16alpha (r61339); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61595); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" +#: actions/accessadminpanel.php:54 lib/adminpanelaction.php:326 +msgid "Access" +msgstr "دسترسی" + +#: actions/accessadminpanel.php:65 +#, fuzzy +msgid "Site access settings" +msgstr "تنظیمات دیگر" + +#: actions/accessadminpanel.php:158 +#, fuzzy +msgid "Registration" +msgstr "ثبت نام" + +#: actions/accessadminpanel.php:161 +msgid "Private" +msgstr "خصوصی" + +#: actions/accessadminpanel.php:163 +msgid "Prohibit anonymous users (not logged in) from viewing site?" +msgstr "" + +#: actions/accessadminpanel.php:167 +msgid "Invite only" +msgstr "فقط دعوت کردن" + +#: actions/accessadminpanel.php:169 +msgid "Make registration invitation only." +msgstr "تنها آماده کردن دعوت نامه های ثبت نام." + +#: actions/accessadminpanel.php:173 +msgid "Closed" +msgstr "مسدود" + +#: actions/accessadminpanel.php:175 +msgid "Disable new registrations." +msgstr "غیر فعال کردن نام نوبسی جدید" + +#: actions/accessadminpanel.php:189 actions/designadminpanel.php:586 +#: actions/emailsettings.php:195 actions/imsettings.php:163 +#: actions/othersettings.php:126 actions/pathsadminpanel.php:351 +#: actions/profilesettings.php:174 actions/siteadminpanel.php:336 +#: actions/smssettings.php:181 actions/subscriptions.php:203 +#: actions/tagother.php:154 actions/useradminpanel.php:313 +#: lib/applicationeditform.php:335 lib/applicationeditform.php:336 +#: lib/designsettings.php:256 lib/groupeditform.php:202 +msgid "Save" +msgstr "ذخیره‌کردن" + +#: actions/accessadminpanel.php:189 +#, fuzzy +msgid "Save access settings" +msgstr "تنظیمات چهره" + #: actions/all.php:63 actions/public.php:97 actions/replies.php:92 #: actions/showfavorites.php:137 actions/tag.php:51 msgid "No such page" @@ -37,7 +91,7 @@ msgstr "چنین صفحه‌ای وجود ندارد" #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:149 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 @@ -142,8 +196,7 @@ msgstr "به روز رسانی از %1$ و دوستان در %2$" #: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 #: actions/apitimelinefriends.php:155 actions/apitimelinegroup.php:150 #: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 -#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found." @@ -159,7 +212,7 @@ msgstr "رابط مورد نظر پیدا نشد." #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:119 +#: actions/apistatusesupdate.php:118 msgid "This method requires a POST." msgstr "برای استفاده از این روش باید اطلاعات را به صورت پست بفرستید" @@ -188,7 +241,7 @@ msgstr "نمی‌توان شناس‌نامه را ذخیره کرد." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:132 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 #: actions/designadminpanel.php:122 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -489,7 +542,14 @@ msgstr "" msgid "Allow or deny access" msgstr "" -#: actions/apioauthauthorize.php:320 lib/action.php:435 +#: actions/apioauthauthorize.php:306 +#, php-format +msgid "" +"The application %s by %s would like the " +"ability to %s your account data." +msgstr "" + +#: actions/apioauthauthorize.php:320 lib/action.php:441 msgid "Account" msgstr "حساب کاربری" @@ -548,17 +608,17 @@ msgstr "وضعیت حذف شد." msgid "No status with that ID found." msgstr "هیچ وضعیتی با آن شناسه یافت نشد." -#: actions/apistatusesupdate.php:162 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "خیلی طولانی است. حداکثر طول مجاز پیام %d حرف است." -#: actions/apistatusesupdate.php:203 +#: actions/apistatusesupdate.php:202 msgid "Not found" msgstr "یافت نشد" -#: actions/apistatusesupdate.php:226 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "حداکثر طول پیام %d حرف است که شامل ضمیمه نیز می‌باشد" @@ -609,11 +669,6 @@ msgstr "%s خط‌زمانی عمومی" msgid "%s updates from everyone!" msgstr "%s به روز رسانی های عموم" -#: actions/apitimelineretweetedbyme.php:112 -#, php-format -msgid "Repeated by %s" -msgstr "%s تکرار کرد" - #: actions/apitimelineretweetedtome.php:111 #, php-format msgid "Repeated to %s" @@ -1024,17 +1079,6 @@ msgstr "بازگرداندن طرح‌های پیش‌فرض" msgid "Reset back to default" msgstr "برگشت به حالت پیش گزیده" -#: actions/designadminpanel.php:586 actions/emailsettings.php:195 -#: actions/imsettings.php:163 actions/othersettings.php:126 -#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174 -#: actions/siteadminpanel.php:388 actions/smssettings.php:181 -#: actions/subscriptions.php:203 actions/tagother.php:154 -#: actions/useradminpanel.php:313 lib/applicationeditform.php:335 -#: lib/applicationeditform.php:336 lib/designsettings.php:256 -#: lib/groupeditform.php:202 -msgid "Save" -msgstr "ذخیره‌کردن" - #: actions/designadminpanel.php:587 lib/designsettings.php:257 msgid "Save design" msgstr "ذخیره‌کردن طرح" @@ -1047,13 +1091,15 @@ msgstr "این آگهی یک آگهی برگزیده نیست!" msgid "Add to favorites" msgstr "افزودن به علاقه‌مندی‌ها" -#: actions/doc.php:69 -msgid "No such document." +#: actions/doc.php:155 +#, fuzzy, php-format +msgid "No such document \"%s\"" msgstr "چنین سندی وجود ندارد." -#: actions/editapplication.php:54 lib/applicationeditform.php:136 -msgid "Edit application" -msgstr "" +#: actions/editapplication.php:54 +#, fuzzy +msgid "Edit Application" +msgstr "انتخابات دیگر" #: actions/editapplication.php:66 #, fuzzy @@ -1072,7 +1118,7 @@ msgid "No such application." msgstr "چنین پیامی وجود ندارد." #: actions/editapplication.php:127 actions/newapplication.php:110 -#: actions/showapplication.php:118 lib/action.php:1189 +#: actions/showapplication.php:118 lib/action.php:1195 msgid "There was a problem with your session token." msgstr "" @@ -1280,7 +1326,7 @@ msgid "Cannot normalize that email address" msgstr "نمی‌توان نشانی را قانونی کرد" #: actions/emailsettings.php:331 actions/register.php:201 -#: actions/siteadminpanel.php:157 +#: actions/siteadminpanel.php:143 msgid "Not a valid email address." msgstr "یک آدرس ایمیل معتبر نیست." @@ -1292,7 +1338,7 @@ msgstr "هم اکنون نشانی شما همین است." msgid "That email address already belongs to another user." msgstr "این نشانی در حال حاضر متعلق به فرد دیگری است." -#: actions/emailsettings.php:353 actions/imsettings.php:317 +#: actions/emailsettings.php:353 actions/imsettings.php:319 #: actions/smssettings.php:337 msgid "Couldn't insert confirmation code." msgstr "نمی‌توان کد تایید را اضافه کرد." @@ -1591,7 +1637,7 @@ msgstr "اعضای گروه %s، صفحهٔ %d" msgid "A list of the users in this group." msgstr "یک فهرست از کاربران در این گروه" -#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107 +#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107 msgid "Admin" msgstr "مدیر" @@ -1786,6 +1832,11 @@ msgstr "" msgid "That is not your Jabber ID." msgstr "این شناسه‌ی Jabber شما نیست." +#: actions/inbox.php:59 +#, fuzzy, php-format +msgid "Inbox for %1$s - page %2$d" +msgstr "صندوق ورودی %s" + #: actions/inbox.php:62 #, php-format msgid "Inbox for %s" @@ -1939,7 +1990,7 @@ msgstr "نام کاربری یا رمز عبور نادرست." msgid "Error setting user. You are probably not authorized." msgstr "خطا در تنظیم کاربر. شما احتمالا اجازه ی این کار را ندارید." -#: actions/login.php:188 actions/login.php:241 lib/action.php:460 +#: actions/login.php:188 actions/login.php:241 lib/action.php:466 #: lib/logingroupnav.php:79 msgid "Login" msgstr "ورود" @@ -2001,8 +2052,9 @@ msgid "No current status" msgstr "بدون وضعیت فعلی" #: actions/newapplication.php:52 -msgid "New application" -msgstr "" +#, fuzzy +msgid "New Application" +msgstr "چنین پیامی وجود ندارد." #: actions/newapplication.php:64 #, fuzzy @@ -2197,8 +2249,8 @@ msgstr "نوع محتوا " msgid "Only " msgstr " فقط" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1038 -#: lib/api.php:1066 lib/api.php:1176 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1039 +#: lib/api.php:1067 lib/api.php:1177 msgid "Not a supported data format." msgstr "یک قالب دادهٔ پشتیبانی‌شده نیست." @@ -2267,6 +2319,11 @@ msgstr "علامت بی اعتبار یا منقضی." msgid "Login token expired." msgstr "ورود به وب‌گاه" +#: actions/outbox.php:58 +#, fuzzy, php-format +msgid "Outbox for %1$s - page %2$d" +msgstr "فرستاده‌های %s" + #: actions/outbox.php:61 #, php-format msgid "Outbox for %s" @@ -2339,7 +2396,7 @@ msgstr "نمی‌توان گذرواژه جدید را ذخیره کرد." msgid "Password saved." msgstr "گذرواژه ذخیره شد." -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:331 msgid "Paths" msgstr "مسیر ها" @@ -2347,133 +2404,149 @@ msgstr "مسیر ها" msgid "Path and server settings for this StatusNet site." msgstr "تنظیمات و نشانی محلی این سایت استاتوس‌نتی" -#: actions/pathsadminpanel.php:140 +#: actions/pathsadminpanel.php:157 #, php-format msgid "Theme directory not readable: %s" msgstr "شاخه‌ی پوسته‌ها خواندنی نیست: %s" -#: actions/pathsadminpanel.php:146 +#: actions/pathsadminpanel.php:163 #, php-format msgid "Avatar directory not writable: %s" msgstr "شاخه‌ی چهره‌ها نوشتنی نیست: %s" -#: actions/pathsadminpanel.php:152 +#: actions/pathsadminpanel.php:169 #, php-format msgid "Background directory not writable: %s" msgstr "شاخه‌ی پس زمینه‌ها نوشتنی نیست: %s" -#: actions/pathsadminpanel.php:160 +#: actions/pathsadminpanel.php:177 #, php-format msgid "Locales directory not readable: %s" msgstr "پوشه‌ی تنظیمات محلی خواندنی نیست: %s" -#: actions/pathsadminpanel.php:166 +#: actions/pathsadminpanel.php:183 msgid "Invalid SSL server. The maximum length is 255 characters." msgstr "" -#: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58 +#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58 #: lib/adminpanelaction.php:311 msgid "Site" msgstr "سایت" -#: actions/pathsadminpanel.php:221 +#: actions/pathsadminpanel.php:238 +msgid "Server" +msgstr "کارگزار" + +#: actions/pathsadminpanel.php:238 +msgid "Site's server hostname." +msgstr "" + +#: actions/pathsadminpanel.php:242 msgid "Path" msgstr "مسیر" -#: actions/pathsadminpanel.php:221 +#: actions/pathsadminpanel.php:242 msgid "Site path" msgstr "مسیر وب‌گاه" -#: actions/pathsadminpanel.php:225 +#: actions/pathsadminpanel.php:246 msgid "Path to locales" msgstr "نشانی تنظیمات محلی" -#: actions/pathsadminpanel.php:225 +#: actions/pathsadminpanel.php:246 msgid "Directory path to locales" msgstr "" -#: actions/pathsadminpanel.php:232 +#: actions/pathsadminpanel.php:250 +msgid "Fancy URLs" +msgstr "" + +#: actions/pathsadminpanel.php:252 +msgid "Use fancy (more readable and memorable) URLs?" +msgstr "" + +#: actions/pathsadminpanel.php:259 msgid "Theme" msgstr "پوسته" -#: actions/pathsadminpanel.php:237 +#: actions/pathsadminpanel.php:264 msgid "Theme server" msgstr "کارگزار پوسته" -#: actions/pathsadminpanel.php:241 +#: actions/pathsadminpanel.php:268 msgid "Theme path" msgstr "مسیر پوسته" -#: actions/pathsadminpanel.php:245 +#: actions/pathsadminpanel.php:272 msgid "Theme directory" msgstr "شاخهٔ پوسته" -#: actions/pathsadminpanel.php:252 +#: actions/pathsadminpanel.php:279 msgid "Avatars" msgstr "چهره‌ها" -#: actions/pathsadminpanel.php:257 +#: actions/pathsadminpanel.php:284 msgid "Avatar server" msgstr "کارگزار نیم‌رخ" -#: actions/pathsadminpanel.php:261 +#: actions/pathsadminpanel.php:288 msgid "Avatar path" msgstr "مسیر نیم‌رخ" -#: actions/pathsadminpanel.php:265 +#: actions/pathsadminpanel.php:292 msgid "Avatar directory" msgstr "شاخهٔ نیم‌رخ" -#: actions/pathsadminpanel.php:274 +#: actions/pathsadminpanel.php:301 msgid "Backgrounds" msgstr "پس زمینه‌ها" -#: actions/pathsadminpanel.php:278 +#: actions/pathsadminpanel.php:305 msgid "Background server" msgstr "کارگذار تصاویر پیش‌زمینه" -#: actions/pathsadminpanel.php:282 +#: actions/pathsadminpanel.php:309 msgid "Background path" msgstr "مسیر تصاویر پیش‌زمینه" -#: actions/pathsadminpanel.php:286 +#: actions/pathsadminpanel.php:313 msgid "Background directory" msgstr "شاخهٔ تصاویر پیش‌زمینه" -#: actions/pathsadminpanel.php:293 +#: actions/pathsadminpanel.php:320 msgid "SSL" msgstr "" -#: actions/pathsadminpanel.php:296 actions/siteadminpanel.php:346 +#: actions/pathsadminpanel.php:323 actions/siteadminpanel.php:294 msgid "Never" msgstr "هیچ وقت" -#: actions/pathsadminpanel.php:297 +#: actions/pathsadminpanel.php:324 msgid "Sometimes" msgstr "گاهی اوقات" -#: actions/pathsadminpanel.php:298 +#: actions/pathsadminpanel.php:325 msgid "Always" msgstr "برای همیشه" -#: actions/pathsadminpanel.php:302 +#: actions/pathsadminpanel.php:329 msgid "Use SSL" msgstr "استفاده از SSL" -#: actions/pathsadminpanel.php:303 +#: actions/pathsadminpanel.php:330 msgid "When to use SSL" msgstr "" -#: actions/pathsadminpanel.php:308 +#: actions/pathsadminpanel.php:335 #, fuzzy msgid "SSL server" msgstr "کارگزار" -#: actions/pathsadminpanel.php:309 +#: actions/pathsadminpanel.php:336 msgid "Server to direct SSL requests to" msgstr "" -#: actions/pathsadminpanel.php:325 +#: actions/pathsadminpanel.php:352 msgid "Save paths" msgstr "نشانی ذخیره سازی" @@ -2582,7 +2655,7 @@ msgid "" "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated" msgstr "" -#: actions/profilesettings.php:151 actions/siteadminpanel.php:294 +#: actions/profilesettings.php:151 actions/siteadminpanel.php:280 msgid "Language" msgstr "زبان" @@ -2608,7 +2681,7 @@ msgstr "" msgid "Bio is too long (max %d chars)." msgstr "" -#: actions/profilesettings.php:235 actions/siteadminpanel.php:164 +#: actions/profilesettings.php:235 actions/siteadminpanel.php:150 msgid "Timezone not selected." msgstr "منطقه‌ی زمانی انتخاب نشده است." @@ -2870,7 +2943,7 @@ msgstr "با عرض تاسف، کد دعوت نا معتبر است." msgid "Registration successful" msgstr "ثبت نام با موفقیت انجام شد." -#: actions/register.php:114 actions/register.php:503 lib/action.php:457 +#: actions/register.php:114 actions/register.php:503 lib/action.php:463 #: lib/logingroupnav.php:85 msgid "Register" msgstr "ثبت نام" @@ -2910,7 +2983,7 @@ msgid "Same as password above. Required." msgstr "" #: actions/register.php:438 actions/register.php:442 -#: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120 +#: actions/siteadminpanel.php:256 lib/accountsettingsaction.php:120 msgid "Email" msgstr "پست الکترونیکی" @@ -3048,6 +3121,11 @@ msgstr "" msgid "Replies to %s" msgstr "پاسخ‌های به %s" +#: actions/replies.php:127 +#, fuzzy, php-format +msgid "Replies to %1$s, page %2$d" +msgstr "پاسخ‌های به %s" + #: actions/replies.php:144 #, php-format msgid "Replies feed for %s (RSS 1.0)" @@ -3178,6 +3256,11 @@ msgid "" "signature method." msgstr "" +#: actions/showfavorites.php:79 +#, fuzzy, php-format +msgid "%1$s's favorite notices, page %2$d" +msgstr "دوست داشتنی های %s" + #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "ناتوان در بازیابی آگهی های محبوب." @@ -3227,6 +3310,11 @@ msgstr "این یک راه است برای به اشتراک گذاشتن آنچ msgid "%s group" msgstr "" +#: actions/showgroup.php:84 +#, fuzzy, php-format +msgid "%1$s group, page %2$d" +msgstr "اعضای گروه %s، صفحهٔ %d" + #: actions/showgroup.php:218 msgid "Group profile" msgstr "" @@ -3337,6 +3425,11 @@ msgstr "" msgid " tagged %s" msgstr "" +#: actions/showstream.php:79 +#, fuzzy, php-format +msgid "%1$s, page %2$d" +msgstr "%s کاربران مسدود شده، صفحه‌ی %d" + #: actions/showstream.php:122 #, fuzzy, php-format msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" @@ -3418,195 +3511,147 @@ msgstr "کاربر قبلا ساکت شده است." msgid "Basic settings for this StatusNet site." msgstr "تنظیمات پایه ای برای این سایت StatusNet." -#: actions/siteadminpanel.php:146 +#: actions/siteadminpanel.php:132 msgid "Site name must have non-zero length." msgstr "نام سایت باید طولی غیر صفر داشته باشد." -#: actions/siteadminpanel.php:154 +#: actions/siteadminpanel.php:140 #, fuzzy msgid "You must have a valid contact email address." msgstr "شما باید یک آدرس ایمیل قابل قبول برای ارتباط داشته باشید" -#: actions/siteadminpanel.php:172 +#: actions/siteadminpanel.php:158 #, php-format msgid "Unknown language \"%s\"." msgstr "" -#: actions/siteadminpanel.php:179 +#: actions/siteadminpanel.php:165 msgid "Invalid snapshot report URL." msgstr "" -#: actions/siteadminpanel.php:185 +#: actions/siteadminpanel.php:171 msgid "Invalid snapshot run value." msgstr "" -#: actions/siteadminpanel.php:191 +#: actions/siteadminpanel.php:177 msgid "Snapshot frequency must be a number." msgstr "" -#: actions/siteadminpanel.php:197 +#: actions/siteadminpanel.php:183 msgid "Minimum text limit is 140 characters." msgstr "" -#: actions/siteadminpanel.php:203 +#: actions/siteadminpanel.php:189 msgid "Dupe limit must 1 or more seconds." msgstr "" -#: actions/siteadminpanel.php:253 +#: actions/siteadminpanel.php:239 msgid "General" msgstr "" -#: actions/siteadminpanel.php:256 +#: actions/siteadminpanel.php:242 msgid "Site name" msgstr "نام وب‌گاه" -#: actions/siteadminpanel.php:257 +#: actions/siteadminpanel.php:243 msgid "The name of your site, like \"Yourcompany Microblog\"" msgstr "نام وب‌گاه شما، مانند «میکروبلاگ شرکت شما»" -#: actions/siteadminpanel.php:261 +#: actions/siteadminpanel.php:247 msgid "Brought by" msgstr "أورده شده به وسیله ی" -#: actions/siteadminpanel.php:262 +#: actions/siteadminpanel.php:248 msgid "Text used for credits link in footer of each page" msgstr "" -#: actions/siteadminpanel.php:266 +#: actions/siteadminpanel.php:252 msgid "Brought by URL" msgstr "" -#: actions/siteadminpanel.php:267 +#: actions/siteadminpanel.php:253 msgid "URL used for credits link in footer of each page" msgstr "" -#: actions/siteadminpanel.php:271 +#: actions/siteadminpanel.php:257 msgid "Contact email address for your site" msgstr "" -#: actions/siteadminpanel.php:277 +#: actions/siteadminpanel.php:263 msgid "Local" msgstr "محلی" -#: actions/siteadminpanel.php:288 +#: actions/siteadminpanel.php:274 msgid "Default timezone" msgstr "منطقه ی زمانی پیش فرض" -#: actions/siteadminpanel.php:289 +#: actions/siteadminpanel.php:275 msgid "Default timezone for the site; usually UTC." msgstr "منظقه ی زمانی پیش فرض برای سایت؛ معمولا UTC." -#: actions/siteadminpanel.php:295 +#: actions/siteadminpanel.php:281 msgid "Default site language" msgstr "زبان پیش فرض سایت" -#: actions/siteadminpanel.php:303 -msgid "URLs" -msgstr "" - -#: actions/siteadminpanel.php:306 -msgid "Server" -msgstr "کارگزار" - -#: actions/siteadminpanel.php:306 -msgid "Site's server hostname." -msgstr "" - -#: actions/siteadminpanel.php:310 -msgid "Fancy URLs" -msgstr "" - -#: actions/siteadminpanel.php:312 -msgid "Use fancy (more readable and memorable) URLs?" -msgstr "" - -#: actions/siteadminpanel.php:318 -msgid "Access" -msgstr "دسترسی" - -#: actions/siteadminpanel.php:321 -msgid "Private" -msgstr "خصوصی" - -#: actions/siteadminpanel.php:323 -msgid "Prohibit anonymous users (not logged in) from viewing site?" -msgstr "" - -#: actions/siteadminpanel.php:327 -msgid "Invite only" -msgstr "فقط دعوت کردن" - -#: actions/siteadminpanel.php:329 -msgid "Make registration invitation only." -msgstr "تنها آماده کردن دعوت نامه های ثبت نام." - -#: actions/siteadminpanel.php:333 -msgid "Closed" -msgstr "مسدود" - -#: actions/siteadminpanel.php:335 -msgid "Disable new registrations." -msgstr "غیر فعال کردن نام نوبسی جدید" - -#: actions/siteadminpanel.php:341 +#: actions/siteadminpanel.php:289 msgid "Snapshots" msgstr "" -#: actions/siteadminpanel.php:344 +#: actions/siteadminpanel.php:292 msgid "Randomly during Web hit" msgstr "" -#: actions/siteadminpanel.php:345 +#: actions/siteadminpanel.php:293 msgid "In a scheduled job" msgstr "" -#: actions/siteadminpanel.php:347 +#: actions/siteadminpanel.php:295 msgid "Data snapshots" msgstr "" -#: actions/siteadminpanel.php:348 +#: actions/siteadminpanel.php:296 msgid "When to send statistical data to status.net servers" msgstr "" -#: actions/siteadminpanel.php:353 +#: actions/siteadminpanel.php:301 msgid "Frequency" msgstr "" -#: actions/siteadminpanel.php:354 +#: actions/siteadminpanel.php:302 msgid "Snapshots will be sent once every N web hits" msgstr "" -#: actions/siteadminpanel.php:359 +#: actions/siteadminpanel.php:307 msgid "Report URL" msgstr "" -#: actions/siteadminpanel.php:360 +#: actions/siteadminpanel.php:308 msgid "Snapshots will be sent to this URL" msgstr "" -#: actions/siteadminpanel.php:367 +#: actions/siteadminpanel.php:315 msgid "Limits" msgstr "محدودیت ها" -#: actions/siteadminpanel.php:370 +#: actions/siteadminpanel.php:318 msgid "Text limit" msgstr "محدودیت متن" -#: actions/siteadminpanel.php:370 +#: actions/siteadminpanel.php:318 msgid "Maximum number of characters for notices." msgstr "بیشینهٔ تعداد حروف برای آگهی‌ها" -#: actions/siteadminpanel.php:374 +#: actions/siteadminpanel.php:322 msgid "Dupe limit" msgstr "" -#: actions/siteadminpanel.php:374 +#: actions/siteadminpanel.php:322 msgid "How long users must wait (in seconds) to post the same thing again." msgstr "" "چه مدت کاربران باید منتظر بمانند ( به ثانیه ) تا همان چیز را مجددا ارسال " "کنند." -#: actions/siteadminpanel.php:388 actions/useradminpanel.php:313 +#: actions/siteadminpanel.php:336 actions/useradminpanel.php:313 msgid "Save site settings" msgstr "" @@ -3801,6 +3846,11 @@ msgstr "" msgid "SMS" msgstr "" +#: actions/tag.php:68 +#, fuzzy, php-format +msgid "Notices tagged with %1$s, page %2$d" +msgstr "کاربران خود برچسب‌گذاری شده با %s - صفحهٔ %d" + #: actions/tag.php:86 #, php-format msgid "Notice feed for tag %s (RSS 1.0)" @@ -4084,6 +4134,11 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "از هات داگ خود لذت ببرید!" +#: actions/usergroups.php:64 +#, fuzzy, php-format +msgid "%1$s groups, page %2$d" +msgstr "اعضای گروه %s، صفحهٔ %d" + #: actions/usergroups.php:130 msgid "Search for more groups" msgstr "جستجو برای گروه های بیشتر" @@ -4146,7 +4201,7 @@ msgstr "" msgid "Plugins" msgstr "" -#: actions/version.php:196 lib/action.php:741 +#: actions/version.php:196 lib/action.php:747 #, fuzzy msgid "Version" msgstr "شخصی" @@ -4203,27 +4258,27 @@ msgstr "پیغام نمی تواند درج گردد" msgid "Could not update message with new URI." msgstr "" -#: classes/Notice.php:171 +#: classes/Notice.php:157 #, php-format msgid "DB error inserting hashtag: %s" msgstr "" -#: classes/Notice.php:225 +#: classes/Notice.php:214 msgid "Problem saving notice. Too long." msgstr "مشکل در ذخیره کردن پیام. بسیار طولانی." -#: classes/Notice.php:229 +#: classes/Notice.php:218 msgid "Problem saving notice. Unknown user." msgstr "مشکل در ذخیره کردن پیام. کاربر نا شناخته." -#: classes/Notice.php:234 +#: classes/Notice.php:223 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "تعداد خیلی زیاد آگهی و بسیار سریع؛ استراحت کنید و مجددا دقایقی دیگر ارسال " "کنید." -#: classes/Notice.php:240 +#: classes/Notice.php:229 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." @@ -4231,20 +4286,25 @@ msgstr "" "تعداد زیاد پیام های دو نسخه ای و بسرعت؛ استراحت کنید و دقایقی دیگر مجددا " "ارسال کنید." -#: classes/Notice.php:246 +#: classes/Notice.php:235 msgid "You are banned from posting notices on this site." msgstr "شما از فرستادن پست در این سایت مردود شدید ." -#: classes/Notice.php:305 classes/Notice.php:330 +#: classes/Notice.php:294 classes/Notice.php:319 msgid "Problem saving notice." msgstr "مشکل در ذخیره کردن آگهی." -#: classes/Notice.php:1059 +#: classes/Notice.php:790 +#, fuzzy +msgid "Problem saving group inbox." +msgstr "مشکل در ذخیره کردن آگهی." + +#: classes/Notice.php:850 #, php-format msgid "DB error inserting reply: %s" msgstr "" -#: classes/Notice.php:1441 +#: classes/Notice.php:1233 #, php-format msgid "RT @%1$s %2$s" msgstr "" @@ -4299,136 +4359,136 @@ msgstr "%s گروه %s را ترک کرد." msgid "Untitled page" msgstr "صفحه ی بدون عنوان" -#: lib/action.php:427 +#: lib/action.php:433 msgid "Primary site navigation" msgstr "" -#: lib/action.php:433 +#: lib/action.php:439 msgid "Home" msgstr "خانه" -#: lib/action.php:433 +#: lib/action.php:439 msgid "Personal profile and friends timeline" msgstr "" -#: lib/action.php:435 +#: lib/action.php:441 msgid "Change your email, avatar, password, profile" msgstr "آدرس ایمیل، آواتار، کلمه ی عبور، پروفایل خود را تغییر دهید" -#: lib/action.php:438 +#: lib/action.php:444 msgid "Connect" msgstr "وصل‌شدن" -#: lib/action.php:438 +#: lib/action.php:444 msgid "Connect to services" msgstr "متصل شدن به خدمات" -#: lib/action.php:442 +#: lib/action.php:448 msgid "Change site configuration" msgstr "تغییر پیکربندی سایت" -#: lib/action.php:446 lib/subgroupnav.php:105 +#: lib/action.php:452 lib/subgroupnav.php:105 msgid "Invite" msgstr "دعوت‌کردن" -#: lib/action.php:447 lib/subgroupnav.php:106 +#: lib/action.php:453 lib/subgroupnav.php:106 #, php-format msgid "Invite friends and colleagues to join you on %s" msgstr " به شما ملحق شوند %s دوستان و همکاران را دعوت کنید تا در" -#: lib/action.php:452 +#: lib/action.php:458 msgid "Logout" msgstr "خروج" -#: lib/action.php:452 +#: lib/action.php:458 msgid "Logout from the site" msgstr "خارج شدن از سایت ." -#: lib/action.php:457 +#: lib/action.php:463 msgid "Create an account" msgstr "یک حساب کاربری بسازید" -#: lib/action.php:460 +#: lib/action.php:466 msgid "Login to the site" msgstr "ورود به وب‌گاه" -#: lib/action.php:463 lib/action.php:726 +#: lib/action.php:469 lib/action.php:732 msgid "Help" msgstr "کمک" -#: lib/action.php:463 +#: lib/action.php:469 msgid "Help me!" msgstr "به من کمک کنید!" -#: lib/action.php:466 lib/searchaction.php:127 +#: lib/action.php:472 lib/searchaction.php:127 msgid "Search" msgstr "جست‌وجو" -#: lib/action.php:466 +#: lib/action.php:472 msgid "Search for people or text" msgstr "جستجو برای شخص با متن" -#: lib/action.php:487 +#: lib/action.php:493 msgid "Site notice" msgstr "خبر سایت" -#: lib/action.php:553 +#: lib/action.php:559 msgid "Local views" msgstr "دید محلی" -#: lib/action.php:619 +#: lib/action.php:625 msgid "Page notice" msgstr "خبر صفحه" -#: lib/action.php:721 +#: lib/action.php:727 msgid "Secondary site navigation" msgstr "" -#: lib/action.php:728 +#: lib/action.php:734 msgid "About" msgstr "دربارهٔ" -#: lib/action.php:730 +#: lib/action.php:736 msgid "FAQ" msgstr "سوال‌های رایج" -#: lib/action.php:734 +#: lib/action.php:740 msgid "TOS" msgstr "" -#: lib/action.php:737 +#: lib/action.php:743 msgid "Privacy" msgstr "خصوصی" -#: lib/action.php:739 +#: lib/action.php:745 msgid "Source" msgstr "منبع" -#: lib/action.php:743 +#: lib/action.php:749 msgid "Contact" msgstr "تماس" -#: lib/action.php:745 +#: lib/action.php:751 msgid "Badge" msgstr "" -#: lib/action.php:773 +#: lib/action.php:779 msgid "StatusNet software license" msgstr "StatusNet مجوز نرم افزار" -#: lib/action.php:776 +#: lib/action.php:782 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." "broughtby%%](%%site.broughtbyurl%%). " msgstr "" -#: lib/action.php:778 +#: lib/action.php:784 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "" -#: lib/action.php:780 +#: lib/action.php:786 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4436,41 +4496,41 @@ msgid "" "org/licensing/licenses/agpl-3.0.html)." msgstr "" -#: lib/action.php:795 +#: lib/action.php:801 msgid "Site content license" msgstr "مجوز محتویات سایت" -#: lib/action.php:800 +#: lib/action.php:806 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "" -#: lib/action.php:805 +#: lib/action.php:811 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" -#: lib/action.php:808 +#: lib/action.php:814 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" -#: lib/action.php:820 +#: lib/action.php:826 msgid "All " msgstr "همه " -#: lib/action.php:825 +#: lib/action.php:831 msgid "license." msgstr "مجوز." -#: lib/action.php:1124 +#: lib/action.php:1130 msgid "Pagination" msgstr "صفحه بندى" -#: lib/action.php:1133 +#: lib/action.php:1139 msgid "After" msgstr "بعد از" -#: lib/action.php:1141 +#: lib/action.php:1147 msgid "Before" msgstr "قبل از" @@ -4503,10 +4563,24 @@ msgstr "پیکره بندی اصلی سایت" msgid "Design configuration" msgstr "" -#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327 +#: lib/adminpanelaction.php:322 +#, fuzzy +msgid "User configuration" +msgstr "پیکره بندی اصلی سایت" + +#: lib/adminpanelaction.php:327 +#, fuzzy +msgid "Access configuration" +msgstr "پیکره بندی اصلی سایت" + +#: lib/adminpanelaction.php:332 msgid "Paths configuration" msgstr "" +#: lib/applicationeditform.php:136 +msgid "Edit application" +msgstr "" + #: lib/applicationeditform.php:186 msgid "Icon for this application" msgstr "" @@ -5082,12 +5156,12 @@ msgstr "مگابایت" msgid "kB" msgstr "کیلوبایت" -#: lib/jabber.php:202 +#: lib/jabber.php:220 #, php-format msgid "[%s]" msgstr "" -#: lib/jabber.php:385 +#: lib/jabber.php:400 #, php-format msgid "Unknown inbox source %d." msgstr "" @@ -5505,19 +5579,19 @@ msgstr "پاسخ ها" msgid "Favorites" msgstr "چیزهای مورد علاقه" -#: lib/personalgroupnav.php:124 +#: lib/personalgroupnav.php:125 msgid "Inbox" msgstr "صندوق دریافتی" -#: lib/personalgroupnav.php:125 +#: lib/personalgroupnav.php:126 msgid "Your incoming messages" msgstr "پیام های وارد شونده ی شما" -#: lib/personalgroupnav.php:129 +#: lib/personalgroupnav.php:130 msgid "Outbox" msgstr "صندوق خروجی" -#: lib/personalgroupnav.php:130 +#: lib/personalgroupnav.php:131 msgid "Your sent messages" msgstr "پیام های فرستاده شده به وسیله ی شما" @@ -5760,47 +5834,47 @@ msgstr "پیام" msgid "Moderate" msgstr "" -#: lib/util.php:875 +#: lib/util.php:868 msgid "a few seconds ago" msgstr "چند ثانیه پیش" -#: lib/util.php:877 +#: lib/util.php:870 msgid "about a minute ago" msgstr "حدود یک دقیقه پیش" -#: lib/util.php:879 +#: lib/util.php:872 #, php-format msgid "about %d minutes ago" msgstr "حدود %d دقیقه پیش" -#: lib/util.php:881 +#: lib/util.php:874 msgid "about an hour ago" msgstr "حدود یک ساعت پیش" -#: lib/util.php:883 +#: lib/util.php:876 #, php-format msgid "about %d hours ago" msgstr "حدود %d ساعت پیش" -#: lib/util.php:885 +#: lib/util.php:878 msgid "about a day ago" msgstr "حدود یک روز پیش" -#: lib/util.php:887 +#: lib/util.php:880 #, php-format msgid "about %d days ago" msgstr "حدود %d روز پیش" -#: lib/util.php:889 +#: lib/util.php:882 msgid "about a month ago" msgstr "حدود یک ماه پیش" -#: lib/util.php:891 +#: lib/util.php:884 #, php-format msgid "about %d months ago" msgstr "حدود %d ماه پیش" -#: lib/util.php:893 +#: lib/util.php:886 msgid "about a year ago" msgstr "حدود یک سال پیش" @@ -5814,7 +5888,7 @@ msgstr "%s یک رنگ صحیح نیست!" msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "%s یک رنگ صحیح نیست! از ۳ یا ۶ حرف مبنای شانزده استفاده کنید" -#: scripts/xmppdaemon.php:301 +#: lib/xmppmanager.php:402 #, fuzzy, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" diff --git a/locale/fi/LC_MESSAGES/statusnet.po b/locale/fi/LC_MESSAGES/statusnet.po index d07fd61ca8..750e41b08c 100644 --- a/locale/fi/LC_MESSAGES/statusnet.po +++ b/locale/fi/LC_MESSAGES/statusnet.po @@ -10,17 +10,75 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-21 22:36+0000\n" -"PO-Revision-Date: 2010-01-21 22:37:30+0000\n" +"POT-Creation-Date: 2010-01-27 23:58+0000\n" +"PO-Revision-Date: 2010-01-27 23:58:47+0000\n" "Language-Team: Finnish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r61339); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61595); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: fi\n" "X-Message-Group: out-statusnet\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#: actions/accessadminpanel.php:54 lib/adminpanelaction.php:326 +#, fuzzy +msgid "Access" +msgstr "Hyväksy" + +#: actions/accessadminpanel.php:65 +#, fuzzy +msgid "Site access settings" +msgstr "Profiilikuva-asetukset" + +#: actions/accessadminpanel.php:158 +#, fuzzy +msgid "Registration" +msgstr "Rekisteröidy" + +#: actions/accessadminpanel.php:161 +#, fuzzy +msgid "Private" +msgstr "Yksityisyys" + +#: actions/accessadminpanel.php:163 +msgid "Prohibit anonymous users (not logged in) from viewing site?" +msgstr "" + +#: actions/accessadminpanel.php:167 +#, fuzzy +msgid "Invite only" +msgstr "Kutsu" + +#: actions/accessadminpanel.php:169 +msgid "Make registration invitation only." +msgstr "" + +#: actions/accessadminpanel.php:173 +#, fuzzy +msgid "Closed" +msgstr "Estä" + +#: actions/accessadminpanel.php:175 +msgid "Disable new registrations." +msgstr "" + +#: actions/accessadminpanel.php:189 actions/designadminpanel.php:586 +#: actions/emailsettings.php:195 actions/imsettings.php:163 +#: actions/othersettings.php:126 actions/pathsadminpanel.php:351 +#: actions/profilesettings.php:174 actions/siteadminpanel.php:336 +#: actions/smssettings.php:181 actions/subscriptions.php:203 +#: actions/tagother.php:154 actions/useradminpanel.php:313 +#: lib/applicationeditform.php:335 lib/applicationeditform.php:336 +#: lib/designsettings.php:256 lib/groupeditform.php:202 +msgid "Save" +msgstr "Tallenna" + +#: actions/accessadminpanel.php:189 +#, fuzzy +msgid "Save access settings" +msgstr "Profiilikuva-asetukset" + #: actions/all.php:63 actions/public.php:97 actions/replies.php:92 #: actions/showfavorites.php:137 actions/tag.php:51 msgid "No such page" @@ -35,7 +93,7 @@ msgstr "Sivua ei ole." #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:149 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 @@ -140,8 +198,7 @@ msgstr "Käyttäjän %1$s ja kavereiden päivitykset palvelussa %2$s!" #: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 #: actions/apitimelinefriends.php:155 actions/apitimelinegroup.php:150 #: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 -#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 #, fuzzy @@ -158,7 +215,7 @@ msgstr "API-metodia ei löytynyt!" #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:119 +#: actions/apistatusesupdate.php:118 msgid "This method requires a POST." msgstr "Tämä metodi edellyttää POST sanoman." @@ -189,7 +246,7 @@ msgstr "Ei voitu tallentaa profiilia." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:132 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 #: actions/designadminpanel.php:122 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -501,7 +558,14 @@ msgstr "" msgid "Allow or deny access" msgstr "" -#: actions/apioauthauthorize.php:320 lib/action.php:435 +#: actions/apioauthauthorize.php:306 +#, php-format +msgid "" +"The application %s by %s would like the " +"ability to %s your account data." +msgstr "" + +#: actions/apioauthauthorize.php:320 lib/action.php:441 msgid "Account" msgstr "Käyttäjätili" @@ -562,17 +626,17 @@ msgstr "Päivitys poistettu." msgid "No status with that ID found." msgstr "Käyttäjätunnukselle ei löytynyt statusviestiä." -#: actions/apistatusesupdate.php:162 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Päivitys on liian pitkä. Maksimipituus on %d merkkiä." -#: actions/apistatusesupdate.php:203 +#: actions/apistatusesupdate.php:202 msgid "Not found" msgstr "Ei löytynyt" -#: actions/apistatusesupdate.php:226 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "Maksimikoko päivitykselle on %d merkkiä, mukaan lukien URL-osoite." @@ -624,11 +688,6 @@ msgstr "%s julkinen aikajana" msgid "%s updates from everyone!" msgstr "%s päivitykset kaikilta!" -#: actions/apitimelineretweetedbyme.php:112 -#, php-format -msgid "Repeated by %s" -msgstr "" - #: actions/apitimelineretweetedtome.php:111 #, fuzzy, php-format msgid "Repeated to %s" @@ -1041,17 +1100,6 @@ msgstr "" msgid "Reset back to default" msgstr "" -#: actions/designadminpanel.php:586 actions/emailsettings.php:195 -#: actions/imsettings.php:163 actions/othersettings.php:126 -#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174 -#: actions/siteadminpanel.php:388 actions/smssettings.php:181 -#: actions/subscriptions.php:203 actions/tagother.php:154 -#: actions/useradminpanel.php:313 lib/applicationeditform.php:335 -#: lib/applicationeditform.php:336 lib/designsettings.php:256 -#: lib/groupeditform.php:202 -msgid "Save" -msgstr "Tallenna" - #: actions/designadminpanel.php:587 lib/designsettings.php:257 msgid "Save design" msgstr "" @@ -1064,13 +1112,15 @@ msgstr "Tämä päivitys ei ole suosikki!" msgid "Add to favorites" msgstr "Lisää suosikkeihin" -#: actions/doc.php:69 -msgid "No such document." +#: actions/doc.php:155 +#, fuzzy, php-format +msgid "No such document \"%s\"" msgstr "Dokumenttia ei ole." -#: actions/editapplication.php:54 lib/applicationeditform.php:136 -msgid "Edit application" -msgstr "" +#: actions/editapplication.php:54 +#, fuzzy +msgid "Edit Application" +msgstr "Muita asetuksia" #: actions/editapplication.php:66 #, fuzzy @@ -1090,7 +1140,7 @@ msgid "No such application." msgstr "Päivitystä ei ole." #: actions/editapplication.php:127 actions/newapplication.php:110 -#: actions/showapplication.php:118 lib/action.php:1189 +#: actions/showapplication.php:118 lib/action.php:1195 msgid "There was a problem with your session token." msgstr "Istuntoavaimesi kanssa oli ongelma." @@ -1304,7 +1354,7 @@ msgid "Cannot normalize that email address" msgstr "Ei voida normalisoida sähköpostiosoitetta" #: actions/emailsettings.php:331 actions/register.php:201 -#: actions/siteadminpanel.php:157 +#: actions/siteadminpanel.php:143 msgid "Not a valid email address." msgstr "Tuo ei ole kelvollinen sähköpostiosoite." @@ -1316,7 +1366,7 @@ msgstr "Tämä on jo sähköpostiosoitteesi." msgid "That email address already belongs to another user." msgstr "Tämä sähköpostiosoite kuuluu jo toisella käyttäjällä." -#: actions/emailsettings.php:353 actions/imsettings.php:317 +#: actions/emailsettings.php:353 actions/imsettings.php:319 #: actions/smssettings.php:337 msgid "Couldn't insert confirmation code." msgstr "Ei voitu asettaa vahvistuskoodia." @@ -1622,7 +1672,7 @@ msgstr "Ryhmän %s jäsenet, sivu %d" msgid "A list of the users in this group." msgstr "Lista ryhmän käyttäjistä." -#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107 +#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107 msgid "Admin" msgstr "Ylläpito" @@ -1814,6 +1864,11 @@ msgstr "" msgid "That is not your Jabber ID." msgstr "Tämä ei ole Jabber ID-tunnuksesi." +#: actions/inbox.php:59 +#, fuzzy, php-format +msgid "Inbox for %1$s - page %2$d" +msgstr "Saapuneet viestit käyttäjälle %s" + #: actions/inbox.php:62 #, php-format msgid "Inbox for %s" @@ -1998,7 +2053,7 @@ msgstr "Väärä käyttäjätunnus tai salasana" msgid "Error setting user. You are probably not authorized." msgstr "Sinulla ei ole valtuutusta tähän." -#: actions/login.php:188 actions/login.php:241 lib/action.php:460 +#: actions/login.php:188 actions/login.php:241 lib/action.php:466 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Kirjaudu sisään" @@ -2063,8 +2118,9 @@ msgid "No current status" msgstr "Ei nykyistä tilatietoa" #: actions/newapplication.php:52 -msgid "New application" -msgstr "" +#, fuzzy +msgid "New Application" +msgstr "Päivitystä ei ole." #: actions/newapplication.php:64 #, fuzzy @@ -2259,8 +2315,8 @@ msgstr "Yhdistä" msgid "Only " msgstr "Vain " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1038 -#: lib/api.php:1066 lib/api.php:1176 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1039 +#: lib/api.php:1067 lib/api.php:1177 msgid "Not a supported data format." msgstr "Tuo ei ole tuettu tietomuoto." @@ -2331,6 +2387,11 @@ msgstr "Päivityksen sisältö ei kelpaa" msgid "Login token expired." msgstr "Kirjaudu sisään" +#: actions/outbox.php:58 +#, fuzzy, php-format +msgid "Outbox for %1$s - page %2$d" +msgstr "Käyttäjän %s lähetetyt viestit" + #: actions/outbox.php:61 #, php-format msgid "Outbox for %s" @@ -2401,7 +2462,7 @@ msgstr "Uutta salasanaa ei voida tallentaa." msgid "Password saved." msgstr "Salasana tallennettu." -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:331 msgid "Paths" msgstr "Polut" @@ -2409,143 +2470,160 @@ msgstr "Polut" msgid "Path and server settings for this StatusNet site." msgstr "Polut ja palvelin asetukset tälle StatusNet palvelulle." -#: actions/pathsadminpanel.php:140 +#: actions/pathsadminpanel.php:157 #, fuzzy, php-format msgid "Theme directory not readable: %s" msgstr "Pikaviestin ei ole käytettävissä." -#: actions/pathsadminpanel.php:146 +#: actions/pathsadminpanel.php:163 #, php-format msgid "Avatar directory not writable: %s" msgstr "" -#: actions/pathsadminpanel.php:152 +#: actions/pathsadminpanel.php:169 #, php-format msgid "Background directory not writable: %s" msgstr "" -#: actions/pathsadminpanel.php:160 +#: actions/pathsadminpanel.php:177 #, php-format msgid "Locales directory not readable: %s" msgstr "" -#: actions/pathsadminpanel.php:166 +#: actions/pathsadminpanel.php:183 msgid "Invalid SSL server. The maximum length is 255 characters." msgstr "" -#: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58 +#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58 #: lib/adminpanelaction.php:311 #, fuzzy msgid "Site" msgstr "Kutsu" -#: actions/pathsadminpanel.php:221 +#: actions/pathsadminpanel.php:238 +#, fuzzy +msgid "Server" +msgstr "Palauta" + +#: actions/pathsadminpanel.php:238 +msgid "Site's server hostname." +msgstr "" + +#: actions/pathsadminpanel.php:242 msgid "Path" msgstr "" -#: actions/pathsadminpanel.php:221 +#: actions/pathsadminpanel.php:242 #, fuzzy msgid "Site path" msgstr "Palvelun ilmoitus" -#: actions/pathsadminpanel.php:225 +#: actions/pathsadminpanel.php:246 msgid "Path to locales" msgstr "" -#: actions/pathsadminpanel.php:225 +#: actions/pathsadminpanel.php:246 msgid "Directory path to locales" msgstr "" -#: actions/pathsadminpanel.php:232 -msgid "Theme" -msgstr "" - -#: actions/pathsadminpanel.php:237 -msgid "Theme server" -msgstr "" - -#: actions/pathsadminpanel.php:241 -msgid "Theme path" -msgstr "" - -#: actions/pathsadminpanel.php:245 -msgid "Theme directory" +#: actions/pathsadminpanel.php:250 +msgid "Fancy URLs" msgstr "" #: actions/pathsadminpanel.php:252 +msgid "Use fancy (more readable and memorable) URLs?" +msgstr "" + +#: actions/pathsadminpanel.php:259 +msgid "Theme" +msgstr "" + +#: actions/pathsadminpanel.php:264 +msgid "Theme server" +msgstr "" + +#: actions/pathsadminpanel.php:268 +msgid "Theme path" +msgstr "" + +#: actions/pathsadminpanel.php:272 +msgid "Theme directory" +msgstr "" + +#: actions/pathsadminpanel.php:279 #, fuzzy msgid "Avatars" msgstr "Kuva" -#: actions/pathsadminpanel.php:257 +#: actions/pathsadminpanel.php:284 #, fuzzy msgid "Avatar server" msgstr "Profiilikuva-asetukset" -#: actions/pathsadminpanel.php:261 +#: actions/pathsadminpanel.php:288 #, fuzzy msgid "Avatar path" msgstr "Kuva päivitetty." -#: actions/pathsadminpanel.php:265 +#: actions/pathsadminpanel.php:292 #, fuzzy msgid "Avatar directory" msgstr "Kuva poistettu." -#: actions/pathsadminpanel.php:274 +#: actions/pathsadminpanel.php:301 msgid "Backgrounds" msgstr "Taustakuvat" -#: actions/pathsadminpanel.php:278 +#: actions/pathsadminpanel.php:305 msgid "Background server" msgstr "Taustakuvapalvelin" -#: actions/pathsadminpanel.php:282 +#: actions/pathsadminpanel.php:309 msgid "Background path" msgstr "Taustakuvan hakemistopolku" -#: actions/pathsadminpanel.php:286 +#: actions/pathsadminpanel.php:313 msgid "Background directory" msgstr "Taustakuvan hakemisto" -#: actions/pathsadminpanel.php:293 +#: actions/pathsadminpanel.php:320 #, fuzzy msgid "SSL" msgstr "SMS" -#: actions/pathsadminpanel.php:296 actions/siteadminpanel.php:346 +#: actions/pathsadminpanel.php:323 actions/siteadminpanel.php:294 #, fuzzy msgid "Never" msgstr "Palauta" -#: actions/pathsadminpanel.php:297 +#: actions/pathsadminpanel.php:324 #, fuzzy msgid "Sometimes" msgstr "Päivitykset" -#: actions/pathsadminpanel.php:298 +#: actions/pathsadminpanel.php:325 #, fuzzy msgid "Always" msgstr "Aliakset" -#: actions/pathsadminpanel.php:302 +#: actions/pathsadminpanel.php:329 msgid "Use SSL" msgstr "" -#: actions/pathsadminpanel.php:303 +#: actions/pathsadminpanel.php:330 msgid "When to use SSL" msgstr "" -#: actions/pathsadminpanel.php:308 +#: actions/pathsadminpanel.php:335 #, fuzzy msgid "SSL server" msgstr "Palauta" -#: actions/pathsadminpanel.php:309 +#: actions/pathsadminpanel.php:336 msgid "Server to direct SSL requests to" msgstr "" -#: actions/pathsadminpanel.php:325 +#: actions/pathsadminpanel.php:352 #, fuzzy msgid "Save paths" msgstr "Palvelun ilmoitus" @@ -2660,7 +2738,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:151 actions/siteadminpanel.php:294 +#: actions/profilesettings.php:151 actions/siteadminpanel.php:280 msgid "Language" msgstr "Kieli" @@ -2688,7 +2766,7 @@ msgstr "" msgid "Bio is too long (max %d chars)." msgstr "\"Tietoja\" on liian pitkä (max 140 merkkiä)." -#: actions/profilesettings.php:235 actions/siteadminpanel.php:164 +#: actions/profilesettings.php:235 actions/siteadminpanel.php:150 msgid "Timezone not selected." msgstr "Aikavyöhykettä ei ole valittu." @@ -2955,7 +3033,7 @@ msgstr "Virheellinen kutsukoodin." msgid "Registration successful" msgstr "Rekisteröityminen onnistui" -#: actions/register.php:114 actions/register.php:503 lib/action.php:457 +#: actions/register.php:114 actions/register.php:503 lib/action.php:463 #: lib/logingroupnav.php:85 msgid "Register" msgstr "Rekisteröidy" @@ -2997,7 +3075,7 @@ msgid "Same as password above. Required." msgstr "Sama kuin ylläoleva salasana. Pakollinen." #: actions/register.php:438 actions/register.php:442 -#: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120 +#: actions/siteadminpanel.php:256 lib/accountsettingsaction.php:120 msgid "Email" msgstr "Sähköposti" @@ -3167,6 +3245,11 @@ msgstr "Luotu" msgid "Replies to %s" msgstr "Vastaukset käyttäjälle %s" +#: actions/replies.php:127 +#, fuzzy, php-format +msgid "Replies to %1$s, page %2$d" +msgstr "Viesti käyttäjälle %1$s, %2$s" + #: actions/replies.php:144 #, fuzzy, php-format msgid "Replies feed for %s (RSS 1.0)" @@ -3300,6 +3383,11 @@ msgid "" "signature method." msgstr "" +#: actions/showfavorites.php:79 +#, fuzzy, php-format +msgid "%1$s's favorite notices, page %2$d" +msgstr "Käyttäjän %s suosikkipäivitykset" + #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "Ei saatu haettua suosikkipäivityksiä." @@ -3349,6 +3437,11 @@ msgstr "" msgid "%s group" msgstr "Ryhmä %s" +#: actions/showgroup.php:84 +#, fuzzy, php-format +msgid "%1$s group, page %2$d" +msgstr "Ryhmän %s jäsenet, sivu %d" + #: actions/showgroup.php:218 msgid "Group profile" msgstr "Ryhmän profiili" @@ -3461,6 +3554,11 @@ msgstr "Päivitys on poistettu." msgid " tagged %s" msgstr "Päivitykset joilla on tagi %s" +#: actions/showstream.php:79 +#, fuzzy, php-format +msgid "%1$s, page %2$d" +msgstr "%s ja kaverit, sivu %d" + #: actions/showstream.php:122 #, fuzzy, php-format msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" @@ -3546,203 +3644,149 @@ msgstr "Käyttäjä on asettanut eston sinulle." msgid "Basic settings for this StatusNet site." msgstr "" -#: actions/siteadminpanel.php:146 +#: actions/siteadminpanel.php:132 msgid "Site name must have non-zero length." msgstr "" -#: actions/siteadminpanel.php:154 +#: actions/siteadminpanel.php:140 #, fuzzy msgid "You must have a valid contact email address." msgstr "Tuo ei ole kelvollinen sähköpostiosoite" -#: actions/siteadminpanel.php:172 +#: actions/siteadminpanel.php:158 #, php-format msgid "Unknown language \"%s\"." msgstr "" -#: actions/siteadminpanel.php:179 +#: actions/siteadminpanel.php:165 msgid "Invalid snapshot report URL." msgstr "" -#: actions/siteadminpanel.php:185 +#: actions/siteadminpanel.php:171 msgid "Invalid snapshot run value." msgstr "" -#: actions/siteadminpanel.php:191 +#: actions/siteadminpanel.php:177 msgid "Snapshot frequency must be a number." msgstr "" -#: actions/siteadminpanel.php:197 +#: actions/siteadminpanel.php:183 msgid "Minimum text limit is 140 characters." msgstr "" -#: actions/siteadminpanel.php:203 +#: actions/siteadminpanel.php:189 msgid "Dupe limit must 1 or more seconds." msgstr "" -#: actions/siteadminpanel.php:253 +#: actions/siteadminpanel.php:239 msgid "General" msgstr "" -#: actions/siteadminpanel.php:256 +#: actions/siteadminpanel.php:242 #, fuzzy msgid "Site name" msgstr "Palvelun ilmoitus" -#: actions/siteadminpanel.php:257 +#: actions/siteadminpanel.php:243 msgid "The name of your site, like \"Yourcompany Microblog\"" msgstr "" -#: actions/siteadminpanel.php:261 +#: actions/siteadminpanel.php:247 msgid "Brought by" msgstr "" -#: actions/siteadminpanel.php:262 +#: actions/siteadminpanel.php:248 msgid "Text used for credits link in footer of each page" msgstr "" -#: actions/siteadminpanel.php:266 +#: actions/siteadminpanel.php:252 msgid "Brought by URL" msgstr "" -#: actions/siteadminpanel.php:267 +#: actions/siteadminpanel.php:253 msgid "URL used for credits link in footer of each page" msgstr "" -#: actions/siteadminpanel.php:271 +#: actions/siteadminpanel.php:257 #, fuzzy msgid "Contact email address for your site" msgstr "Uusi sähköpostiosoite päivityksien lähettämiseen palveluun %s" -#: actions/siteadminpanel.php:277 +#: actions/siteadminpanel.php:263 #, fuzzy msgid "Local" msgstr "Paikalliset näkymät" -#: actions/siteadminpanel.php:288 +#: actions/siteadminpanel.php:274 msgid "Default timezone" msgstr "" -#: actions/siteadminpanel.php:289 +#: actions/siteadminpanel.php:275 msgid "Default timezone for the site; usually UTC." msgstr "" -#: actions/siteadminpanel.php:295 +#: actions/siteadminpanel.php:281 #, fuzzy msgid "Default site language" msgstr "Ensisijainen kieli" -#: actions/siteadminpanel.php:303 -#, fuzzy -msgid "URLs" -msgstr "URL" - -#: actions/siteadminpanel.php:306 -#, fuzzy -msgid "Server" -msgstr "Palauta" - -#: actions/siteadminpanel.php:306 -msgid "Site's server hostname." -msgstr "" - -#: actions/siteadminpanel.php:310 -msgid "Fancy URLs" -msgstr "" - -#: actions/siteadminpanel.php:312 -msgid "Use fancy (more readable and memorable) URLs?" -msgstr "" - -#: actions/siteadminpanel.php:318 -#, fuzzy -msgid "Access" -msgstr "Hyväksy" - -#: actions/siteadminpanel.php:321 -#, fuzzy -msgid "Private" -msgstr "Yksityisyys" - -#: actions/siteadminpanel.php:323 -msgid "Prohibit anonymous users (not logged in) from viewing site?" -msgstr "" - -#: actions/siteadminpanel.php:327 -#, fuzzy -msgid "Invite only" -msgstr "Kutsu" - -#: actions/siteadminpanel.php:329 -msgid "Make registration invitation only." -msgstr "" - -#: actions/siteadminpanel.php:333 -#, fuzzy -msgid "Closed" -msgstr "Estä" - -#: actions/siteadminpanel.php:335 -msgid "Disable new registrations." -msgstr "" - -#: actions/siteadminpanel.php:341 +#: actions/siteadminpanel.php:289 msgid "Snapshots" msgstr "" -#: actions/siteadminpanel.php:344 +#: actions/siteadminpanel.php:292 msgid "Randomly during Web hit" msgstr "" -#: actions/siteadminpanel.php:345 +#: actions/siteadminpanel.php:293 msgid "In a scheduled job" msgstr "" -#: actions/siteadminpanel.php:347 +#: actions/siteadminpanel.php:295 msgid "Data snapshots" msgstr "" -#: actions/siteadminpanel.php:348 +#: actions/siteadminpanel.php:296 msgid "When to send statistical data to status.net servers" msgstr "" -#: actions/siteadminpanel.php:353 +#: actions/siteadminpanel.php:301 msgid "Frequency" msgstr "" -#: actions/siteadminpanel.php:354 +#: actions/siteadminpanel.php:302 msgid "Snapshots will be sent once every N web hits" msgstr "" -#: actions/siteadminpanel.php:359 +#: actions/siteadminpanel.php:307 msgid "Report URL" msgstr "" -#: actions/siteadminpanel.php:360 +#: actions/siteadminpanel.php:308 msgid "Snapshots will be sent to this URL" msgstr "" -#: actions/siteadminpanel.php:367 +#: actions/siteadminpanel.php:315 msgid "Limits" msgstr "" -#: actions/siteadminpanel.php:370 +#: actions/siteadminpanel.php:318 msgid "Text limit" msgstr "" -#: actions/siteadminpanel.php:370 +#: actions/siteadminpanel.php:318 msgid "Maximum number of characters for notices." msgstr "" -#: actions/siteadminpanel.php:374 +#: actions/siteadminpanel.php:322 msgid "Dupe limit" msgstr "" -#: actions/siteadminpanel.php:374 +#: actions/siteadminpanel.php:322 msgid "How long users must wait (in seconds) to post the same thing again." msgstr "" -#: actions/siteadminpanel.php:388 actions/useradminpanel.php:313 +#: actions/siteadminpanel.php:336 actions/useradminpanel.php:313 #, fuzzy msgid "Save site settings" msgstr "Profiilikuva-asetukset" @@ -3944,6 +3988,11 @@ msgstr "Jabber" msgid "SMS" msgstr "SMS" +#: actions/tag.php:68 +#, fuzzy, php-format +msgid "Notices tagged with %1$s, page %2$d" +msgstr "Käyttäjät joilla henkilötagi %s - sivu %d" + #: actions/tag.php:86 #, fuzzy, php-format msgid "Notice feed for tag %s (RSS 1.0)" @@ -4257,6 +4306,11 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "" +#: actions/usergroups.php:64 +#, fuzzy, php-format +msgid "%1$s groups, page %2$d" +msgstr "Ryhmän %s jäsenet, sivu %d" + #: actions/usergroups.php:130 msgid "Search for more groups" msgstr "Hae lisää ryhmiä" @@ -4319,7 +4373,7 @@ msgstr "" msgid "Plugins" msgstr "" -#: actions/version.php:196 lib/action.php:741 +#: actions/version.php:196 lib/action.php:747 #, fuzzy msgid "Version" msgstr "Omat" @@ -4378,28 +4432,28 @@ msgstr "Viestin tallennus ei onnistunut." msgid "Could not update message with new URI." msgstr "Viestin päivittäminen uudella URI-osoitteella ei onnistunut." -#: classes/Notice.php:171 +#: classes/Notice.php:157 #, php-format msgid "DB error inserting hashtag: %s" msgstr "Tietokantavirhe tallennettaessa risutagiä: %s" -#: classes/Notice.php:225 +#: classes/Notice.php:214 #, fuzzy msgid "Problem saving notice. Too long." msgstr "Ongelma päivityksen tallentamisessa." -#: classes/Notice.php:229 +#: classes/Notice.php:218 msgid "Problem saving notice. Unknown user." msgstr "Virhe tapahtui päivityksen tallennuksessa. Tuntematon käyttäjä." -#: classes/Notice.php:234 +#: classes/Notice.php:223 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Liian monta päivitystä liian nopeasti; pidä pieni hengähdystauko ja jatka " "päivityksien lähettämista muutaman minuutin päästä." -#: classes/Notice.php:240 +#: classes/Notice.php:229 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." @@ -4407,20 +4461,25 @@ msgstr "" "Liian monta päivitystä liian nopeasti; pidä pieni hengähdystauko ja jatka " "päivityksien lähettämista muutaman minuutin päästä." -#: classes/Notice.php:246 +#: classes/Notice.php:235 msgid "You are banned from posting notices on this site." msgstr "Päivityksesi tähän palveluun on estetty." -#: classes/Notice.php:305 classes/Notice.php:330 +#: classes/Notice.php:294 classes/Notice.php:319 msgid "Problem saving notice." msgstr "Ongelma päivityksen tallentamisessa." -#: classes/Notice.php:1059 +#: classes/Notice.php:790 +#, fuzzy +msgid "Problem saving group inbox." +msgstr "Ongelma päivityksen tallentamisessa." + +#: classes/Notice.php:850 #, php-format msgid "DB error inserting reply: %s" msgstr "Tietokantavirhe tallennettaessa vastausta: %s" -#: classes/Notice.php:1441 +#: classes/Notice.php:1233 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" @@ -4476,127 +4535,127 @@ msgstr "%1$s (%2$s)" msgid "Untitled page" msgstr "Nimetön sivu" -#: lib/action.php:427 +#: lib/action.php:433 msgid "Primary site navigation" msgstr "Ensisijainen sivunavigointi" -#: lib/action.php:433 +#: lib/action.php:439 msgid "Home" msgstr "Koti" -#: lib/action.php:433 +#: lib/action.php:439 msgid "Personal profile and friends timeline" msgstr "Henkilökohtainen profiili ja kavereiden aikajana" -#: lib/action.php:435 +#: lib/action.php:441 msgid "Change your email, avatar, password, profile" msgstr "Muuta sähköpostiosoitettasi, kuvaasi, salasanaasi, profiiliasi" -#: lib/action.php:438 +#: lib/action.php:444 msgid "Connect" msgstr "Yhdistä" -#: lib/action.php:438 +#: lib/action.php:444 #, fuzzy msgid "Connect to services" msgstr "Ei voitu uudelleenohjata palvelimelle: %s" -#: lib/action.php:442 +#: lib/action.php:448 #, fuzzy msgid "Change site configuration" msgstr "Ensisijainen sivunavigointi" -#: lib/action.php:446 lib/subgroupnav.php:105 +#: lib/action.php:452 lib/subgroupnav.php:105 msgid "Invite" msgstr "Kutsu" -#: lib/action.php:447 lib/subgroupnav.php:106 +#: lib/action.php:453 lib/subgroupnav.php:106 #, php-format msgid "Invite friends and colleagues to join you on %s" msgstr "Kutsu kavereita ja työkavereita liittymään palveluun %s" -#: lib/action.php:452 +#: lib/action.php:458 msgid "Logout" msgstr "Kirjaudu ulos" -#: lib/action.php:452 +#: lib/action.php:458 msgid "Logout from the site" msgstr "Kirjaudu ulos palvelusta" -#: lib/action.php:457 +#: lib/action.php:463 msgid "Create an account" msgstr "Luo uusi käyttäjätili" -#: lib/action.php:460 +#: lib/action.php:466 msgid "Login to the site" msgstr "Kirjaudu sisään palveluun" -#: lib/action.php:463 lib/action.php:726 +#: lib/action.php:469 lib/action.php:732 msgid "Help" msgstr "Ohjeet" -#: lib/action.php:463 +#: lib/action.php:469 msgid "Help me!" msgstr "Auta minua!" -#: lib/action.php:466 lib/searchaction.php:127 +#: lib/action.php:472 lib/searchaction.php:127 msgid "Search" msgstr "Haku" -#: lib/action.php:466 +#: lib/action.php:472 msgid "Search for people or text" msgstr "Hae ihmisiä tai tekstiä" -#: lib/action.php:487 +#: lib/action.php:493 msgid "Site notice" msgstr "Palvelun ilmoitus" -#: lib/action.php:553 +#: lib/action.php:559 msgid "Local views" msgstr "Paikalliset näkymät" -#: lib/action.php:619 +#: lib/action.php:625 msgid "Page notice" msgstr "Sivuilmoitus" -#: lib/action.php:721 +#: lib/action.php:727 msgid "Secondary site navigation" msgstr "Toissijainen sivunavigointi" -#: lib/action.php:728 +#: lib/action.php:734 msgid "About" msgstr "Tietoa" -#: lib/action.php:730 +#: lib/action.php:736 msgid "FAQ" msgstr "UKK" -#: lib/action.php:734 +#: lib/action.php:740 msgid "TOS" msgstr "" -#: lib/action.php:737 +#: lib/action.php:743 msgid "Privacy" msgstr "Yksityisyys" -#: lib/action.php:739 +#: lib/action.php:745 msgid "Source" msgstr "Lähdekoodi" -#: lib/action.php:743 +#: lib/action.php:749 msgid "Contact" msgstr "Ota yhteyttä" -#: lib/action.php:745 +#: lib/action.php:751 #, fuzzy msgid "Badge" msgstr "Tönäise" -#: lib/action.php:773 +#: lib/action.php:779 msgid "StatusNet software license" msgstr "StatusNet-ohjelmiston lisenssi" -#: lib/action.php:776 +#: lib/action.php:782 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -4605,12 +4664,12 @@ msgstr "" "**%%site.name%%** on mikroblogipalvelu, jonka tarjoaa [%%site.broughtby%%](%%" "site.broughtbyurl%%). " -#: lib/action.php:778 +#: lib/action.php:784 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "**%%site.name%%** on mikroblogipalvelu. " -#: lib/action.php:780 +#: lib/action.php:786 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4621,42 +4680,42 @@ msgstr "" "versio %s, saatavilla lisenssillä [GNU Affero General Public License](http://" "www.fsf.org/licensing/licenses/agpl-3.0.html)." -#: lib/action.php:795 +#: lib/action.php:801 #, fuzzy msgid "Site content license" msgstr "StatusNet-ohjelmiston lisenssi" -#: lib/action.php:800 +#: lib/action.php:806 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "" -#: lib/action.php:805 +#: lib/action.php:811 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" -#: lib/action.php:808 +#: lib/action.php:814 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" -#: lib/action.php:820 +#: lib/action.php:826 msgid "All " msgstr "Kaikki " -#: lib/action.php:825 +#: lib/action.php:831 msgid "license." msgstr "lisenssi." -#: lib/action.php:1124 +#: lib/action.php:1130 msgid "Pagination" msgstr "Sivutus" -#: lib/action.php:1133 +#: lib/action.php:1139 msgid "After" msgstr "Myöhemmin" -#: lib/action.php:1141 +#: lib/action.php:1147 msgid "Before" msgstr "Aiemmin" @@ -4695,11 +4754,25 @@ msgstr "Sähköpostiosoitteen vahvistus" msgid "Design configuration" msgstr "SMS vahvistus" -#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327 +#: lib/adminpanelaction.php:322 +#, fuzzy +msgid "User configuration" +msgstr "SMS vahvistus" + +#: lib/adminpanelaction.php:327 +#, fuzzy +msgid "Access configuration" +msgstr "SMS vahvistus" + +#: lib/adminpanelaction.php:332 #, fuzzy msgid "Paths configuration" msgstr "SMS vahvistus" +#: lib/applicationeditform.php:136 +msgid "Edit application" +msgstr "" + #: lib/applicationeditform.php:186 msgid "Icon for this application" msgstr "" @@ -5291,12 +5364,12 @@ msgstr "" msgid "kB" msgstr "" -#: lib/jabber.php:202 +#: lib/jabber.php:220 #, php-format msgid "[%s]" msgstr "" -#: lib/jabber.php:385 +#: lib/jabber.php:400 #, php-format msgid "Unknown inbox source %d." msgstr "" @@ -5734,19 +5807,19 @@ msgstr "Vastaukset" msgid "Favorites" msgstr "Suosikit" -#: lib/personalgroupnav.php:124 +#: lib/personalgroupnav.php:125 msgid "Inbox" msgstr "Saapuneet" -#: lib/personalgroupnav.php:125 +#: lib/personalgroupnav.php:126 msgid "Your incoming messages" msgstr "Sinulle saapuneet viestit" -#: lib/personalgroupnav.php:129 +#: lib/personalgroupnav.php:130 msgid "Outbox" msgstr "Lähetetyt" -#: lib/personalgroupnav.php:130 +#: lib/personalgroupnav.php:131 msgid "Your sent messages" msgstr "Lähettämäsi viestit" @@ -6005,47 +6078,47 @@ msgstr "Viesti" msgid "Moderate" msgstr "" -#: lib/util.php:875 +#: lib/util.php:868 msgid "a few seconds ago" msgstr "muutama sekunti sitten" -#: lib/util.php:877 +#: lib/util.php:870 msgid "about a minute ago" msgstr "noin minuutti sitten" -#: lib/util.php:879 +#: lib/util.php:872 #, php-format msgid "about %d minutes ago" msgstr "noin %d minuuttia sitten" -#: lib/util.php:881 +#: lib/util.php:874 msgid "about an hour ago" msgstr "noin tunti sitten" -#: lib/util.php:883 +#: lib/util.php:876 #, php-format msgid "about %d hours ago" msgstr "noin %d tuntia sitten" -#: lib/util.php:885 +#: lib/util.php:878 msgid "about a day ago" msgstr "noin päivä sitten" -#: lib/util.php:887 +#: lib/util.php:880 #, php-format msgid "about %d days ago" msgstr "noin %d päivää sitten" -#: lib/util.php:889 +#: lib/util.php:882 msgid "about a month ago" msgstr "noin kuukausi sitten" -#: lib/util.php:891 +#: lib/util.php:884 #, php-format msgid "about %d months ago" msgstr "noin %d kuukautta sitten" -#: lib/util.php:893 +#: lib/util.php:886 msgid "about a year ago" msgstr "noin vuosi sitten" @@ -6059,7 +6132,7 @@ msgstr "Kotisivun verkko-osoite ei ole toimiva." msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "" -#: scripts/xmppdaemon.php:301 +#: lib/xmppmanager.php:402 #, fuzzy, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "Viesti oli liian pitkä - maksimikoko on 140 merkkiä, lähetit %d" diff --git a/locale/fr/LC_MESSAGES/statusnet.po b/locale/fr/LC_MESSAGES/statusnet.po index 41f62001f4..06580cd654 100644 --- a/locale/fr/LC_MESSAGES/statusnet.po +++ b/locale/fr/LC_MESSAGES/statusnet.po @@ -4,6 +4,7 @@ # Author@translatewiki.net: IAlex # Author@translatewiki.net: Isoph # Author@translatewiki.net: Jean-Frédéric +# Author@translatewiki.net: Julien C # Author@translatewiki.net: McDutchie # Author@translatewiki.net: Peter17 # -- @@ -13,17 +14,71 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-21 22:36+0000\n" -"PO-Revision-Date: 2010-01-21 22:37:36+0000\n" +"POT-Creation-Date: 2010-01-27 23:58+0000\n" +"PO-Revision-Date: 2010-01-27 23:58:53+0000\n" "Language-Team: French\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r61339); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61595); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: fr\n" "X-Message-Group: out-statusnet\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" +#: actions/accessadminpanel.php:54 lib/adminpanelaction.php:326 +msgid "Access" +msgstr "Accès" + +#: actions/accessadminpanel.php:65 +#, fuzzy +msgid "Site access settings" +msgstr "Sauvegarder les paramètres du site" + +#: actions/accessadminpanel.php:158 +#, fuzzy +msgid "Registration" +msgstr "Créer un compte" + +#: actions/accessadminpanel.php:161 +msgid "Private" +msgstr "Privé" + +#: actions/accessadminpanel.php:163 +msgid "Prohibit anonymous users (not logged in) from viewing site?" +msgstr "Interdire aux utilisateurs anonymes (non connectés) de voir le site ?" + +#: actions/accessadminpanel.php:167 +msgid "Invite only" +msgstr "Sur invitation uniquement" + +#: actions/accessadminpanel.php:169 +msgid "Make registration invitation only." +msgstr "Rendre l’inscription sur invitation seulement." + +#: actions/accessadminpanel.php:173 +msgid "Closed" +msgstr "Fermé" + +#: actions/accessadminpanel.php:175 +msgid "Disable new registrations." +msgstr "Désactiver les nouvelles inscriptions." + +#: actions/accessadminpanel.php:189 actions/designadminpanel.php:586 +#: actions/emailsettings.php:195 actions/imsettings.php:163 +#: actions/othersettings.php:126 actions/pathsadminpanel.php:351 +#: actions/profilesettings.php:174 actions/siteadminpanel.php:336 +#: actions/smssettings.php:181 actions/subscriptions.php:203 +#: actions/tagother.php:154 actions/useradminpanel.php:313 +#: lib/applicationeditform.php:335 lib/applicationeditform.php:336 +#: lib/designsettings.php:256 lib/groupeditform.php:202 +msgid "Save" +msgstr "Enregistrer" + +#: actions/accessadminpanel.php:189 +#, fuzzy +msgid "Save access settings" +msgstr "Sauvegarder les paramètres du site" + #: actions/all.php:63 actions/public.php:97 actions/replies.php:92 #: actions/showfavorites.php:137 actions/tag.php:51 msgid "No such page" @@ -38,7 +93,7 @@ msgstr "Page non trouvée" #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:149 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 @@ -146,8 +201,7 @@ msgstr "Statuts de %1$s et ses amis dans %2$s!" #: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 #: actions/apitimelinefriends.php:155 actions/apitimelinegroup.php:150 #: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 -#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found." @@ -163,7 +217,7 @@ msgstr "Méthode API non trouvée !" #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:119 +#: actions/apistatusesupdate.php:118 msgid "This method requires a POST." msgstr "Ce processus requiert un POST." @@ -194,7 +248,7 @@ msgstr "Impossible d’enregistrer le profil." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:132 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 #: actions/designadminpanel.php:122 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -435,7 +489,7 @@ msgstr "groupes sur %s" #: actions/apioauthauthorize.php:108 actions/apioauthauthorize.php:114 msgid "Bad request." -msgstr "" +msgstr "Requête invalide." #: actions/apioauthauthorize.php:134 actions/avatarsettings.php:268 #: actions/deletenotice.php:157 actions/disfavor.php:74 @@ -478,11 +532,13 @@ msgid "" "The request token %s has been authorized. Please exchange it for an access " "token." msgstr "" +"Le jeton de connexion %s a été autorisé. Merci de l'échanger contre un jeton " +"d'accès." #: actions/apioauthauthorize.php:241 #, php-format msgid "The request token %s has been denied." -msgstr "" +msgstr "Le jeton de connexion %s a été refusé." #: actions/apioauthauthorize.php:246 actions/avatarsettings.php:281 #: actions/designadminpanel.php:103 actions/editapplication.php:139 @@ -496,12 +552,20 @@ msgstr "Soumission de formulaire inattendue." #: actions/apioauthauthorize.php:273 msgid "An application would like to connect to your account" msgstr "" +"Une application vous demande l'autorisation de se connecter à votre compte" #: actions/apioauthauthorize.php:290 msgid "Allow or deny access" +msgstr "Autoriser ou refuser l'accès" + +#: actions/apioauthauthorize.php:306 +#, php-format +msgid "" +"The application %s by %s would like the " +"ability to %s your account data." msgstr "" -#: actions/apioauthauthorize.php:320 lib/action.php:435 +#: actions/apioauthauthorize.php:320 lib/action.php:441 msgid "Account" msgstr "Compte" @@ -527,7 +591,7 @@ msgstr "Autoriser" #: actions/apioauthauthorize.php:361 msgid "Allow or deny access to your account information." -msgstr "" +msgstr "Autoriser ou refuser l'accès à votre compte." #: actions/apistatusesdestroy.php:107 msgid "This method requires a POST or DELETE." @@ -558,17 +622,17 @@ msgstr "Statut supprimé." msgid "No status with that ID found." msgstr "Aucun statut trouvé avec cet identifiant." -#: actions/apistatusesupdate.php:162 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "C’est trop long ! La taille maximale de l’avis est de %d caractères." -#: actions/apistatusesupdate.php:203 +#: actions/apistatusesupdate.php:202 msgid "Not found" msgstr "Non trouvé" -#: actions/apistatusesupdate.php:226 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -621,11 +685,6 @@ msgstr "Activité publique %s" msgid "%s updates from everyone!" msgstr "%s statuts de tout le monde !" -#: actions/apitimelineretweetedbyme.php:112 -#, php-format -msgid "Repeated by %s" -msgstr "Repris par %s" - #: actions/apitimelineretweetedtome.php:111 #, php-format msgid "Repeated to %s" @@ -1036,17 +1095,6 @@ msgstr "Restaurer les conceptions par défaut" msgid "Reset back to default" msgstr "Revenir aux valeurs par défaut" -#: actions/designadminpanel.php:586 actions/emailsettings.php:195 -#: actions/imsettings.php:163 actions/othersettings.php:126 -#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174 -#: actions/siteadminpanel.php:388 actions/smssettings.php:181 -#: actions/subscriptions.php:203 actions/tagother.php:154 -#: actions/useradminpanel.php:313 lib/applicationeditform.php:335 -#: lib/applicationeditform.php:336 lib/designsettings.php:256 -#: lib/groupeditform.php:202 -msgid "Save" -msgstr "Enregistrer" - #: actions/designadminpanel.php:587 lib/designsettings.php:257 msgid "Save design" msgstr "Sauvegarder la conception" @@ -1059,13 +1107,15 @@ msgstr "Cet avis n’est pas un favori !" msgid "Add to favorites" msgstr "Ajouter aux favoris" -#: actions/doc.php:69 -msgid "No such document." +#: actions/doc.php:155 +#, fuzzy, php-format +msgid "No such document \"%s\"" msgstr "Document non trouvé." -#: actions/editapplication.php:54 lib/applicationeditform.php:136 -msgid "Edit application" -msgstr "" +#: actions/editapplication.php:54 +#, fuzzy +msgid "Edit Application" +msgstr "Modifier votre application" #: actions/editapplication.php:66 #, fuzzy @@ -1079,12 +1129,11 @@ msgstr "Vous n'êtes pas membre de ce groupe." #: actions/editapplication.php:81 actions/oauthconnectionssettings.php:163 #: actions/showapplication.php:87 -#, fuzzy msgid "No such application." -msgstr "Avis non trouvé." +msgstr "Pas d'application." #: actions/editapplication.php:127 actions/newapplication.php:110 -#: actions/showapplication.php:118 lib/action.php:1189 +#: actions/showapplication.php:118 lib/action.php:1195 msgid "There was a problem with your session token." msgstr "Un problème est survenu avec votre jeton de session." @@ -1110,7 +1159,7 @@ msgstr "Description" #: actions/editapplication.php:191 msgid "Source URL is too long." -msgstr "" +msgstr "L'URL source est trop longue." #: actions/editapplication.php:197 actions/newapplication.php:182 #, fuzzy @@ -1132,7 +1181,7 @@ msgstr "" #: actions/editapplication.php:215 actions/newapplication.php:203 msgid "Callback is too long." -msgstr "" +msgstr "Le Callback est trop long." #: actions/editapplication.php:222 actions/newapplication.php:212 #, fuzzy @@ -1295,7 +1344,7 @@ msgid "Cannot normalize that email address" msgstr "Impossible d’utiliser cette adresse courriel" #: actions/emailsettings.php:331 actions/register.php:201 -#: actions/siteadminpanel.php:157 +#: actions/siteadminpanel.php:143 msgid "Not a valid email address." msgstr "Adresse courriel invalide." @@ -1307,7 +1356,7 @@ msgstr "Vous utilisez déjà cette adresse courriel." msgid "That email address already belongs to another user." msgstr "Cette adresse courriel appartient déjà à un autre utilisateur." -#: actions/emailsettings.php:353 actions/imsettings.php:317 +#: actions/emailsettings.php:353 actions/imsettings.php:319 #: actions/smssettings.php:337 msgid "Couldn't insert confirmation code." msgstr "Impossible d’insérer le code de confirmation." @@ -1615,7 +1664,7 @@ msgstr "Membres du groupe %1$s - page %2$d" msgid "A list of the users in this group." msgstr "Liste des utilisateurs inscrits à ce groupe." -#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107 +#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107 msgid "Admin" msgstr "Administrer" @@ -1817,6 +1866,11 @@ msgstr "" msgid "That is not your Jabber ID." msgstr "Ceci n’est pas votre identifiant Jabber." +#: actions/inbox.php:59 +#, fuzzy, php-format +msgid "Inbox for %1$s - page %2$d" +msgstr "Boîte de réception de %s" + #: actions/inbox.php:62 #, php-format msgid "Inbox for %s" @@ -2005,7 +2059,7 @@ msgstr "" "Erreur lors de la mise en place de l’utilisateur. Vous n’y êtes probablement " "pas autorisé." -#: actions/login.php:188 actions/login.php:241 lib/action.php:460 +#: actions/login.php:188 actions/login.php:241 lib/action.php:466 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Ouvrir une session" @@ -2073,8 +2127,9 @@ msgid "No current status" msgstr "Aucun statut actuel" #: actions/newapplication.php:52 -msgid "New application" -msgstr "" +#, fuzzy +msgid "New Application" +msgstr "Nouvelle application" #: actions/newapplication.php:64 #, fuzzy @@ -2230,7 +2285,7 @@ msgstr "" #: actions/oauthconnectionssettings.php:71 msgid "Connected applications" -msgstr "" +msgstr "Applications connectées." #: actions/oauthconnectionssettings.php:87 msgid "You have allowed the following applications to access you account." @@ -2271,8 +2326,8 @@ msgstr "type de contenu " msgid "Only " msgstr "Seulement " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1038 -#: lib/api.php:1066 lib/api.php:1176 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1039 +#: lib/api.php:1067 lib/api.php:1177 msgid "Not a supported data format." msgstr "Format de données non supporté." @@ -2337,6 +2392,11 @@ msgstr "Jeton d'identification invalide." msgid "Login token expired." msgstr "Jeton d'identification périmé." +#: actions/outbox.php:58 +#, fuzzy, php-format +msgid "Outbox for %1$s - page %2$d" +msgstr "Boîte d’envoi de %s" + #: actions/outbox.php:61 #, php-format msgid "Outbox for %s" @@ -2408,7 +2468,7 @@ msgstr "Impossible de sauvegarder le nouveau mot de passe." msgid "Password saved." msgstr "Mot de passe enregistré." -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:331 msgid "Paths" msgstr "Chemins" @@ -2416,132 +2476,148 @@ msgstr "Chemins" msgid "Path and server settings for this StatusNet site." msgstr "Paramètres de chemin et serveur pour ce site StatusNet." -#: actions/pathsadminpanel.php:140 +#: actions/pathsadminpanel.php:157 #, php-format msgid "Theme directory not readable: %s" msgstr "Dossier des thème non lisible : %s" -#: actions/pathsadminpanel.php:146 +#: actions/pathsadminpanel.php:163 #, php-format msgid "Avatar directory not writable: %s" msgstr "Dossier des avatars non inscriptible : %s" -#: actions/pathsadminpanel.php:152 +#: actions/pathsadminpanel.php:169 #, php-format msgid "Background directory not writable: %s" msgstr "Dossier des arrière plans non inscriptible : %s" -#: actions/pathsadminpanel.php:160 +#: actions/pathsadminpanel.php:177 #, php-format msgid "Locales directory not readable: %s" msgstr "Dossier des paramètres régionaux non lisible : %s" -#: actions/pathsadminpanel.php:166 +#: actions/pathsadminpanel.php:183 msgid "Invalid SSL server. The maximum length is 255 characters." msgstr "Serveur SSL invalide. La longueur maximale est de 255 caractères." -#: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58 +#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58 #: lib/adminpanelaction.php:311 msgid "Site" msgstr "Site" -#: actions/pathsadminpanel.php:221 +#: actions/pathsadminpanel.php:238 +msgid "Server" +msgstr "Serveur" + +#: actions/pathsadminpanel.php:238 +msgid "Site's server hostname." +msgstr "Nom d’hôte du serveur du site." + +#: actions/pathsadminpanel.php:242 msgid "Path" msgstr "Chemin" -#: actions/pathsadminpanel.php:221 +#: actions/pathsadminpanel.php:242 msgid "Site path" msgstr "Chemin du site" -#: actions/pathsadminpanel.php:225 +#: actions/pathsadminpanel.php:246 msgid "Path to locales" msgstr "Chemin vers les paramètres régionaux" -#: actions/pathsadminpanel.php:225 +#: actions/pathsadminpanel.php:246 msgid "Directory path to locales" msgstr "Chemin de dossier vers les paramètres régionaux" -#: actions/pathsadminpanel.php:232 +#: actions/pathsadminpanel.php:250 +msgid "Fancy URLs" +msgstr "Jolies URL" + +#: actions/pathsadminpanel.php:252 +msgid "Use fancy (more readable and memorable) URLs?" +msgstr "Utiliser des jolies URL (plus lisibles et mémorable) ?" + +#: actions/pathsadminpanel.php:259 msgid "Theme" msgstr "Thème" -#: actions/pathsadminpanel.php:237 +#: actions/pathsadminpanel.php:264 msgid "Theme server" msgstr "Serveur de thèmes" -#: actions/pathsadminpanel.php:241 +#: actions/pathsadminpanel.php:268 msgid "Theme path" msgstr "Chemin des thèmes" -#: actions/pathsadminpanel.php:245 +#: actions/pathsadminpanel.php:272 msgid "Theme directory" msgstr "Dossier des thèmes" -#: actions/pathsadminpanel.php:252 +#: actions/pathsadminpanel.php:279 msgid "Avatars" msgstr "Avatars" -#: actions/pathsadminpanel.php:257 +#: actions/pathsadminpanel.php:284 msgid "Avatar server" msgstr "Serveur d’avatar" -#: actions/pathsadminpanel.php:261 +#: actions/pathsadminpanel.php:288 msgid "Avatar path" msgstr "Chemin des avatars" -#: actions/pathsadminpanel.php:265 +#: actions/pathsadminpanel.php:292 msgid "Avatar directory" msgstr "Dossier des avatars" -#: actions/pathsadminpanel.php:274 +#: actions/pathsadminpanel.php:301 msgid "Backgrounds" msgstr "Arrière plans" -#: actions/pathsadminpanel.php:278 +#: actions/pathsadminpanel.php:305 msgid "Background server" msgstr "Serveur des arrière plans" -#: actions/pathsadminpanel.php:282 +#: actions/pathsadminpanel.php:309 msgid "Background path" msgstr "Chemin des arrière plans" -#: actions/pathsadminpanel.php:286 +#: actions/pathsadminpanel.php:313 msgid "Background directory" msgstr "Dossier des arrière plans" -#: actions/pathsadminpanel.php:293 +#: actions/pathsadminpanel.php:320 msgid "SSL" msgstr "SSL" -#: actions/pathsadminpanel.php:296 actions/siteadminpanel.php:346 +#: actions/pathsadminpanel.php:323 actions/siteadminpanel.php:294 msgid "Never" msgstr "Jamais" -#: actions/pathsadminpanel.php:297 +#: actions/pathsadminpanel.php:324 msgid "Sometimes" msgstr "Quelquefois" -#: actions/pathsadminpanel.php:298 +#: actions/pathsadminpanel.php:325 msgid "Always" msgstr "Toujours" -#: actions/pathsadminpanel.php:302 +#: actions/pathsadminpanel.php:329 msgid "Use SSL" msgstr "Utiliser SSL" -#: actions/pathsadminpanel.php:303 +#: actions/pathsadminpanel.php:330 msgid "When to use SSL" msgstr "Quand utiliser SSL" -#: actions/pathsadminpanel.php:308 +#: actions/pathsadminpanel.php:335 msgid "SSL server" msgstr "Serveur SSL" -#: actions/pathsadminpanel.php:309 +#: actions/pathsadminpanel.php:336 msgid "Server to direct SSL requests to" msgstr "Serveur vers lequel rediriger les requêtes SSL" -#: actions/pathsadminpanel.php:325 +#: actions/pathsadminpanel.php:352 msgid "Save paths" msgstr "Enregistrer les chemins." @@ -2655,7 +2731,7 @@ msgstr "" "Marques pour vous-même (lettres, chiffres, -, ., et _), séparées par des " "virgules ou des espaces" -#: actions/profilesettings.php:151 actions/siteadminpanel.php:294 +#: actions/profilesettings.php:151 actions/siteadminpanel.php:280 msgid "Language" msgstr "Langue" @@ -2683,7 +2759,7 @@ msgstr "" msgid "Bio is too long (max %d chars)." msgstr "La bio est trop longue (%d caractères maximum)." -#: actions/profilesettings.php:235 actions/siteadminpanel.php:164 +#: actions/profilesettings.php:235 actions/siteadminpanel.php:150 msgid "Timezone not selected." msgstr "Aucun fuseau horaire n’a été choisi." @@ -2963,7 +3039,7 @@ msgstr "Désolé, code d’invitation invalide." msgid "Registration successful" msgstr "Compte créé avec succès" -#: actions/register.php:114 actions/register.php:503 lib/action.php:457 +#: actions/register.php:114 actions/register.php:503 lib/action.php:463 #: lib/logingroupnav.php:85 msgid "Register" msgstr "Créer un compte" @@ -3006,7 +3082,7 @@ msgid "Same as password above. Required." msgstr "Identique au mot de passe ci-dessus. Requis." #: actions/register.php:438 actions/register.php:442 -#: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120 +#: actions/siteadminpanel.php:256 lib/accountsettingsaction.php:120 msgid "Email" msgstr "Courriel" @@ -3166,6 +3242,11 @@ msgstr "Repris !" msgid "Replies to %s" msgstr "Réponses à %s" +#: actions/replies.php:127 +#, fuzzy, php-format +msgid "Replies to %1$s, page %2$d" +msgstr "Réponses à %1$s sur %2$s !" + #: actions/replies.php:144 #, php-format msgid "Replies feed for %s (RSS 1.0)" @@ -3302,6 +3383,11 @@ msgid "" "signature method." msgstr "" +#: actions/showfavorites.php:79 +#, fuzzy, php-format +msgid "%1$s's favorite notices, page %2$d" +msgstr "Avis favoris de %s" + #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "Impossible d’afficher les favoris." @@ -3359,6 +3445,11 @@ msgstr "C’est un moyen de partager ce que vous aimez." msgid "%s group" msgstr "Groupe %s" +#: actions/showgroup.php:84 +#, fuzzy, php-format +msgid "%1$s group, page %2$d" +msgstr "Membres du groupe %1$s - page %2$d" + #: actions/showgroup.php:218 msgid "Group profile" msgstr "Profil du groupe" @@ -3481,6 +3572,11 @@ msgstr "Avis supprimé." msgid " tagged %s" msgstr " marqué %s" +#: actions/showstream.php:79 +#, fuzzy, php-format +msgid "%1$s, page %2$d" +msgstr "%1$s profils bloqués, page %2$d" + #: actions/showstream.php:122 #, php-format msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" @@ -3571,194 +3667,146 @@ msgstr "Cet utilisateur est déjà réduit au silence." msgid "Basic settings for this StatusNet site." msgstr "Paramètres basiques pour ce site StatusNet." -#: actions/siteadminpanel.php:146 +#: actions/siteadminpanel.php:132 msgid "Site name must have non-zero length." msgstr "Le nom du site ne peut pas être vide." -#: actions/siteadminpanel.php:154 +#: actions/siteadminpanel.php:140 msgid "You must have a valid contact email address." msgstr "Vous devez avoir une adresse électronique de contact valide." -#: actions/siteadminpanel.php:172 +#: actions/siteadminpanel.php:158 #, php-format msgid "Unknown language \"%s\"." msgstr "Langue « %s » inconnue." -#: actions/siteadminpanel.php:179 +#: actions/siteadminpanel.php:165 msgid "Invalid snapshot report URL." msgstr "URL de rapport d’instantanés invalide." -#: actions/siteadminpanel.php:185 +#: actions/siteadminpanel.php:171 msgid "Invalid snapshot run value." msgstr "Valeur de lancement d’instantanés invalide." -#: actions/siteadminpanel.php:191 +#: actions/siteadminpanel.php:177 msgid "Snapshot frequency must be a number." msgstr "La fréquence des instantanés doit être un nombre." -#: actions/siteadminpanel.php:197 +#: actions/siteadminpanel.php:183 msgid "Minimum text limit is 140 characters." msgstr "La limite minimale de texte est de 140 caractères." -#: actions/siteadminpanel.php:203 +#: actions/siteadminpanel.php:189 msgid "Dupe limit must 1 or more seconds." msgstr "La limite de doublon doit être d’une seconde ou plus." -#: actions/siteadminpanel.php:253 +#: actions/siteadminpanel.php:239 msgid "General" msgstr "Général" -#: actions/siteadminpanel.php:256 +#: actions/siteadminpanel.php:242 msgid "Site name" msgstr "Nom du site" -#: actions/siteadminpanel.php:257 +#: actions/siteadminpanel.php:243 msgid "The name of your site, like \"Yourcompany Microblog\"" msgstr "Le nom de votre site, comme « Microblog de votre compagnie »" -#: actions/siteadminpanel.php:261 +#: actions/siteadminpanel.php:247 msgid "Brought by" msgstr "Apporté par" -#: actions/siteadminpanel.php:262 +#: actions/siteadminpanel.php:248 msgid "Text used for credits link in footer of each page" msgstr "Texte utilisé pour le lien de crédits au bas de chaque page" -#: actions/siteadminpanel.php:266 +#: actions/siteadminpanel.php:252 msgid "Brought by URL" msgstr "Apporté par URL" -#: actions/siteadminpanel.php:267 +#: actions/siteadminpanel.php:253 msgid "URL used for credits link in footer of each page" msgstr "URL utilisée pour le lien de crédits au bas de chaque page" -#: actions/siteadminpanel.php:271 +#: actions/siteadminpanel.php:257 msgid "Contact email address for your site" msgstr "Adresse de courriel de contact de votre site" -#: actions/siteadminpanel.php:277 +#: actions/siteadminpanel.php:263 msgid "Local" msgstr "Local" -#: actions/siteadminpanel.php:288 +#: actions/siteadminpanel.php:274 msgid "Default timezone" msgstr "Zone horaire par défaut" -#: actions/siteadminpanel.php:289 +#: actions/siteadminpanel.php:275 msgid "Default timezone for the site; usually UTC." msgstr "Zone horaire par défaut pour ce site ; généralement UTC." -#: actions/siteadminpanel.php:295 +#: actions/siteadminpanel.php:281 msgid "Default site language" msgstr "Langue du site par défaut" -#: actions/siteadminpanel.php:303 -msgid "URLs" -msgstr "URL" - -#: actions/siteadminpanel.php:306 -msgid "Server" -msgstr "Serveur" - -#: actions/siteadminpanel.php:306 -msgid "Site's server hostname." -msgstr "Nom d’hôte du serveur du site." - -#: actions/siteadminpanel.php:310 -msgid "Fancy URLs" -msgstr "Jolies URL" - -#: actions/siteadminpanel.php:312 -msgid "Use fancy (more readable and memorable) URLs?" -msgstr "Utiliser des jolies URL (plus lisibles et mémorable) ?" - -#: actions/siteadminpanel.php:318 -msgid "Access" -msgstr "Accès" - -#: actions/siteadminpanel.php:321 -msgid "Private" -msgstr "Privé" - -#: actions/siteadminpanel.php:323 -msgid "Prohibit anonymous users (not logged in) from viewing site?" -msgstr "Interdire aux utilisateurs anonymes (non connectés) de voir le site ?" - -#: actions/siteadminpanel.php:327 -msgid "Invite only" -msgstr "Sur invitation uniquement" - -#: actions/siteadminpanel.php:329 -msgid "Make registration invitation only." -msgstr "Rendre l’inscription sur invitation seulement." - -#: actions/siteadminpanel.php:333 -msgid "Closed" -msgstr "Fermé" - -#: actions/siteadminpanel.php:335 -msgid "Disable new registrations." -msgstr "Désactiver les nouvelles inscriptions." - -#: actions/siteadminpanel.php:341 +#: actions/siteadminpanel.php:289 msgid "Snapshots" msgstr "Instantanés" -#: actions/siteadminpanel.php:344 +#: actions/siteadminpanel.php:292 msgid "Randomly during Web hit" msgstr "Au hasard lors des requêtes web" -#: actions/siteadminpanel.php:345 +#: actions/siteadminpanel.php:293 msgid "In a scheduled job" msgstr "Dans une tâche programée" -#: actions/siteadminpanel.php:347 +#: actions/siteadminpanel.php:295 msgid "Data snapshots" msgstr "Instantanés de données" -#: actions/siteadminpanel.php:348 +#: actions/siteadminpanel.php:296 msgid "When to send statistical data to status.net servers" msgstr "Quand envoyer des données statistiques aux serveurs status.net" -#: actions/siteadminpanel.php:353 +#: actions/siteadminpanel.php:301 msgid "Frequency" msgstr "Fréquence" -#: actions/siteadminpanel.php:354 +#: actions/siteadminpanel.php:302 msgid "Snapshots will be sent once every N web hits" msgstr "Les instantanés seront envoyés une fois tous les N requêtes" -#: actions/siteadminpanel.php:359 +#: actions/siteadminpanel.php:307 msgid "Report URL" msgstr "URL de rapport" -#: actions/siteadminpanel.php:360 +#: actions/siteadminpanel.php:308 msgid "Snapshots will be sent to this URL" msgstr "Les instantanés seront envoyés à cette URL" -#: actions/siteadminpanel.php:367 +#: actions/siteadminpanel.php:315 msgid "Limits" msgstr "Limites" -#: actions/siteadminpanel.php:370 +#: actions/siteadminpanel.php:318 msgid "Text limit" msgstr "Limite de texte" -#: actions/siteadminpanel.php:370 +#: actions/siteadminpanel.php:318 msgid "Maximum number of characters for notices." msgstr "Nombre maximal de caractères pour les avis." -#: actions/siteadminpanel.php:374 +#: actions/siteadminpanel.php:322 msgid "Dupe limit" msgstr "Limite de doublons" -#: actions/siteadminpanel.php:374 +#: actions/siteadminpanel.php:322 msgid "How long users must wait (in seconds) to post the same thing again." msgstr "" "Combien de temps (en secondes) les utilisateurs doivent attendre pour poster " "la même chose de nouveau." -#: actions/siteadminpanel.php:388 actions/useradminpanel.php:313 +#: actions/siteadminpanel.php:336 actions/useradminpanel.php:313 msgid "Save site settings" msgstr "Sauvegarder les paramètres du site" @@ -3970,6 +4018,11 @@ msgstr "Jabber" msgid "SMS" msgstr "SMS" +#: actions/tag.php:68 +#, fuzzy, php-format +msgid "Notices tagged with %1$s, page %2$d" +msgstr "Utilisateurs marqués par eux-mêmes avec %1$s - page %2$d" + #: actions/tag.php:86 #, php-format msgid "Notice feed for tag %s (RSS 1.0)" @@ -4274,6 +4327,11 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "Bon appétit !" +#: actions/usergroups.php:64 +#, fuzzy, php-format +msgid "%1$s groups, page %2$d" +msgstr "Membres du groupe %1$s - page %2$d" + #: actions/usergroups.php:130 msgid "Search for more groups" msgstr "Rechercher pour plus de groupes" @@ -4349,7 +4407,7 @@ msgstr "" msgid "Plugins" msgstr "Extensions" -#: actions/version.php:196 lib/action.php:741 +#: actions/version.php:196 lib/action.php:747 msgid "Version" msgstr "Version" @@ -4405,27 +4463,27 @@ msgstr "Impossible d’insérer le message." msgid "Could not update message with new URI." msgstr "Impossible de mettre à jour le message avec un nouvel URI." -#: classes/Notice.php:171 +#: classes/Notice.php:157 #, php-format msgid "DB error inserting hashtag: %s" msgstr "Erreur de base de donnée en insérant la marque (hashtag) : %s" -#: classes/Notice.php:225 +#: classes/Notice.php:214 msgid "Problem saving notice. Too long." msgstr "Problème lors de l’enregistrement de l’avis ; trop long." -#: classes/Notice.php:229 +#: classes/Notice.php:218 msgid "Problem saving notice. Unknown user." msgstr "Erreur lors de l’enregistrement de l’avis. Utilisateur inconnu." -#: classes/Notice.php:234 +#: classes/Notice.php:223 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Trop d’avis, trop vite ! Faites une pause et publiez à nouveau dans quelques " "minutes." -#: classes/Notice.php:240 +#: classes/Notice.php:229 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." @@ -4433,20 +4491,25 @@ msgstr "" "Trop de messages en double trop vite ! Prenez une pause et publiez à nouveau " "dans quelques minutes." -#: classes/Notice.php:246 +#: classes/Notice.php:235 msgid "You are banned from posting notices on this site." msgstr "Il vous est interdit de poster des avis sur ce site." -#: classes/Notice.php:305 classes/Notice.php:330 +#: classes/Notice.php:294 classes/Notice.php:319 msgid "Problem saving notice." msgstr "Problème lors de l’enregistrement de l’avis." -#: classes/Notice.php:1059 +#: classes/Notice.php:790 +#, fuzzy +msgid "Problem saving group inbox." +msgstr "Problème lors de l’enregistrement de l’avis." + +#: classes/Notice.php:850 #, php-format msgid "DB error inserting reply: %s" msgstr "Erreur de base de donnée en insérant la réponse :%s" -#: classes/Notice.php:1441 +#: classes/Notice.php:1233 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -4501,124 +4564,124 @@ msgstr "%1$s - %2$s" msgid "Untitled page" msgstr "Page sans nom" -#: lib/action.php:427 +#: lib/action.php:433 msgid "Primary site navigation" msgstr "Navigation primaire du site" -#: lib/action.php:433 +#: lib/action.php:439 msgid "Home" msgstr "Accueil" -#: lib/action.php:433 +#: lib/action.php:439 msgid "Personal profile and friends timeline" msgstr "Profil personnel et flux des amis" -#: lib/action.php:435 +#: lib/action.php:441 msgid "Change your email, avatar, password, profile" msgstr "Modifier votre courriel, avatar, mot de passe, profil" -#: lib/action.php:438 +#: lib/action.php:444 msgid "Connect" msgstr "Connecter" -#: lib/action.php:438 +#: lib/action.php:444 msgid "Connect to services" msgstr "Se connecter aux services" -#: lib/action.php:442 +#: lib/action.php:448 msgid "Change site configuration" msgstr "Modifier la configuration du site" -#: lib/action.php:446 lib/subgroupnav.php:105 +#: lib/action.php:452 lib/subgroupnav.php:105 msgid "Invite" msgstr "Inviter" -#: lib/action.php:447 lib/subgroupnav.php:106 +#: lib/action.php:453 lib/subgroupnav.php:106 #, php-format msgid "Invite friends and colleagues to join you on %s" msgstr "Inviter des amis et collègues à vous rejoindre dans %s" -#: lib/action.php:452 +#: lib/action.php:458 msgid "Logout" msgstr "Fermeture de session" -#: lib/action.php:452 +#: lib/action.php:458 msgid "Logout from the site" msgstr "Fermer la session" -#: lib/action.php:457 +#: lib/action.php:463 msgid "Create an account" msgstr "Créer un compte" -#: lib/action.php:460 +#: lib/action.php:466 msgid "Login to the site" msgstr "Ouvrir une session" -#: lib/action.php:463 lib/action.php:726 +#: lib/action.php:469 lib/action.php:732 msgid "Help" msgstr "Aide" -#: lib/action.php:463 +#: lib/action.php:469 msgid "Help me!" msgstr "À l’aide !" -#: lib/action.php:466 lib/searchaction.php:127 +#: lib/action.php:472 lib/searchaction.php:127 msgid "Search" msgstr "Rechercher" -#: lib/action.php:466 +#: lib/action.php:472 msgid "Search for people or text" msgstr "Rechercher des personnes ou du texte" -#: lib/action.php:487 +#: lib/action.php:493 msgid "Site notice" msgstr "Notice du site" -#: lib/action.php:553 +#: lib/action.php:559 msgid "Local views" msgstr "Vues locales" -#: lib/action.php:619 +#: lib/action.php:625 msgid "Page notice" msgstr "Avis de la page" -#: lib/action.php:721 +#: lib/action.php:727 msgid "Secondary site navigation" msgstr "Navigation secondaire du site" -#: lib/action.php:728 +#: lib/action.php:734 msgid "About" msgstr "À propos" -#: lib/action.php:730 +#: lib/action.php:736 msgid "FAQ" msgstr "FAQ" -#: lib/action.php:734 +#: lib/action.php:740 msgid "TOS" msgstr "CGU" -#: lib/action.php:737 +#: lib/action.php:743 msgid "Privacy" msgstr "Confidentialité" -#: lib/action.php:739 +#: lib/action.php:745 msgid "Source" msgstr "Source" -#: lib/action.php:743 +#: lib/action.php:749 msgid "Contact" msgstr "Contact" -#: lib/action.php:745 +#: lib/action.php:751 msgid "Badge" msgstr "Insigne" -#: lib/action.php:773 +#: lib/action.php:779 msgid "StatusNet software license" msgstr "Licence du logiciel StatusNet" -#: lib/action.php:776 +#: lib/action.php:782 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -4627,12 +4690,12 @@ msgstr "" "**%%site.name%%** est un service de microblogging qui vous est proposé par " "[%%site.broughtby%%](%%site.broughtbyurl%%)." -#: lib/action.php:778 +#: lib/action.php:784 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "**%%site.name%%** est un service de micro-blogging." -#: lib/action.php:780 +#: lib/action.php:786 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4643,41 +4706,41 @@ msgstr "" "version %s, disponible sous la licence [GNU Affero General Public License] " "(http://www.fsf.org/licensing/licenses/agpl-3.0.html)." -#: lib/action.php:795 +#: lib/action.php:801 msgid "Site content license" msgstr "Licence du contenu du site" -#: lib/action.php:800 +#: lib/action.php:806 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "" -#: lib/action.php:805 +#: lib/action.php:811 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" -#: lib/action.php:808 +#: lib/action.php:814 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" -#: lib/action.php:820 +#: lib/action.php:826 msgid "All " msgstr "Tous " -#: lib/action.php:825 +#: lib/action.php:831 msgid "license." msgstr "licence." -#: lib/action.php:1124 +#: lib/action.php:1130 msgid "Pagination" msgstr "Pagination" -#: lib/action.php:1133 +#: lib/action.php:1139 msgid "After" msgstr "Après" -#: lib/action.php:1141 +#: lib/action.php:1147 msgid "Before" msgstr "Avant" @@ -4709,10 +4772,24 @@ msgstr "Configuration basique du site" msgid "Design configuration" msgstr "Configuration de la conception" -#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327 +#: lib/adminpanelaction.php:322 +#, fuzzy +msgid "User configuration" +msgstr "Configuration des chemins" + +#: lib/adminpanelaction.php:327 +#, fuzzy +msgid "Access configuration" +msgstr "Configuration de la conception" + +#: lib/adminpanelaction.php:332 msgid "Paths configuration" msgstr "Configuration des chemins" +#: lib/applicationeditform.php:136 +msgid "Edit application" +msgstr "Modifier votre application" + #: lib/applicationeditform.php:186 msgid "Icon for this application" msgstr "" @@ -4748,7 +4825,7 @@ msgstr "URL du site Web ou blogue du groupe ou sujet " #: lib/applicationeditform.php:238 msgid "URL to redirect to after authentication" -msgstr "" +msgstr "URL vers laquelle rediriger après l'authentification" #: lib/applicationeditform.php:260 msgid "Browser" @@ -5341,12 +5418,12 @@ msgstr "Mo" msgid "kB" msgstr "Ko" -#: lib/jabber.php:202 +#: lib/jabber.php:220 #, php-format msgid "[%s]" msgstr "[%s]" -#: lib/jabber.php:385 +#: lib/jabber.php:400 #, php-format msgid "Unknown inbox source %d." msgstr "Source %d inconnue pour la boîte de réception." @@ -5846,19 +5923,19 @@ msgstr "Réponses" msgid "Favorites" msgstr "Favoris" -#: lib/personalgroupnav.php:124 +#: lib/personalgroupnav.php:125 msgid "Inbox" msgstr "Boîte de réception" -#: lib/personalgroupnav.php:125 +#: lib/personalgroupnav.php:126 msgid "Your incoming messages" msgstr "Vos messages reçus" -#: lib/personalgroupnav.php:129 +#: lib/personalgroupnav.php:130 msgid "Outbox" msgstr "Boîte d’envoi" -#: lib/personalgroupnav.php:130 +#: lib/personalgroupnav.php:131 msgid "Your sent messages" msgstr "Vos messages envoyés" @@ -6100,47 +6177,47 @@ msgstr "Message" msgid "Moderate" msgstr "Modérer" -#: lib/util.php:875 +#: lib/util.php:868 msgid "a few seconds ago" msgstr "il y a quelques secondes" -#: lib/util.php:877 +#: lib/util.php:870 msgid "about a minute ago" msgstr "il y a 1 minute" -#: lib/util.php:879 +#: lib/util.php:872 #, php-format msgid "about %d minutes ago" msgstr "il y a %d minutes" -#: lib/util.php:881 +#: lib/util.php:874 msgid "about an hour ago" msgstr "il y a 1 heure" -#: lib/util.php:883 +#: lib/util.php:876 #, php-format msgid "about %d hours ago" msgstr "il y a %d heures" -#: lib/util.php:885 +#: lib/util.php:878 msgid "about a day ago" msgstr "il y a 1 jour" -#: lib/util.php:887 +#: lib/util.php:880 #, php-format msgid "about %d days ago" msgstr "il y a %d jours" -#: lib/util.php:889 +#: lib/util.php:882 msgid "about a month ago" msgstr "il y a 1 mois" -#: lib/util.php:891 +#: lib/util.php:884 #, php-format msgid "about %d months ago" msgstr "il y a %d mois" -#: lib/util.php:893 +#: lib/util.php:886 msgid "about a year ago" msgstr "il y a environ 1 an" @@ -6155,7 +6232,7 @@ msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "" "%s n’est pas une couleur valide ! Utilisez 3 ou 6 caractères hexadécimaux." -#: scripts/xmppdaemon.php:301 +#: lib/xmppmanager.php:402 #, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" diff --git a/locale/ga/LC_MESSAGES/statusnet.po b/locale/ga/LC_MESSAGES/statusnet.po index 0f6c29dfa0..611c3f3790 100644 --- a/locale/ga/LC_MESSAGES/statusnet.po +++ b/locale/ga/LC_MESSAGES/statusnet.po @@ -8,18 +8,76 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-21 22:36+0000\n" -"PO-Revision-Date: 2010-01-21 22:37:39+0000\n" +"POT-Creation-Date: 2010-01-27 23:58+0000\n" +"PO-Revision-Date: 2010-01-27 23:58:56+0000\n" "Language-Team: Irish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r61339); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61595); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ga\n" "X-Message-Group: out-statusnet\n" "Plural-Forms: nplurals=5; plural=n==1 ? 0 : n==2 ? 1 : n<7 ? 2 : n<11 ? 3 : " "4;\n" +#: actions/accessadminpanel.php:54 lib/adminpanelaction.php:326 +#, fuzzy +msgid "Access" +msgstr "Aceptar" + +#: actions/accessadminpanel.php:65 +#, fuzzy +msgid "Site access settings" +msgstr "Configuracións de Twitter" + +#: actions/accessadminpanel.php:158 +#, fuzzy +msgid "Registration" +msgstr "Rexistrar" + +#: actions/accessadminpanel.php:161 +#, fuzzy +msgid "Private" +msgstr "Privacidade" + +#: actions/accessadminpanel.php:163 +msgid "Prohibit anonymous users (not logged in) from viewing site?" +msgstr "" + +#: actions/accessadminpanel.php:167 +#, fuzzy +msgid "Invite only" +msgstr "Invitar" + +#: actions/accessadminpanel.php:169 +msgid "Make registration invitation only." +msgstr "" + +#: actions/accessadminpanel.php:173 +#, fuzzy +msgid "Closed" +msgstr "Bloquear" + +#: actions/accessadminpanel.php:175 +msgid "Disable new registrations." +msgstr "" + +#: actions/accessadminpanel.php:189 actions/designadminpanel.php:586 +#: actions/emailsettings.php:195 actions/imsettings.php:163 +#: actions/othersettings.php:126 actions/pathsadminpanel.php:351 +#: actions/profilesettings.php:174 actions/siteadminpanel.php:336 +#: actions/smssettings.php:181 actions/subscriptions.php:203 +#: actions/tagother.php:154 actions/useradminpanel.php:313 +#: lib/applicationeditform.php:335 lib/applicationeditform.php:336 +#: lib/designsettings.php:256 lib/groupeditform.php:202 +msgid "Save" +msgstr "Gardar" + +#: actions/accessadminpanel.php:189 +#, fuzzy +msgid "Save access settings" +msgstr "Configuracións de Twitter" + #: actions/all.php:63 actions/public.php:97 actions/replies.php:92 #: actions/showfavorites.php:137 actions/tag.php:51 #, fuzzy @@ -35,7 +93,7 @@ msgstr "Non existe a etiqueta." #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:149 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 @@ -135,8 +193,7 @@ msgstr "Actualizacións dende %1$s e amigos en %2$s!" #: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 #: actions/apitimelinefriends.php:155 actions/apitimelinegroup.php:150 #: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 -#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 #, fuzzy @@ -153,7 +210,7 @@ msgstr "Método da API non atopado" #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:119 +#: actions/apistatusesupdate.php:118 msgid "This method requires a POST." msgstr "Este método require un POST." @@ -184,7 +241,7 @@ msgstr "Non se puido gardar o perfil." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:132 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 #: actions/designadminpanel.php:122 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -497,7 +554,14 @@ msgstr "" msgid "Allow or deny access" msgstr "" -#: actions/apioauthauthorize.php:320 lib/action.php:435 +#: actions/apioauthauthorize.php:306 +#, php-format +msgid "" +"The application %s by %s would like the " +"ability to %s your account data." +msgstr "" + +#: actions/apioauthauthorize.php:320 lib/action.php:441 #, fuzzy msgid "Account" msgstr "Sobre" @@ -559,18 +623,18 @@ msgstr "Avatar actualizado." msgid "No status with that ID found." msgstr "Non existe ningún estado con esa ID atopada." -#: actions/apistatusesupdate.php:162 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "" "Iso é demasiado longo. O tamaño máximo para un chío é de 140 caracteres." -#: actions/apistatusesupdate.php:203 +#: actions/apistatusesupdate.php:202 msgid "Not found" msgstr "Non atopado" -#: actions/apistatusesupdate.php:226 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -622,11 +686,6 @@ msgstr "Liña de tempo pública de %s" msgid "%s updates from everyone!" msgstr "%s chíos de calquera!" -#: actions/apitimelineretweetedbyme.php:112 -#, php-format -msgid "Repeated by %s" -msgstr "" - #: actions/apitimelineretweetedtome.php:111 #, fuzzy, php-format msgid "Repeated to %s" @@ -1059,17 +1118,6 @@ msgstr "" msgid "Reset back to default" msgstr "" -#: actions/designadminpanel.php:586 actions/emailsettings.php:195 -#: actions/imsettings.php:163 actions/othersettings.php:126 -#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174 -#: actions/siteadminpanel.php:388 actions/smssettings.php:181 -#: actions/subscriptions.php:203 actions/tagother.php:154 -#: actions/useradminpanel.php:313 lib/applicationeditform.php:335 -#: lib/applicationeditform.php:336 lib/designsettings.php:256 -#: lib/groupeditform.php:202 -msgid "Save" -msgstr "Gardar" - #: actions/designadminpanel.php:587 lib/designsettings.php:257 msgid "Save design" msgstr "" @@ -1082,13 +1130,15 @@ msgstr "Este chío non é un favorito!" msgid "Add to favorites" msgstr "Engadir a favoritos" -#: actions/doc.php:69 -msgid "No such document." +#: actions/doc.php:155 +#, fuzzy, php-format +msgid "No such document \"%s\"" msgstr "Ningún documento." -#: actions/editapplication.php:54 lib/applicationeditform.php:136 -msgid "Edit application" -msgstr "" +#: actions/editapplication.php:54 +#, fuzzy +msgid "Edit Application" +msgstr "Outras opcions" #: actions/editapplication.php:66 #, fuzzy @@ -1107,7 +1157,7 @@ msgid "No such application." msgstr "Ningún chío." #: actions/editapplication.php:127 actions/newapplication.php:110 -#: actions/showapplication.php:118 lib/action.php:1189 +#: actions/showapplication.php:118 lib/action.php:1195 #, fuzzy msgid "There was a problem with your session token." msgstr "Houbo un problema co teu token de sesión. Tentao de novo, anda..." @@ -1327,7 +1377,7 @@ msgid "Cannot normalize that email address" msgstr "Esa dirección de correo non se pode normalizar " #: actions/emailsettings.php:331 actions/register.php:201 -#: actions/siteadminpanel.php:157 +#: actions/siteadminpanel.php:143 msgid "Not a valid email address." msgstr "Non é un enderezo de correo válido." @@ -1339,7 +1389,7 @@ msgstr "Xa é o teu enderezo de correo." msgid "That email address already belongs to another user." msgstr "Este enderezo de correo xa pertence a outro usuario." -#: actions/emailsettings.php:353 actions/imsettings.php:317 +#: actions/emailsettings.php:353 actions/imsettings.php:319 #: actions/smssettings.php:337 msgid "Couldn't insert confirmation code." msgstr "Non se puido inserir o código de confirmación." @@ -1657,7 +1707,7 @@ msgstr "" msgid "A list of the users in this group." msgstr "" -#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107 +#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107 msgid "Admin" msgstr "" @@ -1850,6 +1900,11 @@ msgstr "" msgid "That is not your Jabber ID." msgstr "Esa non é a túa conta Jabber." +#: actions/inbox.php:59 +#, fuzzy, php-format +msgid "Inbox for %1$s - page %2$d" +msgstr "Band. Entrada para %s" + #: actions/inbox.php:62 #, php-format msgid "Inbox for %s" @@ -2033,7 +2088,7 @@ msgstr "Usuario ou contrasinal incorrectos." msgid "Error setting user. You are probably not authorized." msgstr "Non está autorizado." -#: actions/login.php:188 actions/login.php:241 lib/action.php:460 +#: actions/login.php:188 actions/login.php:241 lib/action.php:466 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Inicio de sesión" @@ -2096,8 +2151,9 @@ msgid "No current status" msgstr "Sen estado actual" #: actions/newapplication.php:52 -msgid "New application" -msgstr "" +#, fuzzy +msgid "New Application" +msgstr "Ningún chío." #: actions/newapplication.php:64 #, fuzzy @@ -2291,8 +2347,8 @@ msgstr "Conectar" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1038 -#: lib/api.php:1066 lib/api.php:1176 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1039 +#: lib/api.php:1067 lib/api.php:1177 msgid "Not a supported data format." msgstr "Non é un formato de datos soportado." @@ -2362,6 +2418,11 @@ msgstr "Contido do chío inválido" msgid "Login token expired." msgstr "" +#: actions/outbox.php:58 +#, fuzzy, php-format +msgid "Outbox for %1$s - page %2$d" +msgstr "Band. Saída para %s" + #: actions/outbox.php:61 #, php-format msgid "Outbox for %s" @@ -2435,7 +2496,7 @@ msgstr "Non se pode gardar a contrasinal." msgid "Password saved." msgstr "Contrasinal gardada." -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:331 msgid "Paths" msgstr "" @@ -2443,142 +2504,159 @@ msgstr "" msgid "Path and server settings for this StatusNet site." msgstr "" -#: actions/pathsadminpanel.php:140 +#: actions/pathsadminpanel.php:157 #, fuzzy, php-format msgid "Theme directory not readable: %s" msgstr "Esta páxina non está dispoñíbel no tipo de medio que aceptas" -#: actions/pathsadminpanel.php:146 +#: actions/pathsadminpanel.php:163 #, php-format msgid "Avatar directory not writable: %s" msgstr "" -#: actions/pathsadminpanel.php:152 +#: actions/pathsadminpanel.php:169 #, php-format msgid "Background directory not writable: %s" msgstr "" -#: actions/pathsadminpanel.php:160 +#: actions/pathsadminpanel.php:177 #, php-format msgid "Locales directory not readable: %s" msgstr "" -#: actions/pathsadminpanel.php:166 +#: actions/pathsadminpanel.php:183 msgid "Invalid SSL server. The maximum length is 255 characters." msgstr "" -#: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58 +#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58 #: lib/adminpanelaction.php:311 #, fuzzy msgid "Site" msgstr "Invitar" -#: actions/pathsadminpanel.php:221 +#: actions/pathsadminpanel.php:238 +#, fuzzy +msgid "Server" +msgstr "Recuperar" + +#: actions/pathsadminpanel.php:238 +msgid "Site's server hostname." +msgstr "" + +#: actions/pathsadminpanel.php:242 msgid "Path" msgstr "" -#: actions/pathsadminpanel.php:221 +#: actions/pathsadminpanel.php:242 #, fuzzy msgid "Site path" msgstr "Novo chío" -#: actions/pathsadminpanel.php:225 +#: actions/pathsadminpanel.php:246 msgid "Path to locales" msgstr "" -#: actions/pathsadminpanel.php:225 +#: actions/pathsadminpanel.php:246 msgid "Directory path to locales" msgstr "" -#: actions/pathsadminpanel.php:232 -msgid "Theme" -msgstr "" - -#: actions/pathsadminpanel.php:237 -msgid "Theme server" -msgstr "" - -#: actions/pathsadminpanel.php:241 -msgid "Theme path" -msgstr "" - -#: actions/pathsadminpanel.php:245 -msgid "Theme directory" +#: actions/pathsadminpanel.php:250 +msgid "Fancy URLs" msgstr "" #: actions/pathsadminpanel.php:252 +msgid "Use fancy (more readable and memorable) URLs?" +msgstr "" + +#: actions/pathsadminpanel.php:259 +msgid "Theme" +msgstr "" + +#: actions/pathsadminpanel.php:264 +msgid "Theme server" +msgstr "" + +#: actions/pathsadminpanel.php:268 +msgid "Theme path" +msgstr "" + +#: actions/pathsadminpanel.php:272 +msgid "Theme directory" +msgstr "" + +#: actions/pathsadminpanel.php:279 #, fuzzy msgid "Avatars" msgstr "Avatar" -#: actions/pathsadminpanel.php:257 +#: actions/pathsadminpanel.php:284 #, fuzzy msgid "Avatar server" msgstr "Configuracións de Twitter" -#: actions/pathsadminpanel.php:261 +#: actions/pathsadminpanel.php:288 #, fuzzy msgid "Avatar path" msgstr "Avatar actualizado." -#: actions/pathsadminpanel.php:265 +#: actions/pathsadminpanel.php:292 #, fuzzy msgid "Avatar directory" msgstr "Avatar actualizado." -#: actions/pathsadminpanel.php:274 +#: actions/pathsadminpanel.php:301 msgid "Backgrounds" msgstr "" -#: actions/pathsadminpanel.php:278 +#: actions/pathsadminpanel.php:305 msgid "Background server" msgstr "" -#: actions/pathsadminpanel.php:282 +#: actions/pathsadminpanel.php:309 msgid "Background path" msgstr "" -#: actions/pathsadminpanel.php:286 +#: actions/pathsadminpanel.php:313 msgid "Background directory" msgstr "" -#: actions/pathsadminpanel.php:293 +#: actions/pathsadminpanel.php:320 #, fuzzy msgid "SSL" msgstr "SMS" -#: actions/pathsadminpanel.php:296 actions/siteadminpanel.php:346 +#: actions/pathsadminpanel.php:323 actions/siteadminpanel.php:294 #, fuzzy msgid "Never" msgstr "Recuperar" -#: actions/pathsadminpanel.php:297 +#: actions/pathsadminpanel.php:324 #, fuzzy msgid "Sometimes" msgstr "Chíos" -#: actions/pathsadminpanel.php:298 +#: actions/pathsadminpanel.php:325 msgid "Always" msgstr "" -#: actions/pathsadminpanel.php:302 +#: actions/pathsadminpanel.php:329 msgid "Use SSL" msgstr "" -#: actions/pathsadminpanel.php:303 +#: actions/pathsadminpanel.php:330 msgid "When to use SSL" msgstr "" -#: actions/pathsadminpanel.php:308 +#: actions/pathsadminpanel.php:335 #, fuzzy msgid "SSL server" msgstr "Recuperar" -#: actions/pathsadminpanel.php:309 +#: actions/pathsadminpanel.php:336 msgid "Server to direct SSL requests to" msgstr "" -#: actions/pathsadminpanel.php:325 +#: actions/pathsadminpanel.php:352 #, fuzzy msgid "Save paths" msgstr "Novo chío" @@ -2693,7 +2771,7 @@ msgstr "" "Etiquetas para o teu usuario (letras, números, -, ., e _), separados por " "coma ou espazo" -#: actions/profilesettings.php:151 actions/siteadminpanel.php:294 +#: actions/profilesettings.php:151 actions/siteadminpanel.php:280 msgid "Language" msgstr "Linguaxe" @@ -2721,7 +2799,7 @@ msgstr "" msgid "Bio is too long (max %d chars)." msgstr "O teu Bio é demasiado longo (max 140 car.)." -#: actions/profilesettings.php:235 actions/siteadminpanel.php:164 +#: actions/profilesettings.php:235 actions/siteadminpanel.php:150 msgid "Timezone not selected." msgstr "Fuso Horario non seleccionado" @@ -2995,7 +3073,7 @@ msgstr "Acounteceu un erro co código de confirmación." msgid "Registration successful" msgstr "Xa estas rexistrado!!" -#: actions/register.php:114 actions/register.php:503 lib/action.php:457 +#: actions/register.php:114 actions/register.php:503 lib/action.php:463 #: lib/logingroupnav.php:85 msgid "Register" msgstr "Rexistrar" @@ -3041,7 +3119,7 @@ msgid "Same as password above. Required." msgstr "A mesma contrasinal que arriba. Requerido." #: actions/register.php:438 actions/register.php:442 -#: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120 +#: actions/siteadminpanel.php:256 lib/accountsettingsaction.php:120 msgid "Email" msgstr "Correo Electrónico" @@ -3208,6 +3286,11 @@ msgstr "Crear" msgid "Replies to %s" msgstr "Replies to %s" +#: actions/replies.php:127 +#, fuzzy, php-format +msgid "Replies to %1$s, page %2$d" +msgstr "Mensaxe de %1$s en %2$s" + #: actions/replies.php:144 #, fuzzy, php-format msgid "Replies feed for %s (RSS 1.0)" @@ -3338,6 +3421,11 @@ msgid "" "signature method." msgstr "" +#: actions/showfavorites.php:79 +#, fuzzy, php-format +msgid "%1$s's favorite notices, page %2$d" +msgstr "Chíos favoritos de %s" + #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "Non se pode " @@ -3387,6 +3475,11 @@ msgstr "" msgid "%s group" msgstr "" +#: actions/showgroup.php:84 +#, fuzzy, php-format +msgid "%1$s group, page %2$d" +msgstr "Tódalas subscricións" + #: actions/showgroup.php:218 #, fuzzy msgid "Group profile" @@ -3512,6 +3605,11 @@ msgstr "Chío publicado" msgid " tagged %s" msgstr "Chíos tagueados con %s" +#: actions/showstream.php:79 +#, fuzzy, php-format +msgid "%1$s, page %2$d" +msgstr "%s e amigos" + #: actions/showstream.php:122 #, fuzzy, php-format msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" @@ -3599,202 +3697,149 @@ msgstr "O usuario bloqueoute." msgid "Basic settings for this StatusNet site." msgstr "" -#: actions/siteadminpanel.php:146 +#: actions/siteadminpanel.php:132 msgid "Site name must have non-zero length." msgstr "" -#: actions/siteadminpanel.php:154 +#: actions/siteadminpanel.php:140 #, fuzzy msgid "You must have a valid contact email address." msgstr "Non é unha dirección de correo válida" -#: actions/siteadminpanel.php:172 +#: actions/siteadminpanel.php:158 #, php-format msgid "Unknown language \"%s\"." msgstr "" -#: actions/siteadminpanel.php:179 +#: actions/siteadminpanel.php:165 msgid "Invalid snapshot report URL." msgstr "" -#: actions/siteadminpanel.php:185 +#: actions/siteadminpanel.php:171 msgid "Invalid snapshot run value." msgstr "" -#: actions/siteadminpanel.php:191 +#: actions/siteadminpanel.php:177 msgid "Snapshot frequency must be a number." msgstr "" -#: actions/siteadminpanel.php:197 +#: actions/siteadminpanel.php:183 msgid "Minimum text limit is 140 characters." msgstr "" -#: actions/siteadminpanel.php:203 +#: actions/siteadminpanel.php:189 msgid "Dupe limit must 1 or more seconds." msgstr "" -#: actions/siteadminpanel.php:253 +#: actions/siteadminpanel.php:239 msgid "General" msgstr "" -#: actions/siteadminpanel.php:256 +#: actions/siteadminpanel.php:242 #, fuzzy msgid "Site name" msgstr "Novo chío" -#: actions/siteadminpanel.php:257 +#: actions/siteadminpanel.php:243 msgid "The name of your site, like \"Yourcompany Microblog\"" msgstr "" -#: actions/siteadminpanel.php:261 +#: actions/siteadminpanel.php:247 msgid "Brought by" msgstr "" -#: actions/siteadminpanel.php:262 +#: actions/siteadminpanel.php:248 msgid "Text used for credits link in footer of each page" msgstr "" -#: actions/siteadminpanel.php:266 +#: actions/siteadminpanel.php:252 msgid "Brought by URL" msgstr "" -#: actions/siteadminpanel.php:267 +#: actions/siteadminpanel.php:253 msgid "URL used for credits link in footer of each page" msgstr "" -#: actions/siteadminpanel.php:271 +#: actions/siteadminpanel.php:257 #, fuzzy msgid "Contact email address for your site" msgstr "Nova dirección de email para posterar en %s" -#: actions/siteadminpanel.php:277 +#: actions/siteadminpanel.php:263 #, fuzzy msgid "Local" msgstr "Localización" -#: actions/siteadminpanel.php:288 +#: actions/siteadminpanel.php:274 msgid "Default timezone" msgstr "" -#: actions/siteadminpanel.php:289 +#: actions/siteadminpanel.php:275 msgid "Default timezone for the site; usually UTC." msgstr "" -#: actions/siteadminpanel.php:295 +#: actions/siteadminpanel.php:281 #, fuzzy msgid "Default site language" msgstr "Linguaxe preferida" -#: actions/siteadminpanel.php:303 -msgid "URLs" -msgstr "" - -#: actions/siteadminpanel.php:306 -#, fuzzy -msgid "Server" -msgstr "Recuperar" - -#: actions/siteadminpanel.php:306 -msgid "Site's server hostname." -msgstr "" - -#: actions/siteadminpanel.php:310 -msgid "Fancy URLs" -msgstr "" - -#: actions/siteadminpanel.php:312 -msgid "Use fancy (more readable and memorable) URLs?" -msgstr "" - -#: actions/siteadminpanel.php:318 -#, fuzzy -msgid "Access" -msgstr "Aceptar" - -#: actions/siteadminpanel.php:321 -#, fuzzy -msgid "Private" -msgstr "Privacidade" - -#: actions/siteadminpanel.php:323 -msgid "Prohibit anonymous users (not logged in) from viewing site?" -msgstr "" - -#: actions/siteadminpanel.php:327 -#, fuzzy -msgid "Invite only" -msgstr "Invitar" - -#: actions/siteadminpanel.php:329 -msgid "Make registration invitation only." -msgstr "" - -#: actions/siteadminpanel.php:333 -#, fuzzy -msgid "Closed" -msgstr "Bloquear" - -#: actions/siteadminpanel.php:335 -msgid "Disable new registrations." -msgstr "" - -#: actions/siteadminpanel.php:341 +#: actions/siteadminpanel.php:289 msgid "Snapshots" msgstr "" -#: actions/siteadminpanel.php:344 +#: actions/siteadminpanel.php:292 msgid "Randomly during Web hit" msgstr "" -#: actions/siteadminpanel.php:345 +#: actions/siteadminpanel.php:293 msgid "In a scheduled job" msgstr "" -#: actions/siteadminpanel.php:347 +#: actions/siteadminpanel.php:295 msgid "Data snapshots" msgstr "" -#: actions/siteadminpanel.php:348 +#: actions/siteadminpanel.php:296 msgid "When to send statistical data to status.net servers" msgstr "" -#: actions/siteadminpanel.php:353 +#: actions/siteadminpanel.php:301 msgid "Frequency" msgstr "" -#: actions/siteadminpanel.php:354 +#: actions/siteadminpanel.php:302 msgid "Snapshots will be sent once every N web hits" msgstr "" -#: actions/siteadminpanel.php:359 +#: actions/siteadminpanel.php:307 msgid "Report URL" msgstr "" -#: actions/siteadminpanel.php:360 +#: actions/siteadminpanel.php:308 msgid "Snapshots will be sent to this URL" msgstr "" -#: actions/siteadminpanel.php:367 +#: actions/siteadminpanel.php:315 msgid "Limits" msgstr "" -#: actions/siteadminpanel.php:370 +#: actions/siteadminpanel.php:318 msgid "Text limit" msgstr "" -#: actions/siteadminpanel.php:370 +#: actions/siteadminpanel.php:318 msgid "Maximum number of characters for notices." msgstr "" -#: actions/siteadminpanel.php:374 +#: actions/siteadminpanel.php:322 msgid "Dupe limit" msgstr "" -#: actions/siteadminpanel.php:374 +#: actions/siteadminpanel.php:322 msgid "How long users must wait (in seconds) to post the same thing again." msgstr "" -#: actions/siteadminpanel.php:388 actions/useradminpanel.php:313 +#: actions/siteadminpanel.php:336 actions/useradminpanel.php:313 #, fuzzy msgid "Save site settings" msgstr "Configuracións de Twitter" @@ -3997,6 +4042,11 @@ msgstr "Jabber." msgid "SMS" msgstr "SMS" +#: actions/tag.php:68 +#, fuzzy, php-format +msgid "Notices tagged with %1$s, page %2$d" +msgstr "Usuarios auto-etiquetados como %s - páxina %d" + #: actions/tag.php:86 #, fuzzy, php-format msgid "Notice feed for tag %s (RSS 1.0)" @@ -4314,6 +4364,11 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "" +#: actions/usergroups.php:64 +#, fuzzy, php-format +msgid "%1$s groups, page %2$d" +msgstr "Tódalas subscricións" + #: actions/usergroups.php:130 msgid "Search for more groups" msgstr "" @@ -4376,7 +4431,7 @@ msgstr "" msgid "Plugins" msgstr "" -#: actions/version.php:196 lib/action.php:741 +#: actions/version.php:196 lib/action.php:747 #, fuzzy msgid "Version" msgstr "Persoal" @@ -4435,28 +4490,28 @@ msgstr "Non se pode inserir unha mensaxe." msgid "Could not update message with new URI." msgstr "Non se puido actualizar a mensaxe coa nova URI." -#: classes/Notice.php:171 +#: classes/Notice.php:157 #, php-format msgid "DB error inserting hashtag: %s" msgstr "Erro ó inserir o hashtag na BD: %s" -#: classes/Notice.php:225 +#: classes/Notice.php:214 #, fuzzy msgid "Problem saving notice. Too long." msgstr "Aconteceu un erro ó gardar o chío." -#: classes/Notice.php:229 +#: classes/Notice.php:218 msgid "Problem saving notice. Unknown user." msgstr "Aconteceu un erro ó gardar o chío. Usuario descoñecido." -#: classes/Notice.php:234 +#: classes/Notice.php:223 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Demasiados chíos en pouco tempo; tomate un respiro e envíao de novo dentro " "duns minutos." -#: classes/Notice.php:240 +#: classes/Notice.php:229 #, fuzzy msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " @@ -4465,20 +4520,25 @@ msgstr "" "Demasiados chíos en pouco tempo; tomate un respiro e envíao de novo dentro " "duns minutos." -#: classes/Notice.php:246 +#: classes/Notice.php:235 msgid "You are banned from posting notices on this site." msgstr "Tes restrinxido o envio de chíos neste sitio." -#: classes/Notice.php:305 classes/Notice.php:330 +#: classes/Notice.php:294 classes/Notice.php:319 msgid "Problem saving notice." msgstr "Aconteceu un erro ó gardar o chío." -#: classes/Notice.php:1059 +#: classes/Notice.php:790 +#, fuzzy +msgid "Problem saving group inbox." +msgstr "Aconteceu un erro ó gardar o chío." + +#: classes/Notice.php:850 #, php-format msgid "DB error inserting reply: %s" msgstr "Erro ó inserir a contestación na BD: %s" -#: classes/Notice.php:1441 +#: classes/Notice.php:1233 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" @@ -4537,134 +4597,134 @@ msgstr "%1$s (%2$s)" msgid "Untitled page" msgstr "" -#: lib/action.php:427 +#: lib/action.php:433 msgid "Primary site navigation" msgstr "" -#: lib/action.php:433 +#: lib/action.php:439 msgid "Home" msgstr "Persoal" -#: lib/action.php:433 +#: lib/action.php:439 msgid "Personal profile and friends timeline" msgstr "" -#: lib/action.php:435 +#: lib/action.php:441 #, fuzzy msgid "Change your email, avatar, password, profile" msgstr "Cambiar contrasinal" -#: lib/action.php:438 +#: lib/action.php:444 msgid "Connect" msgstr "Conectar" -#: lib/action.php:438 +#: lib/action.php:444 #, fuzzy msgid "Connect to services" msgstr "Non se pode redireccionar ao servidor: %s" -#: lib/action.php:442 +#: lib/action.php:448 #, fuzzy msgid "Change site configuration" msgstr "Navegación de subscricións" -#: lib/action.php:446 lib/subgroupnav.php:105 +#: lib/action.php:452 lib/subgroupnav.php:105 msgid "Invite" msgstr "Invitar" -#: lib/action.php:447 lib/subgroupnav.php:106 +#: lib/action.php:453 lib/subgroupnav.php:106 #, fuzzy, php-format msgid "Invite friends and colleagues to join you on %s" msgstr "" "Emprega este formulario para invitar ós teus amigos e colegas a empregar " "este servizo." -#: lib/action.php:452 +#: lib/action.php:458 msgid "Logout" msgstr "Sair" -#: lib/action.php:452 +#: lib/action.php:458 msgid "Logout from the site" msgstr "" -#: lib/action.php:457 +#: lib/action.php:463 #, fuzzy msgid "Create an account" msgstr "Crear nova conta" -#: lib/action.php:460 +#: lib/action.php:466 msgid "Login to the site" msgstr "" -#: lib/action.php:463 lib/action.php:726 +#: lib/action.php:469 lib/action.php:732 msgid "Help" msgstr "Axuda" -#: lib/action.php:463 +#: lib/action.php:469 #, fuzzy msgid "Help me!" msgstr "Axuda" -#: lib/action.php:466 lib/searchaction.php:127 +#: lib/action.php:472 lib/searchaction.php:127 msgid "Search" msgstr "Buscar" -#: lib/action.php:466 +#: lib/action.php:472 msgid "Search for people or text" msgstr "" -#: lib/action.php:487 +#: lib/action.php:493 #, fuzzy msgid "Site notice" msgstr "Novo chío" -#: lib/action.php:553 +#: lib/action.php:559 msgid "Local views" msgstr "" -#: lib/action.php:619 +#: lib/action.php:625 #, fuzzy msgid "Page notice" msgstr "Novo chío" -#: lib/action.php:721 +#: lib/action.php:727 #, fuzzy msgid "Secondary site navigation" msgstr "Navegación de subscricións" -#: lib/action.php:728 +#: lib/action.php:734 msgid "About" msgstr "Sobre" -#: lib/action.php:730 +#: lib/action.php:736 msgid "FAQ" msgstr "Preguntas frecuentes" -#: lib/action.php:734 +#: lib/action.php:740 msgid "TOS" msgstr "" -#: lib/action.php:737 +#: lib/action.php:743 msgid "Privacy" msgstr "Privacidade" -#: lib/action.php:739 +#: lib/action.php:745 msgid "Source" msgstr "Fonte" -#: lib/action.php:743 +#: lib/action.php:749 msgid "Contact" msgstr "Contacto" -#: lib/action.php:745 +#: lib/action.php:751 msgid "Badge" msgstr "" -#: lib/action.php:773 +#: lib/action.php:779 msgid "StatusNet software license" msgstr "" -#: lib/action.php:776 +#: lib/action.php:782 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -4673,12 +4733,12 @@ msgstr "" "**%%site.name%%** é un servizo de microbloguexo que che proporciona [%%site." "broughtby%%](%%site.broughtbyurl%%). " -#: lib/action.php:778 +#: lib/action.php:784 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "**%%site.name%%** é un servizo de microbloguexo." -#: lib/action.php:780 +#: lib/action.php:786 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4689,44 +4749,44 @@ msgstr "" "%s, dispoñible baixo licenza [GNU Affero General Public License](http://www." "fsf.org/licensing/licenses/agpl-3.0.html)." -#: lib/action.php:795 +#: lib/action.php:801 #, fuzzy msgid "Site content license" msgstr "Atopar no contido dos chíos" -#: lib/action.php:800 +#: lib/action.php:806 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "" -#: lib/action.php:805 +#: lib/action.php:811 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" -#: lib/action.php:808 +#: lib/action.php:814 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" -#: lib/action.php:820 +#: lib/action.php:826 #, fuzzy msgid "All " msgstr "Todos" -#: lib/action.php:825 +#: lib/action.php:831 msgid "license." msgstr "" -#: lib/action.php:1124 +#: lib/action.php:1130 msgid "Pagination" msgstr "" -#: lib/action.php:1133 +#: lib/action.php:1139 #, fuzzy msgid "After" msgstr "« Despois" -#: lib/action.php:1141 +#: lib/action.php:1147 #, fuzzy msgid "Before" msgstr "Antes »" @@ -4766,11 +4826,25 @@ msgstr "Confirmar correo electrónico" msgid "Design configuration" msgstr "Confirmación de SMS" -#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327 +#: lib/adminpanelaction.php:322 +#, fuzzy +msgid "User configuration" +msgstr "Confirmación de SMS" + +#: lib/adminpanelaction.php:327 +#, fuzzy +msgid "Access configuration" +msgstr "Confirmación de SMS" + +#: lib/adminpanelaction.php:332 #, fuzzy msgid "Paths configuration" msgstr "Confirmación de SMS" +#: lib/applicationeditform.php:136 +msgid "Edit application" +msgstr "" + #: lib/applicationeditform.php:186 msgid "Icon for this application" msgstr "" @@ -5406,12 +5480,12 @@ msgstr "" msgid "kB" msgstr "" -#: lib/jabber.php:202 +#: lib/jabber.php:220 #, php-format msgid "[%s]" msgstr "" -#: lib/jabber.php:385 +#: lib/jabber.php:400 #, php-format msgid "Unknown inbox source %d." msgstr "" @@ -5903,19 +5977,19 @@ msgstr "Respostas" msgid "Favorites" msgstr "Favoritos" -#: lib/personalgroupnav.php:124 +#: lib/personalgroupnav.php:125 msgid "Inbox" msgstr "Band. Entrada" -#: lib/personalgroupnav.php:125 +#: lib/personalgroupnav.php:126 msgid "Your incoming messages" msgstr "As túas mensaxes entrantes" -#: lib/personalgroupnav.php:129 +#: lib/personalgroupnav.php:130 msgid "Outbox" msgstr "Band. Saída" -#: lib/personalgroupnav.php:130 +#: lib/personalgroupnav.php:131 msgid "Your sent messages" msgstr "As túas mensaxes enviadas" @@ -6183,47 +6257,47 @@ msgstr "Nova mensaxe" msgid "Moderate" msgstr "" -#: lib/util.php:875 +#: lib/util.php:868 msgid "a few seconds ago" msgstr "fai uns segundos" -#: lib/util.php:877 +#: lib/util.php:870 msgid "about a minute ago" msgstr "fai un minuto" -#: lib/util.php:879 +#: lib/util.php:872 #, php-format msgid "about %d minutes ago" msgstr "fai %d minutos" -#: lib/util.php:881 +#: lib/util.php:874 msgid "about an hour ago" msgstr "fai unha hora" -#: lib/util.php:883 +#: lib/util.php:876 #, php-format msgid "about %d hours ago" msgstr "fai %d horas" -#: lib/util.php:885 +#: lib/util.php:878 msgid "about a day ago" msgstr "fai un día" -#: lib/util.php:887 +#: lib/util.php:880 #, php-format msgid "about %d days ago" msgstr "fai %d días" -#: lib/util.php:889 +#: lib/util.php:882 msgid "about a month ago" msgstr "fai un mes" -#: lib/util.php:891 +#: lib/util.php:884 #, php-format msgid "about %d months ago" msgstr "fai %d meses" -#: lib/util.php:893 +#: lib/util.php:886 msgid "about a year ago" msgstr "fai un ano" @@ -6237,7 +6311,7 @@ msgstr "%1s non é unha orixe fiable." msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "" -#: scripts/xmppdaemon.php:301 +#: lib/xmppmanager.php:402 #, fuzzy, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "Mensaxe demasiado longa - o máximo é 140 caracteres, ti enviaches %d " diff --git a/locale/he/LC_MESSAGES/statusnet.po b/locale/he/LC_MESSAGES/statusnet.po index 0367bace5a..ef9db6e297 100644 --- a/locale/he/LC_MESSAGES/statusnet.po +++ b/locale/he/LC_MESSAGES/statusnet.po @@ -7,17 +7,74 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-21 22:36+0000\n" -"PO-Revision-Date: 2010-01-21 22:37:42+0000\n" +"POT-Creation-Date: 2010-01-27 23:58+0000\n" +"PO-Revision-Date: 2010-01-27 23:58:59+0000\n" "Language-Team: Hebrew\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r61339); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61595); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: he\n" "X-Message-Group: out-statusnet\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#: actions/accessadminpanel.php:54 lib/adminpanelaction.php:326 +#, fuzzy +msgid "Access" +msgstr "קבל" + +#: actions/accessadminpanel.php:65 +#, fuzzy +msgid "Site access settings" +msgstr "הגדרות" + +#: actions/accessadminpanel.php:158 +#, fuzzy +msgid "Registration" +msgstr "הירשם" + +#: actions/accessadminpanel.php:161 +#, fuzzy +msgid "Private" +msgstr "פרטיות" + +#: actions/accessadminpanel.php:163 +msgid "Prohibit anonymous users (not logged in) from viewing site?" +msgstr "" + +#: actions/accessadminpanel.php:167 +msgid "Invite only" +msgstr "" + +#: actions/accessadminpanel.php:169 +msgid "Make registration invitation only." +msgstr "" + +#: actions/accessadminpanel.php:173 +#, fuzzy +msgid "Closed" +msgstr "אין משתמש כזה." + +#: actions/accessadminpanel.php:175 +msgid "Disable new registrations." +msgstr "" + +#: actions/accessadminpanel.php:189 actions/designadminpanel.php:586 +#: actions/emailsettings.php:195 actions/imsettings.php:163 +#: actions/othersettings.php:126 actions/pathsadminpanel.php:351 +#: actions/profilesettings.php:174 actions/siteadminpanel.php:336 +#: actions/smssettings.php:181 actions/subscriptions.php:203 +#: actions/tagother.php:154 actions/useradminpanel.php:313 +#: lib/applicationeditform.php:335 lib/applicationeditform.php:336 +#: lib/designsettings.php:256 lib/groupeditform.php:202 +msgid "Save" +msgstr "שמור" + +#: actions/accessadminpanel.php:189 +#, fuzzy +msgid "Save access settings" +msgstr "הגדרות" + #: actions/all.php:63 actions/public.php:97 actions/replies.php:92 #: actions/showfavorites.php:137 actions/tag.php:51 #, fuzzy @@ -33,7 +90,7 @@ msgstr "אין הודעה כזו." #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:149 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 @@ -133,8 +190,7 @@ msgstr "" #: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 #: actions/apitimelinefriends.php:155 actions/apitimelinegroup.php:150 #: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 -#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 #, fuzzy @@ -151,7 +207,7 @@ msgstr "קוד האישור לא נמצא." #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:119 +#: actions/apistatusesupdate.php:118 msgid "This method requires a POST." msgstr "" @@ -182,7 +238,7 @@ msgstr "שמירת הפרופיל נכשלה." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:132 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 #: actions/designadminpanel.php:122 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -491,7 +547,14 @@ msgstr "" msgid "Allow or deny access" msgstr "" -#: actions/apioauthauthorize.php:320 lib/action.php:435 +#: actions/apioauthauthorize.php:306 +#, php-format +msgid "" +"The application %s by %s would like the " +"ability to %s your account data." +msgstr "" + +#: actions/apioauthauthorize.php:320 lib/action.php:441 #, fuzzy msgid "Account" msgstr "אודות" @@ -552,17 +615,17 @@ msgstr "התמונה עודכנה." msgid "No status with that ID found." msgstr "" -#: actions/apistatusesupdate.php:162 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "זה ארוך מידי. אורך מירבי להודעה הוא 140 אותיות." -#: actions/apistatusesupdate.php:203 +#: actions/apistatusesupdate.php:202 msgid "Not found" msgstr "לא נמצא" -#: actions/apistatusesupdate.php:226 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -614,11 +677,6 @@ msgstr "" msgid "%s updates from everyone!" msgstr "" -#: actions/apitimelineretweetedbyme.php:112 -#, php-format -msgid "Repeated by %s" -msgstr "" - #: actions/apitimelineretweetedtome.php:111 #, fuzzy, php-format msgid "Repeated to %s" @@ -1045,17 +1103,6 @@ msgstr "" msgid "Reset back to default" msgstr "" -#: actions/designadminpanel.php:586 actions/emailsettings.php:195 -#: actions/imsettings.php:163 actions/othersettings.php:126 -#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174 -#: actions/siteadminpanel.php:388 actions/smssettings.php:181 -#: actions/subscriptions.php:203 actions/tagother.php:154 -#: actions/useradminpanel.php:313 lib/applicationeditform.php:335 -#: lib/applicationeditform.php:336 lib/designsettings.php:256 -#: lib/groupeditform.php:202 -msgid "Save" -msgstr "שמור" - #: actions/designadminpanel.php:587 lib/designsettings.php:257 msgid "Save design" msgstr "" @@ -1069,13 +1116,15 @@ msgstr "" msgid "Add to favorites" msgstr "מועדפים" -#: actions/doc.php:69 -msgid "No such document." +#: actions/doc.php:155 +#, fuzzy, php-format +msgid "No such document \"%s\"" msgstr "אין מסמך כזה." -#: actions/editapplication.php:54 lib/applicationeditform.php:136 -msgid "Edit application" -msgstr "" +#: actions/editapplication.php:54 +#, fuzzy +msgid "Edit Application" +msgstr "להודעה אין פרופיל" #: actions/editapplication.php:66 msgid "You must be logged in to edit an application." @@ -1093,7 +1142,7 @@ msgid "No such application." msgstr "אין הודעה כזו." #: actions/editapplication.php:127 actions/newapplication.php:110 -#: actions/showapplication.php:118 lib/action.php:1189 +#: actions/showapplication.php:118 lib/action.php:1195 msgid "There was a problem with your session token." msgstr "" @@ -1302,7 +1351,7 @@ msgid "Cannot normalize that email address" msgstr "" #: actions/emailsettings.php:331 actions/register.php:201 -#: actions/siteadminpanel.php:157 +#: actions/siteadminpanel.php:143 msgid "Not a valid email address." msgstr "" @@ -1314,7 +1363,7 @@ msgstr "" msgid "That email address already belongs to another user." msgstr "" -#: actions/emailsettings.php:353 actions/imsettings.php:317 +#: actions/emailsettings.php:353 actions/imsettings.php:319 #: actions/smssettings.php:337 msgid "Couldn't insert confirmation code." msgstr "הכנסת קוד האישור נכשלה." @@ -1629,7 +1678,7 @@ msgstr "" msgid "A list of the users in this group." msgstr "" -#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107 +#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107 msgid "Admin" msgstr "" @@ -1822,6 +1871,11 @@ msgstr "" msgid "That is not your Jabber ID." msgstr "זהו לא זיהוי ה-Jabber שלך." +#: actions/inbox.php:59 +#, php-format +msgid "Inbox for %1$s - page %2$d" +msgstr "" + #: actions/inbox.php:62 #, php-format msgid "Inbox for %s" @@ -1974,7 +2028,7 @@ msgstr "שם משתמש או סיסמה לא נכונים." msgid "Error setting user. You are probably not authorized." msgstr "לא מורשה." -#: actions/login.php:188 actions/login.php:241 lib/action.php:460 +#: actions/login.php:188 actions/login.php:241 lib/action.php:466 #: lib/logingroupnav.php:79 msgid "Login" msgstr "היכנס" @@ -2034,8 +2088,9 @@ msgid "No current status" msgstr "" #: actions/newapplication.php:52 -msgid "New application" -msgstr "" +#, fuzzy +msgid "New Application" +msgstr "אין הודעה כזו." #: actions/newapplication.php:64 msgid "You must be logged in to register an application." @@ -2223,8 +2278,8 @@ msgstr "התחבר" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1038 -#: lib/api.php:1066 lib/api.php:1176 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1039 +#: lib/api.php:1067 lib/api.php:1177 msgid "Not a supported data format." msgstr "" @@ -2295,6 +2350,11 @@ msgstr "תוכן ההודעה לא חוקי" msgid "Login token expired." msgstr "" +#: actions/outbox.php:58 +#, php-format +msgid "Outbox for %1$s - page %2$d" +msgstr "" + #: actions/outbox.php:61 #, php-format msgid "Outbox for %s" @@ -2367,7 +2427,7 @@ msgstr "לא ניתן לשמור את הסיסמה" msgid "Password saved." msgstr "הסיסמה נשמרה." -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:331 msgid "Paths" msgstr "" @@ -2375,141 +2435,158 @@ msgstr "" msgid "Path and server settings for this StatusNet site." msgstr "" -#: actions/pathsadminpanel.php:140 +#: actions/pathsadminpanel.php:157 #, fuzzy, php-format msgid "Theme directory not readable: %s" msgstr "עמוד זה אינו זמין בסוג מדיה שאתה יכול לקבל" -#: actions/pathsadminpanel.php:146 +#: actions/pathsadminpanel.php:163 #, php-format msgid "Avatar directory not writable: %s" msgstr "" -#: actions/pathsadminpanel.php:152 +#: actions/pathsadminpanel.php:169 #, php-format msgid "Background directory not writable: %s" msgstr "" -#: actions/pathsadminpanel.php:160 +#: actions/pathsadminpanel.php:177 #, php-format msgid "Locales directory not readable: %s" msgstr "" -#: actions/pathsadminpanel.php:166 +#: actions/pathsadminpanel.php:183 msgid "Invalid SSL server. The maximum length is 255 characters." msgstr "" -#: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58 +#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58 #: lib/adminpanelaction.php:311 msgid "Site" msgstr "" -#: actions/pathsadminpanel.php:221 +#: actions/pathsadminpanel.php:238 +#, fuzzy +msgid "Server" +msgstr "שיחזור" + +#: actions/pathsadminpanel.php:238 +msgid "Site's server hostname." +msgstr "" + +#: actions/pathsadminpanel.php:242 msgid "Path" msgstr "" -#: actions/pathsadminpanel.php:221 +#: actions/pathsadminpanel.php:242 #, fuzzy msgid "Site path" msgstr "הודעה חדשה" -#: actions/pathsadminpanel.php:225 +#: actions/pathsadminpanel.php:246 msgid "Path to locales" msgstr "" -#: actions/pathsadminpanel.php:225 +#: actions/pathsadminpanel.php:246 msgid "Directory path to locales" msgstr "" -#: actions/pathsadminpanel.php:232 -msgid "Theme" -msgstr "" - -#: actions/pathsadminpanel.php:237 -msgid "Theme server" -msgstr "" - -#: actions/pathsadminpanel.php:241 -msgid "Theme path" -msgstr "" - -#: actions/pathsadminpanel.php:245 -msgid "Theme directory" +#: actions/pathsadminpanel.php:250 +msgid "Fancy URLs" msgstr "" #: actions/pathsadminpanel.php:252 +msgid "Use fancy (more readable and memorable) URLs?" +msgstr "" + +#: actions/pathsadminpanel.php:259 +msgid "Theme" +msgstr "" + +#: actions/pathsadminpanel.php:264 +msgid "Theme server" +msgstr "" + +#: actions/pathsadminpanel.php:268 +msgid "Theme path" +msgstr "" + +#: actions/pathsadminpanel.php:272 +msgid "Theme directory" +msgstr "" + +#: actions/pathsadminpanel.php:279 #, fuzzy msgid "Avatars" msgstr "תמונה" -#: actions/pathsadminpanel.php:257 +#: actions/pathsadminpanel.php:284 #, fuzzy msgid "Avatar server" msgstr "הגדרות" -#: actions/pathsadminpanel.php:261 +#: actions/pathsadminpanel.php:288 #, fuzzy msgid "Avatar path" msgstr "התמונה עודכנה." -#: actions/pathsadminpanel.php:265 +#: actions/pathsadminpanel.php:292 #, fuzzy msgid "Avatar directory" msgstr "התמונה עודכנה." -#: actions/pathsadminpanel.php:274 +#: actions/pathsadminpanel.php:301 msgid "Backgrounds" msgstr "" -#: actions/pathsadminpanel.php:278 +#: actions/pathsadminpanel.php:305 msgid "Background server" msgstr "" -#: actions/pathsadminpanel.php:282 +#: actions/pathsadminpanel.php:309 msgid "Background path" msgstr "" -#: actions/pathsadminpanel.php:286 +#: actions/pathsadminpanel.php:313 msgid "Background directory" msgstr "" -#: actions/pathsadminpanel.php:293 +#: actions/pathsadminpanel.php:320 #, fuzzy msgid "SSL" msgstr "סמס" -#: actions/pathsadminpanel.php:296 actions/siteadminpanel.php:346 +#: actions/pathsadminpanel.php:323 actions/siteadminpanel.php:294 #, fuzzy msgid "Never" msgstr "שיחזור" -#: actions/pathsadminpanel.php:297 +#: actions/pathsadminpanel.php:324 #, fuzzy msgid "Sometimes" msgstr "הודעות" -#: actions/pathsadminpanel.php:298 +#: actions/pathsadminpanel.php:325 msgid "Always" msgstr "" -#: actions/pathsadminpanel.php:302 +#: actions/pathsadminpanel.php:329 msgid "Use SSL" msgstr "" -#: actions/pathsadminpanel.php:303 +#: actions/pathsadminpanel.php:330 msgid "When to use SSL" msgstr "" -#: actions/pathsadminpanel.php:308 +#: actions/pathsadminpanel.php:335 #, fuzzy msgid "SSL server" msgstr "שיחזור" -#: actions/pathsadminpanel.php:309 +#: actions/pathsadminpanel.php:336 msgid "Server to direct SSL requests to" msgstr "" -#: actions/pathsadminpanel.php:325 +#: actions/pathsadminpanel.php:352 #, fuzzy msgid "Save paths" msgstr "הודעה חדשה" @@ -2619,7 +2696,7 @@ msgid "" "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated" msgstr "" -#: actions/profilesettings.php:151 actions/siteadminpanel.php:294 +#: actions/profilesettings.php:151 actions/siteadminpanel.php:280 msgid "Language" msgstr "שפה" @@ -2645,7 +2722,7 @@ msgstr "" msgid "Bio is too long (max %d chars)." msgstr "הביוגרפיה ארוכה מידי (לכל היותר 140 אותיות)" -#: actions/profilesettings.php:235 actions/siteadminpanel.php:164 +#: actions/profilesettings.php:235 actions/siteadminpanel.php:150 msgid "Timezone not selected." msgstr "" @@ -2910,7 +2987,7 @@ msgstr "שגיאה באישור הקוד." msgid "Registration successful" msgstr "" -#: actions/register.php:114 actions/register.php:503 lib/action.php:457 +#: actions/register.php:114 actions/register.php:503 lib/action.php:463 #: lib/logingroupnav.php:85 msgid "Register" msgstr "הירשם" @@ -2950,7 +3027,7 @@ msgid "Same as password above. Required." msgstr "" #: actions/register.php:438 actions/register.php:442 -#: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120 +#: actions/siteadminpanel.php:256 lib/accountsettingsaction.php:120 msgid "Email" msgstr "" @@ -3095,6 +3172,11 @@ msgstr "צור" msgid "Replies to %s" msgstr "תגובת עבור %s" +#: actions/replies.php:127 +#, fuzzy, php-format +msgid "Replies to %1$s, page %2$d" +msgstr "תגובת עבור %s" + #: actions/replies.php:144 #, fuzzy, php-format msgid "Replies feed for %s (RSS 1.0)" @@ -3224,6 +3306,11 @@ msgid "" "signature method." msgstr "" +#: actions/showfavorites.php:79 +#, fuzzy, php-format +msgid "%1$s's favorite notices, page %2$d" +msgstr "%s וחברים" + #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "" @@ -3273,6 +3360,11 @@ msgstr "" msgid "%s group" msgstr "" +#: actions/showgroup.php:84 +#, fuzzy, php-format +msgid "%1$s group, page %2$d" +msgstr "כל המנויים" + #: actions/showgroup.php:218 #, fuzzy msgid "Group profile" @@ -3388,6 +3480,11 @@ msgstr "הודעות" msgid " tagged %s" msgstr "" +#: actions/showstream.php:79 +#, fuzzy, php-format +msgid "%1$s, page %2$d" +msgstr "%s וחברים" + #: actions/showstream.php:122 #, fuzzy, php-format msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" @@ -3466,198 +3563,146 @@ msgstr "למשתמש אין פרופיל." msgid "Basic settings for this StatusNet site." msgstr "" -#: actions/siteadminpanel.php:146 +#: actions/siteadminpanel.php:132 msgid "Site name must have non-zero length." msgstr "" -#: actions/siteadminpanel.php:154 +#: actions/siteadminpanel.php:140 msgid "You must have a valid contact email address." msgstr "" -#: actions/siteadminpanel.php:172 +#: actions/siteadminpanel.php:158 #, php-format msgid "Unknown language \"%s\"." msgstr "" -#: actions/siteadminpanel.php:179 +#: actions/siteadminpanel.php:165 msgid "Invalid snapshot report URL." msgstr "" -#: actions/siteadminpanel.php:185 +#: actions/siteadminpanel.php:171 msgid "Invalid snapshot run value." msgstr "" -#: actions/siteadminpanel.php:191 +#: actions/siteadminpanel.php:177 msgid "Snapshot frequency must be a number." msgstr "" -#: actions/siteadminpanel.php:197 +#: actions/siteadminpanel.php:183 msgid "Minimum text limit is 140 characters." msgstr "" -#: actions/siteadminpanel.php:203 +#: actions/siteadminpanel.php:189 msgid "Dupe limit must 1 or more seconds." msgstr "" -#: actions/siteadminpanel.php:253 +#: actions/siteadminpanel.php:239 msgid "General" msgstr "" -#: actions/siteadminpanel.php:256 +#: actions/siteadminpanel.php:242 #, fuzzy msgid "Site name" msgstr "הודעה חדשה" -#: actions/siteadminpanel.php:257 +#: actions/siteadminpanel.php:243 msgid "The name of your site, like \"Yourcompany Microblog\"" msgstr "" -#: actions/siteadminpanel.php:261 +#: actions/siteadminpanel.php:247 msgid "Brought by" msgstr "" -#: actions/siteadminpanel.php:262 +#: actions/siteadminpanel.php:248 msgid "Text used for credits link in footer of each page" msgstr "" -#: actions/siteadminpanel.php:266 +#: actions/siteadminpanel.php:252 msgid "Brought by URL" msgstr "" -#: actions/siteadminpanel.php:267 +#: actions/siteadminpanel.php:253 msgid "URL used for credits link in footer of each page" msgstr "" -#: actions/siteadminpanel.php:271 +#: actions/siteadminpanel.php:257 msgid "Contact email address for your site" msgstr "" -#: actions/siteadminpanel.php:277 +#: actions/siteadminpanel.php:263 #, fuzzy msgid "Local" msgstr "מיקום" -#: actions/siteadminpanel.php:288 +#: actions/siteadminpanel.php:274 msgid "Default timezone" msgstr "" -#: actions/siteadminpanel.php:289 +#: actions/siteadminpanel.php:275 msgid "Default timezone for the site; usually UTC." msgstr "" -#: actions/siteadminpanel.php:295 +#: actions/siteadminpanel.php:281 msgid "Default site language" msgstr "" -#: actions/siteadminpanel.php:303 -msgid "URLs" -msgstr "" - -#: actions/siteadminpanel.php:306 -#, fuzzy -msgid "Server" -msgstr "שיחזור" - -#: actions/siteadminpanel.php:306 -msgid "Site's server hostname." -msgstr "" - -#: actions/siteadminpanel.php:310 -msgid "Fancy URLs" -msgstr "" - -#: actions/siteadminpanel.php:312 -msgid "Use fancy (more readable and memorable) URLs?" -msgstr "" - -#: actions/siteadminpanel.php:318 -#, fuzzy -msgid "Access" -msgstr "קבל" - -#: actions/siteadminpanel.php:321 -#, fuzzy -msgid "Private" -msgstr "פרטיות" - -#: actions/siteadminpanel.php:323 -msgid "Prohibit anonymous users (not logged in) from viewing site?" -msgstr "" - -#: actions/siteadminpanel.php:327 -msgid "Invite only" -msgstr "" - -#: actions/siteadminpanel.php:329 -msgid "Make registration invitation only." -msgstr "" - -#: actions/siteadminpanel.php:333 -#, fuzzy -msgid "Closed" -msgstr "אין משתמש כזה." - -#: actions/siteadminpanel.php:335 -msgid "Disable new registrations." -msgstr "" - -#: actions/siteadminpanel.php:341 +#: actions/siteadminpanel.php:289 msgid "Snapshots" msgstr "" -#: actions/siteadminpanel.php:344 +#: actions/siteadminpanel.php:292 msgid "Randomly during Web hit" msgstr "" -#: actions/siteadminpanel.php:345 +#: actions/siteadminpanel.php:293 msgid "In a scheduled job" msgstr "" -#: actions/siteadminpanel.php:347 +#: actions/siteadminpanel.php:295 msgid "Data snapshots" msgstr "" -#: actions/siteadminpanel.php:348 +#: actions/siteadminpanel.php:296 msgid "When to send statistical data to status.net servers" msgstr "" -#: actions/siteadminpanel.php:353 +#: actions/siteadminpanel.php:301 msgid "Frequency" msgstr "" -#: actions/siteadminpanel.php:354 +#: actions/siteadminpanel.php:302 msgid "Snapshots will be sent once every N web hits" msgstr "" -#: actions/siteadminpanel.php:359 +#: actions/siteadminpanel.php:307 msgid "Report URL" msgstr "" -#: actions/siteadminpanel.php:360 +#: actions/siteadminpanel.php:308 msgid "Snapshots will be sent to this URL" msgstr "" -#: actions/siteadminpanel.php:367 +#: actions/siteadminpanel.php:315 msgid "Limits" msgstr "" -#: actions/siteadminpanel.php:370 +#: actions/siteadminpanel.php:318 msgid "Text limit" msgstr "" -#: actions/siteadminpanel.php:370 +#: actions/siteadminpanel.php:318 msgid "Maximum number of characters for notices." msgstr "" -#: actions/siteadminpanel.php:374 +#: actions/siteadminpanel.php:322 msgid "Dupe limit" msgstr "" -#: actions/siteadminpanel.php:374 +#: actions/siteadminpanel.php:322 msgid "How long users must wait (in seconds) to post the same thing again." msgstr "" -#: actions/siteadminpanel.php:388 actions/useradminpanel.php:313 +#: actions/siteadminpanel.php:336 actions/useradminpanel.php:313 #, fuzzy msgid "Save site settings" msgstr "הגדרות" @@ -3857,6 +3902,11 @@ msgstr "אין זיהוי Jabber כזה." msgid "SMS" msgstr "סמס" +#: actions/tag.php:68 +#, fuzzy, php-format +msgid "Notices tagged with %1$s, page %2$d" +msgstr "מיקרובלוג מאת %s" + #: actions/tag.php:86 #, fuzzy, php-format msgid "Notice feed for tag %s (RSS 1.0)" @@ -4165,6 +4215,11 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "" +#: actions/usergroups.php:64 +#, fuzzy, php-format +msgid "%1$s groups, page %2$d" +msgstr "כל המנויים" + #: actions/usergroups.php:130 msgid "Search for more groups" msgstr "" @@ -4227,7 +4282,7 @@ msgstr "" msgid "Plugins" msgstr "" -#: actions/version.php:196 lib/action.php:741 +#: actions/version.php:196 lib/action.php:747 #, fuzzy msgid "Version" msgstr "אישי" @@ -4285,46 +4340,51 @@ msgstr "" msgid "Could not update message with new URI." msgstr "" -#: classes/Notice.php:171 +#: classes/Notice.php:157 #, php-format msgid "DB error inserting hashtag: %s" msgstr "" -#: classes/Notice.php:225 +#: classes/Notice.php:214 #, fuzzy msgid "Problem saving notice. Too long." msgstr "בעיה בשמירת ההודעה." -#: classes/Notice.php:229 +#: classes/Notice.php:218 #, fuzzy msgid "Problem saving notice. Unknown user." msgstr "בעיה בשמירת ההודעה." -#: classes/Notice.php:234 +#: classes/Notice.php:223 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:240 +#: classes/Notice.php:229 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:246 +#: classes/Notice.php:235 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:305 classes/Notice.php:330 +#: classes/Notice.php:294 classes/Notice.php:319 msgid "Problem saving notice." msgstr "בעיה בשמירת ההודעה." -#: classes/Notice.php:1059 +#: classes/Notice.php:790 +#, fuzzy +msgid "Problem saving group inbox." +msgstr "בעיה בשמירת ההודעה." + +#: classes/Notice.php:850 #, php-format msgid "DB error inserting reply: %s" msgstr "שגיאת מסד נתונים בהכנסת התגובה: %s" -#: classes/Notice.php:1441 +#: classes/Notice.php:1233 #, php-format msgid "RT @%1$s %2$s" msgstr "" @@ -4383,131 +4443,131 @@ msgstr "הסטטוס של %1$s ב-%2$s " msgid "Untitled page" msgstr "" -#: lib/action.php:427 +#: lib/action.php:433 msgid "Primary site navigation" msgstr "" -#: lib/action.php:433 +#: lib/action.php:439 msgid "Home" msgstr "בית" -#: lib/action.php:433 +#: lib/action.php:439 msgid "Personal profile and friends timeline" msgstr "" -#: lib/action.php:435 +#: lib/action.php:441 msgid "Change your email, avatar, password, profile" msgstr "" -#: lib/action.php:438 +#: lib/action.php:444 msgid "Connect" msgstr "התחבר" -#: lib/action.php:438 +#: lib/action.php:444 #, fuzzy msgid "Connect to services" msgstr "נכשלה ההפניה לשרת: %s" -#: lib/action.php:442 +#: lib/action.php:448 #, fuzzy msgid "Change site configuration" msgstr "הרשמות" -#: lib/action.php:446 lib/subgroupnav.php:105 +#: lib/action.php:452 lib/subgroupnav.php:105 msgid "Invite" msgstr "" -#: lib/action.php:447 lib/subgroupnav.php:106 +#: lib/action.php:453 lib/subgroupnav.php:106 #, php-format msgid "Invite friends and colleagues to join you on %s" msgstr "" -#: lib/action.php:452 +#: lib/action.php:458 msgid "Logout" msgstr "צא" -#: lib/action.php:452 +#: lib/action.php:458 msgid "Logout from the site" msgstr "" -#: lib/action.php:457 +#: lib/action.php:463 #, fuzzy msgid "Create an account" msgstr "צור חשבון חדש" -#: lib/action.php:460 +#: lib/action.php:466 msgid "Login to the site" msgstr "" -#: lib/action.php:463 lib/action.php:726 +#: lib/action.php:469 lib/action.php:732 msgid "Help" msgstr "עזרה" -#: lib/action.php:463 +#: lib/action.php:469 #, fuzzy msgid "Help me!" msgstr "עזרה" -#: lib/action.php:466 lib/searchaction.php:127 +#: lib/action.php:472 lib/searchaction.php:127 msgid "Search" msgstr "חיפוש" -#: lib/action.php:466 +#: lib/action.php:472 msgid "Search for people or text" msgstr "" -#: lib/action.php:487 +#: lib/action.php:493 #, fuzzy msgid "Site notice" msgstr "הודעה חדשה" -#: lib/action.php:553 +#: lib/action.php:559 msgid "Local views" msgstr "" -#: lib/action.php:619 +#: lib/action.php:625 #, fuzzy msgid "Page notice" msgstr "הודעה חדשה" -#: lib/action.php:721 +#: lib/action.php:727 #, fuzzy msgid "Secondary site navigation" msgstr "הרשמות" -#: lib/action.php:728 +#: lib/action.php:734 msgid "About" msgstr "אודות" -#: lib/action.php:730 +#: lib/action.php:736 msgid "FAQ" msgstr "רשימת שאלות נפוצות" -#: lib/action.php:734 +#: lib/action.php:740 msgid "TOS" msgstr "" -#: lib/action.php:737 +#: lib/action.php:743 msgid "Privacy" msgstr "פרטיות" -#: lib/action.php:739 +#: lib/action.php:745 msgid "Source" msgstr "מקור" -#: lib/action.php:743 +#: lib/action.php:749 msgid "Contact" msgstr "צור קשר" -#: lib/action.php:745 +#: lib/action.php:751 msgid "Badge" msgstr "" -#: lib/action.php:773 +#: lib/action.php:779 msgid "StatusNet software license" msgstr "" -#: lib/action.php:776 +#: lib/action.php:782 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -4516,12 +4576,12 @@ msgstr "" "**%%site.name%%** הוא שרות ביקרובלוג הניתן על ידי [%%site.broughtby%%](%%" "site.broughtbyurl%%)." -#: lib/action.php:778 +#: lib/action.php:784 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "**%%site.name%%** הוא שרות ביקרובלוג." -#: lib/action.php:780 +#: lib/action.php:786 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4532,43 +4592,43 @@ msgstr "" "s, המופצת תחת רשיון [GNU Affero General Public License](http://www.fsf.org/" "licensing/licenses/agpl-3.0.html)" -#: lib/action.php:795 +#: lib/action.php:801 #, fuzzy msgid "Site content license" msgstr "הודעה חדשה" -#: lib/action.php:800 +#: lib/action.php:806 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "" -#: lib/action.php:805 +#: lib/action.php:811 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" -#: lib/action.php:808 +#: lib/action.php:814 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" -#: lib/action.php:820 +#: lib/action.php:826 msgid "All " msgstr "" -#: lib/action.php:825 +#: lib/action.php:831 msgid "license." msgstr "" -#: lib/action.php:1124 +#: lib/action.php:1130 msgid "Pagination" msgstr "" -#: lib/action.php:1133 +#: lib/action.php:1139 #, fuzzy msgid "After" msgstr "<< אחרי" -#: lib/action.php:1141 +#: lib/action.php:1147 #, fuzzy msgid "Before" msgstr "לפני >>" @@ -4602,11 +4662,25 @@ msgstr "הרשמות" msgid "Design configuration" msgstr "" -#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327 +#: lib/adminpanelaction.php:322 +#, fuzzy +msgid "User configuration" +msgstr "הרשמות" + +#: lib/adminpanelaction.php:327 +#, fuzzy +msgid "Access configuration" +msgstr "הרשמות" + +#: lib/adminpanelaction.php:332 #, fuzzy msgid "Paths configuration" msgstr "הרשמות" +#: lib/applicationeditform.php:136 +msgid "Edit application" +msgstr "" + #: lib/applicationeditform.php:186 msgid "Icon for this application" msgstr "" @@ -5201,12 +5275,12 @@ msgstr "" msgid "kB" msgstr "" -#: lib/jabber.php:202 +#: lib/jabber.php:220 #, php-format msgid "[%s]" msgstr "" -#: lib/jabber.php:385 +#: lib/jabber.php:400 #, php-format msgid "Unknown inbox source %d." msgstr "" @@ -5634,19 +5708,19 @@ msgstr "תגובות" msgid "Favorites" msgstr "מועדפים" -#: lib/personalgroupnav.php:124 +#: lib/personalgroupnav.php:125 msgid "Inbox" msgstr "" -#: lib/personalgroupnav.php:125 +#: lib/personalgroupnav.php:126 msgid "Your incoming messages" msgstr "" -#: lib/personalgroupnav.php:129 +#: lib/personalgroupnav.php:130 msgid "Outbox" msgstr "" -#: lib/personalgroupnav.php:130 +#: lib/personalgroupnav.php:131 msgid "Your sent messages" msgstr "" @@ -5908,47 +5982,47 @@ msgstr "הודעה חדשה" msgid "Moderate" msgstr "" -#: lib/util.php:875 +#: lib/util.php:868 msgid "a few seconds ago" msgstr "לפני מספר שניות" -#: lib/util.php:877 +#: lib/util.php:870 msgid "about a minute ago" msgstr "לפני כדקה" -#: lib/util.php:879 +#: lib/util.php:872 #, php-format msgid "about %d minutes ago" msgstr "לפני כ-%d דקות" -#: lib/util.php:881 +#: lib/util.php:874 msgid "about an hour ago" msgstr "לפני כשעה" -#: lib/util.php:883 +#: lib/util.php:876 #, php-format msgid "about %d hours ago" msgstr "לפני כ-%d שעות" -#: lib/util.php:885 +#: lib/util.php:878 msgid "about a day ago" msgstr "לפני כיום" -#: lib/util.php:887 +#: lib/util.php:880 #, php-format msgid "about %d days ago" msgstr "לפני כ-%d ימים" -#: lib/util.php:889 +#: lib/util.php:882 msgid "about a month ago" msgstr "לפני כחודש" -#: lib/util.php:891 +#: lib/util.php:884 #, php-format msgid "about %d months ago" msgstr "לפני כ-%d חודשים" -#: lib/util.php:893 +#: lib/util.php:886 msgid "about a year ago" msgstr "לפני כשנה" @@ -5962,7 +6036,7 @@ msgstr "לאתר הבית יש כתובת לא חוקית." msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "" -#: scripts/xmppdaemon.php:301 +#: lib/xmppmanager.php:402 #, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" diff --git a/locale/hsb/LC_MESSAGES/statusnet.po b/locale/hsb/LC_MESSAGES/statusnet.po index 2355fd8e94..f942d8b639 100644 --- a/locale/hsb/LC_MESSAGES/statusnet.po +++ b/locale/hsb/LC_MESSAGES/statusnet.po @@ -9,18 +9,72 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-21 22:36+0000\n" -"PO-Revision-Date: 2010-01-21 22:37:44+0000\n" +"POT-Creation-Date: 2010-01-27 23:58+0000\n" +"PO-Revision-Date: 2010-01-27 23:59:02+0000\n" "Language-Team: Dutch\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r61339); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61595); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: hsb\n" "X-Message-Group: out-statusnet\n" "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : (n%100==3 || " "n%100==4) ? 2 : 3)\n" +#: actions/accessadminpanel.php:54 lib/adminpanelaction.php:326 +msgid "Access" +msgstr "Přistup" + +#: actions/accessadminpanel.php:65 +#, fuzzy +msgid "Site access settings" +msgstr "Sydłowe nastajenja składować" + +#: actions/accessadminpanel.php:158 +#, fuzzy +msgid "Registration" +msgstr "Registrować" + +#: actions/accessadminpanel.php:161 +msgid "Private" +msgstr "Priwatny" + +#: actions/accessadminpanel.php:163 +msgid "Prohibit anonymous users (not logged in) from viewing site?" +msgstr "" + +#: actions/accessadminpanel.php:167 +msgid "Invite only" +msgstr "Jenož přeprosyć" + +#: actions/accessadminpanel.php:169 +msgid "Make registration invitation only." +msgstr "" + +#: actions/accessadminpanel.php:173 +msgid "Closed" +msgstr "Začinjeny" + +#: actions/accessadminpanel.php:175 +msgid "Disable new registrations." +msgstr "Nowe registrowanja znjemóžnić." + +#: actions/accessadminpanel.php:189 actions/designadminpanel.php:586 +#: actions/emailsettings.php:195 actions/imsettings.php:163 +#: actions/othersettings.php:126 actions/pathsadminpanel.php:351 +#: actions/profilesettings.php:174 actions/siteadminpanel.php:336 +#: actions/smssettings.php:181 actions/subscriptions.php:203 +#: actions/tagother.php:154 actions/useradminpanel.php:313 +#: lib/applicationeditform.php:335 lib/applicationeditform.php:336 +#: lib/designsettings.php:256 lib/groupeditform.php:202 +msgid "Save" +msgstr "Składować" + +#: actions/accessadminpanel.php:189 +#, fuzzy +msgid "Save access settings" +msgstr "Sydłowe nastajenja składować" + #: actions/all.php:63 actions/public.php:97 actions/replies.php:92 #: actions/showfavorites.php:137 actions/tag.php:51 msgid "No such page" @@ -35,7 +89,7 @@ msgstr "Strona njeeksistuje" #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:149 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 @@ -134,8 +188,7 @@ msgstr "" #: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 #: actions/apitimelinefriends.php:155 actions/apitimelinegroup.php:150 #: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 -#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found." @@ -151,7 +204,7 @@ msgstr "API-metoda njenamakana." #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:119 +#: actions/apistatusesupdate.php:118 msgid "This method requires a POST." msgstr "Tuta metoda wužaduje sej POST." @@ -180,7 +233,7 @@ msgstr "Profil njeje so składować dał." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:132 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 #: actions/designadminpanel.php:122 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -476,7 +529,14 @@ msgstr "" msgid "Allow or deny access" msgstr "" -#: actions/apioauthauthorize.php:320 lib/action.php:435 +#: actions/apioauthauthorize.php:306 +#, php-format +msgid "" +"The application %s by %s would like the " +"ability to %s your account data." +msgstr "" + +#: actions/apioauthauthorize.php:320 lib/action.php:441 msgid "Account" msgstr "Konto" @@ -533,17 +593,17 @@ msgstr "Status zničeny." msgid "No status with that ID found." msgstr "Žadyn status z tym ID namakany." -#: actions/apistatusesupdate.php:162 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "To je předołho. Maksimalna wulkosć zdźělenki je %d znamješkow." -#: actions/apistatusesupdate.php:203 +#: actions/apistatusesupdate.php:202 msgid "Not found" msgstr "Njenamakany" -#: actions/apistatusesupdate.php:226 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -594,11 +654,6 @@ msgstr "" msgid "%s updates from everyone!" msgstr "" -#: actions/apitimelineretweetedbyme.php:112 -#, php-format -msgid "Repeated by %s" -msgstr "" - #: actions/apitimelineretweetedtome.php:111 #, php-format msgid "Repeated to %s" @@ -999,17 +1054,6 @@ msgstr "Standardne designy wobnowić" msgid "Reset back to default" msgstr "Na standard wróćo stajić" -#: actions/designadminpanel.php:586 actions/emailsettings.php:195 -#: actions/imsettings.php:163 actions/othersettings.php:126 -#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174 -#: actions/siteadminpanel.php:388 actions/smssettings.php:181 -#: actions/subscriptions.php:203 actions/tagother.php:154 -#: actions/useradminpanel.php:313 lib/applicationeditform.php:335 -#: lib/applicationeditform.php:336 lib/designsettings.php:256 -#: lib/groupeditform.php:202 -msgid "Save" -msgstr "Składować" - #: actions/designadminpanel.php:587 lib/designsettings.php:257 msgid "Save design" msgstr "Design składować" @@ -1022,13 +1066,15 @@ msgstr "Tuta zdźělenka faworit njeje!" msgid "Add to favorites" msgstr "K faworitam přidać" -#: actions/doc.php:69 -msgid "No such document." +#: actions/doc.php:155 +#, fuzzy, php-format +msgid "No such document \"%s\"" msgstr "Dokument njeeksistuje." -#: actions/editapplication.php:54 lib/applicationeditform.php:136 -msgid "Edit application" -msgstr "" +#: actions/editapplication.php:54 +#, fuzzy +msgid "Edit Application" +msgstr "Aplikacije OAuth" #: actions/editapplication.php:66 msgid "You must be logged in to edit an application." @@ -1044,7 +1090,7 @@ msgid "No such application." msgstr "Aplikacija njeeksistuje." #: actions/editapplication.php:127 actions/newapplication.php:110 -#: actions/showapplication.php:118 lib/action.php:1189 +#: actions/showapplication.php:118 lib/action.php:1195 msgid "There was a problem with your session token." msgstr "" @@ -1243,7 +1289,7 @@ msgid "Cannot normalize that email address" msgstr "" #: actions/emailsettings.php:331 actions/register.php:201 -#: actions/siteadminpanel.php:157 +#: actions/siteadminpanel.php:143 msgid "Not a valid email address." msgstr "Njepłaćiwa e-mejlowa adresa." @@ -1255,7 +1301,7 @@ msgstr "To je hižo twoja e-mejlowa adresa." msgid "That email address already belongs to another user." msgstr "Ta e-mejlowa adresa hižo słuša k druhemu wužiwarjej." -#: actions/emailsettings.php:353 actions/imsettings.php:317 +#: actions/emailsettings.php:353 actions/imsettings.php:319 #: actions/smssettings.php:337 msgid "Couldn't insert confirmation code." msgstr "" @@ -1549,7 +1595,7 @@ msgstr "%1$s skupinskich čłonow, strona %2$d" msgid "A list of the users in this group." msgstr "Lisćina wužiwarjow w tutej skupinje." -#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107 +#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107 msgid "Admin" msgstr "Administrator" @@ -1724,6 +1770,11 @@ msgstr "" msgid "That is not your Jabber ID." msgstr "To njeje twój ID Jabber." +#: actions/inbox.php:59 +#, php-format +msgid "Inbox for %1$s - page %2$d" +msgstr "" + #: actions/inbox.php:62 #, php-format msgid "Inbox for %s" @@ -1876,7 +1927,7 @@ msgstr "Wopačne wužiwarske mjeno abo hesło." msgid "Error setting user. You are probably not authorized." msgstr "Zmylk při nastajenju wužiwarja. Snano njejsy awtorizowany." -#: actions/login.php:188 actions/login.php:241 lib/action.php:460 +#: actions/login.php:188 actions/login.php:241 lib/action.php:466 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Přizjewić" @@ -1934,8 +1985,9 @@ msgid "No current status" msgstr "Žadyn aktualny status" #: actions/newapplication.php:52 -msgid "New application" -msgstr "" +#, fuzzy +msgid "New Application" +msgstr "Aplikacija njeeksistuje." #: actions/newapplication.php:64 msgid "You must be logged in to register an application." @@ -2116,8 +2168,8 @@ msgstr "" msgid "Only " msgstr "Jenož " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1038 -#: lib/api.php:1066 lib/api.php:1176 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1039 +#: lib/api.php:1067 lib/api.php:1177 msgid "Not a supported data format." msgstr "Njeje podpěrany datowy format." @@ -2181,6 +2233,11 @@ msgstr "Njepłaćiwe přizjewjenske znamješko podate." msgid "Login token expired." msgstr "Přizjewjenske znamješko spadnjene." +#: actions/outbox.php:58 +#, php-format +msgid "Outbox for %1$s - page %2$d" +msgstr "" + #: actions/outbox.php:61 #, php-format msgid "Outbox for %s" @@ -2251,7 +2308,7 @@ msgstr "" msgid "Password saved." msgstr "Hesło składowane." -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:331 msgid "Paths" msgstr "Šćežki" @@ -2259,132 +2316,148 @@ msgstr "Šćežki" msgid "Path and server settings for this StatusNet site." msgstr "Šćežka a serwerowe nastajenja za tute sydło StatusNet." -#: actions/pathsadminpanel.php:140 +#: actions/pathsadminpanel.php:157 #, php-format msgid "Theme directory not readable: %s" msgstr "" -#: actions/pathsadminpanel.php:146 +#: actions/pathsadminpanel.php:163 #, php-format msgid "Avatar directory not writable: %s" msgstr "" -#: actions/pathsadminpanel.php:152 +#: actions/pathsadminpanel.php:169 #, php-format msgid "Background directory not writable: %s" msgstr "" -#: actions/pathsadminpanel.php:160 +#: actions/pathsadminpanel.php:177 #, php-format msgid "Locales directory not readable: %s" msgstr "" -#: actions/pathsadminpanel.php:166 +#: actions/pathsadminpanel.php:183 msgid "Invalid SSL server. The maximum length is 255 characters." msgstr "" -#: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58 +#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58 #: lib/adminpanelaction.php:311 msgid "Site" msgstr "Sydło" -#: actions/pathsadminpanel.php:221 +#: actions/pathsadminpanel.php:238 +msgid "Server" +msgstr "Serwer" + +#: actions/pathsadminpanel.php:238 +msgid "Site's server hostname." +msgstr "" + +#: actions/pathsadminpanel.php:242 msgid "Path" msgstr "Šćežka" -#: actions/pathsadminpanel.php:221 +#: actions/pathsadminpanel.php:242 msgid "Site path" msgstr "Sydłowa šćežka" -#: actions/pathsadminpanel.php:225 +#: actions/pathsadminpanel.php:246 msgid "Path to locales" msgstr "Šćežka k lokalam" -#: actions/pathsadminpanel.php:225 +#: actions/pathsadminpanel.php:246 msgid "Directory path to locales" msgstr "Zapisowa šćežka k lokalam" -#: actions/pathsadminpanel.php:232 +#: actions/pathsadminpanel.php:250 +msgid "Fancy URLs" +msgstr "" + +#: actions/pathsadminpanel.php:252 +msgid "Use fancy (more readable and memorable) URLs?" +msgstr "" + +#: actions/pathsadminpanel.php:259 msgid "Theme" msgstr "Šat" -#: actions/pathsadminpanel.php:237 +#: actions/pathsadminpanel.php:264 msgid "Theme server" msgstr "Šatowy serwer" -#: actions/pathsadminpanel.php:241 +#: actions/pathsadminpanel.php:268 msgid "Theme path" msgstr "Šatowa šćežka" -#: actions/pathsadminpanel.php:245 +#: actions/pathsadminpanel.php:272 msgid "Theme directory" msgstr "Šatowy zapis" -#: actions/pathsadminpanel.php:252 +#: actions/pathsadminpanel.php:279 msgid "Avatars" msgstr "Awatary" -#: actions/pathsadminpanel.php:257 +#: actions/pathsadminpanel.php:284 msgid "Avatar server" msgstr "Awatarowy serwer" -#: actions/pathsadminpanel.php:261 +#: actions/pathsadminpanel.php:288 msgid "Avatar path" msgstr "Awatarowa šćežka" -#: actions/pathsadminpanel.php:265 +#: actions/pathsadminpanel.php:292 msgid "Avatar directory" msgstr "Awatarowy zapis" -#: actions/pathsadminpanel.php:274 +#: actions/pathsadminpanel.php:301 msgid "Backgrounds" msgstr "Pozadki" -#: actions/pathsadminpanel.php:278 +#: actions/pathsadminpanel.php:305 msgid "Background server" msgstr "Pozadkowy serwer" -#: actions/pathsadminpanel.php:282 +#: actions/pathsadminpanel.php:309 msgid "Background path" msgstr "Pozadkowa šćežka" -#: actions/pathsadminpanel.php:286 +#: actions/pathsadminpanel.php:313 msgid "Background directory" msgstr "Pozadkowy zapis" -#: actions/pathsadminpanel.php:293 +#: actions/pathsadminpanel.php:320 msgid "SSL" msgstr "SSL" -#: actions/pathsadminpanel.php:296 actions/siteadminpanel.php:346 +#: actions/pathsadminpanel.php:323 actions/siteadminpanel.php:294 msgid "Never" msgstr "Ženje" -#: actions/pathsadminpanel.php:297 +#: actions/pathsadminpanel.php:324 msgid "Sometimes" msgstr "Druhdy" -#: actions/pathsadminpanel.php:298 +#: actions/pathsadminpanel.php:325 msgid "Always" msgstr "Přeco" -#: actions/pathsadminpanel.php:302 +#: actions/pathsadminpanel.php:329 msgid "Use SSL" msgstr "SSL wužiwać" -#: actions/pathsadminpanel.php:303 +#: actions/pathsadminpanel.php:330 msgid "When to use SSL" msgstr "" -#: actions/pathsadminpanel.php:308 +#: actions/pathsadminpanel.php:335 msgid "SSL server" msgstr "SSL-serwer" -#: actions/pathsadminpanel.php:309 +#: actions/pathsadminpanel.php:336 msgid "Server to direct SSL requests to" msgstr "" -#: actions/pathsadminpanel.php:325 +#: actions/pathsadminpanel.php:352 msgid "Save paths" msgstr "Šćežki składować" @@ -2489,7 +2562,7 @@ msgid "" "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated" msgstr "" -#: actions/profilesettings.php:151 actions/siteadminpanel.php:294 +#: actions/profilesettings.php:151 actions/siteadminpanel.php:280 msgid "Language" msgstr "Rěč" @@ -2515,7 +2588,7 @@ msgstr "" msgid "Bio is too long (max %d chars)." msgstr "Biografija je předołha (maks. %d znamješkow)." -#: actions/profilesettings.php:235 actions/siteadminpanel.php:164 +#: actions/profilesettings.php:235 actions/siteadminpanel.php:150 msgid "Timezone not selected." msgstr "Časowe pasmo njeje wubrane." @@ -2774,7 +2847,7 @@ msgstr "Wodaj, njepłaćiwy přeprošenski kod." msgid "Registration successful" msgstr "Registrowanje wuspěšne" -#: actions/register.php:114 actions/register.php:503 lib/action.php:457 +#: actions/register.php:114 actions/register.php:503 lib/action.php:463 #: lib/logingroupnav.php:85 msgid "Register" msgstr "Registrować" @@ -2814,7 +2887,7 @@ msgid "Same as password above. Required." msgstr "Jenake kaž hesło horjeka. Trěbne." #: actions/register.php:438 actions/register.php:442 -#: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120 +#: actions/siteadminpanel.php:256 lib/accountsettingsaction.php:120 msgid "Email" msgstr "E-mejl" @@ -2948,6 +3021,11 @@ msgstr "Wospjetowany!" msgid "Replies to %s" msgstr "" +#: actions/replies.php:127 +#, php-format +msgid "Replies to %1$s, page %2$d" +msgstr "" + #: actions/replies.php:144 #, php-format msgid "Replies feed for %s (RSS 1.0)" @@ -3071,6 +3149,11 @@ msgid "" "signature method." msgstr "" +#: actions/showfavorites.php:79 +#, fuzzy, php-format +msgid "%1$s's favorite notices, page %2$d" +msgstr "%1$s a přećeljo, strona %2$d" + #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "" @@ -3120,6 +3203,11 @@ msgstr "" msgid "%s group" msgstr "" +#: actions/showgroup.php:84 +#, fuzzy, php-format +msgid "%1$s group, page %2$d" +msgstr "%1$s skupinskich čłonow, strona %2$d" + #: actions/showgroup.php:218 msgid "Group profile" msgstr "Skupinski profil" @@ -3230,6 +3318,11 @@ msgstr "Zdźělenka zničena." msgid " tagged %s" msgstr "" +#: actions/showstream.php:79 +#, fuzzy, php-format +msgid "%1$s, page %2$d" +msgstr "%1$s a přećeljo, strona %2$d" + #: actions/showstream.php:122 #, php-format msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" @@ -3307,192 +3400,144 @@ msgstr "" msgid "Basic settings for this StatusNet site." msgstr "" -#: actions/siteadminpanel.php:146 +#: actions/siteadminpanel.php:132 msgid "Site name must have non-zero length." msgstr "" -#: actions/siteadminpanel.php:154 +#: actions/siteadminpanel.php:140 msgid "You must have a valid contact email address." msgstr "Dyrbiš płaćiwu kontaktowu e-mejlowu adresu měć." -#: actions/siteadminpanel.php:172 +#: actions/siteadminpanel.php:158 #, php-format msgid "Unknown language \"%s\"." msgstr "Njeznata rěč \"%s\"." -#: actions/siteadminpanel.php:179 +#: actions/siteadminpanel.php:165 msgid "Invalid snapshot report URL." msgstr "" -#: actions/siteadminpanel.php:185 +#: actions/siteadminpanel.php:171 msgid "Invalid snapshot run value." msgstr "" -#: actions/siteadminpanel.php:191 +#: actions/siteadminpanel.php:177 msgid "Snapshot frequency must be a number." msgstr "" -#: actions/siteadminpanel.php:197 +#: actions/siteadminpanel.php:183 msgid "Minimum text limit is 140 characters." msgstr "" -#: actions/siteadminpanel.php:203 +#: actions/siteadminpanel.php:189 msgid "Dupe limit must 1 or more seconds." msgstr "" -#: actions/siteadminpanel.php:253 +#: actions/siteadminpanel.php:239 msgid "General" msgstr "Powšitkowny" -#: actions/siteadminpanel.php:256 +#: actions/siteadminpanel.php:242 msgid "Site name" msgstr "Sydłowe mjeno" -#: actions/siteadminpanel.php:257 +#: actions/siteadminpanel.php:243 msgid "The name of your site, like \"Yourcompany Microblog\"" msgstr "" -#: actions/siteadminpanel.php:261 +#: actions/siteadminpanel.php:247 msgid "Brought by" msgstr "" -#: actions/siteadminpanel.php:262 +#: actions/siteadminpanel.php:248 msgid "Text used for credits link in footer of each page" msgstr "" -#: actions/siteadminpanel.php:266 +#: actions/siteadminpanel.php:252 msgid "Brought by URL" msgstr "" -#: actions/siteadminpanel.php:267 +#: actions/siteadminpanel.php:253 msgid "URL used for credits link in footer of each page" msgstr "" -#: actions/siteadminpanel.php:271 +#: actions/siteadminpanel.php:257 msgid "Contact email address for your site" msgstr "" -#: actions/siteadminpanel.php:277 +#: actions/siteadminpanel.php:263 msgid "Local" msgstr "Lokalny" -#: actions/siteadminpanel.php:288 +#: actions/siteadminpanel.php:274 msgid "Default timezone" msgstr "Standardne časowe pasmo" -#: actions/siteadminpanel.php:289 +#: actions/siteadminpanel.php:275 msgid "Default timezone for the site; usually UTC." msgstr "" -#: actions/siteadminpanel.php:295 +#: actions/siteadminpanel.php:281 msgid "Default site language" msgstr "Standardna sydłowa rěč" -#: actions/siteadminpanel.php:303 -msgid "URLs" -msgstr "URL" - -#: actions/siteadminpanel.php:306 -msgid "Server" -msgstr "Serwer" - -#: actions/siteadminpanel.php:306 -msgid "Site's server hostname." -msgstr "" - -#: actions/siteadminpanel.php:310 -msgid "Fancy URLs" -msgstr "" - -#: actions/siteadminpanel.php:312 -msgid "Use fancy (more readable and memorable) URLs?" -msgstr "" - -#: actions/siteadminpanel.php:318 -msgid "Access" -msgstr "Přistup" - -#: actions/siteadminpanel.php:321 -msgid "Private" -msgstr "Priwatny" - -#: actions/siteadminpanel.php:323 -msgid "Prohibit anonymous users (not logged in) from viewing site?" -msgstr "" - -#: actions/siteadminpanel.php:327 -msgid "Invite only" -msgstr "Jenož přeprosyć" - -#: actions/siteadminpanel.php:329 -msgid "Make registration invitation only." -msgstr "" - -#: actions/siteadminpanel.php:333 -msgid "Closed" -msgstr "Začinjeny" - -#: actions/siteadminpanel.php:335 -msgid "Disable new registrations." -msgstr "Nowe registrowanja znjemóžnić." - -#: actions/siteadminpanel.php:341 +#: actions/siteadminpanel.php:289 msgid "Snapshots" msgstr "" -#: actions/siteadminpanel.php:344 +#: actions/siteadminpanel.php:292 msgid "Randomly during Web hit" msgstr "" -#: actions/siteadminpanel.php:345 +#: actions/siteadminpanel.php:293 msgid "In a scheduled job" msgstr "" -#: actions/siteadminpanel.php:347 +#: actions/siteadminpanel.php:295 msgid "Data snapshots" msgstr "" -#: actions/siteadminpanel.php:348 +#: actions/siteadminpanel.php:296 msgid "When to send statistical data to status.net servers" msgstr "" -#: actions/siteadminpanel.php:353 +#: actions/siteadminpanel.php:301 msgid "Frequency" msgstr "Frekwenca" -#: actions/siteadminpanel.php:354 +#: actions/siteadminpanel.php:302 msgid "Snapshots will be sent once every N web hits" msgstr "" -#: actions/siteadminpanel.php:359 +#: actions/siteadminpanel.php:307 msgid "Report URL" msgstr "" -#: actions/siteadminpanel.php:360 +#: actions/siteadminpanel.php:308 msgid "Snapshots will be sent to this URL" msgstr "" -#: actions/siteadminpanel.php:367 +#: actions/siteadminpanel.php:315 msgid "Limits" msgstr "Limity" -#: actions/siteadminpanel.php:370 +#: actions/siteadminpanel.php:318 msgid "Text limit" msgstr "Tekstowy limit" -#: actions/siteadminpanel.php:370 +#: actions/siteadminpanel.php:318 msgid "Maximum number of characters for notices." msgstr "Maksimalna ličba znamješkow za zdźělenki." -#: actions/siteadminpanel.php:374 +#: actions/siteadminpanel.php:322 msgid "Dupe limit" msgstr "" -#: actions/siteadminpanel.php:374 +#: actions/siteadminpanel.php:322 msgid "How long users must wait (in seconds) to post the same thing again." msgstr "" -#: actions/siteadminpanel.php:388 actions/useradminpanel.php:313 +#: actions/siteadminpanel.php:336 actions/useradminpanel.php:313 msgid "Save site settings" msgstr "Sydłowe nastajenja składować" @@ -3683,6 +3728,11 @@ msgstr "Jabber" msgid "SMS" msgstr "SMS" +#: actions/tag.php:68 +#, php-format +msgid "Notices tagged with %1$s, page %2$d" +msgstr "" + #: actions/tag.php:86 #, php-format msgid "Notice feed for tag %s (RSS 1.0)" @@ -3966,6 +4016,11 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "" +#: actions/usergroups.php:64 +#, fuzzy, php-format +msgid "%1$s groups, page %2$d" +msgstr "%1$s skupinskich čłonow, strona %2$d" + #: actions/usergroups.php:130 msgid "Search for more groups" msgstr "" @@ -4027,7 +4082,7 @@ msgstr "" msgid "Plugins" msgstr "" -#: actions/version.php:196 lib/action.php:741 +#: actions/version.php:196 lib/action.php:747 msgid "Version" msgstr "Wersija" @@ -4081,44 +4136,48 @@ msgstr "" msgid "Could not update message with new URI." msgstr "" -#: classes/Notice.php:171 +#: classes/Notice.php:157 #, php-format msgid "DB error inserting hashtag: %s" msgstr "" -#: classes/Notice.php:225 +#: classes/Notice.php:214 msgid "Problem saving notice. Too long." msgstr "" -#: classes/Notice.php:229 +#: classes/Notice.php:218 msgid "Problem saving notice. Unknown user." msgstr "" -#: classes/Notice.php:234 +#: classes/Notice.php:223 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:240 +#: classes/Notice.php:229 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:246 +#: classes/Notice.php:235 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:305 classes/Notice.php:330 +#: classes/Notice.php:294 classes/Notice.php:319 msgid "Problem saving notice." msgstr "" -#: classes/Notice.php:1059 +#: classes/Notice.php:790 +msgid "Problem saving group inbox." +msgstr "" + +#: classes/Notice.php:850 #, php-format msgid "DB error inserting reply: %s" msgstr "" -#: classes/Notice.php:1441 +#: classes/Notice.php:1233 #, php-format msgid "RT @%1$s %2$s" msgstr "" @@ -4173,136 +4232,136 @@ msgstr "%1$s - %2$s" msgid "Untitled page" msgstr "Strona bjez titula" -#: lib/action.php:427 +#: lib/action.php:433 msgid "Primary site navigation" msgstr "" -#: lib/action.php:433 +#: lib/action.php:439 msgid "Home" msgstr "" -#: lib/action.php:433 +#: lib/action.php:439 msgid "Personal profile and friends timeline" msgstr "" -#: lib/action.php:435 +#: lib/action.php:441 msgid "Change your email, avatar, password, profile" msgstr "" -#: lib/action.php:438 +#: lib/action.php:444 msgid "Connect" msgstr "Zwjazać" -#: lib/action.php:438 +#: lib/action.php:444 msgid "Connect to services" msgstr "" -#: lib/action.php:442 +#: lib/action.php:448 msgid "Change site configuration" msgstr "" -#: lib/action.php:446 lib/subgroupnav.php:105 +#: lib/action.php:452 lib/subgroupnav.php:105 msgid "Invite" msgstr "Přeprosyć" -#: lib/action.php:447 lib/subgroupnav.php:106 +#: lib/action.php:453 lib/subgroupnav.php:106 #, php-format msgid "Invite friends and colleagues to join you on %s" msgstr "" -#: lib/action.php:452 +#: lib/action.php:458 msgid "Logout" msgstr "" -#: lib/action.php:452 +#: lib/action.php:458 msgid "Logout from the site" msgstr "" -#: lib/action.php:457 +#: lib/action.php:463 msgid "Create an account" msgstr "Konto załožić" -#: lib/action.php:460 +#: lib/action.php:466 msgid "Login to the site" msgstr "" -#: lib/action.php:463 lib/action.php:726 +#: lib/action.php:469 lib/action.php:732 msgid "Help" msgstr "Pomoc" -#: lib/action.php:463 +#: lib/action.php:469 msgid "Help me!" msgstr "Pomhaj!" -#: lib/action.php:466 lib/searchaction.php:127 +#: lib/action.php:472 lib/searchaction.php:127 msgid "Search" msgstr "Pytać" -#: lib/action.php:466 +#: lib/action.php:472 msgid "Search for people or text" msgstr "Za ludźimi abo tekstom pytać" -#: lib/action.php:487 +#: lib/action.php:493 msgid "Site notice" msgstr "" -#: lib/action.php:553 +#: lib/action.php:559 msgid "Local views" msgstr "" -#: lib/action.php:619 +#: lib/action.php:625 msgid "Page notice" msgstr "" -#: lib/action.php:721 +#: lib/action.php:727 msgid "Secondary site navigation" msgstr "" -#: lib/action.php:728 +#: lib/action.php:734 msgid "About" msgstr "Wo" -#: lib/action.php:730 +#: lib/action.php:736 msgid "FAQ" msgstr "Huste prašenja" -#: lib/action.php:734 +#: lib/action.php:740 msgid "TOS" msgstr "" -#: lib/action.php:737 +#: lib/action.php:743 msgid "Privacy" msgstr "Priwatnosć" -#: lib/action.php:739 +#: lib/action.php:745 msgid "Source" msgstr "Žórło" -#: lib/action.php:743 +#: lib/action.php:749 msgid "Contact" msgstr "Kontakt" -#: lib/action.php:745 +#: lib/action.php:751 msgid "Badge" msgstr "" -#: lib/action.php:773 +#: lib/action.php:779 msgid "StatusNet software license" msgstr "" -#: lib/action.php:776 +#: lib/action.php:782 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." "broughtby%%](%%site.broughtbyurl%%). " msgstr "" -#: lib/action.php:778 +#: lib/action.php:784 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "" -#: lib/action.php:780 +#: lib/action.php:786 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4310,41 +4369,41 @@ msgid "" "org/licensing/licenses/agpl-3.0.html)." msgstr "" -#: lib/action.php:795 +#: lib/action.php:801 msgid "Site content license" msgstr "" -#: lib/action.php:800 +#: lib/action.php:806 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "" -#: lib/action.php:805 +#: lib/action.php:811 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" -#: lib/action.php:808 +#: lib/action.php:814 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" -#: lib/action.php:820 +#: lib/action.php:826 msgid "All " msgstr "" -#: lib/action.php:825 +#: lib/action.php:831 msgid "license." msgstr "" -#: lib/action.php:1124 +#: lib/action.php:1130 msgid "Pagination" msgstr "" -#: lib/action.php:1133 +#: lib/action.php:1139 msgid "After" msgstr "" -#: lib/action.php:1141 +#: lib/action.php:1147 msgid "Before" msgstr "" @@ -4376,10 +4435,24 @@ msgstr "" msgid "Design configuration" msgstr "" -#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327 +#: lib/adminpanelaction.php:322 +#, fuzzy +msgid "User configuration" +msgstr "SMS-wobkrućenje" + +#: lib/adminpanelaction.php:327 +#, fuzzy +msgid "Access configuration" +msgstr "SMS-wobkrućenje" + +#: lib/adminpanelaction.php:332 msgid "Paths configuration" msgstr "" +#: lib/applicationeditform.php:136 +msgid "Edit application" +msgstr "" + #: lib/applicationeditform.php:186 msgid "Icon for this application" msgstr "" @@ -4951,12 +5024,12 @@ msgstr "MB" msgid "kB" msgstr "KB" -#: lib/jabber.php:202 +#: lib/jabber.php:220 #, php-format msgid "[%s]" msgstr "[%s]" -#: lib/jabber.php:385 +#: lib/jabber.php:400 #, php-format msgid "Unknown inbox source %d." msgstr "Njeznate žórło postoweho kašćika %d." @@ -5364,19 +5437,19 @@ msgstr "Wotmołwy" msgid "Favorites" msgstr "Fawority" -#: lib/personalgroupnav.php:124 +#: lib/personalgroupnav.php:125 msgid "Inbox" msgstr "" -#: lib/personalgroupnav.php:125 +#: lib/personalgroupnav.php:126 msgid "Your incoming messages" msgstr "Twoje dochadźace powěsće" -#: lib/personalgroupnav.php:129 +#: lib/personalgroupnav.php:130 msgid "Outbox" msgstr "" -#: lib/personalgroupnav.php:130 +#: lib/personalgroupnav.php:131 msgid "Your sent messages" msgstr "Twoje pósłane powěsće" @@ -5618,47 +5691,47 @@ msgstr "Powěsć" msgid "Moderate" msgstr "" -#: lib/util.php:875 +#: lib/util.php:868 msgid "a few seconds ago" msgstr "před něšto sekundami" -#: lib/util.php:877 +#: lib/util.php:870 msgid "about a minute ago" msgstr "před něhdźe jednej mjeńšinu" -#: lib/util.php:879 +#: lib/util.php:872 #, php-format msgid "about %d minutes ago" msgstr "před %d mjeńšinami" -#: lib/util.php:881 +#: lib/util.php:874 msgid "about an hour ago" msgstr "před něhdźe jednej hodźinu" -#: lib/util.php:883 +#: lib/util.php:876 #, php-format msgid "about %d hours ago" msgstr "před něhdźe %d hodźinami" -#: lib/util.php:885 +#: lib/util.php:878 msgid "about a day ago" msgstr "před něhdźe jednym dnjom" -#: lib/util.php:887 +#: lib/util.php:880 #, php-format msgid "about %d days ago" msgstr "před něhdźe %d dnjemi" -#: lib/util.php:889 +#: lib/util.php:882 msgid "about a month ago" msgstr "před něhdźe jednym měsacom" -#: lib/util.php:891 +#: lib/util.php:884 #, php-format msgid "about %d months ago" msgstr "před něhdźe %d měsacami" -#: lib/util.php:893 +#: lib/util.php:886 msgid "about a year ago" msgstr "před něhdźe jednym lětom" @@ -5674,7 +5747,7 @@ msgstr "" "%s płaćiwa barba njeje! Wužij 3 heksadecimalne znamješka abo 6 " "heksadecimalnych znamješkow." -#: scripts/xmppdaemon.php:301 +#: lib/xmppmanager.php:402 #, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" diff --git a/locale/ia/LC_MESSAGES/statusnet.po b/locale/ia/LC_MESSAGES/statusnet.po index b54150d955..9dee941474 100644 --- a/locale/ia/LC_MESSAGES/statusnet.po +++ b/locale/ia/LC_MESSAGES/statusnet.po @@ -8,17 +8,71 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-21 22:36+0000\n" -"PO-Revision-Date: 2010-01-21 22:37:47+0000\n" +"POT-Creation-Date: 2010-01-27 23:58+0000\n" +"PO-Revision-Date: 2010-01-27 23:59:06+0000\n" "Language-Team: Interlingua\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r61339); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61595); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ia\n" "X-Message-Group: out-statusnet\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#: actions/accessadminpanel.php:54 lib/adminpanelaction.php:326 +msgid "Access" +msgstr "Accesso" + +#: actions/accessadminpanel.php:65 +#, fuzzy +msgid "Site access settings" +msgstr "Salveguardar configurationes del sito" + +#: actions/accessadminpanel.php:158 +#, fuzzy +msgid "Registration" +msgstr "Crear un conto" + +#: actions/accessadminpanel.php:161 +msgid "Private" +msgstr "Private" + +#: actions/accessadminpanel.php:163 +msgid "Prohibit anonymous users (not logged in) from viewing site?" +msgstr "Prohiber al usatores anonyme (sin session aperte) de vider le sito?" + +#: actions/accessadminpanel.php:167 +msgid "Invite only" +msgstr "Solmente per invitation" + +#: actions/accessadminpanel.php:169 +msgid "Make registration invitation only." +msgstr "Permitter le registration solmente al invitatos." + +#: actions/accessadminpanel.php:173 +msgid "Closed" +msgstr "Claudite" + +#: actions/accessadminpanel.php:175 +msgid "Disable new registrations." +msgstr "Disactivar le creation de nove contos." + +#: actions/accessadminpanel.php:189 actions/designadminpanel.php:586 +#: actions/emailsettings.php:195 actions/imsettings.php:163 +#: actions/othersettings.php:126 actions/pathsadminpanel.php:351 +#: actions/profilesettings.php:174 actions/siteadminpanel.php:336 +#: actions/smssettings.php:181 actions/subscriptions.php:203 +#: actions/tagother.php:154 actions/useradminpanel.php:313 +#: lib/applicationeditform.php:335 lib/applicationeditform.php:336 +#: lib/designsettings.php:256 lib/groupeditform.php:202 +msgid "Save" +msgstr "Salveguardar" + +#: actions/accessadminpanel.php:189 +#, fuzzy +msgid "Save access settings" +msgstr "Salveguardar configurationes del sito" + #: actions/all.php:63 actions/public.php:97 actions/replies.php:92 #: actions/showfavorites.php:137 actions/tag.php:51 msgid "No such page" @@ -33,7 +87,7 @@ msgstr "Pagina non existe" #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:149 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 @@ -140,8 +194,7 @@ msgstr "Actualisationes de %1$s e su amicos in %2$s!" #: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 #: actions/apitimelinefriends.php:155 actions/apitimelinegroup.php:150 #: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 -#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found." @@ -157,7 +210,7 @@ msgstr "Methodo API non trovate." #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:119 +#: actions/apistatusesupdate.php:118 msgid "This method requires a POST." msgstr "Iste methodo require un POST." @@ -188,7 +241,7 @@ msgstr "Non poteva salveguardar le profilo." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:132 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 #: actions/designadminpanel.php:122 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -492,7 +545,14 @@ msgstr "" msgid "Allow or deny access" msgstr "" -#: actions/apioauthauthorize.php:320 lib/action.php:435 +#: actions/apioauthauthorize.php:306 +#, php-format +msgid "" +"The application %s by %s would like the " +"ability to %s your account data." +msgstr "" + +#: actions/apioauthauthorize.php:320 lib/action.php:441 msgid "Account" msgstr "" @@ -550,18 +610,18 @@ msgstr "Stato delite." msgid "No status with that ID found." msgstr "Nulle stato trovate con iste ID." -#: actions/apistatusesupdate.php:162 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "" "Isto es troppo longe. Le longitude maximal del notas es %d characteres." -#: actions/apistatusesupdate.php:203 +#: actions/apistatusesupdate.php:202 msgid "Not found" msgstr "Non trovate" -#: actions/apistatusesupdate.php:226 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -615,11 +675,6 @@ msgstr "Chronologia public de %s" msgid "%s updates from everyone!" msgstr "Actualisationes de totes in %s!" -#: actions/apitimelineretweetedbyme.php:112 -#, php-format -msgid "Repeated by %s" -msgstr "Repetite per %s" - #: actions/apitimelineretweetedtome.php:111 #, php-format msgid "Repeated to %s" @@ -1028,17 +1083,6 @@ msgstr "Restaurar apparentias predefinite" msgid "Reset back to default" msgstr "Revenir al predefinitiones" -#: actions/designadminpanel.php:586 actions/emailsettings.php:195 -#: actions/imsettings.php:163 actions/othersettings.php:126 -#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174 -#: actions/siteadminpanel.php:388 actions/smssettings.php:181 -#: actions/subscriptions.php:203 actions/tagother.php:154 -#: actions/useradminpanel.php:313 lib/applicationeditform.php:335 -#: lib/applicationeditform.php:336 lib/designsettings.php:256 -#: lib/groupeditform.php:202 -msgid "Save" -msgstr "Salveguardar" - #: actions/designadminpanel.php:587 lib/designsettings.php:257 msgid "Save design" msgstr "Salveguardar apparentia" @@ -1051,13 +1095,15 @@ msgstr "Iste nota non es favorite!" msgid "Add to favorites" msgstr "Adder al favorites" -#: actions/doc.php:69 -msgid "No such document." +#: actions/doc.php:155 +#, fuzzy, php-format +msgid "No such document \"%s\"" msgstr "Documento non existe." -#: actions/editapplication.php:54 lib/applicationeditform.php:136 -msgid "Edit application" -msgstr "" +#: actions/editapplication.php:54 +#, fuzzy +msgid "Edit Application" +msgstr "Le nota ha nulle profilo" #: actions/editapplication.php:66 #, fuzzy @@ -1076,7 +1122,7 @@ msgid "No such application." msgstr "Nota non trovate." #: actions/editapplication.php:127 actions/newapplication.php:110 -#: actions/showapplication.php:118 lib/action.php:1189 +#: actions/showapplication.php:118 lib/action.php:1195 msgid "There was a problem with your session token." msgstr "" @@ -1287,7 +1333,7 @@ msgid "Cannot normalize that email address" msgstr "Non pote normalisar iste adresse de e-mail" #: actions/emailsettings.php:331 actions/register.php:201 -#: actions/siteadminpanel.php:157 +#: actions/siteadminpanel.php:143 msgid "Not a valid email address." msgstr "Adresse de e-mail invalide." @@ -1299,7 +1345,7 @@ msgstr "Isto es ja tu adresse de e-mail." msgid "That email address already belongs to another user." msgstr "Iste adresse de e-mail pertine ja a un altere usator." -#: actions/emailsettings.php:353 actions/imsettings.php:317 +#: actions/emailsettings.php:353 actions/imsettings.php:319 #: actions/smssettings.php:337 msgid "Couldn't insert confirmation code." msgstr "Non poteva inserer le codice de confirmation." @@ -1607,7 +1653,7 @@ msgstr "Membros del gruppo %s, pagina %d" msgid "A list of the users in this group." msgstr "Un lista de usatores in iste gruppo." -#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107 +#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107 msgid "Admin" msgstr "Administrator" @@ -1806,6 +1852,11 @@ msgstr "" msgid "That is not your Jabber ID." msgstr "Isto non es tu ID de Jabber." +#: actions/inbox.php:59 +#, fuzzy, php-format +msgid "Inbox for %1$s - page %2$d" +msgstr "Cassa de entrata de %s" + #: actions/inbox.php:62 #, php-format msgid "Inbox for %s" @@ -1990,7 +2041,7 @@ msgid "Error setting user. You are probably not authorized." msgstr "" "Error de acceder al conto de usator. Tu probabilemente non es autorisate." -#: actions/login.php:188 actions/login.php:241 lib/action.php:460 +#: actions/login.php:188 actions/login.php:241 lib/action.php:466 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Aperir session" @@ -2054,8 +2105,9 @@ msgid "No current status" msgstr "Nulle stato actual" #: actions/newapplication.php:52 -msgid "New application" -msgstr "" +#, fuzzy +msgid "New Application" +msgstr "Nota non trovate." #: actions/newapplication.php:64 #, fuzzy @@ -2252,8 +2304,8 @@ msgstr "typo de contento " msgid "Only " msgstr "Solmente " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1038 -#: lib/api.php:1066 lib/api.php:1176 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1039 +#: lib/api.php:1067 lib/api.php:1177 msgid "Not a supported data format." msgstr "Formato de datos non supportate." @@ -2322,6 +2374,11 @@ msgstr "Indicio invalide o expirate." msgid "Login token expired." msgstr "Identificar te a iste sito" +#: actions/outbox.php:58 +#, fuzzy, php-format +msgid "Outbox for %1$s - page %2$d" +msgstr "Cassa de exito pro %s" + #: actions/outbox.php:61 #, php-format msgid "Outbox for %s" @@ -2393,7 +2450,7 @@ msgstr "Non pote salveguardar le nove contrasigno." msgid "Password saved." msgstr "Contrasigno salveguardate." -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:331 msgid "Paths" msgstr "Camminos" @@ -2401,133 +2458,149 @@ msgstr "Camminos" msgid "Path and server settings for this StatusNet site." msgstr "Configuration de cammino e servitor pro iste sito StatusNet." -#: actions/pathsadminpanel.php:140 +#: actions/pathsadminpanel.php:157 #, php-format msgid "Theme directory not readable: %s" msgstr "Directorio de thema non legibile: %s" -#: actions/pathsadminpanel.php:146 +#: actions/pathsadminpanel.php:163 #, php-format msgid "Avatar directory not writable: %s" msgstr "Directorio de avatar non scriptibile: %s" -#: actions/pathsadminpanel.php:152 +#: actions/pathsadminpanel.php:169 #, php-format msgid "Background directory not writable: %s" msgstr "Directorio de fundo non scriptibile: %s" -#: actions/pathsadminpanel.php:160 +#: actions/pathsadminpanel.php:177 #, php-format msgid "Locales directory not readable: %s" msgstr "Directorio de localitates non scriptibile: %s" -#: actions/pathsadminpanel.php:166 +#: actions/pathsadminpanel.php:183 msgid "Invalid SSL server. The maximum length is 255 characters." msgstr "Servitor SSL invalide. Le longitude maxime es 255 characteres." -#: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58 +#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58 #: lib/adminpanelaction.php:311 msgid "Site" msgstr "Sito" -#: actions/pathsadminpanel.php:221 +#: actions/pathsadminpanel.php:238 +msgid "Server" +msgstr "Servitor" + +#: actions/pathsadminpanel.php:238 +msgid "Site's server hostname." +msgstr "Nomine de host del servitor del sito." + +#: actions/pathsadminpanel.php:242 msgid "Path" msgstr "Cammino" -#: actions/pathsadminpanel.php:221 +#: actions/pathsadminpanel.php:242 msgid "Site path" msgstr "Cammino del sito" -#: actions/pathsadminpanel.php:225 +#: actions/pathsadminpanel.php:246 msgid "Path to locales" msgstr "Cammino al localitates" -#: actions/pathsadminpanel.php:225 +#: actions/pathsadminpanel.php:246 msgid "Directory path to locales" msgstr "Cammino al directorio de localitates" -#: actions/pathsadminpanel.php:232 +#: actions/pathsadminpanel.php:250 +msgid "Fancy URLs" +msgstr "URLs de luxo" + +#: actions/pathsadminpanel.php:252 +msgid "Use fancy (more readable and memorable) URLs?" +msgstr "Usar URLs de luxo (plus legibile e memorabile)?" + +#: actions/pathsadminpanel.php:259 msgid "Theme" msgstr "Thema" -#: actions/pathsadminpanel.php:237 +#: actions/pathsadminpanel.php:264 msgid "Theme server" msgstr "Servitor de themas" -#: actions/pathsadminpanel.php:241 +#: actions/pathsadminpanel.php:268 msgid "Theme path" msgstr "Cammino al themas" -#: actions/pathsadminpanel.php:245 +#: actions/pathsadminpanel.php:272 msgid "Theme directory" msgstr "Directorio del themas" -#: actions/pathsadminpanel.php:252 +#: actions/pathsadminpanel.php:279 msgid "Avatars" msgstr "Avatares" -#: actions/pathsadminpanel.php:257 +#: actions/pathsadminpanel.php:284 msgid "Avatar server" msgstr "Servitor de avatares" -#: actions/pathsadminpanel.php:261 +#: actions/pathsadminpanel.php:288 msgid "Avatar path" msgstr "Cammino al avatares" -#: actions/pathsadminpanel.php:265 +#: actions/pathsadminpanel.php:292 msgid "Avatar directory" msgstr "Directorio del avatares" -#: actions/pathsadminpanel.php:274 +#: actions/pathsadminpanel.php:301 msgid "Backgrounds" msgstr "Fundos" -#: actions/pathsadminpanel.php:278 +#: actions/pathsadminpanel.php:305 msgid "Background server" msgstr "Servitor de fundos" -#: actions/pathsadminpanel.php:282 +#: actions/pathsadminpanel.php:309 msgid "Background path" msgstr "Cammino al fundos" -#: actions/pathsadminpanel.php:286 +#: actions/pathsadminpanel.php:313 msgid "Background directory" msgstr "Directorio al fundos" -#: actions/pathsadminpanel.php:293 +#: actions/pathsadminpanel.php:320 msgid "SSL" msgstr "SSL" -#: actions/pathsadminpanel.php:296 actions/siteadminpanel.php:346 +#: actions/pathsadminpanel.php:323 actions/siteadminpanel.php:294 msgid "Never" msgstr "Nunquam" -#: actions/pathsadminpanel.php:297 +#: actions/pathsadminpanel.php:324 msgid "Sometimes" msgstr "Alcun vices" -#: actions/pathsadminpanel.php:298 +#: actions/pathsadminpanel.php:325 msgid "Always" msgstr "Sempre" -#: actions/pathsadminpanel.php:302 +#: actions/pathsadminpanel.php:329 msgid "Use SSL" msgstr "Usar SSL" -#: actions/pathsadminpanel.php:303 +#: actions/pathsadminpanel.php:330 msgid "When to use SSL" msgstr "Quando usar SSL" -#: actions/pathsadminpanel.php:308 +#: actions/pathsadminpanel.php:335 #, fuzzy msgid "SSL server" msgstr "Servitor SSL" -#: actions/pathsadminpanel.php:309 +#: actions/pathsadminpanel.php:336 msgid "Server to direct SSL requests to" msgstr "Servitor verso le qual diriger le requestas SSL" -#: actions/pathsadminpanel.php:325 +#: actions/pathsadminpanel.php:352 msgid "Save paths" msgstr "Salveguardar camminos" @@ -2639,7 +2712,7 @@ msgstr "" "Etiquettas pro te (litteras, numeros, -, ., e _), separate per commas o " "spatios" -#: actions/profilesettings.php:151 actions/siteadminpanel.php:294 +#: actions/profilesettings.php:151 actions/siteadminpanel.php:280 msgid "Language" msgstr "Lingua" @@ -2666,7 +2739,7 @@ msgstr "" msgid "Bio is too long (max %d chars)." msgstr "Bio es troppo longe (max %d chars)." -#: actions/profilesettings.php:235 actions/siteadminpanel.php:164 +#: actions/profilesettings.php:235 actions/siteadminpanel.php:150 msgid "Timezone not selected." msgstr "Fuso horari non seligite." @@ -2941,7 +3014,7 @@ msgstr "Pardono, le codice de invitation es invalide." msgid "Registration successful" msgstr "Registration succedite" -#: actions/register.php:114 actions/register.php:503 lib/action.php:457 +#: actions/register.php:114 actions/register.php:503 lib/action.php:463 #: lib/logingroupnav.php:85 msgid "Register" msgstr "Crear un conto" @@ -2984,7 +3057,7 @@ msgid "Same as password above. Required." msgstr "Identic al contrasigno hic supra. Requisite." #: actions/register.php:438 actions/register.php:442 -#: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120 +#: actions/siteadminpanel.php:256 lib/accountsettingsaction.php:120 msgid "Email" msgstr "E-mail" @@ -3143,6 +3216,11 @@ msgstr "Repetite!" msgid "Replies to %s" msgstr "Responsas a %s" +#: actions/replies.php:127 +#, fuzzy, php-format +msgid "Replies to %1$s, page %2$d" +msgstr "Responsas a %1$s in %2$s!" + #: actions/replies.php:144 #, php-format msgid "Replies feed for %s (RSS 1.0)" @@ -3275,6 +3353,11 @@ msgid "" "signature method." msgstr "" +#: actions/showfavorites.php:79 +#, fuzzy, php-format +msgid "%1$s's favorite notices, page %2$d" +msgstr "Notas favorite de %s" + #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "Non poteva recuperar notas favorite." @@ -3332,6 +3415,11 @@ msgstr "Isto es un modo de condivider lo que te place." msgid "%s group" msgstr "Gruppo %s" +#: actions/showgroup.php:84 +#, fuzzy, php-format +msgid "%1$s group, page %2$d" +msgstr "Membros del gruppo %s, pagina %d" + #: actions/showgroup.php:218 msgid "Group profile" msgstr "Profilo del gruppo" @@ -3451,6 +3539,11 @@ msgstr "Nota delite." msgid " tagged %s" msgstr " con etiquetta %s" +#: actions/showstream.php:79 +#, fuzzy, php-format +msgid "%1$s, page %2$d" +msgstr "%s profilos blocate, pagina %d" + #: actions/showstream.php:122 #, fuzzy, php-format msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" @@ -3540,195 +3633,147 @@ msgstr "Usator es ja silentiate." msgid "Basic settings for this StatusNet site." msgstr "Configurationes de base pro iste sito de StatusNet." -#: actions/siteadminpanel.php:146 +#: actions/siteadminpanel.php:132 msgid "Site name must have non-zero length." msgstr "Le longitude del nomine del sito debe esser plus que zero." -#: actions/siteadminpanel.php:154 +#: actions/siteadminpanel.php:140 #, fuzzy msgid "You must have a valid contact email address." msgstr "Tu debe haber un valide adresse de e-mail pro contacto." -#: actions/siteadminpanel.php:172 +#: actions/siteadminpanel.php:158 #, fuzzy, php-format msgid "Unknown language \"%s\"." msgstr "Lingua \"%s\" incognite" -#: actions/siteadminpanel.php:179 +#: actions/siteadminpanel.php:165 msgid "Invalid snapshot report URL." msgstr "Le URL pro reportar instantaneos es invalide." -#: actions/siteadminpanel.php:185 +#: actions/siteadminpanel.php:171 msgid "Invalid snapshot run value." msgstr "Valor de execution de instantaneo invalide." -#: actions/siteadminpanel.php:191 +#: actions/siteadminpanel.php:177 msgid "Snapshot frequency must be a number." msgstr "Le frequentia de instantaneos debe esser un numero." -#: actions/siteadminpanel.php:197 +#: actions/siteadminpanel.php:183 msgid "Minimum text limit is 140 characters." msgstr "Le limite minime del texto es 140 characteres." -#: actions/siteadminpanel.php:203 +#: actions/siteadminpanel.php:189 msgid "Dupe limit must 1 or more seconds." msgstr "Le limite de duplicatos debe esser 1 o plus secundas." -#: actions/siteadminpanel.php:253 +#: actions/siteadminpanel.php:239 msgid "General" msgstr "General" -#: actions/siteadminpanel.php:256 +#: actions/siteadminpanel.php:242 msgid "Site name" msgstr "Nomine del sito" -#: actions/siteadminpanel.php:257 +#: actions/siteadminpanel.php:243 msgid "The name of your site, like \"Yourcompany Microblog\"" msgstr "Le nomine de tu sito, como \"Le microblog de TuCompania\"" -#: actions/siteadminpanel.php:261 +#: actions/siteadminpanel.php:247 msgid "Brought by" msgstr "Realisate per" -#: actions/siteadminpanel.php:262 +#: actions/siteadminpanel.php:248 msgid "Text used for credits link in footer of each page" msgstr "Le texto usate pro le ligamine al creditos in le pede de cata pagina" -#: actions/siteadminpanel.php:266 +#: actions/siteadminpanel.php:252 msgid "Brought by URL" msgstr "URL pro \"Realisate per\"" -#: actions/siteadminpanel.php:267 +#: actions/siteadminpanel.php:253 msgid "URL used for credits link in footer of each page" msgstr "URL usate pro le ligamine al creditos in le pede de cata pagina" -#: actions/siteadminpanel.php:271 +#: actions/siteadminpanel.php:257 msgid "Contact email address for your site" msgstr "Le adresse de e-mail de contacto pro tu sito" -#: actions/siteadminpanel.php:277 +#: actions/siteadminpanel.php:263 msgid "Local" msgstr "Local" -#: actions/siteadminpanel.php:288 +#: actions/siteadminpanel.php:274 msgid "Default timezone" msgstr "Fuso horari predefinite" -#: actions/siteadminpanel.php:289 +#: actions/siteadminpanel.php:275 msgid "Default timezone for the site; usually UTC." msgstr "Fuso horari predefinite pro le sito; normalmente UTC." -#: actions/siteadminpanel.php:295 +#: actions/siteadminpanel.php:281 msgid "Default site language" msgstr "Lingua predefinite del sito" -#: actions/siteadminpanel.php:303 -msgid "URLs" -msgstr "URLs" - -#: actions/siteadminpanel.php:306 -msgid "Server" -msgstr "Servitor" - -#: actions/siteadminpanel.php:306 -msgid "Site's server hostname." -msgstr "Nomine de host del servitor del sito." - -#: actions/siteadminpanel.php:310 -msgid "Fancy URLs" -msgstr "URLs de luxo" - -#: actions/siteadminpanel.php:312 -msgid "Use fancy (more readable and memorable) URLs?" -msgstr "Usar URLs de luxo (plus legibile e memorabile)?" - -#: actions/siteadminpanel.php:318 -msgid "Access" -msgstr "Accesso" - -#: actions/siteadminpanel.php:321 -msgid "Private" -msgstr "Private" - -#: actions/siteadminpanel.php:323 -msgid "Prohibit anonymous users (not logged in) from viewing site?" -msgstr "Prohiber al usatores anonyme (sin session aperte) de vider le sito?" - -#: actions/siteadminpanel.php:327 -msgid "Invite only" -msgstr "Solmente per invitation" - -#: actions/siteadminpanel.php:329 -msgid "Make registration invitation only." -msgstr "Permitter le registration solmente al invitatos." - -#: actions/siteadminpanel.php:333 -msgid "Closed" -msgstr "Claudite" - -#: actions/siteadminpanel.php:335 -msgid "Disable new registrations." -msgstr "Disactivar le creation de nove contos." - -#: actions/siteadminpanel.php:341 +#: actions/siteadminpanel.php:289 msgid "Snapshots" msgstr "Instantaneos" -#: actions/siteadminpanel.php:344 +#: actions/siteadminpanel.php:292 msgid "Randomly during Web hit" msgstr "Aleatorimente durante un accesso web" -#: actions/siteadminpanel.php:345 +#: actions/siteadminpanel.php:293 msgid "In a scheduled job" msgstr "In un processo planificate" -#: actions/siteadminpanel.php:347 +#: actions/siteadminpanel.php:295 msgid "Data snapshots" msgstr "Instantaneos de datos" -#: actions/siteadminpanel.php:348 +#: actions/siteadminpanel.php:296 msgid "When to send statistical data to status.net servers" msgstr "Quando inviar datos statistic al servitores de status.net" -#: actions/siteadminpanel.php:353 +#: actions/siteadminpanel.php:301 msgid "Frequency" msgstr "Frequentia" -#: actions/siteadminpanel.php:354 +#: actions/siteadminpanel.php:302 msgid "Snapshots will be sent once every N web hits" msgstr "Un instantaneo essera inviate a cata N accessos web" -#: actions/siteadminpanel.php:359 +#: actions/siteadminpanel.php:307 msgid "Report URL" msgstr "URL pro reporto" -#: actions/siteadminpanel.php:360 +#: actions/siteadminpanel.php:308 msgid "Snapshots will be sent to this URL" msgstr "Le instantaneos essera inviate a iste URL" -#: actions/siteadminpanel.php:367 +#: actions/siteadminpanel.php:315 msgid "Limits" msgstr "Limites" -#: actions/siteadminpanel.php:370 +#: actions/siteadminpanel.php:318 msgid "Text limit" msgstr "Limite de texto" -#: actions/siteadminpanel.php:370 +#: actions/siteadminpanel.php:318 msgid "Maximum number of characters for notices." msgstr "Numero maxime de characteres pro notas." -#: actions/siteadminpanel.php:374 +#: actions/siteadminpanel.php:322 msgid "Dupe limit" msgstr "Limite de duplicatos" -#: actions/siteadminpanel.php:374 +#: actions/siteadminpanel.php:322 msgid "How long users must wait (in seconds) to post the same thing again." msgstr "" "Quante tempore (in secundas) le usatores debe attender ante de poter " "publicar le mesme cosa de novo." -#: actions/siteadminpanel.php:388 actions/useradminpanel.php:313 +#: actions/siteadminpanel.php:336 actions/useradminpanel.php:313 msgid "Save site settings" msgstr "Salveguardar configurationes del sito" @@ -3930,6 +3975,11 @@ msgstr "" msgid "SMS" msgstr "" +#: actions/tag.php:68 +#, fuzzy, php-format +msgid "Notices tagged with %1$s, page %2$d" +msgstr "Usatores auto-etiquettate con %s - pagina %d" + #: actions/tag.php:86 #, php-format msgid "Notice feed for tag %s (RSS 1.0)" @@ -4214,6 +4264,11 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "" +#: actions/usergroups.php:64 +#, fuzzy, php-format +msgid "%1$s groups, page %2$d" +msgstr "Membros del gruppo %s, pagina %d" + #: actions/usergroups.php:130 msgid "Search for more groups" msgstr "" @@ -4276,7 +4331,7 @@ msgstr "" msgid "Plugins" msgstr "" -#: actions/version.php:196 lib/action.php:741 +#: actions/version.php:196 lib/action.php:747 #, fuzzy msgid "Version" msgstr "Conversation" @@ -4334,44 +4389,48 @@ msgstr "" msgid "Could not update message with new URI." msgstr "" -#: classes/Notice.php:171 +#: classes/Notice.php:157 #, php-format msgid "DB error inserting hashtag: %s" msgstr "" -#: classes/Notice.php:225 +#: classes/Notice.php:214 msgid "Problem saving notice. Too long." msgstr "" -#: classes/Notice.php:229 +#: classes/Notice.php:218 msgid "Problem saving notice. Unknown user." msgstr "" -#: classes/Notice.php:234 +#: classes/Notice.php:223 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:240 +#: classes/Notice.php:229 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:246 +#: classes/Notice.php:235 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:305 classes/Notice.php:330 +#: classes/Notice.php:294 classes/Notice.php:319 msgid "Problem saving notice." msgstr "" -#: classes/Notice.php:1059 +#: classes/Notice.php:790 +msgid "Problem saving group inbox." +msgstr "" + +#: classes/Notice.php:850 #, php-format msgid "DB error inserting reply: %s" msgstr "" -#: classes/Notice.php:1441 +#: classes/Notice.php:1233 #, php-format msgid "RT @%1$s %2$s" msgstr "" @@ -4426,136 +4485,136 @@ msgstr "%s quitava le gruppo %s" msgid "Untitled page" msgstr "" -#: lib/action.php:427 +#: lib/action.php:433 msgid "Primary site navigation" msgstr "" -#: lib/action.php:433 +#: lib/action.php:439 msgid "Home" msgstr "" -#: lib/action.php:433 +#: lib/action.php:439 msgid "Personal profile and friends timeline" msgstr "" -#: lib/action.php:435 +#: lib/action.php:441 msgid "Change your email, avatar, password, profile" msgstr "" -#: lib/action.php:438 +#: lib/action.php:444 msgid "Connect" msgstr "" -#: lib/action.php:438 +#: lib/action.php:444 msgid "Connect to services" msgstr "" -#: lib/action.php:442 +#: lib/action.php:448 msgid "Change site configuration" msgstr "" -#: lib/action.php:446 lib/subgroupnav.php:105 +#: lib/action.php:452 lib/subgroupnav.php:105 msgid "Invite" msgstr "" -#: lib/action.php:447 lib/subgroupnav.php:106 +#: lib/action.php:453 lib/subgroupnav.php:106 #, php-format msgid "Invite friends and colleagues to join you on %s" msgstr "" -#: lib/action.php:452 +#: lib/action.php:458 msgid "Logout" msgstr "" -#: lib/action.php:452 +#: lib/action.php:458 msgid "Logout from the site" msgstr "" -#: lib/action.php:457 +#: lib/action.php:463 msgid "Create an account" msgstr "" -#: lib/action.php:460 +#: lib/action.php:466 msgid "Login to the site" msgstr "" -#: lib/action.php:463 lib/action.php:726 +#: lib/action.php:469 lib/action.php:732 msgid "Help" msgstr "" -#: lib/action.php:463 +#: lib/action.php:469 msgid "Help me!" msgstr "" -#: lib/action.php:466 lib/searchaction.php:127 +#: lib/action.php:472 lib/searchaction.php:127 msgid "Search" msgstr "" -#: lib/action.php:466 +#: lib/action.php:472 msgid "Search for people or text" msgstr "" -#: lib/action.php:487 +#: lib/action.php:493 msgid "Site notice" msgstr "" -#: lib/action.php:553 +#: lib/action.php:559 msgid "Local views" msgstr "" -#: lib/action.php:619 +#: lib/action.php:625 msgid "Page notice" msgstr "" -#: lib/action.php:721 +#: lib/action.php:727 msgid "Secondary site navigation" msgstr "" -#: lib/action.php:728 +#: lib/action.php:734 msgid "About" msgstr "" -#: lib/action.php:730 +#: lib/action.php:736 msgid "FAQ" msgstr "" -#: lib/action.php:734 +#: lib/action.php:740 msgid "TOS" msgstr "" -#: lib/action.php:737 +#: lib/action.php:743 msgid "Privacy" msgstr "" -#: lib/action.php:739 +#: lib/action.php:745 msgid "Source" msgstr "" -#: lib/action.php:743 +#: lib/action.php:749 msgid "Contact" msgstr "" -#: lib/action.php:745 +#: lib/action.php:751 msgid "Badge" msgstr "" -#: lib/action.php:773 +#: lib/action.php:779 msgid "StatusNet software license" msgstr "" -#: lib/action.php:776 +#: lib/action.php:782 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." "broughtby%%](%%site.broughtbyurl%%). " msgstr "" -#: lib/action.php:778 +#: lib/action.php:784 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "" -#: lib/action.php:780 +#: lib/action.php:786 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4563,41 +4622,41 @@ msgid "" "org/licensing/licenses/agpl-3.0.html)." msgstr "" -#: lib/action.php:795 +#: lib/action.php:801 msgid "Site content license" msgstr "" -#: lib/action.php:800 +#: lib/action.php:806 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "" -#: lib/action.php:805 +#: lib/action.php:811 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" -#: lib/action.php:808 +#: lib/action.php:814 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" -#: lib/action.php:820 +#: lib/action.php:826 msgid "All " msgstr "" -#: lib/action.php:825 +#: lib/action.php:831 msgid "license." msgstr "" -#: lib/action.php:1124 +#: lib/action.php:1130 msgid "Pagination" msgstr "" -#: lib/action.php:1133 +#: lib/action.php:1139 msgid "After" msgstr "" -#: lib/action.php:1141 +#: lib/action.php:1147 msgid "Before" msgstr "" @@ -4630,10 +4689,23 @@ msgstr "" msgid "Design configuration" msgstr "" -#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327 +#: lib/adminpanelaction.php:322 +#, fuzzy +msgid "User configuration" +msgstr "Nulle codice de confirmation." + +#: lib/adminpanelaction.php:327 +msgid "Access configuration" +msgstr "" + +#: lib/adminpanelaction.php:332 msgid "Paths configuration" msgstr "" +#: lib/applicationeditform.php:136 +msgid "Edit application" +msgstr "" + #: lib/applicationeditform.php:186 msgid "Icon for this application" msgstr "" @@ -5206,12 +5278,12 @@ msgstr "" msgid "kB" msgstr "" -#: lib/jabber.php:202 +#: lib/jabber.php:220 #, php-format msgid "[%s]" msgstr "" -#: lib/jabber.php:385 +#: lib/jabber.php:400 #, fuzzy, php-format msgid "Unknown inbox source %d." msgstr "Lingua \"%s\" incognite" @@ -5623,19 +5695,19 @@ msgstr "" msgid "Favorites" msgstr "" -#: lib/personalgroupnav.php:124 +#: lib/personalgroupnav.php:125 msgid "Inbox" msgstr "" -#: lib/personalgroupnav.php:125 +#: lib/personalgroupnav.php:126 msgid "Your incoming messages" msgstr "" -#: lib/personalgroupnav.php:129 +#: lib/personalgroupnav.php:130 msgid "Outbox" msgstr "" -#: lib/personalgroupnav.php:130 +#: lib/personalgroupnav.php:131 msgid "Your sent messages" msgstr "" @@ -5879,47 +5951,47 @@ msgstr "" msgid "Moderate" msgstr "" -#: lib/util.php:875 +#: lib/util.php:868 msgid "a few seconds ago" msgstr "" -#: lib/util.php:877 +#: lib/util.php:870 msgid "about a minute ago" msgstr "" -#: lib/util.php:879 +#: lib/util.php:872 #, php-format msgid "about %d minutes ago" msgstr "" -#: lib/util.php:881 +#: lib/util.php:874 msgid "about an hour ago" msgstr "" -#: lib/util.php:883 +#: lib/util.php:876 #, php-format msgid "about %d hours ago" msgstr "" -#: lib/util.php:885 +#: lib/util.php:878 msgid "about a day ago" msgstr "" -#: lib/util.php:887 +#: lib/util.php:880 #, php-format msgid "about %d days ago" msgstr "" -#: lib/util.php:889 +#: lib/util.php:882 msgid "about a month ago" msgstr "" -#: lib/util.php:891 +#: lib/util.php:884 #, php-format msgid "about %d months ago" msgstr "" -#: lib/util.php:893 +#: lib/util.php:886 msgid "about a year ago" msgstr "" @@ -5933,7 +6005,7 @@ msgstr "" msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "" -#: scripts/xmppdaemon.php:301 +#: lib/xmppmanager.php:402 #, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" diff --git a/locale/is/LC_MESSAGES/statusnet.po b/locale/is/LC_MESSAGES/statusnet.po index a12227a706..3db7dbdf07 100644 --- a/locale/is/LC_MESSAGES/statusnet.po +++ b/locale/is/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-21 22:36+0000\n" -"PO-Revision-Date: 2010-01-21 22:37:50+0000\n" +"POT-Creation-Date: 2010-01-27 23:58+0000\n" +"PO-Revision-Date: 2010-01-27 23:59:09+0000\n" "Language-Team: Icelandic\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r61339); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61595); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: is\n" "X-Message-Group: out-statusnet\n" @@ -21,6 +21,63 @@ msgstr "" "= 31 && n % 100 != 41 && n % 100 != 51 && n % 100 != 61 && n % 100 != 71 && " "n % 100 != 81 && n % 100 != 91);\n" +#: actions/accessadminpanel.php:54 lib/adminpanelaction.php:326 +#, fuzzy +msgid "Access" +msgstr "Samþykkja" + +#: actions/accessadminpanel.php:65 +#, fuzzy +msgid "Site access settings" +msgstr "Stillingar fyrir mynd" + +#: actions/accessadminpanel.php:158 +#, fuzzy +msgid "Registration" +msgstr "Nýskrá" + +#: actions/accessadminpanel.php:161 +#, fuzzy +msgid "Private" +msgstr "Friðhelgi" + +#: actions/accessadminpanel.php:163 +msgid "Prohibit anonymous users (not logged in) from viewing site?" +msgstr "" + +#: actions/accessadminpanel.php:167 +#, fuzzy +msgid "Invite only" +msgstr "Bjóða" + +#: actions/accessadminpanel.php:169 +msgid "Make registration invitation only." +msgstr "" + +#: actions/accessadminpanel.php:173 +msgid "Closed" +msgstr "" + +#: actions/accessadminpanel.php:175 +msgid "Disable new registrations." +msgstr "" + +#: actions/accessadminpanel.php:189 actions/designadminpanel.php:586 +#: actions/emailsettings.php:195 actions/imsettings.php:163 +#: actions/othersettings.php:126 actions/pathsadminpanel.php:351 +#: actions/profilesettings.php:174 actions/siteadminpanel.php:336 +#: actions/smssettings.php:181 actions/subscriptions.php:203 +#: actions/tagother.php:154 actions/useradminpanel.php:313 +#: lib/applicationeditform.php:335 lib/applicationeditform.php:336 +#: lib/designsettings.php:256 lib/groupeditform.php:202 +msgid "Save" +msgstr "Vista" + +#: actions/accessadminpanel.php:189 +#, fuzzy +msgid "Save access settings" +msgstr "Stillingar fyrir mynd" + #: actions/all.php:63 actions/public.php:97 actions/replies.php:92 #: actions/showfavorites.php:137 actions/tag.php:51 #, fuzzy @@ -36,7 +93,7 @@ msgstr "Ekkert þannig merki." #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:149 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 @@ -135,8 +192,7 @@ msgstr "Færslur frá %1$s og vinum á %2$s!" #: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 #: actions/apitimelinefriends.php:155 actions/apitimelinegroup.php:150 #: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 -#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 #, fuzzy @@ -153,7 +209,7 @@ msgstr "Aðferð í forritsskilum fannst ekki!" #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:119 +#: actions/apistatusesupdate.php:118 msgid "This method requires a POST." msgstr "Þessi aðferð krefst POST." @@ -184,7 +240,7 @@ msgstr "Gat ekki vistað persónulega síðu." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:132 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 #: actions/designadminpanel.php:122 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -493,7 +549,14 @@ msgstr "" msgid "Allow or deny access" msgstr "" -#: actions/apioauthauthorize.php:320 lib/action.php:435 +#: actions/apioauthauthorize.php:306 +#, php-format +msgid "" +"The application %s by %s would like the " +"ability to %s your account data." +msgstr "" + +#: actions/apioauthauthorize.php:320 lib/action.php:441 msgid "Account" msgstr "Aðgangur" @@ -553,17 +616,17 @@ msgstr "" msgid "No status with that ID found." msgstr "Engin staða með þessu kenni fannst." -#: actions/apistatusesupdate.php:162 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Þetta er of langt. Hámarkslengd babls er 140 tákn." -#: actions/apistatusesupdate.php:203 +#: actions/apistatusesupdate.php:202 msgid "Not found" msgstr "Fannst ekki" -#: actions/apistatusesupdate.php:226 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -615,11 +678,6 @@ msgstr "Almenningsrás %s" msgid "%s updates from everyone!" msgstr "%s færslur frá öllum!" -#: actions/apitimelineretweetedbyme.php:112 -#, php-format -msgid "Repeated by %s" -msgstr "" - #: actions/apitimelineretweetedtome.php:111 #, fuzzy, php-format msgid "Repeated to %s" @@ -1034,17 +1092,6 @@ msgstr "" msgid "Reset back to default" msgstr "" -#: actions/designadminpanel.php:586 actions/emailsettings.php:195 -#: actions/imsettings.php:163 actions/othersettings.php:126 -#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174 -#: actions/siteadminpanel.php:388 actions/smssettings.php:181 -#: actions/subscriptions.php:203 actions/tagother.php:154 -#: actions/useradminpanel.php:313 lib/applicationeditform.php:335 -#: lib/applicationeditform.php:336 lib/designsettings.php:256 -#: lib/groupeditform.php:202 -msgid "Save" -msgstr "Vista" - #: actions/designadminpanel.php:587 lib/designsettings.php:257 msgid "Save design" msgstr "" @@ -1057,13 +1104,15 @@ msgstr "Þetta babl er ekki í uppáhaldi!" msgid "Add to favorites" msgstr "Bæta við sem uppáhaldsbabli" -#: actions/doc.php:69 -msgid "No such document." +#: actions/doc.php:155 +#, fuzzy, php-format +msgid "No such document \"%s\"" msgstr "Ekkert svoleiðis skjal." -#: actions/editapplication.php:54 lib/applicationeditform.php:136 -msgid "Edit application" -msgstr "" +#: actions/editapplication.php:54 +#, fuzzy +msgid "Edit Application" +msgstr "Aðrir valkostir" #: actions/editapplication.php:66 #, fuzzy @@ -1082,7 +1131,7 @@ msgid "No such application." msgstr "Ekkert svoleiðis babl." #: actions/editapplication.php:127 actions/newapplication.php:110 -#: actions/showapplication.php:118 lib/action.php:1189 +#: actions/showapplication.php:118 lib/action.php:1195 msgid "There was a problem with your session token." msgstr "Það komu upp vandamál varðandi setutókann þinn." @@ -1293,7 +1342,7 @@ msgid "Cannot normalize that email address" msgstr "Get ekki staðlað þetta tölvupóstfang" #: actions/emailsettings.php:331 actions/register.php:201 -#: actions/siteadminpanel.php:157 +#: actions/siteadminpanel.php:143 msgid "Not a valid email address." msgstr "Ekki tækt tölvupóstfang." @@ -1305,7 +1354,7 @@ msgstr "Þetta er nú þegar tölvupóstfangið þitt." msgid "That email address already belongs to another user." msgstr "Þetta tölvupóstfang tilheyrir öðrum notanda." -#: actions/emailsettings.php:353 actions/imsettings.php:317 +#: actions/emailsettings.php:353 actions/imsettings.php:319 #: actions/smssettings.php:337 msgid "Couldn't insert confirmation code." msgstr "Gat ekki sett inn staðfestingarlykil." @@ -1611,7 +1660,7 @@ msgstr "Hópmeðlimir %s, síða %d" msgid "A list of the users in this group." msgstr "Listi yfir notendur í þessum hóp." -#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107 +#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107 msgid "Admin" msgstr "Stjórnandi" @@ -1801,6 +1850,11 @@ msgstr "" msgid "That is not your Jabber ID." msgstr "Þetta er ekki Jabber-kennið þitt." +#: actions/inbox.php:59 +#, fuzzy, php-format +msgid "Inbox for %1$s - page %2$d" +msgstr "Innhólf %s" + #: actions/inbox.php:62 #, php-format msgid "Inbox for %s" @@ -1984,7 +2038,7 @@ msgstr "Rangt notendanafn eða lykilorð." msgid "Error setting user. You are probably not authorized." msgstr "Engin heimild." -#: actions/login.php:188 actions/login.php:241 lib/action.php:460 +#: actions/login.php:188 actions/login.php:241 lib/action.php:466 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Innskráning" @@ -2049,8 +2103,9 @@ msgid "No current status" msgstr "Engin núverandi staða" #: actions/newapplication.php:52 -msgid "New application" -msgstr "" +#, fuzzy +msgid "New Application" +msgstr "Ekkert svoleiðis babl." #: actions/newapplication.php:64 #, fuzzy @@ -2243,8 +2298,8 @@ msgstr "" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1038 -#: lib/api.php:1066 lib/api.php:1176 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1039 +#: lib/api.php:1067 lib/api.php:1177 msgid "Not a supported data format." msgstr "Enginn stuðningur við gagnasnið." @@ -2315,6 +2370,11 @@ msgstr "Ótækt bablinnihald" msgid "Login token expired." msgstr "Skrá þig inn á síðuna" +#: actions/outbox.php:58 +#, fuzzy, php-format +msgid "Outbox for %1$s - page %2$d" +msgstr "Úthólf %s" + #: actions/outbox.php:61 #, php-format msgid "Outbox for %s" @@ -2386,7 +2446,7 @@ msgstr "Get ekki vistað nýja lykilorðið." msgid "Password saved." msgstr "Lykilorð vistað." -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:331 msgid "Paths" msgstr "" @@ -2394,141 +2454,158 @@ msgstr "" msgid "Path and server settings for this StatusNet site." msgstr "" -#: actions/pathsadminpanel.php:140 +#: actions/pathsadminpanel.php:157 #, fuzzy, php-format msgid "Theme directory not readable: %s" msgstr "Þessi síða er ekki aðgengileg í " -#: actions/pathsadminpanel.php:146 +#: actions/pathsadminpanel.php:163 #, php-format msgid "Avatar directory not writable: %s" msgstr "" -#: actions/pathsadminpanel.php:152 +#: actions/pathsadminpanel.php:169 #, php-format msgid "Background directory not writable: %s" msgstr "" -#: actions/pathsadminpanel.php:160 +#: actions/pathsadminpanel.php:177 #, php-format msgid "Locales directory not readable: %s" msgstr "" -#: actions/pathsadminpanel.php:166 +#: actions/pathsadminpanel.php:183 msgid "Invalid SSL server. The maximum length is 255 characters." msgstr "" -#: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58 +#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58 #: lib/adminpanelaction.php:311 #, fuzzy msgid "Site" msgstr "Bjóða" -#: actions/pathsadminpanel.php:221 +#: actions/pathsadminpanel.php:238 +#, fuzzy +msgid "Server" +msgstr "Endurheimta" + +#: actions/pathsadminpanel.php:238 +msgid "Site's server hostname." +msgstr "" + +#: actions/pathsadminpanel.php:242 msgid "Path" msgstr "" -#: actions/pathsadminpanel.php:221 +#: actions/pathsadminpanel.php:242 #, fuzzy msgid "Site path" msgstr "Babl vefsíðunnar" -#: actions/pathsadminpanel.php:225 +#: actions/pathsadminpanel.php:246 msgid "Path to locales" msgstr "" -#: actions/pathsadminpanel.php:225 +#: actions/pathsadminpanel.php:246 msgid "Directory path to locales" msgstr "" -#: actions/pathsadminpanel.php:232 -msgid "Theme" -msgstr "" - -#: actions/pathsadminpanel.php:237 -msgid "Theme server" -msgstr "" - -#: actions/pathsadminpanel.php:241 -msgid "Theme path" -msgstr "" - -#: actions/pathsadminpanel.php:245 -msgid "Theme directory" +#: actions/pathsadminpanel.php:250 +msgid "Fancy URLs" msgstr "" #: actions/pathsadminpanel.php:252 +msgid "Use fancy (more readable and memorable) URLs?" +msgstr "" + +#: actions/pathsadminpanel.php:259 +msgid "Theme" +msgstr "" + +#: actions/pathsadminpanel.php:264 +msgid "Theme server" +msgstr "" + +#: actions/pathsadminpanel.php:268 +msgid "Theme path" +msgstr "" + +#: actions/pathsadminpanel.php:272 +msgid "Theme directory" +msgstr "" + +#: actions/pathsadminpanel.php:279 #, fuzzy msgid "Avatars" msgstr "Mynd" -#: actions/pathsadminpanel.php:257 +#: actions/pathsadminpanel.php:284 #, fuzzy msgid "Avatar server" msgstr "Stillingar fyrir mynd" -#: actions/pathsadminpanel.php:261 +#: actions/pathsadminpanel.php:288 #, fuzzy msgid "Avatar path" msgstr "Mynd hefur verið uppfærð." -#: actions/pathsadminpanel.php:265 +#: actions/pathsadminpanel.php:292 msgid "Avatar directory" msgstr "" -#: actions/pathsadminpanel.php:274 +#: actions/pathsadminpanel.php:301 msgid "Backgrounds" msgstr "" -#: actions/pathsadminpanel.php:278 +#: actions/pathsadminpanel.php:305 msgid "Background server" msgstr "" -#: actions/pathsadminpanel.php:282 +#: actions/pathsadminpanel.php:309 msgid "Background path" msgstr "" -#: actions/pathsadminpanel.php:286 +#: actions/pathsadminpanel.php:313 msgid "Background directory" msgstr "" -#: actions/pathsadminpanel.php:293 +#: actions/pathsadminpanel.php:320 #, fuzzy msgid "SSL" msgstr "SMS" -#: actions/pathsadminpanel.php:296 actions/siteadminpanel.php:346 +#: actions/pathsadminpanel.php:323 actions/siteadminpanel.php:294 #, fuzzy msgid "Never" msgstr "Endurheimta" -#: actions/pathsadminpanel.php:297 +#: actions/pathsadminpanel.php:324 #, fuzzy msgid "Sometimes" msgstr "Babl" -#: actions/pathsadminpanel.php:298 +#: actions/pathsadminpanel.php:325 msgid "Always" msgstr "" -#: actions/pathsadminpanel.php:302 +#: actions/pathsadminpanel.php:329 msgid "Use SSL" msgstr "" -#: actions/pathsadminpanel.php:303 +#: actions/pathsadminpanel.php:330 msgid "When to use SSL" msgstr "" -#: actions/pathsadminpanel.php:308 +#: actions/pathsadminpanel.php:335 #, fuzzy msgid "SSL server" msgstr "Endurheimta" -#: actions/pathsadminpanel.php:309 +#: actions/pathsadminpanel.php:336 msgid "Server to direct SSL requests to" msgstr "" -#: actions/pathsadminpanel.php:325 +#: actions/pathsadminpanel.php:352 #, fuzzy msgid "Save paths" msgstr "Babl vefsíðunnar" @@ -2643,7 +2720,7 @@ msgstr "" "Merki fyrir þig (bókstafir, tölustafir, -, ., og _), aðskilin með kommu eða " "bili" -#: actions/profilesettings.php:151 actions/siteadminpanel.php:294 +#: actions/profilesettings.php:151 actions/siteadminpanel.php:280 msgid "Language" msgstr "Tungumál" @@ -2671,7 +2748,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:235 actions/siteadminpanel.php:164 +#: actions/profilesettings.php:235 actions/siteadminpanel.php:150 msgid "Timezone not selected." msgstr "Tímabelti ekki valið." @@ -2934,7 +3011,7 @@ msgstr "" msgid "Registration successful" msgstr "Nýskráning tókst" -#: actions/register.php:114 actions/register.php:503 lib/action.php:457 +#: actions/register.php:114 actions/register.php:503 lib/action.php:463 #: lib/logingroupnav.php:85 msgid "Register" msgstr "Nýskrá" @@ -2975,7 +3052,7 @@ msgid "Same as password above. Required." msgstr "Sama og lykilorðið hér fyrir ofan. Nauðsynlegt." #: actions/register.php:438 actions/register.php:442 -#: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120 +#: actions/siteadminpanel.php:256 lib/accountsettingsaction.php:120 msgid "Email" msgstr "Tölvupóstur" @@ -3140,6 +3217,11 @@ msgstr "" msgid "Replies to %s" msgstr "Svör við %s" +#: actions/replies.php:127 +#, fuzzy, php-format +msgid "Replies to %1$s, page %2$d" +msgstr "Skilaboð til %1$s á %2$s" + #: actions/replies.php:144 #, php-format msgid "Replies feed for %s (RSS 1.0)" @@ -3268,6 +3350,11 @@ msgid "" "signature method." msgstr "" +#: actions/showfavorites.php:79 +#, fuzzy, php-format +msgid "%1$s's favorite notices, page %2$d" +msgstr "Uppáhaldsbabl %s" + #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "Gat ekki sótt uppáhaldsbabl." @@ -3317,6 +3404,11 @@ msgstr "" msgid "%s group" msgstr "%s hópurinn" +#: actions/showgroup.php:84 +#, fuzzy, php-format +msgid "%1$s group, page %2$d" +msgstr "Hópmeðlimir %s, síða %d" + #: actions/showgroup.php:218 msgid "Group profile" msgstr "Hópssíðan" @@ -3428,6 +3520,11 @@ msgstr "Babl sent inn" msgid " tagged %s" msgstr "" +#: actions/showstream.php:79 +#, fuzzy, php-format +msgid "%1$s, page %2$d" +msgstr "%s og vinirnir, síða %d" + #: actions/showstream.php:122 #, fuzzy, php-format msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" @@ -3506,202 +3603,149 @@ msgstr "" msgid "Basic settings for this StatusNet site." msgstr "" -#: actions/siteadminpanel.php:146 +#: actions/siteadminpanel.php:132 msgid "Site name must have non-zero length." msgstr "" -#: actions/siteadminpanel.php:154 +#: actions/siteadminpanel.php:140 #, fuzzy msgid "You must have a valid contact email address." msgstr "Ekki tækt tölvupóstfang" -#: actions/siteadminpanel.php:172 +#: actions/siteadminpanel.php:158 #, php-format msgid "Unknown language \"%s\"." msgstr "" -#: actions/siteadminpanel.php:179 +#: actions/siteadminpanel.php:165 msgid "Invalid snapshot report URL." msgstr "" -#: actions/siteadminpanel.php:185 +#: actions/siteadminpanel.php:171 msgid "Invalid snapshot run value." msgstr "" -#: actions/siteadminpanel.php:191 +#: actions/siteadminpanel.php:177 msgid "Snapshot frequency must be a number." msgstr "" -#: actions/siteadminpanel.php:197 +#: actions/siteadminpanel.php:183 msgid "Minimum text limit is 140 characters." msgstr "" -#: actions/siteadminpanel.php:203 +#: actions/siteadminpanel.php:189 msgid "Dupe limit must 1 or more seconds." msgstr "" -#: actions/siteadminpanel.php:253 +#: actions/siteadminpanel.php:239 msgid "General" msgstr "" -#: actions/siteadminpanel.php:256 +#: actions/siteadminpanel.php:242 #, fuzzy msgid "Site name" msgstr "Babl vefsíðunnar" -#: actions/siteadminpanel.php:257 +#: actions/siteadminpanel.php:243 msgid "The name of your site, like \"Yourcompany Microblog\"" msgstr "" -#: actions/siteadminpanel.php:261 +#: actions/siteadminpanel.php:247 msgid "Brought by" msgstr "" -#: actions/siteadminpanel.php:262 +#: actions/siteadminpanel.php:248 msgid "Text used for credits link in footer of each page" msgstr "" -#: actions/siteadminpanel.php:266 +#: actions/siteadminpanel.php:252 msgid "Brought by URL" msgstr "" -#: actions/siteadminpanel.php:267 +#: actions/siteadminpanel.php:253 msgid "URL used for credits link in footer of each page" msgstr "" -#: actions/siteadminpanel.php:271 +#: actions/siteadminpanel.php:257 #, fuzzy msgid "Contact email address for your site" msgstr "Nýtt tölvupóstfang til að senda á %s" -#: actions/siteadminpanel.php:277 +#: actions/siteadminpanel.php:263 #, fuzzy msgid "Local" msgstr "Staðbundin sýn" -#: actions/siteadminpanel.php:288 +#: actions/siteadminpanel.php:274 msgid "Default timezone" msgstr "" -#: actions/siteadminpanel.php:289 +#: actions/siteadminpanel.php:275 msgid "Default timezone for the site; usually UTC." msgstr "" -#: actions/siteadminpanel.php:295 +#: actions/siteadminpanel.php:281 #, fuzzy msgid "Default site language" msgstr "Tungumál (ákjósanlegt)" -#: actions/siteadminpanel.php:303 -#, fuzzy -msgid "URLs" -msgstr "Vefslóð" - -#: actions/siteadminpanel.php:306 -#, fuzzy -msgid "Server" -msgstr "Endurheimta" - -#: actions/siteadminpanel.php:306 -msgid "Site's server hostname." -msgstr "" - -#: actions/siteadminpanel.php:310 -msgid "Fancy URLs" -msgstr "" - -#: actions/siteadminpanel.php:312 -msgid "Use fancy (more readable and memorable) URLs?" -msgstr "" - -#: actions/siteadminpanel.php:318 -#, fuzzy -msgid "Access" -msgstr "Samþykkja" - -#: actions/siteadminpanel.php:321 -#, fuzzy -msgid "Private" -msgstr "Friðhelgi" - -#: actions/siteadminpanel.php:323 -msgid "Prohibit anonymous users (not logged in) from viewing site?" -msgstr "" - -#: actions/siteadminpanel.php:327 -#, fuzzy -msgid "Invite only" -msgstr "Bjóða" - -#: actions/siteadminpanel.php:329 -msgid "Make registration invitation only." -msgstr "" - -#: actions/siteadminpanel.php:333 -msgid "Closed" -msgstr "" - -#: actions/siteadminpanel.php:335 -msgid "Disable new registrations." -msgstr "" - -#: actions/siteadminpanel.php:341 +#: actions/siteadminpanel.php:289 msgid "Snapshots" msgstr "" -#: actions/siteadminpanel.php:344 +#: actions/siteadminpanel.php:292 msgid "Randomly during Web hit" msgstr "" -#: actions/siteadminpanel.php:345 +#: actions/siteadminpanel.php:293 msgid "In a scheduled job" msgstr "" -#: actions/siteadminpanel.php:347 +#: actions/siteadminpanel.php:295 msgid "Data snapshots" msgstr "" -#: actions/siteadminpanel.php:348 +#: actions/siteadminpanel.php:296 msgid "When to send statistical data to status.net servers" msgstr "" -#: actions/siteadminpanel.php:353 +#: actions/siteadminpanel.php:301 msgid "Frequency" msgstr "" -#: actions/siteadminpanel.php:354 +#: actions/siteadminpanel.php:302 msgid "Snapshots will be sent once every N web hits" msgstr "" -#: actions/siteadminpanel.php:359 +#: actions/siteadminpanel.php:307 msgid "Report URL" msgstr "" -#: actions/siteadminpanel.php:360 +#: actions/siteadminpanel.php:308 msgid "Snapshots will be sent to this URL" msgstr "" -#: actions/siteadminpanel.php:367 +#: actions/siteadminpanel.php:315 msgid "Limits" msgstr "" -#: actions/siteadminpanel.php:370 +#: actions/siteadminpanel.php:318 msgid "Text limit" msgstr "" -#: actions/siteadminpanel.php:370 +#: actions/siteadminpanel.php:318 msgid "Maximum number of characters for notices." msgstr "" -#: actions/siteadminpanel.php:374 +#: actions/siteadminpanel.php:322 msgid "Dupe limit" msgstr "" -#: actions/siteadminpanel.php:374 +#: actions/siteadminpanel.php:322 msgid "How long users must wait (in seconds) to post the same thing again." msgstr "" -#: actions/siteadminpanel.php:388 actions/useradminpanel.php:313 +#: actions/siteadminpanel.php:336 actions/useradminpanel.php:313 #, fuzzy msgid "Save site settings" msgstr "Stillingar fyrir mynd" @@ -3901,6 +3945,11 @@ msgstr "Jabber snarskilaboðaþjónusta" msgid "SMS" msgstr "SMS" +#: actions/tag.php:68 +#, fuzzy, php-format +msgid "Notices tagged with %1$s, page %2$d" +msgstr "Notendur sjálfmerktir með %s - síða %d" + #: actions/tag.php:86 #, php-format msgid "Notice feed for tag %s (RSS 1.0)" @@ -4212,6 +4261,11 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "" +#: actions/usergroups.php:64 +#, fuzzy, php-format +msgid "%1$s groups, page %2$d" +msgstr "Hópmeðlimir %s, síða %d" + #: actions/usergroups.php:130 msgid "Search for more groups" msgstr "" @@ -4274,7 +4328,7 @@ msgstr "" msgid "Plugins" msgstr "" -#: actions/version.php:196 lib/action.php:741 +#: actions/version.php:196 lib/action.php:747 #, fuzzy msgid "Version" msgstr "Persónulegt" @@ -4333,46 +4387,51 @@ msgstr "Gat ekki skeytt skilaboðum inn í." msgid "Could not update message with new URI." msgstr "Gat ekki uppfært skilaboð með nýju veffangi." -#: classes/Notice.php:171 +#: classes/Notice.php:157 #, php-format msgid "DB error inserting hashtag: %s" msgstr "Gagnagrunnsvilla við innsetningu myllumerkis: %s" -#: classes/Notice.php:225 +#: classes/Notice.php:214 msgid "Problem saving notice. Too long." msgstr "" -#: classes/Notice.php:229 +#: classes/Notice.php:218 msgid "Problem saving notice. Unknown user." msgstr "Gat ekki vistað babl. Óþekktur notandi." -#: classes/Notice.php:234 +#: classes/Notice.php:223 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Of mikið babl í einu; slakaðu aðeins á og haltu svo áfram eftir nokkrar " "mínútur." -#: classes/Notice.php:240 +#: classes/Notice.php:229 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:246 +#: classes/Notice.php:235 msgid "You are banned from posting notices on this site." msgstr "Það hefur verið lagt bann við babli frá þér á þessari síðu." -#: classes/Notice.php:305 classes/Notice.php:330 +#: classes/Notice.php:294 classes/Notice.php:319 msgid "Problem saving notice." msgstr "Vandamál komu upp við að vista babl." -#: classes/Notice.php:1059 +#: classes/Notice.php:790 +#, fuzzy +msgid "Problem saving group inbox." +msgstr "Vandamál komu upp við að vista babl." + +#: classes/Notice.php:850 #, php-format msgid "DB error inserting reply: %s" msgstr "Gagnagrunnsvilla við innsetningu svars: %s" -#: classes/Notice.php:1441 +#: classes/Notice.php:1233 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" @@ -4427,128 +4486,128 @@ msgstr "%1$s (%2$s)" msgid "Untitled page" msgstr "Ónafngreind síða" -#: lib/action.php:427 +#: lib/action.php:433 msgid "Primary site navigation" msgstr "Stikl aðalsíðu" -#: lib/action.php:433 +#: lib/action.php:439 msgid "Home" msgstr "Heim" -#: lib/action.php:433 +#: lib/action.php:439 msgid "Personal profile and friends timeline" msgstr "Persónuleg síða og vinarás" -#: lib/action.php:435 +#: lib/action.php:441 msgid "Change your email, avatar, password, profile" msgstr "" "Breyttu tölvupóstinum þínum, einkennismyndinni þinni, lykilorðinu þínu, " "persónulegu síðunni þinni" -#: lib/action.php:438 +#: lib/action.php:444 msgid "Connect" msgstr "Tengjast" -#: lib/action.php:438 +#: lib/action.php:444 #, fuzzy msgid "Connect to services" msgstr "Gat ekki framsent til vefþjóns: %s" -#: lib/action.php:442 +#: lib/action.php:448 #, fuzzy msgid "Change site configuration" msgstr "Stikl aðalsíðu" -#: lib/action.php:446 lib/subgroupnav.php:105 +#: lib/action.php:452 lib/subgroupnav.php:105 msgid "Invite" msgstr "Bjóða" -#: lib/action.php:447 lib/subgroupnav.php:106 +#: lib/action.php:453 lib/subgroupnav.php:106 #, php-format msgid "Invite friends and colleagues to join you on %s" msgstr "Bjóða vinum og vandamönnum að slást í hópinn á %s" -#: lib/action.php:452 +#: lib/action.php:458 msgid "Logout" msgstr "Útskráning" -#: lib/action.php:452 +#: lib/action.php:458 msgid "Logout from the site" msgstr "Skrá þig út af síðunni" -#: lib/action.php:457 +#: lib/action.php:463 msgid "Create an account" msgstr "Búa til aðgang" -#: lib/action.php:460 +#: lib/action.php:466 msgid "Login to the site" msgstr "Skrá þig inn á síðuna" -#: lib/action.php:463 lib/action.php:726 +#: lib/action.php:469 lib/action.php:732 msgid "Help" msgstr "Hjálp" -#: lib/action.php:463 +#: lib/action.php:469 msgid "Help me!" msgstr "Hjálp!" -#: lib/action.php:466 lib/searchaction.php:127 +#: lib/action.php:472 lib/searchaction.php:127 msgid "Search" msgstr "Leita" -#: lib/action.php:466 +#: lib/action.php:472 msgid "Search for people or text" msgstr "Leita að fólki eða texta" -#: lib/action.php:487 +#: lib/action.php:493 msgid "Site notice" msgstr "Babl vefsíðunnar" -#: lib/action.php:553 +#: lib/action.php:559 msgid "Local views" msgstr "Staðbundin sýn" -#: lib/action.php:619 +#: lib/action.php:625 msgid "Page notice" msgstr "Babl síðunnar" -#: lib/action.php:721 +#: lib/action.php:727 msgid "Secondary site navigation" msgstr "Stikl undirsíðu" -#: lib/action.php:728 +#: lib/action.php:734 msgid "About" msgstr "Um" -#: lib/action.php:730 +#: lib/action.php:736 msgid "FAQ" msgstr "Spurt og svarað" -#: lib/action.php:734 +#: lib/action.php:740 msgid "TOS" msgstr "" -#: lib/action.php:737 +#: lib/action.php:743 msgid "Privacy" msgstr "Friðhelgi" -#: lib/action.php:739 +#: lib/action.php:745 msgid "Source" msgstr "Frumþula" -#: lib/action.php:743 +#: lib/action.php:749 msgid "Contact" msgstr "Tengiliður" -#: lib/action.php:745 +#: lib/action.php:751 msgid "Badge" msgstr "" -#: lib/action.php:773 +#: lib/action.php:779 msgid "StatusNet software license" msgstr "Hugbúnaðarleyfi StatusNet" -#: lib/action.php:776 +#: lib/action.php:782 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -4557,12 +4616,12 @@ msgstr "" "**%%site.name%%** er örbloggsþjónusta í boði [%%site.broughtby%%](%%site." "broughtbyurl%%). " -#: lib/action.php:778 +#: lib/action.php:784 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "**%%site.name%%** er örbloggsþjónusta." -#: lib/action.php:780 +#: lib/action.php:786 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4573,42 +4632,42 @@ msgstr "" "sem er gefinn út undir [GNU Affero almenningsleyfinu](http://www.fsf.org/" "licensing/licenses/agpl-3.0.html)." -#: lib/action.php:795 +#: lib/action.php:801 #, fuzzy msgid "Site content license" msgstr "Hugbúnaðarleyfi StatusNet" -#: lib/action.php:800 +#: lib/action.php:806 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "" -#: lib/action.php:805 +#: lib/action.php:811 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" -#: lib/action.php:808 +#: lib/action.php:814 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" -#: lib/action.php:820 +#: lib/action.php:826 msgid "All " msgstr "Allt " -#: lib/action.php:825 +#: lib/action.php:831 msgid "license." msgstr "leyfi." -#: lib/action.php:1124 +#: lib/action.php:1130 msgid "Pagination" msgstr "Uppröðun" -#: lib/action.php:1133 +#: lib/action.php:1139 msgid "After" msgstr "Eftir" -#: lib/action.php:1141 +#: lib/action.php:1147 msgid "Before" msgstr "Áður" @@ -4646,11 +4705,25 @@ msgstr "Staðfesting tölvupóstfangs" msgid "Design configuration" msgstr "SMS staðfesting" -#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327 +#: lib/adminpanelaction.php:322 +#, fuzzy +msgid "User configuration" +msgstr "SMS staðfesting" + +#: lib/adminpanelaction.php:327 +#, fuzzy +msgid "Access configuration" +msgstr "SMS staðfesting" + +#: lib/adminpanelaction.php:332 #, fuzzy msgid "Paths configuration" msgstr "SMS staðfesting" +#: lib/applicationeditform.php:136 +msgid "Edit application" +msgstr "" + #: lib/applicationeditform.php:186 msgid "Icon for this application" msgstr "" @@ -5238,12 +5311,12 @@ msgstr "" msgid "kB" msgstr "" -#: lib/jabber.php:202 +#: lib/jabber.php:220 #, php-format msgid "[%s]" msgstr "" -#: lib/jabber.php:385 +#: lib/jabber.php:400 #, php-format msgid "Unknown inbox source %d." msgstr "" @@ -5670,19 +5743,19 @@ msgstr "Svör" msgid "Favorites" msgstr "Uppáhald" -#: lib/personalgroupnav.php:124 +#: lib/personalgroupnav.php:125 msgid "Inbox" msgstr "Innhólf" -#: lib/personalgroupnav.php:125 +#: lib/personalgroupnav.php:126 msgid "Your incoming messages" msgstr "Mótteknu skilaboðin þín" -#: lib/personalgroupnav.php:129 +#: lib/personalgroupnav.php:130 msgid "Outbox" msgstr "Úthólf" -#: lib/personalgroupnav.php:130 +#: lib/personalgroupnav.php:131 msgid "Your sent messages" msgstr "Skilaboð sem þú hefur sent" @@ -5936,47 +6009,47 @@ msgstr "Skilaboð" msgid "Moderate" msgstr "" -#: lib/util.php:875 +#: lib/util.php:868 msgid "a few seconds ago" msgstr "fyrir nokkrum sekúndum" -#: lib/util.php:877 +#: lib/util.php:870 msgid "about a minute ago" msgstr "fyrir um einni mínútu síðan" -#: lib/util.php:879 +#: lib/util.php:872 #, php-format msgid "about %d minutes ago" msgstr "fyrir um %d mínútum síðan" -#: lib/util.php:881 +#: lib/util.php:874 msgid "about an hour ago" msgstr "fyrir um einum klukkutíma síðan" -#: lib/util.php:883 +#: lib/util.php:876 #, php-format msgid "about %d hours ago" msgstr "fyrir um %d klukkutímum síðan" -#: lib/util.php:885 +#: lib/util.php:878 msgid "about a day ago" msgstr "fyrir um einum degi síðan" -#: lib/util.php:887 +#: lib/util.php:880 #, php-format msgid "about %d days ago" msgstr "fyrir um %d dögum síðan" -#: lib/util.php:889 +#: lib/util.php:882 msgid "about a month ago" msgstr "fyrir um einum mánuði síðan" -#: lib/util.php:891 +#: lib/util.php:884 #, php-format msgid "about %d months ago" msgstr "fyrir um %d mánuðum síðan" -#: lib/util.php:893 +#: lib/util.php:886 msgid "about a year ago" msgstr "fyrir um einu ári síðan" @@ -5990,7 +6063,7 @@ msgstr "" msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "" -#: scripts/xmppdaemon.php:301 +#: lib/xmppmanager.php:402 #, fuzzy, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "Skilaboð eru of löng - 140 tákn eru í mesta lagi leyfð en þú sendir %d" diff --git a/locale/it/LC_MESSAGES/statusnet.po b/locale/it/LC_MESSAGES/statusnet.po index 892526e984..d43f708140 100644 --- a/locale/it/LC_MESSAGES/statusnet.po +++ b/locale/it/LC_MESSAGES/statusnet.po @@ -9,17 +9,73 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-21 22:36+0000\n" -"PO-Revision-Date: 2010-01-21 22:37:54+0000\n" +"POT-Creation-Date: 2010-01-27 23:58+0000\n" +"PO-Revision-Date: 2010-01-27 23:59:12+0000\n" "Language-Team: Italian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r61339); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61595); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: it\n" "X-Message-Group: out-statusnet\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#: actions/accessadminpanel.php:54 lib/adminpanelaction.php:326 +msgid "Access" +msgstr "Accesso" + +#: actions/accessadminpanel.php:65 +#, fuzzy +msgid "Site access settings" +msgstr "Salva impostazioni" + +#: actions/accessadminpanel.php:158 +#, fuzzy +msgid "Registration" +msgstr "Registra" + +#: actions/accessadminpanel.php:161 +msgid "Private" +msgstr "Privato" + +#: actions/accessadminpanel.php:163 +msgid "Prohibit anonymous users (not logged in) from viewing site?" +msgstr "" +"Proibire agli utenti anonimi (che non hanno effettuato l'accesso) di vedere " +"il sito?" + +#: actions/accessadminpanel.php:167 +msgid "Invite only" +msgstr "Solo invito" + +#: actions/accessadminpanel.php:169 +msgid "Make registration invitation only." +msgstr "Rende la registrazione solo su invito" + +#: actions/accessadminpanel.php:173 +msgid "Closed" +msgstr "Chiuso" + +#: actions/accessadminpanel.php:175 +msgid "Disable new registrations." +msgstr "Disabilita la creazione di nuovi account" + +#: actions/accessadminpanel.php:189 actions/designadminpanel.php:586 +#: actions/emailsettings.php:195 actions/imsettings.php:163 +#: actions/othersettings.php:126 actions/pathsadminpanel.php:351 +#: actions/profilesettings.php:174 actions/siteadminpanel.php:336 +#: actions/smssettings.php:181 actions/subscriptions.php:203 +#: actions/tagother.php:154 actions/useradminpanel.php:313 +#: lib/applicationeditform.php:335 lib/applicationeditform.php:336 +#: lib/designsettings.php:256 lib/groupeditform.php:202 +msgid "Save" +msgstr "Salva" + +#: actions/accessadminpanel.php:189 +#, fuzzy +msgid "Save access settings" +msgstr "Salva impostazioni" + #: actions/all.php:63 actions/public.php:97 actions/replies.php:92 #: actions/showfavorites.php:137 actions/tag.php:51 msgid "No such page" @@ -34,7 +90,7 @@ msgstr "Pagina inesistente." #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:149 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 @@ -142,8 +198,7 @@ msgstr "Messaggi da %1$s e amici su %2$s!" #: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 #: actions/apitimelinefriends.php:155 actions/apitimelinegroup.php:150 #: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 -#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found." @@ -159,7 +214,7 @@ msgstr "Metodo delle API non trovato." #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:119 +#: actions/apistatusesupdate.php:118 msgid "This method requires a POST." msgstr "Questo metodo richiede POST." @@ -190,7 +245,7 @@ msgstr "Impossibile salvare il profilo." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:132 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 #: actions/designadminpanel.php:122 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -494,7 +549,14 @@ msgstr "" msgid "Allow or deny access" msgstr "" -#: actions/apioauthauthorize.php:320 lib/action.php:435 +#: actions/apioauthauthorize.php:306 +#, php-format +msgid "" +"The application %s by %s would like the " +"ability to %s your account data." +msgstr "" + +#: actions/apioauthauthorize.php:320 lib/action.php:441 msgid "Account" msgstr "Account" @@ -553,17 +615,17 @@ msgstr "Messaggio eliminato." msgid "No status with that ID found." msgstr "Nessun stato trovato con quel ID." -#: actions/apistatusesupdate.php:162 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Troppo lungo. Lunghezza massima %d caratteri." -#: actions/apistatusesupdate.php:203 +#: actions/apistatusesupdate.php:202 msgid "Not found" msgstr "Non trovato" -#: actions/apistatusesupdate.php:226 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -615,11 +677,6 @@ msgstr "Attività pubblica di %s" msgid "%s updates from everyone!" msgstr "Aggiornamenti di %s da tutti!" -#: actions/apitimelineretweetedbyme.php:112 -#, php-format -msgid "Repeated by %s" -msgstr "Ripetuto da %s" - #: actions/apitimelineretweetedtome.php:111 #, php-format msgid "Repeated to %s" @@ -1029,17 +1086,6 @@ msgstr "Ripristina i valori predefiniti" msgid "Reset back to default" msgstr "Reimposta i valori predefiniti" -#: actions/designadminpanel.php:586 actions/emailsettings.php:195 -#: actions/imsettings.php:163 actions/othersettings.php:126 -#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174 -#: actions/siteadminpanel.php:388 actions/smssettings.php:181 -#: actions/subscriptions.php:203 actions/tagother.php:154 -#: actions/useradminpanel.php:313 lib/applicationeditform.php:335 -#: lib/applicationeditform.php:336 lib/designsettings.php:256 -#: lib/groupeditform.php:202 -msgid "Save" -msgstr "Salva" - #: actions/designadminpanel.php:587 lib/designsettings.php:257 msgid "Save design" msgstr "Salva aspetto" @@ -1052,13 +1098,15 @@ msgstr "Questo messaggio non è un preferito!" msgid "Add to favorites" msgstr "Aggiungi ai preferiti" -#: actions/doc.php:69 -msgid "No such document." +#: actions/doc.php:155 +#, fuzzy, php-format +msgid "No such document \"%s\"" msgstr "Nessun documento." -#: actions/editapplication.php:54 lib/applicationeditform.php:136 -msgid "Edit application" -msgstr "" +#: actions/editapplication.php:54 +#, fuzzy +msgid "Edit Application" +msgstr "Altre opzioni" #: actions/editapplication.php:66 #, fuzzy @@ -1077,7 +1125,7 @@ msgid "No such application." msgstr "Nessun messaggio." #: actions/editapplication.php:127 actions/newapplication.php:110 -#: actions/showapplication.php:118 lib/action.php:1189 +#: actions/showapplication.php:118 lib/action.php:1195 msgid "There was a problem with your session token." msgstr "Si è verificato un problema con il tuo token di sessione." @@ -1290,7 +1338,7 @@ msgid "Cannot normalize that email address" msgstr "Impossibile normalizzare quell'indirizzo email" #: actions/emailsettings.php:331 actions/register.php:201 -#: actions/siteadminpanel.php:157 +#: actions/siteadminpanel.php:143 msgid "Not a valid email address." msgstr "Non è un indirizzo email valido." @@ -1302,7 +1350,7 @@ msgstr "Quello è già il tuo indirizzo email." msgid "That email address already belongs to another user." msgstr "Quell'indirizzo email appartiene già a un altro utente." -#: actions/emailsettings.php:353 actions/imsettings.php:317 +#: actions/emailsettings.php:353 actions/imsettings.php:319 #: actions/smssettings.php:337 msgid "Couldn't insert confirmation code." msgstr "Impossibile inserire il codice di conferma." @@ -1610,7 +1658,7 @@ msgstr "Membri del gruppo %1$s, pagina %2$d" msgid "A list of the users in this group." msgstr "Un elenco degli utenti in questo gruppo." -#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107 +#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107 msgid "Admin" msgstr "Amministra" @@ -1807,6 +1855,11 @@ msgstr "" msgid "That is not your Jabber ID." msgstr "Quello non è il tuo ID di Jabber." +#: actions/inbox.php:59 +#, fuzzy, php-format +msgid "Inbox for %1$s - page %2$d" +msgstr "Casella posta in arrivo di %s" + #: actions/inbox.php:62 #, php-format msgid "Inbox for %s" @@ -1989,7 +2042,7 @@ msgstr "Nome utente o password non corretto." msgid "Error setting user. You are probably not authorized." msgstr "Errore nell'impostare l'utente. Forse non hai l'autorizzazione." -#: actions/login.php:188 actions/login.php:241 lib/action.php:460 +#: actions/login.php:188 actions/login.php:241 lib/action.php:466 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Accedi" @@ -2052,8 +2105,9 @@ msgid "No current status" msgstr "Nessun messaggio corrente" #: actions/newapplication.php:52 -msgid "New application" -msgstr "" +#, fuzzy +msgid "New Application" +msgstr "Nessun messaggio." #: actions/newapplication.php:64 #, fuzzy @@ -2248,8 +2302,8 @@ msgstr "tipo di contenuto " msgid "Only " msgstr "Solo " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1038 -#: lib/api.php:1066 lib/api.php:1176 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1039 +#: lib/api.php:1067 lib/api.php:1177 msgid "Not a supported data format." msgstr "Non è un formato di dati supportato." @@ -2319,6 +2373,11 @@ msgstr "Token di accesso specificato non valido." msgid "Login token expired." msgstr "Token di accesso scaduto." +#: actions/outbox.php:58 +#, fuzzy, php-format +msgid "Outbox for %1$s - page %2$d" +msgstr "Casella posta inviata di %s" + #: actions/outbox.php:61 #, php-format msgid "Outbox for %s" @@ -2391,7 +2450,7 @@ msgstr "Impossibile salvare la nuova password." msgid "Password saved." msgstr "Password salvata." -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:331 msgid "Paths" msgstr "Percorsi" @@ -2399,132 +2458,148 @@ msgstr "Percorsi" msgid "Path and server settings for this StatusNet site." msgstr "Percorso e impostazioni server per questo sito StatusNet." -#: actions/pathsadminpanel.php:140 +#: actions/pathsadminpanel.php:157 #, php-format msgid "Theme directory not readable: %s" msgstr "Directory del tema non leggibile: %s" -#: actions/pathsadminpanel.php:146 +#: actions/pathsadminpanel.php:163 #, php-format msgid "Avatar directory not writable: %s" msgstr "Directory delle immagini degli utenti non scrivibile: %s" -#: actions/pathsadminpanel.php:152 +#: actions/pathsadminpanel.php:169 #, php-format msgid "Background directory not writable: %s" msgstr "Directory degli sfondi non scrivibile: %s" -#: actions/pathsadminpanel.php:160 +#: actions/pathsadminpanel.php:177 #, php-format msgid "Locales directory not readable: %s" msgstr "Directory delle localizzazioni non leggibile: %s" -#: actions/pathsadminpanel.php:166 +#: actions/pathsadminpanel.php:183 msgid "Invalid SSL server. The maximum length is 255 characters." msgstr "Server SSL non valido. La lunghezza massima è di 255 caratteri." -#: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58 +#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58 #: lib/adminpanelaction.php:311 msgid "Site" msgstr "Sito" -#: actions/pathsadminpanel.php:221 +#: actions/pathsadminpanel.php:238 +msgid "Server" +msgstr "Server" + +#: actions/pathsadminpanel.php:238 +msgid "Site's server hostname." +msgstr "Nome host del server" + +#: actions/pathsadminpanel.php:242 msgid "Path" msgstr "Percorso" -#: actions/pathsadminpanel.php:221 +#: actions/pathsadminpanel.php:242 msgid "Site path" msgstr "Percorso del sito" -#: actions/pathsadminpanel.php:225 +#: actions/pathsadminpanel.php:246 msgid "Path to locales" msgstr "Percorso alle localizzazioni" -#: actions/pathsadminpanel.php:225 +#: actions/pathsadminpanel.php:246 msgid "Directory path to locales" msgstr "Percorso della directory alle localizzazioni" -#: actions/pathsadminpanel.php:232 +#: actions/pathsadminpanel.php:250 +msgid "Fancy URLs" +msgstr "URL semplici" + +#: actions/pathsadminpanel.php:252 +msgid "Use fancy (more readable and memorable) URLs?" +msgstr "Usare gli URL semplici (più leggibili e facili da ricordare)?" + +#: actions/pathsadminpanel.php:259 msgid "Theme" msgstr "Tema" -#: actions/pathsadminpanel.php:237 +#: actions/pathsadminpanel.php:264 msgid "Theme server" msgstr "Server del tema" -#: actions/pathsadminpanel.php:241 +#: actions/pathsadminpanel.php:268 msgid "Theme path" msgstr "Percorso del tema" -#: actions/pathsadminpanel.php:245 +#: actions/pathsadminpanel.php:272 msgid "Theme directory" msgstr "Directory del tema" -#: actions/pathsadminpanel.php:252 +#: actions/pathsadminpanel.php:279 msgid "Avatars" msgstr "Immagini" -#: actions/pathsadminpanel.php:257 +#: actions/pathsadminpanel.php:284 msgid "Avatar server" msgstr "Server dell'immagine" -#: actions/pathsadminpanel.php:261 +#: actions/pathsadminpanel.php:288 msgid "Avatar path" msgstr "Percorso dell'immagine" -#: actions/pathsadminpanel.php:265 +#: actions/pathsadminpanel.php:292 msgid "Avatar directory" msgstr "Directory dell'immagine" -#: actions/pathsadminpanel.php:274 +#: actions/pathsadminpanel.php:301 msgid "Backgrounds" msgstr "Sfondi" -#: actions/pathsadminpanel.php:278 +#: actions/pathsadminpanel.php:305 msgid "Background server" msgstr "Server dello sfondo" -#: actions/pathsadminpanel.php:282 +#: actions/pathsadminpanel.php:309 msgid "Background path" msgstr "Percorso dello sfondo" -#: actions/pathsadminpanel.php:286 +#: actions/pathsadminpanel.php:313 msgid "Background directory" msgstr "Directory dello sfondo" -#: actions/pathsadminpanel.php:293 +#: actions/pathsadminpanel.php:320 msgid "SSL" msgstr "SSL" -#: actions/pathsadminpanel.php:296 actions/siteadminpanel.php:346 +#: actions/pathsadminpanel.php:323 actions/siteadminpanel.php:294 msgid "Never" msgstr "Mai" -#: actions/pathsadminpanel.php:297 +#: actions/pathsadminpanel.php:324 msgid "Sometimes" msgstr "Qualche volta" -#: actions/pathsadminpanel.php:298 +#: actions/pathsadminpanel.php:325 msgid "Always" msgstr "Sempre" -#: actions/pathsadminpanel.php:302 +#: actions/pathsadminpanel.php:329 msgid "Use SSL" msgstr "Usa SSL" -#: actions/pathsadminpanel.php:303 +#: actions/pathsadminpanel.php:330 msgid "When to use SSL" msgstr "Quando usare SSL" -#: actions/pathsadminpanel.php:308 +#: actions/pathsadminpanel.php:335 msgid "SSL server" msgstr "Server SSL" -#: actions/pathsadminpanel.php:309 +#: actions/pathsadminpanel.php:336 msgid "Server to direct SSL requests to" msgstr "Server a cui dirigere le richieste SSL" -#: actions/pathsadminpanel.php:325 +#: actions/pathsadminpanel.php:352 msgid "Save paths" msgstr "Salva percorsi" @@ -2637,7 +2712,7 @@ msgid "" msgstr "" "Le tue etichette (lettere, numeri, -, . e _), separate da virgole o spazi" -#: actions/profilesettings.php:151 actions/siteadminpanel.php:294 +#: actions/profilesettings.php:151 actions/siteadminpanel.php:280 msgid "Language" msgstr "Lingua" @@ -2665,7 +2740,7 @@ msgstr "" msgid "Bio is too long (max %d chars)." msgstr "La biografia è troppo lunga (max %d caratteri)." -#: actions/profilesettings.php:235 actions/siteadminpanel.php:164 +#: actions/profilesettings.php:235 actions/siteadminpanel.php:150 msgid "Timezone not selected." msgstr "Fuso orario non selezionato" @@ -2938,7 +3013,7 @@ msgstr "Codice di invito non valido." msgid "Registration successful" msgstr "Registrazione riuscita" -#: actions/register.php:114 actions/register.php:503 lib/action.php:457 +#: actions/register.php:114 actions/register.php:503 lib/action.php:463 #: lib/logingroupnav.php:85 msgid "Register" msgstr "Registra" @@ -2982,7 +3057,7 @@ msgid "Same as password above. Required." msgstr "Stessa password di sopra; richiesta" #: actions/register.php:438 actions/register.php:442 -#: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120 +#: actions/siteadminpanel.php:256 lib/accountsettingsaction.php:120 msgid "Email" msgstr "Email" @@ -3141,6 +3216,11 @@ msgstr "Ripetuti!" msgid "Replies to %s" msgstr "Risposte a %s" +#: actions/replies.php:127 +#, fuzzy, php-format +msgid "Replies to %1$s, page %2$d" +msgstr "Risposte a %1$s su %2$s!" + #: actions/replies.php:144 #, php-format msgid "Replies feed for %s (RSS 1.0)" @@ -3274,6 +3354,11 @@ msgid "" "signature method." msgstr "" +#: actions/showfavorites.php:79 +#, fuzzy, php-format +msgid "%1$s's favorite notices, page %2$d" +msgstr "Messaggi preferiti di %s" + #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "Impossibile recuperare i messaggi preferiti." @@ -3330,6 +3415,11 @@ msgstr "Questo è un modo per condividere ciò che ti piace." msgid "%s group" msgstr "Gruppi di %s" +#: actions/showgroup.php:84 +#, fuzzy, php-format +msgid "%1$s group, page %2$d" +msgstr "Membri del gruppo %1$s, pagina %2$d" + #: actions/showgroup.php:218 msgid "Group profile" msgstr "Profilo del gruppo" @@ -3449,6 +3539,11 @@ msgstr "Messaggio eliminato." msgid " tagged %s" msgstr " etichettati con %s" +#: actions/showstream.php:79 +#, fuzzy, php-format +msgid "%1$s, page %2$d" +msgstr "Profili bloccati di %1$s, pagina %2$d" + #: actions/showstream.php:122 #, php-format msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" @@ -3538,196 +3633,146 @@ msgstr "L'utente è già stato zittito." msgid "Basic settings for this StatusNet site." msgstr "Impostazioni di base per questo sito StatusNet." -#: actions/siteadminpanel.php:146 +#: actions/siteadminpanel.php:132 msgid "Site name must have non-zero length." msgstr "Il nome del sito non deve avere lunghezza parti a zero." -#: actions/siteadminpanel.php:154 +#: actions/siteadminpanel.php:140 msgid "You must have a valid contact email address." msgstr "Devi avere un'email di contatto valida." -#: actions/siteadminpanel.php:172 +#: actions/siteadminpanel.php:158 #, fuzzy, php-format msgid "Unknown language \"%s\"." msgstr "Lingua \"%s\" sconosciuta." -#: actions/siteadminpanel.php:179 +#: actions/siteadminpanel.php:165 msgid "Invalid snapshot report URL." msgstr "URL di segnalazione snapshot non valido." -#: actions/siteadminpanel.php:185 +#: actions/siteadminpanel.php:171 msgid "Invalid snapshot run value." msgstr "Valore di esecuzione dello snapshot non valido." -#: actions/siteadminpanel.php:191 +#: actions/siteadminpanel.php:177 msgid "Snapshot frequency must be a number." msgstr "La frequenza degli snapshot deve essere un numero." -#: actions/siteadminpanel.php:197 +#: actions/siteadminpanel.php:183 msgid "Minimum text limit is 140 characters." msgstr "Il limite minimo del testo è di 140 caratteri." -#: actions/siteadminpanel.php:203 +#: actions/siteadminpanel.php:189 msgid "Dupe limit must 1 or more seconds." msgstr "Il limite per i duplicati deve essere di 1 o più secondi." -#: actions/siteadminpanel.php:253 +#: actions/siteadminpanel.php:239 msgid "General" msgstr "Generale" -#: actions/siteadminpanel.php:256 +#: actions/siteadminpanel.php:242 msgid "Site name" msgstr "Nome del sito" -#: actions/siteadminpanel.php:257 +#: actions/siteadminpanel.php:243 msgid "The name of your site, like \"Yourcompany Microblog\"" msgstr "Il nome del tuo sito, topo \"Acme Microblog\"" -#: actions/siteadminpanel.php:261 +#: actions/siteadminpanel.php:247 msgid "Brought by" msgstr "Offerto da" -#: actions/siteadminpanel.php:262 +#: actions/siteadminpanel.php:248 msgid "Text used for credits link in footer of each page" msgstr "Testo usato per i crediti nel piè di pagina di ogni pagina" -#: actions/siteadminpanel.php:266 +#: actions/siteadminpanel.php:252 msgid "Brought by URL" msgstr "URL per offerto da" -#: actions/siteadminpanel.php:267 +#: actions/siteadminpanel.php:253 msgid "URL used for credits link in footer of each page" msgstr "URL usato per i crediti nel piè di pagina di ogni pagina" -#: actions/siteadminpanel.php:271 +#: actions/siteadminpanel.php:257 msgid "Contact email address for your site" msgstr "Indirizzo email di contatto per il sito" -#: actions/siteadminpanel.php:277 +#: actions/siteadminpanel.php:263 msgid "Local" msgstr "Locale" -#: actions/siteadminpanel.php:288 +#: actions/siteadminpanel.php:274 msgid "Default timezone" msgstr "Fuso orario predefinito" -#: actions/siteadminpanel.php:289 +#: actions/siteadminpanel.php:275 msgid "Default timezone for the site; usually UTC." msgstr "Fuso orario predefinito; tipicamente UTC" -#: actions/siteadminpanel.php:295 +#: actions/siteadminpanel.php:281 msgid "Default site language" msgstr "Lingua predefinita" -#: actions/siteadminpanel.php:303 -msgid "URLs" -msgstr "URL" - -#: actions/siteadminpanel.php:306 -msgid "Server" -msgstr "Server" - -#: actions/siteadminpanel.php:306 -msgid "Site's server hostname." -msgstr "Nome host del server" - -#: actions/siteadminpanel.php:310 -msgid "Fancy URLs" -msgstr "URL semplici" - -#: actions/siteadminpanel.php:312 -msgid "Use fancy (more readable and memorable) URLs?" -msgstr "Usare gli URL semplici (più leggibili e facili da ricordare)?" - -#: actions/siteadminpanel.php:318 -msgid "Access" -msgstr "Accesso" - -#: actions/siteadminpanel.php:321 -msgid "Private" -msgstr "Privato" - -#: actions/siteadminpanel.php:323 -msgid "Prohibit anonymous users (not logged in) from viewing site?" -msgstr "" -"Proibire agli utenti anonimi (che non hanno effettuato l'accesso) di vedere " -"il sito?" - -#: actions/siteadminpanel.php:327 -msgid "Invite only" -msgstr "Solo invito" - -#: actions/siteadminpanel.php:329 -msgid "Make registration invitation only." -msgstr "Rende la registrazione solo su invito" - -#: actions/siteadminpanel.php:333 -msgid "Closed" -msgstr "Chiuso" - -#: actions/siteadminpanel.php:335 -msgid "Disable new registrations." -msgstr "Disabilita la creazione di nuovi account" - -#: actions/siteadminpanel.php:341 +#: actions/siteadminpanel.php:289 msgid "Snapshots" msgstr "Snapshot" -#: actions/siteadminpanel.php:344 +#: actions/siteadminpanel.php:292 msgid "Randomly during Web hit" msgstr "A caso quando avviene un web hit" -#: actions/siteadminpanel.php:345 +#: actions/siteadminpanel.php:293 msgid "In a scheduled job" msgstr "In un job pianificato" -#: actions/siteadminpanel.php:347 +#: actions/siteadminpanel.php:295 msgid "Data snapshots" msgstr "Snapshot dei dati" -#: actions/siteadminpanel.php:348 +#: actions/siteadminpanel.php:296 msgid "When to send statistical data to status.net servers" msgstr "Quando inviare dati statistici a status.net" -#: actions/siteadminpanel.php:353 +#: actions/siteadminpanel.php:301 msgid "Frequency" msgstr "Frequenza" -#: actions/siteadminpanel.php:354 +#: actions/siteadminpanel.php:302 msgid "Snapshots will be sent once every N web hits" msgstr "Gli snapshot verranno inviati ogni N web hit" -#: actions/siteadminpanel.php:359 +#: actions/siteadminpanel.php:307 msgid "Report URL" msgstr "URL per la segnalazione" -#: actions/siteadminpanel.php:360 +#: actions/siteadminpanel.php:308 msgid "Snapshots will be sent to this URL" msgstr "Gli snapshot verranno inviati a questo URL" -#: actions/siteadminpanel.php:367 +#: actions/siteadminpanel.php:315 msgid "Limits" msgstr "Limiti" -#: actions/siteadminpanel.php:370 +#: actions/siteadminpanel.php:318 msgid "Text limit" msgstr "Limiti del testo" -#: actions/siteadminpanel.php:370 +#: actions/siteadminpanel.php:318 msgid "Maximum number of characters for notices." msgstr "Numero massimo di caratteri per messaggo" -#: actions/siteadminpanel.php:374 +#: actions/siteadminpanel.php:322 msgid "Dupe limit" msgstr "Limite duplicati" -#: actions/siteadminpanel.php:374 +#: actions/siteadminpanel.php:322 msgid "How long users must wait (in seconds) to post the same thing again." msgstr "" "Quanto tempo gli utenti devono attendere (in secondi) prima di inviare " "nuovamente lo stesso messaggio" -#: actions/siteadminpanel.php:388 actions/useradminpanel.php:313 +#: actions/siteadminpanel.php:336 actions/useradminpanel.php:313 msgid "Save site settings" msgstr "Salva impostazioni" @@ -3934,6 +3979,11 @@ msgstr "Jabber" msgid "SMS" msgstr "SMS" +#: actions/tag.php:68 +#, fuzzy, php-format +msgid "Notices tagged with %1$s, page %2$d" +msgstr "Utenti auto-etichettati con %1$s - pagina %2$d" + #: actions/tag.php:86 #, php-format msgid "Notice feed for tag %s (RSS 1.0)" @@ -4236,6 +4286,11 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "Gustati il tuo hotdog!" +#: actions/usergroups.php:64 +#, fuzzy, php-format +msgid "%1$s groups, page %2$d" +msgstr "Membri del gruppo %1$s, pagina %2$d" + #: actions/usergroups.php:130 msgid "Search for more groups" msgstr "Cerca altri gruppi" @@ -4309,7 +4364,7 @@ msgstr "" msgid "Plugins" msgstr "Plugin" -#: actions/version.php:196 lib/action.php:741 +#: actions/version.php:196 lib/action.php:747 msgid "Version" msgstr "Versione" @@ -4370,27 +4425,27 @@ msgstr "Impossibile inserire il messaggio." msgid "Could not update message with new URI." msgstr "Impossibile aggiornare il messaggio con il nuovo URI." -#: classes/Notice.php:171 +#: classes/Notice.php:157 #, php-format msgid "DB error inserting hashtag: %s" msgstr "Errore del DB nell'inserire un hashtag: %s" -#: classes/Notice.php:225 +#: classes/Notice.php:214 msgid "Problem saving notice. Too long." msgstr "Problema nel salvare il messaggio. Troppo lungo." -#: classes/Notice.php:229 +#: classes/Notice.php:218 msgid "Problem saving notice. Unknown user." msgstr "Problema nel salvare il messaggio. Utente sconosciuto." -#: classes/Notice.php:234 +#: classes/Notice.php:223 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Troppi messaggi troppo velocemente; fai una pausa e scrivi di nuovo tra " "qualche minuto." -#: classes/Notice.php:240 +#: classes/Notice.php:229 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." @@ -4398,20 +4453,25 @@ msgstr "" "Troppi messaggi duplicati troppo velocemente; fai una pausa e scrivi di " "nuovo tra qualche minuto." -#: classes/Notice.php:246 +#: classes/Notice.php:235 msgid "You are banned from posting notices on this site." msgstr "Ti è proibito inviare messaggi su questo sito." -#: classes/Notice.php:305 classes/Notice.php:330 +#: classes/Notice.php:294 classes/Notice.php:319 msgid "Problem saving notice." msgstr "Problema nel salvare il messaggio." -#: classes/Notice.php:1059 +#: classes/Notice.php:790 +#, fuzzy +msgid "Problem saving group inbox." +msgstr "Problema nel salvare il messaggio." + +#: classes/Notice.php:850 #, php-format msgid "DB error inserting reply: %s" msgstr "Errore del DB nell'inserire la risposta: %s" -#: classes/Notice.php:1441 +#: classes/Notice.php:1233 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -4466,124 +4526,124 @@ msgstr "%1$s - %2$s" msgid "Untitled page" msgstr "Pagina senza nome" -#: lib/action.php:427 +#: lib/action.php:433 msgid "Primary site navigation" msgstr "Esplorazione sito primaria" -#: lib/action.php:433 +#: lib/action.php:439 msgid "Home" msgstr "Home" -#: lib/action.php:433 +#: lib/action.php:439 msgid "Personal profile and friends timeline" msgstr "Profilo personale e attività degli amici" -#: lib/action.php:435 +#: lib/action.php:441 msgid "Change your email, avatar, password, profile" msgstr "Modifica la tua email, immagine, password o il tuo profilo" -#: lib/action.php:438 +#: lib/action.php:444 msgid "Connect" msgstr "Connetti" -#: lib/action.php:438 +#: lib/action.php:444 msgid "Connect to services" msgstr "Connettiti con altri servizi" -#: lib/action.php:442 +#: lib/action.php:448 msgid "Change site configuration" msgstr "Modifica la configurazione del sito" -#: lib/action.php:446 lib/subgroupnav.php:105 +#: lib/action.php:452 lib/subgroupnav.php:105 msgid "Invite" msgstr "Invita" -#: lib/action.php:447 lib/subgroupnav.php:106 +#: lib/action.php:453 lib/subgroupnav.php:106 #, php-format msgid "Invite friends and colleagues to join you on %s" msgstr "Invita amici e colleghi a seguirti su %s" -#: lib/action.php:452 +#: lib/action.php:458 msgid "Logout" msgstr "Esci" -#: lib/action.php:452 +#: lib/action.php:458 msgid "Logout from the site" msgstr "Termina la tua sessione sul sito" -#: lib/action.php:457 +#: lib/action.php:463 msgid "Create an account" msgstr "Crea un account" -#: lib/action.php:460 +#: lib/action.php:466 msgid "Login to the site" msgstr "Accedi al sito" -#: lib/action.php:463 lib/action.php:726 +#: lib/action.php:469 lib/action.php:732 msgid "Help" msgstr "Aiuto" -#: lib/action.php:463 +#: lib/action.php:469 msgid "Help me!" msgstr "Aiutami!" -#: lib/action.php:466 lib/searchaction.php:127 +#: lib/action.php:472 lib/searchaction.php:127 msgid "Search" msgstr "Cerca" -#: lib/action.php:466 +#: lib/action.php:472 msgid "Search for people or text" msgstr "Cerca persone o del testo" -#: lib/action.php:487 +#: lib/action.php:493 msgid "Site notice" msgstr "Messaggio del sito" -#: lib/action.php:553 +#: lib/action.php:559 msgid "Local views" msgstr "Viste locali" -#: lib/action.php:619 +#: lib/action.php:625 msgid "Page notice" msgstr "Pagina messaggio" -#: lib/action.php:721 +#: lib/action.php:727 msgid "Secondary site navigation" msgstr "Esplorazione secondaria del sito" -#: lib/action.php:728 +#: lib/action.php:734 msgid "About" msgstr "Informazioni" -#: lib/action.php:730 +#: lib/action.php:736 msgid "FAQ" msgstr "FAQ" -#: lib/action.php:734 +#: lib/action.php:740 msgid "TOS" msgstr "TOS" -#: lib/action.php:737 +#: lib/action.php:743 msgid "Privacy" msgstr "Privacy" -#: lib/action.php:739 +#: lib/action.php:745 msgid "Source" msgstr "Sorgenti" -#: lib/action.php:743 +#: lib/action.php:749 msgid "Contact" msgstr "Contatti" -#: lib/action.php:745 +#: lib/action.php:751 msgid "Badge" msgstr "Badge" -#: lib/action.php:773 +#: lib/action.php:779 msgid "StatusNet software license" msgstr "Licenza del software StatusNet" -#: lib/action.php:776 +#: lib/action.php:782 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -4592,12 +4652,12 @@ msgstr "" "**%%site.name%%** è un servizio di microblog offerto da [%%site.broughtby%%]" "(%%site.broughtbyurl%%). " -#: lib/action.php:778 +#: lib/action.php:784 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "**%%site.name%%** è un servizio di microblog. " -#: lib/action.php:780 +#: lib/action.php:786 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4608,41 +4668,41 @@ msgstr "" "s, disponibile nei termini della licenza [GNU Affero General Public License]" "(http://www.fsf.org/licensing/licenses/agpl-3.0.html)." -#: lib/action.php:795 +#: lib/action.php:801 msgid "Site content license" msgstr "Licenza del contenuto del sito" -#: lib/action.php:800 +#: lib/action.php:806 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "" -#: lib/action.php:805 +#: lib/action.php:811 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" -#: lib/action.php:808 +#: lib/action.php:814 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" -#: lib/action.php:820 +#: lib/action.php:826 msgid "All " msgstr "Tutti " -#: lib/action.php:825 +#: lib/action.php:831 msgid "license." msgstr "licenza." -#: lib/action.php:1124 +#: lib/action.php:1130 msgid "Pagination" msgstr "Paginazione" -#: lib/action.php:1133 +#: lib/action.php:1139 msgid "After" msgstr "Successivi" -#: lib/action.php:1141 +#: lib/action.php:1147 msgid "Before" msgstr "Precedenti" @@ -4674,10 +4734,24 @@ msgstr "Configurazione di base" msgid "Design configuration" msgstr "Configurazione aspetto" -#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327 +#: lib/adminpanelaction.php:322 +#, fuzzy +msgid "User configuration" +msgstr "Configurazione percorsi" + +#: lib/adminpanelaction.php:327 +#, fuzzy +msgid "Access configuration" +msgstr "Configurazione aspetto" + +#: lib/adminpanelaction.php:332 msgid "Paths configuration" msgstr "Configurazione percorsi" +#: lib/applicationeditform.php:136 +msgid "Edit application" +msgstr "" + #: lib/applicationeditform.php:186 msgid "Icon for this application" msgstr "" @@ -5298,12 +5372,12 @@ msgstr "MB" msgid "kB" msgstr "kB" -#: lib/jabber.php:202 +#: lib/jabber.php:220 #, php-format msgid "[%s]" msgstr "[%s]" -#: lib/jabber.php:385 +#: lib/jabber.php:400 #, fuzzy, php-format msgid "Unknown inbox source %d." msgstr "Lingua \"%s\" sconosciuta." @@ -5802,19 +5876,19 @@ msgstr "Risposte" msgid "Favorites" msgstr "Preferiti" -#: lib/personalgroupnav.php:124 +#: lib/personalgroupnav.php:125 msgid "Inbox" msgstr "In arrivo" -#: lib/personalgroupnav.php:125 +#: lib/personalgroupnav.php:126 msgid "Your incoming messages" msgstr "I tuoi messaggi in arrivo" -#: lib/personalgroupnav.php:129 +#: lib/personalgroupnav.php:130 msgid "Outbox" msgstr "Inviati" -#: lib/personalgroupnav.php:130 +#: lib/personalgroupnav.php:131 msgid "Your sent messages" msgstr "I tuoi messaggi inviati" @@ -6056,47 +6130,47 @@ msgstr "Messaggio" msgid "Moderate" msgstr "Modera" -#: lib/util.php:875 +#: lib/util.php:868 msgid "a few seconds ago" msgstr "pochi secondi fa" -#: lib/util.php:877 +#: lib/util.php:870 msgid "about a minute ago" msgstr "circa un minuto fa" -#: lib/util.php:879 +#: lib/util.php:872 #, php-format msgid "about %d minutes ago" msgstr "circa %d minuti fa" -#: lib/util.php:881 +#: lib/util.php:874 msgid "about an hour ago" msgstr "circa un'ora fa" -#: lib/util.php:883 +#: lib/util.php:876 #, php-format msgid "about %d hours ago" msgstr "circa %d ore fa" -#: lib/util.php:885 +#: lib/util.php:878 msgid "about a day ago" msgstr "circa un giorno fa" -#: lib/util.php:887 +#: lib/util.php:880 #, php-format msgid "about %d days ago" msgstr "circa %d giorni fa" -#: lib/util.php:889 +#: lib/util.php:882 msgid "about a month ago" msgstr "circa un mese fa" -#: lib/util.php:891 +#: lib/util.php:884 #, php-format msgid "about %d months ago" msgstr "circa %d mesi fa" -#: lib/util.php:893 +#: lib/util.php:886 msgid "about a year ago" msgstr "circa un anno fa" @@ -6110,7 +6184,7 @@ msgstr "%s non è un colore valido." msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "%s non è un colore valido. Usa 3 o 6 caratteri esadecimali." -#: scripts/xmppdaemon.php:301 +#: lib/xmppmanager.php:402 #, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "Messaggio troppo lungo: massimo %1$d caratteri, inviati %2$d." diff --git a/locale/ja/LC_MESSAGES/statusnet.po b/locale/ja/LC_MESSAGES/statusnet.po index 6260ef5acb..ba3d7ecaea 100644 --- a/locale/ja/LC_MESSAGES/statusnet.po +++ b/locale/ja/LC_MESSAGES/statusnet.po @@ -11,17 +11,71 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-21 22:36+0000\n" -"PO-Revision-Date: 2010-01-21 22:37:57+0000\n" +"POT-Creation-Date: 2010-01-27 23:58+0000\n" +"PO-Revision-Date: 2010-01-27 23:59:15+0000\n" "Language-Team: Japanese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r61339); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61595); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ja\n" "X-Message-Group: out-statusnet\n" "Plural-Forms: nplurals=1; plural=0;\n" +#: actions/accessadminpanel.php:54 lib/adminpanelaction.php:326 +msgid "Access" +msgstr "アクセス" + +#: actions/accessadminpanel.php:65 +#, fuzzy +msgid "Site access settings" +msgstr "サイト設定の保存" + +#: actions/accessadminpanel.php:158 +#, fuzzy +msgid "Registration" +msgstr "登録" + +#: actions/accessadminpanel.php:161 +msgid "Private" +msgstr "プライベート" + +#: actions/accessadminpanel.php:163 +msgid "Prohibit anonymous users (not logged in) from viewing site?" +msgstr "匿名ユーザー(ログインしていません)がサイトを見るのを禁止しますか?" + +#: actions/accessadminpanel.php:167 +msgid "Invite only" +msgstr "招待のみ" + +#: actions/accessadminpanel.php:169 +msgid "Make registration invitation only." +msgstr "招待のみ登録する" + +#: actions/accessadminpanel.php:173 +msgid "Closed" +msgstr "閉じられた" + +#: actions/accessadminpanel.php:175 +msgid "Disable new registrations." +msgstr "新規登録を無効。" + +#: actions/accessadminpanel.php:189 actions/designadminpanel.php:586 +#: actions/emailsettings.php:195 actions/imsettings.php:163 +#: actions/othersettings.php:126 actions/pathsadminpanel.php:351 +#: actions/profilesettings.php:174 actions/siteadminpanel.php:336 +#: actions/smssettings.php:181 actions/subscriptions.php:203 +#: actions/tagother.php:154 actions/useradminpanel.php:313 +#: lib/applicationeditform.php:335 lib/applicationeditform.php:336 +#: lib/designsettings.php:256 lib/groupeditform.php:202 +msgid "Save" +msgstr "保存" + +#: actions/accessadminpanel.php:189 +#, fuzzy +msgid "Save access settings" +msgstr "サイト設定の保存" + #: actions/all.php:63 actions/public.php:97 actions/replies.php:92 #: actions/showfavorites.php:137 actions/tag.php:51 msgid "No such page" @@ -36,7 +90,7 @@ msgstr "そのようなページはありません。" #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:149 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 @@ -141,8 +195,7 @@ msgstr "%2$s に %1$s と友人からの更新があります！" #: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 #: actions/apitimelinefriends.php:155 actions/apitimelinegroup.php:150 #: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 -#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found." @@ -158,7 +211,7 @@ msgstr "API メソッドが見つかりません。" #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:119 +#: actions/apistatusesupdate.php:118 msgid "This method requires a POST." msgstr "このメソッドには POST が必要です。" @@ -189,7 +242,7 @@ msgstr "プロフィールを保存できませんでした。" #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:132 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 #: actions/designadminpanel.php:122 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -492,7 +545,14 @@ msgstr "アプリケーションはあなたのアカウントに接続したい msgid "Allow or deny access" msgstr "アクセスを許可または拒絶" -#: actions/apioauthauthorize.php:320 lib/action.php:435 +#: actions/apioauthauthorize.php:306 +#, php-format +msgid "" +"The application %s by %s would like the " +"ability to %s your account data." +msgstr "" + +#: actions/apioauthauthorize.php:320 lib/action.php:441 msgid "Account" msgstr "アカウント" @@ -549,17 +609,17 @@ msgstr "ステータスを削除しました。" msgid "No status with that ID found." msgstr "そのＩＤでのステータスはありません。" -#: actions/apistatusesupdate.php:162 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "長すぎます。つぶやきは最大 140 字までです。" -#: actions/apistatusesupdate.php:203 +#: actions/apistatusesupdate.php:202 msgid "Not found" msgstr "みつかりません" -#: actions/apistatusesupdate.php:226 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "つぶやきは URL を含めて最大 %d 字までです。" @@ -610,11 +670,6 @@ msgstr "%s のパブリックタイムライン" msgid "%s updates from everyone!" msgstr "皆からの %s アップデート!" -#: actions/apitimelineretweetedbyme.php:112 -#, php-format -msgid "Repeated by %s" -msgstr "%s による繰り返し" - #: actions/apitimelineretweetedtome.php:111 #, php-format msgid "Repeated to %s" @@ -1023,17 +1078,6 @@ msgstr "デフォルトデザインに戻す。" msgid "Reset back to default" msgstr "デフォルトへリセットする" -#: actions/designadminpanel.php:586 actions/emailsettings.php:195 -#: actions/imsettings.php:163 actions/othersettings.php:126 -#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174 -#: actions/siteadminpanel.php:388 actions/smssettings.php:181 -#: actions/subscriptions.php:203 actions/tagother.php:154 -#: actions/useradminpanel.php:313 lib/applicationeditform.php:335 -#: lib/applicationeditform.php:336 lib/designsettings.php:256 -#: lib/groupeditform.php:202 -msgid "Save" -msgstr "保存" - #: actions/designadminpanel.php:587 lib/designsettings.php:257 msgid "Save design" msgstr "デザインの保存" @@ -1046,12 +1090,14 @@ msgstr "このつぶやきはお気に入りではありません!" msgid "Add to favorites" msgstr "お気に入りに加える" -#: actions/doc.php:69 -msgid "No such document." +#: actions/doc.php:155 +#, fuzzy, php-format +msgid "No such document \"%s\"" msgstr "そのようなドキュメントはありません。" -#: actions/editapplication.php:54 lib/applicationeditform.php:136 -msgid "Edit application" +#: actions/editapplication.php:54 +#, fuzzy +msgid "Edit Application" msgstr "アプリケーション編集" #: actions/editapplication.php:66 @@ -1068,7 +1114,7 @@ msgid "No such application." msgstr "そのようなアプリケーションはありません。" #: actions/editapplication.php:127 actions/newapplication.php:110 -#: actions/showapplication.php:118 lib/action.php:1189 +#: actions/showapplication.php:118 lib/action.php:1195 msgid "There was a problem with your session token." msgstr "あなたのセッショントークンに関する問題がありました。" @@ -1272,7 +1318,7 @@ msgid "Cannot normalize that email address" msgstr "そのメールアドレスを正規化できません" #: actions/emailsettings.php:331 actions/register.php:201 -#: actions/siteadminpanel.php:157 +#: actions/siteadminpanel.php:143 msgid "Not a valid email address." msgstr "有効なメールアドレスではありません。" @@ -1284,7 +1330,7 @@ msgstr "これはすでにあなたのメールアドレスです。" msgid "That email address already belongs to another user." msgstr "このメールアドレスは既に他の人が使っています。" -#: actions/emailsettings.php:353 actions/imsettings.php:317 +#: actions/emailsettings.php:353 actions/imsettings.php:319 #: actions/smssettings.php:337 msgid "Couldn't insert confirmation code." msgstr "承認コードを追加できません" @@ -1592,7 +1638,7 @@ msgstr "%1$s グループメンバー、ページ %2$d" msgid "A list of the users in this group." msgstr "このグループの利用者のリスト。" -#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107 +#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107 msgid "Admin" msgstr "管理者" @@ -1788,6 +1834,11 @@ msgstr "" msgid "That is not your Jabber ID." msgstr "その Jabber ID はあなたのものではありません。" +#: actions/inbox.php:59 +#, fuzzy, php-format +msgid "Inbox for %1$s - page %2$d" +msgstr "%s の受信箱" + #: actions/inbox.php:62 #, php-format msgid "Inbox for %s" @@ -1872,7 +1923,7 @@ msgstr "任意に招待にパーソナルメッセージを加えてください #: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236 msgid "Send" -msgstr "送る" +msgstr "投稿" #: actions/invite.php:226 #, php-format @@ -1970,7 +2021,7 @@ msgstr "ユーザ名またはパスワードが間違っています。" msgid "Error setting user. You are probably not authorized." msgstr "ユーザ設定エラー。 あなたはたぶん承認されていません。" -#: actions/login.php:188 actions/login.php:241 lib/action.php:460 +#: actions/login.php:188 actions/login.php:241 lib/action.php:466 #: lib/logingroupnav.php:79 msgid "Login" msgstr "ログイン" @@ -2032,7 +2083,8 @@ msgid "No current status" msgstr "現在のステータスはありません" #: actions/newapplication.php:52 -msgid "New application" +#, fuzzy +msgid "New Application" msgstr "新しいアプリケーション" #: actions/newapplication.php:64 @@ -2224,8 +2276,8 @@ msgstr "内容種別 " msgid "Only " msgstr "だけ " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1038 -#: lib/api.php:1066 lib/api.php:1176 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1039 +#: lib/api.php:1067 lib/api.php:1177 msgid "Not a supported data format." msgstr "サポートされていないデータ形式。" @@ -2289,6 +2341,11 @@ msgstr "不正なログイントークンが指定されています。" msgid "Login token expired." msgstr "ログイントークンが期限切れです・" +#: actions/outbox.php:58 +#, fuzzy, php-format +msgid "Outbox for %1$s - page %2$d" +msgstr "%s の送信箱" + #: actions/outbox.php:61 #, php-format msgid "Outbox for %s" @@ -2361,7 +2418,7 @@ msgstr "新しいパスワードを保存できません。" msgid "Password saved." msgstr "パスワードが保存されました。" -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:331 msgid "Paths" msgstr "パス" @@ -2369,132 +2426,148 @@ msgstr "パス" msgid "Path and server settings for this StatusNet site." msgstr "パスと StatusNet サイトのサーバー設定" -#: actions/pathsadminpanel.php:140 +#: actions/pathsadminpanel.php:157 #, php-format msgid "Theme directory not readable: %s" msgstr "テーマディレクトリが読み込めません: %s" -#: actions/pathsadminpanel.php:146 +#: actions/pathsadminpanel.php:163 #, php-format msgid "Avatar directory not writable: %s" msgstr "アバターディレクトリに書き込みできません: %s" -#: actions/pathsadminpanel.php:152 +#: actions/pathsadminpanel.php:169 #, php-format msgid "Background directory not writable: %s" msgstr "バックグラウンドディレクトリに書き込みできません : %s" -#: actions/pathsadminpanel.php:160 +#: actions/pathsadminpanel.php:177 #, php-format msgid "Locales directory not readable: %s" msgstr "場所ディレクトリが読み込めません: %s" -#: actions/pathsadminpanel.php:166 +#: actions/pathsadminpanel.php:183 msgid "Invalid SSL server. The maximum length is 255 characters." msgstr "不正な SSL サーバー。最大 255 文字まで。" -#: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58 +#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58 #: lib/adminpanelaction.php:311 msgid "Site" msgstr "サイト" -#: actions/pathsadminpanel.php:221 +#: actions/pathsadminpanel.php:238 +msgid "Server" +msgstr "サーバー" + +#: actions/pathsadminpanel.php:238 +msgid "Site's server hostname." +msgstr "サイトのサーバーホスト名" + +#: actions/pathsadminpanel.php:242 msgid "Path" msgstr "パス" -#: actions/pathsadminpanel.php:221 +#: actions/pathsadminpanel.php:242 msgid "Site path" msgstr "サイトパス" -#: actions/pathsadminpanel.php:225 +#: actions/pathsadminpanel.php:246 msgid "Path to locales" msgstr "ロケールのパス" -#: actions/pathsadminpanel.php:225 +#: actions/pathsadminpanel.php:246 msgid "Directory path to locales" msgstr "ロケールへのディレクトリパス" -#: actions/pathsadminpanel.php:232 +#: actions/pathsadminpanel.php:250 +msgid "Fancy URLs" +msgstr "" + +#: actions/pathsadminpanel.php:252 +msgid "Use fancy (more readable and memorable) URLs?" +msgstr "Fancy URL (読みやすく忘れにくい) を使用しますか?" + +#: actions/pathsadminpanel.php:259 msgid "Theme" msgstr "テーマ" -#: actions/pathsadminpanel.php:237 +#: actions/pathsadminpanel.php:264 msgid "Theme server" msgstr "テーマサーバー" -#: actions/pathsadminpanel.php:241 +#: actions/pathsadminpanel.php:268 msgid "Theme path" msgstr "テーマパス" -#: actions/pathsadminpanel.php:245 +#: actions/pathsadminpanel.php:272 msgid "Theme directory" msgstr "テーマディレクトリ" -#: actions/pathsadminpanel.php:252 +#: actions/pathsadminpanel.php:279 msgid "Avatars" msgstr "アバター" -#: actions/pathsadminpanel.php:257 +#: actions/pathsadminpanel.php:284 msgid "Avatar server" msgstr "アバターサーバー" -#: actions/pathsadminpanel.php:261 +#: actions/pathsadminpanel.php:288 msgid "Avatar path" msgstr "アバターパス" -#: actions/pathsadminpanel.php:265 +#: actions/pathsadminpanel.php:292 msgid "Avatar directory" msgstr "アバターディレクトリ" -#: actions/pathsadminpanel.php:274 +#: actions/pathsadminpanel.php:301 msgid "Backgrounds" msgstr "バックグラウンド" -#: actions/pathsadminpanel.php:278 +#: actions/pathsadminpanel.php:305 msgid "Background server" msgstr "バックグラウンドサーバー" -#: actions/pathsadminpanel.php:282 +#: actions/pathsadminpanel.php:309 msgid "Background path" msgstr "バックグラウンドパス" -#: actions/pathsadminpanel.php:286 +#: actions/pathsadminpanel.php:313 msgid "Background directory" msgstr "バックグラウンドディレクトリ" -#: actions/pathsadminpanel.php:293 +#: actions/pathsadminpanel.php:320 msgid "SSL" msgstr "SSL" -#: actions/pathsadminpanel.php:296 actions/siteadminpanel.php:346 +#: actions/pathsadminpanel.php:323 actions/siteadminpanel.php:294 msgid "Never" msgstr "" -#: actions/pathsadminpanel.php:297 +#: actions/pathsadminpanel.php:324 msgid "Sometimes" msgstr "ときどき" -#: actions/pathsadminpanel.php:298 +#: actions/pathsadminpanel.php:325 msgid "Always" msgstr "いつも" -#: actions/pathsadminpanel.php:302 +#: actions/pathsadminpanel.php:329 msgid "Use SSL" msgstr "SSL 使用" -#: actions/pathsadminpanel.php:303 +#: actions/pathsadminpanel.php:330 msgid "When to use SSL" msgstr "SSL 使用時" -#: actions/pathsadminpanel.php:308 +#: actions/pathsadminpanel.php:335 msgid "SSL server" msgstr "SSLサーバ" -#: actions/pathsadminpanel.php:309 +#: actions/pathsadminpanel.php:336 msgid "Server to direct SSL requests to" msgstr "ダイレクト SSL リクエストを向けるサーバ" -#: actions/pathsadminpanel.php:325 +#: actions/pathsadminpanel.php:352 msgid "Save paths" msgstr "保存パス" @@ -2606,7 +2679,7 @@ msgstr "" "自分自身についてのタグ (アルファベット、数字、-、.、_)、カンマまたは空白区切" "りで" -#: actions/profilesettings.php:151 actions/siteadminpanel.php:294 +#: actions/profilesettings.php:151 actions/siteadminpanel.php:280 msgid "Language" msgstr "言語" @@ -2632,7 +2705,7 @@ msgstr "自分をフォローしている者を自動的にフォローする (B msgid "Bio is too long (max %d chars)." msgstr "自己紹介が長すぎます (最長140文字)。" -#: actions/profilesettings.php:235 actions/siteadminpanel.php:164 +#: actions/profilesettings.php:235 actions/siteadminpanel.php:150 msgid "Timezone not selected." msgstr "タイムゾーンが選ばれていません。" @@ -2907,7 +2980,7 @@ msgstr "すみません、不正な招待コード。" msgid "Registration successful" msgstr "登録成功" -#: actions/register.php:114 actions/register.php:503 lib/action.php:457 +#: actions/register.php:114 actions/register.php:503 lib/action.php:463 #: lib/logingroupnav.php:85 msgid "Register" msgstr "登録" @@ -2950,7 +3023,7 @@ msgid "Same as password above. Required." msgstr "上のパスワードと同じです。 必須。" #: actions/register.php:438 actions/register.php:442 -#: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120 +#: actions/siteadminpanel.php:256 lib/accountsettingsaction.php:120 msgid "Email" msgstr "メール" @@ -3107,6 +3180,11 @@ msgstr "繰り返されました!" msgid "Replies to %s" msgstr "%s への返信" +#: actions/replies.php:127 +#, fuzzy, php-format +msgid "Replies to %1$s, page %2$d" +msgstr "%2$s 上の %1$s への返信!" + #: actions/replies.php:144 #, php-format msgid "Replies feed for %s (RSS 1.0)" @@ -3238,6 +3316,11 @@ msgstr "" "注意: 私たちはHMAC-SHA1署名をサポートします。 私たちは平文署名メソッドをサ" "ポートしません。" +#: actions/showfavorites.php:79 +#, fuzzy, php-format +msgid "%1$s's favorite notices, page %2$d" +msgstr "%s のお気に入りのつぶやき" + #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "お気に入りのつぶやきを検索できません。" @@ -3295,6 +3378,11 @@ msgstr "これは、あなたが好きなことを共有する方法です。" msgid "%s group" msgstr "%s グループ" +#: actions/showgroup.php:84 +#, fuzzy, php-format +msgid "%1$s group, page %2$d" +msgstr "%1$s グループメンバー、ページ %2$d" + #: actions/showgroup.php:218 msgid "Group profile" msgstr "グループプロファイル" @@ -3414,6 +3502,11 @@ msgstr "つぶやきを削除しました。" msgid " tagged %s" msgstr "タグ付けされた %s" +#: actions/showstream.php:79 +#, fuzzy, php-format +msgid "%1$s, page %2$d" +msgstr "%1$s と友人、ページ %2$d" + #: actions/showstream.php:122 #, php-format msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" @@ -3503,197 +3596,149 @@ msgstr "利用者は既に黙っています。" msgid "Basic settings for this StatusNet site." msgstr "この StatusNet サイトの基本設定。" -#: actions/siteadminpanel.php:146 +#: actions/siteadminpanel.php:132 msgid "Site name must have non-zero length." msgstr "サイト名は長さ0ではいけません。" -#: actions/siteadminpanel.php:154 +#: actions/siteadminpanel.php:140 msgid "You must have a valid contact email address." msgstr "有効な連絡用メールアドレスがなければなりません。" -#: actions/siteadminpanel.php:172 +#: actions/siteadminpanel.php:158 #, php-format msgid "Unknown language \"%s\"." msgstr "不明な言語 \"%s\"" -#: actions/siteadminpanel.php:179 +#: actions/siteadminpanel.php:165 msgid "Invalid snapshot report URL." msgstr "不正なスナップショットレポートURL。" -#: actions/siteadminpanel.php:185 +#: actions/siteadminpanel.php:171 msgid "Invalid snapshot run value." msgstr "不正なスナップショットランバリュー" -#: actions/siteadminpanel.php:191 +#: actions/siteadminpanel.php:177 msgid "Snapshot frequency must be a number." msgstr "スナップショット頻度は数でなければなりません。" -#: actions/siteadminpanel.php:197 +#: actions/siteadminpanel.php:183 msgid "Minimum text limit is 140 characters." msgstr "最小のテキスト制限は140字です。" -#: actions/siteadminpanel.php:203 +#: actions/siteadminpanel.php:189 msgid "Dupe limit must 1 or more seconds." msgstr "デュープ制限は1秒以上でなければなりません。" -#: actions/siteadminpanel.php:253 +#: actions/siteadminpanel.php:239 msgid "General" msgstr "一般" -#: actions/siteadminpanel.php:256 +#: actions/siteadminpanel.php:242 msgid "Site name" msgstr "サイト名" -#: actions/siteadminpanel.php:257 +#: actions/siteadminpanel.php:243 msgid "The name of your site, like \"Yourcompany Microblog\"" msgstr "あなたのサイトの名前、\"Yourcompany Microblog\"のような。" -#: actions/siteadminpanel.php:261 +#: actions/siteadminpanel.php:247 msgid "Brought by" msgstr "持って来られます" -#: actions/siteadminpanel.php:262 +#: actions/siteadminpanel.php:248 msgid "Text used for credits link in footer of each page" msgstr "" "クレジットに使用されるテキストは、それぞれのページのフッターでリンクされま" "す。" -#: actions/siteadminpanel.php:266 +#: actions/siteadminpanel.php:252 msgid "Brought by URL" msgstr "URLで、持って来られます" -#: actions/siteadminpanel.php:267 +#: actions/siteadminpanel.php:253 msgid "URL used for credits link in footer of each page" msgstr "" "クレジットに使用されるURLは、それぞれのページのフッターでリンクされます。" -#: actions/siteadminpanel.php:271 +#: actions/siteadminpanel.php:257 msgid "Contact email address for your site" msgstr "あなたのサイトにコンタクトするメールアドレス" -#: actions/siteadminpanel.php:277 +#: actions/siteadminpanel.php:263 msgid "Local" msgstr "ローカル" -#: actions/siteadminpanel.php:288 +#: actions/siteadminpanel.php:274 msgid "Default timezone" msgstr "デフォルトタイムゾーン" -#: actions/siteadminpanel.php:289 +#: actions/siteadminpanel.php:275 msgid "Default timezone for the site; usually UTC." msgstr "サイトのデフォルトタイムゾーン; 通常UTC。" -#: actions/siteadminpanel.php:295 +#: actions/siteadminpanel.php:281 msgid "Default site language" msgstr "デフォルトサイト言語" -#: actions/siteadminpanel.php:303 -msgid "URLs" -msgstr "" - -#: actions/siteadminpanel.php:306 -msgid "Server" -msgstr "サーバー" - -#: actions/siteadminpanel.php:306 -msgid "Site's server hostname." -msgstr "サイトのサーバーホスト名" - -#: actions/siteadminpanel.php:310 -msgid "Fancy URLs" -msgstr "" - -#: actions/siteadminpanel.php:312 -msgid "Use fancy (more readable and memorable) URLs?" -msgstr "Fancy URL (読みやすく忘れにくい) を使用しますか?" - -#: actions/siteadminpanel.php:318 -msgid "Access" -msgstr "アクセス" - -#: actions/siteadminpanel.php:321 -msgid "Private" -msgstr "プライベート" - -#: actions/siteadminpanel.php:323 -msgid "Prohibit anonymous users (not logged in) from viewing site?" -msgstr "匿名ユーザー(ログインしていません)がサイトを見るのを禁止しますか?" - -#: actions/siteadminpanel.php:327 -msgid "Invite only" -msgstr "招待のみ" - -#: actions/siteadminpanel.php:329 -msgid "Make registration invitation only." -msgstr "招待のみ登録する" - -#: actions/siteadminpanel.php:333 -msgid "Closed" -msgstr "閉じられた" - -#: actions/siteadminpanel.php:335 -msgid "Disable new registrations." -msgstr "新規登録を無効。" - -#: actions/siteadminpanel.php:341 +#: actions/siteadminpanel.php:289 msgid "Snapshots" msgstr "スナップショット" -#: actions/siteadminpanel.php:344 +#: actions/siteadminpanel.php:292 msgid "Randomly during Web hit" msgstr "" -#: actions/siteadminpanel.php:345 +#: actions/siteadminpanel.php:293 msgid "In a scheduled job" msgstr "予定されているジョブで" -#: actions/siteadminpanel.php:347 +#: actions/siteadminpanel.php:295 msgid "Data snapshots" msgstr "データスナップショット" -#: actions/siteadminpanel.php:348 +#: actions/siteadminpanel.php:296 msgid "When to send statistical data to status.net servers" msgstr "いつ status.net サーバに統計データを送りますか" -#: actions/siteadminpanel.php:353 +#: actions/siteadminpanel.php:301 msgid "Frequency" msgstr "頻度" -#: actions/siteadminpanel.php:354 +#: actions/siteadminpanel.php:302 msgid "Snapshots will be sent once every N web hits" msgstr "レポート URL" -#: actions/siteadminpanel.php:359 +#: actions/siteadminpanel.php:307 msgid "Report URL" msgstr "レポート URL" -#: actions/siteadminpanel.php:360 +#: actions/siteadminpanel.php:308 msgid "Snapshots will be sent to this URL" msgstr "このURLにスナップショットを送るでしょう" -#: actions/siteadminpanel.php:367 +#: actions/siteadminpanel.php:315 msgid "Limits" msgstr "制限" -#: actions/siteadminpanel.php:370 +#: actions/siteadminpanel.php:318 msgid "Text limit" msgstr "テキスト制限" -#: actions/siteadminpanel.php:370 +#: actions/siteadminpanel.php:318 msgid "Maximum number of characters for notices." msgstr "つぶやきの文字の最大数" -#: actions/siteadminpanel.php:374 +#: actions/siteadminpanel.php:322 msgid "Dupe limit" msgstr "デュープ制限" -#: actions/siteadminpanel.php:374 +#: actions/siteadminpanel.php:322 msgid "How long users must wait (in seconds) to post the same thing again." msgstr "" "どれくらい長い間(秒)、ユーザは、再び同じものを投稿するのを待たなければならな" "いか。" -#: actions/siteadminpanel.php:388 actions/useradminpanel.php:313 +#: actions/siteadminpanel.php:336 actions/useradminpanel.php:313 msgid "Save site settings" msgstr "サイト設定の保存" @@ -3902,6 +3947,11 @@ msgstr "Jabber" msgid "SMS" msgstr "SMS" +#: actions/tag.php:68 +#, fuzzy, php-format +msgid "Notices tagged with %1$s, page %2$d" +msgstr "ユーザ自身がつけたタグ %1$s - ページ %2$d" + #: actions/tag.php:86 #, php-format msgid "Notice feed for tag %s (RSS 1.0)" @@ -4201,6 +4251,11 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "あなたのhotdogを楽しんでください!" +#: actions/usergroups.php:64 +#, fuzzy, php-format +msgid "%1$s groups, page %2$d" +msgstr "%1$s グループメンバー、ページ %2$d" + #: actions/usergroups.php:130 msgid "Search for more groups" msgstr "もっとグループを検索" @@ -4264,7 +4319,7 @@ msgstr "" msgid "Plugins" msgstr "プラグイン" -#: actions/version.php:196 lib/action.php:741 +#: actions/version.php:196 lib/action.php:747 msgid "Version" msgstr "バージョン" @@ -4323,26 +4378,26 @@ msgstr "メッセージを追加できません。" msgid "Could not update message with new URI." msgstr "新しいURIでメッセージをアップデートできませんでした。" -#: classes/Notice.php:171 +#: classes/Notice.php:157 #, php-format msgid "DB error inserting hashtag: %s" msgstr "ハッシュタグ追加 ＤＢ エラー: %s" -#: classes/Notice.php:225 +#: classes/Notice.php:214 msgid "Problem saving notice. Too long." msgstr "つぶやきを保存する際に問題が発生しました。長すぎです。" -#: classes/Notice.php:229 +#: classes/Notice.php:218 msgid "Problem saving notice. Unknown user." msgstr "つぶやきを保存する際に問題が発生しました。不明な利用者です。" -#: classes/Notice.php:234 +#: classes/Notice.php:223 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "多すぎるつぶやきが速すぎます; 数分間の休みを取ってから再投稿してください。" -#: classes/Notice.php:240 +#: classes/Notice.php:229 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." @@ -4350,20 +4405,25 @@ msgstr "" "多すぎる重複メッセージが速すぎます; 数分間休みを取ってから再度投稿してくださ" "い。" -#: classes/Notice.php:246 +#: classes/Notice.php:235 msgid "You are banned from posting notices on this site." msgstr "あなたはこのサイトでつぶやきを投稿するのが禁止されています。" -#: classes/Notice.php:305 classes/Notice.php:330 +#: classes/Notice.php:294 classes/Notice.php:319 msgid "Problem saving notice." msgstr "つぶやきを保存する際に問題が発生しました。" -#: classes/Notice.php:1059 +#: classes/Notice.php:790 +#, fuzzy +msgid "Problem saving group inbox." +msgstr "つぶやきを保存する際に問題が発生しました。" + +#: classes/Notice.php:850 #, php-format msgid "DB error inserting reply: %s" msgstr "返信を追加する際にデータベースエラー : %s" -#: classes/Notice.php:1441 +#: classes/Notice.php:1233 #, php-format msgid "RT @%1$s %2$s" msgstr "" @@ -4418,124 +4478,124 @@ msgstr "" msgid "Untitled page" msgstr "名称未設定ページ" -#: lib/action.php:427 +#: lib/action.php:433 msgid "Primary site navigation" msgstr "プライマリサイトナビゲーション" -#: lib/action.php:433 +#: lib/action.php:439 msgid "Home" msgstr "ホーム" -#: lib/action.php:433 +#: lib/action.php:439 msgid "Personal profile and friends timeline" msgstr "パーソナルプロファイルと友人のタイムライン" -#: lib/action.php:435 +#: lib/action.php:441 msgid "Change your email, avatar, password, profile" msgstr "メールアドレス、アバター、パスワード、プロパティの変更" -#: lib/action.php:438 +#: lib/action.php:444 msgid "Connect" msgstr "接続" -#: lib/action.php:438 +#: lib/action.php:444 msgid "Connect to services" msgstr "サービスへ接続" -#: lib/action.php:442 +#: lib/action.php:448 msgid "Change site configuration" msgstr "サイト設定の変更" -#: lib/action.php:446 lib/subgroupnav.php:105 +#: lib/action.php:452 lib/subgroupnav.php:105 msgid "Invite" msgstr "招待" -#: lib/action.php:447 lib/subgroupnav.php:106 +#: lib/action.php:453 lib/subgroupnav.php:106 #, php-format msgid "Invite friends and colleagues to join you on %s" msgstr "友人や同僚が %s で加わるよう誘ってください。" -#: lib/action.php:452 +#: lib/action.php:458 msgid "Logout" msgstr "ログアウト" -#: lib/action.php:452 +#: lib/action.php:458 msgid "Logout from the site" msgstr "サイトからログアウト" -#: lib/action.php:457 +#: lib/action.php:463 msgid "Create an account" msgstr "アカウントを作成" -#: lib/action.php:460 +#: lib/action.php:466 msgid "Login to the site" msgstr "サイトへログイン" -#: lib/action.php:463 lib/action.php:726 +#: lib/action.php:469 lib/action.php:732 msgid "Help" msgstr "ヘルプ" -#: lib/action.php:463 +#: lib/action.php:469 msgid "Help me!" msgstr "助けて！" -#: lib/action.php:466 lib/searchaction.php:127 +#: lib/action.php:472 lib/searchaction.php:127 msgid "Search" msgstr "検索" -#: lib/action.php:466 +#: lib/action.php:472 msgid "Search for people or text" msgstr "人々かテキストを検索" -#: lib/action.php:487 +#: lib/action.php:493 msgid "Site notice" msgstr "サイトつぶやき" -#: lib/action.php:553 +#: lib/action.php:559 msgid "Local views" msgstr "ローカルビュー" -#: lib/action.php:619 +#: lib/action.php:625 msgid "Page notice" msgstr "ページつぶやき" -#: lib/action.php:721 +#: lib/action.php:727 msgid "Secondary site navigation" msgstr "セカンダリサイトナビゲーション" -#: lib/action.php:728 +#: lib/action.php:734 msgid "About" msgstr "About" -#: lib/action.php:730 +#: lib/action.php:736 msgid "FAQ" msgstr "よくある質問" -#: lib/action.php:734 +#: lib/action.php:740 msgid "TOS" msgstr "" -#: lib/action.php:737 +#: lib/action.php:743 msgid "Privacy" msgstr "プライバシー" -#: lib/action.php:739 +#: lib/action.php:745 msgid "Source" msgstr "ソース" -#: lib/action.php:743 +#: lib/action.php:749 msgid "Contact" msgstr "連絡先" -#: lib/action.php:745 +#: lib/action.php:751 msgid "Badge" msgstr "バッジ" -#: lib/action.php:773 +#: lib/action.php:779 msgid "StatusNet software license" msgstr "StatusNet ソフトウェアライセンス" -#: lib/action.php:776 +#: lib/action.php:782 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -4544,12 +4604,12 @@ msgstr "" "**%%site.name%%** は [%%site.broughtby%%](%%site.broughtbyurl%%) が提供するマ" "イクロブログサービスです。 " -#: lib/action.php:778 +#: lib/action.php:784 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "**%%site.name%%** はマイクロブログサービスです。 " -#: lib/action.php:780 +#: lib/action.php:786 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4560,41 +4620,41 @@ msgstr "" "いています。 ライセンス [GNU Affero General Public License](http://www.fsf." "org/licensing/licenses/agpl-3.0.html)。" -#: lib/action.php:795 +#: lib/action.php:801 msgid "Site content license" msgstr "サイト内容ライセンス" -#: lib/action.php:800 +#: lib/action.php:806 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "" -#: lib/action.php:805 +#: lib/action.php:811 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" -#: lib/action.php:808 +#: lib/action.php:814 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" -#: lib/action.php:820 +#: lib/action.php:826 msgid "All " msgstr "全て " -#: lib/action.php:825 +#: lib/action.php:831 msgid "license." msgstr "ライセンス。" -#: lib/action.php:1124 +#: lib/action.php:1130 msgid "Pagination" msgstr "ページ化" -#: lib/action.php:1133 +#: lib/action.php:1139 msgid "After" msgstr "<<後" -#: lib/action.php:1141 +#: lib/action.php:1147 msgid "Before" msgstr "前>>" @@ -4626,10 +4686,24 @@ msgstr "基本サイト設定" msgid "Design configuration" msgstr "デザイン設定" -#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327 +#: lib/adminpanelaction.php:322 +#, fuzzy +msgid "User configuration" +msgstr "パス設定" + +#: lib/adminpanelaction.php:327 +#, fuzzy +msgid "Access configuration" +msgstr "デザイン設定" + +#: lib/adminpanelaction.php:332 msgid "Paths configuration" msgstr "パス設定" +#: lib/applicationeditform.php:136 +msgid "Edit application" +msgstr "アプリケーション編集" + #: lib/applicationeditform.php:186 msgid "Icon for this application" msgstr "このアプリケーションのアイコン" @@ -5204,12 +5278,12 @@ msgstr "MB" msgid "kB" msgstr "kB" -#: lib/jabber.php:202 +#: lib/jabber.php:220 #, php-format msgid "[%s]" msgstr "" -#: lib/jabber.php:385 +#: lib/jabber.php:400 #, php-format msgid "Unknown inbox source %d." msgstr "不明な受信箱のソース %d。" @@ -5712,19 +5786,19 @@ msgstr "返信" msgid "Favorites" msgstr "お気に入り" -#: lib/personalgroupnav.php:124 +#: lib/personalgroupnav.php:125 msgid "Inbox" msgstr "受信箱" -#: lib/personalgroupnav.php:125 +#: lib/personalgroupnav.php:126 msgid "Your incoming messages" msgstr "あなたの入ってくるメッセージ" -#: lib/personalgroupnav.php:129 +#: lib/personalgroupnav.php:130 msgid "Outbox" msgstr "送信箱" -#: lib/personalgroupnav.php:130 +#: lib/personalgroupnav.php:131 msgid "Your sent messages" msgstr "あなたが送ったメッセージ" @@ -5967,47 +6041,47 @@ msgstr "メッセージ" msgid "Moderate" msgstr "司会" -#: lib/util.php:875 +#: lib/util.php:868 msgid "a few seconds ago" msgstr "数秒前" -#: lib/util.php:877 +#: lib/util.php:870 msgid "about a minute ago" msgstr "約 1 分前" -#: lib/util.php:879 +#: lib/util.php:872 #, php-format msgid "about %d minutes ago" msgstr "約 %d 分前" -#: lib/util.php:881 +#: lib/util.php:874 msgid "about an hour ago" msgstr "約 1 時間前" -#: lib/util.php:883 +#: lib/util.php:876 #, php-format msgid "about %d hours ago" msgstr "約 %d 時間前" -#: lib/util.php:885 +#: lib/util.php:878 msgid "about a day ago" msgstr "約 1 日前" -#: lib/util.php:887 +#: lib/util.php:880 #, php-format msgid "about %d days ago" msgstr "約 %d 日前" -#: lib/util.php:889 +#: lib/util.php:882 msgid "about a month ago" msgstr "約 1 ヵ月前" -#: lib/util.php:891 +#: lib/util.php:884 #, php-format msgid "about %d months ago" msgstr "約 %d ヵ月前" -#: lib/util.php:893 +#: lib/util.php:886 msgid "about a year ago" msgstr "約 1 年前" @@ -6021,7 +6095,7 @@ msgstr "%sは有効な色ではありません!" msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "%s は有効な色ではありません! 3か6の16進数を使ってください。" -#: scripts/xmppdaemon.php:301 +#: lib/xmppmanager.php:402 #, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "メッセージが長すぎます - 最大 %1$d 字、あなたが送ったのは %2$d。" diff --git a/locale/ko/LC_MESSAGES/statusnet.po b/locale/ko/LC_MESSAGES/statusnet.po index b8197af3ee..bd2600be2c 100644 --- a/locale/ko/LC_MESSAGES/statusnet.po +++ b/locale/ko/LC_MESSAGES/statusnet.po @@ -7,17 +7,75 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-21 22:36+0000\n" -"PO-Revision-Date: 2010-01-21 22:38:00+0000\n" +"POT-Creation-Date: 2010-01-27 23:58+0000\n" +"PO-Revision-Date: 2010-01-27 23:59:18+0000\n" "Language-Team: Korean\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r61339); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61595); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ko\n" "X-Message-Group: out-statusnet\n" "Plural-Forms: nplurals=1; plural=0;\n" +#: actions/accessadminpanel.php:54 lib/adminpanelaction.php:326 +#, fuzzy +msgid "Access" +msgstr "수락" + +#: actions/accessadminpanel.php:65 +#, fuzzy +msgid "Site access settings" +msgstr "아바타 설정" + +#: actions/accessadminpanel.php:158 +#, fuzzy +msgid "Registration" +msgstr "회원가입" + +#: actions/accessadminpanel.php:161 +#, fuzzy +msgid "Private" +msgstr "개인정보 취급방침" + +#: actions/accessadminpanel.php:163 +msgid "Prohibit anonymous users (not logged in) from viewing site?" +msgstr "" + +#: actions/accessadminpanel.php:167 +#, fuzzy +msgid "Invite only" +msgstr "초대" + +#: actions/accessadminpanel.php:169 +msgid "Make registration invitation only." +msgstr "" + +#: actions/accessadminpanel.php:173 +#, fuzzy +msgid "Closed" +msgstr "차단하기" + +#: actions/accessadminpanel.php:175 +msgid "Disable new registrations." +msgstr "" + +#: actions/accessadminpanel.php:189 actions/designadminpanel.php:586 +#: actions/emailsettings.php:195 actions/imsettings.php:163 +#: actions/othersettings.php:126 actions/pathsadminpanel.php:351 +#: actions/profilesettings.php:174 actions/siteadminpanel.php:336 +#: actions/smssettings.php:181 actions/subscriptions.php:203 +#: actions/tagother.php:154 actions/useradminpanel.php:313 +#: lib/applicationeditform.php:335 lib/applicationeditform.php:336 +#: lib/designsettings.php:256 lib/groupeditform.php:202 +msgid "Save" +msgstr "저장" + +#: actions/accessadminpanel.php:189 +#, fuzzy +msgid "Save access settings" +msgstr "아바타 설정" + #: actions/all.php:63 actions/public.php:97 actions/replies.php:92 #: actions/showfavorites.php:137 actions/tag.php:51 #, fuzzy @@ -33,7 +91,7 @@ msgstr "그러한 태그가 없습니다." #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:149 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 @@ -133,8 +191,7 @@ msgstr "%1$s 및 %2$s에 있는 친구들의 업데이트!" #: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 #: actions/apitimelinefriends.php:155 actions/apitimelinegroup.php:150 #: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 -#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 #, fuzzy @@ -151,7 +208,7 @@ msgstr "API 메서드를 찾을 수 없습니다." #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:119 +#: actions/apistatusesupdate.php:118 msgid "This method requires a POST." msgstr "이 메서드는 등록을 요구합니다." @@ -182,7 +239,7 @@ msgstr "프로필을 저장 할 수 없습니다." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:132 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 #: actions/designadminpanel.php:122 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -495,7 +552,14 @@ msgstr "" msgid "Allow or deny access" msgstr "" -#: actions/apioauthauthorize.php:320 lib/action.php:435 +#: actions/apioauthauthorize.php:306 +#, php-format +msgid "" +"The application %s by %s would like the " +"ability to %s your account data." +msgstr "" + +#: actions/apioauthauthorize.php:320 lib/action.php:441 msgid "Account" msgstr "계정" @@ -556,17 +620,17 @@ msgstr "아바타가 업데이트 되었습니다." msgid "No status with that ID found." msgstr "발견된 ID의 상태가 없습니다." -#: actions/apistatusesupdate.php:162 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "너무 깁니다. 통지의 최대 길이는 140글자 입니다." -#: actions/apistatusesupdate.php:203 +#: actions/apistatusesupdate.php:202 msgid "Not found" msgstr "찾지 못함" -#: actions/apistatusesupdate.php:226 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -618,11 +682,6 @@ msgstr "%s 공개 타임라인" msgid "%s updates from everyone!" msgstr "모두로부터의 업데이트 %s개!" -#: actions/apitimelineretweetedbyme.php:112 -#, php-format -msgid "Repeated by %s" -msgstr "" - #: actions/apitimelineretweetedtome.php:111 #, fuzzy, php-format msgid "Repeated to %s" @@ -1047,17 +1106,6 @@ msgstr "" msgid "Reset back to default" msgstr "" -#: actions/designadminpanel.php:586 actions/emailsettings.php:195 -#: actions/imsettings.php:163 actions/othersettings.php:126 -#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174 -#: actions/siteadminpanel.php:388 actions/smssettings.php:181 -#: actions/subscriptions.php:203 actions/tagother.php:154 -#: actions/useradminpanel.php:313 lib/applicationeditform.php:335 -#: lib/applicationeditform.php:336 lib/designsettings.php:256 -#: lib/groupeditform.php:202 -msgid "Save" -msgstr "저장" - #: actions/designadminpanel.php:587 lib/designsettings.php:257 msgid "Save design" msgstr "" @@ -1070,13 +1118,15 @@ msgstr "이 메시지는 favorite이 아닙니다." msgid "Add to favorites" msgstr "좋아하는 게시글로 추가하기" -#: actions/doc.php:69 -msgid "No such document." +#: actions/doc.php:155 +#, fuzzy, php-format +msgid "No such document \"%s\"" msgstr "그러한 문서는 없습니다." -#: actions/editapplication.php:54 lib/applicationeditform.php:136 -msgid "Edit application" -msgstr "" +#: actions/editapplication.php:54 +#, fuzzy +msgid "Edit Application" +msgstr "다른 옵션들" #: actions/editapplication.php:66 #, fuzzy @@ -1095,7 +1145,7 @@ msgid "No such application." msgstr "그러한 통지는 없습니다." #: actions/editapplication.php:127 actions/newapplication.php:110 -#: actions/showapplication.php:118 lib/action.php:1189 +#: actions/showapplication.php:118 lib/action.php:1195 msgid "There was a problem with your session token." msgstr "당신의 세션토큰관련 문제가 있습니다." @@ -1308,7 +1358,7 @@ msgid "Cannot normalize that email address" msgstr "그 이메일 주소를 정규화 할 수 없습니다." #: actions/emailsettings.php:331 actions/register.php:201 -#: actions/siteadminpanel.php:157 +#: actions/siteadminpanel.php:143 msgid "Not a valid email address." msgstr "유효한 이메일 주소가 아닙니다." @@ -1320,7 +1370,7 @@ msgstr "그 이메일 주소는 이미 귀하의 것입니다." msgid "That email address already belongs to another user." msgstr "그 이메일 주소는 이미 다른 사용자의 소유입니다." -#: actions/emailsettings.php:353 actions/imsettings.php:317 +#: actions/emailsettings.php:353 actions/imsettings.php:319 #: actions/smssettings.php:337 msgid "Couldn't insert confirmation code." msgstr "확인 코드를 추가 할 수 없습니다." @@ -1637,7 +1687,7 @@ msgstr "%s 그룹 회원, %d페이지" msgid "A list of the users in this group." msgstr "이 그룹의 회원리스트" -#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107 +#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107 msgid "Admin" msgstr "관리자" @@ -1830,6 +1880,11 @@ msgstr "" msgid "That is not your Jabber ID." msgstr "그 Jabber ID는 귀하의 것이 아닙니다." +#: actions/inbox.php:59 +#, fuzzy, php-format +msgid "Inbox for %1$s - page %2$d" +msgstr "%s의 받은쪽지함" + #: actions/inbox.php:62 #, php-format msgid "Inbox for %s" @@ -2004,7 +2059,7 @@ msgstr "틀린 계정 또는 비밀 번호" msgid "Error setting user. You are probably not authorized." msgstr "인증이 되지 않았습니다." -#: actions/login.php:188 actions/login.php:241 lib/action.php:460 +#: actions/login.php:188 actions/login.php:241 lib/action.php:466 #: lib/logingroupnav.php:79 msgid "Login" msgstr "로그인" @@ -2066,8 +2121,9 @@ msgid "No current status" msgstr "현재 상태가 없습니다." #: actions/newapplication.php:52 -msgid "New application" -msgstr "" +#, fuzzy +msgid "New Application" +msgstr "그러한 통지는 없습니다." #: actions/newapplication.php:64 #, fuzzy @@ -2260,8 +2316,8 @@ msgstr "연결" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1038 -#: lib/api.php:1066 lib/api.php:1176 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1039 +#: lib/api.php:1067 lib/api.php:1177 msgid "Not a supported data format." msgstr "지원하는 형식의 데이터가 아닙니다." @@ -2332,6 +2388,11 @@ msgstr "옳지 않은 통지 내용" msgid "Login token expired." msgstr "사이트에 로그인하세요." +#: actions/outbox.php:58 +#, fuzzy, php-format +msgid "Outbox for %1$s - page %2$d" +msgstr "%s의 보낸쪽지함" + #: actions/outbox.php:61 #, php-format msgid "Outbox for %s" @@ -2402,7 +2463,7 @@ msgstr "새 비밀번호를 저장 할 수 없습니다." msgid "Password saved." msgstr "비밀 번호 저장" -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:331 msgid "Paths" msgstr "" @@ -2410,142 +2471,159 @@ msgstr "" msgid "Path and server settings for this StatusNet site." msgstr "" -#: actions/pathsadminpanel.php:140 +#: actions/pathsadminpanel.php:157 #, fuzzy, php-format msgid "Theme directory not readable: %s" msgstr "이 페이지는 귀하가 승인한 미디어 타입에서는 이용할 수 없습니다." -#: actions/pathsadminpanel.php:146 +#: actions/pathsadminpanel.php:163 #, php-format msgid "Avatar directory not writable: %s" msgstr "" -#: actions/pathsadminpanel.php:152 +#: actions/pathsadminpanel.php:169 #, php-format msgid "Background directory not writable: %s" msgstr "" -#: actions/pathsadminpanel.php:160 +#: actions/pathsadminpanel.php:177 #, php-format msgid "Locales directory not readable: %s" msgstr "" -#: actions/pathsadminpanel.php:166 +#: actions/pathsadminpanel.php:183 msgid "Invalid SSL server. The maximum length is 255 characters." msgstr "" -#: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58 +#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58 #: lib/adminpanelaction.php:311 #, fuzzy msgid "Site" msgstr "초대" -#: actions/pathsadminpanel.php:221 +#: actions/pathsadminpanel.php:238 +#, fuzzy +msgid "Server" +msgstr "복구" + +#: actions/pathsadminpanel.php:238 +msgid "Site's server hostname." +msgstr "" + +#: actions/pathsadminpanel.php:242 msgid "Path" msgstr "" -#: actions/pathsadminpanel.php:221 +#: actions/pathsadminpanel.php:242 #, fuzzy msgid "Site path" msgstr "사이트 공지" -#: actions/pathsadminpanel.php:225 +#: actions/pathsadminpanel.php:246 msgid "Path to locales" msgstr "" -#: actions/pathsadminpanel.php:225 +#: actions/pathsadminpanel.php:246 msgid "Directory path to locales" msgstr "" -#: actions/pathsadminpanel.php:232 -msgid "Theme" -msgstr "" - -#: actions/pathsadminpanel.php:237 -msgid "Theme server" -msgstr "" - -#: actions/pathsadminpanel.php:241 -msgid "Theme path" -msgstr "" - -#: actions/pathsadminpanel.php:245 -msgid "Theme directory" +#: actions/pathsadminpanel.php:250 +msgid "Fancy URLs" msgstr "" #: actions/pathsadminpanel.php:252 +msgid "Use fancy (more readable and memorable) URLs?" +msgstr "" + +#: actions/pathsadminpanel.php:259 +msgid "Theme" +msgstr "" + +#: actions/pathsadminpanel.php:264 +msgid "Theme server" +msgstr "" + +#: actions/pathsadminpanel.php:268 +msgid "Theme path" +msgstr "" + +#: actions/pathsadminpanel.php:272 +msgid "Theme directory" +msgstr "" + +#: actions/pathsadminpanel.php:279 #, fuzzy msgid "Avatars" msgstr "아바타" -#: actions/pathsadminpanel.php:257 +#: actions/pathsadminpanel.php:284 #, fuzzy msgid "Avatar server" msgstr "아바타 설정" -#: actions/pathsadminpanel.php:261 +#: actions/pathsadminpanel.php:288 #, fuzzy msgid "Avatar path" msgstr "아바타가 업데이트 되었습니다." -#: actions/pathsadminpanel.php:265 +#: actions/pathsadminpanel.php:292 #, fuzzy msgid "Avatar directory" msgstr "아바타가 업데이트 되었습니다." -#: actions/pathsadminpanel.php:274 +#: actions/pathsadminpanel.php:301 msgid "Backgrounds" msgstr "" -#: actions/pathsadminpanel.php:278 +#: actions/pathsadminpanel.php:305 msgid "Background server" msgstr "" -#: actions/pathsadminpanel.php:282 +#: actions/pathsadminpanel.php:309 msgid "Background path" msgstr "" -#: actions/pathsadminpanel.php:286 +#: actions/pathsadminpanel.php:313 msgid "Background directory" msgstr "" -#: actions/pathsadminpanel.php:293 +#: actions/pathsadminpanel.php:320 #, fuzzy msgid "SSL" msgstr "SMS" -#: actions/pathsadminpanel.php:296 actions/siteadminpanel.php:346 +#: actions/pathsadminpanel.php:323 actions/siteadminpanel.php:294 #, fuzzy msgid "Never" msgstr "복구" -#: actions/pathsadminpanel.php:297 +#: actions/pathsadminpanel.php:324 #, fuzzy msgid "Sometimes" msgstr "통지" -#: actions/pathsadminpanel.php:298 +#: actions/pathsadminpanel.php:325 msgid "Always" msgstr "" -#: actions/pathsadminpanel.php:302 +#: actions/pathsadminpanel.php:329 msgid "Use SSL" msgstr "" -#: actions/pathsadminpanel.php:303 +#: actions/pathsadminpanel.php:330 msgid "When to use SSL" msgstr "" -#: actions/pathsadminpanel.php:308 +#: actions/pathsadminpanel.php:335 #, fuzzy msgid "SSL server" msgstr "복구" -#: actions/pathsadminpanel.php:309 +#: actions/pathsadminpanel.php:336 msgid "Server to direct SSL requests to" msgstr "" -#: actions/pathsadminpanel.php:325 +#: actions/pathsadminpanel.php:352 #, fuzzy msgid "Save paths" msgstr "사이트 공지" @@ -2656,7 +2734,7 @@ msgid "" "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated" msgstr "당신을 위한 태그, (문자,숫자,-, ., _로 구성) 콤마 혹은 공백으로 구분." -#: actions/profilesettings.php:151 actions/siteadminpanel.php:294 +#: actions/profilesettings.php:151 actions/siteadminpanel.php:280 msgid "Language" msgstr "언어" @@ -2682,7 +2760,7 @@ msgstr "나에게 구독하는 사람에게 자동 구독 신청" msgid "Bio is too long (max %d chars)." msgstr "자기소개가 너무 깁니다. (최대 140글자)" -#: actions/profilesettings.php:235 actions/siteadminpanel.php:164 +#: actions/profilesettings.php:235 actions/siteadminpanel.php:150 msgid "Timezone not selected." msgstr "타임존이 설정 되지 않았습니다." @@ -2948,7 +3026,7 @@ msgstr "확인 코드 오류" msgid "Registration successful" msgstr "회원 가입이 성공적입니다." -#: actions/register.php:114 actions/register.php:503 lib/action.php:457 +#: actions/register.php:114 actions/register.php:503 lib/action.php:463 #: lib/logingroupnav.php:85 msgid "Register" msgstr "회원가입" @@ -2990,7 +3068,7 @@ msgid "Same as password above. Required." msgstr "위와 같은 비밀 번호. 필수 사항." #: actions/register.php:438 actions/register.php:442 -#: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120 +#: actions/siteadminpanel.php:256 lib/accountsettingsaction.php:120 msgid "Email" msgstr "이메일" @@ -3154,6 +3232,11 @@ msgstr "생성" msgid "Replies to %s" msgstr "%s에 답신" +#: actions/replies.php:127 +#, fuzzy, php-format +msgid "Replies to %1$s, page %2$d" +msgstr "%2$s에서 %1$s까지 메시지" + #: actions/replies.php:144 #, fuzzy, php-format msgid "Replies feed for %s (RSS 1.0)" @@ -3283,6 +3366,11 @@ msgid "" "signature method." msgstr "" +#: actions/showfavorites.php:79 +#, fuzzy, php-format +msgid "%1$s's favorite notices, page %2$d" +msgstr "%s 님의 좋아하는 글들" + #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "좋아하는 게시글을 복구할 수 없습니다." @@ -3332,6 +3420,11 @@ msgstr "" msgid "%s group" msgstr "%s 그룹" +#: actions/showgroup.php:84 +#, fuzzy, php-format +msgid "%1$s group, page %2$d" +msgstr "%s 그룹 회원, %d페이지" + #: actions/showgroup.php:218 msgid "Group profile" msgstr "그룹 프로필" @@ -3447,6 +3540,11 @@ msgstr "게시글이 등록되었습니다." msgid " tagged %s" msgstr "%s 태그된 통지" +#: actions/showstream.php:79 +#, fuzzy, php-format +msgid "%1$s, page %2$d" +msgstr "%s 와 친구들, %d 페이지" + #: actions/showstream.php:122 #, fuzzy, php-format msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" @@ -3528,203 +3626,149 @@ msgstr "회원이 당신을 차단해왔습니다." msgid "Basic settings for this StatusNet site." msgstr "" -#: actions/siteadminpanel.php:146 +#: actions/siteadminpanel.php:132 msgid "Site name must have non-zero length." msgstr "" -#: actions/siteadminpanel.php:154 +#: actions/siteadminpanel.php:140 #, fuzzy msgid "You must have a valid contact email address." msgstr "유효한 이메일 주소가 아닙니다." -#: actions/siteadminpanel.php:172 +#: actions/siteadminpanel.php:158 #, php-format msgid "Unknown language \"%s\"." msgstr "" -#: actions/siteadminpanel.php:179 +#: actions/siteadminpanel.php:165 msgid "Invalid snapshot report URL." msgstr "" -#: actions/siteadminpanel.php:185 +#: actions/siteadminpanel.php:171 msgid "Invalid snapshot run value." msgstr "" -#: actions/siteadminpanel.php:191 +#: actions/siteadminpanel.php:177 msgid "Snapshot frequency must be a number." msgstr "" -#: actions/siteadminpanel.php:197 +#: actions/siteadminpanel.php:183 msgid "Minimum text limit is 140 characters." msgstr "" -#: actions/siteadminpanel.php:203 +#: actions/siteadminpanel.php:189 msgid "Dupe limit must 1 or more seconds." msgstr "" -#: actions/siteadminpanel.php:253 +#: actions/siteadminpanel.php:239 msgid "General" msgstr "" -#: actions/siteadminpanel.php:256 +#: actions/siteadminpanel.php:242 #, fuzzy msgid "Site name" msgstr "사이트 공지" -#: actions/siteadminpanel.php:257 +#: actions/siteadminpanel.php:243 msgid "The name of your site, like \"Yourcompany Microblog\"" msgstr "" -#: actions/siteadminpanel.php:261 +#: actions/siteadminpanel.php:247 msgid "Brought by" msgstr "" -#: actions/siteadminpanel.php:262 +#: actions/siteadminpanel.php:248 msgid "Text used for credits link in footer of each page" msgstr "" -#: actions/siteadminpanel.php:266 +#: actions/siteadminpanel.php:252 msgid "Brought by URL" msgstr "" -#: actions/siteadminpanel.php:267 +#: actions/siteadminpanel.php:253 msgid "URL used for credits link in footer of each page" msgstr "" -#: actions/siteadminpanel.php:271 +#: actions/siteadminpanel.php:257 #, fuzzy msgid "Contact email address for your site" msgstr "%s에 포스팅 할 새로운 이메일 주소" -#: actions/siteadminpanel.php:277 +#: actions/siteadminpanel.php:263 #, fuzzy msgid "Local" msgstr "로컬 뷰" -#: actions/siteadminpanel.php:288 +#: actions/siteadminpanel.php:274 msgid "Default timezone" msgstr "" -#: actions/siteadminpanel.php:289 +#: actions/siteadminpanel.php:275 msgid "Default timezone for the site; usually UTC." msgstr "" -#: actions/siteadminpanel.php:295 +#: actions/siteadminpanel.php:281 #, fuzzy msgid "Default site language" msgstr "언어 설정" -#: actions/siteadminpanel.php:303 -#, fuzzy -msgid "URLs" -msgstr "URL" - -#: actions/siteadminpanel.php:306 -#, fuzzy -msgid "Server" -msgstr "복구" - -#: actions/siteadminpanel.php:306 -msgid "Site's server hostname." -msgstr "" - -#: actions/siteadminpanel.php:310 -msgid "Fancy URLs" -msgstr "" - -#: actions/siteadminpanel.php:312 -msgid "Use fancy (more readable and memorable) URLs?" -msgstr "" - -#: actions/siteadminpanel.php:318 -#, fuzzy -msgid "Access" -msgstr "수락" - -#: actions/siteadminpanel.php:321 -#, fuzzy -msgid "Private" -msgstr "개인정보 취급방침" - -#: actions/siteadminpanel.php:323 -msgid "Prohibit anonymous users (not logged in) from viewing site?" -msgstr "" - -#: actions/siteadminpanel.php:327 -#, fuzzy -msgid "Invite only" -msgstr "초대" - -#: actions/siteadminpanel.php:329 -msgid "Make registration invitation only." -msgstr "" - -#: actions/siteadminpanel.php:333 -#, fuzzy -msgid "Closed" -msgstr "차단하기" - -#: actions/siteadminpanel.php:335 -msgid "Disable new registrations." -msgstr "" - -#: actions/siteadminpanel.php:341 +#: actions/siteadminpanel.php:289 msgid "Snapshots" msgstr "" -#: actions/siteadminpanel.php:344 +#: actions/siteadminpanel.php:292 msgid "Randomly during Web hit" msgstr "" -#: actions/siteadminpanel.php:345 +#: actions/siteadminpanel.php:293 msgid "In a scheduled job" msgstr "" -#: actions/siteadminpanel.php:347 +#: actions/siteadminpanel.php:295 msgid "Data snapshots" msgstr "" -#: actions/siteadminpanel.php:348 +#: actions/siteadminpanel.php:296 msgid "When to send statistical data to status.net servers" msgstr "" -#: actions/siteadminpanel.php:353 +#: actions/siteadminpanel.php:301 msgid "Frequency" msgstr "" -#: actions/siteadminpanel.php:354 +#: actions/siteadminpanel.php:302 msgid "Snapshots will be sent once every N web hits" msgstr "" -#: actions/siteadminpanel.php:359 +#: actions/siteadminpanel.php:307 msgid "Report URL" msgstr "" -#: actions/siteadminpanel.php:360 +#: actions/siteadminpanel.php:308 msgid "Snapshots will be sent to this URL" msgstr "" -#: actions/siteadminpanel.php:367 +#: actions/siteadminpanel.php:315 msgid "Limits" msgstr "" -#: actions/siteadminpanel.php:370 +#: actions/siteadminpanel.php:318 msgid "Text limit" msgstr "" -#: actions/siteadminpanel.php:370 +#: actions/siteadminpanel.php:318 msgid "Maximum number of characters for notices." msgstr "" -#: actions/siteadminpanel.php:374 +#: actions/siteadminpanel.php:322 msgid "Dupe limit" msgstr "" -#: actions/siteadminpanel.php:374 +#: actions/siteadminpanel.php:322 msgid "How long users must wait (in seconds) to post the same thing again." msgstr "" -#: actions/siteadminpanel.php:388 actions/useradminpanel.php:313 +#: actions/siteadminpanel.php:336 actions/useradminpanel.php:313 #, fuzzy msgid "Save site settings" msgstr "아바타 설정" @@ -3925,6 +3969,11 @@ msgstr "Jabber" msgid "SMS" msgstr "SMS" +#: actions/tag.php:68 +#, fuzzy, php-format +msgid "Notices tagged with %1$s, page %2$d" +msgstr "이용자 셀프 테크 %s - %d 페이지" + #: actions/tag.php:86 #, fuzzy, php-format msgid "Notice feed for tag %s (RSS 1.0)" @@ -4232,6 +4281,11 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "" +#: actions/usergroups.php:64 +#, fuzzy, php-format +msgid "%1$s groups, page %2$d" +msgstr "%s 그룹 회원, %d페이지" + #: actions/usergroups.php:130 #, fuzzy msgid "Search for more groups" @@ -4295,7 +4349,7 @@ msgstr "" msgid "Plugins" msgstr "" -#: actions/version.php:196 lib/action.php:741 +#: actions/version.php:196 lib/action.php:747 #, fuzzy msgid "Version" msgstr "개인적인" @@ -4354,28 +4408,28 @@ msgstr "메시지를 삽입할 수 없습니다." msgid "Could not update message with new URI." msgstr "새 URI와 함께 메시지를 업데이트할 수 없습니다." -#: classes/Notice.php:171 +#: classes/Notice.php:157 #, php-format msgid "DB error inserting hashtag: %s" msgstr "해쉬테그를 추가 할 때에 데이타베이스 에러 : %s" -#: classes/Notice.php:225 +#: classes/Notice.php:214 #, fuzzy msgid "Problem saving notice. Too long." msgstr "통지를 저장하는데 문제가 발생했습니다." -#: classes/Notice.php:229 +#: classes/Notice.php:218 msgid "Problem saving notice. Unknown user." msgstr "게시글 저장문제. 알려지지않은 회원" -#: classes/Notice.php:234 +#: classes/Notice.php:223 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "너무 많은 게시글이 너무 빠르게 올라옵니다. 한숨고르고 몇분후에 다시 포스트를 " "해보세요." -#: classes/Notice.php:240 +#: classes/Notice.php:229 #, fuzzy msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " @@ -4384,20 +4438,25 @@ msgstr "" "너무 많은 게시글이 너무 빠르게 올라옵니다. 한숨고르고 몇분후에 다시 포스트를 " "해보세요." -#: classes/Notice.php:246 +#: classes/Notice.php:235 msgid "You are banned from posting notices on this site." msgstr "이 사이트에 게시글 포스팅으로부터 당신은 금지되었습니다." -#: classes/Notice.php:305 classes/Notice.php:330 +#: classes/Notice.php:294 classes/Notice.php:319 msgid "Problem saving notice." msgstr "통지를 저장하는데 문제가 발생했습니다." -#: classes/Notice.php:1059 +#: classes/Notice.php:790 +#, fuzzy +msgid "Problem saving group inbox." +msgstr "통지를 저장하는데 문제가 발생했습니다." + +#: classes/Notice.php:850 #, php-format msgid "DB error inserting reply: %s" msgstr "답신을 추가 할 때에 데이타베이스 에러 : %s" -#: classes/Notice.php:1441 +#: classes/Notice.php:1233 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" @@ -4453,127 +4512,127 @@ msgstr "%1$s (%2$s)" msgid "Untitled page" msgstr "제목없는 페이지" -#: lib/action.php:427 +#: lib/action.php:433 msgid "Primary site navigation" msgstr "주 사이트 네비게이션" -#: lib/action.php:433 +#: lib/action.php:439 msgid "Home" msgstr "홈" -#: lib/action.php:433 +#: lib/action.php:439 msgid "Personal profile and friends timeline" msgstr "개인 프로필과 친구 타임라인" -#: lib/action.php:435 +#: lib/action.php:441 msgid "Change your email, avatar, password, profile" msgstr "당신의 이메일, 아바타, 비밀 번호, 프로필을 변경하세요." -#: lib/action.php:438 +#: lib/action.php:444 msgid "Connect" msgstr "연결" -#: lib/action.php:438 +#: lib/action.php:444 #, fuzzy msgid "Connect to services" msgstr "서버에 재접속 할 수 없습니다 : %s" -#: lib/action.php:442 +#: lib/action.php:448 #, fuzzy msgid "Change site configuration" msgstr "주 사이트 네비게이션" -#: lib/action.php:446 lib/subgroupnav.php:105 +#: lib/action.php:452 lib/subgroupnav.php:105 msgid "Invite" msgstr "초대" -#: lib/action.php:447 lib/subgroupnav.php:106 +#: lib/action.php:453 lib/subgroupnav.php:106 #, php-format msgid "Invite friends and colleagues to join you on %s" msgstr "%s에 친구를 가입시키기 위해 친구와 동료를 초대합니다." -#: lib/action.php:452 +#: lib/action.php:458 msgid "Logout" msgstr "로그아웃" -#: lib/action.php:452 +#: lib/action.php:458 msgid "Logout from the site" msgstr "이 사이트로부터 로그아웃" -#: lib/action.php:457 +#: lib/action.php:463 msgid "Create an account" msgstr "계정 만들기" -#: lib/action.php:460 +#: lib/action.php:466 msgid "Login to the site" msgstr "이 사이트 로그인" -#: lib/action.php:463 lib/action.php:726 +#: lib/action.php:469 lib/action.php:732 msgid "Help" msgstr "도움말" -#: lib/action.php:463 +#: lib/action.php:469 msgid "Help me!" msgstr "도움이 필요해!" -#: lib/action.php:466 lib/searchaction.php:127 +#: lib/action.php:472 lib/searchaction.php:127 msgid "Search" msgstr "검색" -#: lib/action.php:466 +#: lib/action.php:472 msgid "Search for people or text" msgstr "프로필이나 텍스트 검색" -#: lib/action.php:487 +#: lib/action.php:493 msgid "Site notice" msgstr "사이트 공지" -#: lib/action.php:553 +#: lib/action.php:559 msgid "Local views" msgstr "로컬 뷰" -#: lib/action.php:619 +#: lib/action.php:625 msgid "Page notice" msgstr "페이지 공지" -#: lib/action.php:721 +#: lib/action.php:727 msgid "Secondary site navigation" msgstr "보조 사이트 네비게이션" -#: lib/action.php:728 +#: lib/action.php:734 msgid "About" msgstr "정보" -#: lib/action.php:730 +#: lib/action.php:736 msgid "FAQ" msgstr "자주 묻는 질문" -#: lib/action.php:734 +#: lib/action.php:740 msgid "TOS" msgstr "" -#: lib/action.php:737 +#: lib/action.php:743 msgid "Privacy" msgstr "개인정보 취급방침" -#: lib/action.php:739 +#: lib/action.php:745 msgid "Source" msgstr "소스 코드" -#: lib/action.php:743 +#: lib/action.php:749 msgid "Contact" msgstr "연락하기" -#: lib/action.php:745 +#: lib/action.php:751 #, fuzzy msgid "Badge" msgstr "찔러 보기" -#: lib/action.php:773 +#: lib/action.php:779 msgid "StatusNet software license" msgstr "라코니카 소프트웨어 라이선스" -#: lib/action.php:776 +#: lib/action.php:782 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -4582,12 +4641,12 @@ msgstr "" "**%%site.name%%** 는 [%%site.broughtby%%](%%site.broughtbyurl%%)가 제공하는 " "마이크로블로깅서비스입니다." -#: lib/action.php:778 +#: lib/action.php:784 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "**%%site.name%%** 는 마이크로블로깅서비스입니다." -#: lib/action.php:780 +#: lib/action.php:786 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4598,42 +4657,42 @@ msgstr "" "을 사용합니다. StatusNet는 [GNU Affero General Public License](http://www." "fsf.org/licensing/licenses/agpl-3.0.html) 라이선스에 따라 사용할 수 있습니다." -#: lib/action.php:795 +#: lib/action.php:801 #, fuzzy msgid "Site content license" msgstr "라코니카 소프트웨어 라이선스" -#: lib/action.php:800 +#: lib/action.php:806 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "" -#: lib/action.php:805 +#: lib/action.php:811 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" -#: lib/action.php:808 +#: lib/action.php:814 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" -#: lib/action.php:820 +#: lib/action.php:826 msgid "All " msgstr "모든 것" -#: lib/action.php:825 +#: lib/action.php:831 msgid "license." msgstr "라이선스" -#: lib/action.php:1124 +#: lib/action.php:1130 msgid "Pagination" msgstr "페이지수" -#: lib/action.php:1133 +#: lib/action.php:1139 msgid "After" msgstr "뒷 페이지" -#: lib/action.php:1141 +#: lib/action.php:1147 msgid "Before" msgstr "앞 페이지" @@ -4672,11 +4731,25 @@ msgstr "이메일 주소 확인서" msgid "Design configuration" msgstr "SMS 인증" -#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327 +#: lib/adminpanelaction.php:322 +#, fuzzy +msgid "User configuration" +msgstr "SMS 인증" + +#: lib/adminpanelaction.php:327 +#, fuzzy +msgid "Access configuration" +msgstr "SMS 인증" + +#: lib/adminpanelaction.php:332 #, fuzzy msgid "Paths configuration" msgstr "SMS 인증" +#: lib/applicationeditform.php:136 +msgid "Edit application" +msgstr "" + #: lib/applicationeditform.php:186 msgid "Icon for this application" msgstr "" @@ -5263,12 +5336,12 @@ msgstr "" msgid "kB" msgstr "" -#: lib/jabber.php:202 +#: lib/jabber.php:220 #, php-format msgid "[%s]" msgstr "" -#: lib/jabber.php:385 +#: lib/jabber.php:400 #, php-format msgid "Unknown inbox source %d." msgstr "" @@ -5694,19 +5767,19 @@ msgstr "답신" msgid "Favorites" msgstr "좋아하는 글들" -#: lib/personalgroupnav.php:124 +#: lib/personalgroupnav.php:125 msgid "Inbox" msgstr "받은 쪽지함" -#: lib/personalgroupnav.php:125 +#: lib/personalgroupnav.php:126 msgid "Your incoming messages" msgstr "당신의 받은 메시지들" -#: lib/personalgroupnav.php:129 +#: lib/personalgroupnav.php:130 msgid "Outbox" msgstr "보낸 쪽지함" -#: lib/personalgroupnav.php:130 +#: lib/personalgroupnav.php:131 msgid "Your sent messages" msgstr "당신의 보낸 메시지들" @@ -5965,47 +6038,47 @@ msgstr "메시지" msgid "Moderate" msgstr "" -#: lib/util.php:875 +#: lib/util.php:868 msgid "a few seconds ago" msgstr "몇 초 전" -#: lib/util.php:877 +#: lib/util.php:870 msgid "about a minute ago" msgstr "1분 전" -#: lib/util.php:879 +#: lib/util.php:872 #, php-format msgid "about %d minutes ago" msgstr "%d분 전" -#: lib/util.php:881 +#: lib/util.php:874 msgid "about an hour ago" msgstr "1시간 전" -#: lib/util.php:883 +#: lib/util.php:876 #, php-format msgid "about %d hours ago" msgstr "%d시간 전" -#: lib/util.php:885 +#: lib/util.php:878 msgid "about a day ago" msgstr "하루 전" -#: lib/util.php:887 +#: lib/util.php:880 #, php-format msgid "about %d days ago" msgstr "%d일 전" -#: lib/util.php:889 +#: lib/util.php:882 msgid "about a month ago" msgstr "1달 전" -#: lib/util.php:891 +#: lib/util.php:884 #, php-format msgid "about %d months ago" msgstr "%d달 전" -#: lib/util.php:893 +#: lib/util.php:886 msgid "about a year ago" msgstr "1년 전" @@ -6019,7 +6092,7 @@ msgstr "홈페이지 주소형식이 올바르지 않습니다." msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "" -#: scripts/xmppdaemon.php:301 +#: lib/xmppmanager.php:402 #, fuzzy, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "당신이 보낸 메시지가 너무 길어요. 최대 140글자까지입니다." diff --git a/locale/mk/LC_MESSAGES/statusnet.po b/locale/mk/LC_MESSAGES/statusnet.po index 95eaff9439..441ccdb8bc 100644 --- a/locale/mk/LC_MESSAGES/statusnet.po +++ b/locale/mk/LC_MESSAGES/statusnet.po @@ -9,17 +9,73 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-21 22:36+0000\n" -"PO-Revision-Date: 2010-01-21 22:38:03+0000\n" +"POT-Creation-Date: 2010-01-27 23:58+0000\n" +"PO-Revision-Date: 2010-01-27 23:59:21+0000\n" "Language-Team: Macedonian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r61339); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61595); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: mk\n" "X-Message-Group: out-statusnet\n" "Plural-Forms: nplurals=2; plural= n==1 || n%10==1 ? 0 : 1;\n" +#: actions/accessadminpanel.php:54 lib/adminpanelaction.php:326 +msgid "Access" +msgstr "Пристап" + +#: actions/accessadminpanel.php:65 +#, fuzzy +msgid "Site access settings" +msgstr "Зачувај нагодувања на веб-страницата" + +#: actions/accessadminpanel.php:158 +#, fuzzy +msgid "Registration" +msgstr "Регистрирај се" + +#: actions/accessadminpanel.php:161 +msgid "Private" +msgstr "Приватен" + +#: actions/accessadminpanel.php:163 +msgid "Prohibit anonymous users (not logged in) from viewing site?" +msgstr "" +"Да им забранам на анонимните (ненајавени) корисници да ја гледаат веб-" +"страницата?" + +#: actions/accessadminpanel.php:167 +msgid "Invite only" +msgstr "Само со покана" + +#: actions/accessadminpanel.php:169 +msgid "Make registration invitation only." +msgstr "Регистрирање само со покана." + +#: actions/accessadminpanel.php:173 +msgid "Closed" +msgstr "Затворен" + +#: actions/accessadminpanel.php:175 +msgid "Disable new registrations." +msgstr "Оневозможи нови регистрации." + +#: actions/accessadminpanel.php:189 actions/designadminpanel.php:586 +#: actions/emailsettings.php:195 actions/imsettings.php:163 +#: actions/othersettings.php:126 actions/pathsadminpanel.php:351 +#: actions/profilesettings.php:174 actions/siteadminpanel.php:336 +#: actions/smssettings.php:181 actions/subscriptions.php:203 +#: actions/tagother.php:154 actions/useradminpanel.php:313 +#: lib/applicationeditform.php:335 lib/applicationeditform.php:336 +#: lib/designsettings.php:256 lib/groupeditform.php:202 +msgid "Save" +msgstr "Зачувај" + +#: actions/accessadminpanel.php:189 +#, fuzzy +msgid "Save access settings" +msgstr "Зачувај нагодувања на веб-страницата" + #: actions/all.php:63 actions/public.php:97 actions/replies.php:92 #: actions/showfavorites.php:137 actions/tag.php:51 msgid "No such page" @@ -34,7 +90,7 @@ msgstr "Нема таква страница" #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:149 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 @@ -142,8 +198,7 @@ msgstr "Подновувања од %1$s и пријатели на %2$s!" #: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 #: actions/apitimelinefriends.php:155 actions/apitimelinegroup.php:150 #: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 -#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found." @@ -159,7 +214,7 @@ msgstr "API методот не е пронајден." #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:119 +#: actions/apistatusesupdate.php:118 msgid "This method requires a POST." msgstr "Овој метод бара POST." @@ -190,7 +245,7 @@ msgstr "Не може да се зачува профил." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:132 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 #: actions/designadminpanel.php:122 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -493,7 +548,14 @@ msgstr "Има програм кој сака да се поврзе со Ваш msgid "Allow or deny access" msgstr "Дозволи или одбиј пристап" -#: actions/apioauthauthorize.php:320 lib/action.php:435 +#: actions/apioauthauthorize.php:306 +#, php-format +msgid "" +"The application %s by %s would like the " +"ability to %s your account data." +msgstr "" + +#: actions/apioauthauthorize.php:320 lib/action.php:441 msgid "Account" msgstr "Сметка" @@ -550,17 +612,17 @@ msgstr "Статусот е избришан." msgid "No status with that ID found." msgstr "Нема пронајдено статус со тој ID." -#: actions/apistatusesupdate.php:162 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Ова е предолго. Максималната дозволена должина изнесува %d знаци." -#: actions/apistatusesupdate.php:203 +#: actions/apistatusesupdate.php:202 msgid "Not found" msgstr "Не е пронајдено" -#: actions/apistatusesupdate.php:226 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -613,11 +675,6 @@ msgstr "Јавна историја на %s" msgid "%s updates from everyone!" msgstr "%s подновуввања од сите!" -#: actions/apitimelineretweetedbyme.php:112 -#, php-format -msgid "Repeated by %s" -msgstr "Повторено од %s" - #: actions/apitimelineretweetedtome.php:111 #, php-format msgid "Repeated to %s" @@ -1028,17 +1085,6 @@ msgstr "Врати основно-зададени нагодувања" msgid "Reset back to default" msgstr "Врати по основно" -#: actions/designadminpanel.php:586 actions/emailsettings.php:195 -#: actions/imsettings.php:163 actions/othersettings.php:126 -#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174 -#: actions/siteadminpanel.php:388 actions/smssettings.php:181 -#: actions/subscriptions.php:203 actions/tagother.php:154 -#: actions/useradminpanel.php:313 lib/applicationeditform.php:335 -#: lib/applicationeditform.php:336 lib/designsettings.php:256 -#: lib/groupeditform.php:202 -msgid "Save" -msgstr "Зачувај" - #: actions/designadminpanel.php:587 lib/designsettings.php:257 msgid "Save design" msgstr "Зачувај изглед" @@ -1051,12 +1097,14 @@ msgstr "Оваа забелешка не Ви е омилена!" msgid "Add to favorites" msgstr "Додај во омилени" -#: actions/doc.php:69 -msgid "No such document." +#: actions/doc.php:155 +#, fuzzy, php-format +msgid "No such document \"%s\"" msgstr "Нема таков документ." -#: actions/editapplication.php:54 lib/applicationeditform.php:136 -msgid "Edit application" +#: actions/editapplication.php:54 +#, fuzzy +msgid "Edit Application" msgstr "Уреди програм" #: actions/editapplication.php:66 @@ -1073,7 +1121,7 @@ msgid "No such application." msgstr "Нема таков програм." #: actions/editapplication.php:127 actions/newapplication.php:110 -#: actions/showapplication.php:118 lib/action.php:1189 +#: actions/showapplication.php:118 lib/action.php:1195 msgid "There was a problem with your session token." msgstr "Се појави проблем со Вашиот сесиски жетон." @@ -1277,7 +1325,7 @@ msgid "Cannot normalize that email address" msgstr "Неможам да ја нормализирам таа е-поштенска адреса" #: actions/emailsettings.php:331 actions/register.php:201 -#: actions/siteadminpanel.php:157 +#: actions/siteadminpanel.php:143 msgid "Not a valid email address." msgstr "Неправилна адреса за е-пошта." @@ -1289,7 +1337,7 @@ msgstr "Оваа е-поштенска адреса е веќе Ваша." msgid "That email address already belongs to another user." msgstr "Таа е-поштенска адреса е веќе зафатена од друг корисник." -#: actions/emailsettings.php:353 actions/imsettings.php:317 +#: actions/emailsettings.php:353 actions/imsettings.php:319 #: actions/smssettings.php:337 msgid "Couldn't insert confirmation code." msgstr "Кодот за потврда не може да се внесе." @@ -1599,7 +1647,7 @@ msgstr "Членови на групата %1$s, стр. %2$d" msgid "A list of the users in this group." msgstr "Листа на корисниците на овааг група." -#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107 +#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107 msgid "Admin" msgstr "Администратор" @@ -1796,6 +1844,11 @@ msgstr "" msgid "That is not your Jabber ID." msgstr "Ова не е Вашиот Jabber ID." +#: actions/inbox.php:59 +#, fuzzy, php-format +msgid "Inbox for %1$s - page %2$d" +msgstr "Приемно сандаче за %s" + #: actions/inbox.php:62 #, php-format msgid "Inbox for %s" @@ -1980,7 +2033,7 @@ msgstr "Неточно корисничко име или лозинка" msgid "Error setting user. You are probably not authorized." msgstr "Грешка при поставувањето на корисникот. Веројатно не се заверени." -#: actions/login.php:188 actions/login.php:241 lib/action.php:460 +#: actions/login.php:188 actions/login.php:241 lib/action.php:466 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Најава" @@ -2043,7 +2096,8 @@ msgid "No current status" msgstr "Нема тековен статус" #: actions/newapplication.php:52 -msgid "New application" +#, fuzzy +msgid "New Application" msgstr "Нов програм" #: actions/newapplication.php:64 @@ -2237,8 +2291,8 @@ msgstr "тип на содржини " msgid "Only " msgstr "Само " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1038 -#: lib/api.php:1066 lib/api.php:1176 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1039 +#: lib/api.php:1067 lib/api.php:1177 msgid "Not a supported data format." msgstr "Ова не е поддржан формат на податотека." @@ -2302,6 +2356,11 @@ msgstr "Назначен е неважечки најавен жетон." msgid "Login token expired." msgstr "Најавниот жетон е истечен." +#: actions/outbox.php:58 +#, fuzzy, php-format +msgid "Outbox for %1$s - page %2$d" +msgstr "Излезно сандаче за %s" + #: actions/outbox.php:61 #, php-format msgid "Outbox for %s" @@ -2374,7 +2433,7 @@ msgstr "Не можам да ја зачувам новата лозинка." msgid "Password saved." msgstr "Лозинката е зачувана." -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:331 msgid "Paths" msgstr "Патеки" @@ -2382,132 +2441,148 @@ msgstr "Патеки" msgid "Path and server settings for this StatusNet site." msgstr "Нагодувања за патеки и сервери за оваа StatusNet веб-страница." -#: actions/pathsadminpanel.php:140 +#: actions/pathsadminpanel.php:157 #, php-format msgid "Theme directory not readable: %s" msgstr "Директориумот на темата е нечитлив: %s" -#: actions/pathsadminpanel.php:146 +#: actions/pathsadminpanel.php:163 #, php-format msgid "Avatar directory not writable: %s" msgstr "Директориумот на аватарот е недостапен за пишување: %s" -#: actions/pathsadminpanel.php:152 +#: actions/pathsadminpanel.php:169 #, php-format msgid "Background directory not writable: %s" msgstr "Директориумот на позадината е нечитлив: %s" -#: actions/pathsadminpanel.php:160 +#: actions/pathsadminpanel.php:177 #, php-format msgid "Locales directory not readable: %s" msgstr "Директориумот на локалите е нечитлив: %s" -#: actions/pathsadminpanel.php:166 +#: actions/pathsadminpanel.php:183 msgid "Invalid SSL server. The maximum length is 255 characters." msgstr "Неважечки SSL-сервер. Дозволени се најмногу 255 знаци" -#: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58 +#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58 #: lib/adminpanelaction.php:311 msgid "Site" msgstr "Веб-страница" -#: actions/pathsadminpanel.php:221 +#: actions/pathsadminpanel.php:238 +msgid "Server" +msgstr "Опслужувач" + +#: actions/pathsadminpanel.php:238 +msgid "Site's server hostname." +msgstr "Име на домаќинот на серверот на веб-страницата" + +#: actions/pathsadminpanel.php:242 msgid "Path" msgstr "Патека" -#: actions/pathsadminpanel.php:221 +#: actions/pathsadminpanel.php:242 msgid "Site path" msgstr "Патека на веб-страницата" -#: actions/pathsadminpanel.php:225 +#: actions/pathsadminpanel.php:246 msgid "Path to locales" msgstr "Патека до локалите" -#: actions/pathsadminpanel.php:225 +#: actions/pathsadminpanel.php:246 msgid "Directory path to locales" msgstr "Патека до директориумот на локалите" -#: actions/pathsadminpanel.php:232 +#: actions/pathsadminpanel.php:250 +msgid "Fancy URLs" +msgstr "Интересни URL-адреси" + +#: actions/pathsadminpanel.php:252 +msgid "Use fancy (more readable and memorable) URLs?" +msgstr "Да користам интересни (почитливи и повпечатливи) URL-адреси?" + +#: actions/pathsadminpanel.php:259 msgid "Theme" msgstr "Тема" -#: actions/pathsadminpanel.php:237 +#: actions/pathsadminpanel.php:264 msgid "Theme server" msgstr "Сервер на темата" -#: actions/pathsadminpanel.php:241 +#: actions/pathsadminpanel.php:268 msgid "Theme path" msgstr "Патека до темата" -#: actions/pathsadminpanel.php:245 +#: actions/pathsadminpanel.php:272 msgid "Theme directory" msgstr "Директориум на темата" -#: actions/pathsadminpanel.php:252 +#: actions/pathsadminpanel.php:279 msgid "Avatars" msgstr "Аватари" -#: actions/pathsadminpanel.php:257 +#: actions/pathsadminpanel.php:284 msgid "Avatar server" msgstr "Сервер на аватарот" -#: actions/pathsadminpanel.php:261 +#: actions/pathsadminpanel.php:288 msgid "Avatar path" msgstr "Патека на аватарот" -#: actions/pathsadminpanel.php:265 +#: actions/pathsadminpanel.php:292 msgid "Avatar directory" msgstr "Директориум на аватарот" -#: actions/pathsadminpanel.php:274 +#: actions/pathsadminpanel.php:301 msgid "Backgrounds" msgstr "Позадини" -#: actions/pathsadminpanel.php:278 +#: actions/pathsadminpanel.php:305 msgid "Background server" msgstr "Сервер на позаднината" -#: actions/pathsadminpanel.php:282 +#: actions/pathsadminpanel.php:309 msgid "Background path" msgstr "Патека до позадината" -#: actions/pathsadminpanel.php:286 +#: actions/pathsadminpanel.php:313 msgid "Background directory" msgstr "Директориум на позадината" -#: actions/pathsadminpanel.php:293 +#: actions/pathsadminpanel.php:320 msgid "SSL" msgstr "SSL" -#: actions/pathsadminpanel.php:296 actions/siteadminpanel.php:346 +#: actions/pathsadminpanel.php:323 actions/siteadminpanel.php:294 msgid "Never" msgstr "Никогаш" -#: actions/pathsadminpanel.php:297 +#: actions/pathsadminpanel.php:324 msgid "Sometimes" msgstr "Понекогаш" -#: actions/pathsadminpanel.php:298 +#: actions/pathsadminpanel.php:325 msgid "Always" msgstr "Секогаш" -#: actions/pathsadminpanel.php:302 +#: actions/pathsadminpanel.php:329 msgid "Use SSL" msgstr "Користи SSL" -#: actions/pathsadminpanel.php:303 +#: actions/pathsadminpanel.php:330 msgid "When to use SSL" msgstr "Кога се користи SSL" -#: actions/pathsadminpanel.php:308 +#: actions/pathsadminpanel.php:335 msgid "SSL server" msgstr "SSL-сервер" -#: actions/pathsadminpanel.php:309 +#: actions/pathsadminpanel.php:336 msgid "Server to direct SSL requests to" msgstr "Сервер, кому ќе му се испраќаат SSL-барања" -#: actions/pathsadminpanel.php:325 +#: actions/pathsadminpanel.php:352 msgid "Save paths" msgstr "Зачувај патеки" @@ -2621,7 +2696,7 @@ msgstr "" "Ознаки за Вас самите (букви, бројки, -, . и _), одделени со запирка или " "празно место" -#: actions/profilesettings.php:151 actions/siteadminpanel.php:294 +#: actions/profilesettings.php:151 actions/siteadminpanel.php:280 msgid "Language" msgstr "Јазик" @@ -2649,7 +2724,7 @@ msgstr "" msgid "Bio is too long (max %d chars)." msgstr "Биографијата е преголема (највеќе до %d знаци)." -#: actions/profilesettings.php:235 actions/siteadminpanel.php:164 +#: actions/profilesettings.php:235 actions/siteadminpanel.php:150 msgid "Timezone not selected." msgstr "Не е избрана часовна зона." @@ -2926,7 +3001,7 @@ msgstr "Жалиме, неважечки код за поканата." msgid "Registration successful" msgstr "Регистрацијата е успешна" -#: actions/register.php:114 actions/register.php:503 lib/action.php:457 +#: actions/register.php:114 actions/register.php:503 lib/action.php:463 #: lib/logingroupnav.php:85 msgid "Register" msgstr "Регистрирај се" @@ -2970,7 +3045,7 @@ msgid "Same as password above. Required." msgstr "Исто што и лозинката погоре. Задолжително поле." #: actions/register.php:438 actions/register.php:442 -#: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120 +#: actions/siteadminpanel.php:256 lib/accountsettingsaction.php:120 msgid "Email" msgstr "Е-пошта" @@ -3129,6 +3204,11 @@ msgstr "Повторено!" msgid "Replies to %s" msgstr "Одговори испратени до %s" +#: actions/replies.php:127 +#, fuzzy, php-format +msgid "Replies to %1$s, page %2$d" +msgstr "Одговори на %1$s на %2$s!" + #: actions/replies.php:144 #, php-format msgid "Replies feed for %s (RSS 1.0)" @@ -3260,6 +3340,11 @@ msgstr "" "Напомена: Поддржуваме HMAC-SHA1 потписи. Не поддржуваме потпишување со прост " "текст." +#: actions/showfavorites.php:79 +#, fuzzy, php-format +msgid "%1$s's favorite notices, page %2$d" +msgstr "Омилени забелешки на %s" + #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "Не можев да ги вратам омилените забелешки." @@ -3317,6 +3402,11 @@ msgstr "Ова е начин да го споделите она што Ви с msgid "%s group" msgstr "Група %s" +#: actions/showgroup.php:84 +#, fuzzy, php-format +msgid "%1$s group, page %2$d" +msgstr "Членови на групата %1$s, стр. %2$d" + #: actions/showgroup.php:218 msgid "Group profile" msgstr "Профил на група" @@ -3437,6 +3527,11 @@ msgstr "Избришана забелешка" msgid " tagged %s" msgstr " означено со %s" +#: actions/showstream.php:79 +#, fuzzy, php-format +msgid "%1$s, page %2$d" +msgstr "%1$s и пријателите, стр. %2$d" + #: actions/showstream.php:122 #, php-format msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" @@ -3526,200 +3621,150 @@ msgstr "Корисникот е веќе замолчен." msgid "Basic settings for this StatusNet site." msgstr "Основни нагодувања за оваа StatusNet веб-страница." -#: actions/siteadminpanel.php:146 +#: actions/siteadminpanel.php:132 msgid "Site name must have non-zero length." msgstr "Должината на името на веб-страницата не може да изнесува нула." -#: actions/siteadminpanel.php:154 +#: actions/siteadminpanel.php:140 msgid "You must have a valid contact email address." msgstr "Мора да имате важечка контактна е-поштенска адреса." -#: actions/siteadminpanel.php:172 +#: actions/siteadminpanel.php:158 #, php-format msgid "Unknown language \"%s\"." msgstr "Непознат јазик „%s“" -#: actions/siteadminpanel.php:179 +#: actions/siteadminpanel.php:165 msgid "Invalid snapshot report URL." msgstr "Неважечки URL за извештај од снимката." -#: actions/siteadminpanel.php:185 +#: actions/siteadminpanel.php:171 msgid "Invalid snapshot run value." msgstr "Неважечка вредност на пуштањето на снимката." -#: actions/siteadminpanel.php:191 +#: actions/siteadminpanel.php:177 msgid "Snapshot frequency must be a number." msgstr "Честотата на снимките мора да биде бројка." -#: actions/siteadminpanel.php:197 +#: actions/siteadminpanel.php:183 msgid "Minimum text limit is 140 characters." msgstr "Минималното ограничување на текстот изнесува 140 знаци." -#: actions/siteadminpanel.php:203 +#: actions/siteadminpanel.php:189 msgid "Dupe limit must 1 or more seconds." msgstr "Ограничувањето на дуплирањето мора да изнесува барем 1 секунда." -#: actions/siteadminpanel.php:253 +#: actions/siteadminpanel.php:239 msgid "General" msgstr "Општи" -#: actions/siteadminpanel.php:256 +#: actions/siteadminpanel.php:242 msgid "Site name" msgstr "Име на веб-страницата" -#: actions/siteadminpanel.php:257 +#: actions/siteadminpanel.php:243 msgid "The name of your site, like \"Yourcompany Microblog\"" msgstr "Името на Вашата веб-страница, како на пр. „Микроблог на Вашафирма“" -#: actions/siteadminpanel.php:261 +#: actions/siteadminpanel.php:247 msgid "Brought by" msgstr "Овозможено од" -#: actions/siteadminpanel.php:262 +#: actions/siteadminpanel.php:248 msgid "Text used for credits link in footer of each page" msgstr "" "Текст за врската за наведување на авторите во долната колонцифра на секоја " "страница" -#: actions/siteadminpanel.php:266 +#: actions/siteadminpanel.php:252 msgid "Brought by URL" msgstr "URL-адреса на овозможувачот на услугите" -#: actions/siteadminpanel.php:267 +#: actions/siteadminpanel.php:253 msgid "URL used for credits link in footer of each page" msgstr "" "URL-адресата која е користи за врски за автори во долната колоцифра на " "секоја страница" -#: actions/siteadminpanel.php:271 +#: actions/siteadminpanel.php:257 msgid "Contact email address for your site" msgstr "Контактна е-пошта за Вашата веб-страница" -#: actions/siteadminpanel.php:277 +#: actions/siteadminpanel.php:263 msgid "Local" msgstr "Локално" -#: actions/siteadminpanel.php:288 +#: actions/siteadminpanel.php:274 msgid "Default timezone" msgstr "Основна часовна зона" -#: actions/siteadminpanel.php:289 +#: actions/siteadminpanel.php:275 msgid "Default timezone for the site; usually UTC." msgstr "Матична часовна зона за веб-страницата; обично UTC." -#: actions/siteadminpanel.php:295 +#: actions/siteadminpanel.php:281 msgid "Default site language" msgstr "Основен јазик" -#: actions/siteadminpanel.php:303 -msgid "URLs" -msgstr "URL-адреси" - -#: actions/siteadminpanel.php:306 -msgid "Server" -msgstr "Опслужувач" - -#: actions/siteadminpanel.php:306 -msgid "Site's server hostname." -msgstr "Име на домаќинот на серверот на веб-страницата" - -#: actions/siteadminpanel.php:310 -msgid "Fancy URLs" -msgstr "Интересни URL-адреси" - -#: actions/siteadminpanel.php:312 -msgid "Use fancy (more readable and memorable) URLs?" -msgstr "Да користам интересни (почитливи и повпечатливи) URL-адреси?" - -#: actions/siteadminpanel.php:318 -msgid "Access" -msgstr "Пристап" - -#: actions/siteadminpanel.php:321 -msgid "Private" -msgstr "Приватен" - -#: actions/siteadminpanel.php:323 -msgid "Prohibit anonymous users (not logged in) from viewing site?" -msgstr "" -"Да им забранам на анонимните (ненајавени) корисници да ја гледаат веб-" -"страницата?" - -#: actions/siteadminpanel.php:327 -msgid "Invite only" -msgstr "Само со покана" - -#: actions/siteadminpanel.php:329 -msgid "Make registration invitation only." -msgstr "Регистрирање само со покана." - -#: actions/siteadminpanel.php:333 -msgid "Closed" -msgstr "Затворен" - -#: actions/siteadminpanel.php:335 -msgid "Disable new registrations." -msgstr "Оневозможи нови регистрации." - -#: actions/siteadminpanel.php:341 +#: actions/siteadminpanel.php:289 msgid "Snapshots" msgstr "Снимки" -#: actions/siteadminpanel.php:344 +#: actions/siteadminpanel.php:292 msgid "Randomly during Web hit" msgstr "По случајност во текот на посета" -#: actions/siteadminpanel.php:345 +#: actions/siteadminpanel.php:293 msgid "In a scheduled job" msgstr "Во зададена задача" -#: actions/siteadminpanel.php:347 +#: actions/siteadminpanel.php:295 msgid "Data snapshots" msgstr "Снимки од податоци" -#: actions/siteadminpanel.php:348 +#: actions/siteadminpanel.php:296 msgid "When to send statistical data to status.net servers" msgstr "Кога да им се испраќаат статистички податоци на status.net серверите" -#: actions/siteadminpanel.php:353 +#: actions/siteadminpanel.php:301 msgid "Frequency" msgstr "Честота" -#: actions/siteadminpanel.php:354 +#: actions/siteadminpanel.php:302 msgid "Snapshots will be sent once every N web hits" msgstr "Ќе се испраќаат снимки на секои N посети" -#: actions/siteadminpanel.php:359 +#: actions/siteadminpanel.php:307 msgid "Report URL" msgstr "URL на извештајот" -#: actions/siteadminpanel.php:360 +#: actions/siteadminpanel.php:308 msgid "Snapshots will be sent to this URL" msgstr "Снимките ќе се испраќаат на оваа URL-адреса" -#: actions/siteadminpanel.php:367 +#: actions/siteadminpanel.php:315 msgid "Limits" msgstr "Ограничувања" -#: actions/siteadminpanel.php:370 +#: actions/siteadminpanel.php:318 msgid "Text limit" msgstr "Ограничување на текстот" -#: actions/siteadminpanel.php:370 +#: actions/siteadminpanel.php:318 msgid "Maximum number of characters for notices." msgstr "Максимален број на знаци за забелешки." -#: actions/siteadminpanel.php:374 +#: actions/siteadminpanel.php:322 msgid "Dupe limit" msgstr "Ограничување на дуплирањето" -#: actions/siteadminpanel.php:374 +#: actions/siteadminpanel.php:322 msgid "How long users must wait (in seconds) to post the same thing again." msgstr "" "Колку долго треба да почекаат корисниците (во секунди) за да можат повторно " "да го објават истото." -#: actions/siteadminpanel.php:388 actions/useradminpanel.php:313 +#: actions/siteadminpanel.php:336 actions/useradminpanel.php:313 msgid "Save site settings" msgstr "Зачувај нагодувања на веб-страницата" @@ -3926,6 +3971,11 @@ msgstr "Jabber" msgid "SMS" msgstr "СМС" +#: actions/tag.php:68 +#, fuzzy, php-format +msgid "Notices tagged with %1$s, page %2$d" +msgstr "Користници самоозначени со %1$s - стр. %2$d" + #: actions/tag.php:86 #, php-format msgid "Notice feed for tag %s (RSS 1.0)" @@ -4226,6 +4276,11 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "Добар апетит!" +#: actions/usergroups.php:64 +#, fuzzy, php-format +msgid "%1$s groups, page %2$d" +msgstr "Членови на групата %1$s, стр. %2$d" + #: actions/usergroups.php:130 msgid "Search for more groups" msgstr "Пребарај уште групи" @@ -4301,7 +4356,7 @@ msgstr "" msgid "Plugins" msgstr "Приклучоци" -#: actions/version.php:196 lib/action.php:741 +#: actions/version.php:196 lib/action.php:747 msgid "Version" msgstr "Верзија" @@ -4358,27 +4413,27 @@ msgstr "Не можев да ја испратам пораката." msgid "Could not update message with new URI." msgstr "Не можев да ја подновам пораката со нов URI." -#: classes/Notice.php:171 +#: classes/Notice.php:157 #, php-format msgid "DB error inserting hashtag: %s" msgstr "Грешка во базата на податоци при вметнувањето на хеш-ознака: %s" -#: classes/Notice.php:225 +#: classes/Notice.php:214 msgid "Problem saving notice. Too long." msgstr "Проблем со зачувувањето на белешката. Премногу долго." -#: classes/Notice.php:229 +#: classes/Notice.php:218 msgid "Problem saving notice. Unknown user." msgstr "Проблем со зачувувањето на белешката. Непознат корисник." -#: classes/Notice.php:234 +#: classes/Notice.php:223 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Премногу забелњшки за прекратко време; здивнете малку и продолжете за " "неколку минути." -#: classes/Notice.php:240 +#: classes/Notice.php:229 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." @@ -4386,20 +4441,25 @@ msgstr "" "Премногу дуплирани пораки во прекратко време; здивнете малку и продолжете за " "неколку минути." -#: classes/Notice.php:246 +#: classes/Notice.php:235 msgid "You are banned from posting notices on this site." msgstr "Забрането Ви е да објавувате забелешки на оваа веб-страница." -#: classes/Notice.php:305 classes/Notice.php:330 +#: classes/Notice.php:294 classes/Notice.php:319 msgid "Problem saving notice." msgstr "Проблем во зачувувањето на белешката." -#: classes/Notice.php:1059 +#: classes/Notice.php:790 +#, fuzzy +msgid "Problem saving group inbox." +msgstr "Проблем во зачувувањето на белешката." + +#: classes/Notice.php:850 #, php-format msgid "DB error inserting reply: %s" msgstr "Одговор од внесот во базата: %s" -#: classes/Notice.php:1441 +#: classes/Notice.php:1233 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -4454,124 +4514,124 @@ msgstr "%1$s - %2$s" msgid "Untitled page" msgstr "Страница без наслов" -#: lib/action.php:427 +#: lib/action.php:433 msgid "Primary site navigation" msgstr "Главна навигација" -#: lib/action.php:433 +#: lib/action.php:439 msgid "Home" msgstr "Дома" -#: lib/action.php:433 +#: lib/action.php:439 msgid "Personal profile and friends timeline" msgstr "Личен профил и историја на пријатели" -#: lib/action.php:435 +#: lib/action.php:441 msgid "Change your email, avatar, password, profile" msgstr "Промена на е-пошта, аватар, лозинка, профил" -#: lib/action.php:438 +#: lib/action.php:444 msgid "Connect" msgstr "Поврзи се" -#: lib/action.php:438 +#: lib/action.php:444 msgid "Connect to services" msgstr "Поврзи се со услуги" -#: lib/action.php:442 +#: lib/action.php:448 msgid "Change site configuration" msgstr "Промена на конфигурацијата на веб-страницата" -#: lib/action.php:446 lib/subgroupnav.php:105 +#: lib/action.php:452 lib/subgroupnav.php:105 msgid "Invite" msgstr "Покани" -#: lib/action.php:447 lib/subgroupnav.php:106 +#: lib/action.php:453 lib/subgroupnav.php:106 #, php-format msgid "Invite friends and colleagues to join you on %s" msgstr "Поканете пријатели и колеги да Ви се придружат на %s" -#: lib/action.php:452 +#: lib/action.php:458 msgid "Logout" msgstr "Одјави се" -#: lib/action.php:452 +#: lib/action.php:458 msgid "Logout from the site" msgstr "Одјава" -#: lib/action.php:457 +#: lib/action.php:463 msgid "Create an account" msgstr "Создај сметка" -#: lib/action.php:460 +#: lib/action.php:466 msgid "Login to the site" msgstr "Најава" -#: lib/action.php:463 lib/action.php:726 +#: lib/action.php:469 lib/action.php:732 msgid "Help" msgstr "Помош" -#: lib/action.php:463 +#: lib/action.php:469 msgid "Help me!" msgstr "Напомош!" -#: lib/action.php:466 lib/searchaction.php:127 +#: lib/action.php:472 lib/searchaction.php:127 msgid "Search" msgstr "Барај" -#: lib/action.php:466 +#: lib/action.php:472 msgid "Search for people or text" msgstr "Пребарајте луѓе или текст" -#: lib/action.php:487 +#: lib/action.php:493 msgid "Site notice" msgstr "Напомена за веб-страницата" -#: lib/action.php:553 +#: lib/action.php:559 msgid "Local views" msgstr "Локални прегледи" -#: lib/action.php:619 +#: lib/action.php:625 msgid "Page notice" msgstr "Напомена за страницата" -#: lib/action.php:721 +#: lib/action.php:727 msgid "Secondary site navigation" msgstr "Споредна навигација" -#: lib/action.php:728 +#: lib/action.php:734 msgid "About" msgstr "За" -#: lib/action.php:730 +#: lib/action.php:736 msgid "FAQ" msgstr "ЧПП" -#: lib/action.php:734 +#: lib/action.php:740 msgid "TOS" msgstr "Услови" -#: lib/action.php:737 +#: lib/action.php:743 msgid "Privacy" msgstr "Приватност" -#: lib/action.php:739 +#: lib/action.php:745 msgid "Source" msgstr "Изворен код" -#: lib/action.php:743 +#: lib/action.php:749 msgid "Contact" msgstr "Контакт" -#: lib/action.php:745 +#: lib/action.php:751 msgid "Badge" msgstr "Значка" -#: lib/action.php:773 +#: lib/action.php:779 msgid "StatusNet software license" msgstr "Лиценца на програмот StatusNet" -#: lib/action.php:776 +#: lib/action.php:782 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -4580,12 +4640,12 @@ msgstr "" "**%%site.name%%** е сервис за микроблогирање што ви го овозможува [%%site." "broughtby%%](%%site.broughtbyurl%%). " -#: lib/action.php:778 +#: lib/action.php:784 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "**%%site.name%%** е сервис за микроблогирање." -#: lib/action.php:780 +#: lib/action.php:786 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4596,41 +4656,41 @@ msgstr "" "верзија %s, достапен пд [GNU Affero General Public License](http://www.fsf." "org/licensing/licenses/agpl-3.0.html)." -#: lib/action.php:795 +#: lib/action.php:801 msgid "Site content license" msgstr "Лиценца на содржините на веб-страницата" -#: lib/action.php:800 +#: lib/action.php:806 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "" -#: lib/action.php:805 +#: lib/action.php:811 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" -#: lib/action.php:808 +#: lib/action.php:814 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" -#: lib/action.php:820 +#: lib/action.php:826 msgid "All " msgstr "Сите " -#: lib/action.php:825 +#: lib/action.php:831 msgid "license." msgstr "лиценца." -#: lib/action.php:1124 +#: lib/action.php:1130 msgid "Pagination" msgstr "Прелом на страници" -#: lib/action.php:1133 +#: lib/action.php:1139 msgid "After" msgstr "По" -#: lib/action.php:1141 +#: lib/action.php:1147 msgid "Before" msgstr "Пред" @@ -4662,10 +4722,24 @@ msgstr "Основни нагодувања на веб-страницата" msgid "Design configuration" msgstr "Конфигурација на изгледот" -#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327 +#: lib/adminpanelaction.php:322 +#, fuzzy +msgid "User configuration" +msgstr "Конфигурација на патеки" + +#: lib/adminpanelaction.php:327 +#, fuzzy +msgid "Access configuration" +msgstr "Конфигурација на изгледот" + +#: lib/adminpanelaction.php:332 msgid "Paths configuration" msgstr "Конфигурација на патеки" +#: lib/applicationeditform.php:136 +msgid "Edit application" +msgstr "Уреди програм" + #: lib/applicationeditform.php:186 msgid "Icon for this application" msgstr "Икона за овој програм" @@ -5279,12 +5353,12 @@ msgstr "МБ" msgid "kB" msgstr "кб" -#: lib/jabber.php:202 +#: lib/jabber.php:220 #, php-format msgid "[%s]" msgstr "[%s]" -#: lib/jabber.php:385 +#: lib/jabber.php:400 #, php-format msgid "Unknown inbox source %d." msgstr "Непознат извор на приемна пошта %d." @@ -5788,19 +5862,19 @@ msgstr "Одговори" msgid "Favorites" msgstr "Омилени" -#: lib/personalgroupnav.php:124 +#: lib/personalgroupnav.php:125 msgid "Inbox" msgstr "Примени" -#: lib/personalgroupnav.php:125 +#: lib/personalgroupnav.php:126 msgid "Your incoming messages" msgstr "Ваши приемни пораки" -#: lib/personalgroupnav.php:129 +#: lib/personalgroupnav.php:130 msgid "Outbox" msgstr "За праќање" -#: lib/personalgroupnav.php:130 +#: lib/personalgroupnav.php:131 msgid "Your sent messages" msgstr "Ваши испратени пораки" @@ -6043,47 +6117,47 @@ msgstr "Порака" msgid "Moderate" msgstr "Модерирај" -#: lib/util.php:875 +#: lib/util.php:868 msgid "a few seconds ago" msgstr "пред неколку секунди" -#: lib/util.php:877 +#: lib/util.php:870 msgid "about a minute ago" msgstr "пред една минута" -#: lib/util.php:879 +#: lib/util.php:872 #, php-format msgid "about %d minutes ago" msgstr "пред %d минути" -#: lib/util.php:881 +#: lib/util.php:874 msgid "about an hour ago" msgstr "пред еден час" -#: lib/util.php:883 +#: lib/util.php:876 #, php-format msgid "about %d hours ago" msgstr "пред %d часа" -#: lib/util.php:885 +#: lib/util.php:878 msgid "about a day ago" msgstr "пред еден ден" -#: lib/util.php:887 +#: lib/util.php:880 #, php-format msgid "about %d days ago" msgstr "пред %d денови" -#: lib/util.php:889 +#: lib/util.php:882 msgid "about a month ago" msgstr "пред еден месец" -#: lib/util.php:891 +#: lib/util.php:884 #, php-format msgid "about %d months ago" msgstr "пред %d месеца" -#: lib/util.php:893 +#: lib/util.php:886 msgid "about a year ago" msgstr "пред една година" @@ -6097,7 +6171,7 @@ msgstr "%s не е важечка боја!" msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "%s не е важечка боја! Користете 3 или 6 шеснаесетни (hex) знаци." -#: scripts/xmppdaemon.php:301 +#: lib/xmppmanager.php:402 #, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" diff --git a/locale/nb/LC_MESSAGES/statusnet.po b/locale/nb/LC_MESSAGES/statusnet.po index 697fda7b00..e6d3295066 100644 --- a/locale/nb/LC_MESSAGES/statusnet.po +++ b/locale/nb/LC_MESSAGES/statusnet.po @@ -8,17 +8,72 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-21 22:36+0000\n" -"PO-Revision-Date: 2010-01-21 22:38:06+0000\n" +"POT-Creation-Date: 2010-01-27 23:58+0000\n" +"PO-Revision-Date: 2010-01-27 23:59:24+0000\n" "Language-Team: Norwegian (bokmål)‬\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r61339); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61595); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: no\n" "X-Message-Group: out-statusnet\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#: actions/accessadminpanel.php:54 lib/adminpanelaction.php:326 +#, fuzzy +msgid "Access" +msgstr "Godta" + +#: actions/accessadminpanel.php:65 +#, fuzzy +msgid "Site access settings" +msgstr "Innstillinger for IM" + +#: actions/accessadminpanel.php:158 +#, fuzzy +msgid "Registration" +msgstr "Alle abonnementer" + +#: actions/accessadminpanel.php:161 +msgid "Private" +msgstr "" + +#: actions/accessadminpanel.php:163 +msgid "Prohibit anonymous users (not logged in) from viewing site?" +msgstr "" + +#: actions/accessadminpanel.php:167 +msgid "Invite only" +msgstr "" + +#: actions/accessadminpanel.php:169 +msgid "Make registration invitation only." +msgstr "" + +#: actions/accessadminpanel.php:173 +msgid "Closed" +msgstr "" + +#: actions/accessadminpanel.php:175 +msgid "Disable new registrations." +msgstr "" + +#: actions/accessadminpanel.php:189 actions/designadminpanel.php:586 +#: actions/emailsettings.php:195 actions/imsettings.php:163 +#: actions/othersettings.php:126 actions/pathsadminpanel.php:351 +#: actions/profilesettings.php:174 actions/siteadminpanel.php:336 +#: actions/smssettings.php:181 actions/subscriptions.php:203 +#: actions/tagother.php:154 actions/useradminpanel.php:313 +#: lib/applicationeditform.php:335 lib/applicationeditform.php:336 +#: lib/designsettings.php:256 lib/groupeditform.php:202 +msgid "Save" +msgstr "Lagre" + +#: actions/accessadminpanel.php:189 +#, fuzzy +msgid "Save access settings" +msgstr "Innstillinger for IM" + #: actions/all.php:63 actions/public.php:97 actions/replies.php:92 #: actions/showfavorites.php:137 actions/tag.php:51 msgid "No such page" @@ -33,7 +88,7 @@ msgstr "Ingen slik side" #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:149 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 @@ -139,8 +194,7 @@ msgstr "Oppdateringer fra %1$s og venner på %2$s!" #: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 #: actions/apitimelinefriends.php:155 actions/apitimelinegroup.php:150 #: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 -#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 #, fuzzy @@ -157,7 +211,7 @@ msgstr "API-metode ikke funnet!" #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:119 +#: actions/apistatusesupdate.php:118 msgid "This method requires a POST." msgstr "Denne metoden krever en POST." @@ -188,7 +242,7 @@ msgstr "Klarte ikke å lagre profil." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:132 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 #: actions/designadminpanel.php:122 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -495,7 +549,14 @@ msgstr "" msgid "Allow or deny access" msgstr "" -#: actions/apioauthauthorize.php:320 lib/action.php:435 +#: actions/apioauthauthorize.php:306 +#, php-format +msgid "" +"The application %s by %s would like the " +"ability to %s your account data." +msgstr "" + +#: actions/apioauthauthorize.php:320 lib/action.php:441 #, fuzzy msgid "Account" msgstr "Om" @@ -555,17 +616,17 @@ msgstr "" msgid "No status with that ID found." msgstr "" -#: actions/apistatusesupdate.php:162 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "" -#: actions/apistatusesupdate.php:203 +#: actions/apistatusesupdate.php:202 msgid "Not found" msgstr "" -#: actions/apistatusesupdate.php:226 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -616,11 +677,6 @@ msgstr "%s offentlig tidslinje" msgid "%s updates from everyone!" msgstr "%s oppdateringer fra alle sammen!" -#: actions/apitimelineretweetedbyme.php:112 -#, php-format -msgid "Repeated by %s" -msgstr "" - #: actions/apitimelineretweetedtome.php:111 #, fuzzy, php-format msgid "Repeated to %s" @@ -1039,17 +1095,6 @@ msgstr "" msgid "Reset back to default" msgstr "" -#: actions/designadminpanel.php:586 actions/emailsettings.php:195 -#: actions/imsettings.php:163 actions/othersettings.php:126 -#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174 -#: actions/siteadminpanel.php:388 actions/smssettings.php:181 -#: actions/subscriptions.php:203 actions/tagother.php:154 -#: actions/useradminpanel.php:313 lib/applicationeditform.php:335 -#: lib/applicationeditform.php:336 lib/designsettings.php:256 -#: lib/groupeditform.php:202 -msgid "Save" -msgstr "Lagre" - #: actions/designadminpanel.php:587 lib/designsettings.php:257 msgid "Save design" msgstr "" @@ -1062,13 +1107,15 @@ msgstr "" msgid "Add to favorites" msgstr "" -#: actions/doc.php:69 -msgid "No such document." +#: actions/doc.php:155 +#, php-format +msgid "No such document \"%s\"" msgstr "" -#: actions/editapplication.php:54 lib/applicationeditform.php:136 -msgid "Edit application" -msgstr "" +#: actions/editapplication.php:54 +#, fuzzy +msgid "Edit Application" +msgstr "Ingen slik side" #: actions/editapplication.php:66 #, fuzzy @@ -1087,7 +1134,7 @@ msgid "No such application." msgstr "Ingen slik side" #: actions/editapplication.php:127 actions/newapplication.php:110 -#: actions/showapplication.php:118 lib/action.php:1189 +#: actions/showapplication.php:118 lib/action.php:1195 msgid "There was a problem with your session token." msgstr "" @@ -1298,7 +1345,7 @@ msgid "Cannot normalize that email address" msgstr "Klarer ikke normalisere epostadressen" #: actions/emailsettings.php:331 actions/register.php:201 -#: actions/siteadminpanel.php:157 +#: actions/siteadminpanel.php:143 msgid "Not a valid email address." msgstr "Ugyldig e-postadresse." @@ -1310,7 +1357,7 @@ msgstr "Det er allerede din e-postadresse." msgid "That email address already belongs to another user." msgstr "" -#: actions/emailsettings.php:353 actions/imsettings.php:317 +#: actions/emailsettings.php:353 actions/imsettings.php:319 #: actions/smssettings.php:337 msgid "Couldn't insert confirmation code." msgstr "" @@ -1614,7 +1661,7 @@ msgstr "" msgid "A list of the users in this group." msgstr "En liste over brukerne i denne gruppen." -#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107 +#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107 msgid "Admin" msgstr "Administrator" @@ -1797,6 +1844,11 @@ msgstr "" msgid "That is not your Jabber ID." msgstr "Det er ikke din Jabber ID." +#: actions/inbox.php:59 +#, php-format +msgid "Inbox for %1$s - page %2$d" +msgstr "" + #: actions/inbox.php:62 #, php-format msgid "Inbox for %s" @@ -1969,7 +2021,7 @@ msgstr "Feil brukernavn eller passord" msgid "Error setting user. You are probably not authorized." msgstr "Ikke autorisert." -#: actions/login.php:188 actions/login.php:241 lib/action.php:460 +#: actions/login.php:188 actions/login.php:241 lib/action.php:466 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Logg inn" @@ -2028,8 +2080,9 @@ msgid "No current status" msgstr "" #: actions/newapplication.php:52 -msgid "New application" -msgstr "" +#, fuzzy +msgid "New Application" +msgstr "Ingen slik side" #: actions/newapplication.php:64 msgid "You must be logged in to register an application." @@ -2212,8 +2265,8 @@ msgstr "" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1038 -#: lib/api.php:1066 lib/api.php:1176 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1039 +#: lib/api.php:1067 lib/api.php:1177 msgid "Not a supported data format." msgstr "" @@ -2282,6 +2335,11 @@ msgstr "Nytt nick" msgid "Login token expired." msgstr "" +#: actions/outbox.php:58 +#, php-format +msgid "Outbox for %1$s - page %2$d" +msgstr "" + #: actions/outbox.php:61 #, php-format msgid "Outbox for %s" @@ -2354,7 +2412,7 @@ msgstr "Klarer ikke å lagre nytt passord." msgid "Password saved." msgstr "Passordet ble lagret" -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:331 msgid "Paths" msgstr "" @@ -2362,138 +2420,155 @@ msgstr "" msgid "Path and server settings for this StatusNet site." msgstr "" -#: actions/pathsadminpanel.php:140 +#: actions/pathsadminpanel.php:157 #, php-format msgid "Theme directory not readable: %s" msgstr "" -#: actions/pathsadminpanel.php:146 +#: actions/pathsadminpanel.php:163 #, php-format msgid "Avatar directory not writable: %s" msgstr "" -#: actions/pathsadminpanel.php:152 +#: actions/pathsadminpanel.php:169 #, php-format msgid "Background directory not writable: %s" msgstr "" -#: actions/pathsadminpanel.php:160 +#: actions/pathsadminpanel.php:177 #, php-format msgid "Locales directory not readable: %s" msgstr "" -#: actions/pathsadminpanel.php:166 +#: actions/pathsadminpanel.php:183 msgid "Invalid SSL server. The maximum length is 255 characters." msgstr "" -#: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58 +#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58 #: lib/adminpanelaction.php:311 msgid "Site" msgstr "" -#: actions/pathsadminpanel.php:221 +#: actions/pathsadminpanel.php:238 +#, fuzzy +msgid "Server" +msgstr "Gjenopprett" + +#: actions/pathsadminpanel.php:238 +msgid "Site's server hostname." +msgstr "" + +#: actions/pathsadminpanel.php:242 msgid "Path" msgstr "" -#: actions/pathsadminpanel.php:221 +#: actions/pathsadminpanel.php:242 msgid "Site path" msgstr "" -#: actions/pathsadminpanel.php:225 +#: actions/pathsadminpanel.php:246 msgid "Path to locales" msgstr "" -#: actions/pathsadminpanel.php:225 +#: actions/pathsadminpanel.php:246 msgid "Directory path to locales" msgstr "" -#: actions/pathsadminpanel.php:232 -msgid "Theme" -msgstr "" - -#: actions/pathsadminpanel.php:237 -msgid "Theme server" -msgstr "" - -#: actions/pathsadminpanel.php:241 -msgid "Theme path" -msgstr "" - -#: actions/pathsadminpanel.php:245 -msgid "Theme directory" +#: actions/pathsadminpanel.php:250 +msgid "Fancy URLs" msgstr "" #: actions/pathsadminpanel.php:252 +msgid "Use fancy (more readable and memorable) URLs?" +msgstr "" + +#: actions/pathsadminpanel.php:259 +msgid "Theme" +msgstr "" + +#: actions/pathsadminpanel.php:264 +msgid "Theme server" +msgstr "" + +#: actions/pathsadminpanel.php:268 +msgid "Theme path" +msgstr "" + +#: actions/pathsadminpanel.php:272 +msgid "Theme directory" +msgstr "" + +#: actions/pathsadminpanel.php:279 #, fuzzy msgid "Avatars" msgstr "Brukerbilde" -#: actions/pathsadminpanel.php:257 +#: actions/pathsadminpanel.php:284 #, fuzzy msgid "Avatar server" msgstr "Innstillinger for IM" -#: actions/pathsadminpanel.php:261 +#: actions/pathsadminpanel.php:288 #, fuzzy msgid "Avatar path" msgstr "Brukerbildet har blitt oppdatert." -#: actions/pathsadminpanel.php:265 +#: actions/pathsadminpanel.php:292 #, fuzzy msgid "Avatar directory" msgstr "Brukerbildet har blitt oppdatert." -#: actions/pathsadminpanel.php:274 +#: actions/pathsadminpanel.php:301 msgid "Backgrounds" msgstr "" -#: actions/pathsadminpanel.php:278 +#: actions/pathsadminpanel.php:305 msgid "Background server" msgstr "" -#: actions/pathsadminpanel.php:282 +#: actions/pathsadminpanel.php:309 msgid "Background path" msgstr "" -#: actions/pathsadminpanel.php:286 +#: actions/pathsadminpanel.php:313 msgid "Background directory" msgstr "" -#: actions/pathsadminpanel.php:293 +#: actions/pathsadminpanel.php:320 msgid "SSL" msgstr "" -#: actions/pathsadminpanel.php:296 actions/siteadminpanel.php:346 +#: actions/pathsadminpanel.php:323 actions/siteadminpanel.php:294 #, fuzzy msgid "Never" msgstr "Gjenopprett" -#: actions/pathsadminpanel.php:297 +#: actions/pathsadminpanel.php:324 msgid "Sometimes" msgstr "" -#: actions/pathsadminpanel.php:298 +#: actions/pathsadminpanel.php:325 msgid "Always" msgstr "" -#: actions/pathsadminpanel.php:302 +#: actions/pathsadminpanel.php:329 msgid "Use SSL" msgstr "" -#: actions/pathsadminpanel.php:303 +#: actions/pathsadminpanel.php:330 msgid "When to use SSL" msgstr "" -#: actions/pathsadminpanel.php:308 +#: actions/pathsadminpanel.php:335 #, fuzzy msgid "SSL server" msgstr "Gjenopprett" -#: actions/pathsadminpanel.php:309 +#: actions/pathsadminpanel.php:336 msgid "Server to direct SSL requests to" msgstr "" -#: actions/pathsadminpanel.php:325 +#: actions/pathsadminpanel.php:352 msgid "Save paths" msgstr "" @@ -2599,7 +2674,7 @@ msgid "" "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated" msgstr "" -#: actions/profilesettings.php:151 actions/siteadminpanel.php:294 +#: actions/profilesettings.php:151 actions/siteadminpanel.php:280 msgid "Language" msgstr "Språk" @@ -2626,7 +2701,7 @@ msgstr "" msgid "Bio is too long (max %d chars)." msgstr "«Om meg» er for lang (maks 140 tegn)." -#: actions/profilesettings.php:235 actions/siteadminpanel.php:164 +#: actions/profilesettings.php:235 actions/siteadminpanel.php:150 msgid "Timezone not selected." msgstr "" @@ -2889,7 +2964,7 @@ msgstr "" msgid "Registration successful" msgstr "" -#: actions/register.php:114 actions/register.php:503 lib/action.php:457 +#: actions/register.php:114 actions/register.php:503 lib/action.php:463 #: lib/logingroupnav.php:85 msgid "Register" msgstr "" @@ -2930,7 +3005,7 @@ msgid "Same as password above. Required." msgstr "" #: actions/register.php:438 actions/register.php:442 -#: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120 +#: actions/siteadminpanel.php:256 lib/accountsettingsaction.php:120 msgid "Email" msgstr "E-post" @@ -3087,6 +3162,11 @@ msgstr "Opprett" msgid "Replies to %s" msgstr "Svar til %s" +#: actions/replies.php:127 +#, fuzzy, php-format +msgid "Replies to %1$s, page %2$d" +msgstr "Svar til %s" + #: actions/replies.php:144 #, php-format msgid "Replies feed for %s (RSS 1.0)" @@ -3218,6 +3298,11 @@ msgid "" "signature method." msgstr "" +#: actions/showfavorites.php:79 +#, fuzzy, php-format +msgid "%1$s's favorite notices, page %2$d" +msgstr "%s og venner" + #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "" @@ -3267,6 +3352,11 @@ msgstr "" msgid "%s group" msgstr "" +#: actions/showgroup.php:84 +#, fuzzy, php-format +msgid "%1$s group, page %2$d" +msgstr "Alle abonnementer" + #: actions/showgroup.php:218 #, fuzzy msgid "Group profile" @@ -3380,6 +3470,11 @@ msgstr "" msgid " tagged %s" msgstr "Tagger" +#: actions/showstream.php:79 +#, fuzzy, php-format +msgid "%1$s, page %2$d" +msgstr "%s og venner" + #: actions/showstream.php:122 #, fuzzy, php-format msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" @@ -3461,195 +3556,145 @@ msgstr "Du er allerede logget inn!" msgid "Basic settings for this StatusNet site." msgstr "" -#: actions/siteadminpanel.php:146 +#: actions/siteadminpanel.php:132 msgid "Site name must have non-zero length." msgstr "" -#: actions/siteadminpanel.php:154 +#: actions/siteadminpanel.php:140 #, fuzzy msgid "You must have a valid contact email address." msgstr "Ugyldig e-postadresse" -#: actions/siteadminpanel.php:172 +#: actions/siteadminpanel.php:158 #, php-format msgid "Unknown language \"%s\"." msgstr "" -#: actions/siteadminpanel.php:179 +#: actions/siteadminpanel.php:165 msgid "Invalid snapshot report URL." msgstr "" -#: actions/siteadminpanel.php:185 +#: actions/siteadminpanel.php:171 msgid "Invalid snapshot run value." msgstr "" -#: actions/siteadminpanel.php:191 +#: actions/siteadminpanel.php:177 msgid "Snapshot frequency must be a number." msgstr "" -#: actions/siteadminpanel.php:197 +#: actions/siteadminpanel.php:183 msgid "Minimum text limit is 140 characters." msgstr "" -#: actions/siteadminpanel.php:203 +#: actions/siteadminpanel.php:189 msgid "Dupe limit must 1 or more seconds." msgstr "" -#: actions/siteadminpanel.php:253 +#: actions/siteadminpanel.php:239 msgid "General" msgstr "" -#: actions/siteadminpanel.php:256 +#: actions/siteadminpanel.php:242 msgid "Site name" msgstr "" -#: actions/siteadminpanel.php:257 +#: actions/siteadminpanel.php:243 msgid "The name of your site, like \"Yourcompany Microblog\"" msgstr "" -#: actions/siteadminpanel.php:261 +#: actions/siteadminpanel.php:247 msgid "Brought by" msgstr "" -#: actions/siteadminpanel.php:262 +#: actions/siteadminpanel.php:248 msgid "Text used for credits link in footer of each page" msgstr "" -#: actions/siteadminpanel.php:266 +#: actions/siteadminpanel.php:252 msgid "Brought by URL" msgstr "" -#: actions/siteadminpanel.php:267 +#: actions/siteadminpanel.php:253 msgid "URL used for credits link in footer of each page" msgstr "" -#: actions/siteadminpanel.php:271 +#: actions/siteadminpanel.php:257 msgid "Contact email address for your site" msgstr "" -#: actions/siteadminpanel.php:277 +#: actions/siteadminpanel.php:263 msgid "Local" msgstr "" -#: actions/siteadminpanel.php:288 +#: actions/siteadminpanel.php:274 msgid "Default timezone" msgstr "" -#: actions/siteadminpanel.php:289 +#: actions/siteadminpanel.php:275 msgid "Default timezone for the site; usually UTC." msgstr "" -#: actions/siteadminpanel.php:295 +#: actions/siteadminpanel.php:281 msgid "Default site language" msgstr "" -#: actions/siteadminpanel.php:303 -msgid "URLs" -msgstr "" - -#: actions/siteadminpanel.php:306 -#, fuzzy -msgid "Server" -msgstr "Gjenopprett" - -#: actions/siteadminpanel.php:306 -msgid "Site's server hostname." -msgstr "" - -#: actions/siteadminpanel.php:310 -msgid "Fancy URLs" -msgstr "" - -#: actions/siteadminpanel.php:312 -msgid "Use fancy (more readable and memorable) URLs?" -msgstr "" - -#: actions/siteadminpanel.php:318 -#, fuzzy -msgid "Access" -msgstr "Godta" - -#: actions/siteadminpanel.php:321 -msgid "Private" -msgstr "" - -#: actions/siteadminpanel.php:323 -msgid "Prohibit anonymous users (not logged in) from viewing site?" -msgstr "" - -#: actions/siteadminpanel.php:327 -msgid "Invite only" -msgstr "" - -#: actions/siteadminpanel.php:329 -msgid "Make registration invitation only." -msgstr "" - -#: actions/siteadminpanel.php:333 -msgid "Closed" -msgstr "" - -#: actions/siteadminpanel.php:335 -msgid "Disable new registrations." -msgstr "" - -#: actions/siteadminpanel.php:341 +#: actions/siteadminpanel.php:289 msgid "Snapshots" msgstr "" -#: actions/siteadminpanel.php:344 +#: actions/siteadminpanel.php:292 msgid "Randomly during Web hit" msgstr "" -#: actions/siteadminpanel.php:345 +#: actions/siteadminpanel.php:293 msgid "In a scheduled job" msgstr "" -#: actions/siteadminpanel.php:347 +#: actions/siteadminpanel.php:295 msgid "Data snapshots" msgstr "" -#: actions/siteadminpanel.php:348 +#: actions/siteadminpanel.php:296 msgid "When to send statistical data to status.net servers" msgstr "" -#: actions/siteadminpanel.php:353 +#: actions/siteadminpanel.php:301 msgid "Frequency" msgstr "" -#: actions/siteadminpanel.php:354 +#: actions/siteadminpanel.php:302 msgid "Snapshots will be sent once every N web hits" msgstr "" -#: actions/siteadminpanel.php:359 +#: actions/siteadminpanel.php:307 msgid "Report URL" msgstr "" -#: actions/siteadminpanel.php:360 +#: actions/siteadminpanel.php:308 msgid "Snapshots will be sent to this URL" msgstr "" -#: actions/siteadminpanel.php:367 +#: actions/siteadminpanel.php:315 msgid "Limits" msgstr "" -#: actions/siteadminpanel.php:370 +#: actions/siteadminpanel.php:318 msgid "Text limit" msgstr "" -#: actions/siteadminpanel.php:370 +#: actions/siteadminpanel.php:318 msgid "Maximum number of characters for notices." msgstr "" -#: actions/siteadminpanel.php:374 +#: actions/siteadminpanel.php:322 msgid "Dupe limit" msgstr "" -#: actions/siteadminpanel.php:374 +#: actions/siteadminpanel.php:322 msgid "How long users must wait (in seconds) to post the same thing again." msgstr "" -#: actions/siteadminpanel.php:388 actions/useradminpanel.php:313 +#: actions/siteadminpanel.php:336 actions/useradminpanel.php:313 #, fuzzy msgid "Save site settings" msgstr "Innstillinger for IM" @@ -3849,6 +3894,11 @@ msgstr "Ingen Jabber ID." msgid "SMS" msgstr "" +#: actions/tag.php:68 +#, fuzzy, php-format +msgid "Notices tagged with %1$s, page %2$d" +msgstr "Mikroblogg av %s" + #: actions/tag.php:86 #, php-format msgid "Notice feed for tag %s (RSS 1.0)" @@ -4143,6 +4193,11 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "" +#: actions/usergroups.php:64 +#, fuzzy, php-format +msgid "%1$s groups, page %2$d" +msgstr "Alle abonnementer" + #: actions/usergroups.php:130 msgid "Search for more groups" msgstr "" @@ -4205,7 +4260,7 @@ msgstr "" msgid "Plugins" msgstr "" -#: actions/version.php:196 lib/action.php:741 +#: actions/version.php:196 lib/action.php:747 #, fuzzy msgid "Version" msgstr "Personlig" @@ -4263,44 +4318,48 @@ msgstr "" msgid "Could not update message with new URI." msgstr "" -#: classes/Notice.php:171 +#: classes/Notice.php:157 #, php-format msgid "DB error inserting hashtag: %s" msgstr "" -#: classes/Notice.php:225 +#: classes/Notice.php:214 msgid "Problem saving notice. Too long." msgstr "" -#: classes/Notice.php:229 +#: classes/Notice.php:218 msgid "Problem saving notice. Unknown user." msgstr "" -#: classes/Notice.php:234 +#: classes/Notice.php:223 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:240 +#: classes/Notice.php:229 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:246 +#: classes/Notice.php:235 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:305 classes/Notice.php:330 +#: classes/Notice.php:294 classes/Notice.php:319 msgid "Problem saving notice." msgstr "" -#: classes/Notice.php:1059 +#: classes/Notice.php:790 +msgid "Problem saving group inbox." +msgstr "" + +#: classes/Notice.php:850 #, php-format msgid "DB error inserting reply: %s" msgstr "" -#: classes/Notice.php:1441 +#: classes/Notice.php:1233 #, php-format msgid "RT @%1$s %2$s" msgstr "" @@ -4358,126 +4417,126 @@ msgstr "%1$s sin status på %2$s" msgid "Untitled page" msgstr "" -#: lib/action.php:427 +#: lib/action.php:433 msgid "Primary site navigation" msgstr "" -#: lib/action.php:433 +#: lib/action.php:439 msgid "Home" msgstr "Hjem" -#: lib/action.php:433 +#: lib/action.php:439 msgid "Personal profile and friends timeline" msgstr "" -#: lib/action.php:435 +#: lib/action.php:441 msgid "Change your email, avatar, password, profile" msgstr "" -#: lib/action.php:438 +#: lib/action.php:444 msgid "Connect" msgstr "Koble til" -#: lib/action.php:438 +#: lib/action.php:444 msgid "Connect to services" msgstr "" -#: lib/action.php:442 +#: lib/action.php:448 msgid "Change site configuration" msgstr "" -#: lib/action.php:446 lib/subgroupnav.php:105 +#: lib/action.php:452 lib/subgroupnav.php:105 msgid "Invite" msgstr "" -#: lib/action.php:447 lib/subgroupnav.php:106 +#: lib/action.php:453 lib/subgroupnav.php:106 #, php-format msgid "Invite friends and colleagues to join you on %s" msgstr "" -#: lib/action.php:452 +#: lib/action.php:458 msgid "Logout" msgstr "Logg ut" -#: lib/action.php:452 +#: lib/action.php:458 msgid "Logout from the site" msgstr "" -#: lib/action.php:457 +#: lib/action.php:463 #, fuzzy msgid "Create an account" msgstr "Opprett en ny konto" -#: lib/action.php:460 +#: lib/action.php:466 msgid "Login to the site" msgstr "" -#: lib/action.php:463 lib/action.php:726 +#: lib/action.php:469 lib/action.php:732 msgid "Help" msgstr "Hjelp" -#: lib/action.php:463 +#: lib/action.php:469 #, fuzzy msgid "Help me!" msgstr "Hjelp" -#: lib/action.php:466 lib/searchaction.php:127 +#: lib/action.php:472 lib/searchaction.php:127 msgid "Search" msgstr "Søk" -#: lib/action.php:466 +#: lib/action.php:472 msgid "Search for people or text" msgstr "" -#: lib/action.php:487 +#: lib/action.php:493 msgid "Site notice" msgstr "" -#: lib/action.php:553 +#: lib/action.php:559 msgid "Local views" msgstr "" -#: lib/action.php:619 +#: lib/action.php:625 msgid "Page notice" msgstr "" -#: lib/action.php:721 +#: lib/action.php:727 msgid "Secondary site navigation" msgstr "" -#: lib/action.php:728 +#: lib/action.php:734 msgid "About" msgstr "Om" -#: lib/action.php:730 +#: lib/action.php:736 msgid "FAQ" msgstr "OSS/FAQ" -#: lib/action.php:734 +#: lib/action.php:740 msgid "TOS" msgstr "" -#: lib/action.php:737 +#: lib/action.php:743 msgid "Privacy" msgstr "" -#: lib/action.php:739 +#: lib/action.php:745 msgid "Source" msgstr "Kilde" -#: lib/action.php:743 +#: lib/action.php:749 msgid "Contact" msgstr "Kontakt" -#: lib/action.php:745 +#: lib/action.php:751 msgid "Badge" msgstr "" -#: lib/action.php:773 +#: lib/action.php:779 msgid "StatusNet software license" msgstr "" -#: lib/action.php:776 +#: lib/action.php:782 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -4486,12 +4545,12 @@ msgstr "" "**%%site.name%%** er en mikrobloggingtjeneste av [%%site.broughtby%%](%%site." "broughtbyurl%%). " -#: lib/action.php:778 +#: lib/action.php:784 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "**%%site.name%%** er en mikrobloggingtjeneste. " -#: lib/action.php:780 +#: lib/action.php:786 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4499,41 +4558,41 @@ msgid "" "org/licensing/licenses/agpl-3.0.html)." msgstr "" -#: lib/action.php:795 +#: lib/action.php:801 msgid "Site content license" msgstr "" -#: lib/action.php:800 +#: lib/action.php:806 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "" -#: lib/action.php:805 +#: lib/action.php:811 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" -#: lib/action.php:808 +#: lib/action.php:814 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" -#: lib/action.php:820 +#: lib/action.php:826 msgid "All " msgstr "" -#: lib/action.php:825 +#: lib/action.php:831 msgid "license." msgstr "" -#: lib/action.php:1124 +#: lib/action.php:1130 msgid "Pagination" msgstr "" -#: lib/action.php:1133 +#: lib/action.php:1139 msgid "After" msgstr "" -#: lib/action.php:1141 +#: lib/action.php:1147 #, fuzzy msgid "Before" msgstr "Tidligere »" @@ -4566,10 +4625,22 @@ msgstr "" msgid "Design configuration" msgstr "" -#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327 +#: lib/adminpanelaction.php:322 +msgid "User configuration" +msgstr "" + +#: lib/adminpanelaction.php:327 +msgid "Access configuration" +msgstr "" + +#: lib/adminpanelaction.php:332 msgid "Paths configuration" msgstr "" +#: lib/applicationeditform.php:136 +msgid "Edit application" +msgstr "" + #: lib/applicationeditform.php:186 msgid "Icon for this application" msgstr "" @@ -5158,12 +5229,12 @@ msgstr "" msgid "kB" msgstr "" -#: lib/jabber.php:202 +#: lib/jabber.php:220 #, php-format msgid "[%s]" msgstr "" -#: lib/jabber.php:385 +#: lib/jabber.php:400 #, php-format msgid "Unknown inbox source %d." msgstr "" @@ -5589,19 +5660,19 @@ msgstr "Svar" msgid "Favorites" msgstr "" -#: lib/personalgroupnav.php:124 +#: lib/personalgroupnav.php:125 msgid "Inbox" msgstr "" -#: lib/personalgroupnav.php:125 +#: lib/personalgroupnav.php:126 msgid "Your incoming messages" msgstr "" -#: lib/personalgroupnav.php:129 +#: lib/personalgroupnav.php:130 msgid "Outbox" msgstr "" -#: lib/personalgroupnav.php:130 +#: lib/personalgroupnav.php:131 msgid "Your sent messages" msgstr "" @@ -5858,47 +5929,47 @@ msgstr "" msgid "Moderate" msgstr "" -#: lib/util.php:875 +#: lib/util.php:868 msgid "a few seconds ago" msgstr "noen få sekunder siden" -#: lib/util.php:877 +#: lib/util.php:870 msgid "about a minute ago" msgstr "omtrent ett minutt siden" -#: lib/util.php:879 +#: lib/util.php:872 #, php-format msgid "about %d minutes ago" msgstr "omtrent %d minutter siden" -#: lib/util.php:881 +#: lib/util.php:874 msgid "about an hour ago" msgstr "omtrent én time siden" -#: lib/util.php:883 +#: lib/util.php:876 #, php-format msgid "about %d hours ago" msgstr "omtrent %d timer siden" -#: lib/util.php:885 +#: lib/util.php:878 msgid "about a day ago" msgstr "omtrent én dag siden" -#: lib/util.php:887 +#: lib/util.php:880 #, php-format msgid "about %d days ago" msgstr "omtrent %d dager siden" -#: lib/util.php:889 +#: lib/util.php:882 msgid "about a month ago" msgstr "omtrent én måned siden" -#: lib/util.php:891 +#: lib/util.php:884 #, php-format msgid "about %d months ago" msgstr "omtrent %d måneder siden" -#: lib/util.php:893 +#: lib/util.php:886 msgid "about a year ago" msgstr "omtrent ett år siden" @@ -5912,7 +5983,7 @@ msgstr "" msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "" -#: scripts/xmppdaemon.php:301 +#: lib/xmppmanager.php:402 #, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" diff --git a/locale/nl/LC_MESSAGES/statusnet.po b/locale/nl/LC_MESSAGES/statusnet.po index 935117671c..8e5fc1ea9f 100644 --- a/locale/nl/LC_MESSAGES/statusnet.po +++ b/locale/nl/LC_MESSAGES/statusnet.po @@ -10,17 +10,71 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-21 22:36+0000\n" -"PO-Revision-Date: 2010-01-21 22:38:12+0000\n" +"POT-Creation-Date: 2010-01-27 23:58+0000\n" +"PO-Revision-Date: 2010-01-27 23:59:30+0000\n" "Language-Team: Dutch\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r61339); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61595); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: nl\n" "X-Message-Group: out-statusnet\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#: actions/accessadminpanel.php:54 lib/adminpanelaction.php:326 +msgid "Access" +msgstr "Toegang" + +#: actions/accessadminpanel.php:65 +#, fuzzy +msgid "Site access settings" +msgstr "Websiteinstellingen opslaan" + +#: actions/accessadminpanel.php:158 +#, fuzzy +msgid "Registration" +msgstr "Registreren" + +#: actions/accessadminpanel.php:161 +msgid "Private" +msgstr "Privé" + +#: actions/accessadminpanel.php:163 +msgid "Prohibit anonymous users (not logged in) from viewing site?" +msgstr "Mogen anonieme gebruikers (niet aangemeld) de website bekijken?" + +#: actions/accessadminpanel.php:167 +msgid "Invite only" +msgstr "Alleen op uitnodiging" + +#: actions/accessadminpanel.php:169 +msgid "Make registration invitation only." +msgstr "Registratie alleen op uitnodiging." + +#: actions/accessadminpanel.php:173 +msgid "Closed" +msgstr "Gesloten" + +#: actions/accessadminpanel.php:175 +msgid "Disable new registrations." +msgstr "Nieuwe registraties uitschakelen." + +#: actions/accessadminpanel.php:189 actions/designadminpanel.php:586 +#: actions/emailsettings.php:195 actions/imsettings.php:163 +#: actions/othersettings.php:126 actions/pathsadminpanel.php:351 +#: actions/profilesettings.php:174 actions/siteadminpanel.php:336 +#: actions/smssettings.php:181 actions/subscriptions.php:203 +#: actions/tagother.php:154 actions/useradminpanel.php:313 +#: lib/applicationeditform.php:335 lib/applicationeditform.php:336 +#: lib/designsettings.php:256 lib/groupeditform.php:202 +msgid "Save" +msgstr "Opslaan" + +#: actions/accessadminpanel.php:189 +#, fuzzy +msgid "Save access settings" +msgstr "Websiteinstellingen opslaan" + #: actions/all.php:63 actions/public.php:97 actions/replies.php:92 #: actions/showfavorites.php:137 actions/tag.php:51 msgid "No such page" @@ -35,7 +89,7 @@ msgstr "Deze pagina bestaat niet" #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:149 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 @@ -143,8 +197,7 @@ msgstr "Updates van %1$s en vrienden op %2$s." #: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 #: actions/apitimelinefriends.php:155 actions/apitimelinegroup.php:150 #: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 -#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found." @@ -160,7 +213,7 @@ msgstr "De API-functie is niet aangetroffen." #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:119 +#: actions/apistatusesupdate.php:118 msgid "This method requires a POST." msgstr "Deze methode vereist een POST." @@ -191,7 +244,7 @@ msgstr "Het was niet mogelijk het profiel op te slaan." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:132 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 #: actions/designadminpanel.php:122 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -505,7 +558,14 @@ msgstr "Een applicatie vraagt toegang tot uw gebruikersgegevens" msgid "Allow or deny access" msgstr "Toegang toestaan of ontzeggen" -#: actions/apioauthauthorize.php:320 lib/action.php:435 +#: actions/apioauthauthorize.php:306 +#, php-format +msgid "" +"The application %s by %s would like the " +"ability to %s your account data." +msgstr "" + +#: actions/apioauthauthorize.php:320 lib/action.php:441 msgid "Account" msgstr "Gebruiker" @@ -562,17 +622,17 @@ msgstr "De status is verwijderd." msgid "No status with that ID found." msgstr "Er is geen status gevonden met dit ID." -#: actions/apistatusesupdate.php:162 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "De mededeling is te lang. Gebruik maximaal %d tekens." -#: actions/apistatusesupdate.php:203 +#: actions/apistatusesupdate.php:202 msgid "Not found" msgstr "Niet gevonden" -#: actions/apistatusesupdate.php:226 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -625,11 +685,6 @@ msgstr "%s publieke tijdlijn" msgid "%s updates from everyone!" msgstr "%s updates van iedereen" -#: actions/apitimelineretweetedbyme.php:112 -#, php-format -msgid "Repeated by %s" -msgstr "Herhaald door %s" - #: actions/apitimelineretweetedtome.php:111 #, php-format msgid "Repeated to %s" @@ -1040,17 +1095,6 @@ msgstr "Standaardontwerp toepassen" msgid "Reset back to default" msgstr "Standaardinstellingen toepassen" -#: actions/designadminpanel.php:586 actions/emailsettings.php:195 -#: actions/imsettings.php:163 actions/othersettings.php:126 -#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174 -#: actions/siteadminpanel.php:388 actions/smssettings.php:181 -#: actions/subscriptions.php:203 actions/tagother.php:154 -#: actions/useradminpanel.php:313 lib/applicationeditform.php:335 -#: lib/applicationeditform.php:336 lib/designsettings.php:256 -#: lib/groupeditform.php:202 -msgid "Save" -msgstr "Opslaan" - #: actions/designadminpanel.php:587 lib/designsettings.php:257 msgid "Save design" msgstr "Ontwerp opslaan" @@ -1063,12 +1107,14 @@ msgstr "Deze mededeling staats niet op uw favorietenlijst." msgid "Add to favorites" msgstr "Aan favorieten toevoegen" -#: actions/doc.php:69 -msgid "No such document." +#: actions/doc.php:155 +#, fuzzy, php-format +msgid "No such document \"%s\"" msgstr "Onbekend document." -#: actions/editapplication.php:54 lib/applicationeditform.php:136 -msgid "Edit application" +#: actions/editapplication.php:54 +#, fuzzy +msgid "Edit Application" msgstr "Applicatie bewerken" #: actions/editapplication.php:66 @@ -1085,7 +1131,7 @@ msgid "No such application." msgstr "De applicatie bestaat niet." #: actions/editapplication.php:127 actions/newapplication.php:110 -#: actions/showapplication.php:118 lib/action.php:1189 +#: actions/showapplication.php:118 lib/action.php:1195 msgid "There was a problem with your session token." msgstr "Er is een probleem met uw sessietoken." @@ -1288,7 +1334,7 @@ msgid "Cannot normalize that email address" msgstr "Kan het emailadres niet normaliseren" #: actions/emailsettings.php:331 actions/register.php:201 -#: actions/siteadminpanel.php:157 +#: actions/siteadminpanel.php:143 msgid "Not a valid email address." msgstr "Geen geldig e-mailadres." @@ -1300,7 +1346,7 @@ msgstr "U hebt dit e-mailadres als ingesteld als uw e-mailadres." msgid "That email address already belongs to another user." msgstr "Dit e-mailadres is al geregistreerd door een andere gebruiker." -#: actions/emailsettings.php:353 actions/imsettings.php:317 +#: actions/emailsettings.php:353 actions/imsettings.php:319 #: actions/smssettings.php:337 msgid "Couldn't insert confirmation code." msgstr "De bevestigingscode kon niet ingevoegd worden." @@ -1615,7 +1661,7 @@ msgstr "%1$s groeps leden, pagina %2$d" msgid "A list of the users in this group." msgstr "Ledenlijst van deze groep" -#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107 +#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107 msgid "Admin" msgstr "Beheerder" @@ -1814,6 +1860,11 @@ msgstr "" msgid "That is not your Jabber ID." msgstr "Dit is niet uw Jabber-ID." +#: actions/inbox.php:59 +#, fuzzy, php-format +msgid "Inbox for %1$s - page %2$d" +msgstr "Postvak IN van %s" + #: actions/inbox.php:62 #, php-format msgid "Inbox for %s" @@ -2000,7 +2051,7 @@ msgstr "" "Er is een fout opgetreden bij het maken van de instellingen. U hebt " "waarschijnlijk niet de juiste rechten." -#: actions/login.php:188 actions/login.php:241 lib/action.php:460 +#: actions/login.php:188 actions/login.php:241 lib/action.php:466 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Aanmelden" @@ -2062,7 +2113,8 @@ msgid "No current status" msgstr "Geen huidige status" #: actions/newapplication.php:52 -msgid "New application" +#, fuzzy +msgid "New Application" msgstr "Nieuwe applicatie" #: actions/newapplication.php:64 @@ -2259,8 +2311,8 @@ msgstr "inhoudstype " msgid "Only " msgstr "Alleen " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1038 -#: lib/api.php:1066 lib/api.php:1176 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1039 +#: lib/api.php:1067 lib/api.php:1177 msgid "Not a supported data format." msgstr "Geen ondersteund gegevensformaat." @@ -2324,6 +2376,11 @@ msgstr "Het opgegeven token is ongeldig." msgid "Login token expired." msgstr "Het aanmeldtoken is verlopen." +#: actions/outbox.php:58 +#, fuzzy, php-format +msgid "Outbox for %1$s - page %2$d" +msgstr "Postvak UIT voor %s" + #: actions/outbox.php:61 #, php-format msgid "Outbox for %s" @@ -2394,7 +2451,7 @@ msgstr "Het was niet mogelijk het nieuwe wachtwoord op te slaan." msgid "Password saved." msgstr "Het wachtwoord is opgeslagen." -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:331 msgid "Paths" msgstr "Paden" @@ -2402,132 +2459,148 @@ msgstr "Paden" msgid "Path and server settings for this StatusNet site." msgstr "Pad- en serverinstellingen voor de StatusNet-website." -#: actions/pathsadminpanel.php:140 +#: actions/pathsadminpanel.php:157 #, php-format msgid "Theme directory not readable: %s" msgstr "Er kan niet uit de vormgevingmap gelezen worden: %s" -#: actions/pathsadminpanel.php:146 +#: actions/pathsadminpanel.php:163 #, php-format msgid "Avatar directory not writable: %s" msgstr "Er kan niet in de avatarmap geschreven worden: %s" -#: actions/pathsadminpanel.php:152 +#: actions/pathsadminpanel.php:169 #, php-format msgid "Background directory not writable: %s" msgstr "Er kan niet in de achtergrondmap geschreven worden: %s" -#: actions/pathsadminpanel.php:160 +#: actions/pathsadminpanel.php:177 #, php-format msgid "Locales directory not readable: %s" msgstr "Er kan niet uit de talenmap gelezen worden: %s" -#: actions/pathsadminpanel.php:166 +#: actions/pathsadminpanel.php:183 msgid "Invalid SSL server. The maximum length is 255 characters." msgstr "De SSL-server is ongeldig. De maximale lengte is 255 tekens." -#: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58 +#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58 #: lib/adminpanelaction.php:311 msgid "Site" msgstr "Website" -#: actions/pathsadminpanel.php:221 +#: actions/pathsadminpanel.php:238 +msgid "Server" +msgstr "Server" + +#: actions/pathsadminpanel.php:238 +msgid "Site's server hostname." +msgstr "Hostnaam van de website server." + +#: actions/pathsadminpanel.php:242 msgid "Path" msgstr "Pad" -#: actions/pathsadminpanel.php:221 +#: actions/pathsadminpanel.php:242 msgid "Site path" msgstr "Websitepad" -#: actions/pathsadminpanel.php:225 +#: actions/pathsadminpanel.php:246 msgid "Path to locales" msgstr "Talenpad" -#: actions/pathsadminpanel.php:225 +#: actions/pathsadminpanel.php:246 msgid "Directory path to locales" msgstr "Talenmap" -#: actions/pathsadminpanel.php:232 +#: actions/pathsadminpanel.php:250 +msgid "Fancy URLs" +msgstr "Nette URL's" + +#: actions/pathsadminpanel.php:252 +msgid "Use fancy (more readable and memorable) URLs?" +msgstr "Nette URL's (meer leesbaar en beter te onthouden) gebruiken?" + +#: actions/pathsadminpanel.php:259 msgid "Theme" msgstr "Vormgeving" -#: actions/pathsadminpanel.php:237 +#: actions/pathsadminpanel.php:264 msgid "Theme server" msgstr "Vormgevingsserver" -#: actions/pathsadminpanel.php:241 +#: actions/pathsadminpanel.php:268 msgid "Theme path" msgstr "Vormgevingspad" -#: actions/pathsadminpanel.php:245 +#: actions/pathsadminpanel.php:272 msgid "Theme directory" msgstr "Vormgevingsmap" -#: actions/pathsadminpanel.php:252 +#: actions/pathsadminpanel.php:279 msgid "Avatars" msgstr "Avatars" -#: actions/pathsadminpanel.php:257 +#: actions/pathsadminpanel.php:284 msgid "Avatar server" msgstr "Avatarserver" -#: actions/pathsadminpanel.php:261 +#: actions/pathsadminpanel.php:288 msgid "Avatar path" msgstr "Avatarpad" -#: actions/pathsadminpanel.php:265 +#: actions/pathsadminpanel.php:292 msgid "Avatar directory" msgstr "Avatarmap" -#: actions/pathsadminpanel.php:274 +#: actions/pathsadminpanel.php:301 msgid "Backgrounds" msgstr "Achtergronden" -#: actions/pathsadminpanel.php:278 +#: actions/pathsadminpanel.php:305 msgid "Background server" msgstr "Achtergrondenserver" -#: actions/pathsadminpanel.php:282 +#: actions/pathsadminpanel.php:309 msgid "Background path" msgstr "Achtergrondpad" -#: actions/pathsadminpanel.php:286 +#: actions/pathsadminpanel.php:313 msgid "Background directory" msgstr "Achtergrondenmap" -#: actions/pathsadminpanel.php:293 +#: actions/pathsadminpanel.php:320 msgid "SSL" msgstr "SSL" -#: actions/pathsadminpanel.php:296 actions/siteadminpanel.php:346 +#: actions/pathsadminpanel.php:323 actions/siteadminpanel.php:294 msgid "Never" msgstr "Nooit" -#: actions/pathsadminpanel.php:297 +#: actions/pathsadminpanel.php:324 msgid "Sometimes" msgstr "Soms" -#: actions/pathsadminpanel.php:298 +#: actions/pathsadminpanel.php:325 msgid "Always" msgstr "Altijd" -#: actions/pathsadminpanel.php:302 +#: actions/pathsadminpanel.php:329 msgid "Use SSL" msgstr "SSL gebruiken" -#: actions/pathsadminpanel.php:303 +#: actions/pathsadminpanel.php:330 msgid "When to use SSL" msgstr "Wanneer SSL gebruikt moet worden" -#: actions/pathsadminpanel.php:308 +#: actions/pathsadminpanel.php:335 msgid "SSL server" msgstr "SSL-server" -#: actions/pathsadminpanel.php:309 +#: actions/pathsadminpanel.php:336 msgid "Server to direct SSL requests to" msgstr "De server waar SSL-verzoeken heen gestuurd moeten worden" -#: actions/pathsadminpanel.php:325 +#: actions/pathsadminpanel.php:352 msgid "Save paths" msgstr "Opslagpaden" @@ -2641,7 +2714,7 @@ msgstr "" "Eigen labels (letter, getallen, -, ., en _). Gescheiden door komma's of " "spaties" -#: actions/profilesettings.php:151 actions/siteadminpanel.php:294 +#: actions/profilesettings.php:151 actions/siteadminpanel.php:280 msgid "Language" msgstr "Taal" @@ -2669,7 +2742,7 @@ msgstr "" msgid "Bio is too long (max %d chars)." msgstr "De beschrijving is te lang (maximaal %d tekens)." -#: actions/profilesettings.php:235 actions/siteadminpanel.php:164 +#: actions/profilesettings.php:235 actions/siteadminpanel.php:150 msgid "Timezone not selected." msgstr "Er is geen tijdzone geselecteerd." @@ -2952,7 +3025,7 @@ msgstr "Sorry. De uitnodigingscode is ongeldig." msgid "Registration successful" msgstr "De registratie is voltooid" -#: actions/register.php:114 actions/register.php:503 lib/action.php:457 +#: actions/register.php:114 actions/register.php:503 lib/action.php:463 #: lib/logingroupnav.php:85 msgid "Register" msgstr "Registreren" @@ -2994,7 +3067,7 @@ msgid "Same as password above. Required." msgstr "Gelijk aan het wachtwoord hierboven. Verplicht" #: actions/register.php:438 actions/register.php:442 -#: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120 +#: actions/siteadminpanel.php:256 lib/accountsettingsaction.php:120 msgid "Email" msgstr "E-mail" @@ -3153,6 +3226,11 @@ msgstr "Herhaald!" msgid "Replies to %s" msgstr "Antwoorden aan %s" +#: actions/replies.php:127 +#, fuzzy, php-format +msgid "Replies to %1$s, page %2$d" +msgstr "Antwoorden aan %1$s op %2$s." + #: actions/replies.php:144 #, php-format msgid "Replies feed for %s (RSS 1.0)" @@ -3284,6 +3362,11 @@ msgstr "" "Opmerking: HMAC-SHA1 ondertekening wordt ondersteund. Ondertekening in " "platte tekst is niet mogelijk." +#: actions/showfavorites.php:79 +#, fuzzy, php-format +msgid "%1$s's favorite notices, page %2$d" +msgstr "Favoriete mededelingen van %s" + #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "Het was niet mogelijk de favoriete mededelingen op te halen." @@ -3342,6 +3425,11 @@ msgstr "Dit is de manier om dat te delen wat u wilt." msgid "%s group" msgstr "%s groep" +#: actions/showgroup.php:84 +#, fuzzy, php-format +msgid "%1$s group, page %2$d" +msgstr "%1$s groeps leden, pagina %2$d" + #: actions/showgroup.php:218 msgid "Group profile" msgstr "Groepsprofiel" @@ -3462,6 +3550,11 @@ msgstr "Deze mededeling is verwijderd." msgid " tagged %s" msgstr " met het label %s" +#: actions/showstream.php:79 +#, fuzzy, php-format +msgid "%1$s, page %2$d" +msgstr "%1$s en vrienden, pagina %2$d" + #: actions/showstream.php:122 #, php-format msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" @@ -3552,200 +3645,152 @@ msgstr "Deze gebruiker is al gemuilkorfd." msgid "Basic settings for this StatusNet site." msgstr "Basisinstellingen voor deze StatusNet-website." -#: actions/siteadminpanel.php:146 +#: actions/siteadminpanel.php:132 msgid "Site name must have non-zero length." msgstr "De sitenaam moet ingevoerd worden en mag niet leeg zijn." -#: actions/siteadminpanel.php:154 +#: actions/siteadminpanel.php:140 msgid "You must have a valid contact email address." msgstr "" "U moet een geldig e-mailadres opgeven waarop contact opgenomen kan worden." -#: actions/siteadminpanel.php:172 +#: actions/siteadminpanel.php:158 #, php-format msgid "Unknown language \"%s\"." msgstr "De taal \"%s\" is niet bekend." -#: actions/siteadminpanel.php:179 +#: actions/siteadminpanel.php:165 msgid "Invalid snapshot report URL." msgstr "De rapportage-URL voor snapshots is ongeldig." -#: actions/siteadminpanel.php:185 +#: actions/siteadminpanel.php:171 msgid "Invalid snapshot run value." msgstr "De waarde voor het uitvoeren van snapshots is ongeldig." -#: actions/siteadminpanel.php:191 +#: actions/siteadminpanel.php:177 msgid "Snapshot frequency must be a number." msgstr "De snapshotfrequentie moet een getal zijn." -#: actions/siteadminpanel.php:197 +#: actions/siteadminpanel.php:183 msgid "Minimum text limit is 140 characters." msgstr "De minimale tekstlimiet is 140 tekens." -#: actions/siteadminpanel.php:203 +#: actions/siteadminpanel.php:189 msgid "Dupe limit must 1 or more seconds." msgstr "De duplicaatlimiet moet één of meer seconden zijn." -#: actions/siteadminpanel.php:253 +#: actions/siteadminpanel.php:239 msgid "General" msgstr "Algemeen" -#: actions/siteadminpanel.php:256 +#: actions/siteadminpanel.php:242 msgid "Site name" msgstr "Websitenaam" -#: actions/siteadminpanel.php:257 +#: actions/siteadminpanel.php:243 msgid "The name of your site, like \"Yourcompany Microblog\"" msgstr "De naam van de website, zoals \"UwBedrijf Microblog\"" -#: actions/siteadminpanel.php:261 +#: actions/siteadminpanel.php:247 msgid "Brought by" msgstr "Mogelijk gemaakt door" -#: actions/siteadminpanel.php:262 +#: actions/siteadminpanel.php:248 msgid "Text used for credits link in footer of each page" msgstr "" "De tekst die gebruikt worden in de \"creditsverwijzing\" in de voettekst van " "iedere pagina" -#: actions/siteadminpanel.php:266 +#: actions/siteadminpanel.php:252 msgid "Brought by URL" msgstr "\"Mogelijk gemaakt door\"-URL" -#: actions/siteadminpanel.php:267 +#: actions/siteadminpanel.php:253 msgid "URL used for credits link in footer of each page" msgstr "" "URL die wordt gebruikt voor de verwijzing naar de hoster en dergelijke in de " "voettekst van iedere pagina" -#: actions/siteadminpanel.php:271 +#: actions/siteadminpanel.php:257 msgid "Contact email address for your site" msgstr "E-mailadres om contact op te nemen met de websitebeheerder" -#: actions/siteadminpanel.php:277 +#: actions/siteadminpanel.php:263 msgid "Local" msgstr "Lokaal" -#: actions/siteadminpanel.php:288 +#: actions/siteadminpanel.php:274 msgid "Default timezone" msgstr "Standaardtijdzone" -#: actions/siteadminpanel.php:289 +#: actions/siteadminpanel.php:275 msgid "Default timezone for the site; usually UTC." msgstr "Standaardtijdzone voor de website. Meestal UTC." -#: actions/siteadminpanel.php:295 +#: actions/siteadminpanel.php:281 msgid "Default site language" msgstr "Standaardtaal" -#: actions/siteadminpanel.php:303 -msgid "URLs" -msgstr "URL's" - -#: actions/siteadminpanel.php:306 -msgid "Server" -msgstr "Server" - -#: actions/siteadminpanel.php:306 -msgid "Site's server hostname." -msgstr "Hostnaam van de website server." - -#: actions/siteadminpanel.php:310 -msgid "Fancy URLs" -msgstr "Nette URL's" - -#: actions/siteadminpanel.php:312 -msgid "Use fancy (more readable and memorable) URLs?" -msgstr "Nette URL's (meer leesbaar en beter te onthouden) gebruiken?" - -#: actions/siteadminpanel.php:318 -msgid "Access" -msgstr "Toegang" - -#: actions/siteadminpanel.php:321 -msgid "Private" -msgstr "Privé" - -#: actions/siteadminpanel.php:323 -msgid "Prohibit anonymous users (not logged in) from viewing site?" -msgstr "Mogen anonieme gebruikers (niet aangemeld) de website bekijken?" - -#: actions/siteadminpanel.php:327 -msgid "Invite only" -msgstr "Alleen op uitnodiging" - -#: actions/siteadminpanel.php:329 -msgid "Make registration invitation only." -msgstr "Registratie alleen op uitnodiging." - -#: actions/siteadminpanel.php:333 -msgid "Closed" -msgstr "Gesloten" - -#: actions/siteadminpanel.php:335 -msgid "Disable new registrations." -msgstr "Nieuwe registraties uitschakelen." - -#: actions/siteadminpanel.php:341 +#: actions/siteadminpanel.php:289 msgid "Snapshots" msgstr "Snapshots" -#: actions/siteadminpanel.php:344 +#: actions/siteadminpanel.php:292 msgid "Randomly during Web hit" msgstr "Willekeurig tijdens een websitehit" -#: actions/siteadminpanel.php:345 +#: actions/siteadminpanel.php:293 msgid "In a scheduled job" msgstr "Als geplande taak" -#: actions/siteadminpanel.php:347 +#: actions/siteadminpanel.php:295 msgid "Data snapshots" msgstr "Snapshots van gegevens" -#: actions/siteadminpanel.php:348 +#: actions/siteadminpanel.php:296 msgid "When to send statistical data to status.net servers" msgstr "" "Wanneer statistische gegevens naar de status.net-servers verzonden worden" -#: actions/siteadminpanel.php:353 +#: actions/siteadminpanel.php:301 msgid "Frequency" msgstr "Frequentie" -#: actions/siteadminpanel.php:354 +#: actions/siteadminpanel.php:302 msgid "Snapshots will be sent once every N web hits" msgstr "Iedere zoveel websitehits wordt een snapshot verzonden" -#: actions/siteadminpanel.php:359 +#: actions/siteadminpanel.php:307 msgid "Report URL" msgstr "Rapportage-URL" -#: actions/siteadminpanel.php:360 +#: actions/siteadminpanel.php:308 msgid "Snapshots will be sent to this URL" msgstr "Snapshots worden naar deze URL verzonden" -#: actions/siteadminpanel.php:367 +#: actions/siteadminpanel.php:315 msgid "Limits" msgstr "Limieten" -#: actions/siteadminpanel.php:370 +#: actions/siteadminpanel.php:318 msgid "Text limit" msgstr "Tekstlimiet" -#: actions/siteadminpanel.php:370 +#: actions/siteadminpanel.php:318 msgid "Maximum number of characters for notices." msgstr "Maximaal aantal te gebruiken tekens voor mededelingen." -#: actions/siteadminpanel.php:374 +#: actions/siteadminpanel.php:322 msgid "Dupe limit" msgstr "Duplicaatlimiet" -#: actions/siteadminpanel.php:374 +#: actions/siteadminpanel.php:322 msgid "How long users must wait (in seconds) to post the same thing again." msgstr "" "Hoe lang gebruikers moeten wachten (in seconden) voor ze hetzelfde kunnen " "zenden." -#: actions/siteadminpanel.php:388 actions/useradminpanel.php:313 +#: actions/siteadminpanel.php:336 actions/useradminpanel.php:313 msgid "Save site settings" msgstr "Websiteinstellingen opslaan" @@ -3953,6 +3998,11 @@ msgstr "Jabber" msgid "SMS" msgstr "SMS" +#: actions/tag.php:68 +#, fuzzy, php-format +msgid "Notices tagged with %1$s, page %2$d" +msgstr "Gebruikers die zichzelf met %1$s hebben gelabeld - pagina %2$d" + #: actions/tag.php:86 #, php-format msgid "Notice feed for tag %s (RSS 1.0)" @@ -4256,6 +4306,11 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "Geniet van uw hotdog!" +#: actions/usergroups.php:64 +#, fuzzy, php-format +msgid "%1$s groups, page %2$d" +msgstr "%1$s groeps leden, pagina %2$d" + #: actions/usergroups.php:130 msgid "Search for more groups" msgstr "Meer groepen zoeken" @@ -4330,7 +4385,7 @@ msgstr "" msgid "Plugins" msgstr "Plug-ins" -#: actions/version.php:196 lib/action.php:741 +#: actions/version.php:196 lib/action.php:747 msgid "Version" msgstr "Versie" @@ -4388,31 +4443,31 @@ msgstr "Het was niet mogelijk het bericht in te voegen." msgid "Could not update message with new URI." msgstr "Het was niet mogelijk het bericht bij te werken met de nieuwe URI." -#: classes/Notice.php:171 +#: classes/Notice.php:157 #, php-format msgid "DB error inserting hashtag: %s" msgstr "Er is een databasefout opgetreden bij de invoer van de hashtag: %s" -#: classes/Notice.php:225 +#: classes/Notice.php:214 msgid "Problem saving notice. Too long." msgstr "" "Er is een probleem opgetreden bij het opslaan van de mededeling. Deze is te " "lang." -#: classes/Notice.php:229 +#: classes/Notice.php:218 msgid "Problem saving notice. Unknown user." msgstr "" "Er was een probleem bij het opslaan van de mededeling. De gebruiker is " "onbekend." -#: classes/Notice.php:234 +#: classes/Notice.php:223 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "U hebt te snel te veel mededelingen verstuurd. Kom even op adem en probeer " "het over enige tijd weer." -#: classes/Notice.php:240 +#: classes/Notice.php:229 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." @@ -4420,22 +4475,27 @@ msgstr "" "Te veel duplicaatberichten te snel achter elkaar. Neem een adempauze en " "plaats over een aantal minuten pas weer een bericht." -#: classes/Notice.php:246 +#: classes/Notice.php:235 msgid "You are banned from posting notices on this site." msgstr "" "U bent geblokkeerd en mag geen mededelingen meer achterlaten op deze site." -#: classes/Notice.php:305 classes/Notice.php:330 +#: classes/Notice.php:294 classes/Notice.php:319 msgid "Problem saving notice." msgstr "Er is een probleem opgetreden bij het opslaan van de mededeling." -#: classes/Notice.php:1059 +#: classes/Notice.php:790 +#, fuzzy +msgid "Problem saving group inbox." +msgstr "Er is een probleem opgetreden bij het opslaan van de mededeling." + +#: classes/Notice.php:850 #, php-format msgid "DB error inserting reply: %s" msgstr "" "Er is een databasefout opgetreden bij het invoegen van het antwoord: %s" -#: classes/Notice.php:1441 +#: classes/Notice.php:1233 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -4490,124 +4550,124 @@ msgstr "%1$s - %2$s" msgid "Untitled page" msgstr "Naamloze pagina" -#: lib/action.php:427 +#: lib/action.php:433 msgid "Primary site navigation" msgstr "Primaire sitenavigatie" -#: lib/action.php:433 +#: lib/action.php:439 msgid "Home" msgstr "Start" -#: lib/action.php:433 +#: lib/action.php:439 msgid "Personal profile and friends timeline" msgstr "Persoonlijk profiel en tijdlijn van vrienden" -#: lib/action.php:435 +#: lib/action.php:441 msgid "Change your email, avatar, password, profile" msgstr "Uw e-mailadres, avatar, wachtwoord of profiel wijzigen" -#: lib/action.php:438 +#: lib/action.php:444 msgid "Connect" msgstr "Koppelen" -#: lib/action.php:438 +#: lib/action.php:444 msgid "Connect to services" msgstr "Met diensten verbinden" -#: lib/action.php:442 +#: lib/action.php:448 msgid "Change site configuration" msgstr "Websiteinstellingen wijzigen" -#: lib/action.php:446 lib/subgroupnav.php:105 +#: lib/action.php:452 lib/subgroupnav.php:105 msgid "Invite" msgstr "Uitnodigen" -#: lib/action.php:447 lib/subgroupnav.php:106 +#: lib/action.php:453 lib/subgroupnav.php:106 #, php-format msgid "Invite friends and colleagues to join you on %s" msgstr "Vrienden en collega's uitnodigen om u te vergezellen op %s" -#: lib/action.php:452 +#: lib/action.php:458 msgid "Logout" msgstr "Afmelden" -#: lib/action.php:452 +#: lib/action.php:458 msgid "Logout from the site" msgstr "Van de site afmelden" -#: lib/action.php:457 +#: lib/action.php:463 msgid "Create an account" msgstr "Gebruiker aanmaken" -#: lib/action.php:460 +#: lib/action.php:466 msgid "Login to the site" msgstr "Bij de site aanmelden" -#: lib/action.php:463 lib/action.php:726 +#: lib/action.php:469 lib/action.php:732 msgid "Help" msgstr "Help" -#: lib/action.php:463 +#: lib/action.php:469 msgid "Help me!" msgstr "Help me!" -#: lib/action.php:466 lib/searchaction.php:127 +#: lib/action.php:472 lib/searchaction.php:127 msgid "Search" msgstr "Zoeken" -#: lib/action.php:466 +#: lib/action.php:472 msgid "Search for people or text" msgstr "Naar gebruikers of tekst zoeken" -#: lib/action.php:487 +#: lib/action.php:493 msgid "Site notice" msgstr "Mededeling van de website" -#: lib/action.php:553 +#: lib/action.php:559 msgid "Local views" msgstr "Lokale weergaven" -#: lib/action.php:619 +#: lib/action.php:625 msgid "Page notice" msgstr "Mededeling van de pagina" -#: lib/action.php:721 +#: lib/action.php:727 msgid "Secondary site navigation" msgstr "Secundaire sitenavigatie" -#: lib/action.php:728 +#: lib/action.php:734 msgid "About" msgstr "Over" -#: lib/action.php:730 +#: lib/action.php:736 msgid "FAQ" msgstr "Veel gestelde vragen" -#: lib/action.php:734 +#: lib/action.php:740 msgid "TOS" msgstr "Gebruiksvoorwaarden" -#: lib/action.php:737 +#: lib/action.php:743 msgid "Privacy" msgstr "Privacy" -#: lib/action.php:739 +#: lib/action.php:745 msgid "Source" msgstr "Broncode" -#: lib/action.php:743 +#: lib/action.php:749 msgid "Contact" msgstr "Contact" -#: lib/action.php:745 +#: lib/action.php:751 msgid "Badge" msgstr "Widget" -#: lib/action.php:773 +#: lib/action.php:779 msgid "StatusNet software license" msgstr "Licentie van de StatusNet-software" -#: lib/action.php:776 +#: lib/action.php:782 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -4616,12 +4676,12 @@ msgstr "" "**%%site.name%%** is een microblogdienst van [%%site.broughtby%%](%%site." "broughtbyurl%%). " -#: lib/action.php:778 +#: lib/action.php:784 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "**%%site.name%%** is een microblogdienst. " -#: lib/action.php:780 +#: lib/action.php:786 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4632,41 +4692,45 @@ msgstr "" "versie %s, beschikbaar onder de [GNU Affero General Public License](http://" "www.fsf.org/licensing/licenses/agpl-3.0.html)." -#: lib/action.php:795 +#: lib/action.php:801 msgid "Site content license" msgstr "Licentie voor siteinhoud" -#: lib/action.php:800 +#: lib/action.php:806 #, php-format msgid "Content and data of %1$s are private and confidential." -msgstr "" +msgstr "Inhoud en gegevens van %1$s zijn persoonlijk en vertrouwelijk." -#: lib/action.php:805 +#: lib/action.php:811 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" +"Auteursrechten op inhoud en gegevens rusten bij %1$s. Alle rechten " +"voorbehouden." -#: lib/action.php:808 +#: lib/action.php:814 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" +"Auteursrechten op inhoud en gegevens rusten bij de respectievelijke " +"gebruikers. Alle rechten voorbehouden." -#: lib/action.php:820 +#: lib/action.php:826 msgid "All " msgstr "Alle " -#: lib/action.php:825 +#: lib/action.php:831 msgid "license." msgstr "licentie." -#: lib/action.php:1124 +#: lib/action.php:1130 msgid "Pagination" msgstr "Paginering" -#: lib/action.php:1133 +#: lib/action.php:1139 msgid "After" msgstr "Later" -#: lib/action.php:1141 +#: lib/action.php:1147 msgid "Before" msgstr "Eerder" @@ -4698,10 +4762,24 @@ msgstr "Basisinstellingen voor de website" msgid "Design configuration" msgstr "Instellingen vormgeving" -#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327 +#: lib/adminpanelaction.php:322 +#, fuzzy +msgid "User configuration" +msgstr "Padinstellingen" + +#: lib/adminpanelaction.php:327 +#, fuzzy +msgid "Access configuration" +msgstr "Instellingen vormgeving" + +#: lib/adminpanelaction.php:332 msgid "Paths configuration" msgstr "Padinstellingen" +#: lib/applicationeditform.php:136 +msgid "Edit application" +msgstr "Applicatie bewerken" + #: lib/applicationeditform.php:186 msgid "Icon for this application" msgstr "Icoon voor deze applicatie" @@ -5322,12 +5400,12 @@ msgstr "MB" msgid "kB" msgstr "kB" -#: lib/jabber.php:202 +#: lib/jabber.php:220 #, php-format msgid "[%s]" msgstr "[%s]" -#: lib/jabber.php:385 +#: lib/jabber.php:400 #, php-format msgid "Unknown inbox source %d." msgstr "Onbekende bron Postvak IN %d." @@ -5831,19 +5909,19 @@ msgstr "Antwoorden" msgid "Favorites" msgstr "Favorieten" -#: lib/personalgroupnav.php:124 +#: lib/personalgroupnav.php:125 msgid "Inbox" msgstr "Postvak IN" -#: lib/personalgroupnav.php:125 +#: lib/personalgroupnav.php:126 msgid "Your incoming messages" msgstr "Uw inkomende berichten" -#: lib/personalgroupnav.php:129 +#: lib/personalgroupnav.php:130 msgid "Outbox" msgstr "Postvak UIT" -#: lib/personalgroupnav.php:130 +#: lib/personalgroupnav.php:131 msgid "Your sent messages" msgstr "Uw verzonden berichten" @@ -6085,47 +6163,47 @@ msgstr "Bericht" msgid "Moderate" msgstr "Modereren" -#: lib/util.php:875 +#: lib/util.php:868 msgid "a few seconds ago" msgstr "een paar seconden geleden" -#: lib/util.php:877 +#: lib/util.php:870 msgid "about a minute ago" msgstr "ongeveer een minuut geleden" -#: lib/util.php:879 +#: lib/util.php:872 #, php-format msgid "about %d minutes ago" msgstr "ongeveer %d minuten geleden" -#: lib/util.php:881 +#: lib/util.php:874 msgid "about an hour ago" msgstr "ongeveer een uur geleden" -#: lib/util.php:883 +#: lib/util.php:876 #, php-format msgid "about %d hours ago" msgstr "ongeveer %d uur geleden" -#: lib/util.php:885 +#: lib/util.php:878 msgid "about a day ago" msgstr "ongeveer een dag geleden" -#: lib/util.php:887 +#: lib/util.php:880 #, php-format msgid "about %d days ago" msgstr "ongeveer %d dagen geleden" -#: lib/util.php:889 +#: lib/util.php:882 msgid "about a month ago" msgstr "ongeveer een maand geleden" -#: lib/util.php:891 +#: lib/util.php:884 #, php-format msgid "about %d months ago" msgstr "ongeveer %d maanden geleden" -#: lib/util.php:893 +#: lib/util.php:886 msgid "about a year ago" msgstr "ongeveer een jaar geleden" @@ -6139,7 +6217,7 @@ msgstr "%s is geen geldige kleur." msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "%s is geen geldige kleur. Gebruik drie of zes hexadecimale tekens." -#: scripts/xmppdaemon.php:301 +#: lib/xmppmanager.php:402 #, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" diff --git a/locale/nn/LC_MESSAGES/statusnet.po b/locale/nn/LC_MESSAGES/statusnet.po index 5a9d928fdb..44c9c6cd55 100644 --- a/locale/nn/LC_MESSAGES/statusnet.po +++ b/locale/nn/LC_MESSAGES/statusnet.po @@ -7,17 +7,75 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-21 22:36+0000\n" -"PO-Revision-Date: 2010-01-21 22:38:09+0000\n" +"POT-Creation-Date: 2010-01-27 23:58+0000\n" +"PO-Revision-Date: 2010-01-27 23:59:27+0000\n" "Language-Team: Norwegian Nynorsk\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r61339); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61595); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: nn\n" "X-Message-Group: out-statusnet\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#: actions/accessadminpanel.php:54 lib/adminpanelaction.php:326 +#, fuzzy +msgid "Access" +msgstr "Godta" + +#: actions/accessadminpanel.php:65 +#, fuzzy +msgid "Site access settings" +msgstr "Avatar-innstillingar" + +#: actions/accessadminpanel.php:158 +#, fuzzy +msgid "Registration" +msgstr "Registrér" + +#: actions/accessadminpanel.php:161 +#, fuzzy +msgid "Private" +msgstr "Personvern" + +#: actions/accessadminpanel.php:163 +msgid "Prohibit anonymous users (not logged in) from viewing site?" +msgstr "" + +#: actions/accessadminpanel.php:167 +#, fuzzy +msgid "Invite only" +msgstr "Invitér" + +#: actions/accessadminpanel.php:169 +msgid "Make registration invitation only." +msgstr "" + +#: actions/accessadminpanel.php:173 +#, fuzzy +msgid "Closed" +msgstr "Blokkér" + +#: actions/accessadminpanel.php:175 +msgid "Disable new registrations." +msgstr "" + +#: actions/accessadminpanel.php:189 actions/designadminpanel.php:586 +#: actions/emailsettings.php:195 actions/imsettings.php:163 +#: actions/othersettings.php:126 actions/pathsadminpanel.php:351 +#: actions/profilesettings.php:174 actions/siteadminpanel.php:336 +#: actions/smssettings.php:181 actions/subscriptions.php:203 +#: actions/tagother.php:154 actions/useradminpanel.php:313 +#: lib/applicationeditform.php:335 lib/applicationeditform.php:336 +#: lib/designsettings.php:256 lib/groupeditform.php:202 +msgid "Save" +msgstr "Lagra" + +#: actions/accessadminpanel.php:189 +#, fuzzy +msgid "Save access settings" +msgstr "Avatar-innstillingar" + #: actions/all.php:63 actions/public.php:97 actions/replies.php:92 #: actions/showfavorites.php:137 actions/tag.php:51 #, fuzzy @@ -33,7 +91,7 @@ msgstr "Dette emneord finst ikkje." #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:149 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 @@ -133,8 +191,7 @@ msgstr "Oppdateringar frå %1$s og vener på %2$s!" #: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 #: actions/apitimelinefriends.php:155 actions/apitimelinegroup.php:150 #: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 -#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 #, fuzzy @@ -151,7 +208,7 @@ msgstr "Fann ikkje API-metode." #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:119 +#: actions/apistatusesupdate.php:118 msgid "This method requires a POST." msgstr "Dette krev ein POST." @@ -182,7 +239,7 @@ msgstr "Kan ikkje lagra profil." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:132 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 #: actions/designadminpanel.php:122 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -493,7 +550,14 @@ msgstr "" msgid "Allow or deny access" msgstr "" -#: actions/apioauthauthorize.php:320 lib/action.php:435 +#: actions/apioauthauthorize.php:306 +#, php-format +msgid "" +"The application %s by %s would like the " +"ability to %s your account data." +msgstr "" + +#: actions/apioauthauthorize.php:320 lib/action.php:441 msgid "Account" msgstr "Konto" @@ -554,17 +618,17 @@ msgstr "Lasta opp brukarbilete." msgid "No status with that ID found." msgstr "Fann ingen status med den ID-en." -#: actions/apistatusesupdate.php:162 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Det er for langt! Ein notis kan berre innehalde 140 teikn." -#: actions/apistatusesupdate.php:203 +#: actions/apistatusesupdate.php:202 msgid "Not found" msgstr "Fann ikkje" -#: actions/apistatusesupdate.php:226 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -616,11 +680,6 @@ msgstr "%s offentleg tidsline" msgid "%s updates from everyone!" msgstr "%s oppdateringar frå alle saman!" -#: actions/apitimelineretweetedbyme.php:112 -#, php-format -msgid "Repeated by %s" -msgstr "" - #: actions/apitimelineretweetedtome.php:111 #, fuzzy, php-format msgid "Repeated to %s" @@ -1046,17 +1105,6 @@ msgstr "" msgid "Reset back to default" msgstr "" -#: actions/designadminpanel.php:586 actions/emailsettings.php:195 -#: actions/imsettings.php:163 actions/othersettings.php:126 -#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174 -#: actions/siteadminpanel.php:388 actions/smssettings.php:181 -#: actions/subscriptions.php:203 actions/tagother.php:154 -#: actions/useradminpanel.php:313 lib/applicationeditform.php:335 -#: lib/applicationeditform.php:336 lib/designsettings.php:256 -#: lib/groupeditform.php:202 -msgid "Save" -msgstr "Lagra" - #: actions/designadminpanel.php:587 lib/designsettings.php:257 msgid "Save design" msgstr "" @@ -1069,13 +1117,15 @@ msgstr "Denne notisen er ikkje ein favoritt!" msgid "Add to favorites" msgstr "Legg til i favorittar" -#: actions/doc.php:69 -msgid "No such document." +#: actions/doc.php:155 +#, fuzzy, php-format +msgid "No such document \"%s\"" msgstr "Slikt dokument finst ikkje." -#: actions/editapplication.php:54 lib/applicationeditform.php:136 -msgid "Edit application" -msgstr "" +#: actions/editapplication.php:54 +#, fuzzy +msgid "Edit Application" +msgstr "Andre val" #: actions/editapplication.php:66 #, fuzzy @@ -1094,7 +1144,7 @@ msgid "No such application." msgstr "Denne notisen finst ikkje." #: actions/editapplication.php:127 actions/newapplication.php:110 -#: actions/showapplication.php:118 lib/action.php:1189 +#: actions/showapplication.php:118 lib/action.php:1195 msgid "There was a problem with your session token." msgstr "Det var eit problem med sesjons billetten din." @@ -1308,7 +1358,7 @@ msgid "Cannot normalize that email address" msgstr "Klarar ikkje normalisera epostadressa" #: actions/emailsettings.php:331 actions/register.php:201 -#: actions/siteadminpanel.php:157 +#: actions/siteadminpanel.php:143 msgid "Not a valid email address." msgstr "Ikkje ei gyldig epostadresse." @@ -1320,7 +1370,7 @@ msgstr "Det er alt din epost addresse" msgid "That email address already belongs to another user." msgstr "Den epost addressa er alt registrert hos ein annan brukar." -#: actions/emailsettings.php:353 actions/imsettings.php:317 +#: actions/emailsettings.php:353 actions/imsettings.php:319 #: actions/smssettings.php:337 msgid "Couldn't insert confirmation code." msgstr "Kan ikkje leggja til godkjenningskode." @@ -1637,7 +1687,7 @@ msgstr "%s medlemmar i gruppa, side %d" msgid "A list of the users in this group." msgstr "Ei liste over brukarane i denne gruppa." -#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107 +#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107 msgid "Admin" msgstr "Administrator" @@ -1829,6 +1879,11 @@ msgstr "" msgid "That is not your Jabber ID." msgstr "Det er ikkje din Jabber ID." +#: actions/inbox.php:59 +#, fuzzy, php-format +msgid "Inbox for %1$s - page %2$d" +msgstr "Innboks for %s" + #: actions/inbox.php:62 #, php-format msgid "Inbox for %s" @@ -2006,7 +2061,7 @@ msgstr "Feil brukarnamn eller passord" msgid "Error setting user. You are probably not authorized." msgstr "Ikkje autorisert." -#: actions/login.php:188 actions/login.php:241 lib/action.php:460 +#: actions/login.php:188 actions/login.php:241 lib/action.php:466 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Logg inn" @@ -2069,8 +2124,9 @@ msgid "No current status" msgstr "Ingen status" #: actions/newapplication.php:52 -msgid "New application" -msgstr "" +#, fuzzy +msgid "New Application" +msgstr "Denne notisen finst ikkje." #: actions/newapplication.php:64 #, fuzzy @@ -2265,8 +2321,8 @@ msgstr "Kopla til" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1038 -#: lib/api.php:1066 lib/api.php:1176 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1039 +#: lib/api.php:1067 lib/api.php:1177 msgid "Not a supported data format." msgstr "Ikkje eit støtta dataformat." @@ -2337,6 +2393,11 @@ msgstr "Ugyldig notisinnhald" msgid "Login token expired." msgstr "Logg inn " +#: actions/outbox.php:58 +#, fuzzy, php-format +msgid "Outbox for %1$s - page %2$d" +msgstr "Utboks for %s" + #: actions/outbox.php:61 #, php-format msgid "Outbox for %s" @@ -2407,7 +2468,7 @@ msgstr "Klarar ikkje lagra nytt passord." msgid "Password saved." msgstr "Lagra passord." -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:331 msgid "Paths" msgstr "" @@ -2415,142 +2476,159 @@ msgstr "" msgid "Path and server settings for this StatusNet site." msgstr "" -#: actions/pathsadminpanel.php:140 +#: actions/pathsadminpanel.php:157 #, fuzzy, php-format msgid "Theme directory not readable: %s" msgstr "Denne sida er ikkje tilgjengleg i eit" -#: actions/pathsadminpanel.php:146 +#: actions/pathsadminpanel.php:163 #, php-format msgid "Avatar directory not writable: %s" msgstr "" -#: actions/pathsadminpanel.php:152 +#: actions/pathsadminpanel.php:169 #, php-format msgid "Background directory not writable: %s" msgstr "" -#: actions/pathsadminpanel.php:160 +#: actions/pathsadminpanel.php:177 #, php-format msgid "Locales directory not readable: %s" msgstr "" -#: actions/pathsadminpanel.php:166 +#: actions/pathsadminpanel.php:183 msgid "Invalid SSL server. The maximum length is 255 characters." msgstr "" -#: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58 +#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58 #: lib/adminpanelaction.php:311 #, fuzzy msgid "Site" msgstr "Invitér" -#: actions/pathsadminpanel.php:221 +#: actions/pathsadminpanel.php:238 +#, fuzzy +msgid "Server" +msgstr "Gjenopprett" + +#: actions/pathsadminpanel.php:238 +msgid "Site's server hostname." +msgstr "" + +#: actions/pathsadminpanel.php:242 msgid "Path" msgstr "" -#: actions/pathsadminpanel.php:221 +#: actions/pathsadminpanel.php:242 #, fuzzy msgid "Site path" msgstr "Statusmelding" -#: actions/pathsadminpanel.php:225 +#: actions/pathsadminpanel.php:246 msgid "Path to locales" msgstr "" -#: actions/pathsadminpanel.php:225 +#: actions/pathsadminpanel.php:246 msgid "Directory path to locales" msgstr "" -#: actions/pathsadminpanel.php:232 -msgid "Theme" -msgstr "" - -#: actions/pathsadminpanel.php:237 -msgid "Theme server" -msgstr "" - -#: actions/pathsadminpanel.php:241 -msgid "Theme path" -msgstr "" - -#: actions/pathsadminpanel.php:245 -msgid "Theme directory" +#: actions/pathsadminpanel.php:250 +msgid "Fancy URLs" msgstr "" #: actions/pathsadminpanel.php:252 +msgid "Use fancy (more readable and memorable) URLs?" +msgstr "" + +#: actions/pathsadminpanel.php:259 +msgid "Theme" +msgstr "" + +#: actions/pathsadminpanel.php:264 +msgid "Theme server" +msgstr "" + +#: actions/pathsadminpanel.php:268 +msgid "Theme path" +msgstr "" + +#: actions/pathsadminpanel.php:272 +msgid "Theme directory" +msgstr "" + +#: actions/pathsadminpanel.php:279 #, fuzzy msgid "Avatars" msgstr "Brukarbilete" -#: actions/pathsadminpanel.php:257 +#: actions/pathsadminpanel.php:284 #, fuzzy msgid "Avatar server" msgstr "Avatar-innstillingar" -#: actions/pathsadminpanel.php:261 +#: actions/pathsadminpanel.php:288 #, fuzzy msgid "Avatar path" msgstr "Lasta opp brukarbilete." -#: actions/pathsadminpanel.php:265 +#: actions/pathsadminpanel.php:292 #, fuzzy msgid "Avatar directory" msgstr "Lasta opp brukarbilete." -#: actions/pathsadminpanel.php:274 +#: actions/pathsadminpanel.php:301 msgid "Backgrounds" msgstr "" -#: actions/pathsadminpanel.php:278 +#: actions/pathsadminpanel.php:305 msgid "Background server" msgstr "" -#: actions/pathsadminpanel.php:282 +#: actions/pathsadminpanel.php:309 msgid "Background path" msgstr "" -#: actions/pathsadminpanel.php:286 +#: actions/pathsadminpanel.php:313 msgid "Background directory" msgstr "" -#: actions/pathsadminpanel.php:293 +#: actions/pathsadminpanel.php:320 #, fuzzy msgid "SSL" msgstr "SMS" -#: actions/pathsadminpanel.php:296 actions/siteadminpanel.php:346 +#: actions/pathsadminpanel.php:323 actions/siteadminpanel.php:294 #, fuzzy msgid "Never" msgstr "Gjenopprett" -#: actions/pathsadminpanel.php:297 +#: actions/pathsadminpanel.php:324 #, fuzzy msgid "Sometimes" msgstr "Notisar" -#: actions/pathsadminpanel.php:298 +#: actions/pathsadminpanel.php:325 msgid "Always" msgstr "" -#: actions/pathsadminpanel.php:302 +#: actions/pathsadminpanel.php:329 msgid "Use SSL" msgstr "" -#: actions/pathsadminpanel.php:303 +#: actions/pathsadminpanel.php:330 msgid "When to use SSL" msgstr "" -#: actions/pathsadminpanel.php:308 +#: actions/pathsadminpanel.php:335 #, fuzzy msgid "SSL server" msgstr "Gjenopprett" -#: actions/pathsadminpanel.php:309 +#: actions/pathsadminpanel.php:336 msgid "Server to direct SSL requests to" msgstr "" -#: actions/pathsadminpanel.php:325 +#: actions/pathsadminpanel.php:352 #, fuzzy msgid "Save paths" msgstr "Statusmelding" @@ -2664,7 +2742,7 @@ msgstr "" "merkelappar for deg sjølv ( bokstavar, nummer, -, ., og _ ), komma eller " "mellomroms separert." -#: actions/profilesettings.php:151 actions/siteadminpanel.php:294 +#: actions/profilesettings.php:151 actions/siteadminpanel.php:280 msgid "Language" msgstr "Språk" @@ -2691,7 +2769,7 @@ msgstr "" msgid "Bio is too long (max %d chars)." msgstr "«Om meg» er for lang (maks 140 " -#: actions/profilesettings.php:235 actions/siteadminpanel.php:164 +#: actions/profilesettings.php:235 actions/siteadminpanel.php:150 msgid "Timezone not selected." msgstr "Tidssone er ikkje valt." @@ -2958,7 +3036,7 @@ msgstr "Feil med stadfestingskode." msgid "Registration successful" msgstr "Registreringa gikk bra" -#: actions/register.php:114 actions/register.php:503 lib/action.php:457 +#: actions/register.php:114 actions/register.php:503 lib/action.php:463 #: lib/logingroupnav.php:85 msgid "Register" msgstr "Registrér" @@ -3000,7 +3078,7 @@ msgid "Same as password above. Required." msgstr "Samme som passord over. Påkrevd." #: actions/register.php:438 actions/register.php:442 -#: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120 +#: actions/siteadminpanel.php:256 lib/accountsettingsaction.php:120 msgid "Email" msgstr "Epost" @@ -3167,6 +3245,11 @@ msgstr "Lag" msgid "Replies to %s" msgstr "Svar til %s" +#: actions/replies.php:127 +#, fuzzy, php-format +msgid "Replies to %1$s, page %2$d" +msgstr "Melding til %1$s på %2$s" + #: actions/replies.php:144 #, fuzzy, php-format msgid "Replies feed for %s (RSS 1.0)" @@ -3296,6 +3379,11 @@ msgid "" "signature method." msgstr "" +#: actions/showfavorites.php:79 +#, fuzzy, php-format +msgid "%1$s's favorite notices, page %2$d" +msgstr "%s's favoritt meldingar" + #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "Kunne ikkje hente fram favorittane." @@ -3345,6 +3433,11 @@ msgstr "" msgid "%s group" msgstr "%s gruppe" +#: actions/showgroup.php:84 +#, fuzzy, php-format +msgid "%1$s group, page %2$d" +msgstr "%s medlemmar i gruppa, side %d" + #: actions/showgroup.php:218 msgid "Group profile" msgstr "Gruppe profil" @@ -3460,6 +3553,11 @@ msgstr "Melding lagra" msgid " tagged %s" msgstr "Notisar merka med %s" +#: actions/showstream.php:79 +#, fuzzy, php-format +msgid "%1$s, page %2$d" +msgstr "%s med vener, side %d" + #: actions/showstream.php:122 #, fuzzy, php-format msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" @@ -3541,203 +3639,149 @@ msgstr "Brukar har blokkert deg." msgid "Basic settings for this StatusNet site." msgstr "" -#: actions/siteadminpanel.php:146 +#: actions/siteadminpanel.php:132 msgid "Site name must have non-zero length." msgstr "" -#: actions/siteadminpanel.php:154 +#: actions/siteadminpanel.php:140 #, fuzzy msgid "You must have a valid contact email address." msgstr "Ikkje ei gyldig epostadresse" -#: actions/siteadminpanel.php:172 +#: actions/siteadminpanel.php:158 #, php-format msgid "Unknown language \"%s\"." msgstr "" -#: actions/siteadminpanel.php:179 +#: actions/siteadminpanel.php:165 msgid "Invalid snapshot report URL." msgstr "" -#: actions/siteadminpanel.php:185 +#: actions/siteadminpanel.php:171 msgid "Invalid snapshot run value." msgstr "" -#: actions/siteadminpanel.php:191 +#: actions/siteadminpanel.php:177 msgid "Snapshot frequency must be a number." msgstr "" -#: actions/siteadminpanel.php:197 +#: actions/siteadminpanel.php:183 msgid "Minimum text limit is 140 characters." msgstr "" -#: actions/siteadminpanel.php:203 +#: actions/siteadminpanel.php:189 msgid "Dupe limit must 1 or more seconds." msgstr "" -#: actions/siteadminpanel.php:253 +#: actions/siteadminpanel.php:239 msgid "General" msgstr "" -#: actions/siteadminpanel.php:256 +#: actions/siteadminpanel.php:242 #, fuzzy msgid "Site name" msgstr "Statusmelding" -#: actions/siteadminpanel.php:257 +#: actions/siteadminpanel.php:243 msgid "The name of your site, like \"Yourcompany Microblog\"" msgstr "" -#: actions/siteadminpanel.php:261 +#: actions/siteadminpanel.php:247 msgid "Brought by" msgstr "" -#: actions/siteadminpanel.php:262 +#: actions/siteadminpanel.php:248 msgid "Text used for credits link in footer of each page" msgstr "" -#: actions/siteadminpanel.php:266 +#: actions/siteadminpanel.php:252 msgid "Brought by URL" msgstr "" -#: actions/siteadminpanel.php:267 +#: actions/siteadminpanel.php:253 msgid "URL used for credits link in footer of each page" msgstr "" -#: actions/siteadminpanel.php:271 +#: actions/siteadminpanel.php:257 #, fuzzy msgid "Contact email address for your site" msgstr "Ny epostadresse for å oppdatera %s" -#: actions/siteadminpanel.php:277 +#: actions/siteadminpanel.php:263 #, fuzzy msgid "Local" msgstr "Lokale syningar" -#: actions/siteadminpanel.php:288 +#: actions/siteadminpanel.php:274 msgid "Default timezone" msgstr "" -#: actions/siteadminpanel.php:289 +#: actions/siteadminpanel.php:275 msgid "Default timezone for the site; usually UTC." msgstr "" -#: actions/siteadminpanel.php:295 +#: actions/siteadminpanel.php:281 #, fuzzy msgid "Default site language" msgstr "Foretrukke språk" -#: actions/siteadminpanel.php:303 -#, fuzzy -msgid "URLs" -msgstr "URL" - -#: actions/siteadminpanel.php:306 -#, fuzzy -msgid "Server" -msgstr "Gjenopprett" - -#: actions/siteadminpanel.php:306 -msgid "Site's server hostname." -msgstr "" - -#: actions/siteadminpanel.php:310 -msgid "Fancy URLs" -msgstr "" - -#: actions/siteadminpanel.php:312 -msgid "Use fancy (more readable and memorable) URLs?" -msgstr "" - -#: actions/siteadminpanel.php:318 -#, fuzzy -msgid "Access" -msgstr "Godta" - -#: actions/siteadminpanel.php:321 -#, fuzzy -msgid "Private" -msgstr "Personvern" - -#: actions/siteadminpanel.php:323 -msgid "Prohibit anonymous users (not logged in) from viewing site?" -msgstr "" - -#: actions/siteadminpanel.php:327 -#, fuzzy -msgid "Invite only" -msgstr "Invitér" - -#: actions/siteadminpanel.php:329 -msgid "Make registration invitation only." -msgstr "" - -#: actions/siteadminpanel.php:333 -#, fuzzy -msgid "Closed" -msgstr "Blokkér" - -#: actions/siteadminpanel.php:335 -msgid "Disable new registrations." -msgstr "" - -#: actions/siteadminpanel.php:341 +#: actions/siteadminpanel.php:289 msgid "Snapshots" msgstr "" -#: actions/siteadminpanel.php:344 +#: actions/siteadminpanel.php:292 msgid "Randomly during Web hit" msgstr "" -#: actions/siteadminpanel.php:345 +#: actions/siteadminpanel.php:293 msgid "In a scheduled job" msgstr "" -#: actions/siteadminpanel.php:347 +#: actions/siteadminpanel.php:295 msgid "Data snapshots" msgstr "" -#: actions/siteadminpanel.php:348 +#: actions/siteadminpanel.php:296 msgid "When to send statistical data to status.net servers" msgstr "" -#: actions/siteadminpanel.php:353 +#: actions/siteadminpanel.php:301 msgid "Frequency" msgstr "" -#: actions/siteadminpanel.php:354 +#: actions/siteadminpanel.php:302 msgid "Snapshots will be sent once every N web hits" msgstr "" -#: actions/siteadminpanel.php:359 +#: actions/siteadminpanel.php:307 msgid "Report URL" msgstr "" -#: actions/siteadminpanel.php:360 +#: actions/siteadminpanel.php:308 msgid "Snapshots will be sent to this URL" msgstr "" -#: actions/siteadminpanel.php:367 +#: actions/siteadminpanel.php:315 msgid "Limits" msgstr "" -#: actions/siteadminpanel.php:370 +#: actions/siteadminpanel.php:318 msgid "Text limit" msgstr "" -#: actions/siteadminpanel.php:370 +#: actions/siteadminpanel.php:318 msgid "Maximum number of characters for notices." msgstr "" -#: actions/siteadminpanel.php:374 +#: actions/siteadminpanel.php:322 msgid "Dupe limit" msgstr "" -#: actions/siteadminpanel.php:374 +#: actions/siteadminpanel.php:322 msgid "How long users must wait (in seconds) to post the same thing again." msgstr "" -#: actions/siteadminpanel.php:388 actions/useradminpanel.php:313 +#: actions/siteadminpanel.php:336 actions/useradminpanel.php:313 #, fuzzy msgid "Save site settings" msgstr "Avatar-innstillingar" @@ -3939,6 +3983,11 @@ msgstr "Jabber" msgid "SMS" msgstr "SMS" +#: actions/tag.php:68 +#, fuzzy, php-format +msgid "Notices tagged with %1$s, page %2$d" +msgstr "Brukarar sjølv-merka med %s, side %d" + #: actions/tag.php:86 #, fuzzy, php-format msgid "Notice feed for tag %s (RSS 1.0)" @@ -4251,6 +4300,11 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "" +#: actions/usergroups.php:64 +#, fuzzy, php-format +msgid "%1$s groups, page %2$d" +msgstr "%s medlemmar i gruppa, side %d" + #: actions/usergroups.php:130 #, fuzzy msgid "Search for more groups" @@ -4314,7 +4368,7 @@ msgstr "" msgid "Plugins" msgstr "" -#: actions/version.php:196 lib/action.php:741 +#: actions/version.php:196 lib/action.php:747 #, fuzzy msgid "Version" msgstr "Personleg" @@ -4373,27 +4427,27 @@ msgstr "Kunne ikkje lagre melding." msgid "Could not update message with new URI." msgstr "Kunne ikkje oppdatere melding med ny URI." -#: classes/Notice.php:171 +#: classes/Notice.php:157 #, php-format msgid "DB error inserting hashtag: %s" msgstr "databasefeil ved innsetjing av skigardmerkelapp (#merkelapp): %s" -#: classes/Notice.php:225 +#: classes/Notice.php:214 #, fuzzy msgid "Problem saving notice. Too long." msgstr "Eit problem oppstod ved lagring av notis." -#: classes/Notice.php:229 +#: classes/Notice.php:218 msgid "Problem saving notice. Unknown user." msgstr "Feil ved lagring av notis. Ukjend brukar." -#: classes/Notice.php:234 +#: classes/Notice.php:223 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "For mange notisar for raskt; tek ei pause, og prøv igjen om eit par minutt." -#: classes/Notice.php:240 +#: classes/Notice.php:229 #, fuzzy msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " @@ -4401,20 +4455,25 @@ msgid "" msgstr "" "For mange notisar for raskt; tek ei pause, og prøv igjen om eit par minutt." -#: classes/Notice.php:246 +#: classes/Notice.php:235 msgid "You are banned from posting notices on this site." msgstr "Du kan ikkje lengre legge inn notisar på denne sida." -#: classes/Notice.php:305 classes/Notice.php:330 +#: classes/Notice.php:294 classes/Notice.php:319 msgid "Problem saving notice." msgstr "Eit problem oppstod ved lagring av notis." -#: classes/Notice.php:1059 +#: classes/Notice.php:790 +#, fuzzy +msgid "Problem saving group inbox." +msgstr "Eit problem oppstod ved lagring av notis." + +#: classes/Notice.php:850 #, php-format msgid "DB error inserting reply: %s" msgstr "Databasefeil, kan ikkje lagra svar: %s" -#: classes/Notice.php:1441 +#: classes/Notice.php:1233 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" @@ -4470,127 +4529,127 @@ msgstr "%1$s (%2$s)" msgid "Untitled page" msgstr "Ingen tittel" -#: lib/action.php:427 +#: lib/action.php:433 msgid "Primary site navigation" msgstr "Navigasjon for hovudsida" -#: lib/action.php:433 +#: lib/action.php:439 msgid "Home" msgstr "Heim" -#: lib/action.php:433 +#: lib/action.php:439 msgid "Personal profile and friends timeline" msgstr "Personleg profil og oversyn over vener" -#: lib/action.php:435 +#: lib/action.php:441 msgid "Change your email, avatar, password, profile" msgstr "Endra e-posten, avataren, passordet eller profilen" -#: lib/action.php:438 +#: lib/action.php:444 msgid "Connect" msgstr "Kopla til" -#: lib/action.php:438 +#: lib/action.php:444 #, fuzzy msgid "Connect to services" msgstr "Klarte ikkje å omdirigera til tenaren: %s" -#: lib/action.php:442 +#: lib/action.php:448 #, fuzzy msgid "Change site configuration" msgstr "Navigasjon for hovudsida" -#: lib/action.php:446 lib/subgroupnav.php:105 +#: lib/action.php:452 lib/subgroupnav.php:105 msgid "Invite" msgstr "Invitér" -#: lib/action.php:447 lib/subgroupnav.php:106 +#: lib/action.php:453 lib/subgroupnav.php:106 #, php-format msgid "Invite friends and colleagues to join you on %s" msgstr "Inviter vennar og kollega til å bli med deg på %s" -#: lib/action.php:452 +#: lib/action.php:458 msgid "Logout" msgstr "Logg ut" -#: lib/action.php:452 +#: lib/action.php:458 msgid "Logout from the site" msgstr "Logg ut or sida" -#: lib/action.php:457 +#: lib/action.php:463 msgid "Create an account" msgstr "Opprett ny konto" -#: lib/action.php:460 +#: lib/action.php:466 msgid "Login to the site" msgstr "Logg inn or sida" -#: lib/action.php:463 lib/action.php:726 +#: lib/action.php:469 lib/action.php:732 msgid "Help" msgstr "Hjelp" -#: lib/action.php:463 +#: lib/action.php:469 msgid "Help me!" msgstr "Hjelp meg!" -#: lib/action.php:466 lib/searchaction.php:127 +#: lib/action.php:472 lib/searchaction.php:127 msgid "Search" msgstr "Søk" -#: lib/action.php:466 +#: lib/action.php:472 msgid "Search for people or text" msgstr "Søk etter folk eller innhald" -#: lib/action.php:487 +#: lib/action.php:493 msgid "Site notice" msgstr "Statusmelding" -#: lib/action.php:553 +#: lib/action.php:559 msgid "Local views" msgstr "Lokale syningar" -#: lib/action.php:619 +#: lib/action.php:625 msgid "Page notice" msgstr "Sidenotis" -#: lib/action.php:721 +#: lib/action.php:727 msgid "Secondary site navigation" msgstr "Andrenivås side navigasjon" -#: lib/action.php:728 +#: lib/action.php:734 msgid "About" msgstr "Om" -#: lib/action.php:730 +#: lib/action.php:736 msgid "FAQ" msgstr "OSS" -#: lib/action.php:734 +#: lib/action.php:740 msgid "TOS" msgstr "" -#: lib/action.php:737 +#: lib/action.php:743 msgid "Privacy" msgstr "Personvern" -#: lib/action.php:739 +#: lib/action.php:745 msgid "Source" msgstr "Kjeldekode" -#: lib/action.php:743 +#: lib/action.php:749 msgid "Contact" msgstr "Kontakt" -#: lib/action.php:745 +#: lib/action.php:751 #, fuzzy msgid "Badge" msgstr "Dult" -#: lib/action.php:773 +#: lib/action.php:779 msgid "StatusNet software license" msgstr "StatusNets programvarelisens" -#: lib/action.php:776 +#: lib/action.php:782 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -4599,12 +4658,12 @@ msgstr "" "**%%site.name%%** er ei mikrobloggingteneste av [%%site.broughtby%%](%%site." "broughtbyurl%%). " -#: lib/action.php:778 +#: lib/action.php:784 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "**%%site.name%%** er ei mikrobloggingteneste. " -#: lib/action.php:780 +#: lib/action.php:786 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4615,42 +4674,42 @@ msgstr "" "%s, tilgjengeleg under [GNU Affero General Public License](http://www.fsf." "org/licensing/licenses/agpl-3.0.html)." -#: lib/action.php:795 +#: lib/action.php:801 #, fuzzy msgid "Site content license" msgstr "StatusNets programvarelisens" -#: lib/action.php:800 +#: lib/action.php:806 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "" -#: lib/action.php:805 +#: lib/action.php:811 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" -#: lib/action.php:808 +#: lib/action.php:814 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" -#: lib/action.php:820 +#: lib/action.php:826 msgid "All " msgstr "Alle" -#: lib/action.php:825 +#: lib/action.php:831 msgid "license." msgstr "lisens." -#: lib/action.php:1124 +#: lib/action.php:1130 msgid "Pagination" msgstr "Paginering" -#: lib/action.php:1133 +#: lib/action.php:1139 msgid "After" msgstr "« Etter" -#: lib/action.php:1141 +#: lib/action.php:1147 msgid "Before" msgstr "Før »" @@ -4689,11 +4748,25 @@ msgstr "Stadfesting av epostadresse" msgid "Design configuration" msgstr "SMS bekreftelse" -#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327 +#: lib/adminpanelaction.php:322 +#, fuzzy +msgid "User configuration" +msgstr "SMS bekreftelse" + +#: lib/adminpanelaction.php:327 +#, fuzzy +msgid "Access configuration" +msgstr "SMS bekreftelse" + +#: lib/adminpanelaction.php:332 #, fuzzy msgid "Paths configuration" msgstr "SMS bekreftelse" +#: lib/applicationeditform.php:136 +msgid "Edit application" +msgstr "" + #: lib/applicationeditform.php:186 msgid "Icon for this application" msgstr "" @@ -5283,12 +5356,12 @@ msgstr "" msgid "kB" msgstr "" -#: lib/jabber.php:202 +#: lib/jabber.php:220 #, php-format msgid "[%s]" msgstr "" -#: lib/jabber.php:385 +#: lib/jabber.php:400 #, php-format msgid "Unknown inbox source %d." msgstr "" @@ -5721,19 +5794,19 @@ msgstr "Svar" msgid "Favorites" msgstr "Favorittar" -#: lib/personalgroupnav.php:124 +#: lib/personalgroupnav.php:125 msgid "Inbox" msgstr "Innboks" -#: lib/personalgroupnav.php:125 +#: lib/personalgroupnav.php:126 msgid "Your incoming messages" msgstr "Dine innkomande meldinger" -#: lib/personalgroupnav.php:129 +#: lib/personalgroupnav.php:130 msgid "Outbox" msgstr "Utboks" -#: lib/personalgroupnav.php:130 +#: lib/personalgroupnav.php:131 msgid "Your sent messages" msgstr "Dine sende meldingar" @@ -5992,47 +6065,47 @@ msgstr "Melding" msgid "Moderate" msgstr "" -#: lib/util.php:875 +#: lib/util.php:868 msgid "a few seconds ago" msgstr "eit par sekund sidan" -#: lib/util.php:877 +#: lib/util.php:870 msgid "about a minute ago" msgstr "omtrent eitt minutt sidan" -#: lib/util.php:879 +#: lib/util.php:872 #, php-format msgid "about %d minutes ago" msgstr "~%d minutt sidan" -#: lib/util.php:881 +#: lib/util.php:874 msgid "about an hour ago" msgstr "omtrent ein time sidan" -#: lib/util.php:883 +#: lib/util.php:876 #, php-format msgid "about %d hours ago" msgstr "~%d timar sidan" -#: lib/util.php:885 +#: lib/util.php:878 msgid "about a day ago" msgstr "omtrent ein dag sidan" -#: lib/util.php:887 +#: lib/util.php:880 #, php-format msgid "about %d days ago" msgstr "~%d dagar sidan" -#: lib/util.php:889 +#: lib/util.php:882 msgid "about a month ago" msgstr "omtrent ein månad sidan" -#: lib/util.php:891 +#: lib/util.php:884 #, php-format msgid "about %d months ago" msgstr "~%d månadar sidan" -#: lib/util.php:893 +#: lib/util.php:886 msgid "about a year ago" msgstr "omtrent eitt år sidan" @@ -6046,7 +6119,7 @@ msgstr "Heimesida er ikkje ei gyldig internettadresse." msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "" -#: scripts/xmppdaemon.php:301 +#: lib/xmppmanager.php:402 #, fuzzy, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "Melding for lang - maksimum 140 teikn, du skreiv %d" diff --git a/locale/pl/LC_MESSAGES/statusnet.po b/locale/pl/LC_MESSAGES/statusnet.po index b42a542b51..292affef5e 100644 --- a/locale/pl/LC_MESSAGES/statusnet.po +++ b/locale/pl/LC_MESSAGES/statusnet.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-21 22:36+0000\n" -"PO-Revision-Date: 2010-01-21 22:38:15+0000\n" +"POT-Creation-Date: 2010-01-27 23:58+0000\n" +"PO-Revision-Date: 2010-01-27 23:59:33+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Polish \n" "MIME-Version: 1.0\n" @@ -19,11 +19,65 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" -"X-Generator: MediaWiki 1.16alpha (r61339); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61595); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: pl\n" "X-Message-Group: out-statusnet\n" +#: actions/accessadminpanel.php:54 lib/adminpanelaction.php:326 +msgid "Access" +msgstr "Dostęp" + +#: actions/accessadminpanel.php:65 +#, fuzzy +msgid "Site access settings" +msgstr "Zapisz ustawienia strony" + +#: actions/accessadminpanel.php:158 +#, fuzzy +msgid "Registration" +msgstr "Zarejestruj się" + +#: actions/accessadminpanel.php:161 +msgid "Private" +msgstr "Prywatna" + +#: actions/accessadminpanel.php:163 +msgid "Prohibit anonymous users (not logged in) from viewing site?" +msgstr "Zabronić anonimowym użytkownikom (niezalogowanym) przeglądać stronę?" + +#: actions/accessadminpanel.php:167 +msgid "Invite only" +msgstr "Tylko zaproszeni" + +#: actions/accessadminpanel.php:169 +msgid "Make registration invitation only." +msgstr "Rejestracja tylko za zaproszeniem." + +#: actions/accessadminpanel.php:173 +msgid "Closed" +msgstr "Zamknięte" + +#: actions/accessadminpanel.php:175 +msgid "Disable new registrations." +msgstr "Wyłączenie nowych rejestracji." + +#: actions/accessadminpanel.php:189 actions/designadminpanel.php:586 +#: actions/emailsettings.php:195 actions/imsettings.php:163 +#: actions/othersettings.php:126 actions/pathsadminpanel.php:351 +#: actions/profilesettings.php:174 actions/siteadminpanel.php:336 +#: actions/smssettings.php:181 actions/subscriptions.php:203 +#: actions/tagother.php:154 actions/useradminpanel.php:313 +#: lib/applicationeditform.php:335 lib/applicationeditform.php:336 +#: lib/designsettings.php:256 lib/groupeditform.php:202 +msgid "Save" +msgstr "Zapisz" + +#: actions/accessadminpanel.php:189 +#, fuzzy +msgid "Save access settings" +msgstr "Zapisz ustawienia strony" + #: actions/all.php:63 actions/public.php:97 actions/replies.php:92 #: actions/showfavorites.php:137 actions/tag.php:51 msgid "No such page" @@ -38,7 +92,7 @@ msgstr "Nie ma takiej strony" #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:149 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 @@ -146,8 +200,7 @@ msgstr "Aktualizacje z %1$s i przyjaciół na %2$s." #: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 #: actions/apitimelinefriends.php:155 actions/apitimelinegroup.php:150 #: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 -#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found." @@ -163,7 +216,7 @@ msgstr "Nie odnaleziono metody API." #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:119 +#: actions/apistatusesupdate.php:118 msgid "This method requires a POST." msgstr "Ta metoda wymaga POST." @@ -193,7 +246,7 @@ msgstr "Nie można zapisać profilu." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:132 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 #: actions/designadminpanel.php:122 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -495,7 +548,14 @@ msgstr "Aplikacja chce połączyć się z kontem użytkownika" msgid "Allow or deny access" msgstr "Zezwolić czy odmówić dostęp" -#: actions/apioauthauthorize.php:320 lib/action.php:435 +#: actions/apioauthauthorize.php:306 +#, php-format +msgid "" +"The application %s by %s would like the " +"ability to %s your account data." +msgstr "" + +#: actions/apioauthauthorize.php:320 lib/action.php:441 msgid "Account" msgstr "Konto" @@ -552,17 +612,17 @@ msgstr "Usunięto stan." msgid "No status with that ID found." msgstr "Nie odnaleziono stanów z tym identyfikatorem." -#: actions/apistatusesupdate.php:162 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Wpis jest za długi. Maksymalna długość wynosi %d znaków." -#: actions/apistatusesupdate.php:203 +#: actions/apistatusesupdate.php:202 msgid "Not found" msgstr "Nie odnaleziono" -#: actions/apistatusesupdate.php:226 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "Maksymalny rozmiar wpisu wynosi %d znaków, w tym adres URL załącznika." @@ -613,11 +673,6 @@ msgstr "Publiczna oś czasu użytkownika %s" msgid "%s updates from everyone!" msgstr "Użytkownik %s aktualizuje od każdego." -#: actions/apitimelineretweetedbyme.php:112 -#, php-format -msgid "Repeated by %s" -msgstr "Powtórzone przez użytkownika %s" - #: actions/apitimelineretweetedtome.php:111 #, php-format msgid "Repeated to %s" @@ -1023,17 +1078,6 @@ msgstr "Przywróć domyślny wygląd" msgid "Reset back to default" msgstr "Przywróć domyślne ustawienia" -#: actions/designadminpanel.php:586 actions/emailsettings.php:195 -#: actions/imsettings.php:163 actions/othersettings.php:126 -#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174 -#: actions/siteadminpanel.php:388 actions/smssettings.php:181 -#: actions/subscriptions.php:203 actions/tagother.php:154 -#: actions/useradminpanel.php:313 lib/applicationeditform.php:335 -#: lib/applicationeditform.php:336 lib/designsettings.php:256 -#: lib/groupeditform.php:202 -msgid "Save" -msgstr "Zapisz" - #: actions/designadminpanel.php:587 lib/designsettings.php:257 msgid "Save design" msgstr "Zapisz wygląd" @@ -1046,12 +1090,14 @@ msgstr "Ten wpis nie jest ulubiony." msgid "Add to favorites" msgstr "Dodaj do ulubionych" -#: actions/doc.php:69 -msgid "No such document." +#: actions/doc.php:155 +#, fuzzy, php-format +msgid "No such document \"%s\"" msgstr "Nie ma takiego dokumentu." -#: actions/editapplication.php:54 lib/applicationeditform.php:136 -msgid "Edit application" +#: actions/editapplication.php:54 +#, fuzzy +msgid "Edit Application" msgstr "Zmodyfikuj aplikację" #: actions/editapplication.php:66 @@ -1068,7 +1114,7 @@ msgid "No such application." msgstr "Nie ma takiej aplikacji." #: actions/editapplication.php:127 actions/newapplication.php:110 -#: actions/showapplication.php:118 lib/action.php:1189 +#: actions/showapplication.php:118 lib/action.php:1195 msgid "There was a problem with your session token." msgstr "Wystąpił problem z tokenem sesji." @@ -1270,7 +1316,7 @@ msgid "Cannot normalize that email address" msgstr "Nie można znormalizować tego adresu e-mail" #: actions/emailsettings.php:331 actions/register.php:201 -#: actions/siteadminpanel.php:157 +#: actions/siteadminpanel.php:143 msgid "Not a valid email address." msgstr "To nie jest prawidłowy adres e-mail." @@ -1282,7 +1328,7 @@ msgstr "Ten adres e-mail jest już twój." msgid "That email address already belongs to another user." msgstr "Ten adres e-mail należy już do innego użytkownika." -#: actions/emailsettings.php:353 actions/imsettings.php:317 +#: actions/emailsettings.php:353 actions/imsettings.php:319 #: actions/smssettings.php:337 msgid "Couldn't insert confirmation code." msgstr "Nie można wprowadzić kodu potwierdzającego." @@ -1586,7 +1632,7 @@ msgstr "Członkowie grupy %1$s, strona %2$d" msgid "A list of the users in this group." msgstr "Lista użytkowników znajdujących się w tej grupie." -#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107 +#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107 msgid "Admin" msgstr "Administrator" @@ -1782,6 +1828,11 @@ msgstr "" msgid "That is not your Jabber ID." msgstr "To nie jest twój identyfikator Jabbera." +#: actions/inbox.php:59 +#, fuzzy, php-format +msgid "Inbox for %1$s - page %2$d" +msgstr "Odebrane wiadomości użytkownika %s" + #: actions/inbox.php:62 #, php-format msgid "Inbox for %s" @@ -1965,7 +2016,7 @@ msgstr "Niepoprawna nazwa użytkownika lub hasło." msgid "Error setting user. You are probably not authorized." msgstr "Błąd podczas ustawiania użytkownika. Prawdopodobnie brak upoważnienia." -#: actions/login.php:188 actions/login.php:241 lib/action.php:460 +#: actions/login.php:188 actions/login.php:241 lib/action.php:466 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Zaloguj się" @@ -2029,7 +2080,8 @@ msgid "No current status" msgstr "Brak obecnego stanu" #: actions/newapplication.php:52 -msgid "New application" +#, fuzzy +msgid "New Application" msgstr "Nowa aplikacja" #: actions/newapplication.php:64 @@ -2220,8 +2272,8 @@ msgstr "typ zawartości " msgid "Only " msgstr "Tylko " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1038 -#: lib/api.php:1066 lib/api.php:1176 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1039 +#: lib/api.php:1067 lib/api.php:1177 msgid "Not a supported data format." msgstr "To nie jest obsługiwany format danych." @@ -2285,6 +2337,11 @@ msgstr "Podano nieprawidłowy token logowania." msgid "Login token expired." msgstr "Token logowania wygasł." +#: actions/outbox.php:58 +#, fuzzy, php-format +msgid "Outbox for %1$s - page %2$d" +msgstr "Wysłane wiadomości użytkownika %s" + #: actions/outbox.php:61 #, php-format msgid "Outbox for %s" @@ -2355,7 +2412,7 @@ msgstr "Nie można zapisać nowego hasła." msgid "Password saved." msgstr "Zapisano hasło." -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:331 msgid "Paths" msgstr "Ścieżki" @@ -2363,132 +2420,150 @@ msgstr "Ścieżki" msgid "Path and server settings for this StatusNet site." msgstr "Ustawienia ścieżki i serwera dla tej strony StatusNet." -#: actions/pathsadminpanel.php:140 +#: actions/pathsadminpanel.php:157 #, php-format msgid "Theme directory not readable: %s" msgstr "Katalog motywu jest nieczytelny: %s" -#: actions/pathsadminpanel.php:146 +#: actions/pathsadminpanel.php:163 #, php-format msgid "Avatar directory not writable: %s" msgstr "Katalog awatara jest niezapisywalny: %s" -#: actions/pathsadminpanel.php:152 +#: actions/pathsadminpanel.php:169 #, php-format msgid "Background directory not writable: %s" msgstr "Katalog tła jest niezapisywalny: %s" -#: actions/pathsadminpanel.php:160 +#: actions/pathsadminpanel.php:177 #, php-format msgid "Locales directory not readable: %s" msgstr "Katalog lokalizacji jest nieczytelny: %s" -#: actions/pathsadminpanel.php:166 +#: actions/pathsadminpanel.php:183 msgid "Invalid SSL server. The maximum length is 255 characters." msgstr "Nieprawidłowy serwer SSL. Maksymalna długość to 255 znaków." -#: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58 +#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58 #: lib/adminpanelaction.php:311 msgid "Site" msgstr "Strona" -#: actions/pathsadminpanel.php:221 +#: actions/pathsadminpanel.php:238 +msgid "Server" +msgstr "Serwer" + +#: actions/pathsadminpanel.php:238 +msgid "Site's server hostname." +msgstr "Nazwa komputera serwera strony." + +#: actions/pathsadminpanel.php:242 msgid "Path" msgstr "Ścieżka" -#: actions/pathsadminpanel.php:221 +#: actions/pathsadminpanel.php:242 msgid "Site path" msgstr "Ścieżka do strony" -#: actions/pathsadminpanel.php:225 +#: actions/pathsadminpanel.php:246 msgid "Path to locales" msgstr "Ścieżka do lokalizacji" -#: actions/pathsadminpanel.php:225 +#: actions/pathsadminpanel.php:246 msgid "Directory path to locales" msgstr "Ścieżka do katalogu lokalizacji" -#: actions/pathsadminpanel.php:232 +#: actions/pathsadminpanel.php:250 +msgid "Fancy URLs" +msgstr "Eleganckie adresu URL" + +#: actions/pathsadminpanel.php:252 +msgid "Use fancy (more readable and memorable) URLs?" +msgstr "" +"Używać eleganckich (bardziej czytelnych i łatwiejszych do zapamiętania) " +"adresów URL?" + +#: actions/pathsadminpanel.php:259 msgid "Theme" msgstr "Motyw" -#: actions/pathsadminpanel.php:237 +#: actions/pathsadminpanel.php:264 msgid "Theme server" msgstr "Serwer motywu" -#: actions/pathsadminpanel.php:241 +#: actions/pathsadminpanel.php:268 msgid "Theme path" msgstr "Ścieżka do motywu" -#: actions/pathsadminpanel.php:245 +#: actions/pathsadminpanel.php:272 msgid "Theme directory" msgstr "Katalog motywu" -#: actions/pathsadminpanel.php:252 +#: actions/pathsadminpanel.php:279 msgid "Avatars" msgstr "Awatary" -#: actions/pathsadminpanel.php:257 +#: actions/pathsadminpanel.php:284 msgid "Avatar server" msgstr "Serwer awatara" -#: actions/pathsadminpanel.php:261 +#: actions/pathsadminpanel.php:288 msgid "Avatar path" msgstr "Ścieżka do awatara" -#: actions/pathsadminpanel.php:265 +#: actions/pathsadminpanel.php:292 msgid "Avatar directory" msgstr "Katalog awatara" -#: actions/pathsadminpanel.php:274 +#: actions/pathsadminpanel.php:301 msgid "Backgrounds" msgstr "Tła" -#: actions/pathsadminpanel.php:278 +#: actions/pathsadminpanel.php:305 msgid "Background server" msgstr "Serwer tła" -#: actions/pathsadminpanel.php:282 +#: actions/pathsadminpanel.php:309 msgid "Background path" msgstr "Ścieżka do tła" -#: actions/pathsadminpanel.php:286 +#: actions/pathsadminpanel.php:313 msgid "Background directory" msgstr "Katalog tła" -#: actions/pathsadminpanel.php:293 +#: actions/pathsadminpanel.php:320 msgid "SSL" msgstr "SSL" -#: actions/pathsadminpanel.php:296 actions/siteadminpanel.php:346 +#: actions/pathsadminpanel.php:323 actions/siteadminpanel.php:294 msgid "Never" msgstr "Nigdy" -#: actions/pathsadminpanel.php:297 +#: actions/pathsadminpanel.php:324 msgid "Sometimes" msgstr "Czasem" -#: actions/pathsadminpanel.php:298 +#: actions/pathsadminpanel.php:325 msgid "Always" msgstr "Zawsze" -#: actions/pathsadminpanel.php:302 +#: actions/pathsadminpanel.php:329 msgid "Use SSL" msgstr "Użycie SSL" -#: actions/pathsadminpanel.php:303 +#: actions/pathsadminpanel.php:330 msgid "When to use SSL" msgstr "Kiedy używać SSL" -#: actions/pathsadminpanel.php:308 +#: actions/pathsadminpanel.php:335 msgid "SSL server" msgstr "Serwer SSL" -#: actions/pathsadminpanel.php:309 +#: actions/pathsadminpanel.php:336 msgid "Server to direct SSL requests to" msgstr "Serwer do przekierowywania żądań SSL" -#: actions/pathsadminpanel.php:325 +#: actions/pathsadminpanel.php:352 msgid "Save paths" msgstr "Ścieżki zapisu" @@ -2600,7 +2675,7 @@ msgstr "" "Znaczniki dla siebie (litery, liczby, -, . i _), oddzielone przecinkami lub " "spacjami" -#: actions/profilesettings.php:151 actions/siteadminpanel.php:294 +#: actions/profilesettings.php:151 actions/siteadminpanel.php:280 msgid "Language" msgstr "Język" @@ -2627,7 +2702,7 @@ msgstr "" msgid "Bio is too long (max %d chars)." msgstr "Wpis \"O mnie\" jest za długi (maksymalnie %d znaków)." -#: actions/profilesettings.php:235 actions/siteadminpanel.php:164 +#: actions/profilesettings.php:235 actions/siteadminpanel.php:150 msgid "Timezone not selected." msgstr "Nie wybrano strefy czasowej." @@ -2902,7 +2977,7 @@ msgstr "Nieprawidłowy kod zaproszenia." msgid "Registration successful" msgstr "Rejestracja powiodła się" -#: actions/register.php:114 actions/register.php:503 lib/action.php:457 +#: actions/register.php:114 actions/register.php:503 lib/action.php:463 #: lib/logingroupnav.php:85 msgid "Register" msgstr "Zarejestruj się" @@ -2946,7 +3021,7 @@ msgid "Same as password above. Required." msgstr "Takie samo jak powyższe hasło. Wymagane." #: actions/register.php:438 actions/register.php:442 -#: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120 +#: actions/siteadminpanel.php:256 lib/accountsettingsaction.php:120 msgid "Email" msgstr "E-mail" @@ -3104,6 +3179,11 @@ msgstr "Powtórzono." msgid "Replies to %s" msgstr "Odpowiedzi na %s" +#: actions/replies.php:127 +#, fuzzy, php-format +msgid "Replies to %1$s, page %2$d" +msgstr "odpowiedzi dla użytkownika %1$s na %2$s." + #: actions/replies.php:144 #, php-format msgid "Replies feed for %s (RSS 1.0)" @@ -3235,6 +3315,11 @@ msgstr "" "Uwaga: obsługiwane są podpisy HMAC-SHA1. Metoda podpisu w zwykłym tekście " "nie jest obsługiwana." +#: actions/showfavorites.php:79 +#, fuzzy, php-format +msgid "%1$s's favorite notices, page %2$d" +msgstr "Ulubione wpisy użytkownika %s" + #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "Nie można odebrać ulubionych wpisów." @@ -3292,6 +3377,11 @@ msgstr "To jest sposób na współdzielenie tego, co chcesz." msgid "%s group" msgstr "Grupa %s" +#: actions/showgroup.php:84 +#, fuzzy, php-format +msgid "%1$s group, page %2$d" +msgstr "Członkowie grupy %1$s, strona %2$d" + #: actions/showgroup.php:218 msgid "Group profile" msgstr "Profil grupy" @@ -3412,6 +3502,11 @@ msgstr "Usunięto wpis." msgid " tagged %s" msgstr " ze znacznikiem %s" +#: actions/showstream.php:79 +#, fuzzy, php-format +msgid "%1$s, page %2$d" +msgstr "%1$s i przyjaciele, strona %2$d" + #: actions/showstream.php:122 #, php-format msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" @@ -3502,196 +3597,146 @@ msgstr "Użytkownik jest już wyciszony." msgid "Basic settings for this StatusNet site." msgstr "Podstawowe ustawienia tej strony StatusNet." -#: actions/siteadminpanel.php:146 +#: actions/siteadminpanel.php:132 msgid "Site name must have non-zero length." msgstr "Nazwa strony nie może mieć zerową długość." -#: actions/siteadminpanel.php:154 +#: actions/siteadminpanel.php:140 msgid "You must have a valid contact email address." msgstr "Należy posiadać prawidłowy kontaktowy adres e-mail." -#: actions/siteadminpanel.php:172 +#: actions/siteadminpanel.php:158 #, php-format msgid "Unknown language \"%s\"." msgstr "Nieznany język \"%s\"." -#: actions/siteadminpanel.php:179 +#: actions/siteadminpanel.php:165 msgid "Invalid snapshot report URL." msgstr "Nieprawidłowy adres URL zgłaszania migawek." -#: actions/siteadminpanel.php:185 +#: actions/siteadminpanel.php:171 msgid "Invalid snapshot run value." msgstr "Nieprawidłowa wartość wykonania migawki." -#: actions/siteadminpanel.php:191 +#: actions/siteadminpanel.php:177 msgid "Snapshot frequency must be a number." msgstr "Częstotliwość migawek musi być liczbą." -#: actions/siteadminpanel.php:197 +#: actions/siteadminpanel.php:183 msgid "Minimum text limit is 140 characters." msgstr "Maksymalne ograniczenie tekstu to 14 znaków." -#: actions/siteadminpanel.php:203 +#: actions/siteadminpanel.php:189 msgid "Dupe limit must 1 or more seconds." msgstr "Ograniczenie duplikatów musi wynosić jedną lub więcej sekund." -#: actions/siteadminpanel.php:253 +#: actions/siteadminpanel.php:239 msgid "General" msgstr "Ogólne" -#: actions/siteadminpanel.php:256 +#: actions/siteadminpanel.php:242 msgid "Site name" msgstr "Nazwa strony" -#: actions/siteadminpanel.php:257 +#: actions/siteadminpanel.php:243 msgid "The name of your site, like \"Yourcompany Microblog\"" msgstr "Nazwa strony, taka jak \"Mikroblog firmy X\"" -#: actions/siteadminpanel.php:261 +#: actions/siteadminpanel.php:247 msgid "Brought by" msgstr "Dostarczane przez" -#: actions/siteadminpanel.php:262 +#: actions/siteadminpanel.php:248 msgid "Text used for credits link in footer of each page" msgstr "Tekst używany do odnośnika do zasług w stopce każdej strony" -#: actions/siteadminpanel.php:266 +#: actions/siteadminpanel.php:252 msgid "Brought by URL" msgstr "Adres URL \"Dostarczane przez\"" -#: actions/siteadminpanel.php:267 +#: actions/siteadminpanel.php:253 msgid "URL used for credits link in footer of each page" msgstr "Adres URL używany do odnośnika do zasług w stopce każdej strony" -#: actions/siteadminpanel.php:271 +#: actions/siteadminpanel.php:257 msgid "Contact email address for your site" msgstr "Kontaktowy adres e-mail strony" -#: actions/siteadminpanel.php:277 +#: actions/siteadminpanel.php:263 msgid "Local" msgstr "Lokalne" -#: actions/siteadminpanel.php:288 +#: actions/siteadminpanel.php:274 msgid "Default timezone" msgstr "Domyślna strefa czasowa" -#: actions/siteadminpanel.php:289 +#: actions/siteadminpanel.php:275 msgid "Default timezone for the site; usually UTC." msgstr "Domyśla strefa czasowa strony, zwykle UTC." -#: actions/siteadminpanel.php:295 +#: actions/siteadminpanel.php:281 msgid "Default site language" msgstr "Domyślny język strony" -#: actions/siteadminpanel.php:303 -msgid "URLs" -msgstr "Adresy URL" - -#: actions/siteadminpanel.php:306 -msgid "Server" -msgstr "Serwer" - -#: actions/siteadminpanel.php:306 -msgid "Site's server hostname." -msgstr "Nazwa komputera serwera strony." - -#: actions/siteadminpanel.php:310 -msgid "Fancy URLs" -msgstr "Eleganckie adresu URL" - -#: actions/siteadminpanel.php:312 -msgid "Use fancy (more readable and memorable) URLs?" -msgstr "" -"Używać eleganckich (bardziej czytelnych i łatwiejszych do zapamiętania) " -"adresów URL?" - -#: actions/siteadminpanel.php:318 -msgid "Access" -msgstr "Dostęp" - -#: actions/siteadminpanel.php:321 -msgid "Private" -msgstr "Prywatna" - -#: actions/siteadminpanel.php:323 -msgid "Prohibit anonymous users (not logged in) from viewing site?" -msgstr "Zabronić anonimowym użytkownikom (niezalogowanym) przeglądać stronę?" - -#: actions/siteadminpanel.php:327 -msgid "Invite only" -msgstr "Tylko zaproszeni" - -#: actions/siteadminpanel.php:329 -msgid "Make registration invitation only." -msgstr "Rejestracja tylko za zaproszeniem." - -#: actions/siteadminpanel.php:333 -msgid "Closed" -msgstr "Zamknięte" - -#: actions/siteadminpanel.php:335 -msgid "Disable new registrations." -msgstr "Wyłączenie nowych rejestracji." - -#: actions/siteadminpanel.php:341 +#: actions/siteadminpanel.php:289 msgid "Snapshots" msgstr "Migawki" -#: actions/siteadminpanel.php:344 +#: actions/siteadminpanel.php:292 msgid "Randomly during Web hit" msgstr "Losowo podczas trafienia WWW" -#: actions/siteadminpanel.php:345 +#: actions/siteadminpanel.php:293 msgid "In a scheduled job" msgstr "Jako zaplanowane zadanie" -#: actions/siteadminpanel.php:347 +#: actions/siteadminpanel.php:295 msgid "Data snapshots" msgstr "Migawki danych" -#: actions/siteadminpanel.php:348 +#: actions/siteadminpanel.php:296 msgid "When to send statistical data to status.net servers" msgstr "Kiedy wysyłać dane statystyczne na serwery status.net" -#: actions/siteadminpanel.php:353 +#: actions/siteadminpanel.php:301 msgid "Frequency" msgstr "Częstotliwość" -#: actions/siteadminpanel.php:354 +#: actions/siteadminpanel.php:302 msgid "Snapshots will be sent once every N web hits" msgstr "Migawki będą wysyłane co N trafień WWW" -#: actions/siteadminpanel.php:359 +#: actions/siteadminpanel.php:307 msgid "Report URL" msgstr "Adres URL zgłaszania" -#: actions/siteadminpanel.php:360 +#: actions/siteadminpanel.php:308 msgid "Snapshots will be sent to this URL" msgstr "Migawki będą wysyłane na ten adres URL" -#: actions/siteadminpanel.php:367 +#: actions/siteadminpanel.php:315 msgid "Limits" msgstr "Ograniczenia" -#: actions/siteadminpanel.php:370 +#: actions/siteadminpanel.php:318 msgid "Text limit" msgstr "Ograniczenie tekstu" -#: actions/siteadminpanel.php:370 +#: actions/siteadminpanel.php:318 msgid "Maximum number of characters for notices." msgstr "Maksymalna liczba znaków wpisów." -#: actions/siteadminpanel.php:374 +#: actions/siteadminpanel.php:322 msgid "Dupe limit" msgstr "Ograniczenie duplikatów" -#: actions/siteadminpanel.php:374 +#: actions/siteadminpanel.php:322 msgid "How long users must wait (in seconds) to post the same thing again." msgstr "" "Ile czasu użytkownicy muszą czekać (w sekundach), aby ponownie wysłać to " "samo." -#: actions/siteadminpanel.php:388 actions/useradminpanel.php:313 +#: actions/siteadminpanel.php:336 actions/useradminpanel.php:313 msgid "Save site settings" msgstr "Zapisz ustawienia strony" @@ -3899,6 +3944,11 @@ msgstr "Jabber" msgid "SMS" msgstr "SMS" +#: actions/tag.php:68 +#, fuzzy, php-format +msgid "Notices tagged with %1$s, page %2$d" +msgstr "Użytkownicy używający znacznika %1$s - strona %2$d" + #: actions/tag.php:86 #, php-format msgid "Notice feed for tag %s (RSS 1.0)" @@ -4197,6 +4247,11 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "Smacznego hot-doga." +#: actions/usergroups.php:64 +#, fuzzy, php-format +msgid "%1$s groups, page %2$d" +msgstr "Członkowie grupy %1$s, strona %2$d" + #: actions/usergroups.php:130 msgid "Search for more groups" msgstr "Wyszukaj więcej grup" @@ -4272,7 +4327,7 @@ msgstr "" msgid "Plugins" msgstr "Wtyczki" -#: actions/version.php:196 lib/action.php:741 +#: actions/version.php:196 lib/action.php:747 msgid "Version" msgstr "Wersja" @@ -4331,27 +4386,27 @@ msgstr "Nie można wprowadzić wiadomości." msgid "Could not update message with new URI." msgstr "Nie można zaktualizować wiadomości za pomocą nowego adresu URL." -#: classes/Notice.php:171 +#: classes/Notice.php:157 #, php-format msgid "DB error inserting hashtag: %s" msgstr "Błąd bazy danych podczas wprowadzania znacznika mieszania: %s" -#: classes/Notice.php:225 +#: classes/Notice.php:214 msgid "Problem saving notice. Too long." msgstr "Problem podczas zapisywania wpisu. Za długi." -#: classes/Notice.php:229 +#: classes/Notice.php:218 msgid "Problem saving notice. Unknown user." msgstr "Problem podczas zapisywania wpisu. Nieznany użytkownik." -#: classes/Notice.php:234 +#: classes/Notice.php:223 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Za dużo wpisów w za krótkim czasie, weź głęboki oddech i wyślij ponownie za " "kilka minut." -#: classes/Notice.php:240 +#: classes/Notice.php:229 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." @@ -4359,20 +4414,25 @@ msgstr "" "Za dużo takich samych wiadomości w za krótkim czasie, weź głęboki oddech i " "wyślij ponownie za kilka minut." -#: classes/Notice.php:246 +#: classes/Notice.php:235 msgid "You are banned from posting notices on this site." msgstr "Zabroniono ci wysyłania wpisów na tej stronie." -#: classes/Notice.php:305 classes/Notice.php:330 +#: classes/Notice.php:294 classes/Notice.php:319 msgid "Problem saving notice." msgstr "Problem podczas zapisywania wpisu." -#: classes/Notice.php:1059 +#: classes/Notice.php:790 +#, fuzzy +msgid "Problem saving group inbox." +msgstr "Problem podczas zapisywania wpisu." + +#: classes/Notice.php:850 #, php-format msgid "DB error inserting reply: %s" msgstr "Błąd bazy danych podczas wprowadzania odpowiedzi: %s" -#: classes/Notice.php:1441 +#: classes/Notice.php:1233 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -4427,124 +4487,124 @@ msgstr "%1$s - %2$s" msgid "Untitled page" msgstr "Strona bez nazwy" -#: lib/action.php:427 +#: lib/action.php:433 msgid "Primary site navigation" msgstr "Główna nawigacja strony" -#: lib/action.php:433 +#: lib/action.php:439 msgid "Home" msgstr "Strona domowa" -#: lib/action.php:433 +#: lib/action.php:439 msgid "Personal profile and friends timeline" msgstr "Profil osobisty i oś czasu przyjaciół" -#: lib/action.php:435 +#: lib/action.php:441 msgid "Change your email, avatar, password, profile" msgstr "Zmień adres e-mail, awatar, hasło, profil" -#: lib/action.php:438 +#: lib/action.php:444 msgid "Connect" msgstr "Połącz" -#: lib/action.php:438 +#: lib/action.php:444 msgid "Connect to services" msgstr "Połącz z serwisami" -#: lib/action.php:442 +#: lib/action.php:448 msgid "Change site configuration" msgstr "Zmień konfigurację strony" -#: lib/action.php:446 lib/subgroupnav.php:105 +#: lib/action.php:452 lib/subgroupnav.php:105 msgid "Invite" msgstr "Zaproś" -#: lib/action.php:447 lib/subgroupnav.php:106 +#: lib/action.php:453 lib/subgroupnav.php:106 #, php-format msgid "Invite friends and colleagues to join you on %s" msgstr "Zaproś przyjaciół i kolegów do dołączenia do ciebie na %s" -#: lib/action.php:452 +#: lib/action.php:458 msgid "Logout" msgstr "Wyloguj się" -#: lib/action.php:452 +#: lib/action.php:458 msgid "Logout from the site" msgstr "Wyloguj się ze strony" -#: lib/action.php:457 +#: lib/action.php:463 msgid "Create an account" msgstr "Utwórz konto" -#: lib/action.php:460 +#: lib/action.php:466 msgid "Login to the site" msgstr "Zaloguj się na stronę" -#: lib/action.php:463 lib/action.php:726 +#: lib/action.php:469 lib/action.php:732 msgid "Help" msgstr "Pomoc" -#: lib/action.php:463 +#: lib/action.php:469 msgid "Help me!" msgstr "Pomóż mi." -#: lib/action.php:466 lib/searchaction.php:127 +#: lib/action.php:472 lib/searchaction.php:127 msgid "Search" msgstr "Wyszukaj" -#: lib/action.php:466 +#: lib/action.php:472 msgid "Search for people or text" msgstr "Wyszukaj osoby lub tekst" -#: lib/action.php:487 +#: lib/action.php:493 msgid "Site notice" msgstr "Wpis strony" -#: lib/action.php:553 +#: lib/action.php:559 msgid "Local views" msgstr "Lokalne widoki" -#: lib/action.php:619 +#: lib/action.php:625 msgid "Page notice" msgstr "Wpis strony" -#: lib/action.php:721 +#: lib/action.php:727 msgid "Secondary site navigation" msgstr "Druga nawigacja strony" -#: lib/action.php:728 +#: lib/action.php:734 msgid "About" msgstr "O usłudze" -#: lib/action.php:730 +#: lib/action.php:736 msgid "FAQ" msgstr "FAQ" -#: lib/action.php:734 +#: lib/action.php:740 msgid "TOS" msgstr "TOS" -#: lib/action.php:737 +#: lib/action.php:743 msgid "Privacy" msgstr "Prywatność" -#: lib/action.php:739 +#: lib/action.php:745 msgid "Source" msgstr "Kod źródłowy" -#: lib/action.php:743 +#: lib/action.php:749 msgid "Contact" msgstr "Kontakt" -#: lib/action.php:745 +#: lib/action.php:751 msgid "Badge" msgstr "Odznaka" -#: lib/action.php:773 +#: lib/action.php:779 msgid "StatusNet software license" msgstr "Licencja oprogramowania StatusNet" -#: lib/action.php:776 +#: lib/action.php:782 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -4553,12 +4613,12 @@ msgstr "" "**%%site.name%%** jest usługą mikroblogowania prowadzoną przez [%%site." "broughtby%%](%%site.broughtbyurl%%). " -#: lib/action.php:778 +#: lib/action.php:784 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "**%%site.name%%** jest usługą mikroblogowania. " -#: lib/action.php:780 +#: lib/action.php:786 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4569,41 +4629,45 @@ msgstr "" "status.net/) w wersji %s, dostępnego na [Powszechnej Licencji Publicznej GNU " "Affero](http://www.fsf.org/licensing/licenses/agpl-3.0.html)." -#: lib/action.php:795 +#: lib/action.php:801 msgid "Site content license" msgstr "Licencja zawartości strony" -#: lib/action.php:800 +#: lib/action.php:806 #, php-format msgid "Content and data of %1$s are private and confidential." -msgstr "" +msgstr "Treść i dane %1$s są prywatne i poufne." -#: lib/action.php:805 +#: lib/action.php:811 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" +"Prawa autorskie do treści i danych są własnością %1$s. Wszystkie prawa " +"zastrzeżone." -#: lib/action.php:808 +#: lib/action.php:814 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" +"Prawa autorskie do treści i danych są własnością współtwórców. Wszystkie " +"prawa zastrzeżone." -#: lib/action.php:820 +#: lib/action.php:826 msgid "All " msgstr "Wszystko " -#: lib/action.php:825 +#: lib/action.php:831 msgid "license." msgstr "licencja." -#: lib/action.php:1124 +#: lib/action.php:1130 msgid "Pagination" msgstr "Paginacja" -#: lib/action.php:1133 +#: lib/action.php:1139 msgid "After" msgstr "Później" -#: lib/action.php:1141 +#: lib/action.php:1147 msgid "Before" msgstr "Wcześniej" @@ -4635,10 +4699,24 @@ msgstr "Podstawowa konfiguracja strony" msgid "Design configuration" msgstr "Konfiguracja wyglądu" -#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327 +#: lib/adminpanelaction.php:322 +#, fuzzy +msgid "User configuration" +msgstr "Konfiguracja ścieżek" + +#: lib/adminpanelaction.php:327 +#, fuzzy +msgid "Access configuration" +msgstr "Konfiguracja wyglądu" + +#: lib/adminpanelaction.php:332 msgid "Paths configuration" msgstr "Konfiguracja ścieżek" +#: lib/applicationeditform.php:136 +msgid "Edit application" +msgstr "Zmodyfikuj aplikację" + #: lib/applicationeditform.php:186 msgid "Icon for this application" msgstr "Ikona tej aplikacji" @@ -5256,12 +5334,12 @@ msgstr "MB" msgid "kB" msgstr "KB" -#: lib/jabber.php:202 +#: lib/jabber.php:220 #, php-format msgid "[%s]" msgstr "[%s]" -#: lib/jabber.php:385 +#: lib/jabber.php:400 #, php-format msgid "Unknown inbox source %d." msgstr "Nieznane źródło skrzynki odbiorczej %d." @@ -5759,19 +5837,19 @@ msgstr "Odpowiedzi" msgid "Favorites" msgstr "Ulubione" -#: lib/personalgroupnav.php:124 +#: lib/personalgroupnav.php:125 msgid "Inbox" msgstr "Odebrane" -#: lib/personalgroupnav.php:125 +#: lib/personalgroupnav.php:126 msgid "Your incoming messages" msgstr "Wiadomości przychodzące" -#: lib/personalgroupnav.php:129 +#: lib/personalgroupnav.php:130 msgid "Outbox" msgstr "Wysłane" -#: lib/personalgroupnav.php:130 +#: lib/personalgroupnav.php:131 msgid "Your sent messages" msgstr "Wysłane wiadomości" @@ -6013,47 +6091,47 @@ msgstr "Wiadomość" msgid "Moderate" msgstr "Moderuj" -#: lib/util.php:875 +#: lib/util.php:868 msgid "a few seconds ago" msgstr "kilka sekund temu" -#: lib/util.php:877 +#: lib/util.php:870 msgid "about a minute ago" msgstr "około minutę temu" -#: lib/util.php:879 +#: lib/util.php:872 #, php-format msgid "about %d minutes ago" msgstr "około %d minut temu" -#: lib/util.php:881 +#: lib/util.php:874 msgid "about an hour ago" msgstr "około godzinę temu" -#: lib/util.php:883 +#: lib/util.php:876 #, php-format msgid "about %d hours ago" msgstr "około %d godzin temu" -#: lib/util.php:885 +#: lib/util.php:878 msgid "about a day ago" msgstr "blisko dzień temu" -#: lib/util.php:887 +#: lib/util.php:880 #, php-format msgid "about %d days ago" msgstr "około %d dni temu" -#: lib/util.php:889 +#: lib/util.php:882 msgid "about a month ago" msgstr "około miesiąc temu" -#: lib/util.php:891 +#: lib/util.php:884 #, php-format msgid "about %d months ago" msgstr "około %d miesięcy temu" -#: lib/util.php:893 +#: lib/util.php:886 msgid "about a year ago" msgstr "około rok temu" @@ -6069,7 +6147,7 @@ msgstr "" "%s nie jest prawidłowym kolorem. Użyj trzech lub sześciu znaków " "szesnastkowych." -#: scripts/xmppdaemon.php:301 +#: lib/xmppmanager.php:402 #, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "Wiadomość jest za długa - maksymalnie %1$d znaków, wysłano %2$d." diff --git a/locale/pt/LC_MESSAGES/statusnet.po b/locale/pt/LC_MESSAGES/statusnet.po index 9b136debd7..86e7899ee2 100644 --- a/locale/pt/LC_MESSAGES/statusnet.po +++ b/locale/pt/LC_MESSAGES/statusnet.po @@ -9,17 +9,71 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-21 22:36+0000\n" -"PO-Revision-Date: 2010-01-21 22:38:17+0000\n" +"POT-Creation-Date: 2010-01-27 23:58+0000\n" +"PO-Revision-Date: 2010-01-27 23:59:37+0000\n" "Language-Team: Portuguese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r61339); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61595); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: pt\n" "X-Message-Group: out-statusnet\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#: actions/accessadminpanel.php:54 lib/adminpanelaction.php:326 +msgid "Access" +msgstr "Acesso" + +#: actions/accessadminpanel.php:65 +#, fuzzy +msgid "Site access settings" +msgstr "Gravar configurações do site" + +#: actions/accessadminpanel.php:158 +#, fuzzy +msgid "Registration" +msgstr "Registar" + +#: actions/accessadminpanel.php:161 +msgid "Private" +msgstr "Privado" + +#: actions/accessadminpanel.php:163 +msgid "Prohibit anonymous users (not logged in) from viewing site?" +msgstr "Proibir utilizadores anónimos (sem sessão iniciada) de ver o site?" + +#: actions/accessadminpanel.php:167 +msgid "Invite only" +msgstr "Só por convite" + +#: actions/accessadminpanel.php:169 +msgid "Make registration invitation only." +msgstr "Permitir o registo só a convidados." + +#: actions/accessadminpanel.php:173 +msgid "Closed" +msgstr "Fechado" + +#: actions/accessadminpanel.php:175 +msgid "Disable new registrations." +msgstr "Impossibilitar registos novos." + +#: actions/accessadminpanel.php:189 actions/designadminpanel.php:586 +#: actions/emailsettings.php:195 actions/imsettings.php:163 +#: actions/othersettings.php:126 actions/pathsadminpanel.php:351 +#: actions/profilesettings.php:174 actions/siteadminpanel.php:336 +#: actions/smssettings.php:181 actions/subscriptions.php:203 +#: actions/tagother.php:154 actions/useradminpanel.php:313 +#: lib/applicationeditform.php:335 lib/applicationeditform.php:336 +#: lib/designsettings.php:256 lib/groupeditform.php:202 +msgid "Save" +msgstr "Gravar" + +#: actions/accessadminpanel.php:189 +#, fuzzy +msgid "Save access settings" +msgstr "Gravar configurações do site" + #: actions/all.php:63 actions/public.php:97 actions/replies.php:92 #: actions/showfavorites.php:137 actions/tag.php:51 msgid "No such page" @@ -34,7 +88,7 @@ msgstr "Página não encontrada." #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:149 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 @@ -140,8 +194,7 @@ msgstr "Actualizações de %1$s e amigos no %2$s!" #: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 #: actions/apitimelinefriends.php:155 actions/apitimelinegroup.php:150 #: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 -#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found." @@ -157,7 +210,7 @@ msgstr "Método da API não encontrado." #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:119 +#: actions/apistatusesupdate.php:118 msgid "This method requires a POST." msgstr "Este método requer um POST." @@ -187,7 +240,7 @@ msgstr "Não foi possível gravar o perfil." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:132 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 #: actions/designadminpanel.php:122 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -490,7 +543,14 @@ msgstr "" msgid "Allow or deny access" msgstr "" -#: actions/apioauthauthorize.php:320 lib/action.php:435 +#: actions/apioauthauthorize.php:306 +#, php-format +msgid "" +"The application %s by %s would like the " +"ability to %s your account data." +msgstr "" + +#: actions/apioauthauthorize.php:320 lib/action.php:441 msgid "Account" msgstr "Conta" @@ -549,17 +609,17 @@ msgstr "Estado apagado." msgid "No status with that ID found." msgstr "Não foi encontrado um estado com esse ID." -#: actions/apistatusesupdate.php:162 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Demasiado longo. Tamanho máx. das notas é %d caracteres." -#: actions/apistatusesupdate.php:203 +#: actions/apistatusesupdate.php:202 msgid "Not found" msgstr "Não encontrado" -#: actions/apistatusesupdate.php:226 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "Tamanho máx. das notas é %d caracteres, incluíndo a URL do anexo." @@ -610,11 +670,6 @@ msgstr "Notas públicas de %s" msgid "%s updates from everyone!" msgstr "%s actualizações de todos!" -#: actions/apitimelineretweetedbyme.php:112 -#, php-format -msgid "Repeated by %s" -msgstr "Repetida por %s" - #: actions/apitimelineretweetedtome.php:111 #, php-format msgid "Repeated to %s" @@ -1023,17 +1078,6 @@ msgstr "Repor estilos predefinidos" msgid "Reset back to default" msgstr "Repor predefinição" -#: actions/designadminpanel.php:586 actions/emailsettings.php:195 -#: actions/imsettings.php:163 actions/othersettings.php:126 -#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174 -#: actions/siteadminpanel.php:388 actions/smssettings.php:181 -#: actions/subscriptions.php:203 actions/tagother.php:154 -#: actions/useradminpanel.php:313 lib/applicationeditform.php:335 -#: lib/applicationeditform.php:336 lib/designsettings.php:256 -#: lib/groupeditform.php:202 -msgid "Save" -msgstr "Gravar" - #: actions/designadminpanel.php:587 lib/designsettings.php:257 msgid "Save design" msgstr "Gravar o estilo" @@ -1046,13 +1090,15 @@ msgstr "Esta nota não é uma favorita!" msgid "Add to favorites" msgstr "Adicionar às favoritas" -#: actions/doc.php:69 -msgid "No such document." +#: actions/doc.php:155 +#, fuzzy, php-format +msgid "No such document \"%s\"" msgstr "Documento não encontrado." -#: actions/editapplication.php:54 lib/applicationeditform.php:136 -msgid "Edit application" -msgstr "" +#: actions/editapplication.php:54 +#, fuzzy +msgid "Edit Application" +msgstr "Outras opções" #: actions/editapplication.php:66 #, fuzzy @@ -1071,7 +1117,7 @@ msgid "No such application." msgstr "Nota não encontrada." #: actions/editapplication.php:127 actions/newapplication.php:110 -#: actions/showapplication.php:118 lib/action.php:1189 +#: actions/showapplication.php:118 lib/action.php:1195 msgid "There was a problem with your session token." msgstr "Ocorreu um problema com a sua sessão." @@ -1285,7 +1331,7 @@ msgid "Cannot normalize that email address" msgstr "Não é possível normalizar esse endereço electrónico" #: actions/emailsettings.php:331 actions/register.php:201 -#: actions/siteadminpanel.php:157 +#: actions/siteadminpanel.php:143 msgid "Not a valid email address." msgstr "Correio electrónico é inválido." @@ -1297,7 +1343,7 @@ msgstr "Esse já é o seu endereço electrónico." msgid "That email address already belongs to another user." msgstr "Esse endereço electrónico já pertence a outro utilizador." -#: actions/emailsettings.php:353 actions/imsettings.php:317 +#: actions/emailsettings.php:353 actions/imsettings.php:319 #: actions/smssettings.php:337 msgid "Couldn't insert confirmation code." msgstr "Não foi possível inserir o código de confirmação." @@ -1604,7 +1650,7 @@ msgstr "Membros do grupo %1$s, página %2$d" msgid "A list of the users in this group." msgstr "Uma lista dos utilizadores neste grupo." -#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107 +#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107 msgid "Admin" msgstr "Gestor" @@ -1800,6 +1846,11 @@ msgstr "" msgid "That is not your Jabber ID." msgstr "Esse não é o seu Jabber ID." +#: actions/inbox.php:59 +#, fuzzy, php-format +msgid "Inbox for %1$s - page %2$d" +msgstr "Caixa de entrada de %s" + #: actions/inbox.php:62 #, php-format msgid "Inbox for %s" @@ -1983,7 +2034,7 @@ msgstr "Nome de utilizador ou senha incorrectos." msgid "Error setting user. You are probably not authorized." msgstr "Erro ao preparar o utilizador. Provavelmente não está autorizado." -#: actions/login.php:188 actions/login.php:241 lib/action.php:460 +#: actions/login.php:188 actions/login.php:241 lib/action.php:466 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Entrar" @@ -2047,8 +2098,9 @@ msgid "No current status" msgstr "Sem estado actual" #: actions/newapplication.php:52 -msgid "New application" -msgstr "" +#, fuzzy +msgid "New Application" +msgstr "Nota não encontrada." #: actions/newapplication.php:64 #, fuzzy @@ -2243,8 +2295,8 @@ msgstr "tipo de conteúdo " msgid "Only " msgstr "Apenas " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1038 -#: lib/api.php:1066 lib/api.php:1176 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1039 +#: lib/api.php:1067 lib/api.php:1177 msgid "Not a supported data format." msgstr "Formato de dados não suportado." @@ -2314,6 +2366,11 @@ msgstr "Chave inválida ou expirada." msgid "Login token expired." msgstr "Iniciar sessão no site" +#: actions/outbox.php:58 +#, fuzzy, php-format +msgid "Outbox for %1$s - page %2$d" +msgstr "Caixa de saída de %s" + #: actions/outbox.php:61 #, php-format msgid "Outbox for %s" @@ -2385,7 +2442,7 @@ msgstr "Não é possível guardar a nova senha." msgid "Password saved." msgstr "Senha gravada." -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:331 msgid "Paths" msgstr "Localizações" @@ -2393,132 +2450,148 @@ msgstr "Localizações" msgid "Path and server settings for this StatusNet site." msgstr "Configurações de localização e servidor deste site StatusNet." -#: actions/pathsadminpanel.php:140 +#: actions/pathsadminpanel.php:157 #, php-format msgid "Theme directory not readable: %s" msgstr "Sem acesso de leitura do directório do tema: %s" -#: actions/pathsadminpanel.php:146 +#: actions/pathsadminpanel.php:163 #, php-format msgid "Avatar directory not writable: %s" msgstr "Sem acesso de escrita no directório do avatar: %s" -#: actions/pathsadminpanel.php:152 +#: actions/pathsadminpanel.php:169 #, php-format msgid "Background directory not writable: %s" msgstr "Sem acesso de escrita no directório do fundo: %s" -#: actions/pathsadminpanel.php:160 +#: actions/pathsadminpanel.php:177 #, php-format msgid "Locales directory not readable: %s" msgstr "Sem acesso de leitura ao directório de idiomas: %s" -#: actions/pathsadminpanel.php:166 +#: actions/pathsadminpanel.php:183 msgid "Invalid SSL server. The maximum length is 255 characters." msgstr "Servidor SSL inválido. O tamanho máximo é 255 caracteres." -#: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58 +#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58 #: lib/adminpanelaction.php:311 msgid "Site" msgstr "Site" -#: actions/pathsadminpanel.php:221 +#: actions/pathsadminpanel.php:238 +msgid "Server" +msgstr "Servidor" + +#: actions/pathsadminpanel.php:238 +msgid "Site's server hostname." +msgstr "Nome do servidor do site." + +#: actions/pathsadminpanel.php:242 msgid "Path" msgstr "Localização" -#: actions/pathsadminpanel.php:221 +#: actions/pathsadminpanel.php:242 msgid "Site path" msgstr "Localização do site" -#: actions/pathsadminpanel.php:225 +#: actions/pathsadminpanel.php:246 msgid "Path to locales" msgstr "Localização de idiomas" -#: actions/pathsadminpanel.php:225 +#: actions/pathsadminpanel.php:246 msgid "Directory path to locales" msgstr "Localização do directório de idiomas" -#: actions/pathsadminpanel.php:232 +#: actions/pathsadminpanel.php:250 +msgid "Fancy URLs" +msgstr "URLs bonitas" + +#: actions/pathsadminpanel.php:252 +msgid "Use fancy (more readable and memorable) URLs?" +msgstr "Usar URLs bonitas (mais legíveis e memoráveis)" + +#: actions/pathsadminpanel.php:259 msgid "Theme" msgstr "Tema" -#: actions/pathsadminpanel.php:237 +#: actions/pathsadminpanel.php:264 msgid "Theme server" msgstr "Servidor do tema" -#: actions/pathsadminpanel.php:241 +#: actions/pathsadminpanel.php:268 msgid "Theme path" msgstr "Localização do tema" -#: actions/pathsadminpanel.php:245 +#: actions/pathsadminpanel.php:272 msgid "Theme directory" msgstr "Directório do tema" -#: actions/pathsadminpanel.php:252 +#: actions/pathsadminpanel.php:279 msgid "Avatars" msgstr "Avatares" -#: actions/pathsadminpanel.php:257 +#: actions/pathsadminpanel.php:284 msgid "Avatar server" msgstr "Servidor do avatar" -#: actions/pathsadminpanel.php:261 +#: actions/pathsadminpanel.php:288 msgid "Avatar path" msgstr "Localização do avatar" -#: actions/pathsadminpanel.php:265 +#: actions/pathsadminpanel.php:292 msgid "Avatar directory" msgstr "Directório do avatar" -#: actions/pathsadminpanel.php:274 +#: actions/pathsadminpanel.php:301 msgid "Backgrounds" msgstr "Fundos" -#: actions/pathsadminpanel.php:278 +#: actions/pathsadminpanel.php:305 msgid "Background server" msgstr "Servidor de fundos" -#: actions/pathsadminpanel.php:282 +#: actions/pathsadminpanel.php:309 msgid "Background path" msgstr "Localização dos fundos" -#: actions/pathsadminpanel.php:286 +#: actions/pathsadminpanel.php:313 msgid "Background directory" msgstr "Directório dos fundos" -#: actions/pathsadminpanel.php:293 +#: actions/pathsadminpanel.php:320 msgid "SSL" msgstr "SSL" -#: actions/pathsadminpanel.php:296 actions/siteadminpanel.php:346 +#: actions/pathsadminpanel.php:323 actions/siteadminpanel.php:294 msgid "Never" msgstr "Nunca" -#: actions/pathsadminpanel.php:297 +#: actions/pathsadminpanel.php:324 msgid "Sometimes" msgstr "Às vezes" -#: actions/pathsadminpanel.php:298 +#: actions/pathsadminpanel.php:325 msgid "Always" msgstr "Sempre" -#: actions/pathsadminpanel.php:302 +#: actions/pathsadminpanel.php:329 msgid "Use SSL" msgstr "Usar SSL" -#: actions/pathsadminpanel.php:303 +#: actions/pathsadminpanel.php:330 msgid "When to use SSL" msgstr "Quando usar SSL" -#: actions/pathsadminpanel.php:308 +#: actions/pathsadminpanel.php:335 msgid "SSL server" msgstr "Servidor SSL" -#: actions/pathsadminpanel.php:309 +#: actions/pathsadminpanel.php:336 msgid "Server to direct SSL requests to" msgstr "Servidor para onde encaminhar pedidos SSL" -#: actions/pathsadminpanel.php:325 +#: actions/pathsadminpanel.php:352 msgid "Save paths" msgstr "Gravar localizações" @@ -2631,7 +2704,7 @@ msgstr "" "Categorias para si (letras, números, -, ., _), separadas por vírgulas ou " "espaços" -#: actions/profilesettings.php:151 actions/siteadminpanel.php:294 +#: actions/profilesettings.php:151 actions/siteadminpanel.php:280 msgid "Language" msgstr "Idioma" @@ -2657,7 +2730,7 @@ msgstr "Subscrever automaticamente quem me subscreva (óptimo para não-humanos) msgid "Bio is too long (max %d chars)." msgstr "Biografia demasiado extensa (máx. %d caracteres)." -#: actions/profilesettings.php:235 actions/siteadminpanel.php:164 +#: actions/profilesettings.php:235 actions/siteadminpanel.php:150 msgid "Timezone not selected." msgstr "Fuso horário não foi seleccionado." @@ -2936,7 +3009,7 @@ msgstr "Desculpe, código de convite inválido." msgid "Registration successful" msgstr "Registo efectuado" -#: actions/register.php:114 actions/register.php:503 lib/action.php:457 +#: actions/register.php:114 actions/register.php:503 lib/action.php:463 #: lib/logingroupnav.php:85 msgid "Register" msgstr "Registar" @@ -2979,7 +3052,7 @@ msgid "Same as password above. Required." msgstr "Repita a senha acima. Obrigatório." #: actions/register.php:438 actions/register.php:442 -#: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120 +#: actions/siteadminpanel.php:256 lib/accountsettingsaction.php:120 msgid "Email" msgstr "Correio" @@ -3137,6 +3210,11 @@ msgstr "Repetida!" msgid "Replies to %s" msgstr "Respostas a %s" +#: actions/replies.php:127 +#, fuzzy, php-format +msgid "Replies to %1$s, page %2$d" +msgstr "Respostas a %1$s em %2$s!" + #: actions/replies.php:144 #, php-format msgid "Replies feed for %s (RSS 1.0)" @@ -3270,6 +3348,11 @@ msgid "" "signature method." msgstr "" +#: actions/showfavorites.php:79 +#, fuzzy, php-format +msgid "%1$s's favorite notices, page %2$d" +msgstr "Notas favoritas de %s" + #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "Não foi possível importar notas favoritas." @@ -3327,6 +3410,11 @@ msgstr "Esta é uma forma de partilhar aquilo de que gosta." msgid "%s group" msgstr "Grupo %s" +#: actions/showgroup.php:84 +#, fuzzy, php-format +msgid "%1$s group, page %2$d" +msgstr "Membros do grupo %1$s, página %2$d" + #: actions/showgroup.php:218 msgid "Group profile" msgstr "Perfil do grupo" @@ -3447,6 +3535,11 @@ msgstr "Avatar actualizado." msgid " tagged %s" msgstr " categorizou %s" +#: actions/showstream.php:79 +#, fuzzy, php-format +msgid "%1$s, page %2$d" +msgstr "Perfis bloqueados de %1$s, página %2$d" + #: actions/showstream.php:122 #, php-format msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" @@ -3536,194 +3629,146 @@ msgstr "O utilizador já está silenciado." msgid "Basic settings for this StatusNet site." msgstr "Configurações básicas para este site StatusNet." -#: actions/siteadminpanel.php:146 +#: actions/siteadminpanel.php:132 msgid "Site name must have non-zero length." msgstr "Nome do site não pode ter comprimento zero." -#: actions/siteadminpanel.php:154 +#: actions/siteadminpanel.php:140 msgid "You must have a valid contact email address." msgstr "Tem de ter um endereço válido para o correio electrónico de contacto." -#: actions/siteadminpanel.php:172 +#: actions/siteadminpanel.php:158 #, php-format msgid "Unknown language \"%s\"." msgstr "Língua desconhecida \"%s\"." -#: actions/siteadminpanel.php:179 +#: actions/siteadminpanel.php:165 msgid "Invalid snapshot report URL." msgstr "URL para onde enviar instantâneos é inválida" -#: actions/siteadminpanel.php:185 +#: actions/siteadminpanel.php:171 msgid "Invalid snapshot run value." msgstr "Valor de criação do instantâneo é inválido." -#: actions/siteadminpanel.php:191 +#: actions/siteadminpanel.php:177 msgid "Snapshot frequency must be a number." msgstr "Frequência dos instantâneos estatísticos tem de ser um número." -#: actions/siteadminpanel.php:197 +#: actions/siteadminpanel.php:183 msgid "Minimum text limit is 140 characters." msgstr "O valor mínimo de limite para o texto é 140 caracteres." -#: actions/siteadminpanel.php:203 +#: actions/siteadminpanel.php:189 msgid "Dupe limit must 1 or more seconds." msgstr "O limite de duplicados tem de ser 1 ou mais segundos." -#: actions/siteadminpanel.php:253 +#: actions/siteadminpanel.php:239 msgid "General" msgstr "Geral" -#: actions/siteadminpanel.php:256 +#: actions/siteadminpanel.php:242 msgid "Site name" msgstr "Nome do site" -#: actions/siteadminpanel.php:257 +#: actions/siteadminpanel.php:243 msgid "The name of your site, like \"Yourcompany Microblog\"" msgstr "O nome do seu site, por exemplo \"Microblogue NomeDaEmpresa\"" -#: actions/siteadminpanel.php:261 +#: actions/siteadminpanel.php:247 msgid "Brought by" msgstr "Disponibilizado por" -#: actions/siteadminpanel.php:262 +#: actions/siteadminpanel.php:248 msgid "Text used for credits link in footer of each page" msgstr "Texto usado para a ligação de atribuição no rodapé de cada página" -#: actions/siteadminpanel.php:266 +#: actions/siteadminpanel.php:252 msgid "Brought by URL" msgstr "URL da atribuição" -#: actions/siteadminpanel.php:267 +#: actions/siteadminpanel.php:253 msgid "URL used for credits link in footer of each page" msgstr "URL usada para a ligação de atribuição no rodapé de cada página" -#: actions/siteadminpanel.php:271 +#: actions/siteadminpanel.php:257 msgid "Contact email address for your site" msgstr "Endereço de correio electrónico de contacto para o site" -#: actions/siteadminpanel.php:277 +#: actions/siteadminpanel.php:263 msgid "Local" msgstr "Local" -#: actions/siteadminpanel.php:288 +#: actions/siteadminpanel.php:274 msgid "Default timezone" msgstr "Fuso horário, por omissão" -#: actions/siteadminpanel.php:289 +#: actions/siteadminpanel.php:275 msgid "Default timezone for the site; usually UTC." msgstr "Fuso horário por omissão, para o site; normalmente, UTC." -#: actions/siteadminpanel.php:295 +#: actions/siteadminpanel.php:281 msgid "Default site language" msgstr "Idioma do site, por omissão" -#: actions/siteadminpanel.php:303 -msgid "URLs" -msgstr "URLs" - -#: actions/siteadminpanel.php:306 -msgid "Server" -msgstr "Servidor" - -#: actions/siteadminpanel.php:306 -msgid "Site's server hostname." -msgstr "Nome do servidor do site." - -#: actions/siteadminpanel.php:310 -msgid "Fancy URLs" -msgstr "URLs bonitas" - -#: actions/siteadminpanel.php:312 -msgid "Use fancy (more readable and memorable) URLs?" -msgstr "Usar URLs bonitas (mais legíveis e memoráveis)" - -#: actions/siteadminpanel.php:318 -msgid "Access" -msgstr "Acesso" - -#: actions/siteadminpanel.php:321 -msgid "Private" -msgstr "Privado" - -#: actions/siteadminpanel.php:323 -msgid "Prohibit anonymous users (not logged in) from viewing site?" -msgstr "Proibir utilizadores anónimos (sem sessão iniciada) de ver o site?" - -#: actions/siteadminpanel.php:327 -msgid "Invite only" -msgstr "Só por convite" - -#: actions/siteadminpanel.php:329 -msgid "Make registration invitation only." -msgstr "Permitir o registo só a convidados." - -#: actions/siteadminpanel.php:333 -msgid "Closed" -msgstr "Fechado" - -#: actions/siteadminpanel.php:335 -msgid "Disable new registrations." -msgstr "Impossibilitar registos novos." - -#: actions/siteadminpanel.php:341 +#: actions/siteadminpanel.php:289 msgid "Snapshots" msgstr "Instantâneos" -#: actions/siteadminpanel.php:344 +#: actions/siteadminpanel.php:292 msgid "Randomly during Web hit" msgstr "Aleatoriamente, durante o acesso pela internet" -#: actions/siteadminpanel.php:345 +#: actions/siteadminpanel.php:293 msgid "In a scheduled job" msgstr "Num processo agendado" -#: actions/siteadminpanel.php:347 +#: actions/siteadminpanel.php:295 msgid "Data snapshots" msgstr "Instantâneos dos dados" -#: actions/siteadminpanel.php:348 +#: actions/siteadminpanel.php:296 msgid "When to send statistical data to status.net servers" msgstr "Quando enviar dados estatísticos para os servidores do status.net" -#: actions/siteadminpanel.php:353 +#: actions/siteadminpanel.php:301 msgid "Frequency" msgstr "Frequência" -#: actions/siteadminpanel.php:354 +#: actions/siteadminpanel.php:302 msgid "Snapshots will be sent once every N web hits" msgstr "Instantâneos serão enviados uma vez a cada N acessos da internet" -#: actions/siteadminpanel.php:359 +#: actions/siteadminpanel.php:307 msgid "Report URL" msgstr "URL para relatórios" -#: actions/siteadminpanel.php:360 +#: actions/siteadminpanel.php:308 msgid "Snapshots will be sent to this URL" msgstr "Instantâneos serão enviados para esta URL" -#: actions/siteadminpanel.php:367 +#: actions/siteadminpanel.php:315 msgid "Limits" msgstr "Limites" -#: actions/siteadminpanel.php:370 +#: actions/siteadminpanel.php:318 msgid "Text limit" msgstr "Limite de texto" -#: actions/siteadminpanel.php:370 +#: actions/siteadminpanel.php:318 msgid "Maximum number of characters for notices." msgstr "Número máximo de caracteres nas notas." -#: actions/siteadminpanel.php:374 +#: actions/siteadminpanel.php:322 msgid "Dupe limit" msgstr "Limite de duplicações" -#: actions/siteadminpanel.php:374 +#: actions/siteadminpanel.php:322 msgid "How long users must wait (in seconds) to post the same thing again." msgstr "" "Quanto tempo os utilizadores terão de esperar (em segundos) para publicar a " "mesma coisa outra vez." -#: actions/siteadminpanel.php:388 actions/useradminpanel.php:313 +#: actions/siteadminpanel.php:336 actions/useradminpanel.php:313 msgid "Save site settings" msgstr "Gravar configurações do site" @@ -3932,6 +3977,11 @@ msgstr "Jabber" msgid "SMS" msgstr "SMS" +#: actions/tag.php:68 +#, fuzzy, php-format +msgid "Notices tagged with %1$s, page %2$d" +msgstr "Utilizadores auto-categorizados com %1$s - página %2$d" + #: actions/tag.php:86 #, php-format msgid "Notice feed for tag %s (RSS 1.0)" @@ -4232,6 +4282,11 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "Disfrute do seu cachorro-quente!" +#: actions/usergroups.php:64 +#, fuzzy, php-format +msgid "%1$s groups, page %2$d" +msgstr "Membros do grupo %1$s, página %2$d" + #: actions/usergroups.php:130 msgid "Search for more groups" msgstr "Procurar mais grupos" @@ -4304,7 +4359,7 @@ msgstr "" msgid "Plugins" msgstr "Plugins" -#: actions/version.php:196 lib/action.php:741 +#: actions/version.php:196 lib/action.php:747 msgid "Version" msgstr "Versão" @@ -4364,27 +4419,27 @@ msgstr "Não foi possível inserir a mensagem." msgid "Could not update message with new URI." msgstr "Não foi possível actualizar a mensagem com a nova URI." -#: classes/Notice.php:171 +#: classes/Notice.php:157 #, php-format msgid "DB error inserting hashtag: %s" msgstr "Erro na base de dados ao inserir a marca: %s" -#: classes/Notice.php:225 +#: classes/Notice.php:214 msgid "Problem saving notice. Too long." msgstr "Problema na gravação da nota. Demasiado longa." -#: classes/Notice.php:229 +#: classes/Notice.php:218 msgid "Problem saving notice. Unknown user." msgstr "Problema na gravação da nota. Utilizador desconhecido." -#: classes/Notice.php:234 +#: classes/Notice.php:223 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Demasiadas notas, demasiado rápido; descanse e volte a publicar daqui a " "alguns minutos." -#: classes/Notice.php:240 +#: classes/Notice.php:229 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." @@ -4392,20 +4447,25 @@ msgstr "" "Demasiadas mensagens duplicadas, demasiado rápido; descanse e volte a " "publicar daqui a alguns minutos." -#: classes/Notice.php:246 +#: classes/Notice.php:235 msgid "You are banned from posting notices on this site." msgstr "Está proibido de publicar notas neste site." -#: classes/Notice.php:305 classes/Notice.php:330 +#: classes/Notice.php:294 classes/Notice.php:319 msgid "Problem saving notice." msgstr "Problema na gravação da nota." -#: classes/Notice.php:1059 +#: classes/Notice.php:790 +#, fuzzy +msgid "Problem saving group inbox." +msgstr "Problema na gravação da nota." + +#: classes/Notice.php:850 #, php-format msgid "DB error inserting reply: %s" msgstr "Ocorreu um erro na base de dados ao inserir a resposta: %s" -#: classes/Notice.php:1441 +#: classes/Notice.php:1233 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -4460,124 +4520,124 @@ msgstr "%1$s (%2$s)" msgid "Untitled page" msgstr "Página sem título" -#: lib/action.php:427 +#: lib/action.php:433 msgid "Primary site navigation" msgstr "Navegação primária deste site" -#: lib/action.php:433 +#: lib/action.php:439 msgid "Home" msgstr "Início" -#: lib/action.php:433 +#: lib/action.php:439 msgid "Personal profile and friends timeline" msgstr "Perfil pessoal e notas dos amigos" -#: lib/action.php:435 +#: lib/action.php:441 msgid "Change your email, avatar, password, profile" msgstr "Altere o seu endereço electrónico, avatar, senha, perfil" -#: lib/action.php:438 +#: lib/action.php:444 msgid "Connect" msgstr "Ligar" -#: lib/action.php:438 +#: lib/action.php:444 msgid "Connect to services" msgstr "Ligar aos serviços" -#: lib/action.php:442 +#: lib/action.php:448 msgid "Change site configuration" msgstr "Alterar a configuração do site" -#: lib/action.php:446 lib/subgroupnav.php:105 +#: lib/action.php:452 lib/subgroupnav.php:105 msgid "Invite" msgstr "Convidar" -#: lib/action.php:447 lib/subgroupnav.php:106 +#: lib/action.php:453 lib/subgroupnav.php:106 #, php-format msgid "Invite friends and colleagues to join you on %s" msgstr "Convidar amigos e colegas para se juntarem a si em %s" -#: lib/action.php:452 +#: lib/action.php:458 msgid "Logout" msgstr "Sair" -#: lib/action.php:452 +#: lib/action.php:458 msgid "Logout from the site" msgstr "Terminar esta sessão" -#: lib/action.php:457 +#: lib/action.php:463 msgid "Create an account" msgstr "Criar uma conta" -#: lib/action.php:460 +#: lib/action.php:466 msgid "Login to the site" msgstr "Iniciar uma sessão" -#: lib/action.php:463 lib/action.php:726 +#: lib/action.php:469 lib/action.php:732 msgid "Help" msgstr "Ajuda" -#: lib/action.php:463 +#: lib/action.php:469 msgid "Help me!" msgstr "Ajudem-me!" -#: lib/action.php:466 lib/searchaction.php:127 +#: lib/action.php:472 lib/searchaction.php:127 msgid "Search" msgstr "Pesquisa" -#: lib/action.php:466 +#: lib/action.php:472 msgid "Search for people or text" msgstr "Procurar pessoas ou pesquisar texto" -#: lib/action.php:487 +#: lib/action.php:493 msgid "Site notice" msgstr "Aviso do site" -#: lib/action.php:553 +#: lib/action.php:559 msgid "Local views" msgstr "Vistas locais" -#: lib/action.php:619 +#: lib/action.php:625 msgid "Page notice" msgstr "Aviso da página" -#: lib/action.php:721 +#: lib/action.php:727 msgid "Secondary site navigation" msgstr "Navegação secundária deste site" -#: lib/action.php:728 +#: lib/action.php:734 msgid "About" msgstr "Sobre" -#: lib/action.php:730 +#: lib/action.php:736 msgid "FAQ" msgstr "FAQ" -#: lib/action.php:734 +#: lib/action.php:740 msgid "TOS" msgstr "Termos" -#: lib/action.php:737 +#: lib/action.php:743 msgid "Privacy" msgstr "Privacidade" -#: lib/action.php:739 +#: lib/action.php:745 msgid "Source" msgstr "Código" -#: lib/action.php:743 +#: lib/action.php:749 msgid "Contact" msgstr "Contacto" -#: lib/action.php:745 +#: lib/action.php:751 msgid "Badge" msgstr "Emblema" -#: lib/action.php:773 +#: lib/action.php:779 msgid "StatusNet software license" msgstr "Licença de software do StatusNet" -#: lib/action.php:776 +#: lib/action.php:782 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -4586,12 +4646,12 @@ msgstr "" "**%%site.name%%** é um serviço de microblogues disponibilizado por [%%site." "broughtby%%](%%site.broughtbyurl%%). " -#: lib/action.php:778 +#: lib/action.php:784 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "**%%site.name%%** é um serviço de microblogues. " -#: lib/action.php:780 +#: lib/action.php:786 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4602,41 +4662,41 @@ msgstr "" "disponibilizado nos termos da [GNU Affero General Public License](http://www." "fsf.org/licensing/licenses/agpl-3.0.html)." -#: lib/action.php:795 +#: lib/action.php:801 msgid "Site content license" msgstr "Licença de conteúdos do site" -#: lib/action.php:800 +#: lib/action.php:806 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "" -#: lib/action.php:805 +#: lib/action.php:811 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" -#: lib/action.php:808 +#: lib/action.php:814 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" -#: lib/action.php:820 +#: lib/action.php:826 msgid "All " msgstr "Tudo " -#: lib/action.php:825 +#: lib/action.php:831 msgid "license." msgstr "licença." -#: lib/action.php:1124 +#: lib/action.php:1130 msgid "Pagination" msgstr "Paginação" -#: lib/action.php:1133 +#: lib/action.php:1139 msgid "After" msgstr "Posteriores" -#: lib/action.php:1141 +#: lib/action.php:1147 msgid "Before" msgstr "Anteriores" @@ -4668,10 +4728,24 @@ msgstr "Configuração básica do site" msgid "Design configuration" msgstr "Configuração do estilo" -#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327 +#: lib/adminpanelaction.php:322 +#, fuzzy +msgid "User configuration" +msgstr "Configuração das localizações" + +#: lib/adminpanelaction.php:327 +#, fuzzy +msgid "Access configuration" +msgstr "Configuração do estilo" + +#: lib/adminpanelaction.php:332 msgid "Paths configuration" msgstr "Configuração das localizações" +#: lib/applicationeditform.php:136 +msgid "Edit application" +msgstr "" + #: lib/applicationeditform.php:186 msgid "Icon for this application" msgstr "" @@ -5288,12 +5362,12 @@ msgstr "MB" msgid "kB" msgstr "kB" -#: lib/jabber.php:202 +#: lib/jabber.php:220 #, php-format msgid "[%s]" msgstr "[%s]" -#: lib/jabber.php:385 +#: lib/jabber.php:400 #, fuzzy, php-format msgid "Unknown inbox source %d." msgstr "Língua desconhecida \"%s\"." @@ -5792,19 +5866,19 @@ msgstr "Respostas" msgid "Favorites" msgstr "Favoritas" -#: lib/personalgroupnav.php:124 +#: lib/personalgroupnav.php:125 msgid "Inbox" msgstr "Recebidas" -#: lib/personalgroupnav.php:125 +#: lib/personalgroupnav.php:126 msgid "Your incoming messages" msgstr "Mensagens recebidas" -#: lib/personalgroupnav.php:129 +#: lib/personalgroupnav.php:130 msgid "Outbox" msgstr "Enviadas" -#: lib/personalgroupnav.php:130 +#: lib/personalgroupnav.php:131 msgid "Your sent messages" msgstr "Mensagens enviadas" @@ -6046,47 +6120,47 @@ msgstr "Mensagem" msgid "Moderate" msgstr "Moderar" -#: lib/util.php:875 +#: lib/util.php:868 msgid "a few seconds ago" msgstr "há alguns segundos" -#: lib/util.php:877 +#: lib/util.php:870 msgid "about a minute ago" msgstr "há cerca de um minuto" -#: lib/util.php:879 +#: lib/util.php:872 #, php-format msgid "about %d minutes ago" msgstr "há cerca de %d minutos" -#: lib/util.php:881 +#: lib/util.php:874 msgid "about an hour ago" msgstr "há cerca de uma hora" -#: lib/util.php:883 +#: lib/util.php:876 #, php-format msgid "about %d hours ago" msgstr "há cerca de %d horas" -#: lib/util.php:885 +#: lib/util.php:878 msgid "about a day ago" msgstr "há cerca de um dia" -#: lib/util.php:887 +#: lib/util.php:880 #, php-format msgid "about %d days ago" msgstr "há cerca de %d dias" -#: lib/util.php:889 +#: lib/util.php:882 msgid "about a month ago" msgstr "há cerca de um mês" -#: lib/util.php:891 +#: lib/util.php:884 #, php-format msgid "about %d months ago" msgstr "há cerca de %d meses" -#: lib/util.php:893 +#: lib/util.php:886 msgid "about a year ago" msgstr "há cerca de um ano" @@ -6100,7 +6174,7 @@ msgstr "%s não é uma cor válida!" msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "%s não é uma cor válida! Use 3 ou 6 caracteres hexadecimais." -#: scripts/xmppdaemon.php:301 +#: lib/xmppmanager.php:402 #, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "Mensagem demasiado extensa - máx. %1$d caracteres, enviou %2$d." diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.po b/locale/pt_BR/LC_MESSAGES/statusnet.po index d28a14e684..c3502658af 100644 --- a/locale/pt_BR/LC_MESSAGES/statusnet.po +++ b/locale/pt_BR/LC_MESSAGES/statusnet.po @@ -10,17 +10,71 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-21 22:36+0000\n" -"PO-Revision-Date: 2010-01-21 22:38:21+0000\n" +"POT-Creation-Date: 2010-01-27 23:58+0000\n" +"PO-Revision-Date: 2010-01-27 23:59:40+0000\n" "Language-Team: Brazilian Portuguese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r61339); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61595); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: pt-br\n" "X-Message-Group: out-statusnet\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" +#: actions/accessadminpanel.php:54 lib/adminpanelaction.php:326 +msgid "Access" +msgstr "Acesso" + +#: actions/accessadminpanel.php:65 +#, fuzzy +msgid "Site access settings" +msgstr "Salvar as configurações do site" + +#: actions/accessadminpanel.php:158 +#, fuzzy +msgid "Registration" +msgstr "Registrar-se" + +#: actions/accessadminpanel.php:161 +msgid "Private" +msgstr "Particular" + +#: actions/accessadminpanel.php:163 +msgid "Prohibit anonymous users (not logged in) from viewing site?" +msgstr "Impedir usuários anônimos (não autenticados) de visualizar o site?" + +#: actions/accessadminpanel.php:167 +msgid "Invite only" +msgstr "Somente convidados" + +#: actions/accessadminpanel.php:169 +msgid "Make registration invitation only." +msgstr "Cadastro liberado somente para convidados." + +#: actions/accessadminpanel.php:173 +msgid "Closed" +msgstr "Fechado" + +#: actions/accessadminpanel.php:175 +msgid "Disable new registrations." +msgstr "Desabilita novos registros." + +#: actions/accessadminpanel.php:189 actions/designadminpanel.php:586 +#: actions/emailsettings.php:195 actions/imsettings.php:163 +#: actions/othersettings.php:126 actions/pathsadminpanel.php:351 +#: actions/profilesettings.php:174 actions/siteadminpanel.php:336 +#: actions/smssettings.php:181 actions/subscriptions.php:203 +#: actions/tagother.php:154 actions/useradminpanel.php:313 +#: lib/applicationeditform.php:335 lib/applicationeditform.php:336 +#: lib/designsettings.php:256 lib/groupeditform.php:202 +msgid "Save" +msgstr "Salvar" + +#: actions/accessadminpanel.php:189 +#, fuzzy +msgid "Save access settings" +msgstr "Salvar as configurações do site" + #: actions/all.php:63 actions/public.php:97 actions/replies.php:92 #: actions/showfavorites.php:137 actions/tag.php:51 msgid "No such page" @@ -35,7 +89,7 @@ msgstr "Esta página não existe." #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:149 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 @@ -143,8 +197,7 @@ msgstr "Atualizações de %1$s e amigos no %2$s!" #: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 #: actions/apitimelinefriends.php:155 actions/apitimelinegroup.php:150 #: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 -#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found." @@ -160,7 +213,7 @@ msgstr "O método da API não foi encontrado!" #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:119 +#: actions/apistatusesupdate.php:118 msgid "This method requires a POST." msgstr "Este método requer um POST." @@ -191,7 +244,7 @@ msgstr "Não foi possível salvar o perfil." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:132 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 #: actions/designadminpanel.php:122 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -498,7 +551,14 @@ msgstr "Uma aplicação gostaria de se conectar à sua conta" msgid "Allow or deny access" msgstr "Permitir ou negar o acesso" -#: actions/apioauthauthorize.php:320 lib/action.php:435 +#: actions/apioauthauthorize.php:306 +#, php-format +msgid "" +"The application %s by %s would like the " +"ability to %s your account data." +msgstr "" + +#: actions/apioauthauthorize.php:320 lib/action.php:441 msgid "Account" msgstr "Conta" @@ -555,17 +615,17 @@ msgstr "A mensagem foi excluída." msgid "No status with that ID found." msgstr "Não foi encontrada nenhuma mensagem com esse ID." -#: actions/apistatusesupdate.php:162 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Está muito extenso. O tamanho máximo é de %s caracteres." -#: actions/apistatusesupdate.php:203 +#: actions/apistatusesupdate.php:202 msgid "Not found" msgstr "Não encontrado" -#: actions/apistatusesupdate.php:226 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "O tamanho máximo da mensagem é de %s caracteres" @@ -616,11 +676,6 @@ msgstr "Mensagens públicas de %s" msgid "%s updates from everyone!" msgstr "%s mensagens de todo mundo!" -#: actions/apitimelineretweetedbyme.php:112 -#, php-format -msgid "Repeated by %s" -msgstr "Repetida por %s" - #: actions/apitimelineretweetedtome.php:111 #, php-format msgid "Repeated to %s" @@ -1030,17 +1085,6 @@ msgstr "Restaura a aparência padrão" msgid "Reset back to default" msgstr "Restaura de volta ao padrão" -#: actions/designadminpanel.php:586 actions/emailsettings.php:195 -#: actions/imsettings.php:163 actions/othersettings.php:126 -#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174 -#: actions/siteadminpanel.php:388 actions/smssettings.php:181 -#: actions/subscriptions.php:203 actions/tagother.php:154 -#: actions/useradminpanel.php:313 lib/applicationeditform.php:335 -#: lib/applicationeditform.php:336 lib/designsettings.php:256 -#: lib/groupeditform.php:202 -msgid "Save" -msgstr "Salvar" - #: actions/designadminpanel.php:587 lib/designsettings.php:257 msgid "Save design" msgstr "Salvar a aparência" @@ -1053,12 +1097,14 @@ msgstr "Esta mensagem não é uma favorita!" msgid "Add to favorites" msgstr "Adicionar às favoritas" -#: actions/doc.php:69 -msgid "No such document." +#: actions/doc.php:155 +#, fuzzy, php-format +msgid "No such document \"%s\"" msgstr "Esse documento não existe." -#: actions/editapplication.php:54 lib/applicationeditform.php:136 -msgid "Edit application" +#: actions/editapplication.php:54 +#, fuzzy +msgid "Edit Application" msgstr "Editar a aplicação" #: actions/editapplication.php:66 @@ -1075,7 +1121,7 @@ msgid "No such application." msgstr "Essa aplicação não existe." #: actions/editapplication.php:127 actions/newapplication.php:110 -#: actions/showapplication.php:118 lib/action.php:1189 +#: actions/showapplication.php:118 lib/action.php:1195 msgid "There was a problem with your session token." msgstr "Ocorreu um problema com o seu token de sessão." @@ -1280,7 +1326,7 @@ msgid "Cannot normalize that email address" msgstr "Não foi possível normalizar este endereço de e-mail" #: actions/emailsettings.php:331 actions/register.php:201 -#: actions/siteadminpanel.php:157 +#: actions/siteadminpanel.php:143 msgid "Not a valid email address." msgstr "Não é um endereço de e-mail válido." @@ -1292,7 +1338,7 @@ msgstr "Esse já é seu endereço de e-mail." msgid "That email address already belongs to another user." msgstr "Esse endereço de e-mail já pertence à outro usuário." -#: actions/emailsettings.php:353 actions/imsettings.php:317 +#: actions/emailsettings.php:353 actions/imsettings.php:319 #: actions/smssettings.php:337 msgid "Couldn't insert confirmation code." msgstr "Não foi possível inserir o código de confirmação." @@ -1602,7 +1648,7 @@ msgstr "Membros do grupo %1$s, pág. %2$d" msgid "A list of the users in this group." msgstr "Uma lista dos usuários deste grupo." -#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107 +#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107 msgid "Admin" msgstr "Admin" @@ -1800,6 +1846,11 @@ msgstr "" msgid "That is not your Jabber ID." msgstr "Essa não é sua ID do Jabber." +#: actions/inbox.php:59 +#, fuzzy, php-format +msgid "Inbox for %1$s - page %2$d" +msgstr "Recebidas por %s" + #: actions/inbox.php:62 #, php-format msgid "Inbox for %s" @@ -1984,7 +2035,7 @@ msgid "Error setting user. You are probably not authorized." msgstr "" "Erro na configuração do usuário. Você provavelmente não tem autorização." -#: actions/login.php:188 actions/login.php:241 lib/action.php:460 +#: actions/login.php:188 actions/login.php:241 lib/action.php:466 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Entrar" @@ -2050,7 +2101,8 @@ msgid "No current status" msgstr "Nenhuma mensagem atual" #: actions/newapplication.php:52 -msgid "New application" +#, fuzzy +msgid "New Application" msgstr "Nova aplicação" #: actions/newapplication.php:64 @@ -2245,8 +2297,8 @@ msgstr "tipo de conteúdo " msgid "Only " msgstr "Apenas " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1038 -#: lib/api.php:1066 lib/api.php:1176 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1039 +#: lib/api.php:1067 lib/api.php:1177 msgid "Not a supported data format." msgstr "Não é um formato de dados suportado." @@ -2310,6 +2362,11 @@ msgstr "O token de autenticação especificado é inválido." msgid "Login token expired." msgstr "O token de autenticação expirou." +#: actions/outbox.php:58 +#, fuzzy, php-format +msgid "Outbox for %1$s - page %2$d" +msgstr "Enviadas de %s" + #: actions/outbox.php:61 #, php-format msgid "Outbox for %s" @@ -2382,7 +2439,7 @@ msgstr "Não é possível salvar a nova senha." msgid "Password saved." msgstr "A senha foi salva." -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:331 msgid "Paths" msgstr "Caminhos" @@ -2390,133 +2447,149 @@ msgstr "Caminhos" msgid "Path and server settings for this StatusNet site." msgstr "Configurações dos caminhos e do servidor para este site StatusNet." -#: actions/pathsadminpanel.php:140 +#: actions/pathsadminpanel.php:157 #, php-format msgid "Theme directory not readable: %s" msgstr "Sem permissão de leitura no diretório de temas: %s" -#: actions/pathsadminpanel.php:146 +#: actions/pathsadminpanel.php:163 #, php-format msgid "Avatar directory not writable: %s" msgstr "Sem permissão de escrita no diretório de avatares: %s" -#: actions/pathsadminpanel.php:152 +#: actions/pathsadminpanel.php:169 #, php-format msgid "Background directory not writable: %s" msgstr "Sem permissão de escrita no diretório de imagens de fundo: %s" -#: actions/pathsadminpanel.php:160 +#: actions/pathsadminpanel.php:177 #, php-format msgid "Locales directory not readable: %s" msgstr "Sem permissão de leitura no diretório de locales: %s" -#: actions/pathsadminpanel.php:166 +#: actions/pathsadminpanel.php:183 msgid "Invalid SSL server. The maximum length is 255 characters." msgstr "" "Servidor SSL inválido. O comprimento máximo deve ser de 255 caracteres." -#: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58 +#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58 #: lib/adminpanelaction.php:311 msgid "Site" msgstr "Site" -#: actions/pathsadminpanel.php:221 +#: actions/pathsadminpanel.php:238 +msgid "Server" +msgstr "Servidor" + +#: actions/pathsadminpanel.php:238 +msgid "Site's server hostname." +msgstr "Nome de host do servidor do site." + +#: actions/pathsadminpanel.php:242 msgid "Path" msgstr "Caminho" -#: actions/pathsadminpanel.php:221 +#: actions/pathsadminpanel.php:242 msgid "Site path" msgstr "Caminho do site" -#: actions/pathsadminpanel.php:225 +#: actions/pathsadminpanel.php:246 msgid "Path to locales" msgstr "Caminho para os locales" -#: actions/pathsadminpanel.php:225 +#: actions/pathsadminpanel.php:246 msgid "Directory path to locales" msgstr "Caminho do diretório de locales" -#: actions/pathsadminpanel.php:232 +#: actions/pathsadminpanel.php:250 +msgid "Fancy URLs" +msgstr "URLs limpas" + +#: actions/pathsadminpanel.php:252 +msgid "Use fancy (more readable and memorable) URLs?" +msgstr "Utilizar URLs limpas (mais legíveis e memorizáveis)?" + +#: actions/pathsadminpanel.php:259 msgid "Theme" msgstr "Tema" -#: actions/pathsadminpanel.php:237 +#: actions/pathsadminpanel.php:264 msgid "Theme server" msgstr "Servidor de temas" -#: actions/pathsadminpanel.php:241 +#: actions/pathsadminpanel.php:268 msgid "Theme path" msgstr "Caminho dos temas" -#: actions/pathsadminpanel.php:245 +#: actions/pathsadminpanel.php:272 msgid "Theme directory" msgstr "Diretório dos temas" -#: actions/pathsadminpanel.php:252 +#: actions/pathsadminpanel.php:279 msgid "Avatars" msgstr "Avatares" -#: actions/pathsadminpanel.php:257 +#: actions/pathsadminpanel.php:284 msgid "Avatar server" msgstr "Servidor de avatares" -#: actions/pathsadminpanel.php:261 +#: actions/pathsadminpanel.php:288 msgid "Avatar path" msgstr "Caminho dos avatares" -#: actions/pathsadminpanel.php:265 +#: actions/pathsadminpanel.php:292 msgid "Avatar directory" msgstr "Diretório dos avatares" -#: actions/pathsadminpanel.php:274 +#: actions/pathsadminpanel.php:301 msgid "Backgrounds" msgstr "Imagens de fundo" -#: actions/pathsadminpanel.php:278 +#: actions/pathsadminpanel.php:305 msgid "Background server" msgstr "Servidor de imagens de fundo" -#: actions/pathsadminpanel.php:282 +#: actions/pathsadminpanel.php:309 msgid "Background path" msgstr "Caminho das imagens de fundo" -#: actions/pathsadminpanel.php:286 +#: actions/pathsadminpanel.php:313 msgid "Background directory" msgstr "Diretório das imagens de fundo" -#: actions/pathsadminpanel.php:293 +#: actions/pathsadminpanel.php:320 msgid "SSL" msgstr "SSL" -#: actions/pathsadminpanel.php:296 actions/siteadminpanel.php:346 +#: actions/pathsadminpanel.php:323 actions/siteadminpanel.php:294 msgid "Never" msgstr "Nunca" -#: actions/pathsadminpanel.php:297 +#: actions/pathsadminpanel.php:324 msgid "Sometimes" msgstr "Algumas vezes" -#: actions/pathsadminpanel.php:298 +#: actions/pathsadminpanel.php:325 msgid "Always" msgstr "Sempre" -#: actions/pathsadminpanel.php:302 +#: actions/pathsadminpanel.php:329 msgid "Use SSL" msgstr "Usar SSL" -#: actions/pathsadminpanel.php:303 +#: actions/pathsadminpanel.php:330 msgid "When to use SSL" msgstr "Quando usar SSL" -#: actions/pathsadminpanel.php:308 +#: actions/pathsadminpanel.php:335 msgid "SSL server" msgstr "Servidor SSL" -#: actions/pathsadminpanel.php:309 +#: actions/pathsadminpanel.php:336 msgid "Server to direct SSL requests to" msgstr "Servidor para onde devem ser direcionadas as requisições SSL" -#: actions/pathsadminpanel.php:325 +#: actions/pathsadminpanel.php:352 msgid "Save paths" msgstr "Salvar caminhos" @@ -2628,7 +2701,7 @@ msgstr "" "Suas etiquetas (letras, números, -, ., e _), separadas por vírgulas ou " "espaços" -#: actions/profilesettings.php:151 actions/siteadminpanel.php:294 +#: actions/profilesettings.php:151 actions/siteadminpanel.php:280 msgid "Language" msgstr "Idioma" @@ -2655,7 +2728,7 @@ msgstr "" msgid "Bio is too long (max %d chars)." msgstr "A descrição é muito extensa (máximo %d caracteres)." -#: actions/profilesettings.php:235 actions/siteadminpanel.php:164 +#: actions/profilesettings.php:235 actions/siteadminpanel.php:150 msgid "Timezone not selected." msgstr "O fuso horário não foi selecionado." @@ -2935,7 +3008,7 @@ msgstr "Desculpe, mas o código do convite é inválido." msgid "Registration successful" msgstr "Registro realizado com sucesso" -#: actions/register.php:114 actions/register.php:503 lib/action.php:457 +#: actions/register.php:114 actions/register.php:503 lib/action.php:463 #: lib/logingroupnav.php:85 msgid "Register" msgstr "Registrar-se" @@ -2978,7 +3051,7 @@ msgid "Same as password above. Required." msgstr "Igual à senha acima. Obrigatório." #: actions/register.php:438 actions/register.php:442 -#: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120 +#: actions/siteadminpanel.php:256 lib/accountsettingsaction.php:120 msgid "Email" msgstr "E-mail" @@ -3135,6 +3208,11 @@ msgstr "Repetida!" msgid "Replies to %s" msgstr "Respostas para %s" +#: actions/replies.php:127 +#, fuzzy, php-format +msgid "Replies to %1$s, page %2$d" +msgstr "Respostas para %1$s no %2$s" + #: actions/replies.php:144 #, php-format msgid "Replies feed for %s (RSS 1.0)" @@ -3267,6 +3345,11 @@ msgstr "" "Nota: Nós suportamos assinaturas HMAC-SHA1. Nós não suportamos o método de " "assinatura em texto plano." +#: actions/showfavorites.php:79 +#, fuzzy, php-format +msgid "%1$s's favorite notices, page %2$d" +msgstr "Mensagens favoritas de %s" + #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "Não foi possível recuperar as mensagens favoritas." @@ -3324,6 +3407,11 @@ msgstr "Esta é uma forma de compartilhar o que você gosta." msgid "%s group" msgstr "Grupo %s" +#: actions/showgroup.php:84 +#, fuzzy, php-format +msgid "%1$s group, page %2$d" +msgstr "Membros do grupo %1$s, pág. %2$d" + #: actions/showgroup.php:218 msgid "Group profile" msgstr "Perfil do grupo" @@ -3444,6 +3532,11 @@ msgstr "A mensagem excluída." msgid " tagged %s" msgstr " etiquetada %s" +#: actions/showstream.php:79 +#, fuzzy, php-format +msgid "%1$s, page %2$d" +msgstr "%1$s e amigos, pág. %2$d" + #: actions/showstream.php:122 #, php-format msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" @@ -3535,194 +3628,146 @@ msgstr "O usuário já está silenciado." msgid "Basic settings for this StatusNet site." msgstr "Configurações básicas para esta instância do StatusNet." -#: actions/siteadminpanel.php:146 +#: actions/siteadminpanel.php:132 msgid "Site name must have non-zero length." msgstr "Você deve digitar alguma coisa para o nome do site." -#: actions/siteadminpanel.php:154 +#: actions/siteadminpanel.php:140 msgid "You must have a valid contact email address." msgstr "Você deve ter um endereço de e-mail para contato válido." -#: actions/siteadminpanel.php:172 +#: actions/siteadminpanel.php:158 #, php-format msgid "Unknown language \"%s\"." msgstr "Idioma \"%s\" desconhecido." -#: actions/siteadminpanel.php:179 +#: actions/siteadminpanel.php:165 msgid "Invalid snapshot report URL." msgstr "A URL para o envio das estatísticas é inválida." -#: actions/siteadminpanel.php:185 +#: actions/siteadminpanel.php:171 msgid "Invalid snapshot run value." msgstr "O valor de execução da obtenção das estatísticas é inválido." -#: actions/siteadminpanel.php:191 +#: actions/siteadminpanel.php:177 msgid "Snapshot frequency must be a number." msgstr "A frequência de geração de estatísticas deve ser um número." -#: actions/siteadminpanel.php:197 +#: actions/siteadminpanel.php:183 msgid "Minimum text limit is 140 characters." msgstr "O comprimento máximo do texto é de 140 caracteres." -#: actions/siteadminpanel.php:203 +#: actions/siteadminpanel.php:189 msgid "Dupe limit must 1 or more seconds." msgstr "O limite de duplicatas deve ser de um ou mais segundos." -#: actions/siteadminpanel.php:253 +#: actions/siteadminpanel.php:239 msgid "General" msgstr "Geral" -#: actions/siteadminpanel.php:256 +#: actions/siteadminpanel.php:242 msgid "Site name" msgstr "Nome do site" -#: actions/siteadminpanel.php:257 +#: actions/siteadminpanel.php:243 msgid "The name of your site, like \"Yourcompany Microblog\"" msgstr "O nome do seu site, por exemplo \"Microblog da Sua Empresa\"" -#: actions/siteadminpanel.php:261 +#: actions/siteadminpanel.php:247 msgid "Brought by" msgstr "Disponibilizado por" -#: actions/siteadminpanel.php:262 +#: actions/siteadminpanel.php:248 msgid "Text used for credits link in footer of each page" msgstr "Texto utilizado para o link de créditos no rodapé de cada página" -#: actions/siteadminpanel.php:266 +#: actions/siteadminpanel.php:252 msgid "Brought by URL" msgstr "URL do disponibilizado por" -#: actions/siteadminpanel.php:267 +#: actions/siteadminpanel.php:253 msgid "URL used for credits link in footer of each page" msgstr "URL utilizada para o link de créditos no rodapé de cada página" -#: actions/siteadminpanel.php:271 +#: actions/siteadminpanel.php:257 msgid "Contact email address for your site" msgstr "Endereço de e-mail para contatos do seu site" -#: actions/siteadminpanel.php:277 +#: actions/siteadminpanel.php:263 msgid "Local" msgstr "Local" -#: actions/siteadminpanel.php:288 +#: actions/siteadminpanel.php:274 msgid "Default timezone" msgstr "Fuso horário padrão" -#: actions/siteadminpanel.php:289 +#: actions/siteadminpanel.php:275 msgid "Default timezone for the site; usually UTC." msgstr "Fuso horário padrão para o seu site; geralmente UTC." -#: actions/siteadminpanel.php:295 +#: actions/siteadminpanel.php:281 msgid "Default site language" msgstr "Idioma padrão do site" -#: actions/siteadminpanel.php:303 -msgid "URLs" -msgstr "URLs" - -#: actions/siteadminpanel.php:306 -msgid "Server" -msgstr "Servidor" - -#: actions/siteadminpanel.php:306 -msgid "Site's server hostname." -msgstr "Nome de host do servidor do site." - -#: actions/siteadminpanel.php:310 -msgid "Fancy URLs" -msgstr "URLs limpas" - -#: actions/siteadminpanel.php:312 -msgid "Use fancy (more readable and memorable) URLs?" -msgstr "Utilizar URLs limpas (mais legíveis e memorizáveis)?" - -#: actions/siteadminpanel.php:318 -msgid "Access" -msgstr "Acesso" - -#: actions/siteadminpanel.php:321 -msgid "Private" -msgstr "Particular" - -#: actions/siteadminpanel.php:323 -msgid "Prohibit anonymous users (not logged in) from viewing site?" -msgstr "Impedir usuários anônimos (não autenticados) de visualizar o site?" - -#: actions/siteadminpanel.php:327 -msgid "Invite only" -msgstr "Somente convidados" - -#: actions/siteadminpanel.php:329 -msgid "Make registration invitation only." -msgstr "Cadastro liberado somente para convidados." - -#: actions/siteadminpanel.php:333 -msgid "Closed" -msgstr "Fechado" - -#: actions/siteadminpanel.php:335 -msgid "Disable new registrations." -msgstr "Desabilita novos registros." - -#: actions/siteadminpanel.php:341 +#: actions/siteadminpanel.php:289 msgid "Snapshots" msgstr "Estatísticas" -#: actions/siteadminpanel.php:344 +#: actions/siteadminpanel.php:292 msgid "Randomly during Web hit" msgstr "Aleatoriamente durante o funcionamento" -#: actions/siteadminpanel.php:345 +#: actions/siteadminpanel.php:293 msgid "In a scheduled job" msgstr "Em horários pré-definidos" -#: actions/siteadminpanel.php:347 +#: actions/siteadminpanel.php:295 msgid "Data snapshots" msgstr "Estatísticas dos dados" -#: actions/siteadminpanel.php:348 +#: actions/siteadminpanel.php:296 msgid "When to send statistical data to status.net servers" msgstr "Quando enviar dados estatísticos para os servidores status.net" -#: actions/siteadminpanel.php:353 +#: actions/siteadminpanel.php:301 msgid "Frequency" msgstr "Frequentemente" -#: actions/siteadminpanel.php:354 +#: actions/siteadminpanel.php:302 msgid "Snapshots will be sent once every N web hits" msgstr "As estatísticas serão enviadas uma vez a cada N usos da web" -#: actions/siteadminpanel.php:359 +#: actions/siteadminpanel.php:307 msgid "Report URL" msgstr "URL para envio" -#: actions/siteadminpanel.php:360 +#: actions/siteadminpanel.php:308 msgid "Snapshots will be sent to this URL" msgstr "As estatísticas serão enviadas para esta URL" -#: actions/siteadminpanel.php:367 +#: actions/siteadminpanel.php:315 msgid "Limits" msgstr "Limites" -#: actions/siteadminpanel.php:370 +#: actions/siteadminpanel.php:318 msgid "Text limit" msgstr "Limite do texto" -#: actions/siteadminpanel.php:370 +#: actions/siteadminpanel.php:318 msgid "Maximum number of characters for notices." msgstr "Número máximo de caracteres para as mensagens." -#: actions/siteadminpanel.php:374 +#: actions/siteadminpanel.php:322 msgid "Dupe limit" msgstr "Limite de duplicatas" -#: actions/siteadminpanel.php:374 +#: actions/siteadminpanel.php:322 msgid "How long users must wait (in seconds) to post the same thing again." msgstr "" "Quanto tempo (em segundos) os usuários devem esperar para publicar a mesma " "coisa novamente." -#: actions/siteadminpanel.php:388 actions/useradminpanel.php:313 +#: actions/siteadminpanel.php:336 actions/useradminpanel.php:313 msgid "Save site settings" msgstr "Salvar as configurações do site" @@ -3929,6 +3974,11 @@ msgstr "Jabber" msgid "SMS" msgstr "SMS" +#: actions/tag.php:68 +#, fuzzy, php-format +msgid "Notices tagged with %1$s, page %2$d" +msgstr "Usuários auto-etiquetados com %1$s - pág. %2$d" + #: actions/tag.php:86 #, php-format msgid "Notice feed for tag %s (RSS 1.0)" @@ -4230,6 +4280,11 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "Aproveite o seu cachorro-quente!" +#: actions/usergroups.php:64 +#, fuzzy, php-format +msgid "%1$s groups, page %2$d" +msgstr "Membros do grupo %1$s, pág. %2$d" + #: actions/usergroups.php:130 msgid "Search for more groups" msgstr "Procurar por outros grupos" @@ -4305,7 +4360,7 @@ msgstr "" msgid "Plugins" msgstr "Plugins" -#: actions/version.php:196 lib/action.php:741 +#: actions/version.php:196 lib/action.php:747 msgid "Version" msgstr "Versão" @@ -4361,27 +4416,27 @@ msgstr "Não foi possível inserir a mensagem." msgid "Could not update message with new URI." msgstr "Não foi possível atualizar a mensagem com a nova URI." -#: classes/Notice.php:171 +#: classes/Notice.php:157 #, php-format msgid "DB error inserting hashtag: %s" msgstr "Erro no banco de dados durante a inserção da hashtag: %s" -#: classes/Notice.php:225 +#: classes/Notice.php:214 msgid "Problem saving notice. Too long." msgstr "Problema no salvamento da mensagem. Ela é muito extensa." -#: classes/Notice.php:229 +#: classes/Notice.php:218 msgid "Problem saving notice. Unknown user." msgstr "Problema no salvamento da mensagem. Usuário desconhecido." -#: classes/Notice.php:234 +#: classes/Notice.php:223 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Muitas mensagens em um período curto de tempo; dê uma respirada e publique " "novamente daqui a alguns minutos." -#: classes/Notice.php:240 +#: classes/Notice.php:229 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." @@ -4389,20 +4444,25 @@ msgstr "" "Muitas mensagens duplicadas em um período curto de tempo; dê uma respirada e " "publique novamente daqui a alguns minutos." -#: classes/Notice.php:246 +#: classes/Notice.php:235 msgid "You are banned from posting notices on this site." msgstr "Você está proibido de publicar mensagens neste site." -#: classes/Notice.php:305 classes/Notice.php:330 +#: classes/Notice.php:294 classes/Notice.php:319 msgid "Problem saving notice." msgstr "Problema no salvamento da mensagem." -#: classes/Notice.php:1059 +#: classes/Notice.php:790 +#, fuzzy +msgid "Problem saving group inbox." +msgstr "Problema no salvamento da mensagem." + +#: classes/Notice.php:850 #, php-format msgid "DB error inserting reply: %s" msgstr "Erro no banco de dados na inserção da reposta: %s" -#: classes/Notice.php:1441 +#: classes/Notice.php:1233 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -4457,124 +4517,124 @@ msgstr "%1$s - %2$s" msgid "Untitled page" msgstr "Página sem título" -#: lib/action.php:427 +#: lib/action.php:433 msgid "Primary site navigation" msgstr "Navegação primária no site" -#: lib/action.php:433 +#: lib/action.php:439 msgid "Home" msgstr "Início" -#: lib/action.php:433 +#: lib/action.php:439 msgid "Personal profile and friends timeline" msgstr "Perfil pessoal e fluxo de mensagens dos amigos" -#: lib/action.php:435 +#: lib/action.php:441 msgid "Change your email, avatar, password, profile" msgstr "Mude seu e-mail, avatar, senha, perfil" -#: lib/action.php:438 +#: lib/action.php:444 msgid "Connect" msgstr "Conectar" -#: lib/action.php:438 +#: lib/action.php:444 msgid "Connect to services" msgstr "Conecte-se a outros serviços" -#: lib/action.php:442 +#: lib/action.php:448 msgid "Change site configuration" msgstr "Mude as configurações do site" -#: lib/action.php:446 lib/subgroupnav.php:105 +#: lib/action.php:452 lib/subgroupnav.php:105 msgid "Invite" msgstr "Convidar" -#: lib/action.php:447 lib/subgroupnav.php:106 +#: lib/action.php:453 lib/subgroupnav.php:106 #, php-format msgid "Invite friends and colleagues to join you on %s" msgstr "Convide seus amigos e colegas para unir-se a você no %s" -#: lib/action.php:452 +#: lib/action.php:458 msgid "Logout" msgstr "Sair" -#: lib/action.php:452 +#: lib/action.php:458 msgid "Logout from the site" msgstr "Sai do site" -#: lib/action.php:457 +#: lib/action.php:463 msgid "Create an account" msgstr "Cria uma conta" -#: lib/action.php:460 +#: lib/action.php:466 msgid "Login to the site" msgstr "Autentique-se no site" -#: lib/action.php:463 lib/action.php:726 +#: lib/action.php:469 lib/action.php:732 msgid "Help" msgstr "Ajuda" -#: lib/action.php:463 +#: lib/action.php:469 msgid "Help me!" msgstr "Ajudem-me!" -#: lib/action.php:466 lib/searchaction.php:127 +#: lib/action.php:472 lib/searchaction.php:127 msgid "Search" msgstr "Procurar" -#: lib/action.php:466 +#: lib/action.php:472 msgid "Search for people or text" msgstr "Procura por pessoas ou textos" -#: lib/action.php:487 +#: lib/action.php:493 msgid "Site notice" msgstr "Mensagem do site" -#: lib/action.php:553 +#: lib/action.php:559 msgid "Local views" msgstr "Visualizações locais" -#: lib/action.php:619 +#: lib/action.php:625 msgid "Page notice" msgstr "Notícia da página" -#: lib/action.php:721 +#: lib/action.php:727 msgid "Secondary site navigation" msgstr "Navegação secundária no site" -#: lib/action.php:728 +#: lib/action.php:734 msgid "About" msgstr "Sobre" -#: lib/action.php:730 +#: lib/action.php:736 msgid "FAQ" msgstr "FAQ" -#: lib/action.php:734 +#: lib/action.php:740 msgid "TOS" msgstr "Termos de uso" -#: lib/action.php:737 +#: lib/action.php:743 msgid "Privacy" msgstr "Privacidade" -#: lib/action.php:739 +#: lib/action.php:745 msgid "Source" msgstr "Fonte" -#: lib/action.php:743 +#: lib/action.php:749 msgid "Contact" msgstr "Contato" -#: lib/action.php:745 +#: lib/action.php:751 msgid "Badge" msgstr "Mini-aplicativo" -#: lib/action.php:773 +#: lib/action.php:779 msgid "StatusNet software license" msgstr "Licença do software StatusNet" -#: lib/action.php:776 +#: lib/action.php:782 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -4583,12 +4643,12 @@ msgstr "" "**%%site.name%%** é um serviço de microblog disponibilizado por [%%site." "broughtby%%](%%site.broughtbyurl%%). " -#: lib/action.php:778 +#: lib/action.php:784 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "**%%site.name%%** é um serviço de microblog. " -#: lib/action.php:780 +#: lib/action.php:786 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4599,41 +4659,43 @@ msgstr "" "versão %s, disponível sob a [GNU Affero General Public License] (http://www." "fsf.org/licensing/licenses/agpl-3.0.html)." -#: lib/action.php:795 +#: lib/action.php:801 msgid "Site content license" msgstr "Licença do conteúdo do site" -#: lib/action.php:800 +#: lib/action.php:806 #, php-format msgid "Content and data of %1$s are private and confidential." -msgstr "" +msgstr "O conteúdo e os dados de %1$s são privados e confidenciais." -#: lib/action.php:805 +#: lib/action.php:811 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." -msgstr "" +msgstr "Conteúdo e dados licenciados sob %1$s. Todos os direitos reservados." -#: lib/action.php:808 +#: lib/action.php:814 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" +"Conteúdo e dados licenciados pelos colaboradores. Todos os direitos " +"reservados." -#: lib/action.php:820 +#: lib/action.php:826 msgid "All " msgstr "Todas " -#: lib/action.php:825 +#: lib/action.php:831 msgid "license." msgstr "licença." -#: lib/action.php:1124 +#: lib/action.php:1130 msgid "Pagination" msgstr "Paginação" -#: lib/action.php:1133 +#: lib/action.php:1139 msgid "After" msgstr "Próximo" -#: lib/action.php:1141 +#: lib/action.php:1147 msgid "Before" msgstr "Anterior" @@ -4665,10 +4727,24 @@ msgstr "Configuração básica do site" msgid "Design configuration" msgstr "Configuração da aparência" -#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327 +#: lib/adminpanelaction.php:322 +#, fuzzy +msgid "User configuration" +msgstr "Configuração dos caminhos" + +#: lib/adminpanelaction.php:327 +#, fuzzy +msgid "Access configuration" +msgstr "Configuração da aparência" + +#: lib/adminpanelaction.php:332 msgid "Paths configuration" msgstr "Configuração dos caminhos" +#: lib/applicationeditform.php:136 +msgid "Edit application" +msgstr "Editar a aplicação" + #: lib/applicationeditform.php:186 msgid "Icon for this application" msgstr "Ícone para esta aplicação" @@ -5284,12 +5360,12 @@ msgstr "Mb" msgid "kB" msgstr "Kb" -#: lib/jabber.php:202 +#: lib/jabber.php:220 #, php-format msgid "[%s]" msgstr "[%s]" -#: lib/jabber.php:385 +#: lib/jabber.php:400 #, php-format msgid "Unknown inbox source %d." msgstr "Fonte da caixa de entrada desconhecida %d." @@ -5790,19 +5866,19 @@ msgstr "Respostas" msgid "Favorites" msgstr "Favoritas" -#: lib/personalgroupnav.php:124 +#: lib/personalgroupnav.php:125 msgid "Inbox" msgstr "Recebidas" -#: lib/personalgroupnav.php:125 +#: lib/personalgroupnav.php:126 msgid "Your incoming messages" msgstr "Suas mensagens recebidas" -#: lib/personalgroupnav.php:129 +#: lib/personalgroupnav.php:130 msgid "Outbox" msgstr "Enviadas" -#: lib/personalgroupnav.php:130 +#: lib/personalgroupnav.php:131 msgid "Your sent messages" msgstr "Suas mensagens enviadas" @@ -6044,47 +6120,47 @@ msgstr "Mensagem" msgid "Moderate" msgstr "Moderar" -#: lib/util.php:875 +#: lib/util.php:868 msgid "a few seconds ago" msgstr "alguns segundos atrás" -#: lib/util.php:877 +#: lib/util.php:870 msgid "about a minute ago" msgstr "cerca de 1 minuto atrás" -#: lib/util.php:879 +#: lib/util.php:872 #, php-format msgid "about %d minutes ago" msgstr "cerca de %d minutos atrás" -#: lib/util.php:881 +#: lib/util.php:874 msgid "about an hour ago" msgstr "cerca de 1 hora atrás" -#: lib/util.php:883 +#: lib/util.php:876 #, php-format msgid "about %d hours ago" msgstr "cerca de %d horas atrás" -#: lib/util.php:885 +#: lib/util.php:878 msgid "about a day ago" msgstr "cerca de 1 dia atrás" -#: lib/util.php:887 +#: lib/util.php:880 #, php-format msgid "about %d days ago" msgstr "cerca de %d dias atrás" -#: lib/util.php:889 +#: lib/util.php:882 msgid "about a month ago" msgstr "cerca de 1 mês atrás" -#: lib/util.php:891 +#: lib/util.php:884 #, php-format msgid "about %d months ago" msgstr "cerca de %d meses atrás" -#: lib/util.php:893 +#: lib/util.php:886 msgid "about a year ago" msgstr "cerca de 1 ano atrás" @@ -6098,7 +6174,7 @@ msgstr "%s não é uma cor válida!" msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "%s não é uma cor válida! Utilize 3 ou 6 caracteres hexadecimais." -#: scripts/xmppdaemon.php:301 +#: lib/xmppmanager.php:402 #, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" diff --git a/locale/ru/LC_MESSAGES/statusnet.po b/locale/ru/LC_MESSAGES/statusnet.po index d95566fdf9..cd58abacb5 100644 --- a/locale/ru/LC_MESSAGES/statusnet.po +++ b/locale/ru/LC_MESSAGES/statusnet.po @@ -11,18 +11,73 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-21 22:36+0000\n" -"PO-Revision-Date: 2010-01-21 22:38:23+0000\n" +"POT-Creation-Date: 2010-01-27 23:58+0000\n" +"PO-Revision-Date: 2010-01-27 23:59:43+0000\n" "Language-Team: Russian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r61339); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61595); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ru\n" "X-Message-Group: out-statusnet\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" "10< =4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +#: actions/accessadminpanel.php:54 lib/adminpanelaction.php:326 +msgid "Access" +msgstr "Принять" + +#: actions/accessadminpanel.php:65 +#, fuzzy +msgid "Site access settings" +msgstr "Сохранить настройки сайта" + +#: actions/accessadminpanel.php:158 +#, fuzzy +msgid "Registration" +msgstr "Регистрация" + +#: actions/accessadminpanel.php:161 +msgid "Private" +msgstr "Личное" + +#: actions/accessadminpanel.php:163 +msgid "Prohibit anonymous users (not logged in) from viewing site?" +msgstr "" +"Запретить анонимным (не авторизовавшимся) пользователям просматривать сайт?" + +#: actions/accessadminpanel.php:167 +msgid "Invite only" +msgstr "Только по приглашениям" + +#: actions/accessadminpanel.php:169 +msgid "Make registration invitation only." +msgstr "Разрешить регистрацию только по приглашениям." + +#: actions/accessadminpanel.php:173 +msgid "Closed" +msgstr "Закрыта" + +#: actions/accessadminpanel.php:175 +msgid "Disable new registrations." +msgstr "Отключить новые регистрации." + +#: actions/accessadminpanel.php:189 actions/designadminpanel.php:586 +#: actions/emailsettings.php:195 actions/imsettings.php:163 +#: actions/othersettings.php:126 actions/pathsadminpanel.php:351 +#: actions/profilesettings.php:174 actions/siteadminpanel.php:336 +#: actions/smssettings.php:181 actions/subscriptions.php:203 +#: actions/tagother.php:154 actions/useradminpanel.php:313 +#: lib/applicationeditform.php:335 lib/applicationeditform.php:336 +#: lib/designsettings.php:256 lib/groupeditform.php:202 +msgid "Save" +msgstr "Сохранить" + +#: actions/accessadminpanel.php:189 +#, fuzzy +msgid "Save access settings" +msgstr "Сохранить настройки сайта" + #: actions/all.php:63 actions/public.php:97 actions/replies.php:92 #: actions/showfavorites.php:137 actions/tag.php:51 msgid "No such page" @@ -37,7 +92,7 @@ msgstr "Нет такой страницы" #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:149 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 @@ -55,9 +110,9 @@ msgid "No such user." msgstr "Нет такого пользователя." #: actions/all.php:84 -#, fuzzy, php-format +#, php-format msgid "%1$s and friends, page %2$d" -msgstr "Заблокированные профили %1$s, страница %2$d" +msgstr "%1$s и друзья, страница %2$d" #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 #: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 @@ -143,8 +198,7 @@ msgstr "Обновлено от %1$s и его друзей на %2$s!" #: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 #: actions/apitimelinefriends.php:155 actions/apitimelinegroup.php:150 #: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 -#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found." @@ -160,7 +214,7 @@ msgstr "Метод API не найден." #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:119 +#: actions/apistatusesupdate.php:118 msgid "This method requires a POST." msgstr "Этот метод требует POST." @@ -189,7 +243,7 @@ msgstr "Не удаётся сохранить профиль." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:132 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 #: actions/designadminpanel.php:122 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -433,7 +487,7 @@ msgstr "группы на %s" #: actions/apioauthauthorize.php:108 actions/apioauthauthorize.php:114 msgid "Bad request." -msgstr "" +msgstr "Неверный запрос." #: actions/apioauthauthorize.php:134 actions/avatarsettings.php:268 #: actions/deletenotice.php:157 actions/disfavor.php:74 @@ -458,14 +512,12 @@ msgid "Invalid nickname / password!" msgstr "Неверное имя или пароль." #: actions/apioauthauthorize.php:170 -#, fuzzy msgid "DB error deleting OAuth app user." -msgstr "Ошибка в установках пользователя." +msgstr "Ошибка базы данных при удалении пользователя приложения OAuth." #: actions/apioauthauthorize.php:196 -#, fuzzy msgid "DB error inserting OAuth app user." -msgstr "Ошибка баз данных при вставке хеш-тегов для %s" +msgstr "Ошибка базы данных при добавлении пользователя приложения OAuth." #: actions/apioauthauthorize.php:231 #, php-format @@ -473,11 +525,12 @@ msgid "" "The request token %s has been authorized. Please exchange it for an access " "token." msgstr "" +"Ключ запроса %s авторизован. Пожалуйста, обменяйте его на ключ доступа." #: actions/apioauthauthorize.php:241 #, php-format msgid "The request token %s has been denied." -msgstr "" +msgstr "Ключ запроса %s отклонён." #: actions/apioauthauthorize.php:246 actions/avatarsettings.php:281 #: actions/designadminpanel.php:103 actions/editapplication.php:139 @@ -490,13 +543,20 @@ msgstr "Нетиповое подтверждение формы." #: actions/apioauthauthorize.php:273 msgid "An application would like to connect to your account" -msgstr "" +msgstr "Приложение хочет соединиться с вашей учётной записью" #: actions/apioauthauthorize.php:290 msgid "Allow or deny access" msgstr "Разрешить или запретить доступ" -#: actions/apioauthauthorize.php:320 lib/action.php:435 +#: actions/apioauthauthorize.php:306 +#, php-format +msgid "" +"The application %s by %s would like the " +"ability to %s your account data." +msgstr "" + +#: actions/apioauthauthorize.php:320 lib/action.php:441 msgid "Account" msgstr "Настройки" @@ -553,17 +613,17 @@ msgstr "Статус удалён." msgid "No status with that ID found." msgstr "Не найдено статуса с таким ID." -#: actions/apistatusesupdate.php:162 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Слишком длинная запись. Максимальная длина — %d знаков." -#: actions/apistatusesupdate.php:203 +#: actions/apistatusesupdate.php:202 msgid "Not found" msgstr "Не найдено" -#: actions/apistatusesupdate.php:226 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "Максимальная длина записи — %d символов, включая URL вложения." @@ -614,11 +674,6 @@ msgstr "Общая лента %s" msgid "%s updates from everyone!" msgstr "Обновления %s от всех!" -#: actions/apitimelineretweetedbyme.php:112 -#, php-format -msgid "Repeated by %s" -msgstr "Повторено %s" - #: actions/apitimelineretweetedtome.php:111 #, php-format msgid "Repeated to %s" @@ -1027,17 +1082,6 @@ msgstr "Восстановить оформление по умолчанию" msgid "Reset back to default" msgstr "Восстановить значения по умолчанию" -#: actions/designadminpanel.php:586 actions/emailsettings.php:195 -#: actions/imsettings.php:163 actions/othersettings.php:126 -#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174 -#: actions/siteadminpanel.php:388 actions/smssettings.php:181 -#: actions/subscriptions.php:203 actions/tagother.php:154 -#: actions/useradminpanel.php:313 lib/applicationeditform.php:335 -#: lib/applicationeditform.php:336 lib/designsettings.php:256 -#: lib/groupeditform.php:202 -msgid "Save" -msgstr "Сохранить" - #: actions/designadminpanel.php:587 lib/designsettings.php:257 msgid "Save design" msgstr "Сохранить оформление" @@ -1050,39 +1094,37 @@ msgstr "Эта запись не входит в число ваших люби msgid "Add to favorites" msgstr "Добавить в любимые" -#: actions/doc.php:69 -msgid "No such document." +#: actions/doc.php:155 +#, fuzzy, php-format +msgid "No such document \"%s\"" msgstr "Нет такого документа." -#: actions/editapplication.php:54 lib/applicationeditform.php:136 -msgid "Edit application" -msgstr "" +#: actions/editapplication.php:54 +#, fuzzy +msgid "Edit Application" +msgstr "Изменить приложение" #: actions/editapplication.php:66 -#, fuzzy msgid "You must be logged in to edit an application." -msgstr "Вы должны авторизоваться, чтобы изменить группу." +msgstr "Вы должны авторизоваться, чтобы изменить приложение." #: actions/editapplication.php:77 actions/showapplication.php:94 -#, fuzzy msgid "You are not the owner of this application." -msgstr "Вы не являетесь членом этой группы." +msgstr "Вы не являетесь владельцем этого приложения." #: actions/editapplication.php:81 actions/oauthconnectionssettings.php:163 #: actions/showapplication.php:87 -#, fuzzy msgid "No such application." -msgstr "Нет такой записи." +msgstr "Нет такого приложения." #: actions/editapplication.php:127 actions/newapplication.php:110 -#: actions/showapplication.php:118 lib/action.php:1189 +#: actions/showapplication.php:118 lib/action.php:1195 msgid "There was a problem with your session token." msgstr "Проблема с Вашей сессией. Попробуйте ещё раз, пожалуйста." #: actions/editapplication.php:161 -#, fuzzy msgid "Use this form to edit your application." -msgstr "Заполните информацию о группе в следующие поля" +msgstr "Воспользуйтесь этой формой, чтобы изменить приложение." #: actions/editapplication.php:177 actions/newapplication.php:159 msgid "Name is required." @@ -1098,21 +1140,19 @@ msgstr "Описание обязательно." #: actions/editapplication.php:191 msgid "Source URL is too long." -msgstr "" +msgstr "URL источника слишком длинный." #: actions/editapplication.php:197 actions/newapplication.php:182 -#, fuzzy msgid "Source URL is not valid." -msgstr "URL аватары «%s» недействителен." +msgstr "URL источника недействителен." #: actions/editapplication.php:200 actions/newapplication.php:185 msgid "Organization is required." -msgstr "" +msgstr "Организация обязательна." #: actions/editapplication.php:203 actions/newapplication.php:188 -#, fuzzy msgid "Organization is too long (max 255 chars)." -msgstr "Слишком длинное месторасположение (максимум 255 знаков)." +msgstr "Слишком длинное название организации (максимум 255 знаков)." #: actions/editapplication.php:206 actions/newapplication.php:191 msgid "Organization homepage is required." @@ -1120,17 +1160,15 @@ msgstr "Домашняя страница организации обязате #: actions/editapplication.php:215 actions/newapplication.php:203 msgid "Callback is too long." -msgstr "" +msgstr "Обратный вызов слишком длинный." #: actions/editapplication.php:222 actions/newapplication.php:212 -#, fuzzy msgid "Callback URL is not valid." -msgstr "URL аватары «%s» недействителен." +msgstr "URL-адрес обратного вызова недействителен." #: actions/editapplication.php:255 -#, fuzzy msgid "Could not update application." -msgstr "Не удаётся обновить информацию о группе." +msgstr "Не удаётся обновить приложение." #: actions/editgroup.php:56 #, php-format @@ -1291,7 +1329,7 @@ msgid "Cannot normalize that email address" msgstr "Не удаётся стандартизировать этот электронный адрес" #: actions/emailsettings.php:331 actions/register.php:201 -#: actions/siteadminpanel.php:157 +#: actions/siteadminpanel.php:143 msgid "Not a valid email address." msgstr "Неверный электронный адрес." @@ -1303,7 +1341,7 @@ msgstr "Это уже Ваш электронный адрес." msgid "That email address already belongs to another user." msgstr "Этот электронный адрес уже задействован другим пользователем." -#: actions/emailsettings.php:353 actions/imsettings.php:317 +#: actions/emailsettings.php:353 actions/imsettings.php:319 #: actions/smssettings.php:337 msgid "Couldn't insert confirmation code." msgstr "Не удаётся вставить код подтверждения." @@ -1611,7 +1649,7 @@ msgstr "Участники группы %1$s, страница %2$d" msgid "A list of the users in this group." msgstr "Список пользователей, являющихся членами этой группы." -#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107 +#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107 msgid "Admin" msgstr "Настройки" @@ -1808,6 +1846,11 @@ msgstr "" msgid "That is not your Jabber ID." msgstr "Это не Ваш Jabber ID." +#: actions/inbox.php:59 +#, fuzzy, php-format +msgid "Inbox for %1$s - page %2$d" +msgstr "Входящие для %s" + #: actions/inbox.php:62 #, php-format msgid "Inbox for %s" @@ -1816,7 +1859,8 @@ msgstr "Входящие для %s" #: actions/inbox.php:115 msgid "This is your inbox, which lists your incoming private messages." msgstr "" -"Это Ваши входящие сообщения, где перечислены входящие приватные сообщения." +"Это ваш ящик входящих сообщений, в котором хранятся поступившие личные " +"сообщения." #: actions/invite.php:39 msgid "Invites have been disabled." @@ -1873,7 +1917,7 @@ msgstr "" #: actions/invite.php:162 msgid "" "Use this form to invite your friends and colleagues to use this service." -msgstr "В этой форме ты можешь пригласить друзей и коллег на этот сервис." +msgstr "В этой форме вы можете пригласить друзей и коллег на этот сервис." #: actions/invite.php:187 msgid "Email addresses" @@ -1881,7 +1925,7 @@ msgstr "Почтовый адрес" #: actions/invite.php:189 msgid "Addresses of friends to invite (one per line)" -msgstr "Адреса друзей, которых ты хочешь пригласить (по одному на строчку)" +msgstr "Адреса друзей, которых вы хотите пригласить (по одному на строчку)" #: actions/invite.php:192 msgid "Personal message" @@ -1991,7 +2035,7 @@ msgstr "Некорректное имя или пароль." msgid "Error setting user. You are probably not authorized." msgstr "Ошибка установки пользователя. Вы, вероятно, не авторизованы." -#: actions/login.php:188 actions/login.php:241 lib/action.php:460 +#: actions/login.php:188 actions/login.php:241 lib/action.php:466 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Вход" @@ -2054,27 +2098,25 @@ msgid "No current status" msgstr "Нет текущего статуса" #: actions/newapplication.php:52 -msgid "New application" -msgstr "" +#, fuzzy +msgid "New Application" +msgstr "Новое приложение" #: actions/newapplication.php:64 -#, fuzzy msgid "You must be logged in to register an application." -msgstr "Вы должны авторизоваться, чтобы создать новую группу." +msgstr "Вы должны авторизоваться, чтобы зарегистрировать приложение." #: actions/newapplication.php:143 -#, fuzzy msgid "Use this form to register a new application." -msgstr "Используйте эту форму для создания новой группы." +msgstr "Используйте эту форму для создания нового приложения." #: actions/newapplication.php:173 msgid "Source URL is required." msgstr "URL источника обязателен." #: actions/newapplication.php:255 actions/newapplication.php:264 -#, fuzzy msgid "Could not create application." -msgstr "Не удаётся создать алиасы." +msgstr "Не удаётся создать приложение." #: actions/newgroup.php:53 msgid "New group" @@ -2189,49 +2231,46 @@ msgid "Nudge sent!" msgstr "«Подталкивание» отправлено!" #: actions/oauthappssettings.php:59 -#, fuzzy msgid "You must be logged in to list your applications." -msgstr "Вы должны авторизоваться, чтобы изменить группу." +msgstr "Вы должны авторизоваться, чтобы просматривать свои приложения." #: actions/oauthappssettings.php:74 -#, fuzzy msgid "OAuth applications" -msgstr "Другие опции" +msgstr "Приложения OAuth" #: actions/oauthappssettings.php:85 msgid "Applications you have registered" -msgstr "" +msgstr "Приложения, которые вы зарегистрировали" #: actions/oauthappssettings.php:135 #, php-format msgid "You have not registered any applications yet." -msgstr "" +msgstr "Вы пока не зарегистрировали ни одного приложения." #: actions/oauthconnectionssettings.php:71 msgid "Connected applications" -msgstr "" +msgstr "Подключённые приложения" #: actions/oauthconnectionssettings.php:87 msgid "You have allowed the following applications to access you account." -msgstr "" +msgstr "Вы разрешили доступ к учётной записи следующим приложениям." #: actions/oauthconnectionssettings.php:170 -#, fuzzy msgid "You are not a user of that application." -msgstr "Вы не являетесь членом этой группы." +msgstr "Вы не являетесь пользователем этого приложения." #: actions/oauthconnectionssettings.php:180 msgid "Unable to revoke access for app: " -msgstr "" +msgstr "Не удаётся отозвать права для приложения: " #: actions/oauthconnectionssettings.php:192 #, php-format msgid "You have not authorized any applications to use your account." -msgstr "" +msgstr "Вы не разрешили приложениям использовать вашу учётную запись." #: actions/oauthconnectionssettings.php:205 msgid "Developers can edit the registration settings for their applications " -msgstr "" +msgstr "Разработчики могут изменять настройки регистрации своих приложений " #: actions/oembed.php:79 actions/shownotice.php:100 msgid "Notice has no profile" @@ -2250,8 +2289,8 @@ msgstr "тип содержимого " msgid "Only " msgstr "Только " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1038 -#: lib/api.php:1066 lib/api.php:1176 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1039 +#: lib/api.php:1067 lib/api.php:1177 msgid "Not a supported data format." msgstr "Неподдерживаемый формат данных." @@ -2264,7 +2303,6 @@ msgid "Notice Search" msgstr "Поиск в записях" #: actions/othersettings.php:60 -#, fuzzy msgid "Other settings" msgstr "Другие настройки" @@ -2301,24 +2339,25 @@ msgid "No user ID specified." msgstr "Не указан идентификатор пользователя." #: actions/otp.php:83 -#, fuzzy msgid "No login token specified." -msgstr "Не указана запись." +msgstr "Не указан ключ для входа." #: actions/otp.php:90 -#, fuzzy msgid "No login token requested." -msgstr "Нет ID профиля в запросе." +msgstr "Ключ для входа не был запрошен." #: actions/otp.php:95 -#, fuzzy msgid "Invalid login token specified." -msgstr "Неверный или устаревший ключ." +msgstr "Задан неверный ключ для входа." #: actions/otp.php:104 -#, fuzzy msgid "Login token expired." -msgstr "Авторизоваться" +msgstr "Срок действия ключа для входа истёк." + +#: actions/outbox.php:58 +#, fuzzy, php-format +msgid "Outbox for %1$s - page %2$d" +msgstr "Исходящие для %s" #: actions/outbox.php:61 #, php-format @@ -2392,7 +2431,7 @@ msgstr "Не удаётся сохранить новый пароль." msgid "Password saved." msgstr "Пароль сохранён." -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:331 msgid "Paths" msgstr "Пути" @@ -2400,132 +2439,148 @@ msgstr "Пути" msgid "Path and server settings for this StatusNet site." msgstr "Настройки путей и серверов для этого сайта StatusNet." -#: actions/pathsadminpanel.php:140 +#: actions/pathsadminpanel.php:157 #, php-format msgid "Theme directory not readable: %s" msgstr "Директория тем недоступна для чтения: %s" -#: actions/pathsadminpanel.php:146 +#: actions/pathsadminpanel.php:163 #, php-format msgid "Avatar directory not writable: %s" msgstr "Директория аватар не доступна для записи: %s" -#: actions/pathsadminpanel.php:152 +#: actions/pathsadminpanel.php:169 #, php-format msgid "Background directory not writable: %s" msgstr "Директория фоновых изображений не доступна для записи: %s" -#: actions/pathsadminpanel.php:160 +#: actions/pathsadminpanel.php:177 #, php-format msgid "Locales directory not readable: %s" msgstr "Директория локализаций не доступна для чтения: %s" -#: actions/pathsadminpanel.php:166 +#: actions/pathsadminpanel.php:183 msgid "Invalid SSL server. The maximum length is 255 characters." msgstr "Неверный SSL-сервер. Максимальная длина составляет 255 символов." -#: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58 +#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58 #: lib/adminpanelaction.php:311 msgid "Site" msgstr "Сайт" -#: actions/pathsadminpanel.php:221 +#: actions/pathsadminpanel.php:238 +msgid "Server" +msgstr "Сервер" + +#: actions/pathsadminpanel.php:238 +msgid "Site's server hostname." +msgstr "Имя хоста сервера сайта." + +#: actions/pathsadminpanel.php:242 msgid "Path" msgstr "Путь" -#: actions/pathsadminpanel.php:221 +#: actions/pathsadminpanel.php:242 msgid "Site path" msgstr "Путь к сайту" -#: actions/pathsadminpanel.php:225 +#: actions/pathsadminpanel.php:246 msgid "Path to locales" msgstr "Пусть к локализациям" -#: actions/pathsadminpanel.php:225 +#: actions/pathsadminpanel.php:246 msgid "Directory path to locales" msgstr "Путь к директории локализаций" -#: actions/pathsadminpanel.php:232 +#: actions/pathsadminpanel.php:250 +msgid "Fancy URLs" +msgstr "Короткие URL" + +#: actions/pathsadminpanel.php:252 +msgid "Use fancy (more readable and memorable) URLs?" +msgstr "Использовать ли короткие (более читаемые и запоминаемые) URL-адреса?" + +#: actions/pathsadminpanel.php:259 msgid "Theme" msgstr "Тема" -#: actions/pathsadminpanel.php:237 +#: actions/pathsadminpanel.php:264 msgid "Theme server" msgstr "Сервер темы" -#: actions/pathsadminpanel.php:241 +#: actions/pathsadminpanel.php:268 msgid "Theme path" msgstr "Путь темы" -#: actions/pathsadminpanel.php:245 +#: actions/pathsadminpanel.php:272 msgid "Theme directory" msgstr "Директория темы" -#: actions/pathsadminpanel.php:252 +#: actions/pathsadminpanel.php:279 msgid "Avatars" msgstr "Аватары" -#: actions/pathsadminpanel.php:257 +#: actions/pathsadminpanel.php:284 msgid "Avatar server" msgstr "Сервер аватар" -#: actions/pathsadminpanel.php:261 +#: actions/pathsadminpanel.php:288 msgid "Avatar path" msgstr "Путь к аватарам" -#: actions/pathsadminpanel.php:265 +#: actions/pathsadminpanel.php:292 msgid "Avatar directory" msgstr "Директория аватар" -#: actions/pathsadminpanel.php:274 +#: actions/pathsadminpanel.php:301 msgid "Backgrounds" msgstr "Фоновые изображения" -#: actions/pathsadminpanel.php:278 +#: actions/pathsadminpanel.php:305 msgid "Background server" msgstr "Сервер фонового изображения" -#: actions/pathsadminpanel.php:282 +#: actions/pathsadminpanel.php:309 msgid "Background path" msgstr "Путь к фоновому изображению" -#: actions/pathsadminpanel.php:286 +#: actions/pathsadminpanel.php:313 msgid "Background directory" msgstr "Директория фонового изображения" -#: actions/pathsadminpanel.php:293 +#: actions/pathsadminpanel.php:320 msgid "SSL" msgstr "SSL" -#: actions/pathsadminpanel.php:296 actions/siteadminpanel.php:346 +#: actions/pathsadminpanel.php:323 actions/siteadminpanel.php:294 msgid "Never" msgstr "Никогда" -#: actions/pathsadminpanel.php:297 +#: actions/pathsadminpanel.php:324 msgid "Sometimes" msgstr "Иногда" -#: actions/pathsadminpanel.php:298 +#: actions/pathsadminpanel.php:325 msgid "Always" msgstr "Всегда" -#: actions/pathsadminpanel.php:302 +#: actions/pathsadminpanel.php:329 msgid "Use SSL" msgstr "Использовать SSL" -#: actions/pathsadminpanel.php:303 +#: actions/pathsadminpanel.php:330 msgid "When to use SSL" msgstr "Когда использовать SSL" -#: actions/pathsadminpanel.php:308 +#: actions/pathsadminpanel.php:335 msgid "SSL server" msgstr "SSL-сервер" -#: actions/pathsadminpanel.php:309 +#: actions/pathsadminpanel.php:336 msgid "Server to direct SSL requests to" msgstr "Сервер, которому направлять SSL-запросы" -#: actions/pathsadminpanel.php:325 +#: actions/pathsadminpanel.php:352 msgid "Save paths" msgstr "Сохранить пути" @@ -2636,7 +2691,7 @@ msgstr "" "Теги для самого себя (буквы, цифры, -, ., и _), разделенные запятой или " "пробелом" -#: actions/profilesettings.php:151 actions/siteadminpanel.php:294 +#: actions/profilesettings.php:151 actions/siteadminpanel.php:280 msgid "Language" msgstr "Язык" @@ -2662,7 +2717,7 @@ msgstr "Автоматически подписываться на всех, к msgid "Bio is too long (max %d chars)." msgstr "Слишком длинная биография (максимум %d символов)." -#: actions/profilesettings.php:235 actions/siteadminpanel.php:164 +#: actions/profilesettings.php:235 actions/siteadminpanel.php:150 msgid "Timezone not selected." msgstr "Часовой пояс не выбран." @@ -2936,7 +2991,7 @@ msgstr "Извините, неверный пригласительный код msgid "Registration successful" msgstr "Регистрация успешна!" -#: actions/register.php:114 actions/register.php:503 lib/action.php:457 +#: actions/register.php:114 actions/register.php:503 lib/action.php:463 #: lib/logingroupnav.php:85 msgid "Register" msgstr "Регистрация" @@ -2983,7 +3038,7 @@ msgid "Same as password above. Required." msgstr "Тот же пароль что и сверху. Обязательное поле." #: actions/register.php:438 actions/register.php:442 -#: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120 +#: actions/siteadminpanel.php:256 lib/accountsettingsaction.php:120 msgid "Email" msgstr "Email" @@ -3138,6 +3193,11 @@ msgstr "Повторено!" msgid "Replies to %s" msgstr "Ответы для %s" +#: actions/replies.php:127 +#, fuzzy, php-format +msgid "Replies to %1$s, page %2$d" +msgstr "Ответы на записи %1$s на %2$s!" + #: actions/replies.php:144 #, php-format msgid "Replies feed for %s (RSS 1.0)" @@ -3195,18 +3255,16 @@ msgid "User is already sandboxed." msgstr "Пользователь уже в режиме песочницы." #: actions/showapplication.php:82 -#, fuzzy msgid "You must be logged in to view an application." -msgstr "Вы должны авторизоваться, чтобы покинуть группу." +msgstr "Вы должны авторизоваться, чтобы просматривать приложения." #: actions/showapplication.php:158 -#, fuzzy msgid "Application profile" -msgstr "Запись без профиля" +msgstr "Профиль приложения" #: actions/showapplication.php:160 lib/applicationeditform.php:182 msgid "Icon" -msgstr "" +msgstr "Иконка" #: actions/showapplication.php:170 actions/version.php:195 #: lib/applicationeditform.php:197 @@ -3230,46 +3288,52 @@ msgstr "Статистика" #: actions/showapplication.php:204 #, php-format msgid "created by %1$s - %2$s access by default - %3$d users" -msgstr "" +msgstr "создано %1$s — %2$s доступ по умолчанию — %3$d польз." #: actions/showapplication.php:214 msgid "Application actions" -msgstr "" +msgstr "Действия приложения" #: actions/showapplication.php:233 msgid "Reset key & secret" -msgstr "" +msgstr "Сбросить ключ и секретную фразу" #: actions/showapplication.php:241 msgid "Application info" -msgstr "" +msgstr "Информация о приложении" #: actions/showapplication.php:243 msgid "Consumer key" -msgstr "" +msgstr "Потребительский ключ" #: actions/showapplication.php:248 msgid "Consumer secret" -msgstr "" +msgstr "Секретная фраза потребителя" #: actions/showapplication.php:253 msgid "Request token URL" -msgstr "" +msgstr "URL ключа запроса" #: actions/showapplication.php:258 msgid "Access token URL" -msgstr "" +msgstr "URL ключа доступа" #: actions/showapplication.php:263 -#, fuzzy msgid "Authorize URL" -msgstr "Автор" +msgstr "URL авторизации" #: actions/showapplication.php:268 msgid "" "Note: We support HMAC-SHA1 signatures. We do not support the plaintext " "signature method." msgstr "" +"Примечание: Мы поддерживаем подписи HMAC-SHA1. Мы не поддерживаем метод " +"подписи открытым текстом." + +#: actions/showfavorites.php:79 +#, fuzzy, php-format +msgid "%1$s's favorite notices, page %2$d" +msgstr "Любимые записи %s" #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." @@ -3327,6 +3391,11 @@ msgstr "Это способ разделить то, что вам нравит msgid "%s group" msgstr "Группа %s" +#: actions/showgroup.php:84 +#, fuzzy, php-format +msgid "%1$s group, page %2$d" +msgstr "Участники группы %1$s, страница %2$d" + #: actions/showgroup.php:218 msgid "Group profile" msgstr "Профиль группы" @@ -3447,6 +3516,11 @@ msgstr "Запись удалена." msgid " tagged %s" msgstr " с тегом %s" +#: actions/showstream.php:79 +#, fuzzy, php-format +msgid "%1$s, page %2$d" +msgstr "%1$s и друзья, страница %2$d" + #: actions/showstream.php:122 #, php-format msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" @@ -3539,196 +3613,147 @@ msgstr "Пользователь уже заглушён." msgid "Basic settings for this StatusNet site." msgstr "Основные настройки для этого сайта StatusNet." -#: actions/siteadminpanel.php:146 +#: actions/siteadminpanel.php:132 msgid "Site name must have non-zero length." msgstr "Имя сайта должно быть ненулевой длины." -#: actions/siteadminpanel.php:154 +#: actions/siteadminpanel.php:140 msgid "You must have a valid contact email address." msgstr "У вас должен быть действительный контактный email-адрес." -#: actions/siteadminpanel.php:172 +#: actions/siteadminpanel.php:158 #, php-format msgid "Unknown language \"%s\"." msgstr "Неизвестный язык «%s»." -#: actions/siteadminpanel.php:179 +#: actions/siteadminpanel.php:165 msgid "Invalid snapshot report URL." msgstr "Неверный URL отчёта снимка." -#: actions/siteadminpanel.php:185 +#: actions/siteadminpanel.php:171 msgid "Invalid snapshot run value." msgstr "Неверное значение запуска снимка." -#: actions/siteadminpanel.php:191 +#: actions/siteadminpanel.php:177 msgid "Snapshot frequency must be a number." msgstr "Частота снимков должна быть числом." -#: actions/siteadminpanel.php:197 +#: actions/siteadminpanel.php:183 msgid "Minimum text limit is 140 characters." msgstr "Минимальное ограничение текста составляет 140 символов." -#: actions/siteadminpanel.php:203 +#: actions/siteadminpanel.php:189 msgid "Dupe limit must 1 or more seconds." msgstr "Ограничение дублирования должно составлять 1 или более секунд." -#: actions/siteadminpanel.php:253 +#: actions/siteadminpanel.php:239 msgid "General" msgstr "Базовые" -#: actions/siteadminpanel.php:256 +#: actions/siteadminpanel.php:242 msgid "Site name" msgstr "Имя сайта" -#: actions/siteadminpanel.php:257 +#: actions/siteadminpanel.php:243 msgid "The name of your site, like \"Yourcompany Microblog\"" msgstr "Имя вашего сайта, например, «Yourcompany Microblog»" -#: actions/siteadminpanel.php:261 +#: actions/siteadminpanel.php:247 msgid "Brought by" msgstr "Предоставлено" -#: actions/siteadminpanel.php:262 +#: actions/siteadminpanel.php:248 msgid "Text used for credits link in footer of each page" msgstr "" "Текст, используемый для указания авторов в нижнем колонтитуле каждой страницы" -#: actions/siteadminpanel.php:266 +#: actions/siteadminpanel.php:252 msgid "Brought by URL" msgstr "URL-адрес поставщика услуг" -#: actions/siteadminpanel.php:267 +#: actions/siteadminpanel.php:253 msgid "URL used for credits link in footer of each page" msgstr "" "URL, используемый для ссылки на авторов в нижнем колонтитуле каждой страницы" -#: actions/siteadminpanel.php:271 +#: actions/siteadminpanel.php:257 msgid "Contact email address for your site" msgstr "Контактный email-адрес для вашего сайта" -#: actions/siteadminpanel.php:277 +#: actions/siteadminpanel.php:263 msgid "Local" msgstr "Внутренние настройки" -#: actions/siteadminpanel.php:288 +#: actions/siteadminpanel.php:274 msgid "Default timezone" msgstr "Часовой пояс по умолчанию" -#: actions/siteadminpanel.php:289 +#: actions/siteadminpanel.php:275 msgid "Default timezone for the site; usually UTC." msgstr "Часовой пояс по умолчанию для сайта; обычно UTC." -#: actions/siteadminpanel.php:295 +#: actions/siteadminpanel.php:281 msgid "Default site language" msgstr "Язык сайта по умолчанию" -#: actions/siteadminpanel.php:303 -msgid "URLs" -msgstr "URL-адреса" - -#: actions/siteadminpanel.php:306 -msgid "Server" -msgstr "Сервер" - -#: actions/siteadminpanel.php:306 -msgid "Site's server hostname." -msgstr "Имя хоста сервера сайта." - -#: actions/siteadminpanel.php:310 -msgid "Fancy URLs" -msgstr "Короткие URL" - -#: actions/siteadminpanel.php:312 -msgid "Use fancy (more readable and memorable) URLs?" -msgstr "Использовать ли короткие (более читаемые и запоминаемые) URL-адреса?" - -#: actions/siteadminpanel.php:318 -msgid "Access" -msgstr "Принять" - -#: actions/siteadminpanel.php:321 -msgid "Private" -msgstr "Личное" - -#: actions/siteadminpanel.php:323 -msgid "Prohibit anonymous users (not logged in) from viewing site?" -msgstr "" -"Запретить анонимным (не авторизовавшимся) пользователям просматривать сайт?" - -#: actions/siteadminpanel.php:327 -msgid "Invite only" -msgstr "Только по приглашениям" - -#: actions/siteadminpanel.php:329 -msgid "Make registration invitation only." -msgstr "Разрешить регистрацию только по приглашениям." - -#: actions/siteadminpanel.php:333 -msgid "Closed" -msgstr "Закрыта" - -#: actions/siteadminpanel.php:335 -msgid "Disable new registrations." -msgstr "Отключить новые регистрации." - -#: actions/siteadminpanel.php:341 +#: actions/siteadminpanel.php:289 msgid "Snapshots" msgstr "Снимки" -#: actions/siteadminpanel.php:344 +#: actions/siteadminpanel.php:292 msgid "Randomly during Web hit" msgstr "При случайном посещении" -#: actions/siteadminpanel.php:345 +#: actions/siteadminpanel.php:293 msgid "In a scheduled job" msgstr "По заданному графику" -#: actions/siteadminpanel.php:347 +#: actions/siteadminpanel.php:295 msgid "Data snapshots" msgstr "Снимки данных" -#: actions/siteadminpanel.php:348 +#: actions/siteadminpanel.php:296 msgid "When to send statistical data to status.net servers" msgstr "Когда отправлять статистические данные на сервера status.net" -#: actions/siteadminpanel.php:353 +#: actions/siteadminpanel.php:301 msgid "Frequency" msgstr "Частота" -#: actions/siteadminpanel.php:354 +#: actions/siteadminpanel.php:302 msgid "Snapshots will be sent once every N web hits" msgstr "Снимки будут отправляться каждые N посещений" -#: actions/siteadminpanel.php:359 +#: actions/siteadminpanel.php:307 msgid "Report URL" msgstr "URL отчёта" -#: actions/siteadminpanel.php:360 +#: actions/siteadminpanel.php:308 msgid "Snapshots will be sent to this URL" msgstr "Снимки будут отправляться по этому URL-адресу" -#: actions/siteadminpanel.php:367 +#: actions/siteadminpanel.php:315 msgid "Limits" msgstr "Границы" -#: actions/siteadminpanel.php:370 +#: actions/siteadminpanel.php:318 msgid "Text limit" msgstr "Границы текста" -#: actions/siteadminpanel.php:370 +#: actions/siteadminpanel.php:318 msgid "Maximum number of characters for notices." msgstr "Максимальное число символов для записей." -#: actions/siteadminpanel.php:374 +#: actions/siteadminpanel.php:322 msgid "Dupe limit" msgstr "Предел дубликатов" -#: actions/siteadminpanel.php:374 +#: actions/siteadminpanel.php:322 msgid "How long users must wait (in seconds) to post the same thing again." msgstr "" "Сколько нужно ждать пользователям (в секундах) для отправки того же ещё раз." -#: actions/siteadminpanel.php:388 actions/useradminpanel.php:313 +#: actions/siteadminpanel.php:336 actions/useradminpanel.php:313 msgid "Save site settings" msgstr "Сохранить настройки сайта" @@ -3938,6 +3963,11 @@ msgstr "Jabber" msgid "SMS" msgstr "СМС" +#: actions/tag.php:68 +#, fuzzy, php-format +msgid "Notices tagged with %1$s, page %2$d" +msgstr "Пользователи, установившие себе тег %1$s — страница %2$d" + #: actions/tag.php:86 #, php-format msgid "Notice feed for tag %s (RSS 1.0)" @@ -4237,6 +4267,11 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "Приятного аппетита!" +#: actions/usergroups.php:64 +#, fuzzy, php-format +msgid "%1$s groups, page %2$d" +msgstr "Участники группы %1$s, страница %2$d" + #: actions/usergroups.php:130 msgid "Search for more groups" msgstr "Искать другие группы" @@ -4311,7 +4346,7 @@ msgstr "" msgid "Plugins" msgstr "Плагины" -#: actions/version.php:196 lib/action.php:741 +#: actions/version.php:196 lib/action.php:747 msgid "Version" msgstr "Версия" @@ -4339,19 +4374,16 @@ msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "Файл такого размера превысит вашу месячную квоту в %d байта." #: classes/Group_member.php:41 -#, fuzzy msgid "Group join failed." -msgstr "Профиль группы" +msgstr "Не удаётся присоединиться к группе." #: classes/Group_member.php:53 -#, fuzzy msgid "Not part of group." -msgstr "Не удаётся обновить информацию о группе." +msgstr "Не является частью группы." #: classes/Group_member.php:60 -#, fuzzy msgid "Group leave failed." -msgstr "Профиль группы" +msgstr "Не удаётся покинуть группу." #: classes/Login_token.php:76 #, php-format @@ -4370,27 +4402,27 @@ msgstr "Не удаётся вставить сообщение." msgid "Could not update message with new URI." msgstr "Не удаётся обновить сообщение с новым URI." -#: classes/Notice.php:171 +#: classes/Notice.php:157 #, php-format msgid "DB error inserting hashtag: %s" msgstr "Ошибка баз данных при вставке хеш-тегов для %s" -#: classes/Notice.php:225 +#: classes/Notice.php:214 msgid "Problem saving notice. Too long." msgstr "Проблемы с сохранением записи. Слишком длинно." -#: classes/Notice.php:229 +#: classes/Notice.php:218 msgid "Problem saving notice. Unknown user." msgstr "Проблема при сохранении записи. Неизвестный пользователь." -#: classes/Notice.php:234 +#: classes/Notice.php:223 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Слишком много записей за столь короткий срок; передохните немного и " "попробуйте вновь через пару минут." -#: classes/Notice.php:240 +#: classes/Notice.php:229 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." @@ -4398,20 +4430,25 @@ msgstr "" "Слишком много одинаковых записей за столь короткий срок; передохните немного " "и попробуйте вновь через пару минут." -#: classes/Notice.php:246 +#: classes/Notice.php:235 msgid "You are banned from posting notices on this site." msgstr "Вам запрещено поститься на этом сайте (бан)" -#: classes/Notice.php:305 classes/Notice.php:330 +#: classes/Notice.php:294 classes/Notice.php:319 msgid "Problem saving notice." msgstr "Проблемы с сохранением записи." -#: classes/Notice.php:1059 +#: classes/Notice.php:790 +#, fuzzy +msgid "Problem saving group inbox." +msgstr "Проблемы с сохранением записи." + +#: classes/Notice.php:850 #, php-format msgid "DB error inserting reply: %s" msgstr "Ошибка баз данных при вставке ответа для %s" -#: classes/Notice.php:1441 +#: classes/Notice.php:1233 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -4458,132 +4495,132 @@ msgid "Other options" msgstr "Другие опции" #: lib/action.php:144 -#, fuzzy, php-format +#, php-format msgid "%1$s - %2$s" -msgstr "%1$s (%2$s)" +msgstr "%1$s — %2$s" #: lib/action.php:159 msgid "Untitled page" msgstr "Страница без названия" -#: lib/action.php:427 +#: lib/action.php:433 msgid "Primary site navigation" msgstr "Главная навигация" -#: lib/action.php:433 +#: lib/action.php:439 msgid "Home" msgstr "Моё" -#: lib/action.php:433 +#: lib/action.php:439 msgid "Personal profile and friends timeline" msgstr "Личный профиль и лента друзей" -#: lib/action.php:435 +#: lib/action.php:441 msgid "Change your email, avatar, password, profile" msgstr "Изменить ваш email, аватару, пароль, профиль" -#: lib/action.php:438 +#: lib/action.php:444 msgid "Connect" msgstr "Соединить" -#: lib/action.php:438 +#: lib/action.php:444 msgid "Connect to services" msgstr "Соединить с сервисами" -#: lib/action.php:442 +#: lib/action.php:448 msgid "Change site configuration" msgstr "Изменить конфигурацию сайта" -#: lib/action.php:446 lib/subgroupnav.php:105 +#: lib/action.php:452 lib/subgroupnav.php:105 msgid "Invite" msgstr "Пригласить" -#: lib/action.php:447 lib/subgroupnav.php:106 +#: lib/action.php:453 lib/subgroupnav.php:106 #, php-format msgid "Invite friends and colleagues to join you on %s" -msgstr "Пригласи друзей и коллег стать такими же как ты участниками %s" +msgstr "Пригласите друзей и коллег стать такими же как вы участниками %s" -#: lib/action.php:452 +#: lib/action.php:458 msgid "Logout" msgstr "Выход" -#: lib/action.php:452 +#: lib/action.php:458 msgid "Logout from the site" msgstr "Выйти" -#: lib/action.php:457 +#: lib/action.php:463 msgid "Create an account" msgstr "Создать новый аккаунт" -#: lib/action.php:460 +#: lib/action.php:466 msgid "Login to the site" msgstr "Войти" -#: lib/action.php:463 lib/action.php:726 +#: lib/action.php:469 lib/action.php:732 msgid "Help" msgstr "Помощь" -#: lib/action.php:463 +#: lib/action.php:469 msgid "Help me!" msgstr "Помощь" -#: lib/action.php:466 lib/searchaction.php:127 +#: lib/action.php:472 lib/searchaction.php:127 msgid "Search" msgstr "Поиск" -#: lib/action.php:466 +#: lib/action.php:472 msgid "Search for people or text" msgstr "Искать людей или текст" -#: lib/action.php:487 +#: lib/action.php:493 msgid "Site notice" msgstr "Новая запись" -#: lib/action.php:553 +#: lib/action.php:559 msgid "Local views" msgstr "Локальные виды" -#: lib/action.php:619 +#: lib/action.php:625 msgid "Page notice" msgstr "Новая запись" -#: lib/action.php:721 +#: lib/action.php:727 msgid "Secondary site navigation" msgstr "Навигация по подпискам" -#: lib/action.php:728 +#: lib/action.php:734 msgid "About" msgstr "О проекте" -#: lib/action.php:730 +#: lib/action.php:736 msgid "FAQ" msgstr "ЧаВо" -#: lib/action.php:734 +#: lib/action.php:740 msgid "TOS" msgstr "TOS" -#: lib/action.php:737 +#: lib/action.php:743 msgid "Privacy" msgstr "Пользовательское соглашение" -#: lib/action.php:739 +#: lib/action.php:745 msgid "Source" msgstr "Исходный код" -#: lib/action.php:743 +#: lib/action.php:749 msgid "Contact" msgstr "Контактная информация" -#: lib/action.php:745 +#: lib/action.php:751 msgid "Badge" msgstr "Бедж" -#: lib/action.php:773 +#: lib/action.php:779 msgid "StatusNet software license" msgstr "StatusNet лицензия" -#: lib/action.php:776 +#: lib/action.php:782 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -4592,12 +4629,12 @@ msgstr "" "**%%site.name%%** — это сервис микроблогинга, созданный для вас при помощи [%" "%site.broughtby%%](%%site.broughtbyurl%%). " -#: lib/action.php:778 +#: lib/action.php:784 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "**%%site.name%%** — сервис микроблогинга. " -#: lib/action.php:780 +#: lib/action.php:786 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4609,41 +4646,44 @@ msgstr "" "лицензией [GNU Affero General Public License](http://www.fsf.org/licensing/" "licenses/agpl-3.0.html)." -#: lib/action.php:795 +#: lib/action.php:801 msgid "Site content license" msgstr "Лицензия содержимого сайта" -#: lib/action.php:800 +#: lib/action.php:806 #, php-format msgid "Content and data of %1$s are private and confidential." -msgstr "" +msgstr "Содержание и данные %1$s являются личными и конфиденциальными." -#: lib/action.php:805 +#: lib/action.php:811 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" +"Авторские права на содержание и данные принадлежат %1$s. Все права защищены." -#: lib/action.php:808 +#: lib/action.php:814 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" +"Авторские права на содержание и данные принадлежат разработчикам. Все права " +"защищены." -#: lib/action.php:820 +#: lib/action.php:826 msgid "All " msgstr "All " -#: lib/action.php:825 +#: lib/action.php:831 msgid "license." msgstr "license." -#: lib/action.php:1124 +#: lib/action.php:1130 msgid "Pagination" msgstr "Разбиение на страницы" -#: lib/action.php:1133 +#: lib/action.php:1139 msgid "After" msgstr "Сюда" -#: lib/action.php:1141 +#: lib/action.php:1147 msgid "Before" msgstr "Туда" @@ -4675,75 +4715,85 @@ msgstr "Основная конфигурация сайта" msgid "Design configuration" msgstr "Конфигурация оформления" -#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327 +#: lib/adminpanelaction.php:322 +#, fuzzy +msgid "User configuration" +msgstr "Конфигурация путей" + +#: lib/adminpanelaction.php:327 +#, fuzzy +msgid "Access configuration" +msgstr "Конфигурация оформления" + +#: lib/adminpanelaction.php:332 msgid "Paths configuration" msgstr "Конфигурация путей" +#: lib/applicationeditform.php:136 +msgid "Edit application" +msgstr "Изменить приложение" + #: lib/applicationeditform.php:186 msgid "Icon for this application" -msgstr "" +msgstr "Иконка для этого приложения" #: lib/applicationeditform.php:206 -#, fuzzy, php-format +#, php-format msgid "Describe your application in %d characters" -msgstr "Опишите группу или тему при помощи %d символов" +msgstr "Опишите ваше приложение при помощи %d символов" #: lib/applicationeditform.php:209 -#, fuzzy msgid "Describe your application" -msgstr "Опишите группу или тему" +msgstr "Опишите ваше приложение" #: lib/applicationeditform.php:218 -#, fuzzy msgid "Source URL" -msgstr "Исходный код" +msgstr "URL источника" #: lib/applicationeditform.php:220 -#, fuzzy msgid "URL of the homepage of this application" -msgstr "Адрес страницы, дневника или профиля группы на другом портале" +msgstr "URL-адрес домашней страницы этого приложения" #: lib/applicationeditform.php:226 msgid "Organization responsible for this application" -msgstr "" +msgstr "Организация, ответственная за это приложение" #: lib/applicationeditform.php:232 -#, fuzzy msgid "URL for the homepage of the organization" -msgstr "Адрес страницы, дневника или профиля группы на другом портале" +msgstr "URL-адрес домашней страницы организации" #: lib/applicationeditform.php:238 msgid "URL to redirect to after authentication" -msgstr "" +msgstr "URL для перенаправления после проверки подлинности" #: lib/applicationeditform.php:260 msgid "Browser" -msgstr "" +msgstr "Браузер" #: lib/applicationeditform.php:276 msgid "Desktop" -msgstr "" +msgstr "Операционная система" #: lib/applicationeditform.php:277 msgid "Type of application, browser or desktop" -msgstr "" +msgstr "Среда выполнения приложения: браузер или операционная система" #: lib/applicationeditform.php:299 msgid "Read-only" -msgstr "" +msgstr "Только чтение" #: lib/applicationeditform.php:317 msgid "Read-write" -msgstr "" +msgstr "Чтение и запись" #: lib/applicationeditform.php:318 msgid "Default access for this application: read-only, or read-write" msgstr "" +"Доступ по умолчанию для этого приложения: только чтение или чтение и запись" #: lib/applicationlist.php:154 -#, fuzzy msgid "Revoke" -msgstr "Убрать" +msgstr "Отозвать" #: lib/attachmentlist.php:87 msgid "Attachments" @@ -5103,13 +5153,12 @@ msgid "Updates by SMS" msgstr "Обновления по СМС" #: lib/connectsettingsaction.php:120 -#, fuzzy msgid "Connections" -msgstr "Соединить" +msgstr "Соединения" #: lib/connectsettingsaction.php:121 msgid "Authorized connected applications" -msgstr "" +msgstr "Авторизованные соединённые приложения" #: lib/dberroraction.php:60 msgid "Database error" @@ -5297,15 +5346,15 @@ msgstr "МБ" msgid "kB" msgstr "КБ" -#: lib/jabber.php:202 +#: lib/jabber.php:220 #, php-format msgid "[%s]" msgstr "[%s]" -#: lib/jabber.php:385 -#, fuzzy, php-format +#: lib/jabber.php:400 +#, php-format msgid "Unknown inbox source %d." -msgstr "Неизвестный язык «%s»." +msgstr "Неизвестный источник входящих сообщений %d." #: lib/joinform.php:114 msgid "Join" @@ -5705,6 +5754,8 @@ msgid "" "Sorry, retrieving your geo location is taking longer than expected, please " "try again later" msgstr "" +"К сожалению, получение информации о вашем местонахождении заняло больше " +"времени, чем ожидалось; повторите попытку позже" #: lib/noticelist.php:428 #, php-format @@ -5799,19 +5850,19 @@ msgstr "Ответы" msgid "Favorites" msgstr "Любимое" -#: lib/personalgroupnav.php:124 +#: lib/personalgroupnav.php:125 msgid "Inbox" msgstr "Входящие" -#: lib/personalgroupnav.php:125 +#: lib/personalgroupnav.php:126 msgid "Your incoming messages" msgstr "Ваши входящие сообщения" -#: lib/personalgroupnav.php:129 +#: lib/personalgroupnav.php:130 msgid "Outbox" msgstr "Исходящие" -#: lib/personalgroupnav.php:130 +#: lib/personalgroupnav.php:131 msgid "Your sent messages" msgstr "Ваши исходящие сообщения" @@ -6053,47 +6104,47 @@ msgstr "Сообщение" msgid "Moderate" msgstr "Модерировать" -#: lib/util.php:875 +#: lib/util.php:868 msgid "a few seconds ago" msgstr "пару секунд назад" -#: lib/util.php:877 +#: lib/util.php:870 msgid "about a minute ago" msgstr "около минуты назад" -#: lib/util.php:879 +#: lib/util.php:872 #, php-format msgid "about %d minutes ago" msgstr "около %d минут(ы) назад" -#: lib/util.php:881 +#: lib/util.php:874 msgid "about an hour ago" msgstr "около часа назад" -#: lib/util.php:883 +#: lib/util.php:876 #, php-format msgid "about %d hours ago" msgstr "около %d часа(ов) назад" -#: lib/util.php:885 +#: lib/util.php:878 msgid "about a day ago" msgstr "около дня назад" -#: lib/util.php:887 +#: lib/util.php:880 #, php-format msgid "about %d days ago" msgstr "около %d дня(ей) назад" -#: lib/util.php:889 +#: lib/util.php:882 msgid "about a month ago" msgstr "около месяца назад" -#: lib/util.php:891 +#: lib/util.php:884 #, php-format msgid "about %d months ago" msgstr "около %d месяца(ев) назад" -#: lib/util.php:893 +#: lib/util.php:886 msgid "about a year ago" msgstr "около года назад" @@ -6109,7 +6160,7 @@ msgstr "" "%s не является допустимым цветом! Используйте 3 или 6 шестнадцатеричных " "символов." -#: scripts/xmppdaemon.php:301 +#: lib/xmppmanager.php:402 #, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" diff --git a/locale/statusnet.po b/locale/statusnet.po index fedcf6e7bc..7995115348 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: 2010-01-21 22:36+0000\n" +"POT-Creation-Date: 2010-01-27 23:58+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,6 +17,57 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" +#: actions/accessadminpanel.php:54 lib/adminpanelaction.php:326 +msgid "Access" +msgstr "" + +#: actions/accessadminpanel.php:65 +msgid "Site access settings" +msgstr "" + +#: actions/accessadminpanel.php:158 +msgid "Registration" +msgstr "" + +#: actions/accessadminpanel.php:161 +msgid "Private" +msgstr "" + +#: actions/accessadminpanel.php:163 +msgid "Prohibit anonymous users (not logged in) from viewing site?" +msgstr "" + +#: actions/accessadminpanel.php:167 +msgid "Invite only" +msgstr "" + +#: actions/accessadminpanel.php:169 +msgid "Make registration invitation only." +msgstr "" + +#: actions/accessadminpanel.php:173 +msgid "Closed" +msgstr "" + +#: actions/accessadminpanel.php:175 +msgid "Disable new registrations." +msgstr "" + +#: actions/accessadminpanel.php:189 actions/designadminpanel.php:586 +#: actions/emailsettings.php:195 actions/imsettings.php:163 +#: actions/othersettings.php:126 actions/pathsadminpanel.php:351 +#: actions/profilesettings.php:174 actions/siteadminpanel.php:336 +#: actions/smssettings.php:181 actions/subscriptions.php:203 +#: actions/tagother.php:154 actions/useradminpanel.php:313 +#: lib/applicationeditform.php:335 lib/applicationeditform.php:336 +#: lib/designsettings.php:256 lib/groupeditform.php:202 +msgid "Save" +msgstr "" + +#: actions/accessadminpanel.php:189 +msgid "Save access settings" +msgstr "" + #: actions/all.php:63 actions/public.php:97 actions/replies.php:92 #: actions/showfavorites.php:137 actions/tag.php:51 msgid "No such page" @@ -31,7 +82,7 @@ msgstr "" #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:149 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 @@ -130,8 +181,7 @@ msgstr "" #: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 #: actions/apitimelinefriends.php:155 actions/apitimelinegroup.php:150 #: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 -#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found." @@ -147,7 +197,7 @@ msgstr "" #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:119 +#: actions/apistatusesupdate.php:118 msgid "This method requires a POST." msgstr "" @@ -176,7 +226,7 @@ msgstr "" #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:132 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 #: actions/designadminpanel.php:122 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -472,7 +522,14 @@ msgstr "" msgid "Allow or deny access" msgstr "" -#: actions/apioauthauthorize.php:320 lib/action.php:435 +#: actions/apioauthauthorize.php:306 +#, php-format +msgid "" +"The application %s by %s would like the " +"ability to %s your account data." +msgstr "" + +#: actions/apioauthauthorize.php:320 lib/action.php:441 msgid "Account" msgstr "" @@ -529,17 +586,17 @@ msgstr "" msgid "No status with that ID found." msgstr "" -#: actions/apistatusesupdate.php:162 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "" -#: actions/apistatusesupdate.php:203 +#: actions/apistatusesupdate.php:202 msgid "Not found" msgstr "" -#: actions/apistatusesupdate.php:226 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -590,11 +647,6 @@ msgstr "" msgid "%s updates from everyone!" msgstr "" -#: actions/apitimelineretweetedbyme.php:112 -#, php-format -msgid "Repeated by %s" -msgstr "" - #: actions/apitimelineretweetedtome.php:111 #, php-format msgid "Repeated to %s" @@ -993,17 +1045,6 @@ msgstr "" msgid "Reset back to default" msgstr "" -#: actions/designadminpanel.php:586 actions/emailsettings.php:195 -#: actions/imsettings.php:163 actions/othersettings.php:126 -#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174 -#: actions/siteadminpanel.php:388 actions/smssettings.php:181 -#: actions/subscriptions.php:203 actions/tagother.php:154 -#: actions/useradminpanel.php:313 lib/applicationeditform.php:335 -#: lib/applicationeditform.php:336 lib/designsettings.php:256 -#: lib/groupeditform.php:202 -msgid "Save" -msgstr "" - #: actions/designadminpanel.php:587 lib/designsettings.php:257 msgid "Save design" msgstr "" @@ -1016,12 +1057,13 @@ msgstr "" msgid "Add to favorites" msgstr "" -#: actions/doc.php:69 -msgid "No such document." +#: actions/doc.php:155 +#, php-format +msgid "No such document \"%s\"" msgstr "" -#: actions/editapplication.php:54 lib/applicationeditform.php:136 -msgid "Edit application" +#: actions/editapplication.php:54 +msgid "Edit Application" msgstr "" #: actions/editapplication.php:66 @@ -1038,7 +1080,7 @@ msgid "No such application." msgstr "" #: actions/editapplication.php:127 actions/newapplication.php:110 -#: actions/showapplication.php:118 lib/action.php:1189 +#: actions/showapplication.php:118 lib/action.php:1195 msgid "There was a problem with your session token." msgstr "" @@ -1237,7 +1279,7 @@ msgid "Cannot normalize that email address" msgstr "" #: actions/emailsettings.php:331 actions/register.php:201 -#: actions/siteadminpanel.php:157 +#: actions/siteadminpanel.php:143 msgid "Not a valid email address." msgstr "" @@ -1249,7 +1291,7 @@ msgstr "" msgid "That email address already belongs to another user." msgstr "" -#: actions/emailsettings.php:353 actions/imsettings.php:317 +#: actions/emailsettings.php:353 actions/imsettings.php:319 #: actions/smssettings.php:337 msgid "Couldn't insert confirmation code." msgstr "" @@ -1541,7 +1583,7 @@ msgstr "" msgid "A list of the users in this group." msgstr "" -#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107 +#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107 msgid "Admin" msgstr "" @@ -1716,6 +1758,11 @@ msgstr "" msgid "That is not your Jabber ID." msgstr "" +#: actions/inbox.php:59 +#, php-format +msgid "Inbox for %1$s - page %2$d" +msgstr "" + #: actions/inbox.php:62 #, php-format msgid "Inbox for %s" @@ -1866,7 +1913,7 @@ msgstr "" msgid "Error setting user. You are probably not authorized." msgstr "" -#: actions/login.php:188 actions/login.php:241 lib/action.php:460 +#: actions/login.php:188 actions/login.php:241 lib/action.php:466 #: lib/logingroupnav.php:79 msgid "Login" msgstr "" @@ -1924,7 +1971,7 @@ msgid "No current status" msgstr "" #: actions/newapplication.php:52 -msgid "New application" +msgid "New Application" msgstr "" #: actions/newapplication.php:64 @@ -2106,8 +2153,8 @@ msgstr "" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1038 -#: lib/api.php:1066 lib/api.php:1176 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1039 +#: lib/api.php:1067 lib/api.php:1177 msgid "Not a supported data format." msgstr "" @@ -2171,6 +2218,11 @@ msgstr "" msgid "Login token expired." msgstr "" +#: actions/outbox.php:58 +#, php-format +msgid "Outbox for %1$s - page %2$d" +msgstr "" + #: actions/outbox.php:61 #, php-format msgid "Outbox for %s" @@ -2241,7 +2293,7 @@ msgstr "" msgid "Password saved." msgstr "" -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:331 msgid "Paths" msgstr "" @@ -2249,132 +2301,148 @@ msgstr "" msgid "Path and server settings for this StatusNet site." msgstr "" -#: actions/pathsadminpanel.php:140 +#: actions/pathsadminpanel.php:157 #, php-format msgid "Theme directory not readable: %s" msgstr "" -#: actions/pathsadminpanel.php:146 +#: actions/pathsadminpanel.php:163 #, php-format msgid "Avatar directory not writable: %s" msgstr "" -#: actions/pathsadminpanel.php:152 +#: actions/pathsadminpanel.php:169 #, php-format msgid "Background directory not writable: %s" msgstr "" -#: actions/pathsadminpanel.php:160 +#: actions/pathsadminpanel.php:177 #, php-format msgid "Locales directory not readable: %s" msgstr "" -#: actions/pathsadminpanel.php:166 +#: actions/pathsadminpanel.php:183 msgid "Invalid SSL server. The maximum length is 255 characters." msgstr "" -#: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58 +#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58 #: lib/adminpanelaction.php:311 msgid "Site" msgstr "" -#: actions/pathsadminpanel.php:221 +#: actions/pathsadminpanel.php:238 +msgid "Server" +msgstr "" + +#: actions/pathsadminpanel.php:238 +msgid "Site's server hostname." +msgstr "" + +#: actions/pathsadminpanel.php:242 msgid "Path" msgstr "" -#: actions/pathsadminpanel.php:221 +#: actions/pathsadminpanel.php:242 msgid "Site path" msgstr "" -#: actions/pathsadminpanel.php:225 +#: actions/pathsadminpanel.php:246 msgid "Path to locales" msgstr "" -#: actions/pathsadminpanel.php:225 +#: actions/pathsadminpanel.php:246 msgid "Directory path to locales" msgstr "" -#: actions/pathsadminpanel.php:232 -msgid "Theme" -msgstr "" - -#: actions/pathsadminpanel.php:237 -msgid "Theme server" -msgstr "" - -#: actions/pathsadminpanel.php:241 -msgid "Theme path" -msgstr "" - -#: actions/pathsadminpanel.php:245 -msgid "Theme directory" +#: actions/pathsadminpanel.php:250 +msgid "Fancy URLs" msgstr "" #: actions/pathsadminpanel.php:252 +msgid "Use fancy (more readable and memorable) URLs?" +msgstr "" + +#: actions/pathsadminpanel.php:259 +msgid "Theme" +msgstr "" + +#: actions/pathsadminpanel.php:264 +msgid "Theme server" +msgstr "" + +#: actions/pathsadminpanel.php:268 +msgid "Theme path" +msgstr "" + +#: actions/pathsadminpanel.php:272 +msgid "Theme directory" +msgstr "" + +#: actions/pathsadminpanel.php:279 msgid "Avatars" msgstr "" -#: actions/pathsadminpanel.php:257 +#: actions/pathsadminpanel.php:284 msgid "Avatar server" msgstr "" -#: actions/pathsadminpanel.php:261 +#: actions/pathsadminpanel.php:288 msgid "Avatar path" msgstr "" -#: actions/pathsadminpanel.php:265 +#: actions/pathsadminpanel.php:292 msgid "Avatar directory" msgstr "" -#: actions/pathsadminpanel.php:274 +#: actions/pathsadminpanel.php:301 msgid "Backgrounds" msgstr "" -#: actions/pathsadminpanel.php:278 +#: actions/pathsadminpanel.php:305 msgid "Background server" msgstr "" -#: actions/pathsadminpanel.php:282 +#: actions/pathsadminpanel.php:309 msgid "Background path" msgstr "" -#: actions/pathsadminpanel.php:286 +#: actions/pathsadminpanel.php:313 msgid "Background directory" msgstr "" -#: actions/pathsadminpanel.php:293 +#: actions/pathsadminpanel.php:320 msgid "SSL" msgstr "" -#: actions/pathsadminpanel.php:296 actions/siteadminpanel.php:346 +#: actions/pathsadminpanel.php:323 actions/siteadminpanel.php:294 msgid "Never" msgstr "" -#: actions/pathsadminpanel.php:297 +#: actions/pathsadminpanel.php:324 msgid "Sometimes" msgstr "" -#: actions/pathsadminpanel.php:298 +#: actions/pathsadminpanel.php:325 msgid "Always" msgstr "" -#: actions/pathsadminpanel.php:302 +#: actions/pathsadminpanel.php:329 msgid "Use SSL" msgstr "" -#: actions/pathsadminpanel.php:303 +#: actions/pathsadminpanel.php:330 msgid "When to use SSL" msgstr "" -#: actions/pathsadminpanel.php:308 +#: actions/pathsadminpanel.php:335 msgid "SSL server" msgstr "" -#: actions/pathsadminpanel.php:309 +#: actions/pathsadminpanel.php:336 msgid "Server to direct SSL requests to" msgstr "" -#: actions/pathsadminpanel.php:325 +#: actions/pathsadminpanel.php:352 msgid "Save paths" msgstr "" @@ -2479,7 +2547,7 @@ msgid "" "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated" msgstr "" -#: actions/profilesettings.php:151 actions/siteadminpanel.php:294 +#: actions/profilesettings.php:151 actions/siteadminpanel.php:280 msgid "Language" msgstr "" @@ -2505,7 +2573,7 @@ msgstr "" msgid "Bio is too long (max %d chars)." msgstr "" -#: actions/profilesettings.php:235 actions/siteadminpanel.php:164 +#: actions/profilesettings.php:235 actions/siteadminpanel.php:150 msgid "Timezone not selected." msgstr "" @@ -2763,7 +2831,7 @@ msgstr "" msgid "Registration successful" msgstr "" -#: actions/register.php:114 actions/register.php:503 lib/action.php:457 +#: actions/register.php:114 actions/register.php:503 lib/action.php:463 #: lib/logingroupnav.php:85 msgid "Register" msgstr "" @@ -2803,7 +2871,7 @@ msgid "Same as password above. Required." msgstr "" #: actions/register.php:438 actions/register.php:442 -#: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120 +#: actions/siteadminpanel.php:256 lib/accountsettingsaction.php:120 msgid "Email" msgstr "" @@ -2937,6 +3005,11 @@ msgstr "" msgid "Replies to %s" msgstr "" +#: actions/replies.php:127 +#, php-format +msgid "Replies to %1$s, page %2$d" +msgstr "" + #: actions/replies.php:144 #, php-format msgid "Replies feed for %s (RSS 1.0)" @@ -3060,6 +3133,11 @@ msgid "" "signature method." msgstr "" +#: actions/showfavorites.php:79 +#, php-format +msgid "%1$s's favorite notices, page %2$d" +msgstr "" + #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "" @@ -3109,6 +3187,11 @@ msgstr "" msgid "%s group" msgstr "" +#: actions/showgroup.php:84 +#, php-format +msgid "%1$s group, page %2$d" +msgstr "" + #: actions/showgroup.php:218 msgid "Group profile" msgstr "" @@ -3219,6 +3302,11 @@ msgstr "" msgid " tagged %s" msgstr "" +#: actions/showstream.php:79 +#, php-format +msgid "%1$s, page %2$d" +msgstr "" + #: actions/showstream.php:122 #, php-format msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" @@ -3296,192 +3384,144 @@ msgstr "" msgid "Basic settings for this StatusNet site." msgstr "" -#: actions/siteadminpanel.php:146 +#: actions/siteadminpanel.php:132 msgid "Site name must have non-zero length." msgstr "" -#: actions/siteadminpanel.php:154 +#: actions/siteadminpanel.php:140 msgid "You must have a valid contact email address." msgstr "" -#: actions/siteadminpanel.php:172 +#: actions/siteadminpanel.php:158 #, php-format msgid "Unknown language \"%s\"." msgstr "" -#: actions/siteadminpanel.php:179 +#: actions/siteadminpanel.php:165 msgid "Invalid snapshot report URL." msgstr "" -#: actions/siteadminpanel.php:185 +#: actions/siteadminpanel.php:171 msgid "Invalid snapshot run value." msgstr "" -#: actions/siteadminpanel.php:191 +#: actions/siteadminpanel.php:177 msgid "Snapshot frequency must be a number." msgstr "" -#: actions/siteadminpanel.php:197 +#: actions/siteadminpanel.php:183 msgid "Minimum text limit is 140 characters." msgstr "" -#: actions/siteadminpanel.php:203 +#: actions/siteadminpanel.php:189 msgid "Dupe limit must 1 or more seconds." msgstr "" -#: actions/siteadminpanel.php:253 +#: actions/siteadminpanel.php:239 msgid "General" msgstr "" -#: actions/siteadminpanel.php:256 +#: actions/siteadminpanel.php:242 msgid "Site name" msgstr "" -#: actions/siteadminpanel.php:257 +#: actions/siteadminpanel.php:243 msgid "The name of your site, like \"Yourcompany Microblog\"" msgstr "" -#: actions/siteadminpanel.php:261 +#: actions/siteadminpanel.php:247 msgid "Brought by" msgstr "" -#: actions/siteadminpanel.php:262 +#: actions/siteadminpanel.php:248 msgid "Text used for credits link in footer of each page" msgstr "" -#: actions/siteadminpanel.php:266 +#: actions/siteadminpanel.php:252 msgid "Brought by URL" msgstr "" -#: actions/siteadminpanel.php:267 +#: actions/siteadminpanel.php:253 msgid "URL used for credits link in footer of each page" msgstr "" -#: actions/siteadminpanel.php:271 +#: actions/siteadminpanel.php:257 msgid "Contact email address for your site" msgstr "" -#: actions/siteadminpanel.php:277 +#: actions/siteadminpanel.php:263 msgid "Local" msgstr "" -#: actions/siteadminpanel.php:288 +#: actions/siteadminpanel.php:274 msgid "Default timezone" msgstr "" -#: actions/siteadminpanel.php:289 +#: actions/siteadminpanel.php:275 msgid "Default timezone for the site; usually UTC." msgstr "" -#: actions/siteadminpanel.php:295 +#: actions/siteadminpanel.php:281 msgid "Default site language" msgstr "" -#: actions/siteadminpanel.php:303 -msgid "URLs" -msgstr "" - -#: actions/siteadminpanel.php:306 -msgid "Server" -msgstr "" - -#: actions/siteadminpanel.php:306 -msgid "Site's server hostname." -msgstr "" - -#: actions/siteadminpanel.php:310 -msgid "Fancy URLs" -msgstr "" - -#: actions/siteadminpanel.php:312 -msgid "Use fancy (more readable and memorable) URLs?" -msgstr "" - -#: actions/siteadminpanel.php:318 -msgid "Access" -msgstr "" - -#: actions/siteadminpanel.php:321 -msgid "Private" -msgstr "" - -#: actions/siteadminpanel.php:323 -msgid "Prohibit anonymous users (not logged in) from viewing site?" -msgstr "" - -#: actions/siteadminpanel.php:327 -msgid "Invite only" -msgstr "" - -#: actions/siteadminpanel.php:329 -msgid "Make registration invitation only." -msgstr "" - -#: actions/siteadminpanel.php:333 -msgid "Closed" -msgstr "" - -#: actions/siteadminpanel.php:335 -msgid "Disable new registrations." -msgstr "" - -#: actions/siteadminpanel.php:341 +#: actions/siteadminpanel.php:289 msgid "Snapshots" msgstr "" -#: actions/siteadminpanel.php:344 +#: actions/siteadminpanel.php:292 msgid "Randomly during Web hit" msgstr "" -#: actions/siteadminpanel.php:345 +#: actions/siteadminpanel.php:293 msgid "In a scheduled job" msgstr "" -#: actions/siteadminpanel.php:347 +#: actions/siteadminpanel.php:295 msgid "Data snapshots" msgstr "" -#: actions/siteadminpanel.php:348 +#: actions/siteadminpanel.php:296 msgid "When to send statistical data to status.net servers" msgstr "" -#: actions/siteadminpanel.php:353 +#: actions/siteadminpanel.php:301 msgid "Frequency" msgstr "" -#: actions/siteadminpanel.php:354 +#: actions/siteadminpanel.php:302 msgid "Snapshots will be sent once every N web hits" msgstr "" -#: actions/siteadminpanel.php:359 +#: actions/siteadminpanel.php:307 msgid "Report URL" msgstr "" -#: actions/siteadminpanel.php:360 +#: actions/siteadminpanel.php:308 msgid "Snapshots will be sent to this URL" msgstr "" -#: actions/siteadminpanel.php:367 +#: actions/siteadminpanel.php:315 msgid "Limits" msgstr "" -#: actions/siteadminpanel.php:370 +#: actions/siteadminpanel.php:318 msgid "Text limit" msgstr "" -#: actions/siteadminpanel.php:370 +#: actions/siteadminpanel.php:318 msgid "Maximum number of characters for notices." msgstr "" -#: actions/siteadminpanel.php:374 +#: actions/siteadminpanel.php:322 msgid "Dupe limit" msgstr "" -#: actions/siteadminpanel.php:374 +#: actions/siteadminpanel.php:322 msgid "How long users must wait (in seconds) to post the same thing again." msgstr "" -#: actions/siteadminpanel.php:388 actions/useradminpanel.php:313 +#: actions/siteadminpanel.php:336 actions/useradminpanel.php:313 msgid "Save site settings" msgstr "" @@ -3672,6 +3712,11 @@ msgstr "" msgid "SMS" msgstr "" +#: actions/tag.php:68 +#, php-format +msgid "Notices tagged with %1$s, page %2$d" +msgstr "" + #: actions/tag.php:86 #, php-format msgid "Notice feed for tag %s (RSS 1.0)" @@ -3955,6 +4000,11 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "" +#: actions/usergroups.php:64 +#, php-format +msgid "%1$s groups, page %2$d" +msgstr "" + #: actions/usergroups.php:130 msgid "Search for more groups" msgstr "" @@ -4016,7 +4066,7 @@ msgstr "" msgid "Plugins" msgstr "" -#: actions/version.php:196 lib/action.php:741 +#: actions/version.php:196 lib/action.php:747 msgid "Version" msgstr "" @@ -4070,44 +4120,48 @@ msgstr "" msgid "Could not update message with new URI." msgstr "" -#: classes/Notice.php:171 +#: classes/Notice.php:157 #, php-format msgid "DB error inserting hashtag: %s" msgstr "" -#: classes/Notice.php:225 +#: classes/Notice.php:214 msgid "Problem saving notice. Too long." msgstr "" -#: classes/Notice.php:229 +#: classes/Notice.php:218 msgid "Problem saving notice. Unknown user." msgstr "" -#: classes/Notice.php:234 +#: classes/Notice.php:223 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:240 +#: classes/Notice.php:229 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:246 +#: classes/Notice.php:235 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:305 classes/Notice.php:330 +#: classes/Notice.php:294 classes/Notice.php:319 msgid "Problem saving notice." msgstr "" -#: classes/Notice.php:1059 +#: classes/Notice.php:790 +msgid "Problem saving group inbox." +msgstr "" + +#: classes/Notice.php:850 #, php-format msgid "DB error inserting reply: %s" msgstr "" -#: classes/Notice.php:1441 +#: classes/Notice.php:1233 #, php-format msgid "RT @%1$s %2$s" msgstr "" @@ -4162,136 +4216,136 @@ msgstr "" msgid "Untitled page" msgstr "" -#: lib/action.php:427 +#: lib/action.php:433 msgid "Primary site navigation" msgstr "" -#: lib/action.php:433 +#: lib/action.php:439 msgid "Home" msgstr "" -#: lib/action.php:433 +#: lib/action.php:439 msgid "Personal profile and friends timeline" msgstr "" -#: lib/action.php:435 +#: lib/action.php:441 msgid "Change your email, avatar, password, profile" msgstr "" -#: lib/action.php:438 +#: lib/action.php:444 msgid "Connect" msgstr "" -#: lib/action.php:438 +#: lib/action.php:444 msgid "Connect to services" msgstr "" -#: lib/action.php:442 +#: lib/action.php:448 msgid "Change site configuration" msgstr "" -#: lib/action.php:446 lib/subgroupnav.php:105 +#: lib/action.php:452 lib/subgroupnav.php:105 msgid "Invite" msgstr "" -#: lib/action.php:447 lib/subgroupnav.php:106 +#: lib/action.php:453 lib/subgroupnav.php:106 #, php-format msgid "Invite friends and colleagues to join you on %s" msgstr "" -#: lib/action.php:452 +#: lib/action.php:458 msgid "Logout" msgstr "" -#: lib/action.php:452 +#: lib/action.php:458 msgid "Logout from the site" msgstr "" -#: lib/action.php:457 +#: lib/action.php:463 msgid "Create an account" msgstr "" -#: lib/action.php:460 +#: lib/action.php:466 msgid "Login to the site" msgstr "" -#: lib/action.php:463 lib/action.php:726 +#: lib/action.php:469 lib/action.php:732 msgid "Help" msgstr "" -#: lib/action.php:463 +#: lib/action.php:469 msgid "Help me!" msgstr "" -#: lib/action.php:466 lib/searchaction.php:127 +#: lib/action.php:472 lib/searchaction.php:127 msgid "Search" msgstr "" -#: lib/action.php:466 +#: lib/action.php:472 msgid "Search for people or text" msgstr "" -#: lib/action.php:487 +#: lib/action.php:493 msgid "Site notice" msgstr "" -#: lib/action.php:553 +#: lib/action.php:559 msgid "Local views" msgstr "" -#: lib/action.php:619 +#: lib/action.php:625 msgid "Page notice" msgstr "" -#: lib/action.php:721 +#: lib/action.php:727 msgid "Secondary site navigation" msgstr "" -#: lib/action.php:728 +#: lib/action.php:734 msgid "About" msgstr "" -#: lib/action.php:730 +#: lib/action.php:736 msgid "FAQ" msgstr "" -#: lib/action.php:734 +#: lib/action.php:740 msgid "TOS" msgstr "" -#: lib/action.php:737 +#: lib/action.php:743 msgid "Privacy" msgstr "" -#: lib/action.php:739 +#: lib/action.php:745 msgid "Source" msgstr "" -#: lib/action.php:743 +#: lib/action.php:749 msgid "Contact" msgstr "" -#: lib/action.php:745 +#: lib/action.php:751 msgid "Badge" msgstr "" -#: lib/action.php:773 +#: lib/action.php:779 msgid "StatusNet software license" msgstr "" -#: lib/action.php:776 +#: lib/action.php:782 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." "broughtby%%](%%site.broughtbyurl%%). " msgstr "" -#: lib/action.php:778 +#: lib/action.php:784 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "" -#: lib/action.php:780 +#: lib/action.php:786 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4299,41 +4353,41 @@ msgid "" "org/licensing/licenses/agpl-3.0.html)." msgstr "" -#: lib/action.php:795 +#: lib/action.php:801 msgid "Site content license" msgstr "" -#: lib/action.php:800 +#: lib/action.php:806 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "" -#: lib/action.php:805 +#: lib/action.php:811 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" -#: lib/action.php:808 +#: lib/action.php:814 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" -#: lib/action.php:820 +#: lib/action.php:826 msgid "All " msgstr "" -#: lib/action.php:825 +#: lib/action.php:831 msgid "license." msgstr "" -#: lib/action.php:1124 +#: lib/action.php:1130 msgid "Pagination" msgstr "" -#: lib/action.php:1133 +#: lib/action.php:1139 msgid "After" msgstr "" -#: lib/action.php:1141 +#: lib/action.php:1147 msgid "Before" msgstr "" @@ -4365,10 +4419,22 @@ msgstr "" msgid "Design configuration" msgstr "" -#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327 +#: lib/adminpanelaction.php:322 +msgid "User configuration" +msgstr "" + +#: lib/adminpanelaction.php:327 +msgid "Access configuration" +msgstr "" + +#: lib/adminpanelaction.php:332 msgid "Paths configuration" msgstr "" +#: lib/applicationeditform.php:136 +msgid "Edit application" +msgstr "" + #: lib/applicationeditform.php:186 msgid "Icon for this application" msgstr "" @@ -4934,12 +5000,12 @@ msgstr "" msgid "kB" msgstr "" -#: lib/jabber.php:202 +#: lib/jabber.php:220 #, php-format msgid "[%s]" msgstr "" -#: lib/jabber.php:385 +#: lib/jabber.php:400 #, php-format msgid "Unknown inbox source %d." msgstr "" @@ -5347,19 +5413,19 @@ msgstr "" msgid "Favorites" msgstr "" -#: lib/personalgroupnav.php:124 +#: lib/personalgroupnav.php:125 msgid "Inbox" msgstr "" -#: lib/personalgroupnav.php:125 +#: lib/personalgroupnav.php:126 msgid "Your incoming messages" msgstr "" -#: lib/personalgroupnav.php:129 +#: lib/personalgroupnav.php:130 msgid "Outbox" msgstr "" -#: lib/personalgroupnav.php:130 +#: lib/personalgroupnav.php:131 msgid "Your sent messages" msgstr "" @@ -5601,47 +5667,47 @@ msgstr "" msgid "Moderate" msgstr "" -#: lib/util.php:875 +#: lib/util.php:868 msgid "a few seconds ago" msgstr "" -#: lib/util.php:877 +#: lib/util.php:870 msgid "about a minute ago" msgstr "" -#: lib/util.php:879 +#: lib/util.php:872 #, php-format msgid "about %d minutes ago" msgstr "" -#: lib/util.php:881 +#: lib/util.php:874 msgid "about an hour ago" msgstr "" -#: lib/util.php:883 +#: lib/util.php:876 #, php-format msgid "about %d hours ago" msgstr "" -#: lib/util.php:885 +#: lib/util.php:878 msgid "about a day ago" msgstr "" -#: lib/util.php:887 +#: lib/util.php:880 #, php-format msgid "about %d days ago" msgstr "" -#: lib/util.php:889 +#: lib/util.php:882 msgid "about a month ago" msgstr "" -#: lib/util.php:891 +#: lib/util.php:884 #, php-format msgid "about %d months ago" msgstr "" -#: lib/util.php:893 +#: lib/util.php:886 msgid "about a year ago" msgstr "" @@ -5655,7 +5721,7 @@ msgstr "" msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "" -#: scripts/xmppdaemon.php:301 +#: lib/xmppmanager.php:402 #, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" diff --git a/locale/sv/LC_MESSAGES/statusnet.po b/locale/sv/LC_MESSAGES/statusnet.po index 6046d5fe2a..6731f7dfc9 100644 --- a/locale/sv/LC_MESSAGES/statusnet.po +++ b/locale/sv/LC_MESSAGES/statusnet.po @@ -9,17 +9,72 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-21 22:36+0000\n" -"PO-Revision-Date: 2010-01-21 22:38:31+0000\n" +"POT-Creation-Date: 2010-01-27 23:58+0000\n" +"PO-Revision-Date: 2010-01-27 23:59:47+0000\n" "Language-Team: Swedish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r61339); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61595); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: sv\n" "X-Message-Group: out-statusnet\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#: actions/accessadminpanel.php:54 lib/adminpanelaction.php:326 +msgid "Access" +msgstr "Åtkomst" + +#: actions/accessadminpanel.php:65 +#, fuzzy +msgid "Site access settings" +msgstr "Spara webbplatsinställningar" + +#: actions/accessadminpanel.php:158 +#, fuzzy +msgid "Registration" +msgstr "Registrera" + +#: actions/accessadminpanel.php:161 +msgid "Private" +msgstr "Privat" + +#: actions/accessadminpanel.php:163 +msgid "Prohibit anonymous users (not logged in) from viewing site?" +msgstr "" +"Skall anonyma användare (inte inloggade) förhindras från att se webbplatsen?" + +#: actions/accessadminpanel.php:167 +msgid "Invite only" +msgstr "Endast inbjudan" + +#: actions/accessadminpanel.php:169 +msgid "Make registration invitation only." +msgstr "Gör så att registrering endast sker genom inbjudan." + +#: actions/accessadminpanel.php:173 +msgid "Closed" +msgstr "Stängd" + +#: actions/accessadminpanel.php:175 +msgid "Disable new registrations." +msgstr "Inaktivera nya registreringar." + +#: actions/accessadminpanel.php:189 actions/designadminpanel.php:586 +#: actions/emailsettings.php:195 actions/imsettings.php:163 +#: actions/othersettings.php:126 actions/pathsadminpanel.php:351 +#: actions/profilesettings.php:174 actions/siteadminpanel.php:336 +#: actions/smssettings.php:181 actions/subscriptions.php:203 +#: actions/tagother.php:154 actions/useradminpanel.php:313 +#: lib/applicationeditform.php:335 lib/applicationeditform.php:336 +#: lib/designsettings.php:256 lib/groupeditform.php:202 +msgid "Save" +msgstr "Spara" + +#: actions/accessadminpanel.php:189 +#, fuzzy +msgid "Save access settings" +msgstr "Spara webbplatsinställningar" + #: actions/all.php:63 actions/public.php:97 actions/replies.php:92 #: actions/showfavorites.php:137 actions/tag.php:51 msgid "No such page" @@ -34,7 +89,7 @@ msgstr "Ingen sådan sida" #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:149 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 @@ -140,8 +195,7 @@ msgstr "Uppdateringar från %1$s och vänner på %2$s!" #: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 #: actions/apitimelinefriends.php:155 actions/apitimelinegroup.php:150 #: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 -#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found." @@ -157,7 +211,7 @@ msgstr "API-metod hittades inte." #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:119 +#: actions/apistatusesupdate.php:118 msgid "This method requires a POST." msgstr "Denna metod kräver en POST." @@ -186,7 +240,7 @@ msgstr "Kunde inte spara profil." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:132 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 #: actions/designadminpanel.php:122 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -485,7 +539,14 @@ msgstr "En applikation skulle vilja ansluta till ditt konto" msgid "Allow or deny access" msgstr "Tillåt eller neka åtkomst" -#: actions/apioauthauthorize.php:320 lib/action.php:435 +#: actions/apioauthauthorize.php:306 +#, php-format +msgid "" +"The application %s by %s would like the " +"ability to %s your account data." +msgstr "" + +#: actions/apioauthauthorize.php:320 lib/action.php:441 msgid "Account" msgstr "Konto" @@ -542,17 +603,17 @@ msgstr "Status borttagen." msgid "No status with that ID found." msgstr "Ingen status med det ID:t hittades." -#: actions/apistatusesupdate.php:162 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Det är för långt. Maximal notisstorlek är %d tecken." -#: actions/apistatusesupdate.php:203 +#: actions/apistatusesupdate.php:202 msgid "Not found" msgstr "Hittades inte" -#: actions/apistatusesupdate.php:226 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "Maximal notisstorlek är %d tecken, inklusive URL för bilaga." @@ -603,11 +664,6 @@ msgstr "%s publika tidslinje" msgid "%s updates from everyone!" msgstr "%s uppdateringar från alla!" -#: actions/apitimelineretweetedbyme.php:112 -#, php-format -msgid "Repeated by %s" -msgstr "Upprepat av %s" - #: actions/apitimelineretweetedtome.php:111 #, php-format msgid "Repeated to %s" @@ -1017,17 +1073,6 @@ msgstr "Återställ standardutseende" msgid "Reset back to default" msgstr "Återställ till standardvärde" -#: actions/designadminpanel.php:586 actions/emailsettings.php:195 -#: actions/imsettings.php:163 actions/othersettings.php:126 -#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174 -#: actions/siteadminpanel.php:388 actions/smssettings.php:181 -#: actions/subscriptions.php:203 actions/tagother.php:154 -#: actions/useradminpanel.php:313 lib/applicationeditform.php:335 -#: lib/applicationeditform.php:336 lib/designsettings.php:256 -#: lib/groupeditform.php:202 -msgid "Save" -msgstr "Spara" - #: actions/designadminpanel.php:587 lib/designsettings.php:257 msgid "Save design" msgstr "Spara utseende" @@ -1040,12 +1085,14 @@ msgstr "Denna notis är inte en favorit!" msgid "Add to favorites" msgstr "Lägg till i favoriter" -#: actions/doc.php:69 -msgid "No such document." +#: actions/doc.php:155 +#, fuzzy, php-format +msgid "No such document \"%s\"" msgstr "Inget sådant dokument." -#: actions/editapplication.php:54 lib/applicationeditform.php:136 -msgid "Edit application" +#: actions/editapplication.php:54 +#, fuzzy +msgid "Edit Application" msgstr "Redigera applikation" #: actions/editapplication.php:66 @@ -1062,7 +1109,7 @@ msgid "No such application." msgstr "Ingen sådan applikation." #: actions/editapplication.php:127 actions/newapplication.php:110 -#: actions/showapplication.php:118 lib/action.php:1189 +#: actions/showapplication.php:118 lib/action.php:1195 msgid "There was a problem with your session token." msgstr "Det var ett problem med din sessions-token." @@ -1264,7 +1311,7 @@ msgid "Cannot normalize that email address" msgstr "Kan inte normalisera den e-postadressen" #: actions/emailsettings.php:331 actions/register.php:201 -#: actions/siteadminpanel.php:157 +#: actions/siteadminpanel.php:143 msgid "Not a valid email address." msgstr "Inte en giltig e-postadress." @@ -1276,7 +1323,7 @@ msgstr "Det är redan din e-postadress." msgid "That email address already belongs to another user." msgstr "Den e-postadressen tillhör redan en annan användare." -#: actions/emailsettings.php:353 actions/imsettings.php:317 +#: actions/emailsettings.php:353 actions/imsettings.php:319 #: actions/smssettings.php:337 msgid "Couldn't insert confirmation code." msgstr "Kunde inte infoga bekräftelsekod." @@ -1583,7 +1630,7 @@ msgstr "%1$s gruppmedlemmar, sida %2$d" msgid "A list of the users in this group." msgstr "En lista av användarna i denna grupp." -#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107 +#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107 msgid "Admin" msgstr "Administratör" @@ -1780,6 +1827,11 @@ msgstr "" msgid "That is not your Jabber ID." msgstr "Detta är inte ditt Jabber-ID." +#: actions/inbox.php:59 +#, fuzzy, php-format +msgid "Inbox for %1$s - page %2$d" +msgstr "Inkorg för %s" + #: actions/inbox.php:62 #, php-format msgid "Inbox for %s" @@ -1937,7 +1989,7 @@ msgstr "Felaktigt användarnamn eller lösenord." msgid "Error setting user. You are probably not authorized." msgstr "Fel vid inställning av användare. Du har sannolikt inte tillstånd." -#: actions/login.php:188 actions/login.php:241 lib/action.php:460 +#: actions/login.php:188 actions/login.php:241 lib/action.php:466 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Logga in" @@ -1999,7 +2051,8 @@ msgid "No current status" msgstr "Ingen aktuell status" #: actions/newapplication.php:52 -msgid "New application" +#, fuzzy +msgid "New Application" msgstr "Ny applikation" #: actions/newapplication.php:64 @@ -2192,8 +2245,8 @@ msgstr "innehållstyp " msgid "Only " msgstr "Bara " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1038 -#: lib/api.php:1066 lib/api.php:1176 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1039 +#: lib/api.php:1067 lib/api.php:1177 msgid "Not a supported data format." msgstr "Ett dataformat som inte stödjs" @@ -2257,6 +2310,11 @@ msgstr "Ogiltig inloggnings-token angiven." msgid "Login token expired." msgstr "Inloggnings-token förfallen." +#: actions/outbox.php:58 +#, fuzzy, php-format +msgid "Outbox for %1$s - page %2$d" +msgstr "Utkorg för %s" + #: actions/outbox.php:61 #, php-format msgid "Outbox for %s" @@ -2327,7 +2385,7 @@ msgstr "Kan inte spara nytt lösenord." msgid "Password saved." msgstr "Lösenord sparat." -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:331 msgid "Paths" msgstr "Sökvägar" @@ -2335,132 +2393,149 @@ msgstr "Sökvägar" msgid "Path and server settings for this StatusNet site." msgstr "Sökvägs- och serverinställningar för denna StatusNet-webbplats." -#: actions/pathsadminpanel.php:140 +#: actions/pathsadminpanel.php:157 #, php-format msgid "Theme directory not readable: %s" msgstr "Katalog med teman är inte läsbar: %s" -#: actions/pathsadminpanel.php:146 +#: actions/pathsadminpanel.php:163 #, php-format msgid "Avatar directory not writable: %s" msgstr "Katalog med avatarer är inte skrivbar: %s" -#: actions/pathsadminpanel.php:152 +#: actions/pathsadminpanel.php:169 #, php-format msgid "Background directory not writable: %s" msgstr "Katalog med bakgrunder är inte skrivbar: %s" -#: actions/pathsadminpanel.php:160 +#: actions/pathsadminpanel.php:177 #, php-format msgid "Locales directory not readable: %s" msgstr "Katalog med lokaliseringfiler (locales) är inte läsbar. %s" -#: actions/pathsadminpanel.php:166 +#: actions/pathsadminpanel.php:183 msgid "Invalid SSL server. The maximum length is 255 characters." msgstr "Ogiltigt SSL-servernamn. Den maximala längden är 255 tecken." -#: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58 +#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58 #: lib/adminpanelaction.php:311 msgid "Site" msgstr "Webbplats" -#: actions/pathsadminpanel.php:221 +#: actions/pathsadminpanel.php:238 +msgid "Server" +msgstr "Server" + +#: actions/pathsadminpanel.php:238 +msgid "Site's server hostname." +msgstr "Värdnamn för webbplatsens server." + +#: actions/pathsadminpanel.php:242 msgid "Path" msgstr "Sökväg" -#: actions/pathsadminpanel.php:221 +#: actions/pathsadminpanel.php:242 msgid "Site path" msgstr "Sökväg till webbplats" -#: actions/pathsadminpanel.php:225 +#: actions/pathsadminpanel.php:246 msgid "Path to locales" msgstr "Sökväg till lokaliseringfiler (locales)" -#: actions/pathsadminpanel.php:225 +#: actions/pathsadminpanel.php:246 msgid "Directory path to locales" msgstr "Katalogsökväg till lokaliseringfiler (locales)" -#: actions/pathsadminpanel.php:232 +#: actions/pathsadminpanel.php:250 +msgid "Fancy URLs" +msgstr "Utsmyckade URL:er" + +#: actions/pathsadminpanel.php:252 +msgid "Use fancy (more readable and memorable) URLs?" +msgstr "" +"Skall utsmyckade URL:er användas (mer läsbara och lättare att komma ihåg)?" + +#: actions/pathsadminpanel.php:259 msgid "Theme" msgstr "Teman" -#: actions/pathsadminpanel.php:237 +#: actions/pathsadminpanel.php:264 msgid "Theme server" msgstr "Server med teman" -#: actions/pathsadminpanel.php:241 +#: actions/pathsadminpanel.php:268 msgid "Theme path" msgstr "Sökväg till teman" -#: actions/pathsadminpanel.php:245 +#: actions/pathsadminpanel.php:272 msgid "Theme directory" msgstr "Katalog med teman" -#: actions/pathsadminpanel.php:252 +#: actions/pathsadminpanel.php:279 msgid "Avatars" msgstr "Avatarer" -#: actions/pathsadminpanel.php:257 +#: actions/pathsadminpanel.php:284 msgid "Avatar server" msgstr "Server med avatarer" -#: actions/pathsadminpanel.php:261 +#: actions/pathsadminpanel.php:288 msgid "Avatar path" msgstr "Sökväg till avatarer" -#: actions/pathsadminpanel.php:265 +#: actions/pathsadminpanel.php:292 msgid "Avatar directory" msgstr "Katalog med avatarer" -#: actions/pathsadminpanel.php:274 +#: actions/pathsadminpanel.php:301 msgid "Backgrounds" msgstr "Bakgrunder" -#: actions/pathsadminpanel.php:278 +#: actions/pathsadminpanel.php:305 msgid "Background server" msgstr "Server med bakgrunder" -#: actions/pathsadminpanel.php:282 +#: actions/pathsadminpanel.php:309 msgid "Background path" msgstr "Sökväg till bakgrunder" -#: actions/pathsadminpanel.php:286 +#: actions/pathsadminpanel.php:313 msgid "Background directory" msgstr "Katalog med bakgrunder" -#: actions/pathsadminpanel.php:293 +#: actions/pathsadminpanel.php:320 msgid "SSL" msgstr "SSL" -#: actions/pathsadminpanel.php:296 actions/siteadminpanel.php:346 +#: actions/pathsadminpanel.php:323 actions/siteadminpanel.php:294 msgid "Never" msgstr "Aldrig" -#: actions/pathsadminpanel.php:297 +#: actions/pathsadminpanel.php:324 msgid "Sometimes" msgstr "Ibland" -#: actions/pathsadminpanel.php:298 +#: actions/pathsadminpanel.php:325 msgid "Always" msgstr "Alltid" -#: actions/pathsadminpanel.php:302 +#: actions/pathsadminpanel.php:329 msgid "Use SSL" msgstr "Använd SSL" -#: actions/pathsadminpanel.php:303 +#: actions/pathsadminpanel.php:330 msgid "When to use SSL" msgstr "När SSL skall användas" -#: actions/pathsadminpanel.php:308 +#: actions/pathsadminpanel.php:335 msgid "SSL server" msgstr "SSL-server" -#: actions/pathsadminpanel.php:309 +#: actions/pathsadminpanel.php:336 msgid "Server to direct SSL requests to" msgstr "Server att dirigera SSL-begäran till" -#: actions/pathsadminpanel.php:325 +#: actions/pathsadminpanel.php:352 msgid "Save paths" msgstr "Spara sökvägar" @@ -2571,7 +2646,7 @@ msgstr "" "Taggar för dig själv (bokstäver, nummer, -, ., och _), separerade med " "kommatecken eller mellanslag" -#: actions/profilesettings.php:151 actions/siteadminpanel.php:294 +#: actions/profilesettings.php:151 actions/siteadminpanel.php:280 msgid "Language" msgstr "Språk" @@ -2599,7 +2674,7 @@ msgstr "" msgid "Bio is too long (max %d chars)." msgstr "Biografin är för lång (max %d tecken)." -#: actions/profilesettings.php:235 actions/siteadminpanel.php:164 +#: actions/profilesettings.php:235 actions/siteadminpanel.php:150 msgid "Timezone not selected." msgstr "Tidszon inte valt." @@ -2875,7 +2950,7 @@ msgstr "Tyvärr, ogiltig inbjudningskod." msgid "Registration successful" msgstr "Registreringen genomförd" -#: actions/register.php:114 actions/register.php:503 lib/action.php:457 +#: actions/register.php:114 actions/register.php:503 lib/action.php:463 #: lib/logingroupnav.php:85 msgid "Register" msgstr "Registrera" @@ -2919,7 +2994,7 @@ msgid "Same as password above. Required." msgstr "Samma som lösenordet ovan. Måste fyllas i." #: actions/register.php:438 actions/register.php:442 -#: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120 +#: actions/siteadminpanel.php:256 lib/accountsettingsaction.php:120 msgid "Email" msgstr "E-post" @@ -3065,6 +3140,11 @@ msgstr "Upprepad!" msgid "Replies to %s" msgstr "Svarat till %s" +#: actions/replies.php:127 +#, fuzzy, php-format +msgid "Replies to %1$s, page %2$d" +msgstr "Svar till %1$s på %2$s" + #: actions/replies.php:144 #, php-format msgid "Replies feed for %s (RSS 1.0)" @@ -3196,6 +3276,11 @@ msgstr "" "Notera: Vi stöjder HMAC-SHA1-signaturer. Vi stödjer inte metoden med " "klartextsignatur." +#: actions/showfavorites.php:79 +#, fuzzy, php-format +msgid "%1$s's favorite notices, page %2$d" +msgstr "%ss favoritnotiser" + #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "Kunde inte hämta favoritnotiser." @@ -3253,6 +3338,11 @@ msgstr "Detta är ett sätt att dela med av det du gillar." msgid "%s group" msgstr "%s grupp" +#: actions/showgroup.php:84 +#, fuzzy, php-format +msgid "%1$s group, page %2$d" +msgstr "%1$s gruppmedlemmar, sida %2$d" + #: actions/showgroup.php:218 msgid "Group profile" msgstr "Grupprofil" @@ -3372,6 +3462,11 @@ msgstr "Notis borttagen." msgid " tagged %s" msgstr "taggade %s" +#: actions/showstream.php:79 +#, fuzzy, php-format +msgid "%1$s, page %2$d" +msgstr "%1$s blockerade profiler, sida %2$d" + #: actions/showstream.php:122 #, php-format msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" @@ -3460,195 +3555,145 @@ msgstr "Användaren är redan nedtystad." msgid "Basic settings for this StatusNet site." msgstr "Grundinställningar för din StatusNet-webbplats" -#: actions/siteadminpanel.php:146 +#: actions/siteadminpanel.php:132 msgid "Site name must have non-zero length." msgstr "Webbplatsnamnet måste vara minst ett tecken långt." -#: actions/siteadminpanel.php:154 +#: actions/siteadminpanel.php:140 msgid "You must have a valid contact email address." msgstr "Du måste ha en giltig e-postadress." -#: actions/siteadminpanel.php:172 +#: actions/siteadminpanel.php:158 #, php-format msgid "Unknown language \"%s\"." msgstr "Okänt språk \"%s\"." -#: actions/siteadminpanel.php:179 +#: actions/siteadminpanel.php:165 msgid "Invalid snapshot report URL." msgstr "Ogiltig rapport-URL för ögonblicksbild" -#: actions/siteadminpanel.php:185 +#: actions/siteadminpanel.php:171 msgid "Invalid snapshot run value." msgstr "Ogiltigt körvärde för ögonblicksbild." -#: actions/siteadminpanel.php:191 +#: actions/siteadminpanel.php:177 msgid "Snapshot frequency must be a number." msgstr "Frekvens för ögonblicksbilder måste vara ett nummer." -#: actions/siteadminpanel.php:197 +#: actions/siteadminpanel.php:183 msgid "Minimum text limit is 140 characters." msgstr "Minsta textbegränsning är 140 tecken." -#: actions/siteadminpanel.php:203 +#: actions/siteadminpanel.php:189 msgid "Dupe limit must 1 or more seconds." msgstr "Begränsning av duplikat måste vara en eller fler sekuner." -#: actions/siteadminpanel.php:253 +#: actions/siteadminpanel.php:239 msgid "General" msgstr "Allmänt" -#: actions/siteadminpanel.php:256 +#: actions/siteadminpanel.php:242 msgid "Site name" msgstr "Webbplatsnamn" -#: actions/siteadminpanel.php:257 +#: actions/siteadminpanel.php:243 msgid "The name of your site, like \"Yourcompany Microblog\"" msgstr "Namnet på din webbplats, t.ex. \"Företagsnamn mikroblogg\"" -#: actions/siteadminpanel.php:261 +#: actions/siteadminpanel.php:247 msgid "Brought by" msgstr "Tillhandahållen av" -#: actions/siteadminpanel.php:262 +#: actions/siteadminpanel.php:248 msgid "Text used for credits link in footer of each page" msgstr "Text som används för tillskrivningslänkar i sidfoten på varje sida." -#: actions/siteadminpanel.php:266 +#: actions/siteadminpanel.php:252 msgid "Brought by URL" msgstr "Tillhandahållen av URL" -#: actions/siteadminpanel.php:267 +#: actions/siteadminpanel.php:253 msgid "URL used for credits link in footer of each page" msgstr "URL som används för tillskrivningslänkar i sidfoten på varje sida" -#: actions/siteadminpanel.php:271 +#: actions/siteadminpanel.php:257 msgid "Contact email address for your site" msgstr "Kontakte-postadress för din webbplats" -#: actions/siteadminpanel.php:277 +#: actions/siteadminpanel.php:263 msgid "Local" msgstr "Lokal" -#: actions/siteadminpanel.php:288 +#: actions/siteadminpanel.php:274 msgid "Default timezone" msgstr "Standardtidszon" -#: actions/siteadminpanel.php:289 +#: actions/siteadminpanel.php:275 msgid "Default timezone for the site; usually UTC." msgstr "Standardtidzon för denna webbplats; vanligtvis UTC." -#: actions/siteadminpanel.php:295 +#: actions/siteadminpanel.php:281 msgid "Default site language" msgstr "Webbplatsens standardspråk" -#: actions/siteadminpanel.php:303 -msgid "URLs" -msgstr "URL:er" - -#: actions/siteadminpanel.php:306 -msgid "Server" -msgstr "Server" - -#: actions/siteadminpanel.php:306 -msgid "Site's server hostname." -msgstr "Värdnamn för webbplatsens server." - -#: actions/siteadminpanel.php:310 -msgid "Fancy URLs" -msgstr "Utsmyckade URL:er" - -#: actions/siteadminpanel.php:312 -msgid "Use fancy (more readable and memorable) URLs?" -msgstr "" -"Skall utsmyckade URL:er användas (mer läsbara och lättare att komma ihåg)?" - -#: actions/siteadminpanel.php:318 -msgid "Access" -msgstr "Åtkomst" - -#: actions/siteadminpanel.php:321 -msgid "Private" -msgstr "Privat" - -#: actions/siteadminpanel.php:323 -msgid "Prohibit anonymous users (not logged in) from viewing site?" -msgstr "" -"Skall anonyma användare (inte inloggade) förhindras från att se webbplatsen?" - -#: actions/siteadminpanel.php:327 -msgid "Invite only" -msgstr "Endast inbjudan" - -#: actions/siteadminpanel.php:329 -msgid "Make registration invitation only." -msgstr "Gör så att registrering endast sker genom inbjudan." - -#: actions/siteadminpanel.php:333 -msgid "Closed" -msgstr "Stängd" - -#: actions/siteadminpanel.php:335 -msgid "Disable new registrations." -msgstr "Inaktivera nya registreringar." - -#: actions/siteadminpanel.php:341 +#: actions/siteadminpanel.php:289 msgid "Snapshots" msgstr "Ögonblicksbild" -#: actions/siteadminpanel.php:344 +#: actions/siteadminpanel.php:292 msgid "Randomly during Web hit" msgstr "Slumpmässigt vid webbförfrågningar" -#: actions/siteadminpanel.php:345 +#: actions/siteadminpanel.php:293 msgid "In a scheduled job" msgstr "I ett schemalagt jobb" -#: actions/siteadminpanel.php:347 +#: actions/siteadminpanel.php:295 msgid "Data snapshots" msgstr "Ögonblicksbild av data" -#: actions/siteadminpanel.php:348 +#: actions/siteadminpanel.php:296 msgid "When to send statistical data to status.net servers" msgstr "När statistikdata skall skickas till status.net-servrar" -#: actions/siteadminpanel.php:353 +#: actions/siteadminpanel.php:301 msgid "Frequency" msgstr "Frekvens" -#: actions/siteadminpanel.php:354 +#: actions/siteadminpanel.php:302 msgid "Snapshots will be sent once every N web hits" msgstr "Ögonblicksbild kommer skickas var N:te webbträff" -#: actions/siteadminpanel.php:359 +#: actions/siteadminpanel.php:307 msgid "Report URL" msgstr "URL för rapport" -#: actions/siteadminpanel.php:360 +#: actions/siteadminpanel.php:308 msgid "Snapshots will be sent to this URL" msgstr "Ögonblicksbild kommer skickat till denna URL" -#: actions/siteadminpanel.php:367 +#: actions/siteadminpanel.php:315 msgid "Limits" msgstr "Begränsningar" -#: actions/siteadminpanel.php:370 +#: actions/siteadminpanel.php:318 msgid "Text limit" msgstr "Textbegränsning" -#: actions/siteadminpanel.php:370 +#: actions/siteadminpanel.php:318 msgid "Maximum number of characters for notices." msgstr "Maximala antalet tecken för notiser." -#: actions/siteadminpanel.php:374 +#: actions/siteadminpanel.php:322 msgid "Dupe limit" msgstr "Duplikatbegränsning" -#: actions/siteadminpanel.php:374 +#: actions/siteadminpanel.php:322 msgid "How long users must wait (in seconds) to post the same thing again." msgstr "" "Hur länge användare måste vänta (i sekunder) för att posta samma sak igen." -#: actions/siteadminpanel.php:388 actions/useradminpanel.php:313 +#: actions/siteadminpanel.php:336 actions/useradminpanel.php:313 msgid "Save site settings" msgstr "Spara webbplatsinställningar" @@ -3856,6 +3901,11 @@ msgstr "Jabber" msgid "SMS" msgstr "SMS" +#: actions/tag.php:68 +#, fuzzy, php-format +msgid "Notices tagged with %1$s, page %2$d" +msgstr "Användare som taggat sig själv med %1$s - sida %2$d" + #: actions/tag.php:86 #, php-format msgid "Notice feed for tag %s (RSS 1.0)" @@ -4158,6 +4208,11 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "Smaklig måltid!" +#: actions/usergroups.php:64 +#, fuzzy, php-format +msgid "%1$s groups, page %2$d" +msgstr "%1$s gruppmedlemmar, sida %2$d" + #: actions/usergroups.php:130 msgid "Search for more groups" msgstr "Sök efter fler grupper" @@ -4232,7 +4287,7 @@ msgstr "" msgid "Plugins" msgstr "Insticksmoduler" -#: actions/version.php:196 lib/action.php:741 +#: actions/version.php:196 lib/action.php:747 msgid "Version" msgstr "Version" @@ -4288,27 +4343,27 @@ msgstr "Kunde inte infoga meddelande." msgid "Could not update message with new URI." msgstr "Kunde inte uppdatera meddelande med ny URI." -#: classes/Notice.php:171 +#: classes/Notice.php:157 #, php-format msgid "DB error inserting hashtag: %s" msgstr "Databasfel vid infogning av hashtag: %s" -#: classes/Notice.php:225 +#: classes/Notice.php:214 msgid "Problem saving notice. Too long." msgstr "Problem vid sparande av notis. För långt." -#: classes/Notice.php:229 +#: classes/Notice.php:218 msgid "Problem saving notice. Unknown user." msgstr "Problem vid sparande av notis. Okänd användare." -#: classes/Notice.php:234 +#: classes/Notice.php:223 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "För många notiser för snabbt; ta en vilopaus och posta igen om ett par " "minuter." -#: classes/Notice.php:240 +#: classes/Notice.php:229 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." @@ -4316,20 +4371,25 @@ msgstr "" "För många duplicerade meddelanden för snabbt; ta en vilopaus och posta igen " "om ett par minuter." -#: classes/Notice.php:246 +#: classes/Notice.php:235 msgid "You are banned from posting notices on this site." msgstr "Du är utestängd från att posta notiser på denna webbplats." -#: classes/Notice.php:305 classes/Notice.php:330 +#: classes/Notice.php:294 classes/Notice.php:319 msgid "Problem saving notice." msgstr "Problem med att spara notis." -#: classes/Notice.php:1059 +#: classes/Notice.php:790 +#, fuzzy +msgid "Problem saving group inbox." +msgstr "Problem med att spara notis." + +#: classes/Notice.php:850 #, php-format msgid "DB error inserting reply: %s" msgstr "Databasfel vid infogning av svar: %s" -#: classes/Notice.php:1441 +#: classes/Notice.php:1233 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -4384,124 +4444,124 @@ msgstr "%1$s - %2$s" msgid "Untitled page" msgstr "Namnlös sida" -#: lib/action.php:427 +#: lib/action.php:433 msgid "Primary site navigation" msgstr "Primär webbplatsnavigation" -#: lib/action.php:433 +#: lib/action.php:439 msgid "Home" msgstr "Hem" -#: lib/action.php:433 +#: lib/action.php:439 msgid "Personal profile and friends timeline" msgstr "Personlig profil och vänners tidslinje" -#: lib/action.php:435 +#: lib/action.php:441 msgid "Change your email, avatar, password, profile" msgstr "Ändra din e-post, avatar, lösenord, profil" -#: lib/action.php:438 +#: lib/action.php:444 msgid "Connect" msgstr "Anslut" -#: lib/action.php:438 +#: lib/action.php:444 msgid "Connect to services" msgstr "Anslut till tjänster" -#: lib/action.php:442 +#: lib/action.php:448 msgid "Change site configuration" msgstr "Ändra webbplatskonfiguration" -#: lib/action.php:446 lib/subgroupnav.php:105 +#: lib/action.php:452 lib/subgroupnav.php:105 msgid "Invite" msgstr "Bjud in" -#: lib/action.php:447 lib/subgroupnav.php:106 +#: lib/action.php:453 lib/subgroupnav.php:106 #, php-format msgid "Invite friends and colleagues to join you on %s" msgstr "Bjud in vänner och kollegor att gå med dig på %s" -#: lib/action.php:452 +#: lib/action.php:458 msgid "Logout" msgstr "Logga ut" -#: lib/action.php:452 +#: lib/action.php:458 msgid "Logout from the site" msgstr "Logga ut från webbplatsen" -#: lib/action.php:457 +#: lib/action.php:463 msgid "Create an account" msgstr "Skapa ett konto" -#: lib/action.php:460 +#: lib/action.php:466 msgid "Login to the site" msgstr "Logga in på webbplatsen" -#: lib/action.php:463 lib/action.php:726 +#: lib/action.php:469 lib/action.php:732 msgid "Help" msgstr "Hjälp" -#: lib/action.php:463 +#: lib/action.php:469 msgid "Help me!" msgstr "Hjälp mig!" -#: lib/action.php:466 lib/searchaction.php:127 +#: lib/action.php:472 lib/searchaction.php:127 msgid "Search" msgstr "Sök" -#: lib/action.php:466 +#: lib/action.php:472 msgid "Search for people or text" msgstr "Sök efter personer eller text" -#: lib/action.php:487 +#: lib/action.php:493 msgid "Site notice" msgstr "Webbplatsnotis" -#: lib/action.php:553 +#: lib/action.php:559 msgid "Local views" msgstr "Lokala vyer" -#: lib/action.php:619 +#: lib/action.php:625 msgid "Page notice" msgstr "Sidnotis" -#: lib/action.php:721 +#: lib/action.php:727 msgid "Secondary site navigation" msgstr "Sekundär webbplatsnavigation" -#: lib/action.php:728 +#: lib/action.php:734 msgid "About" msgstr "Om" -#: lib/action.php:730 +#: lib/action.php:736 msgid "FAQ" msgstr "Frågor & svar" -#: lib/action.php:734 +#: lib/action.php:740 msgid "TOS" msgstr "Användarvillkor" -#: lib/action.php:737 +#: lib/action.php:743 msgid "Privacy" msgstr "Sekretess" -#: lib/action.php:739 +#: lib/action.php:745 msgid "Source" msgstr "Källa" -#: lib/action.php:743 +#: lib/action.php:749 msgid "Contact" msgstr "Kontakt" -#: lib/action.php:745 +#: lib/action.php:751 msgid "Badge" msgstr "Emblem" -#: lib/action.php:773 +#: lib/action.php:779 msgid "StatusNet software license" msgstr "Programvarulicens för StatusNet" -#: lib/action.php:776 +#: lib/action.php:782 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -4510,12 +4570,12 @@ msgstr "" "**%%site.name%%** är en mikrobloggtjänst tillhandahållen av [%%site.broughtby" "%%](%%site.broughtbyurl%%). " -#: lib/action.php:778 +#: lib/action.php:784 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "**%%site.name%%** är en mikrobloggtjänst." -#: lib/action.php:780 +#: lib/action.php:786 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4526,41 +4586,41 @@ msgstr "" "version %s, tillgänglig under [GNU Affero General Public License](http://www." "fsf.org/licensing/licenses/agpl-3.0.html)." -#: lib/action.php:795 +#: lib/action.php:801 msgid "Site content license" msgstr "Licens för webbplatsinnehåll" -#: lib/action.php:800 +#: lib/action.php:806 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "" -#: lib/action.php:805 +#: lib/action.php:811 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" -#: lib/action.php:808 +#: lib/action.php:814 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" -#: lib/action.php:820 +#: lib/action.php:826 msgid "All " msgstr "Alla " -#: lib/action.php:825 +#: lib/action.php:831 msgid "license." msgstr "licens." -#: lib/action.php:1124 +#: lib/action.php:1130 msgid "Pagination" msgstr "Numrering av sidor" -#: lib/action.php:1133 +#: lib/action.php:1139 msgid "After" msgstr "Senare" -#: lib/action.php:1141 +#: lib/action.php:1147 msgid "Before" msgstr "Tidigare" @@ -4592,10 +4652,24 @@ msgstr "Grundläggande webbplatskonfiguration" msgid "Design configuration" msgstr "Konfiguration av utseende" -#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327 +#: lib/adminpanelaction.php:322 +#, fuzzy +msgid "User configuration" +msgstr "Konfiguration av sökvägar" + +#: lib/adminpanelaction.php:327 +#, fuzzy +msgid "Access configuration" +msgstr "Konfiguration av utseende" + +#: lib/adminpanelaction.php:332 msgid "Paths configuration" msgstr "Konfiguration av sökvägar" +#: lib/applicationeditform.php:136 +msgid "Edit application" +msgstr "Redigera applikation" + #: lib/applicationeditform.php:186 msgid "Icon for this application" msgstr "Ikon för denna applikation" @@ -5168,12 +5242,12 @@ msgstr "MB" msgid "kB" msgstr "kB" -#: lib/jabber.php:202 +#: lib/jabber.php:220 #, php-format msgid "[%s]" msgstr "[%s]" -#: lib/jabber.php:385 +#: lib/jabber.php:400 #, php-format msgid "Unknown inbox source %d." msgstr "Okänd källa för inkorg %d." @@ -5598,19 +5672,19 @@ msgstr "Svar" msgid "Favorites" msgstr "Favoriter" -#: lib/personalgroupnav.php:124 +#: lib/personalgroupnav.php:125 msgid "Inbox" msgstr "Inkorg" -#: lib/personalgroupnav.php:125 +#: lib/personalgroupnav.php:126 msgid "Your incoming messages" msgstr "Dina inkommande meddelanden" -#: lib/personalgroupnav.php:129 +#: lib/personalgroupnav.php:130 msgid "Outbox" msgstr "Utkorg" -#: lib/personalgroupnav.php:130 +#: lib/personalgroupnav.php:131 msgid "Your sent messages" msgstr "Dina skickade meddelanden" @@ -5852,47 +5926,47 @@ msgstr "Meddelande" msgid "Moderate" msgstr "Moderera" -#: lib/util.php:875 +#: lib/util.php:868 msgid "a few seconds ago" msgstr "ett par sekunder sedan" -#: lib/util.php:877 +#: lib/util.php:870 msgid "about a minute ago" msgstr "för nån minut sedan" -#: lib/util.php:879 +#: lib/util.php:872 #, php-format msgid "about %d minutes ago" msgstr "för %d minuter sedan" -#: lib/util.php:881 +#: lib/util.php:874 msgid "about an hour ago" msgstr "för en timma sedan" -#: lib/util.php:883 +#: lib/util.php:876 #, php-format msgid "about %d hours ago" msgstr "för %d timmar sedan" -#: lib/util.php:885 +#: lib/util.php:878 msgid "about a day ago" msgstr "för en dag sedan" -#: lib/util.php:887 +#: lib/util.php:880 #, php-format msgid "about %d days ago" msgstr "för %d dagar sedan" -#: lib/util.php:889 +#: lib/util.php:882 msgid "about a month ago" msgstr "för en månad sedan" -#: lib/util.php:891 +#: lib/util.php:884 #, php-format msgid "about %d months ago" msgstr "för %d månader sedan" -#: lib/util.php:893 +#: lib/util.php:886 msgid "about a year ago" msgstr "för ett år sedan" @@ -5906,7 +5980,7 @@ msgstr "%s är inte en giltig färg!" msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "%s är inte en giltig färg! Använd 3 eller 6 hexadecimala tecken." -#: scripts/xmppdaemon.php:301 +#: lib/xmppmanager.php:402 #, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "Meddelande för långt - maximum är %1$d tecken, du skickade %2$d." diff --git a/locale/te/LC_MESSAGES/statusnet.po b/locale/te/LC_MESSAGES/statusnet.po index 4b313d88f0..54579428cb 100644 --- a/locale/te/LC_MESSAGES/statusnet.po +++ b/locale/te/LC_MESSAGES/statusnet.po @@ -8,17 +8,73 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-21 22:36+0000\n" -"PO-Revision-Date: 2010-01-21 22:38:34+0000\n" +"POT-Creation-Date: 2010-01-27 23:58+0000\n" +"PO-Revision-Date: 2010-01-27 23:59:50+0000\n" "Language-Team: Telugu\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r61339); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61595); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: te\n" "X-Message-Group: out-statusnet\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#: actions/accessadminpanel.php:54 lib/adminpanelaction.php:326 +#, fuzzy +msgid "Access" +msgstr "అంగీకరించు" + +#: actions/accessadminpanel.php:65 +#, fuzzy +msgid "Site access settings" +msgstr "సైటు అమరికలను భద్రపరచు" + +#: actions/accessadminpanel.php:158 +#, fuzzy +msgid "Registration" +msgstr "నమోదు" + +#: actions/accessadminpanel.php:161 +msgid "Private" +msgstr "అంతరంగికం" + +#: actions/accessadminpanel.php:163 +msgid "Prohibit anonymous users (not logged in) from viewing site?" +msgstr "అజ్ఞాత (ప్రవేశించని) వాడుకరులని సైటుని చూడకుండా నిషేధించాలా?" + +#: actions/accessadminpanel.php:167 +msgid "Invite only" +msgstr "ఆహ్వానితులకు మాత్రమే" + +#: actions/accessadminpanel.php:169 +msgid "Make registration invitation only." +msgstr "ఆహ్వానితులు మాత్రమే నమోదు అవ్వగలిగేలా చెయ్యి." + +#: actions/accessadminpanel.php:173 +#, fuzzy +msgid "Closed" +msgstr "అటువంటి వాడుకరి లేరు." + +#: actions/accessadminpanel.php:175 +msgid "Disable new registrations." +msgstr "కొత్త నమోదులను అచేతనంచేయి." + +#: actions/accessadminpanel.php:189 actions/designadminpanel.php:586 +#: actions/emailsettings.php:195 actions/imsettings.php:163 +#: actions/othersettings.php:126 actions/pathsadminpanel.php:351 +#: actions/profilesettings.php:174 actions/siteadminpanel.php:336 +#: actions/smssettings.php:181 actions/subscriptions.php:203 +#: actions/tagother.php:154 actions/useradminpanel.php:313 +#: lib/applicationeditform.php:335 lib/applicationeditform.php:336 +#: lib/designsettings.php:256 lib/groupeditform.php:202 +msgid "Save" +msgstr "భద్రపరచు" + +#: actions/accessadminpanel.php:189 +#, fuzzy +msgid "Save access settings" +msgstr "సైటు అమరికలను భద్రపరచు" + #: actions/all.php:63 actions/public.php:97 actions/replies.php:92 #: actions/showfavorites.php:137 actions/tag.php:51 msgid "No such page" @@ -33,7 +89,7 @@ msgstr "అటువంటి పేజీ లేదు" #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:149 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 @@ -132,8 +188,7 @@ msgstr "" #: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 #: actions/apitimelinefriends.php:155 actions/apitimelinegroup.php:150 #: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 -#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 #, fuzzy @@ -150,7 +205,7 @@ msgstr "నిర్ధారణ సంకేతం కనబడలేదు." #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:119 +#: actions/apistatusesupdate.php:118 msgid "This method requires a POST." msgstr "" @@ -181,7 +236,7 @@ msgstr "ప్రొఫైలుని భద్రపరచలేకున్ #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:132 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 #: actions/designadminpanel.php:122 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -441,9 +496,8 @@ msgid "There was a problem with your session token. Try again, please." msgstr "" #: actions/apioauthauthorize.php:146 -#, fuzzy msgid "Invalid nickname / password!" -msgstr "వాడుకరిపేరు లేదా సంకేతపదం తప్పు." +msgstr "తప్పుడు పేరు / సంకేతపదం!" #: actions/apioauthauthorize.php:170 msgid "DB error deleting OAuth app user." @@ -483,7 +537,14 @@ msgstr "" msgid "Allow or deny access" msgstr "" -#: actions/apioauthauthorize.php:320 lib/action.php:435 +#: actions/apioauthauthorize.php:306 +#, php-format +msgid "" +"The application %s by %s would like the " +"ability to %s your account data." +msgstr "" + +#: actions/apioauthauthorize.php:320 lib/action.php:441 msgid "Account" msgstr "ఖాతా" @@ -542,17 +603,17 @@ msgstr "స్థితిని తొలగించాం." msgid "No status with that ID found." msgstr "" -#: actions/apistatusesupdate.php:162 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "అది చాలా పొడవుంది. గరిష్ఠ నోటీసు పరిమాణం %d అక్షరాలు." -#: actions/apistatusesupdate.php:203 +#: actions/apistatusesupdate.php:202 msgid "Not found" msgstr "దొరకలేదు" -#: actions/apistatusesupdate.php:226 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "గరిష్ఠ నోటీసు పొడవు %d అక్షరాలు, జోడింపు URLని కలుపుకుని." @@ -603,11 +664,6 @@ msgstr "%s బహిరంగ కాలరేఖ" msgid "%s updates from everyone!" msgstr "" -#: actions/apitimelineretweetedbyme.php:112 -#, php-format -msgid "Repeated by %s" -msgstr "" - #: actions/apitimelineretweetedtome.php:111 #, fuzzy, php-format msgid "Repeated to %s" @@ -916,7 +972,7 @@ msgstr "రూపురేఖలు" #: actions/designadminpanel.php:73 msgid "Design settings for this StatusNet site." -msgstr "" +msgstr "ఈ స్టేటస్‌నెట్ సైటుకి రూపురేఖల అమరికలు." #: actions/designadminpanel.php:275 msgid "Invalid logo URL." @@ -1011,17 +1067,6 @@ msgstr "" msgid "Reset back to default" msgstr "" -#: actions/designadminpanel.php:586 actions/emailsettings.php:195 -#: actions/imsettings.php:163 actions/othersettings.php:126 -#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174 -#: actions/siteadminpanel.php:388 actions/smssettings.php:181 -#: actions/subscriptions.php:203 actions/tagother.php:154 -#: actions/useradminpanel.php:313 lib/applicationeditform.php:335 -#: lib/applicationeditform.php:336 lib/designsettings.php:256 -#: lib/groupeditform.php:202 -msgid "Save" -msgstr "భద్రపరచు" - #: actions/designadminpanel.php:587 lib/designsettings.php:257 msgid "Save design" msgstr "రూపురేఖలని భద్రపరచు" @@ -1034,44 +1079,41 @@ msgstr "ఈ నోటీసు ఇష్టాంశం కాదు!" msgid "Add to favorites" msgstr "ఇష్టాంశాలకు చేర్చు" -#: actions/doc.php:69 -msgid "No such document." +#: actions/doc.php:155 +#, fuzzy, php-format +msgid "No such document \"%s\"" msgstr "అటువంటి పత్రమేమీ లేదు." -#: actions/editapplication.php:54 lib/applicationeditform.php:136 -msgid "Edit application" -msgstr "" +#: actions/editapplication.php:54 +#, fuzzy +msgid "Edit Application" +msgstr "ఉపకరణాన్ని మార్చు" #: actions/editapplication.php:66 -#, fuzzy msgid "You must be logged in to edit an application." -msgstr "గుంపుని మార్చడానికి మీరు ప్రవేశించి ఉండాలి." +msgstr "ఉపకరణాలని మార్చడానికి మీరు ప్రవేశించి ఉండాలి." #: actions/editapplication.php:77 actions/showapplication.php:94 -#, fuzzy msgid "You are not the owner of this application." -msgstr "మీరు ఈ గుంపులో సభ్యులు కాదు." +msgstr "మీరు ఈ ఉపకరణం యొక్క యజమాని కాదు." #: actions/editapplication.php:81 actions/oauthconnectionssettings.php:163 #: actions/showapplication.php:87 -#, fuzzy msgid "No such application." -msgstr "అటువంటి సందేశమేమీ లేదు." +msgstr "అటువంటి ఉపకరణం లేదు." #: actions/editapplication.php:127 actions/newapplication.php:110 -#: actions/showapplication.php:118 lib/action.php:1189 +#: actions/showapplication.php:118 lib/action.php:1195 msgid "There was a problem with your session token." msgstr "" #: actions/editapplication.php:161 -#, fuzzy msgid "Use this form to edit your application." -msgstr "గుంపుని మార్చడానికి ఈ ఫారాన్ని ఉపయోగించండి." +msgstr "మీ ఉపకరణాన్ని మార్చడానికి ఈ ఫారాన్ని ఉపయోగించండి." #: actions/editapplication.php:177 actions/newapplication.php:159 -#, fuzzy msgid "Name is required." -msgstr "పై సంకేతపదం మరోసారి. తప్పనిసరి." +msgstr "పేరు తప్పనిసరి." #: actions/editapplication.php:180 actions/newapplication.php:162 msgid "Name is too long (max 255 chars)." @@ -1095,9 +1137,8 @@ msgid "Organization is required." msgstr "సంస్థ తప్పనిసరి." #: actions/editapplication.php:203 actions/newapplication.php:188 -#, fuzzy msgid "Organization is too long (max 255 chars)." -msgstr "ప్రాంతం పేరు మరీ పెద్దగా ఉంది (255 అక్షరాలు గరిష్ఠం)." +msgstr "సంస్థ పేరు మరీ పెద్దగా ఉంది (255 అక్షరాలు గరిష్ఠం)." #: actions/editapplication.php:206 actions/newapplication.php:191 msgid "Organization homepage is required." @@ -1263,7 +1304,7 @@ msgid "Cannot normalize that email address" msgstr "" #: actions/emailsettings.php:331 actions/register.php:201 -#: actions/siteadminpanel.php:157 +#: actions/siteadminpanel.php:143 msgid "Not a valid email address." msgstr "సరైన ఈమెయిల్ చిరునామా కాదు:" @@ -1275,7 +1316,7 @@ msgstr "అది ఇప్పటికే మీ ఈమెయిల్ చి msgid "That email address already belongs to another user." msgstr "ఆ ఈమెయిల్ చిరునామా ఇప్పటేకే ఇతర వాడుకరికి సంబంధించినది." -#: actions/emailsettings.php:353 actions/imsettings.php:317 +#: actions/emailsettings.php:353 actions/imsettings.php:319 #: actions/smssettings.php:337 msgid "Couldn't insert confirmation code." msgstr "నిర్ధారణ సంకేతాన్ని చేర్చలేకపోయాం." @@ -1563,15 +1604,15 @@ msgid "%s group members" msgstr "%s గుంపు సభ్యులు" #: actions/groupmembers.php:96 -#, fuzzy, php-format +#, php-format msgid "%1$s group members, page %2$d" -msgstr "%s గుంపు సభ్యులు, పేజీ %d" +msgstr "%1$s గుంపు సభ్యులు, పేజీ %2$d" #: actions/groupmembers.php:111 msgid "A list of the users in this group." msgstr "ఈ గుంపులో వాడుకరులు జాబితా." -#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107 +#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107 msgid "Admin" msgstr "" @@ -1749,6 +1790,11 @@ msgstr "" msgid "That is not your Jabber ID." msgstr "ఇది మీ Jabber ID కాదు" +#: actions/inbox.php:59 +#, fuzzy, php-format +msgid "Inbox for %1$s - page %2$d" +msgstr "%sకి వచ్చినవి" + #: actions/inbox.php:62 #, php-format msgid "Inbox for %s" @@ -1899,7 +1945,7 @@ msgstr "వాడుకరిపేరు లేదా సంకేతపదం msgid "Error setting user. You are probably not authorized." msgstr "" -#: actions/login.php:188 actions/login.php:241 lib/action.php:460 +#: actions/login.php:188 actions/login.php:241 lib/action.php:466 #: lib/logingroupnav.php:79 msgid "Login" msgstr "ప్రవేశించండి" @@ -1960,18 +2006,17 @@ msgid "No current status" msgstr "ప్రస్తుత స్థితి ఏమీ లేదు" #: actions/newapplication.php:52 -msgid "New application" -msgstr "" +#, fuzzy +msgid "New Application" +msgstr "కొత్త ఉపకరణం" #: actions/newapplication.php:64 -#, fuzzy msgid "You must be logged in to register an application." -msgstr "గుంపుని సృష్టించడానికి మీరు లోనికి ప్రవేశించాలి." +msgstr "ఉపకరణాలని నమోదుచేసుకోడానికి మీరు లోనికి ప్రవేశించి ఉండాలి." #: actions/newapplication.php:143 -#, fuzzy msgid "Use this form to register a new application." -msgstr "కొత్త గుంపుని సృష్టిండానికి ఈ ఫారాన్ని ఉపయోగించండి." +msgstr "కొత్త ఉపకరణాన్ని నమోదుచేసుకోడానికి ఈ ఫారాన్ని ఉపయోగించండి." #: actions/newapplication.php:173 msgid "Source URL is required." @@ -2065,6 +2110,8 @@ msgid "" "Why not [register an account](%%%%action.register%%%%) and be the first to " "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!" msgstr "" +"మీరు [ఒక ఖాతా నమోదు చేసుకుని](%%%%action.register%%%%) [ఈ విషయంపై వ్రాసే](%%%%action." +"newnotice%%%%?status_textarea=%s) మొదటివారు ఎందుకుకాకూడదు!" #: actions/noticesearchrss.php:96 #, fuzzy, php-format @@ -2090,9 +2137,8 @@ msgid "Nudge sent!" msgstr "" #: actions/oauthappssettings.php:59 -#, fuzzy msgid "You must be logged in to list your applications." -msgstr "గుంపుని మార్చడానికి మీరు ప్రవేశించి ఉండాలి." +msgstr "మీ ఉపకరణాలను చూడడానికి మీరు ప్రవేశించి ఉండాలి." #: actions/oauthappssettings.php:74 #, fuzzy @@ -2101,7 +2147,7 @@ msgstr "ఇతర ఎంపికలు" #: actions/oauthappssettings.php:85 msgid "Applications you have registered" -msgstr "" +msgstr "మీరు నమోదు చేసివున్న ఉపకరణాలు" #: actions/oauthappssettings.php:135 #, php-format @@ -2110,16 +2156,15 @@ msgstr "" #: actions/oauthconnectionssettings.php:71 msgid "Connected applications" -msgstr "" +msgstr "సంధానిత ఉపకరణాలు" #: actions/oauthconnectionssettings.php:87 msgid "You have allowed the following applications to access you account." msgstr "" #: actions/oauthconnectionssettings.php:170 -#, fuzzy msgid "You are not a user of that application." -msgstr "మీరు ఆ గుంపులో సభ్యులు కాదు." +msgstr "మీరు ఆ ఉపకరణం యొక్క వాడుకరి కాదు." #: actions/oauthconnectionssettings.php:180 msgid "Unable to revoke access for app: " @@ -2151,8 +2196,8 @@ msgstr "విషయ రకం " msgid "Only " msgstr "మాత్రమే " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1038 -#: lib/api.php:1066 lib/api.php:1176 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1039 +#: lib/api.php:1067 lib/api.php:1177 msgid "Not a supported data format." msgstr "" @@ -2221,6 +2266,11 @@ msgstr "సందేశపు విషయం సరైనది కాదు" msgid "Login token expired." msgstr "సైటు లోనికి ప్రవేశించు" +#: actions/outbox.php:58 +#, php-format +msgid "Outbox for %1$s - page %2$d" +msgstr "" + #: actions/outbox.php:61 #, php-format msgid "Outbox for %s" @@ -2291,7 +2341,7 @@ msgstr "కొత్త సంకేతపదాన్ని భద్రపర msgid "Password saved." msgstr "సంకేతపదం భద్రమయ్యింది." -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:331 msgid "Paths" msgstr "" @@ -2299,137 +2349,153 @@ msgstr "" msgid "Path and server settings for this StatusNet site." msgstr "" -#: actions/pathsadminpanel.php:140 +#: actions/pathsadminpanel.php:157 #, fuzzy, php-format msgid "Theme directory not readable: %s" msgstr "హోమ్ పేజీ URL సరైనది కాదు." -#: actions/pathsadminpanel.php:146 +#: actions/pathsadminpanel.php:163 #, php-format msgid "Avatar directory not writable: %s" msgstr "" -#: actions/pathsadminpanel.php:152 +#: actions/pathsadminpanel.php:169 #, php-format msgid "Background directory not writable: %s" msgstr "" -#: actions/pathsadminpanel.php:160 +#: actions/pathsadminpanel.php:177 #, php-format msgid "Locales directory not readable: %s" msgstr "" -#: actions/pathsadminpanel.php:166 +#: actions/pathsadminpanel.php:183 msgid "Invalid SSL server. The maximum length is 255 characters." msgstr "" -#: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58 +#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58 #: lib/adminpanelaction.php:311 msgid "Site" msgstr "సైటు" -#: actions/pathsadminpanel.php:221 +#: actions/pathsadminpanel.php:238 +msgid "Server" +msgstr "సేవకి" + +#: actions/pathsadminpanel.php:238 +msgid "Site's server hostname." +msgstr "" + +#: actions/pathsadminpanel.php:242 msgid "Path" msgstr "" -#: actions/pathsadminpanel.php:221 +#: actions/pathsadminpanel.php:242 #, fuzzy msgid "Site path" msgstr "కొత్త సందేశం" -#: actions/pathsadminpanel.php:225 +#: actions/pathsadminpanel.php:246 msgid "Path to locales" msgstr "" -#: actions/pathsadminpanel.php:225 +#: actions/pathsadminpanel.php:246 msgid "Directory path to locales" msgstr "" -#: actions/pathsadminpanel.php:232 +#: actions/pathsadminpanel.php:250 +msgid "Fancy URLs" +msgstr "" + +#: actions/pathsadminpanel.php:252 +msgid "Use fancy (more readable and memorable) URLs?" +msgstr "" + +#: actions/pathsadminpanel.php:259 msgid "Theme" msgstr "అలంకారం" -#: actions/pathsadminpanel.php:237 +#: actions/pathsadminpanel.php:264 msgid "Theme server" msgstr "అలంకారాల సేవకి" -#: actions/pathsadminpanel.php:241 +#: actions/pathsadminpanel.php:268 msgid "Theme path" msgstr "" -#: actions/pathsadminpanel.php:245 +#: actions/pathsadminpanel.php:272 msgid "Theme directory" msgstr "అలంకార సంచయం" -#: actions/pathsadminpanel.php:252 +#: actions/pathsadminpanel.php:279 msgid "Avatars" msgstr "అవతారాలు" -#: actions/pathsadminpanel.php:257 +#: actions/pathsadminpanel.php:284 msgid "Avatar server" msgstr "అవతారాల సేవకి" -#: actions/pathsadminpanel.php:261 +#: actions/pathsadminpanel.php:288 #, fuzzy msgid "Avatar path" msgstr "అవతారాన్ని తాజాకరించాం." -#: actions/pathsadminpanel.php:265 +#: actions/pathsadminpanel.php:292 msgid "Avatar directory" msgstr "అవతారాల సంచయం" -#: actions/pathsadminpanel.php:274 +#: actions/pathsadminpanel.php:301 msgid "Backgrounds" msgstr "నేపథ్యాలు" -#: actions/pathsadminpanel.php:278 +#: actions/pathsadminpanel.php:305 msgid "Background server" msgstr "నేపథ్యాల సేవకి" -#: actions/pathsadminpanel.php:282 +#: actions/pathsadminpanel.php:309 #, fuzzy msgid "Background path" msgstr "నేపథ్యం" -#: actions/pathsadminpanel.php:286 +#: actions/pathsadminpanel.php:313 msgid "Background directory" msgstr "నేపథ్యాల సంచయం" -#: actions/pathsadminpanel.php:293 +#: actions/pathsadminpanel.php:320 msgid "SSL" msgstr "" -#: actions/pathsadminpanel.php:296 actions/siteadminpanel.php:346 +#: actions/pathsadminpanel.php:323 actions/siteadminpanel.php:294 #, fuzzy msgid "Never" msgstr "వైదొలగు" -#: actions/pathsadminpanel.php:297 +#: actions/pathsadminpanel.php:324 msgid "Sometimes" msgstr "కొన్నిసార్లు" -#: actions/pathsadminpanel.php:298 +#: actions/pathsadminpanel.php:325 msgid "Always" msgstr "ఎల్లప్పుడూ" -#: actions/pathsadminpanel.php:302 +#: actions/pathsadminpanel.php:329 msgid "Use SSL" msgstr "" -#: actions/pathsadminpanel.php:303 +#: actions/pathsadminpanel.php:330 msgid "When to use SSL" msgstr "" -#: actions/pathsadminpanel.php:308 +#: actions/pathsadminpanel.php:335 #, fuzzy msgid "SSL server" msgstr "వైదొలగు" -#: actions/pathsadminpanel.php:309 +#: actions/pathsadminpanel.php:336 msgid "Server to direct SSL requests to" msgstr "" -#: actions/pathsadminpanel.php:325 +#: actions/pathsadminpanel.php:352 #, fuzzy msgid "Save paths" msgstr "కొత్త సందేశం" @@ -2539,7 +2605,7 @@ msgid "" "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated" msgstr "" -#: actions/profilesettings.php:151 actions/siteadminpanel.php:294 +#: actions/profilesettings.php:151 actions/siteadminpanel.php:280 msgid "Language" msgstr "భాష" @@ -2565,7 +2631,7 @@ msgstr "" msgid "Bio is too long (max %d chars)." msgstr "స్వపరిచయం చాలా పెద్దగా ఉంది (%d అక్షరాలు గరిష్ఠం)." -#: actions/profilesettings.php:235 actions/siteadminpanel.php:164 +#: actions/profilesettings.php:235 actions/siteadminpanel.php:150 msgid "Timezone not selected." msgstr "కాలమండలాన్ని ఎంచుకోలేదు." @@ -2665,6 +2731,8 @@ msgid "" "blogging) service based on the Free Software [StatusNet](http://status.net/) " "tool." msgstr "" +"ఇది %%site.name%%, స్వేచ్ఛా మృదూపకరమైన [స్టేటస్‌నెట్](http://status.net/) అనే పనిముట్టుపై " +"ఆధారపడిన ఒక [మైక్రో-బ్లాగింగు](http://en.wikipedia.org/wiki/Micro-blogging) సేవ." #: actions/publictagcloud.php:57 #, fuzzy @@ -2829,7 +2897,7 @@ msgstr "క్షమించండి, తప్పు ఆహ్వాన స msgid "Registration successful" msgstr "నమోదు విజయవంతం" -#: actions/register.php:114 actions/register.php:503 lib/action.php:457 +#: actions/register.php:114 actions/register.php:503 lib/action.php:463 #: lib/logingroupnav.php:85 msgid "Register" msgstr "నమోదు" @@ -2869,7 +2937,7 @@ msgid "Same as password above. Required." msgstr "పై సంకేతపదం మరోసారి. తప్పనిసరి." #: actions/register.php:438 actions/register.php:442 -#: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120 +#: actions/siteadminpanel.php:256 lib/accountsettingsaction.php:120 msgid "Email" msgstr "ఈమెయిల్" @@ -2913,6 +2981,18 @@ msgid "" "\n" "Thanks for signing up and we hope you enjoy using this service." msgstr "" +"%1$s, అభినందనలు! %%%%site.name%%%%కి స్వాగతం. ఇక్కడ నుండి, మీరు...\n" +"\n" +"* [మీ ప్రొఫైలు](%2$s)కి వెళ్ళి మీ మొదటి సందేశాన్ని వ్రాయండి.\n" +"* [జాబర్/జీటాక్ చిరునామాని](%%%%action.imsettings%%%%) చేర్చుకోండి అప్పుడు తక్షణ సందేశాల ద్వారా " +"మీరు నోటీసులని పంపగలుగుతారు.\n" +"* మీకు తెలిసిన లేదా మీ ఆసక్తులను పంచుకునే [వ్యక్తుల కోసం వెతకండి](%%%%action.peoplesearch%%" +"%%).\n" +"* మీ గురించి ఇతరులకు మరింత చెప్పడానికి మీ [ప్రొఫైలు అమరికలని](%%%%action.profilesettings%%%" +"%) తాజాకరించుకోండి. \n" +"* సౌలభ్యాలను తెలుసుకోడానికి [ఆన్‌లైన్ పత్రావళి](%%%%doc.help%%%%)ని చూడండి. \n" +"\n" +"నమోదుచేసుకున్నందుకు కృతజ్ఞతలు మరియు ఈ సేవని ఉపయోగిస్తూ మీరు ఆనందిస్తారని మేం ఆశిస్తున్నాం." #: actions/register.php:562 msgid "" @@ -3009,6 +3089,11 @@ msgstr "సృష్టితం" msgid "Replies to %s" msgstr "%sకి స్పందనలు" +#: actions/replies.php:127 +#, fuzzy, php-format +msgid "Replies to %1$s, page %2$d" +msgstr "%sకి స్పందనలు" + #: actions/replies.php:144 #, fuzzy, php-format msgid "Replies feed for %s (RSS 1.0)" @@ -3099,7 +3184,7 @@ msgstr "" #: actions/showapplication.php:214 msgid "Application actions" -msgstr "" +msgstr "ఉపకరణ చర్యలు" #: actions/showapplication.php:233 msgid "Reset key & secret" @@ -3107,7 +3192,7 @@ msgstr "" #: actions/showapplication.php:241 msgid "Application info" -msgstr "" +msgstr "ఉపకరణ సమాచారం" #: actions/showapplication.php:243 msgid "Consumer key" @@ -3136,6 +3221,11 @@ msgid "" "signature method." msgstr "" +#: actions/showfavorites.php:79 +#, fuzzy, php-format +msgid "%1$s's favorite notices, page %2$d" +msgstr "%sకి ఇష్టమైన నోటీసులు" + #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "" @@ -3185,6 +3275,11 @@ msgstr "మీకు నచ్చినవి పంచుకోడానిక msgid "%s group" msgstr "%s గుంపు" +#: actions/showgroup.php:84 +#, fuzzy, php-format +msgid "%1$s group, page %2$d" +msgstr "%1$s గుంపు సభ్యులు, పేజీ %2$d" + #: actions/showgroup.php:218 msgid "Group profile" msgstr "గుంపు ప్రొఫైలు" @@ -3295,6 +3390,11 @@ msgstr "నోటీసుని తొలగించాం." msgid " tagged %s" msgstr "" +#: actions/showstream.php:79 +#, fuzzy, php-format +msgid "%1$s, page %2$d" +msgstr "%1$s మరియు మిత్రులు, పేజీ %2$d" + #: actions/showstream.php:122 #, fuzzy, php-format msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" @@ -3356,9 +3456,9 @@ msgid "" msgstr "" #: actions/showstream.php:313 -#, fuzzy, php-format +#, php-format msgid "Repeat of %s" -msgstr "%sకి స్పందనలు" +msgstr "%s యొక్క పునరావృతం" #: actions/silence.php:65 actions/unsilence.php:65 msgid "You cannot silence users on this site." @@ -3373,196 +3473,145 @@ msgstr "వాడుకరిని ఇప్పటికే గుంపున msgid "Basic settings for this StatusNet site." msgstr "" -#: actions/siteadminpanel.php:146 +#: actions/siteadminpanel.php:132 msgid "Site name must have non-zero length." msgstr "సైటు పేరు తప్పనిసరిగా సున్నా కంటే ఎక్కువ పొడవుండాలి." -#: actions/siteadminpanel.php:154 +#: actions/siteadminpanel.php:140 msgid "You must have a valid contact email address." msgstr "మీకు సరైన సంప్రదింపు ఈమెయిలు చిరునామా ఉండాలి." -#: actions/siteadminpanel.php:172 +#: actions/siteadminpanel.php:158 #, php-format msgid "Unknown language \"%s\"." msgstr "గుర్తు తెలియని భాష \"%s\"." -#: actions/siteadminpanel.php:179 +#: actions/siteadminpanel.php:165 msgid "Invalid snapshot report URL." msgstr "" -#: actions/siteadminpanel.php:185 +#: actions/siteadminpanel.php:171 msgid "Invalid snapshot run value." msgstr "" -#: actions/siteadminpanel.php:191 +#: actions/siteadminpanel.php:177 msgid "Snapshot frequency must be a number." msgstr "" -#: actions/siteadminpanel.php:197 +#: actions/siteadminpanel.php:183 msgid "Minimum text limit is 140 characters." msgstr "కనిష్ఠ పాఠ్య పరిమితి 140 అక్షరాలు." -#: actions/siteadminpanel.php:203 +#: actions/siteadminpanel.php:189 msgid "Dupe limit must 1 or more seconds." msgstr "" -#: actions/siteadminpanel.php:253 +#: actions/siteadminpanel.php:239 msgid "General" msgstr "సాధారణ" -#: actions/siteadminpanel.php:256 +#: actions/siteadminpanel.php:242 msgid "Site name" msgstr "సైటు పేరు" -#: actions/siteadminpanel.php:257 +#: actions/siteadminpanel.php:243 msgid "The name of your site, like \"Yourcompany Microblog\"" msgstr "మీ సైటు యొక్క పేరు, ఇలా \"మీకంపెనీ మైక్రోబ్లాగు\"" -#: actions/siteadminpanel.php:261 +#: actions/siteadminpanel.php:247 msgid "Brought by" msgstr "" -#: actions/siteadminpanel.php:262 +#: actions/siteadminpanel.php:248 msgid "Text used for credits link in footer of each page" msgstr "" -#: actions/siteadminpanel.php:266 +#: actions/siteadminpanel.php:252 msgid "Brought by URL" msgstr "" -#: actions/siteadminpanel.php:267 +#: actions/siteadminpanel.php:253 msgid "URL used for credits link in footer of each page" msgstr "" -#: actions/siteadminpanel.php:271 +#: actions/siteadminpanel.php:257 #, fuzzy msgid "Contact email address for your site" msgstr "ఈ వాడుకరికై నమోదైన ఈమెయిల్ చిరునామాలు ఏమీ లేవు." -#: actions/siteadminpanel.php:277 +#: actions/siteadminpanel.php:263 msgid "Local" msgstr "స్థానిక" -#: actions/siteadminpanel.php:288 +#: actions/siteadminpanel.php:274 msgid "Default timezone" msgstr "అప్రమేయ కాలమండలం" -#: actions/siteadminpanel.php:289 +#: actions/siteadminpanel.php:275 msgid "Default timezone for the site; usually UTC." msgstr "" -#: actions/siteadminpanel.php:295 +#: actions/siteadminpanel.php:281 msgid "Default site language" msgstr "అప్రమేయ సైటు భాష" -#: actions/siteadminpanel.php:303 -msgid "URLs" -msgstr "" - -#: actions/siteadminpanel.php:306 -#, fuzzy -msgid "Server" -msgstr "వైదొలగు" - -#: actions/siteadminpanel.php:306 -msgid "Site's server hostname." -msgstr "" - -#: actions/siteadminpanel.php:310 -msgid "Fancy URLs" -msgstr "" - -#: actions/siteadminpanel.php:312 -msgid "Use fancy (more readable and memorable) URLs?" -msgstr "" - -#: actions/siteadminpanel.php:318 -#, fuzzy -msgid "Access" -msgstr "అంగీకరించు" - -#: actions/siteadminpanel.php:321 -msgid "Private" -msgstr "అంతరంగికం" - -#: actions/siteadminpanel.php:323 -msgid "Prohibit anonymous users (not logged in) from viewing site?" -msgstr "అజ్ఞాత (ప్రవేశించని) వాడుకరులని సైటుని చూడకుండా నిషేధించాలా?" - -#: actions/siteadminpanel.php:327 -msgid "Invite only" -msgstr "ఆహ్వానితులకు మాత్రమే" - -#: actions/siteadminpanel.php:329 -msgid "Make registration invitation only." -msgstr "ఆహ్వానితులు మాత్రమే నమోదు అవ్వగలిగేలా చెయ్యి." - -#: actions/siteadminpanel.php:333 -#, fuzzy -msgid "Closed" -msgstr "అటువంటి వాడుకరి లేరు." - -#: actions/siteadminpanel.php:335 -msgid "Disable new registrations." -msgstr "కొత్త నమోదులను అచేతనంచేయి." - -#: actions/siteadminpanel.php:341 +#: actions/siteadminpanel.php:289 msgid "Snapshots" msgstr "" -#: actions/siteadminpanel.php:344 +#: actions/siteadminpanel.php:292 msgid "Randomly during Web hit" msgstr "" -#: actions/siteadminpanel.php:345 +#: actions/siteadminpanel.php:293 msgid "In a scheduled job" msgstr "" -#: actions/siteadminpanel.php:347 +#: actions/siteadminpanel.php:295 msgid "Data snapshots" msgstr "" -#: actions/siteadminpanel.php:348 +#: actions/siteadminpanel.php:296 msgid "When to send statistical data to status.net servers" msgstr "" -#: actions/siteadminpanel.php:353 +#: actions/siteadminpanel.php:301 msgid "Frequency" msgstr "తరచుదనం" -#: actions/siteadminpanel.php:354 +#: actions/siteadminpanel.php:302 msgid "Snapshots will be sent once every N web hits" msgstr "" -#: actions/siteadminpanel.php:359 +#: actions/siteadminpanel.php:307 msgid "Report URL" msgstr "" -#: actions/siteadminpanel.php:360 +#: actions/siteadminpanel.php:308 msgid "Snapshots will be sent to this URL" msgstr "" -#: actions/siteadminpanel.php:367 +#: actions/siteadminpanel.php:315 msgid "Limits" msgstr "పరిమితులు" -#: actions/siteadminpanel.php:370 +#: actions/siteadminpanel.php:318 msgid "Text limit" msgstr "పాఠ్యపు పరిమితి" -#: actions/siteadminpanel.php:370 +#: actions/siteadminpanel.php:318 msgid "Maximum number of characters for notices." msgstr "సందేశాలలోని అక్షరాల గరిష్ఠ సంఖ్య." -#: actions/siteadminpanel.php:374 +#: actions/siteadminpanel.php:322 msgid "Dupe limit" msgstr "" -#: actions/siteadminpanel.php:374 +#: actions/siteadminpanel.php:322 msgid "How long users must wait (in seconds) to post the same thing again." msgstr "" -#: actions/siteadminpanel.php:388 actions/useradminpanel.php:313 +#: actions/siteadminpanel.php:336 actions/useradminpanel.php:313 msgid "Save site settings" msgstr "సైటు అమరికలను భద్రపరచు" @@ -3684,9 +3733,9 @@ msgid "%s subscribers" msgstr "%s చందాదార్లు" #: actions/subscribers.php:52 -#, fuzzy, php-format +#, php-format msgid "%1$s subscribers, page %2$d" -msgstr "%s చందాదార్లు, పేజీ %d" +msgstr "%1$s చందాదార్లు, పేజీ %2$d" #: actions/subscribers.php:63 msgid "These are the people who listen to your notices." @@ -3706,7 +3755,7 @@ msgstr "" #: actions/subscribers.php:110 #, php-format msgid "%s has no subscribers. Want to be the first?" -msgstr "" +msgstr "%sకి చందాదార్లు ఎవరూ లేరు. మీరే మొదటివారు కావాలనుకుంటున్నారా?" #: actions/subscribers.php:114 #, php-format @@ -3721,9 +3770,9 @@ msgid "%s subscriptions" msgstr "%s చందాలు" #: actions/subscriptions.php:54 -#, fuzzy, php-format +#, php-format msgid "%1$s subscriptions, page %2$d" -msgstr "%s చందాలు, పేజీ %d" +msgstr "%1$s చందాలు, పేజీ %2$d" #: actions/subscriptions.php:65 msgid "These are the people whose notices you listen to." @@ -3757,6 +3806,11 @@ msgstr "జాబర్" msgid "SMS" msgstr "" +#: actions/tag.php:68 +#, fuzzy, php-format +msgid "Notices tagged with %1$s, page %2$d" +msgstr "%s యొక్క మైక్రోబ్లాగు" + #: actions/tag.php:86 #, fuzzy, php-format msgid "Notice feed for tag %s (RSS 1.0)" @@ -3898,9 +3952,8 @@ msgid "Welcome text for new users (Max 255 chars)." msgstr "కొత్త వాడుకరులకై స్వాగత సందేశం (255 అక్షరాలు గరిష్ఠం)." #: actions/useradminpanel.php:241 -#, fuzzy msgid "Default subscription" -msgstr "అన్ని చందాలు" +msgstr "అప్రమేయ చందా" #: actions/useradminpanel.php:242 #, fuzzy @@ -3912,9 +3965,8 @@ msgid "Invitations" msgstr "ఆహ్వానాలు" #: actions/useradminpanel.php:256 -#, fuzzy msgid "Invitations enabled" -msgstr "ఆహ్వానము(ల)ని పంపించాం" +msgstr "ఆహ్వానాలని చేతనంచేసాం" #: actions/useradminpanel.php:258 msgid "Whether to allow users to invite new users." @@ -4047,6 +4099,11 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "" +#: actions/usergroups.php:64 +#, fuzzy, php-format +msgid "%1$s groups, page %2$d" +msgstr "%1$s గుంపు సభ్యులు, పేజీ %2$d" + #: actions/usergroups.php:130 msgid "Search for more groups" msgstr "మరిన్ని గుంపులకై వెతుకు" @@ -4108,7 +4165,7 @@ msgstr "" msgid "Plugins" msgstr "" -#: actions/version.php:196 lib/action.php:741 +#: actions/version.php:196 lib/action.php:747 msgid "Version" msgstr "సంచిక" @@ -4163,46 +4220,51 @@ msgstr "" msgid "Could not update message with new URI." msgstr "" -#: classes/Notice.php:171 +#: classes/Notice.php:157 #, php-format msgid "DB error inserting hashtag: %s" msgstr "" -#: classes/Notice.php:225 +#: classes/Notice.php:214 #, fuzzy msgid "Problem saving notice. Too long." msgstr "సందేశాన్ని భద్రపరచడంలో పొరపాటు." -#: classes/Notice.php:229 +#: classes/Notice.php:218 #, fuzzy msgid "Problem saving notice. Unknown user." msgstr "సందేశాన్ని భద్రపరచడంలో పొరపాటు." -#: classes/Notice.php:234 +#: classes/Notice.php:223 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:240 +#: classes/Notice.php:229 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:246 +#: classes/Notice.php:235 msgid "You are banned from posting notices on this site." msgstr "ఈ సైటులో నోటీసులు రాయడం నుండి మిమ్మల్ని నిషేధించారు." -#: classes/Notice.php:305 classes/Notice.php:330 +#: classes/Notice.php:294 classes/Notice.php:319 msgid "Problem saving notice." msgstr "సందేశాన్ని భద్రపరచడంలో పొరపాటు." -#: classes/Notice.php:1059 +#: classes/Notice.php:790 +#, fuzzy +msgid "Problem saving group inbox." +msgstr "సందేశాన్ని భద్రపరచడంలో పొరపాటు." + +#: classes/Notice.php:850 #, php-format msgid "DB error inserting reply: %s" msgstr "" -#: classes/Notice.php:1441 +#: classes/Notice.php:1233 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" @@ -4217,9 +4279,8 @@ msgid "Could not create group." msgstr "గుంపుని సృష్టించలేకపోయాం." #: classes/User_group.php:409 -#, fuzzy msgid "Could not set group membership." -msgstr "చందాని సృష్టించలేకపోయాం." +msgstr "గుంపు సభ్యత్వాన్ని అమర్చలేకపోయాం." #: lib/accountsettingsaction.php:108 msgid "Change your profile settings" @@ -4259,128 +4320,126 @@ msgstr "%1$s - %2$s" msgid "Untitled page" msgstr "" -#: lib/action.php:427 +#: lib/action.php:433 msgid "Primary site navigation" msgstr "" -#: lib/action.php:433 +#: lib/action.php:439 msgid "Home" msgstr "ముంగిలి" -#: lib/action.php:433 +#: lib/action.php:439 msgid "Personal profile and friends timeline" msgstr "" -#: lib/action.php:435 +#: lib/action.php:441 msgid "Change your email, avatar, password, profile" msgstr "మీ ఈమెయిలు, అవతారం, సంకేతపదం మరియు ప్రౌఫైళ్ళను మార్చుకోండి" -#: lib/action.php:438 +#: lib/action.php:444 msgid "Connect" msgstr "అనుసంధానించు" -#: lib/action.php:438 +#: lib/action.php:444 msgid "Connect to services" msgstr "" -#: lib/action.php:442 +#: lib/action.php:448 #, fuzzy msgid "Change site configuration" msgstr "చందాలు" -#: lib/action.php:446 lib/subgroupnav.php:105 +#: lib/action.php:452 lib/subgroupnav.php:105 msgid "Invite" msgstr "ఆహ్వానించు" -#: lib/action.php:447 lib/subgroupnav.php:106 +#: lib/action.php:453 lib/subgroupnav.php:106 #, php-format msgid "Invite friends and colleagues to join you on %s" msgstr "" -#: lib/action.php:452 +#: lib/action.php:458 msgid "Logout" msgstr "నిష్క్రమించు" -#: lib/action.php:452 +#: lib/action.php:458 msgid "Logout from the site" msgstr "సైటు నుండి నిష్క్రమించు" -#: lib/action.php:457 +#: lib/action.php:463 msgid "Create an account" msgstr "కొత్త ఖాతా సృష్టించు" -#: lib/action.php:460 +#: lib/action.php:466 msgid "Login to the site" msgstr "సైటులోని ప్రవేశించు" -#: lib/action.php:463 lib/action.php:726 +#: lib/action.php:469 lib/action.php:732 msgid "Help" msgstr "సహాయం" -#: lib/action.php:463 +#: lib/action.php:469 msgid "Help me!" msgstr "సహాయం కావాలి!" -#: lib/action.php:466 lib/searchaction.php:127 +#: lib/action.php:472 lib/searchaction.php:127 msgid "Search" msgstr "వెతుకు" -#: lib/action.php:466 +#: lib/action.php:472 msgid "Search for people or text" msgstr "" -#: lib/action.php:487 -#, fuzzy +#: lib/action.php:493 msgid "Site notice" -msgstr "కొత్త సందేశం" +msgstr "సైటు గమనిక" -#: lib/action.php:553 +#: lib/action.php:559 msgid "Local views" msgstr "స్థానిక వీక్షణలు" -#: lib/action.php:619 -#, fuzzy +#: lib/action.php:625 msgid "Page notice" -msgstr "కొత్త సందేశం" +msgstr "పేజీ గమనిక" -#: lib/action.php:721 +#: lib/action.php:727 #, fuzzy msgid "Secondary site navigation" msgstr "చందాలు" -#: lib/action.php:728 +#: lib/action.php:734 msgid "About" msgstr "గురించి" -#: lib/action.php:730 +#: lib/action.php:736 msgid "FAQ" msgstr "ప్రశ్నలు" -#: lib/action.php:734 +#: lib/action.php:740 msgid "TOS" msgstr "సేవా నియమాలు" -#: lib/action.php:737 +#: lib/action.php:743 msgid "Privacy" msgstr "అంతరంగికత" -#: lib/action.php:739 +#: lib/action.php:745 msgid "Source" msgstr "మూలము" -#: lib/action.php:743 +#: lib/action.php:749 msgid "Contact" msgstr "సంప్రదించు" -#: lib/action.php:745 +#: lib/action.php:751 msgid "Badge" msgstr "బాడ్జి" -#: lib/action.php:773 +#: lib/action.php:779 msgid "StatusNet software license" msgstr "స్టేటస్‌నెట్ మృదూపకరణ లైసెన్సు" -#: lib/action.php:776 +#: lib/action.php:782 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -4389,12 +4448,12 @@ msgstr "" "**%%site.name%%** అనేది [%%site.broughtby%%](%%site.broughtbyurl%%) వారు " "అందిస్తున్న మైక్రో బ్లాగింగు సదుపాయం. " -#: lib/action.php:778 +#: lib/action.php:784 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "**%%site.name%%** అనేది మైక్రో బ్లాగింగు సదుపాయం." -#: lib/action.php:780 +#: lib/action.php:786 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4405,42 +4464,42 @@ msgstr "" "html) కింద లభ్యమయ్యే [స్టేటస్‌నెట్](http://status.net/) మైక్రోబ్లాగింగ్ ఉపకరణం సంచిక %s " "పై నడుస్తుంది." -#: lib/action.php:795 +#: lib/action.php:801 #, fuzzy msgid "Site content license" msgstr "కొత్త సందేశం" -#: lib/action.php:800 +#: lib/action.php:806 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "" -#: lib/action.php:805 +#: lib/action.php:811 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" -#: lib/action.php:808 +#: lib/action.php:814 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" -#: lib/action.php:820 +#: lib/action.php:826 msgid "All " msgstr "అన్నీ " -#: lib/action.php:825 +#: lib/action.php:831 msgid "license." msgstr "" -#: lib/action.php:1124 +#: lib/action.php:1130 msgid "Pagination" msgstr "పేజీకరణ" -#: lib/action.php:1133 +#: lib/action.php:1139 msgid "After" msgstr "తర్వాత" -#: lib/action.php:1141 +#: lib/action.php:1147 msgid "Before" msgstr "ఇంతక్రితం" @@ -4473,24 +4532,37 @@ msgstr "ప్రాథమిక సైటు స్వరూపణం" msgid "Design configuration" msgstr "SMS నిర్ధారణ" -#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327 +#: lib/adminpanelaction.php:322 +#, fuzzy +msgid "User configuration" +msgstr "SMS నిర్ధారణ" + +#: lib/adminpanelaction.php:327 +#, fuzzy +msgid "Access configuration" +msgstr "SMS నిర్ధారణ" + +#: lib/adminpanelaction.php:332 #, fuzzy msgid "Paths configuration" msgstr "SMS నిర్ధారణ" +#: lib/applicationeditform.php:136 +msgid "Edit application" +msgstr "ఉపకరణాన్ని మార్చు" + #: lib/applicationeditform.php:186 msgid "Icon for this application" -msgstr "" +msgstr "ఈ ఉపకరణానికి ప్రతీకం" #: lib/applicationeditform.php:206 -#, fuzzy, php-format +#, php-format msgid "Describe your application in %d characters" -msgstr "మీ గురించి మరియు మీ ఆసక్తుల గురించి 140 అక్షరాల్లో చెప్పండి" +msgstr "మీ ఉపకరణం గురించి %d అక్షరాల్లో వివరించండి" #: lib/applicationeditform.php:209 -#, fuzzy msgid "Describe your application" -msgstr "మీ గురించి మరియు మీ ఆసక్తుల గురించి 140 అక్షరాల్లో చెప్పండి" +msgstr "మీ ఉపకరణాన్ని వివరించండి" #: lib/applicationeditform.php:218 #, fuzzy @@ -4498,13 +4570,12 @@ msgid "Source URL" msgstr "మూలము" #: lib/applicationeditform.php:220 -#, fuzzy msgid "URL of the homepage of this application" -msgstr "మీ హోమ్ పేజీ, బ్లాగు, లేదా వేరే సేటులోని మీ ప్రొఫైలు యొక్క చిరునామా" +msgstr "ఈ ఉపకరణం యొక్క హోమ్‌పేజీ చిరునామా" #: lib/applicationeditform.php:226 msgid "Organization responsible for this application" -msgstr "" +msgstr "ఈ ఉపకరణానికి బాధ్యతాయుతమైన సంస్థ" #: lib/applicationeditform.php:232 #, fuzzy @@ -4690,14 +4761,12 @@ msgid "Error sending direct message." msgstr "" #: lib/command.php:413 -#, fuzzy msgid "Cannot repeat your own notice" -msgstr "ఈ లైసెన్సుకి అంగీకరించకపోతే మీరు నమోదుచేసుకోలేరు." +msgstr "మీ నోటిసుని మీరే పునరావృతించలేరు" #: lib/command.php:418 -#, fuzzy msgid "Already repeated that notice" -msgstr "ఈ నోటీసుని తొలగించు" +msgstr "ఇప్పటికే ఈ నోటీసుని పునరావృతించారు" #: lib/command.php:426 #, fuzzy, php-format @@ -4872,9 +4941,8 @@ msgid "Updates by SMS" msgstr "" #: lib/connectsettingsaction.php:120 -#, fuzzy msgid "Connections" -msgstr "అనుసంధానించు" +msgstr "అనుసంధానాలు" #: lib/connectsettingsaction.php:121 msgid "Authorized connected applications" @@ -5067,12 +5135,12 @@ msgstr "మెబై" msgid "kB" msgstr "కిబై" -#: lib/jabber.php:202 +#: lib/jabber.php:220 #, php-format msgid "[%s]" msgstr "[%s]" -#: lib/jabber.php:385 +#: lib/jabber.php:400 #, fuzzy, php-format msgid "Unknown inbox source %d." msgstr "గుర్తు తెలియని భాష \"%s\"" @@ -5118,7 +5186,7 @@ msgstr "" #: lib/mail.php:236 #, php-format msgid "%1$s is now listening to your notices on %2$s." -msgstr "" +msgstr "%1$s ఇప్పుడు %2$sలో మీ నోటీసులని వింటున్నారు." #: lib/mail.php:241 #, php-format @@ -5134,13 +5202,21 @@ msgid "" "----\n" "Change your email address or notification options at %8$s\n" msgstr "" +"%1$s ఇప్పుడు %2$sలో మీ నోటీసులని వింటున్నారు.\n" +"\n" +"%3$s\n" +"\n" +"%4$s%5$s%6$s\n" +"మీ విధేయులు,\n" +"%7$s.\n" +"\n" +"----\n" +"మీ ఈమెయిలు చిరునామాని లేదా గమనింపుల ఎంపికలను %8$s వద్ద మార్చుకోండి" #: lib/mail.php:258 -#, fuzzy, php-format +#, php-format msgid "Bio: %s" -msgstr "" -"స్వపరిచయం: %s\n" -"\n" +msgstr "స్వపరిచయం: %s" #: lib/mail.php:286 #, php-format @@ -5491,19 +5567,19 @@ msgstr "స్పందనలు" msgid "Favorites" msgstr "ఇష్టాంశాలు" -#: lib/personalgroupnav.php:124 +#: lib/personalgroupnav.php:125 msgid "Inbox" msgstr "వచ్చినవి" -#: lib/personalgroupnav.php:125 +#: lib/personalgroupnav.php:126 msgid "Your incoming messages" msgstr "మీకు వచ్చిన సందేశాలు" -#: lib/personalgroupnav.php:129 +#: lib/personalgroupnav.php:130 msgid "Outbox" msgstr "పంపినవి" -#: lib/personalgroupnav.php:130 +#: lib/personalgroupnav.php:131 msgid "Your sent messages" msgstr "మీరు పంపిన సందేశాలు" @@ -5641,12 +5717,12 @@ msgstr "ఈ వాడుకరిని నిరోధించు" #: lib/subgroupnav.php:83 #, php-format msgid "People %s subscribes to" -msgstr "" +msgstr "%s చందాచేరిన వ్యక్తులు" #: lib/subgroupnav.php:91 -#, fuzzy, php-format +#, php-format msgid "People subscribed to %s" -msgstr "%sకి స్పందనలు" +msgstr "%sకి చందాచేరిన వ్యక్తులు" #: lib/subgroupnav.php:99 #, php-format @@ -5746,7 +5822,7 @@ msgstr "మార్చు" #: lib/userprofile.php:272 msgid "Send a direct message to this user" -msgstr "" +msgstr "ఈ వాడుకరికి ఒక నేరు సందేశాన్ని పంపించండి" #: lib/userprofile.php:273 msgid "Message" @@ -5756,47 +5832,47 @@ msgstr "సందేశం" msgid "Moderate" msgstr "" -#: lib/util.php:875 +#: lib/util.php:868 msgid "a few seconds ago" msgstr "కొన్ని క్షణాల క్రితం" -#: lib/util.php:877 +#: lib/util.php:870 msgid "about a minute ago" msgstr "ఓ నిమిషం క్రితం" -#: lib/util.php:879 +#: lib/util.php:872 #, php-format msgid "about %d minutes ago" msgstr "%d నిమిషాల క్రితం" -#: lib/util.php:881 +#: lib/util.php:874 msgid "about an hour ago" msgstr "ఒక గంట క్రితం" -#: lib/util.php:883 +#: lib/util.php:876 #, php-format msgid "about %d hours ago" msgstr "%d గంటల క్రితం" -#: lib/util.php:885 +#: lib/util.php:878 msgid "about a day ago" msgstr "ఓ రోజు క్రితం" -#: lib/util.php:887 +#: lib/util.php:880 #, php-format msgid "about %d days ago" msgstr "%d రోజుల క్రితం" -#: lib/util.php:889 +#: lib/util.php:882 msgid "about a month ago" msgstr "ఓ నెల క్రితం" -#: lib/util.php:891 +#: lib/util.php:884 #, php-format msgid "about %d months ago" msgstr "%d నెలల క్రితం" -#: lib/util.php:893 +#: lib/util.php:886 msgid "about a year ago" msgstr "ఒక సంవత్సరం క్రితం" @@ -5810,7 +5886,7 @@ msgstr "%s అనేది సరైన రంగు కాదు!" msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "%s అనేది సరైన రంగు కాదు! 3 లేదా 6 హెక్స్ అక్షరాలను వాడండి." -#: scripts/xmppdaemon.php:301 +#: lib/xmppmanager.php:402 #, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "నోటిసు చాలా పొడవుగా ఉంది - %1$d అక్షరాలు గరిష్ఠం, మీరు %2$d పంపించారు." diff --git a/locale/tr/LC_MESSAGES/statusnet.po b/locale/tr/LC_MESSAGES/statusnet.po index bcec74af8b..5b620f24de 100644 --- a/locale/tr/LC_MESSAGES/statusnet.po +++ b/locale/tr/LC_MESSAGES/statusnet.po @@ -1,5 +1,6 @@ # Translation of StatusNet to Turkish # +# Author@translatewiki.net: Joseph # Author@translatewiki.net: McDutchie # -- # This file is distributed under the same license as the StatusNet package. @@ -8,17 +9,74 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-21 22:36+0000\n" -"PO-Revision-Date: 2010-01-21 22:38:37+0000\n" +"POT-Creation-Date: 2010-01-27 23:58+0000\n" +"PO-Revision-Date: 2010-01-27 23:59:53+0000\n" "Language-Team: Turkish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r61339); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61595); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: tr\n" "X-Message-Group: out-statusnet\n" "Plural-Forms: nplurals=1; plural=0;\n" +#: actions/accessadminpanel.php:54 lib/adminpanelaction.php:326 +#, fuzzy +msgid "Access" +msgstr "Kabul et" + +#: actions/accessadminpanel.php:65 +#, fuzzy +msgid "Site access settings" +msgstr "Ayarlar" + +#: actions/accessadminpanel.php:158 +#, fuzzy +msgid "Registration" +msgstr "Kayıt" + +#: actions/accessadminpanel.php:161 +#, fuzzy +msgid "Private" +msgstr "Gizlilik" + +#: actions/accessadminpanel.php:163 +msgid "Prohibit anonymous users (not logged in) from viewing site?" +msgstr "" + +#: actions/accessadminpanel.php:167 +msgid "Invite only" +msgstr "" + +#: actions/accessadminpanel.php:169 +msgid "Make registration invitation only." +msgstr "" + +#: actions/accessadminpanel.php:173 +#, fuzzy +msgid "Closed" +msgstr "Böyle bir kullanıcı yok." + +#: actions/accessadminpanel.php:175 +msgid "Disable new registrations." +msgstr "" + +#: actions/accessadminpanel.php:189 actions/designadminpanel.php:586 +#: actions/emailsettings.php:195 actions/imsettings.php:163 +#: actions/othersettings.php:126 actions/pathsadminpanel.php:351 +#: actions/profilesettings.php:174 actions/siteadminpanel.php:336 +#: actions/smssettings.php:181 actions/subscriptions.php:203 +#: actions/tagother.php:154 actions/useradminpanel.php:313 +#: lib/applicationeditform.php:335 lib/applicationeditform.php:336 +#: lib/designsettings.php:256 lib/groupeditform.php:202 +msgid "Save" +msgstr "Kaydet" + +#: actions/accessadminpanel.php:189 +#, fuzzy +msgid "Save access settings" +msgstr "Ayarlar" + #: actions/all.php:63 actions/public.php:97 actions/replies.php:92 #: actions/showfavorites.php:137 actions/tag.php:51 #, fuzzy @@ -34,7 +92,7 @@ msgstr "Böyle bir durum mesajı yok." #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:149 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 @@ -134,8 +192,7 @@ msgstr "" #: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 #: actions/apitimelinefriends.php:155 actions/apitimelinegroup.php:150 #: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 -#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 #, fuzzy @@ -152,7 +209,7 @@ msgstr "Onay kodu bulunamadı." #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:119 +#: actions/apistatusesupdate.php:118 msgid "This method requires a POST." msgstr "" @@ -183,7 +240,7 @@ msgstr "Profil kaydedilemedi." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:132 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 #: actions/designadminpanel.php:122 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -495,7 +552,14 @@ msgstr "" msgid "Allow or deny access" msgstr "" -#: actions/apioauthauthorize.php:320 lib/action.php:435 +#: actions/apioauthauthorize.php:306 +#, php-format +msgid "" +"The application %s by %s would like the " +"ability to %s your account data." +msgstr "" + +#: actions/apioauthauthorize.php:320 lib/action.php:441 #, fuzzy msgid "Account" msgstr "Hakkında" @@ -556,18 +620,18 @@ msgstr "Avatar güncellendi." msgid "No status with that ID found." msgstr "" -#: actions/apistatusesupdate.php:162 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "" "Ah, durumunuz biraz uzun kaçtı. Azami 180 karaktere sığdırmaya ne dersiniz?" -#: actions/apistatusesupdate.php:203 +#: actions/apistatusesupdate.php:202 msgid "Not found" msgstr "" -#: actions/apistatusesupdate.php:226 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -619,11 +683,6 @@ msgstr "" msgid "%s updates from everyone!" msgstr "" -#: actions/apitimelineretweetedbyme.php:112 -#, php-format -msgid "Repeated by %s" -msgstr "" - #: actions/apitimelineretweetedtome.php:111 #, fuzzy, php-format msgid "Repeated to %s" @@ -1049,17 +1108,6 @@ msgstr "" msgid "Reset back to default" msgstr "" -#: actions/designadminpanel.php:586 actions/emailsettings.php:195 -#: actions/imsettings.php:163 actions/othersettings.php:126 -#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174 -#: actions/siteadminpanel.php:388 actions/smssettings.php:181 -#: actions/subscriptions.php:203 actions/tagother.php:154 -#: actions/useradminpanel.php:313 lib/applicationeditform.php:335 -#: lib/applicationeditform.php:336 lib/designsettings.php:256 -#: lib/groupeditform.php:202 -msgid "Save" -msgstr "Kaydet" - #: actions/designadminpanel.php:587 lib/designsettings.php:257 msgid "Save design" msgstr "" @@ -1072,13 +1120,15 @@ msgstr "" msgid "Add to favorites" msgstr "" -#: actions/doc.php:69 -msgid "No such document." +#: actions/doc.php:155 +#, fuzzy, php-format +msgid "No such document \"%s\"" msgstr "Böyle bir belge yok." -#: actions/editapplication.php:54 lib/applicationeditform.php:136 -msgid "Edit application" -msgstr "" +#: actions/editapplication.php:54 +#, fuzzy +msgid "Edit Application" +msgstr "Bu durum mesajının ait oldugu kullanıcı profili yok" #: actions/editapplication.php:66 msgid "You must be logged in to edit an application." @@ -1096,7 +1146,7 @@ msgid "No such application." msgstr "Böyle bir durum mesajı yok." #: actions/editapplication.php:127 actions/newapplication.php:110 -#: actions/showapplication.php:118 lib/action.php:1189 +#: actions/showapplication.php:118 lib/action.php:1195 msgid "There was a problem with your session token." msgstr "" @@ -1305,7 +1355,7 @@ msgid "Cannot normalize that email address" msgstr "" #: actions/emailsettings.php:331 actions/register.php:201 -#: actions/siteadminpanel.php:157 +#: actions/siteadminpanel.php:143 msgid "Not a valid email address." msgstr "Geçersiz bir eposta adresi." @@ -1317,7 +1367,7 @@ msgstr "" msgid "That email address already belongs to another user." msgstr "" -#: actions/emailsettings.php:353 actions/imsettings.php:317 +#: actions/emailsettings.php:353 actions/imsettings.php:319 #: actions/smssettings.php:337 msgid "Couldn't insert confirmation code." msgstr "Onay kodu eklenemedi." @@ -1629,7 +1679,7 @@ msgstr "" msgid "A list of the users in this group." msgstr "" -#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107 +#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107 msgid "Admin" msgstr "" @@ -1824,6 +1874,11 @@ msgstr "" msgid "That is not your Jabber ID." msgstr "Bu sizin Jabber ID'niz değil." +#: actions/inbox.php:59 +#, php-format +msgid "Inbox for %1$s - page %2$d" +msgstr "" + #: actions/inbox.php:62 #, php-format msgid "Inbox for %s" @@ -1976,7 +2031,7 @@ msgstr "Yanlış kullanıcı adı veya parola." msgid "Error setting user. You are probably not authorized." msgstr "Yetkilendirilmemiş." -#: actions/login.php:188 actions/login.php:241 lib/action.php:460 +#: actions/login.php:188 actions/login.php:241 lib/action.php:466 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Giriş" @@ -2040,8 +2095,9 @@ msgid "No current status" msgstr "" #: actions/newapplication.php:52 -msgid "New application" -msgstr "" +#, fuzzy +msgid "New Application" +msgstr "Böyle bir durum mesajı yok." #: actions/newapplication.php:64 msgid "You must be logged in to register an application." @@ -2228,8 +2284,8 @@ msgstr "Bağlan" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1038 -#: lib/api.php:1066 lib/api.php:1176 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1039 +#: lib/api.php:1067 lib/api.php:1177 msgid "Not a supported data format." msgstr "" @@ -2300,6 +2356,11 @@ msgstr "Geçersiz durum mesajı" msgid "Login token expired." msgstr "" +#: actions/outbox.php:58 +#, php-format +msgid "Outbox for %1$s - page %2$d" +msgstr "" + #: actions/outbox.php:61 #, php-format msgid "Outbox for %s" @@ -2372,7 +2433,7 @@ msgstr "Yeni parola kaydedilemedi." msgid "Password saved." msgstr "Parola kaydedildi." -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:331 msgid "Paths" msgstr "" @@ -2380,140 +2441,156 @@ msgstr "" msgid "Path and server settings for this StatusNet site." msgstr "" -#: actions/pathsadminpanel.php:140 +#: actions/pathsadminpanel.php:157 #, fuzzy, php-format msgid "Theme directory not readable: %s" msgstr "Bu sayfa kabul ettiğiniz ortam türünde kullanılabilir değil" -#: actions/pathsadminpanel.php:146 +#: actions/pathsadminpanel.php:163 #, php-format msgid "Avatar directory not writable: %s" msgstr "" -#: actions/pathsadminpanel.php:152 +#: actions/pathsadminpanel.php:169 #, php-format msgid "Background directory not writable: %s" msgstr "" -#: actions/pathsadminpanel.php:160 +#: actions/pathsadminpanel.php:177 #, php-format msgid "Locales directory not readable: %s" msgstr "" -#: actions/pathsadminpanel.php:166 +#: actions/pathsadminpanel.php:183 msgid "Invalid SSL server. The maximum length is 255 characters." msgstr "" -#: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58 +#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58 #: lib/adminpanelaction.php:311 msgid "Site" msgstr "" -#: actions/pathsadminpanel.php:221 +#: actions/pathsadminpanel.php:238 +msgid "Server" +msgstr "Sunucu" + +#: actions/pathsadminpanel.php:238 +msgid "Site's server hostname." +msgstr "" + +#: actions/pathsadminpanel.php:242 msgid "Path" msgstr "" -#: actions/pathsadminpanel.php:221 +#: actions/pathsadminpanel.php:242 #, fuzzy msgid "Site path" msgstr "Yeni durum mesajı" -#: actions/pathsadminpanel.php:225 +#: actions/pathsadminpanel.php:246 msgid "Path to locales" msgstr "" -#: actions/pathsadminpanel.php:225 +#: actions/pathsadminpanel.php:246 msgid "Directory path to locales" msgstr "" -#: actions/pathsadminpanel.php:232 -msgid "Theme" -msgstr "" - -#: actions/pathsadminpanel.php:237 -msgid "Theme server" -msgstr "" - -#: actions/pathsadminpanel.php:241 -msgid "Theme path" -msgstr "" - -#: actions/pathsadminpanel.php:245 -msgid "Theme directory" +#: actions/pathsadminpanel.php:250 +msgid "Fancy URLs" msgstr "" #: actions/pathsadminpanel.php:252 +msgid "Use fancy (more readable and memorable) URLs?" +msgstr "" + +#: actions/pathsadminpanel.php:259 +msgid "Theme" +msgstr "" + +#: actions/pathsadminpanel.php:264 +msgid "Theme server" +msgstr "" + +#: actions/pathsadminpanel.php:268 +msgid "Theme path" +msgstr "" + +#: actions/pathsadminpanel.php:272 +msgid "Theme directory" +msgstr "" + +#: actions/pathsadminpanel.php:279 #, fuzzy msgid "Avatars" msgstr "Avatar" -#: actions/pathsadminpanel.php:257 +#: actions/pathsadminpanel.php:284 #, fuzzy msgid "Avatar server" msgstr "Ayarlar" -#: actions/pathsadminpanel.php:261 +#: actions/pathsadminpanel.php:288 #, fuzzy msgid "Avatar path" msgstr "Avatar güncellendi." -#: actions/pathsadminpanel.php:265 +#: actions/pathsadminpanel.php:292 #, fuzzy msgid "Avatar directory" msgstr "Avatar güncellendi." -#: actions/pathsadminpanel.php:274 +#: actions/pathsadminpanel.php:301 msgid "Backgrounds" msgstr "" -#: actions/pathsadminpanel.php:278 +#: actions/pathsadminpanel.php:305 msgid "Background server" msgstr "" -#: actions/pathsadminpanel.php:282 +#: actions/pathsadminpanel.php:309 msgid "Background path" msgstr "" -#: actions/pathsadminpanel.php:286 +#: actions/pathsadminpanel.php:313 msgid "Background directory" msgstr "" -#: actions/pathsadminpanel.php:293 +#: actions/pathsadminpanel.php:320 msgid "SSL" msgstr "" -#: actions/pathsadminpanel.php:296 actions/siteadminpanel.php:346 +#: actions/pathsadminpanel.php:323 actions/siteadminpanel.php:294 #, fuzzy msgid "Never" msgstr "Geri al" -#: actions/pathsadminpanel.php:297 +#: actions/pathsadminpanel.php:324 #, fuzzy msgid "Sometimes" msgstr "Durum mesajları" -#: actions/pathsadminpanel.php:298 +#: actions/pathsadminpanel.php:325 msgid "Always" msgstr "" -#: actions/pathsadminpanel.php:302 +#: actions/pathsadminpanel.php:329 msgid "Use SSL" msgstr "" -#: actions/pathsadminpanel.php:303 +#: actions/pathsadminpanel.php:330 msgid "When to use SSL" msgstr "" -#: actions/pathsadminpanel.php:308 +#: actions/pathsadminpanel.php:335 #, fuzzy msgid "SSL server" msgstr "Geri al" -#: actions/pathsadminpanel.php:309 +#: actions/pathsadminpanel.php:336 msgid "Server to direct SSL requests to" msgstr "" -#: actions/pathsadminpanel.php:325 +#: actions/pathsadminpanel.php:352 #, fuzzy msgid "Save paths" msgstr "Yeni durum mesajı" @@ -2629,7 +2706,7 @@ msgid "" "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated" msgstr "" -#: actions/profilesettings.php:151 actions/siteadminpanel.php:294 +#: actions/profilesettings.php:151 actions/siteadminpanel.php:280 msgid "Language" msgstr "" @@ -2655,7 +2732,7 @@ msgstr "" msgid "Bio is too long (max %d chars)." msgstr "Hakkında bölümü çok uzun (azm 140 karakter)." -#: actions/profilesettings.php:235 actions/siteadminpanel.php:164 +#: actions/profilesettings.php:235 actions/siteadminpanel.php:150 msgid "Timezone not selected." msgstr "" @@ -2922,7 +2999,7 @@ msgstr "Onay kodu hatası." msgid "Registration successful" msgstr "" -#: actions/register.php:114 actions/register.php:503 lib/action.php:457 +#: actions/register.php:114 actions/register.php:503 lib/action.php:463 #: lib/logingroupnav.php:85 msgid "Register" msgstr "Kayıt" @@ -2962,7 +3039,7 @@ msgid "Same as password above. Required." msgstr "" #: actions/register.php:438 actions/register.php:442 -#: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120 +#: actions/siteadminpanel.php:256 lib/accountsettingsaction.php:120 msgid "Email" msgstr "Eposta" @@ -3107,6 +3184,11 @@ msgstr "Yarat" msgid "Replies to %s" msgstr "%s için cevaplar" +#: actions/replies.php:127 +#, fuzzy, php-format +msgid "Replies to %1$s, page %2$d" +msgstr "%s için cevaplar" + #: actions/replies.php:144 #, fuzzy, php-format msgid "Replies feed for %s (RSS 1.0)" @@ -3236,6 +3318,11 @@ msgid "" "signature method." msgstr "" +#: actions/showfavorites.php:79 +#, fuzzy, php-format +msgid "%1$s's favorite notices, page %2$d" +msgstr "%s ve arkadaşları" + #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "" @@ -3285,6 +3372,11 @@ msgstr "" msgid "%s group" msgstr "" +#: actions/showgroup.php:84 +#, fuzzy, php-format +msgid "%1$s group, page %2$d" +msgstr "Bütün abonelikler" + #: actions/showgroup.php:218 #, fuzzy msgid "Group profile" @@ -3400,6 +3492,11 @@ msgstr "Durum mesajları" msgid " tagged %s" msgstr "" +#: actions/showstream.php:79 +#, fuzzy, php-format +msgid "%1$s, page %2$d" +msgstr "%s ve arkadaşları" + #: actions/showstream.php:122 #, fuzzy, php-format msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" @@ -3478,200 +3575,148 @@ msgstr "Kullanıcının profili yok." msgid "Basic settings for this StatusNet site." msgstr "" -#: actions/siteadminpanel.php:146 +#: actions/siteadminpanel.php:132 msgid "Site name must have non-zero length." msgstr "" -#: actions/siteadminpanel.php:154 +#: actions/siteadminpanel.php:140 #, fuzzy msgid "You must have a valid contact email address." msgstr "Geçersiz bir eposta adresi." -#: actions/siteadminpanel.php:172 +#: actions/siteadminpanel.php:158 #, php-format msgid "Unknown language \"%s\"." msgstr "" -#: actions/siteadminpanel.php:179 +#: actions/siteadminpanel.php:165 msgid "Invalid snapshot report URL." msgstr "" -#: actions/siteadminpanel.php:185 +#: actions/siteadminpanel.php:171 msgid "Invalid snapshot run value." msgstr "" -#: actions/siteadminpanel.php:191 +#: actions/siteadminpanel.php:177 msgid "Snapshot frequency must be a number." msgstr "" -#: actions/siteadminpanel.php:197 +#: actions/siteadminpanel.php:183 msgid "Minimum text limit is 140 characters." msgstr "" -#: actions/siteadminpanel.php:203 +#: actions/siteadminpanel.php:189 msgid "Dupe limit must 1 or more seconds." msgstr "" -#: actions/siteadminpanel.php:253 +#: actions/siteadminpanel.php:239 msgid "General" msgstr "" -#: actions/siteadminpanel.php:256 +#: actions/siteadminpanel.php:242 #, fuzzy msgid "Site name" msgstr "Yeni durum mesajı" -#: actions/siteadminpanel.php:257 +#: actions/siteadminpanel.php:243 msgid "The name of your site, like \"Yourcompany Microblog\"" msgstr "" -#: actions/siteadminpanel.php:261 +#: actions/siteadminpanel.php:247 msgid "Brought by" msgstr "" -#: actions/siteadminpanel.php:262 +#: actions/siteadminpanel.php:248 msgid "Text used for credits link in footer of each page" msgstr "" -#: actions/siteadminpanel.php:266 +#: actions/siteadminpanel.php:252 msgid "Brought by URL" msgstr "" -#: actions/siteadminpanel.php:267 +#: actions/siteadminpanel.php:253 msgid "URL used for credits link in footer of each page" msgstr "" -#: actions/siteadminpanel.php:271 +#: actions/siteadminpanel.php:257 #, fuzzy msgid "Contact email address for your site" msgstr "Kullanıcı için kaydedilmiş eposta adresi yok." -#: actions/siteadminpanel.php:277 +#: actions/siteadminpanel.php:263 #, fuzzy msgid "Local" msgstr "Yer" -#: actions/siteadminpanel.php:288 +#: actions/siteadminpanel.php:274 msgid "Default timezone" msgstr "" -#: actions/siteadminpanel.php:289 +#: actions/siteadminpanel.php:275 msgid "Default timezone for the site; usually UTC." msgstr "" -#: actions/siteadminpanel.php:295 +#: actions/siteadminpanel.php:281 msgid "Default site language" msgstr "" -#: actions/siteadminpanel.php:303 -msgid "URLs" -msgstr "" - -#: actions/siteadminpanel.php:306 -#, fuzzy -msgid "Server" -msgstr "Geri al" - -#: actions/siteadminpanel.php:306 -msgid "Site's server hostname." -msgstr "" - -#: actions/siteadminpanel.php:310 -msgid "Fancy URLs" -msgstr "" - -#: actions/siteadminpanel.php:312 -msgid "Use fancy (more readable and memorable) URLs?" -msgstr "" - -#: actions/siteadminpanel.php:318 -#, fuzzy -msgid "Access" -msgstr "Kabul et" - -#: actions/siteadminpanel.php:321 -#, fuzzy -msgid "Private" -msgstr "Gizlilik" - -#: actions/siteadminpanel.php:323 -msgid "Prohibit anonymous users (not logged in) from viewing site?" -msgstr "" - -#: actions/siteadminpanel.php:327 -msgid "Invite only" -msgstr "" - -#: actions/siteadminpanel.php:329 -msgid "Make registration invitation only." -msgstr "" - -#: actions/siteadminpanel.php:333 -#, fuzzy -msgid "Closed" -msgstr "Böyle bir kullanıcı yok." - -#: actions/siteadminpanel.php:335 -msgid "Disable new registrations." -msgstr "" - -#: actions/siteadminpanel.php:341 +#: actions/siteadminpanel.php:289 msgid "Snapshots" msgstr "" -#: actions/siteadminpanel.php:344 +#: actions/siteadminpanel.php:292 msgid "Randomly during Web hit" msgstr "" -#: actions/siteadminpanel.php:345 +#: actions/siteadminpanel.php:293 msgid "In a scheduled job" msgstr "" -#: actions/siteadminpanel.php:347 +#: actions/siteadminpanel.php:295 msgid "Data snapshots" msgstr "" -#: actions/siteadminpanel.php:348 +#: actions/siteadminpanel.php:296 msgid "When to send statistical data to status.net servers" msgstr "" -#: actions/siteadminpanel.php:353 +#: actions/siteadminpanel.php:301 msgid "Frequency" msgstr "" -#: actions/siteadminpanel.php:354 +#: actions/siteadminpanel.php:302 msgid "Snapshots will be sent once every N web hits" msgstr "" -#: actions/siteadminpanel.php:359 +#: actions/siteadminpanel.php:307 msgid "Report URL" msgstr "" -#: actions/siteadminpanel.php:360 +#: actions/siteadminpanel.php:308 msgid "Snapshots will be sent to this URL" msgstr "" -#: actions/siteadminpanel.php:367 +#: actions/siteadminpanel.php:315 msgid "Limits" msgstr "" -#: actions/siteadminpanel.php:370 +#: actions/siteadminpanel.php:318 msgid "Text limit" msgstr "" -#: actions/siteadminpanel.php:370 +#: actions/siteadminpanel.php:318 msgid "Maximum number of characters for notices." msgstr "" -#: actions/siteadminpanel.php:374 +#: actions/siteadminpanel.php:322 msgid "Dupe limit" msgstr "" -#: actions/siteadminpanel.php:374 +#: actions/siteadminpanel.php:322 msgid "How long users must wait (in seconds) to post the same thing again." msgstr "" -#: actions/siteadminpanel.php:388 actions/useradminpanel.php:313 +#: actions/siteadminpanel.php:336 actions/useradminpanel.php:313 #, fuzzy msgid "Save site settings" msgstr "Ayarlar" @@ -3871,6 +3916,11 @@ msgstr "JabberID yok." msgid "SMS" msgstr "" +#: actions/tag.php:68 +#, fuzzy, php-format +msgid "Notices tagged with %1$s, page %2$d" +msgstr "%s adli kullanicinin durum mesajlari" + #: actions/tag.php:86 #, fuzzy, php-format msgid "Notice feed for tag %s (RSS 1.0)" @@ -4173,6 +4223,11 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "" +#: actions/usergroups.php:64 +#, fuzzy, php-format +msgid "%1$s groups, page %2$d" +msgstr "Bütün abonelikler" + #: actions/usergroups.php:130 msgid "Search for more groups" msgstr "" @@ -4235,7 +4290,7 @@ msgstr "" msgid "Plugins" msgstr "" -#: actions/version.php:196 lib/action.php:741 +#: actions/version.php:196 lib/action.php:747 #, fuzzy msgid "Version" msgstr "Kişisel" @@ -4293,46 +4348,51 @@ msgstr "" msgid "Could not update message with new URI." msgstr "" -#: classes/Notice.php:171 +#: classes/Notice.php:157 #, php-format msgid "DB error inserting hashtag: %s" msgstr "" -#: classes/Notice.php:225 +#: classes/Notice.php:214 #, fuzzy msgid "Problem saving notice. Too long." msgstr "Durum mesajını kaydederken hata oluştu." -#: classes/Notice.php:229 +#: classes/Notice.php:218 #, fuzzy msgid "Problem saving notice. Unknown user." msgstr "Durum mesajını kaydederken hata oluştu." -#: classes/Notice.php:234 +#: classes/Notice.php:223 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:240 +#: classes/Notice.php:229 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:246 +#: classes/Notice.php:235 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:305 classes/Notice.php:330 +#: classes/Notice.php:294 classes/Notice.php:319 msgid "Problem saving notice." msgstr "Durum mesajını kaydederken hata oluştu." -#: classes/Notice.php:1059 +#: classes/Notice.php:790 +#, fuzzy +msgid "Problem saving group inbox." +msgstr "Durum mesajını kaydederken hata oluştu." + +#: classes/Notice.php:850 #, php-format msgid "DB error inserting reply: %s" msgstr "Cevap eklenirken veritabanı hatası: %s" -#: classes/Notice.php:1441 +#: classes/Notice.php:1233 #, php-format msgid "RT @%1$s %2$s" msgstr "" @@ -4391,131 +4451,131 @@ msgstr "%1$s'in %2$s'deki durum mesajları " msgid "Untitled page" msgstr "" -#: lib/action.php:427 +#: lib/action.php:433 msgid "Primary site navigation" msgstr "" -#: lib/action.php:433 +#: lib/action.php:439 msgid "Home" msgstr "Başlangıç" -#: lib/action.php:433 +#: lib/action.php:439 msgid "Personal profile and friends timeline" msgstr "" -#: lib/action.php:435 +#: lib/action.php:441 msgid "Change your email, avatar, password, profile" msgstr "" -#: lib/action.php:438 +#: lib/action.php:444 msgid "Connect" msgstr "Bağlan" -#: lib/action.php:438 +#: lib/action.php:444 #, fuzzy msgid "Connect to services" msgstr "Sunucuya yönlendirme yapılamadı: %s" -#: lib/action.php:442 +#: lib/action.php:448 #, fuzzy msgid "Change site configuration" msgstr "Abonelikler" -#: lib/action.php:446 lib/subgroupnav.php:105 +#: lib/action.php:452 lib/subgroupnav.php:105 msgid "Invite" msgstr "" -#: lib/action.php:447 lib/subgroupnav.php:106 +#: lib/action.php:453 lib/subgroupnav.php:106 #, php-format msgid "Invite friends and colleagues to join you on %s" msgstr "" -#: lib/action.php:452 +#: lib/action.php:458 msgid "Logout" msgstr "Çıkış" -#: lib/action.php:452 +#: lib/action.php:458 msgid "Logout from the site" msgstr "" -#: lib/action.php:457 +#: lib/action.php:463 #, fuzzy msgid "Create an account" msgstr "Yeni hesap oluştur" -#: lib/action.php:460 +#: lib/action.php:466 msgid "Login to the site" msgstr "" -#: lib/action.php:463 lib/action.php:726 +#: lib/action.php:469 lib/action.php:732 msgid "Help" msgstr "Yardım" -#: lib/action.php:463 +#: lib/action.php:469 #, fuzzy msgid "Help me!" msgstr "Yardım" -#: lib/action.php:466 lib/searchaction.php:127 +#: lib/action.php:472 lib/searchaction.php:127 msgid "Search" msgstr "Ara" -#: lib/action.php:466 +#: lib/action.php:472 msgid "Search for people or text" msgstr "" -#: lib/action.php:487 +#: lib/action.php:493 #, fuzzy msgid "Site notice" msgstr "Yeni durum mesajı" -#: lib/action.php:553 +#: lib/action.php:559 msgid "Local views" msgstr "" -#: lib/action.php:619 +#: lib/action.php:625 #, fuzzy msgid "Page notice" msgstr "Yeni durum mesajı" -#: lib/action.php:721 +#: lib/action.php:727 #, fuzzy msgid "Secondary site navigation" msgstr "Abonelikler" -#: lib/action.php:728 +#: lib/action.php:734 msgid "About" msgstr "Hakkında" -#: lib/action.php:730 +#: lib/action.php:736 msgid "FAQ" msgstr "SSS" -#: lib/action.php:734 +#: lib/action.php:740 msgid "TOS" msgstr "" -#: lib/action.php:737 +#: lib/action.php:743 msgid "Privacy" msgstr "Gizlilik" -#: lib/action.php:739 +#: lib/action.php:745 msgid "Source" msgstr "Kaynak" -#: lib/action.php:743 +#: lib/action.php:749 msgid "Contact" msgstr "İletişim" -#: lib/action.php:745 +#: lib/action.php:751 msgid "Badge" msgstr "" -#: lib/action.php:773 +#: lib/action.php:779 msgid "StatusNet software license" msgstr "" -#: lib/action.php:776 +#: lib/action.php:782 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -4524,12 +4584,12 @@ msgstr "" "**%%site.name%%** [%%site.broughtby%%](%%site.broughtbyurl%%)\" tarafından " "hazırlanan anında mesajlaşma ağıdır. " -#: lib/action.php:778 +#: lib/action.php:784 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "**%%site.name%%** bir aninda mesajlaşma sosyal ağıdır." -#: lib/action.php:780 +#: lib/action.php:786 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4540,43 +4600,43 @@ msgstr "" "licenses/agpl-3.0.html) lisansı ile korunan [StatusNet](http://status.net/) " "microbloglama yazılımının %s. versiyonunu kullanmaktadır." -#: lib/action.php:795 +#: lib/action.php:801 #, fuzzy msgid "Site content license" msgstr "Yeni durum mesajı" -#: lib/action.php:800 +#: lib/action.php:806 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "" -#: lib/action.php:805 +#: lib/action.php:811 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" -#: lib/action.php:808 +#: lib/action.php:814 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" -#: lib/action.php:820 +#: lib/action.php:826 msgid "All " msgstr "" -#: lib/action.php:825 +#: lib/action.php:831 msgid "license." msgstr "" -#: lib/action.php:1124 +#: lib/action.php:1130 msgid "Pagination" msgstr "" -#: lib/action.php:1133 +#: lib/action.php:1139 #, fuzzy msgid "After" msgstr "« Sonra" -#: lib/action.php:1141 +#: lib/action.php:1147 #, fuzzy msgid "Before" msgstr "Önce »" @@ -4611,11 +4671,25 @@ msgstr "Eposta adresi onayı" msgid "Design configuration" msgstr "Eposta adresi onayı" -#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327 +#: lib/adminpanelaction.php:322 +#, fuzzy +msgid "User configuration" +msgstr "Eposta adresi onayı" + +#: lib/adminpanelaction.php:327 +#, fuzzy +msgid "Access configuration" +msgstr "Eposta adresi onayı" + +#: lib/adminpanelaction.php:332 #, fuzzy msgid "Paths configuration" msgstr "Eposta adresi onayı" +#: lib/applicationeditform.php:136 +msgid "Edit application" +msgstr "" + #: lib/applicationeditform.php:186 msgid "Icon for this application" msgstr "" @@ -5211,12 +5285,12 @@ msgstr "" msgid "kB" msgstr "" -#: lib/jabber.php:202 +#: lib/jabber.php:220 #, php-format msgid "[%s]" msgstr "" -#: lib/jabber.php:385 +#: lib/jabber.php:400 #, php-format msgid "Unknown inbox source %d." msgstr "" @@ -5644,19 +5718,19 @@ msgstr "Cevaplar" msgid "Favorites" msgstr "" -#: lib/personalgroupnav.php:124 +#: lib/personalgroupnav.php:125 msgid "Inbox" msgstr "" -#: lib/personalgroupnav.php:125 +#: lib/personalgroupnav.php:126 msgid "Your incoming messages" msgstr "" -#: lib/personalgroupnav.php:129 +#: lib/personalgroupnav.php:130 msgid "Outbox" msgstr "" -#: lib/personalgroupnav.php:130 +#: lib/personalgroupnav.php:131 msgid "Your sent messages" msgstr "" @@ -5915,47 +5989,47 @@ msgstr "" msgid "Moderate" msgstr "" -#: lib/util.php:875 +#: lib/util.php:868 msgid "a few seconds ago" msgstr "birkaç saniye önce" -#: lib/util.php:877 +#: lib/util.php:870 msgid "about a minute ago" msgstr "yaklaşık bir dakika önce" -#: lib/util.php:879 +#: lib/util.php:872 #, php-format msgid "about %d minutes ago" msgstr "yaklaşık %d dakika önce" -#: lib/util.php:881 +#: lib/util.php:874 msgid "about an hour ago" msgstr "yaklaşık bir saat önce" -#: lib/util.php:883 +#: lib/util.php:876 #, php-format msgid "about %d hours ago" msgstr "yaklaşık %d saat önce" -#: lib/util.php:885 +#: lib/util.php:878 msgid "about a day ago" msgstr "yaklaşık bir gün önce" -#: lib/util.php:887 +#: lib/util.php:880 #, php-format msgid "about %d days ago" msgstr "yaklaşık %d gün önce" -#: lib/util.php:889 +#: lib/util.php:882 msgid "about a month ago" msgstr "yaklaşık bir ay önce" -#: lib/util.php:891 +#: lib/util.php:884 #, php-format msgid "about %d months ago" msgstr "yaklaşık %d ay önce" -#: lib/util.php:893 +#: lib/util.php:886 msgid "about a year ago" msgstr "yaklaşık bir yıl önce" @@ -5969,7 +6043,7 @@ msgstr "Başlangıç sayfası adresi geçerli bir URL değil." msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "" -#: scripts/xmppdaemon.php:301 +#: lib/xmppmanager.php:402 #, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" diff --git a/locale/uk/LC_MESSAGES/statusnet.po b/locale/uk/LC_MESSAGES/statusnet.po index 886b60cc30..c5ea85a8a3 100644 --- a/locale/uk/LC_MESSAGES/statusnet.po +++ b/locale/uk/LC_MESSAGES/statusnet.po @@ -10,18 +10,74 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-21 22:36+0000\n" -"PO-Revision-Date: 2010-01-21 22:38:40+0000\n" +"POT-Creation-Date: 2010-01-27 23:58+0000\n" +"PO-Revision-Date: 2010-01-27 23:59:56+0000\n" "Language-Team: Ukrainian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r61339); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61595); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: uk\n" "X-Message-Group: out-statusnet\n" "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" +#: actions/accessadminpanel.php:54 lib/adminpanelaction.php:326 +msgid "Access" +msgstr "Погодитись" + +#: actions/accessadminpanel.php:65 +#, fuzzy +msgid "Site access settings" +msgstr "Зберегти налаштування сайту" + +#: actions/accessadminpanel.php:158 +#, fuzzy +msgid "Registration" +msgstr "Реєстрація" + +#: actions/accessadminpanel.php:161 +msgid "Private" +msgstr "Приватно" + +#: actions/accessadminpanel.php:163 +msgid "Prohibit anonymous users (not logged in) from viewing site?" +msgstr "" +"Заборонити анонімним відвідувачам (ті, що не увійшли до системи) переглядати " +"сайт?" + +#: actions/accessadminpanel.php:167 +msgid "Invite only" +msgstr "Лише за запрошеннями" + +#: actions/accessadminpanel.php:169 +msgid "Make registration invitation only." +msgstr "Зробити регістрацію лише за запрошеннями." + +#: actions/accessadminpanel.php:173 +msgid "Closed" +msgstr "Закрито" + +#: actions/accessadminpanel.php:175 +msgid "Disable new registrations." +msgstr "Скасувати подальшу регістрацію." + +#: actions/accessadminpanel.php:189 actions/designadminpanel.php:586 +#: actions/emailsettings.php:195 actions/imsettings.php:163 +#: actions/othersettings.php:126 actions/pathsadminpanel.php:351 +#: actions/profilesettings.php:174 actions/siteadminpanel.php:336 +#: actions/smssettings.php:181 actions/subscriptions.php:203 +#: actions/tagother.php:154 actions/useradminpanel.php:313 +#: lib/applicationeditform.php:335 lib/applicationeditform.php:336 +#: lib/designsettings.php:256 lib/groupeditform.php:202 +msgid "Save" +msgstr "Зберегти" + +#: actions/accessadminpanel.php:189 +#, fuzzy +msgid "Save access settings" +msgstr "Зберегти налаштування сайту" + #: actions/all.php:63 actions/public.php:97 actions/replies.php:92 #: actions/showfavorites.php:137 actions/tag.php:51 msgid "No such page" @@ -36,7 +92,7 @@ msgstr "Немає такої сторінки" #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:149 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 @@ -141,8 +197,7 @@ msgstr "Оновлення від %1$s та друзів на %2$s!" #: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 #: actions/apitimelinefriends.php:155 actions/apitimelinegroup.php:150 #: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 -#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found." @@ -158,7 +213,7 @@ msgstr "API метод не знайдено." #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:119 +#: actions/apistatusesupdate.php:118 msgid "This method requires a POST." msgstr "Цей метод потребує POST." @@ -188,7 +243,7 @@ msgstr "Не вдалося зберегти профіль." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:132 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 #: actions/designadminpanel.php:122 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -492,7 +547,14 @@ msgstr "Запит на дозвіл під’єднатися до Вашого msgid "Allow or deny access" msgstr "Дозволити або заборонити доступ" -#: actions/apioauthauthorize.php:320 lib/action.php:435 +#: actions/apioauthauthorize.php:306 +#, php-format +msgid "" +"The application %s by %s would like the " +"ability to %s your account data." +msgstr "" + +#: actions/apioauthauthorize.php:320 lib/action.php:441 msgid "Account" msgstr "Акаунт" @@ -549,17 +611,17 @@ msgstr "Статус видалено." msgid "No status with that ID found." msgstr "Не знайдено жодних статусів з таким ID." -#: actions/apistatusesupdate.php:162 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Надто довго. Максимальний розмір допису — %d знаків." -#: actions/apistatusesupdate.php:203 +#: actions/apistatusesupdate.php:202 msgid "Not found" msgstr "Не знайдено" -#: actions/apistatusesupdate.php:226 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -612,11 +674,6 @@ msgstr "%s загальна стрічка" msgid "%s updates from everyone!" msgstr "%s оновлення від усіх!" -#: actions/apitimelineretweetedbyme.php:112 -#, php-format -msgid "Repeated by %s" -msgstr "Вторування %s" - #: actions/apitimelineretweetedtome.php:111 #, php-format msgid "Repeated to %s" @@ -1022,17 +1079,6 @@ msgstr "Оновити налаштування за замовчуванням" msgid "Reset back to default" msgstr "Повернутись до початкових налаштувань" -#: actions/designadminpanel.php:586 actions/emailsettings.php:195 -#: actions/imsettings.php:163 actions/othersettings.php:126 -#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174 -#: actions/siteadminpanel.php:388 actions/smssettings.php:181 -#: actions/subscriptions.php:203 actions/tagother.php:154 -#: actions/useradminpanel.php:313 lib/applicationeditform.php:335 -#: lib/applicationeditform.php:336 lib/designsettings.php:256 -#: lib/groupeditform.php:202 -msgid "Save" -msgstr "Зберегти" - #: actions/designadminpanel.php:587 lib/designsettings.php:257 msgid "Save design" msgstr "Зберегти дизайн" @@ -1045,12 +1091,14 @@ msgstr "Цей допис не є обраним!" msgid "Add to favorites" msgstr "Додати до обраних" -#: actions/doc.php:69 -msgid "No such document." +#: actions/doc.php:155 +#, fuzzy, php-format +msgid "No such document \"%s\"" msgstr "Такого документа немає." -#: actions/editapplication.php:54 lib/applicationeditform.php:136 -msgid "Edit application" +#: actions/editapplication.php:54 +#, fuzzy +msgid "Edit Application" msgstr "Керувати додатками" #: actions/editapplication.php:66 @@ -1067,7 +1115,7 @@ msgid "No such application." msgstr "Такого додатку немає." #: actions/editapplication.php:127 actions/newapplication.php:110 -#: actions/showapplication.php:118 lib/action.php:1189 +#: actions/showapplication.php:118 lib/action.php:1195 msgid "There was a problem with your session token." msgstr "Виникли певні проблеми з токеном поточної сесії." @@ -1268,7 +1316,7 @@ msgid "Cannot normalize that email address" msgstr "Не можна полагодити цю поштову адресу" #: actions/emailsettings.php:331 actions/register.php:201 -#: actions/siteadminpanel.php:157 +#: actions/siteadminpanel.php:143 msgid "Not a valid email address." msgstr "Це недійсна електронна адреса." @@ -1280,7 +1328,7 @@ msgstr "Це і є Вашою адресою." msgid "That email address already belongs to another user." msgstr "Ця електронна адреса належить іншому користувачу." -#: actions/emailsettings.php:353 actions/imsettings.php:317 +#: actions/emailsettings.php:353 actions/imsettings.php:319 #: actions/smssettings.php:337 msgid "Couldn't insert confirmation code." msgstr "Не вдалося додати код підтвердження." @@ -1586,7 +1634,7 @@ msgstr "Учасники групи %1$s, сторінка %2$d" msgid "A list of the users in this group." msgstr "Список учасників цієї групи." -#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107 +#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107 msgid "Admin" msgstr "Адмін" @@ -1785,6 +1833,11 @@ msgstr "" msgid "That is not your Jabber ID." msgstr "Це не Ваш Jabber ID." +#: actions/inbox.php:59 +#, fuzzy, php-format +msgid "Inbox for %1$s - page %2$d" +msgstr "Вхідні для %s" + #: actions/inbox.php:62 #, php-format msgid "Inbox for %s" @@ -1968,7 +2021,7 @@ msgstr "Неточне ім’я або пароль." msgid "Error setting user. You are probably not authorized." msgstr "Помилка. Можливо, Ви не авторизовані." -#: actions/login.php:188 actions/login.php:241 lib/action.php:460 +#: actions/login.php:188 actions/login.php:241 lib/action.php:466 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Увійти" @@ -2033,7 +2086,8 @@ msgid "No current status" msgstr "Ніякого поточного статусу" #: actions/newapplication.php:52 -msgid "New application" +#, fuzzy +msgid "New Application" msgstr "Новий додаток" #: actions/newapplication.php:64 @@ -2225,8 +2279,8 @@ msgstr "тип змісту " msgid "Only " msgstr "Лише " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1038 -#: lib/api.php:1066 lib/api.php:1176 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1039 +#: lib/api.php:1067 lib/api.php:1177 msgid "Not a supported data format." msgstr "Такий формат даних не підтримується." @@ -2290,6 +2344,11 @@ msgstr "Токен для входу визначено як неправиль msgid "Login token expired." msgstr "Токен для входу втратив чинність." +#: actions/outbox.php:58 +#, fuzzy, php-format +msgid "Outbox for %1$s - page %2$d" +msgstr "Вихідні для %s" + #: actions/outbox.php:61 #, php-format msgid "Outbox for %s" @@ -2362,7 +2421,7 @@ msgstr "Неможна зберегти новий пароль." msgid "Password saved." msgstr "Пароль збережено." -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:331 msgid "Paths" msgstr "Шлях" @@ -2370,132 +2429,148 @@ msgstr "Шлях" msgid "Path and server settings for this StatusNet site." msgstr "Шлях та налаштування серверу для цього сайту StatusNet." -#: actions/pathsadminpanel.php:140 +#: actions/pathsadminpanel.php:157 #, php-format msgid "Theme directory not readable: %s" msgstr "Дирикторію теми неможна прочитати: %s" -#: actions/pathsadminpanel.php:146 +#: actions/pathsadminpanel.php:163 #, php-format msgid "Avatar directory not writable: %s" msgstr "Щось не так із написанням директорії аватари: %s" -#: actions/pathsadminpanel.php:152 +#: actions/pathsadminpanel.php:169 #, php-format msgid "Background directory not writable: %s" msgstr "Щось не так із написанням директорії фону: %s" -#: actions/pathsadminpanel.php:160 +#: actions/pathsadminpanel.php:177 #, php-format msgid "Locales directory not readable: %s" msgstr "Не можу прочитати директорію локалі: %s" -#: actions/pathsadminpanel.php:166 +#: actions/pathsadminpanel.php:183 msgid "Invalid SSL server. The maximum length is 255 characters." msgstr "Помилковий SSL-сервер. Максимальна довжина 255 знаків." -#: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58 +#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58 #: lib/adminpanelaction.php:311 msgid "Site" msgstr "Сайт" -#: actions/pathsadminpanel.php:221 +#: actions/pathsadminpanel.php:238 +msgid "Server" +msgstr "Сервер" + +#: actions/pathsadminpanel.php:238 +msgid "Site's server hostname." +msgstr "Ім’я хосту сервера на якому знаходиться сайт." + +#: actions/pathsadminpanel.php:242 msgid "Path" msgstr "Шлях" -#: actions/pathsadminpanel.php:221 +#: actions/pathsadminpanel.php:242 msgid "Site path" msgstr "Шлях до сайту" -#: actions/pathsadminpanel.php:225 +#: actions/pathsadminpanel.php:246 msgid "Path to locales" msgstr "Шлях до локалей" -#: actions/pathsadminpanel.php:225 +#: actions/pathsadminpanel.php:246 msgid "Directory path to locales" msgstr "Директорія шляху до локалей" -#: actions/pathsadminpanel.php:232 +#: actions/pathsadminpanel.php:250 +msgid "Fancy URLs" +msgstr "Надзвичайні URL-адреси" + +#: actions/pathsadminpanel.php:252 +msgid "Use fancy (more readable and memorable) URLs?" +msgstr "Використовувати надзвичайні (найбільш пам’ятні і визначні) URL-адреси?" + +#: actions/pathsadminpanel.php:259 msgid "Theme" msgstr "Тема" -#: actions/pathsadminpanel.php:237 +#: actions/pathsadminpanel.php:264 msgid "Theme server" msgstr "Сервер теми" -#: actions/pathsadminpanel.php:241 +#: actions/pathsadminpanel.php:268 msgid "Theme path" msgstr "Шлях до теми" -#: actions/pathsadminpanel.php:245 +#: actions/pathsadminpanel.php:272 msgid "Theme directory" msgstr "Директорія теми" -#: actions/pathsadminpanel.php:252 +#: actions/pathsadminpanel.php:279 msgid "Avatars" msgstr "Аватари" -#: actions/pathsadminpanel.php:257 +#: actions/pathsadminpanel.php:284 msgid "Avatar server" msgstr "Сервер аватари" -#: actions/pathsadminpanel.php:261 +#: actions/pathsadminpanel.php:288 msgid "Avatar path" msgstr "Шлях до аватари" -#: actions/pathsadminpanel.php:265 +#: actions/pathsadminpanel.php:292 msgid "Avatar directory" msgstr "Директорія аватари" -#: actions/pathsadminpanel.php:274 +#: actions/pathsadminpanel.php:301 msgid "Backgrounds" msgstr "Фони" -#: actions/pathsadminpanel.php:278 +#: actions/pathsadminpanel.php:305 msgid "Background server" msgstr "Сервер фонів" -#: actions/pathsadminpanel.php:282 +#: actions/pathsadminpanel.php:309 msgid "Background path" msgstr "Шлях до фонів" -#: actions/pathsadminpanel.php:286 +#: actions/pathsadminpanel.php:313 msgid "Background directory" msgstr "Директорія фонів" -#: actions/pathsadminpanel.php:293 +#: actions/pathsadminpanel.php:320 msgid "SSL" msgstr "SSL-шифрування" -#: actions/pathsadminpanel.php:296 actions/siteadminpanel.php:346 +#: actions/pathsadminpanel.php:323 actions/siteadminpanel.php:294 msgid "Never" msgstr "Ніколи" -#: actions/pathsadminpanel.php:297 +#: actions/pathsadminpanel.php:324 msgid "Sometimes" msgstr "Іноді" -#: actions/pathsadminpanel.php:298 +#: actions/pathsadminpanel.php:325 msgid "Always" msgstr "Завжди" -#: actions/pathsadminpanel.php:302 +#: actions/pathsadminpanel.php:329 msgid "Use SSL" msgstr "Використовувати SSL" -#: actions/pathsadminpanel.php:303 +#: actions/pathsadminpanel.php:330 msgid "When to use SSL" msgstr "Тоді використовувати SSL" -#: actions/pathsadminpanel.php:308 +#: actions/pathsadminpanel.php:335 msgid "SSL server" msgstr "SSL-сервер" -#: actions/pathsadminpanel.php:309 +#: actions/pathsadminpanel.php:336 msgid "Server to direct SSL requests to" msgstr "Сервер на який направляти SSL-запити" -#: actions/pathsadminpanel.php:325 +#: actions/pathsadminpanel.php:352 msgid "Save paths" msgstr "Зберегти шляхи" @@ -2584,7 +2659,7 @@ msgstr "Про себе" #: actions/userauthorization.php:158 lib/groupeditform.php:177 #: lib/userprofile.php:164 msgid "Location" -msgstr "Локація" +msgstr "Розташування" #: actions/profilesettings.php:134 actions/register.php:473 msgid "Where you are, like \"City, State (or Region), Country\"" @@ -2607,7 +2682,7 @@ msgstr "" "Позначте себе теґами (літери, цифри, -, . та _), відокремлюючи кожен комою " "або пробілом" -#: actions/profilesettings.php:151 actions/siteadminpanel.php:294 +#: actions/profilesettings.php:151 actions/siteadminpanel.php:280 msgid "Language" msgstr "Мова" @@ -2634,7 +2709,7 @@ msgstr "" msgid "Bio is too long (max %d chars)." msgstr "Ви перевищили ліміт (%d знаків максимум)." -#: actions/profilesettings.php:235 actions/siteadminpanel.php:164 +#: actions/profilesettings.php:235 actions/siteadminpanel.php:150 msgid "Timezone not selected." msgstr "Часовий пояс не обрано." @@ -2911,7 +2986,7 @@ msgstr "Даруйте, помилка у коді запрошення." msgid "Registration successful" msgstr "Реєстрація успішна" -#: actions/register.php:114 actions/register.php:503 lib/action.php:457 +#: actions/register.php:114 actions/register.php:503 lib/action.php:463 #: lib/logingroupnav.php:85 msgid "Register" msgstr "Реєстрація" @@ -2955,7 +3030,7 @@ msgid "Same as password above. Required." msgstr "Такий само, як і пароль вище. Неодмінно." #: actions/register.php:438 actions/register.php:442 -#: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120 +#: actions/siteadminpanel.php:256 lib/accountsettingsaction.php:120 msgid "Email" msgstr "Пошта" @@ -3111,6 +3186,11 @@ msgstr "Вторувати!" msgid "Replies to %s" msgstr "Відповіді до %s" +#: actions/replies.php:127 +#, fuzzy, php-format +msgid "Replies to %1$s, page %2$d" +msgstr "Відповіді до %1$s на %2$s!" + #: actions/replies.php:144 #, php-format msgid "Replies feed for %s (RSS 1.0)" @@ -3242,6 +3322,11 @@ msgstr "" "До уваги: Всі підписи шифруються за методом HMAC-SHA1. Ми не підтримуємо " "шифрування підписів відкритим текстом." +#: actions/showfavorites.php:79 +#, fuzzy, php-format +msgid "%1$s's favorite notices, page %2$d" +msgstr "Обрані дописи %s" + #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "Не можна відновити обрані дописи." @@ -3299,6 +3384,11 @@ msgstr "Це спосіб поділитись з усіма тим, що вам msgid "%s group" msgstr "Група %s" +#: actions/showgroup.php:84 +#, fuzzy, php-format +msgid "%1$s group, page %2$d" +msgstr "Учасники групи %1$s, сторінка %2$d" + #: actions/showgroup.php:218 msgid "Group profile" msgstr "Профіль групи" @@ -3418,6 +3508,11 @@ msgstr "Допис видалено." msgid " tagged %s" msgstr " позначено з %s" +#: actions/showstream.php:79 +#, fuzzy, php-format +msgid "%1$s, page %2$d" +msgstr "%1$s та друзі, сторінка %2$d" + #: actions/showstream.php:122 #, php-format msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" @@ -3507,198 +3602,148 @@ msgstr "Користувачу наразі заклеїли рота скотч msgid "Basic settings for this StatusNet site." msgstr "Загальні налаштування цього сайту StatusNet." -#: actions/siteadminpanel.php:146 +#: actions/siteadminpanel.php:132 msgid "Site name must have non-zero length." msgstr "Ім’я сайту не може бути порожнім." -#: actions/siteadminpanel.php:154 +#: actions/siteadminpanel.php:140 msgid "You must have a valid contact email address." msgstr "Електронна адреса має бути чинною." -#: actions/siteadminpanel.php:172 +#: actions/siteadminpanel.php:158 #, php-format msgid "Unknown language \"%s\"." msgstr "Невідома мова «%s»." -#: actions/siteadminpanel.php:179 +#: actions/siteadminpanel.php:165 msgid "Invalid snapshot report URL." msgstr "Помилковий снепшот URL." -#: actions/siteadminpanel.php:185 +#: actions/siteadminpanel.php:171 msgid "Invalid snapshot run value." msgstr "Помилкове значення снепшоту." -#: actions/siteadminpanel.php:191 +#: actions/siteadminpanel.php:177 msgid "Snapshot frequency must be a number." msgstr "Частота повторення снепшотів має містити цифру." -#: actions/siteadminpanel.php:197 +#: actions/siteadminpanel.php:183 msgid "Minimum text limit is 140 characters." msgstr "Ліміт текстових повідомлень становить 140 знаків." -#: actions/siteadminpanel.php:203 +#: actions/siteadminpanel.php:189 msgid "Dupe limit must 1 or more seconds." msgstr "" "Часове обмеження при надсиланні дублікату повідомлення має становити від 1 і " "більше секунд." -#: actions/siteadminpanel.php:253 +#: actions/siteadminpanel.php:239 msgid "General" msgstr "Основні" -#: actions/siteadminpanel.php:256 +#: actions/siteadminpanel.php:242 msgid "Site name" msgstr "Назва сайту" -#: actions/siteadminpanel.php:257 +#: actions/siteadminpanel.php:243 msgid "The name of your site, like \"Yourcompany Microblog\"" msgstr "Назва Вашого сайту, штибу \"Мікроблоґи компанії ...\"" -#: actions/siteadminpanel.php:261 +#: actions/siteadminpanel.php:247 msgid "Brought by" msgstr "Надано" -#: actions/siteadminpanel.php:262 +#: actions/siteadminpanel.php:248 msgid "Text used for credits link in footer of each page" msgstr "Текст використаний для посілань кредитів унизу кожної сторінки" -#: actions/siteadminpanel.php:266 +#: actions/siteadminpanel.php:252 msgid "Brought by URL" msgstr "Наданий URL" -#: actions/siteadminpanel.php:267 +#: actions/siteadminpanel.php:253 msgid "URL used for credits link in footer of each page" msgstr "URL використаний для посілань кредитів унизу кожної сторінки" -#: actions/siteadminpanel.php:271 +#: actions/siteadminpanel.php:257 msgid "Contact email address for your site" msgstr "Контактна електронна адреса для Вашого сайту" -#: actions/siteadminpanel.php:277 +#: actions/siteadminpanel.php:263 msgid "Local" msgstr "Локаль" -#: actions/siteadminpanel.php:288 +#: actions/siteadminpanel.php:274 msgid "Default timezone" msgstr "Часовий пояс за замовчуванням" -#: actions/siteadminpanel.php:289 +#: actions/siteadminpanel.php:275 msgid "Default timezone for the site; usually UTC." msgstr "Часовий пояс за замовчуванням для сайту; зазвичай UTC." -#: actions/siteadminpanel.php:295 +#: actions/siteadminpanel.php:281 msgid "Default site language" msgstr "Мова сайту за замовчуванням" -#: actions/siteadminpanel.php:303 -msgid "URLs" -msgstr "URL-адреси" - -#: actions/siteadminpanel.php:306 -msgid "Server" -msgstr "Сервер" - -#: actions/siteadminpanel.php:306 -msgid "Site's server hostname." -msgstr "Ім’я хосту сервера на якому знаходиться сайт." - -#: actions/siteadminpanel.php:310 -msgid "Fancy URLs" -msgstr "Надзвичайні URL-адреси" - -#: actions/siteadminpanel.php:312 -msgid "Use fancy (more readable and memorable) URLs?" -msgstr "Використовувати надзвичайні (найбільш пам’ятні і визначні) URL-адреси?" - -#: actions/siteadminpanel.php:318 -msgid "Access" -msgstr "Погодитись" - -#: actions/siteadminpanel.php:321 -msgid "Private" -msgstr "Приватно" - -#: actions/siteadminpanel.php:323 -msgid "Prohibit anonymous users (not logged in) from viewing site?" -msgstr "" -"Заборонити анонімним відвідувачам (ті, що не увійшли до системи) переглядати " -"сайт?" - -#: actions/siteadminpanel.php:327 -msgid "Invite only" -msgstr "Лише за запрошеннями" - -#: actions/siteadminpanel.php:329 -msgid "Make registration invitation only." -msgstr "Зробити регістрацію лише за запрошеннями." - -#: actions/siteadminpanel.php:333 -msgid "Closed" -msgstr "Закрито" - -#: actions/siteadminpanel.php:335 -msgid "Disable new registrations." -msgstr "Скасувати подальшу регістрацію." - -#: actions/siteadminpanel.php:341 +#: actions/siteadminpanel.php:289 msgid "Snapshots" msgstr "Снепшоти" -#: actions/siteadminpanel.php:344 +#: actions/siteadminpanel.php:292 msgid "Randomly during Web hit" msgstr "Випадково під час веб-хіта" -#: actions/siteadminpanel.php:345 +#: actions/siteadminpanel.php:293 msgid "In a scheduled job" msgstr "Згідно плану робіт" -#: actions/siteadminpanel.php:347 +#: actions/siteadminpanel.php:295 msgid "Data snapshots" msgstr "Снепшоти даних" -#: actions/siteadminpanel.php:348 +#: actions/siteadminpanel.php:296 msgid "When to send statistical data to status.net servers" msgstr "Коли надсилати статистичні дані до серверів status.net" -#: actions/siteadminpanel.php:353 +#: actions/siteadminpanel.php:301 msgid "Frequency" msgstr "Частота" -#: actions/siteadminpanel.php:354 +#: actions/siteadminpanel.php:302 msgid "Snapshots will be sent once every N web hits" msgstr "Снепшоти надсилатимуться раз на N веб-хітів" -#: actions/siteadminpanel.php:359 +#: actions/siteadminpanel.php:307 msgid "Report URL" msgstr "Звітня URL-адреса" -#: actions/siteadminpanel.php:360 +#: actions/siteadminpanel.php:308 msgid "Snapshots will be sent to this URL" msgstr "Снепшоти надсилатимуться на цю URL-адресу" -#: actions/siteadminpanel.php:367 +#: actions/siteadminpanel.php:315 msgid "Limits" msgstr "Обмеження" -#: actions/siteadminpanel.php:370 +#: actions/siteadminpanel.php:318 msgid "Text limit" msgstr "Текстові обмеження" -#: actions/siteadminpanel.php:370 +#: actions/siteadminpanel.php:318 msgid "Maximum number of characters for notices." msgstr "Максимальна кількість знаків у дописі." -#: actions/siteadminpanel.php:374 +#: actions/siteadminpanel.php:322 msgid "Dupe limit" msgstr "Часове обмеження" -#: actions/siteadminpanel.php:374 +#: actions/siteadminpanel.php:322 msgid "How long users must wait (in seconds) to post the same thing again." msgstr "" "Як довго користувачі мають зачекати (в секундах) аби надіслати той самий " "допис ще раз." -#: actions/siteadminpanel.php:388 actions/useradminpanel.php:313 +#: actions/siteadminpanel.php:336 actions/useradminpanel.php:313 msgid "Save site settings" msgstr "Зберегти налаштування сайту" @@ -3906,6 +3951,11 @@ msgstr "Jabber" msgid "SMS" msgstr "СМС" +#: actions/tag.php:68 +#, fuzzy, php-format +msgid "Notices tagged with %1$s, page %2$d" +msgstr "Користувачі з особистим теґом %1$s — сторінка %2$d" + #: actions/tag.php:86 #, php-format msgid "Notice feed for tag %s (RSS 1.0)" @@ -4205,6 +4255,11 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "Поласуйте бутербродом!" +#: actions/usergroups.php:64 +#, fuzzy, php-format +msgid "%1$s groups, page %2$d" +msgstr "Учасники групи %1$s, сторінка %2$d" + #: actions/usergroups.php:130 msgid "Search for more groups" msgstr "Шукати групи ще" @@ -4279,7 +4334,7 @@ msgstr "" msgid "Plugins" msgstr "Додатки" -#: actions/version.php:196 lib/action.php:741 +#: actions/version.php:196 lib/action.php:747 msgid "Version" msgstr "Версія" @@ -4335,27 +4390,27 @@ msgstr "Не можна долучити повідомлення." msgid "Could not update message with new URI." msgstr "Не можна оновити повідомлення з новим URI." -#: classes/Notice.php:171 +#: classes/Notice.php:157 #, php-format msgid "DB error inserting hashtag: %s" msgstr "Помилка бази даних при додаванні теґу: %s" -#: classes/Notice.php:225 +#: classes/Notice.php:214 msgid "Problem saving notice. Too long." msgstr "Проблема при збереженні допису. Надто довге." -#: classes/Notice.php:229 +#: classes/Notice.php:218 msgid "Problem saving notice. Unknown user." msgstr "Проблема при збереженні допису. Невідомий користувач." -#: classes/Notice.php:234 +#: classes/Notice.php:223 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Дуже багато дописів за короткий термін; ходіть подихайте повітрям і " "повертайтесь за кілька хвилин." -#: classes/Notice.php:240 +#: classes/Notice.php:229 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." @@ -4363,20 +4418,25 @@ msgstr "" "Дуже багато повідомлень за короткий термін; ходіть подихайте повітрям і " "повертайтесь за кілька хвилин." -#: classes/Notice.php:246 +#: classes/Notice.php:235 msgid "You are banned from posting notices on this site." msgstr "Вам заборонено надсилати дописи до цього сайту." -#: classes/Notice.php:305 classes/Notice.php:330 +#: classes/Notice.php:294 classes/Notice.php:319 msgid "Problem saving notice." msgstr "Проблема при збереженні допису." -#: classes/Notice.php:1059 +#: classes/Notice.php:790 +#, fuzzy +msgid "Problem saving group inbox." +msgstr "Проблема при збереженні допису." + +#: classes/Notice.php:850 #, php-format msgid "DB error inserting reply: %s" msgstr "Помилка бази даних при додаванні відповіді: %s" -#: classes/Notice.php:1441 +#: classes/Notice.php:1233 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -4431,124 +4491,124 @@ msgstr "%1$s — %2$s" msgid "Untitled page" msgstr "Сторінка без заголовку" -#: lib/action.php:427 +#: lib/action.php:433 msgid "Primary site navigation" msgstr "Відправна навігація по сайту" -#: lib/action.php:433 +#: lib/action.php:439 msgid "Home" msgstr "Дім" -#: lib/action.php:433 +#: lib/action.php:439 msgid "Personal profile and friends timeline" msgstr "Персональний профіль і стрічка друзів" -#: lib/action.php:435 +#: lib/action.php:441 msgid "Change your email, avatar, password, profile" msgstr "Змінити електронну адресу, аватару, пароль, профіль" -#: lib/action.php:438 +#: lib/action.php:444 msgid "Connect" msgstr "З’єднання" -#: lib/action.php:438 +#: lib/action.php:444 msgid "Connect to services" msgstr "З’єднання з сервісами" -#: lib/action.php:442 +#: lib/action.php:448 msgid "Change site configuration" msgstr "Змінити конфігурацію сайту" -#: lib/action.php:446 lib/subgroupnav.php:105 +#: lib/action.php:452 lib/subgroupnav.php:105 msgid "Invite" msgstr "Запросити" -#: lib/action.php:447 lib/subgroupnav.php:106 +#: lib/action.php:453 lib/subgroupnav.php:106 #, php-format msgid "Invite friends and colleagues to join you on %s" msgstr "Запросіть друзів та колег приєднатись до Вас на %s" -#: lib/action.php:452 +#: lib/action.php:458 msgid "Logout" msgstr "Вийти" -#: lib/action.php:452 +#: lib/action.php:458 msgid "Logout from the site" msgstr "Вийти з сайту" -#: lib/action.php:457 +#: lib/action.php:463 msgid "Create an account" msgstr "Створити новий акаунт" -#: lib/action.php:460 +#: lib/action.php:466 msgid "Login to the site" msgstr "Увійти на сайт" -#: lib/action.php:463 lib/action.php:726 +#: lib/action.php:469 lib/action.php:732 msgid "Help" msgstr "Допомога" -#: lib/action.php:463 +#: lib/action.php:469 msgid "Help me!" msgstr "Допоможіть!" -#: lib/action.php:466 lib/searchaction.php:127 +#: lib/action.php:472 lib/searchaction.php:127 msgid "Search" msgstr "Пошук" -#: lib/action.php:466 +#: lib/action.php:472 msgid "Search for people or text" msgstr "Пошук людей або текстів" -#: lib/action.php:487 +#: lib/action.php:493 msgid "Site notice" msgstr "Зауваження сайту" -#: lib/action.php:553 +#: lib/action.php:559 msgid "Local views" msgstr "Огляд" -#: lib/action.php:619 +#: lib/action.php:625 msgid "Page notice" msgstr "Зауваження сторінки" -#: lib/action.php:721 +#: lib/action.php:727 msgid "Secondary site navigation" msgstr "Другорядна навігація по сайту" -#: lib/action.php:728 +#: lib/action.php:734 msgid "About" msgstr "Про" -#: lib/action.php:730 +#: lib/action.php:736 msgid "FAQ" msgstr "ЧаПи" -#: lib/action.php:734 +#: lib/action.php:740 msgid "TOS" msgstr "Умови" -#: lib/action.php:737 +#: lib/action.php:743 msgid "Privacy" msgstr "Конфіденційність" -#: lib/action.php:739 +#: lib/action.php:745 msgid "Source" msgstr "Джерело" -#: lib/action.php:743 +#: lib/action.php:749 msgid "Contact" msgstr "Контакт" -#: lib/action.php:745 +#: lib/action.php:751 msgid "Badge" msgstr "Бедж" -#: lib/action.php:773 +#: lib/action.php:779 msgid "StatusNet software license" msgstr "Ліцензія програмного забезпечення StatusNet" -#: lib/action.php:776 +#: lib/action.php:782 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -4557,12 +4617,12 @@ msgstr "" "**%%site.name%%** — це сервіс мікроблоґів наданий вам [%%site.broughtby%%](%%" "site.broughtbyurl%%). " -#: lib/action.php:778 +#: lib/action.php:784 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "**%%site.name%%** — це сервіс мікроблоґів. " -#: lib/action.php:780 +#: lib/action.php:786 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4573,41 +4633,42 @@ msgstr "" "для мікроблоґів, версія %s, доступному під [GNU Affero General Public " "License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)." -#: lib/action.php:795 +#: lib/action.php:801 msgid "Site content license" msgstr "Ліцензія змісту сайту" -#: lib/action.php:800 +#: lib/action.php:806 #, php-format msgid "Content and data of %1$s are private and confidential." -msgstr "" +msgstr "Зміст і дані %1$s є приватними і конфіденційними." -#: lib/action.php:805 +#: lib/action.php:811 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." -msgstr "" +msgstr "Авторські права на зміст і дані належать %1$s. Всі права захищено." -#: lib/action.php:808 +#: lib/action.php:814 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" +"Авторські права на зміст і дані належать розробникам. Всі права захищено." -#: lib/action.php:820 +#: lib/action.php:826 msgid "All " msgstr "Всі " -#: lib/action.php:825 +#: lib/action.php:831 msgid "license." msgstr "ліцензія." -#: lib/action.php:1124 +#: lib/action.php:1130 msgid "Pagination" msgstr "Нумерація сторінок" -#: lib/action.php:1133 +#: lib/action.php:1139 msgid "After" msgstr "Вперед" -#: lib/action.php:1141 +#: lib/action.php:1147 msgid "Before" msgstr "Назад" @@ -4639,10 +4700,24 @@ msgstr "Основна конфігурація сайту" msgid "Design configuration" msgstr "Конфігурація дизайну" -#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327 +#: lib/adminpanelaction.php:322 +#, fuzzy +msgid "User configuration" +msgstr "Конфігурація шляху" + +#: lib/adminpanelaction.php:327 +#, fuzzy +msgid "Access configuration" +msgstr "Конфігурація дизайну" + +#: lib/adminpanelaction.php:332 msgid "Paths configuration" msgstr "Конфігурація шляху" +#: lib/applicationeditform.php:136 +msgid "Edit application" +msgstr "Керувати додатками" + #: lib/applicationeditform.php:186 msgid "Icon for this application" msgstr "Іконка для цього додатку" @@ -5254,12 +5329,12 @@ msgstr "Мб" msgid "kB" msgstr "кб" -#: lib/jabber.php:202 +#: lib/jabber.php:220 #, php-format msgid "[%s]" msgstr "[%s]" -#: lib/jabber.php:385 +#: lib/jabber.php:400 #, php-format msgid "Unknown inbox source %d." msgstr "Невідоме джерело вхідного повідомлення %d." @@ -5758,19 +5833,19 @@ msgstr "Відповіді" msgid "Favorites" msgstr "Обрані" -#: lib/personalgroupnav.php:124 +#: lib/personalgroupnav.php:125 msgid "Inbox" msgstr "Вхідні" -#: lib/personalgroupnav.php:125 +#: lib/personalgroupnav.php:126 msgid "Your incoming messages" msgstr "Ваші вхідні повідомлення" -#: lib/personalgroupnav.php:129 +#: lib/personalgroupnav.php:130 msgid "Outbox" msgstr "Вихідні" -#: lib/personalgroupnav.php:130 +#: lib/personalgroupnav.php:131 msgid "Your sent messages" msgstr "Надіслані вами повідомлення" @@ -6012,47 +6087,47 @@ msgstr "Повідомлення" msgid "Moderate" msgstr "Модерувати" -#: lib/util.php:875 +#: lib/util.php:868 msgid "a few seconds ago" msgstr "мить тому" -#: lib/util.php:877 +#: lib/util.php:870 msgid "about a minute ago" msgstr "хвилину тому" -#: lib/util.php:879 +#: lib/util.php:872 #, php-format msgid "about %d minutes ago" msgstr "близько %d хвилин тому" -#: lib/util.php:881 +#: lib/util.php:874 msgid "about an hour ago" msgstr "годину тому" -#: lib/util.php:883 +#: lib/util.php:876 #, php-format msgid "about %d hours ago" msgstr "близько %d годин тому" -#: lib/util.php:885 +#: lib/util.php:878 msgid "about a day ago" msgstr "день тому" -#: lib/util.php:887 +#: lib/util.php:880 #, php-format msgid "about %d days ago" msgstr "близько %d днів тому" -#: lib/util.php:889 +#: lib/util.php:882 msgid "about a month ago" msgstr "місяць тому" -#: lib/util.php:891 +#: lib/util.php:884 #, php-format msgid "about %d months ago" msgstr "близько %d місяців тому" -#: lib/util.php:893 +#: lib/util.php:886 msgid "about a year ago" msgstr "рік тому" @@ -6066,7 +6141,7 @@ msgstr "%s є неприпустимим кольором!" msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "%s неприпустимий колір! Використайте 3 або 6 знаків (HEX-формат)" -#: scripts/xmppdaemon.php:301 +#: lib/xmppmanager.php:402 #, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" diff --git a/locale/vi/LC_MESSAGES/statusnet.po b/locale/vi/LC_MESSAGES/statusnet.po index 4b977cee41..741589cffa 100644 --- a/locale/vi/LC_MESSAGES/statusnet.po +++ b/locale/vi/LC_MESSAGES/statusnet.po @@ -7,17 +7,75 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-21 22:36+0000\n" -"PO-Revision-Date: 2010-01-21 22:38:43+0000\n" +"POT-Creation-Date: 2010-01-27 23:58+0000\n" +"PO-Revision-Date: 2010-01-27 23:59:59+0000\n" "Language-Team: Vietnamese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r61339); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61595); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: vi\n" "X-Message-Group: out-statusnet\n" "Plural-Forms: nplurals=1; plural=0;\n" +#: actions/accessadminpanel.php:54 lib/adminpanelaction.php:326 +#, fuzzy +msgid "Access" +msgstr "Chấp nhận" + +#: actions/accessadminpanel.php:65 +#, fuzzy +msgid "Site access settings" +msgstr "Thay đổi hình đại diện" + +#: actions/accessadminpanel.php:158 +#, fuzzy +msgid "Registration" +msgstr "Đăng ký" + +#: actions/accessadminpanel.php:161 +#, fuzzy +msgid "Private" +msgstr "Riêng tư" + +#: actions/accessadminpanel.php:163 +msgid "Prohibit anonymous users (not logged in) from viewing site?" +msgstr "" + +#: actions/accessadminpanel.php:167 +#, fuzzy +msgid "Invite only" +msgstr "Thư mời" + +#: actions/accessadminpanel.php:169 +msgid "Make registration invitation only." +msgstr "" + +#: actions/accessadminpanel.php:173 +#, fuzzy +msgid "Closed" +msgstr "Ban user" + +#: actions/accessadminpanel.php:175 +msgid "Disable new registrations." +msgstr "" + +#: actions/accessadminpanel.php:189 actions/designadminpanel.php:586 +#: actions/emailsettings.php:195 actions/imsettings.php:163 +#: actions/othersettings.php:126 actions/pathsadminpanel.php:351 +#: actions/profilesettings.php:174 actions/siteadminpanel.php:336 +#: actions/smssettings.php:181 actions/subscriptions.php:203 +#: actions/tagother.php:154 actions/useradminpanel.php:313 +#: lib/applicationeditform.php:335 lib/applicationeditform.php:336 +#: lib/designsettings.php:256 lib/groupeditform.php:202 +msgid "Save" +msgstr "Lưu" + +#: actions/accessadminpanel.php:189 +#, fuzzy +msgid "Save access settings" +msgstr "Thay đổi hình đại diện" + #: actions/all.php:63 actions/public.php:97 actions/replies.php:92 #: actions/showfavorites.php:137 actions/tag.php:51 #, fuzzy @@ -33,7 +91,7 @@ msgstr "Không có tin nhắn nào." #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:149 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 @@ -133,8 +191,7 @@ msgstr "" #: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 #: actions/apitimelinefriends.php:155 actions/apitimelinegroup.php:150 #: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 -#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 #, fuzzy @@ -151,7 +208,7 @@ msgstr "Phương thức API không tìm thấy!" #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:119 +#: actions/apistatusesupdate.php:118 msgid "This method requires a POST." msgstr "Phương thức này yêu cầu là POST." @@ -182,7 +239,7 @@ msgstr "Không thể lưu hồ sơ cá nhân." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:132 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 #: actions/designadminpanel.php:122 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -497,7 +554,14 @@ msgstr "" msgid "Allow or deny access" msgstr "" -#: actions/apioauthauthorize.php:320 lib/action.php:435 +#: actions/apioauthauthorize.php:306 +#, php-format +msgid "" +"The application %s by %s would like the " +"ability to %s your account data." +msgstr "" + +#: actions/apioauthauthorize.php:320 lib/action.php:441 #, fuzzy msgid "Account" msgstr "Giới thiệu" @@ -558,17 +622,17 @@ msgstr "Hình đại diện đã được cập nhật." msgid "No status with that ID found." msgstr "Không tìm thấy trạng thái nào tương ứng với ID đó." -#: actions/apistatusesupdate.php:162 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Quá dài. Tối đa là 140 ký tự." -#: actions/apistatusesupdate.php:203 +#: actions/apistatusesupdate.php:202 msgid "Not found" msgstr "Không tìm thấy" -#: actions/apistatusesupdate.php:226 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -620,11 +684,6 @@ msgstr "Dòng tin công cộng" msgid "%s updates from everyone!" msgstr "%s cập nhật từ tất cả mọi người!" -#: actions/apitimelineretweetedbyme.php:112 -#, php-format -msgid "Repeated by %s" -msgstr "" - #: actions/apitimelineretweetedtome.php:111 #, fuzzy, php-format msgid "Repeated to %s" @@ -1060,17 +1119,6 @@ msgstr "" msgid "Reset back to default" msgstr "" -#: actions/designadminpanel.php:586 actions/emailsettings.php:195 -#: actions/imsettings.php:163 actions/othersettings.php:126 -#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174 -#: actions/siteadminpanel.php:388 actions/smssettings.php:181 -#: actions/subscriptions.php:203 actions/tagother.php:154 -#: actions/useradminpanel.php:313 lib/applicationeditform.php:335 -#: lib/applicationeditform.php:336 lib/designsettings.php:256 -#: lib/groupeditform.php:202 -msgid "Save" -msgstr "Lưu" - #: actions/designadminpanel.php:587 lib/designsettings.php:257 #, fuzzy msgid "Save design" @@ -1086,13 +1134,15 @@ msgstr "Tin nhắn này đã có trong danh sách tin nhắn ưa thích của b msgid "Add to favorites" msgstr "Tìm kiếm các tin nhắn ưa thích của %s" -#: actions/doc.php:69 -msgid "No such document." +#: actions/doc.php:155 +#, fuzzy, php-format +msgid "No such document \"%s\"" msgstr "Không có tài liệu nào." -#: actions/editapplication.php:54 lib/applicationeditform.php:136 -msgid "Edit application" -msgstr "" +#: actions/editapplication.php:54 +#, fuzzy +msgid "Edit Application" +msgstr "Tin nhắn không có hồ sơ cá nhân" #: actions/editapplication.php:66 #, fuzzy @@ -1111,7 +1161,7 @@ msgid "No such application." msgstr "Không có tin nhắn nào." #: actions/editapplication.php:127 actions/newapplication.php:110 -#: actions/showapplication.php:118 lib/action.php:1189 +#: actions/showapplication.php:118 lib/action.php:1195 #, fuzzy msgid "There was a problem with your session token." msgstr "Có lỗi xảy ra khi thao tác. Hãy thử lại lần nữa." @@ -1331,7 +1381,7 @@ msgid "Cannot normalize that email address" msgstr "Không thể bình thường hóa địa chỉ GTalk này" #: actions/emailsettings.php:331 actions/register.php:201 -#: actions/siteadminpanel.php:157 +#: actions/siteadminpanel.php:143 msgid "Not a valid email address." msgstr "Địa chỉ email không hợp lệ." @@ -1345,7 +1395,7 @@ msgstr "Bạn đã dùng địa chỉ email này rồi" msgid "That email address already belongs to another user." msgstr "Địa chỉ email GTalk này đã có người khác sử dụng rồi." -#: actions/emailsettings.php:353 actions/imsettings.php:317 +#: actions/emailsettings.php:353 actions/imsettings.php:319 #: actions/smssettings.php:337 msgid "Couldn't insert confirmation code." msgstr "Không thể chèn mã xác nhận." @@ -1672,7 +1722,7 @@ msgstr "Thành viên" msgid "A list of the users in this group." msgstr "" -#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107 +#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107 msgid "Admin" msgstr "" @@ -1870,6 +1920,11 @@ msgstr "" msgid "That is not your Jabber ID." msgstr "Đây không phải Jabber ID của bạn." +#: actions/inbox.php:59 +#, fuzzy, php-format +msgid "Inbox for %1$s - page %2$d" +msgstr "Hộp thư đến của %s" + #: actions/inbox.php:62 #, php-format msgid "Inbox for %s" @@ -2057,7 +2112,7 @@ msgstr "Sai tên đăng nhập hoặc mật khẩu." msgid "Error setting user. You are probably not authorized." msgstr "Chưa được phép." -#: actions/login.php:188 actions/login.php:241 lib/action.php:460 +#: actions/login.php:188 actions/login.php:241 lib/action.php:466 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Đăng nhập" @@ -2120,8 +2175,9 @@ msgid "No current status" msgstr "" #: actions/newapplication.php:52 -msgid "New application" -msgstr "" +#, fuzzy +msgid "New Application" +msgstr "Không có tin nhắn nào." #: actions/newapplication.php:64 #, fuzzy @@ -2317,8 +2373,8 @@ msgstr "Kết nối" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1038 -#: lib/api.php:1066 lib/api.php:1176 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1039 +#: lib/api.php:1067 lib/api.php:1177 msgid "Not a supported data format." msgstr "Không hỗ trợ định dạng dữ liệu này." @@ -2390,6 +2446,11 @@ msgstr "Nội dung tin nhắn không hợp lệ" msgid "Login token expired." msgstr "" +#: actions/outbox.php:58 +#, fuzzy, php-format +msgid "Outbox for %1$s - page %2$d" +msgstr "Hộp thư đi của %s" + #: actions/outbox.php:61 #, php-format msgid "Outbox for %s" @@ -2465,7 +2526,7 @@ msgstr "Không thể lưu mật khẩu mới" msgid "Password saved." msgstr "Đã lưu mật khẩu." -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:331 msgid "Paths" msgstr "" @@ -2473,146 +2534,163 @@ msgstr "" msgid "Path and server settings for this StatusNet site." msgstr "" -#: actions/pathsadminpanel.php:140 +#: actions/pathsadminpanel.php:157 #, 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/pathsadminpanel.php:146 +#: actions/pathsadminpanel.php:163 #, php-format msgid "Avatar directory not writable: %s" msgstr "" -#: actions/pathsadminpanel.php:152 +#: actions/pathsadminpanel.php:169 #, php-format msgid "Background directory not writable: %s" msgstr "" -#: actions/pathsadminpanel.php:160 +#: actions/pathsadminpanel.php:177 #, php-format msgid "Locales directory not readable: %s" msgstr "" -#: actions/pathsadminpanel.php:166 +#: actions/pathsadminpanel.php:183 msgid "Invalid SSL server. The maximum length is 255 characters." msgstr "" -#: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58 +#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58 #: lib/adminpanelaction.php:311 #, fuzzy msgid "Site" msgstr "Thư mời" -#: actions/pathsadminpanel.php:221 +#: actions/pathsadminpanel.php:238 +#, fuzzy +msgid "Server" +msgstr "Khôi phục" + +#: actions/pathsadminpanel.php:238 +msgid "Site's server hostname." +msgstr "" + +#: actions/pathsadminpanel.php:242 msgid "Path" msgstr "" -#: actions/pathsadminpanel.php:221 +#: actions/pathsadminpanel.php:242 #, fuzzy msgid "Site path" msgstr "Thông báo mới" -#: actions/pathsadminpanel.php:225 +#: actions/pathsadminpanel.php:246 msgid "Path to locales" msgstr "" -#: actions/pathsadminpanel.php:225 +#: actions/pathsadminpanel.php:246 msgid "Directory path to locales" msgstr "" -#: actions/pathsadminpanel.php:232 -msgid "Theme" -msgstr "" - -#: actions/pathsadminpanel.php:237 -msgid "Theme server" -msgstr "" - -#: actions/pathsadminpanel.php:241 -msgid "Theme path" -msgstr "" - -#: actions/pathsadminpanel.php:245 -msgid "Theme directory" +#: actions/pathsadminpanel.php:250 +msgid "Fancy URLs" msgstr "" #: actions/pathsadminpanel.php:252 +msgid "Use fancy (more readable and memorable) URLs?" +msgstr "" + +#: actions/pathsadminpanel.php:259 +msgid "Theme" +msgstr "" + +#: actions/pathsadminpanel.php:264 +msgid "Theme server" +msgstr "" + +#: actions/pathsadminpanel.php:268 +msgid "Theme path" +msgstr "" + +#: actions/pathsadminpanel.php:272 +msgid "Theme directory" +msgstr "" + +#: actions/pathsadminpanel.php:279 #, fuzzy msgid "Avatars" msgstr "Hình đại diện" -#: actions/pathsadminpanel.php:257 +#: actions/pathsadminpanel.php:284 #, fuzzy msgid "Avatar server" msgstr "Thay đổi hình đại diện" -#: actions/pathsadminpanel.php:261 +#: actions/pathsadminpanel.php:288 #, fuzzy msgid "Avatar path" msgstr "Hình đại diện đã được cập nhật." -#: actions/pathsadminpanel.php:265 +#: actions/pathsadminpanel.php:292 #, fuzzy msgid "Avatar directory" msgstr "Hình đại diện đã được cập nhật." -#: actions/pathsadminpanel.php:274 +#: actions/pathsadminpanel.php:301 #, fuzzy msgid "Backgrounds" msgstr "Background Theme:" -#: actions/pathsadminpanel.php:278 +#: actions/pathsadminpanel.php:305 #, fuzzy msgid "Background server" msgstr "Background Theme:" -#: actions/pathsadminpanel.php:282 +#: actions/pathsadminpanel.php:309 #, fuzzy msgid "Background path" msgstr "Background Theme:" -#: actions/pathsadminpanel.php:286 +#: actions/pathsadminpanel.php:313 #, fuzzy msgid "Background directory" msgstr "Background Theme:" -#: actions/pathsadminpanel.php:293 +#: actions/pathsadminpanel.php:320 #, fuzzy msgid "SSL" msgstr "SMS" -#: actions/pathsadminpanel.php:296 actions/siteadminpanel.php:346 +#: actions/pathsadminpanel.php:323 actions/siteadminpanel.php:294 #, fuzzy msgid "Never" msgstr "Khôi phục" -#: actions/pathsadminpanel.php:297 +#: actions/pathsadminpanel.php:324 #, fuzzy msgid "Sometimes" msgstr "Tin nhắn" -#: actions/pathsadminpanel.php:298 +#: actions/pathsadminpanel.php:325 msgid "Always" msgstr "" -#: actions/pathsadminpanel.php:302 +#: actions/pathsadminpanel.php:329 msgid "Use SSL" msgstr "" -#: actions/pathsadminpanel.php:303 +#: actions/pathsadminpanel.php:330 msgid "When to use SSL" msgstr "" -#: actions/pathsadminpanel.php:308 +#: actions/pathsadminpanel.php:335 #, fuzzy msgid "SSL server" msgstr "Khôi phục" -#: actions/pathsadminpanel.php:309 +#: actions/pathsadminpanel.php:336 msgid "Server to direct SSL requests to" msgstr "" -#: actions/pathsadminpanel.php:325 +#: actions/pathsadminpanel.php:352 #, fuzzy msgid "Save paths" msgstr "Thông báo mới" @@ -2724,7 +2802,7 @@ msgid "" "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated" msgstr "" -#: actions/profilesettings.php:151 actions/siteadminpanel.php:294 +#: actions/profilesettings.php:151 actions/siteadminpanel.php:280 msgid "Language" msgstr "Ngôn ngữ" @@ -2750,7 +2828,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:235 actions/siteadminpanel.php:164 +#: actions/profilesettings.php:235 actions/siteadminpanel.php:150 msgid "Timezone not selected." msgstr "" @@ -3021,7 +3099,7 @@ msgstr "Lỗi xảy ra với mã xác nhận." msgid "Registration successful" msgstr "Đăng ký thành công" -#: actions/register.php:114 actions/register.php:503 lib/action.php:457 +#: actions/register.php:114 actions/register.php:503 lib/action.php:463 #: lib/logingroupnav.php:85 msgid "Register" msgstr "Đăng ký" @@ -3064,7 +3142,7 @@ msgid "Same as password above. Required." msgstr "Cùng mật khẩu ở trên. Bắt buộc." #: actions/register.php:438 actions/register.php:442 -#: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120 +#: actions/siteadminpanel.php:256 lib/accountsettingsaction.php:120 msgid "Email" msgstr "Email" @@ -3225,6 +3303,11 @@ msgstr "Tạo" msgid "Replies to %s" msgstr "Trả lời cho %s" +#: actions/replies.php:127 +#, fuzzy, php-format +msgid "Replies to %1$s, page %2$d" +msgstr "%s chào mừng bạn " + #: actions/replies.php:144 #, fuzzy, php-format msgid "Replies feed for %s (RSS 1.0)" @@ -3354,6 +3437,11 @@ msgid "" "signature method." msgstr "" +#: actions/showfavorites.php:79 +#, fuzzy, php-format +msgid "%1$s's favorite notices, page %2$d" +msgstr "Những tin nhắn ưa thích của %s" + #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "Không thể lấy lại các tin nhắn ưa thích" @@ -3403,6 +3491,11 @@ msgstr "" msgid "%s group" msgstr "%s và nhóm" +#: actions/showgroup.php:84 +#, fuzzy, php-format +msgid "%1$s group, page %2$d" +msgstr "Thành viên" + #: actions/showgroup.php:218 #, fuzzy msgid "Group profile" @@ -3520,6 +3613,11 @@ msgstr "Tin đã gửi" msgid " tagged %s" msgstr "Thông báo được gắn thẻ %s" +#: actions/showstream.php:79 +#, fuzzy, php-format +msgid "%1$s, page %2$d" +msgstr "%s và bạn bè" + #: actions/showstream.php:122 #, fuzzy, php-format msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" @@ -3599,202 +3697,149 @@ msgstr "Người dùng không có thông tin." msgid "Basic settings for this StatusNet site." msgstr "" -#: actions/siteadminpanel.php:146 +#: actions/siteadminpanel.php:132 msgid "Site name must have non-zero length." msgstr "" -#: actions/siteadminpanel.php:154 +#: actions/siteadminpanel.php:140 #, fuzzy msgid "You must have a valid contact email address." msgstr "Địa chỉ email không hợp lệ." -#: actions/siteadminpanel.php:172 +#: actions/siteadminpanel.php:158 #, php-format msgid "Unknown language \"%s\"." msgstr "" -#: actions/siteadminpanel.php:179 +#: actions/siteadminpanel.php:165 msgid "Invalid snapshot report URL." msgstr "" -#: actions/siteadminpanel.php:185 +#: actions/siteadminpanel.php:171 msgid "Invalid snapshot run value." msgstr "" -#: actions/siteadminpanel.php:191 +#: actions/siteadminpanel.php:177 msgid "Snapshot frequency must be a number." msgstr "" -#: actions/siteadminpanel.php:197 +#: actions/siteadminpanel.php:183 msgid "Minimum text limit is 140 characters." msgstr "" -#: actions/siteadminpanel.php:203 +#: actions/siteadminpanel.php:189 msgid "Dupe limit must 1 or more seconds." msgstr "" -#: actions/siteadminpanel.php:253 +#: actions/siteadminpanel.php:239 msgid "General" msgstr "" -#: actions/siteadminpanel.php:256 +#: actions/siteadminpanel.php:242 #, fuzzy msgid "Site name" msgstr "Thông báo mới" -#: actions/siteadminpanel.php:257 +#: actions/siteadminpanel.php:243 msgid "The name of your site, like \"Yourcompany Microblog\"" msgstr "" -#: actions/siteadminpanel.php:261 +#: actions/siteadminpanel.php:247 msgid "Brought by" msgstr "" -#: actions/siteadminpanel.php:262 +#: actions/siteadminpanel.php:248 msgid "Text used for credits link in footer of each page" msgstr "" -#: actions/siteadminpanel.php:266 +#: actions/siteadminpanel.php:252 msgid "Brought by URL" msgstr "" -#: actions/siteadminpanel.php:267 +#: actions/siteadminpanel.php:253 msgid "URL used for credits link in footer of each page" msgstr "" -#: actions/siteadminpanel.php:271 +#: actions/siteadminpanel.php:257 #, fuzzy msgid "Contact email address for your site" msgstr "Dia chi email moi de gui tin nhan den %s" -#: actions/siteadminpanel.php:277 +#: actions/siteadminpanel.php:263 #, fuzzy msgid "Local" msgstr "Thành phố" -#: actions/siteadminpanel.php:288 +#: actions/siteadminpanel.php:274 msgid "Default timezone" msgstr "" -#: actions/siteadminpanel.php:289 +#: actions/siteadminpanel.php:275 msgid "Default timezone for the site; usually UTC." msgstr "" -#: actions/siteadminpanel.php:295 +#: actions/siteadminpanel.php:281 #, fuzzy msgid "Default site language" msgstr "Ngôn ngữ bạn thích" -#: actions/siteadminpanel.php:303 -msgid "URLs" -msgstr "" - -#: actions/siteadminpanel.php:306 -#, fuzzy -msgid "Server" -msgstr "Khôi phục" - -#: actions/siteadminpanel.php:306 -msgid "Site's server hostname." -msgstr "" - -#: actions/siteadminpanel.php:310 -msgid "Fancy URLs" -msgstr "" - -#: actions/siteadminpanel.php:312 -msgid "Use fancy (more readable and memorable) URLs?" -msgstr "" - -#: actions/siteadminpanel.php:318 -#, fuzzy -msgid "Access" -msgstr "Chấp nhận" - -#: actions/siteadminpanel.php:321 -#, fuzzy -msgid "Private" -msgstr "Riêng tư" - -#: actions/siteadminpanel.php:323 -msgid "Prohibit anonymous users (not logged in) from viewing site?" -msgstr "" - -#: actions/siteadminpanel.php:327 -#, fuzzy -msgid "Invite only" -msgstr "Thư mời" - -#: actions/siteadminpanel.php:329 -msgid "Make registration invitation only." -msgstr "" - -#: actions/siteadminpanel.php:333 -#, fuzzy -msgid "Closed" -msgstr "Ban user" - -#: actions/siteadminpanel.php:335 -msgid "Disable new registrations." -msgstr "" - -#: actions/siteadminpanel.php:341 +#: actions/siteadminpanel.php:289 msgid "Snapshots" msgstr "" -#: actions/siteadminpanel.php:344 +#: actions/siteadminpanel.php:292 msgid "Randomly during Web hit" msgstr "" -#: actions/siteadminpanel.php:345 +#: actions/siteadminpanel.php:293 msgid "In a scheduled job" msgstr "" -#: actions/siteadminpanel.php:347 +#: actions/siteadminpanel.php:295 msgid "Data snapshots" msgstr "" -#: actions/siteadminpanel.php:348 +#: actions/siteadminpanel.php:296 msgid "When to send statistical data to status.net servers" msgstr "" -#: actions/siteadminpanel.php:353 +#: actions/siteadminpanel.php:301 msgid "Frequency" msgstr "" -#: actions/siteadminpanel.php:354 +#: actions/siteadminpanel.php:302 msgid "Snapshots will be sent once every N web hits" msgstr "" -#: actions/siteadminpanel.php:359 +#: actions/siteadminpanel.php:307 msgid "Report URL" msgstr "" -#: actions/siteadminpanel.php:360 +#: actions/siteadminpanel.php:308 msgid "Snapshots will be sent to this URL" msgstr "" -#: actions/siteadminpanel.php:367 +#: actions/siteadminpanel.php:315 msgid "Limits" msgstr "" -#: actions/siteadminpanel.php:370 +#: actions/siteadminpanel.php:318 msgid "Text limit" msgstr "" -#: actions/siteadminpanel.php:370 +#: actions/siteadminpanel.php:318 msgid "Maximum number of characters for notices." msgstr "" -#: actions/siteadminpanel.php:374 +#: actions/siteadminpanel.php:322 msgid "Dupe limit" msgstr "" -#: actions/siteadminpanel.php:374 +#: actions/siteadminpanel.php:322 msgid "How long users must wait (in seconds) to post the same thing again." msgstr "" -#: actions/siteadminpanel.php:388 actions/useradminpanel.php:313 +#: actions/siteadminpanel.php:336 actions/useradminpanel.php:313 #, fuzzy msgid "Save site settings" msgstr "Thay đổi hình đại diện" @@ -4009,6 +4054,11 @@ msgstr "Không có Jabber ID." msgid "SMS" msgstr "SMS" +#: actions/tag.php:68 +#, fuzzy, php-format +msgid "Notices tagged with %1$s, page %2$d" +msgstr "Dòng tin nhắn cho %s" + #: actions/tag.php:86 #, fuzzy, php-format msgid "Notice feed for tag %s (RSS 1.0)" @@ -4321,6 +4371,11 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "" +#: actions/usergroups.php:64 +#, fuzzy, php-format +msgid "%1$s groups, page %2$d" +msgstr "Thành viên" + #: actions/usergroups.php:130 msgid "Search for more groups" msgstr "" @@ -4383,7 +4438,7 @@ msgstr "" msgid "Plugins" msgstr "" -#: actions/version.php:196 lib/action.php:741 +#: actions/version.php:196 lib/action.php:747 #, fuzzy msgid "Version" msgstr "Cá nhân" @@ -4444,46 +4499,51 @@ msgstr "Không thể chèn thêm vào đăng nhận." msgid "Could not update message with new URI." msgstr "Không thể cập nhật thông tin user với địa chỉ email đã được xác nhận." -#: classes/Notice.php:171 +#: classes/Notice.php:157 #, fuzzy, php-format msgid "DB error inserting hashtag: %s" msgstr "Lỗi cơ sở dữ liệu khi chèn trả lời: %s" -#: classes/Notice.php:225 +#: classes/Notice.php:214 #, fuzzy msgid "Problem saving notice. Too long." msgstr "Có lỗi xảy ra khi lưu tin nhắn." -#: classes/Notice.php:229 +#: classes/Notice.php:218 #, fuzzy msgid "Problem saving notice. Unknown user." msgstr "Có lỗi xảy ra khi lưu tin nhắn." -#: classes/Notice.php:234 +#: classes/Notice.php:223 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:240 +#: classes/Notice.php:229 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:246 +#: classes/Notice.php:235 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:305 classes/Notice.php:330 +#: classes/Notice.php:294 classes/Notice.php:319 msgid "Problem saving notice." msgstr "Có lỗi xảy ra khi lưu tin nhắn." -#: classes/Notice.php:1059 +#: classes/Notice.php:790 +#, fuzzy +msgid "Problem saving group inbox." +msgstr "Có lỗi xảy ra khi lưu tin nhắn." + +#: classes/Notice.php:850 #, php-format msgid "DB error inserting reply: %s" msgstr "Lỗi cơ sở dữ liệu khi chèn trả lời: %s" -#: classes/Notice.php:1441 +#: classes/Notice.php:1233 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%s (%s)" @@ -4543,135 +4603,135 @@ msgstr "%s (%s)" msgid "Untitled page" msgstr "" -#: lib/action.php:427 +#: lib/action.php:433 msgid "Primary site navigation" msgstr "" -#: lib/action.php:433 +#: lib/action.php:439 msgid "Home" msgstr "Trang chủ" -#: lib/action.php:433 +#: lib/action.php:439 msgid "Personal profile and friends timeline" msgstr "" -#: lib/action.php:435 +#: lib/action.php:441 #, fuzzy msgid "Change your email, avatar, password, profile" msgstr "Thay đổi mật khẩu của bạn" -#: lib/action.php:438 +#: lib/action.php:444 msgid "Connect" msgstr "Kết nối" -#: lib/action.php:438 +#: lib/action.php:444 #, fuzzy msgid "Connect to services" msgstr "Không thể chuyển đến máy chủ: %s" -#: lib/action.php:442 +#: lib/action.php:448 #, fuzzy msgid "Change site configuration" msgstr "Tôi theo" -#: lib/action.php:446 lib/subgroupnav.php:105 +#: lib/action.php:452 lib/subgroupnav.php:105 msgid "Invite" msgstr "Thư mời" -#: lib/action.php:447 lib/subgroupnav.php:106 +#: lib/action.php:453 lib/subgroupnav.php:106 #, fuzzy, php-format msgid "Invite friends and colleagues to join you on %s" msgstr "" "Điền địa chỉ email và nội dung tin nhắn để gửi thư mời bạn bè và đồng nghiệp " "của bạn tham gia vào dịch vụ này." -#: lib/action.php:452 +#: lib/action.php:458 msgid "Logout" msgstr "Thoát" -#: lib/action.php:452 +#: lib/action.php:458 msgid "Logout from the site" msgstr "" -#: lib/action.php:457 +#: lib/action.php:463 #, fuzzy msgid "Create an account" msgstr "Tạo tài khoản mới" -#: lib/action.php:460 +#: lib/action.php:466 msgid "Login to the site" msgstr "" -#: lib/action.php:463 lib/action.php:726 +#: lib/action.php:469 lib/action.php:732 msgid "Help" msgstr "Hướng dẫn" -#: lib/action.php:463 +#: lib/action.php:469 #, fuzzy msgid "Help me!" msgstr "Hướng dẫn" -#: lib/action.php:466 lib/searchaction.php:127 +#: lib/action.php:472 lib/searchaction.php:127 msgid "Search" msgstr "Tìm kiếm" -#: lib/action.php:466 +#: lib/action.php:472 msgid "Search for people or text" msgstr "" -#: lib/action.php:487 +#: lib/action.php:493 #, fuzzy msgid "Site notice" msgstr "Thông báo mới" -#: lib/action.php:553 +#: lib/action.php:559 msgid "Local views" msgstr "" -#: lib/action.php:619 +#: lib/action.php:625 #, fuzzy msgid "Page notice" msgstr "Thông báo mới" -#: lib/action.php:721 +#: lib/action.php:727 #, fuzzy msgid "Secondary site navigation" msgstr "Tôi theo" -#: lib/action.php:728 +#: lib/action.php:734 msgid "About" msgstr "Giới thiệu" -#: lib/action.php:730 +#: lib/action.php:736 msgid "FAQ" msgstr "FAQ" -#: lib/action.php:734 +#: lib/action.php:740 msgid "TOS" msgstr "" -#: lib/action.php:737 +#: lib/action.php:743 msgid "Privacy" msgstr "Riêng tư" -#: lib/action.php:739 +#: lib/action.php:745 msgid "Source" msgstr "Nguồn" -#: lib/action.php:743 +#: lib/action.php:749 msgid "Contact" msgstr "Liên hệ" -#: lib/action.php:745 +#: lib/action.php:751 #, fuzzy msgid "Badge" msgstr "Tin đã gửi" -#: lib/action.php:773 +#: lib/action.php:779 msgid "StatusNet software license" msgstr "" -#: lib/action.php:776 +#: lib/action.php:782 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -4680,12 +4740,12 @@ msgstr "" "**%%site.name%%** là dịch vụ gửi tin nhắn được cung cấp từ [%%site.broughtby%" "%](%%site.broughtbyurl%%). " -#: lib/action.php:778 +#: lib/action.php:784 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "**%%site.name%%** là dịch vụ gửi tin nhắn. " -#: lib/action.php:780 +#: lib/action.php:786 #, fuzzy, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4696,43 +4756,43 @@ msgstr "" "quyền [GNU Affero General Public License](http://www.fsf.org/licensing/" "licenses/agpl-3.0.html)." -#: lib/action.php:795 +#: lib/action.php:801 #, fuzzy msgid "Site content license" msgstr "Tìm theo nội dung của tin nhắn" -#: lib/action.php:800 +#: lib/action.php:806 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "" -#: lib/action.php:805 +#: lib/action.php:811 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" -#: lib/action.php:808 +#: lib/action.php:814 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" -#: lib/action.php:820 +#: lib/action.php:826 msgid "All " msgstr "" -#: lib/action.php:825 +#: lib/action.php:831 msgid "license." msgstr "" -#: lib/action.php:1124 +#: lib/action.php:1130 msgid "Pagination" msgstr "" -#: lib/action.php:1133 +#: lib/action.php:1139 #, fuzzy msgid "After" msgstr "Sau" -#: lib/action.php:1141 +#: lib/action.php:1147 #, fuzzy msgid "Before" msgstr "Trước" @@ -4770,11 +4830,25 @@ msgstr "Xac nhan dia chi email" msgid "Design configuration" msgstr "Xác nhận SMS" -#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327 +#: lib/adminpanelaction.php:322 +#, fuzzy +msgid "User configuration" +msgstr "Xác nhận SMS" + +#: lib/adminpanelaction.php:327 +#, fuzzy +msgid "Access configuration" +msgstr "Xác nhận SMS" + +#: lib/adminpanelaction.php:332 #, fuzzy msgid "Paths configuration" msgstr "Xác nhận SMS" +#: lib/applicationeditform.php:136 +msgid "Edit application" +msgstr "" + #: lib/applicationeditform.php:186 msgid "Icon for this application" msgstr "" @@ -5382,12 +5456,12 @@ msgstr "" msgid "kB" msgstr "" -#: lib/jabber.php:202 +#: lib/jabber.php:220 #, php-format msgid "[%s]" msgstr "" -#: lib/jabber.php:385 +#: lib/jabber.php:400 #, php-format msgid "Unknown inbox source %d." msgstr "" @@ -5872,19 +5946,19 @@ msgstr "Trả lời" msgid "Favorites" msgstr "Ưa thích" -#: lib/personalgroupnav.php:124 +#: lib/personalgroupnav.php:125 msgid "Inbox" msgstr "Hộp thư đến" -#: lib/personalgroupnav.php:125 +#: lib/personalgroupnav.php:126 msgid "Your incoming messages" msgstr "Thư đến của bạn" -#: lib/personalgroupnav.php:129 +#: lib/personalgroupnav.php:130 msgid "Outbox" msgstr "Hộp thư đi" -#: lib/personalgroupnav.php:130 +#: lib/personalgroupnav.php:131 msgid "Your sent messages" msgstr "Thư bạn đã gửi" @@ -6156,47 +6230,47 @@ msgstr "Tin mới nhất" msgid "Moderate" msgstr "" -#: lib/util.php:875 +#: lib/util.php:868 msgid "a few seconds ago" msgstr "vài giây trước" -#: lib/util.php:877 +#: lib/util.php:870 msgid "about a minute ago" msgstr "1 phút trước" -#: lib/util.php:879 +#: lib/util.php:872 #, php-format msgid "about %d minutes ago" msgstr "%d phút trước" -#: lib/util.php:881 +#: lib/util.php:874 msgid "about an hour ago" msgstr "1 giờ trước" -#: lib/util.php:883 +#: lib/util.php:876 #, php-format msgid "about %d hours ago" msgstr "%d giờ trước" -#: lib/util.php:885 +#: lib/util.php:878 msgid "about a day ago" msgstr "1 ngày trước" -#: lib/util.php:887 +#: lib/util.php:880 #, php-format msgid "about %d days ago" msgstr "%d ngày trước" -#: lib/util.php:889 +#: lib/util.php:882 msgid "about a month ago" msgstr "1 tháng trước" -#: lib/util.php:891 +#: lib/util.php:884 #, php-format msgid "about %d months ago" msgstr "%d tháng trước" -#: lib/util.php:893 +#: lib/util.php:886 msgid "about a year ago" msgstr "1 năm trước" @@ -6210,7 +6284,7 @@ msgstr "Trang chủ không phải là URL" msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "" -#: scripts/xmppdaemon.php:301 +#: lib/xmppmanager.php:402 #, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po index aec8ae047a..1cd332a8b8 100644 --- a/locale/zh_CN/LC_MESSAGES/statusnet.po +++ b/locale/zh_CN/LC_MESSAGES/statusnet.po @@ -10,17 +10,75 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-21 22:36+0000\n" -"PO-Revision-Date: 2010-01-21 22:38:46+0000\n" +"POT-Creation-Date: 2010-01-27 23:58+0000\n" +"PO-Revision-Date: 2010-01-28 00:00:04+0000\n" "Language-Team: Simplified Chinese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r61339); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61595); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: zh-hans\n" "X-Message-Group: out-statusnet\n" "Plural-Forms: nplurals=1; plural=0;\n" +#: actions/accessadminpanel.php:54 lib/adminpanelaction.php:326 +#, fuzzy +msgid "Access" +msgstr "接受" + +#: actions/accessadminpanel.php:65 +#, fuzzy +msgid "Site access settings" +msgstr "头像设置" + +#: actions/accessadminpanel.php:158 +#, fuzzy +msgid "Registration" +msgstr "注册" + +#: actions/accessadminpanel.php:161 +#, fuzzy +msgid "Private" +msgstr "隐私" + +#: actions/accessadminpanel.php:163 +msgid "Prohibit anonymous users (not logged in) from viewing site?" +msgstr "" + +#: actions/accessadminpanel.php:167 +#, fuzzy +msgid "Invite only" +msgstr "邀请" + +#: actions/accessadminpanel.php:169 +msgid "Make registration invitation only." +msgstr "" + +#: actions/accessadminpanel.php:173 +#, fuzzy +msgid "Closed" +msgstr "阻止" + +#: actions/accessadminpanel.php:175 +msgid "Disable new registrations." +msgstr "" + +#: actions/accessadminpanel.php:189 actions/designadminpanel.php:586 +#: actions/emailsettings.php:195 actions/imsettings.php:163 +#: actions/othersettings.php:126 actions/pathsadminpanel.php:351 +#: actions/profilesettings.php:174 actions/siteadminpanel.php:336 +#: actions/smssettings.php:181 actions/subscriptions.php:203 +#: actions/tagother.php:154 actions/useradminpanel.php:313 +#: lib/applicationeditform.php:335 lib/applicationeditform.php:336 +#: lib/designsettings.php:256 lib/groupeditform.php:202 +msgid "Save" +msgstr "保存" + +#: actions/accessadminpanel.php:189 +#, fuzzy +msgid "Save access settings" +msgstr "头像设置" + #: actions/all.php:63 actions/public.php:97 actions/replies.php:92 #: actions/showfavorites.php:137 actions/tag.php:51 msgid "No such page" @@ -35,7 +93,7 @@ msgstr "没有该页面" #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:149 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 @@ -135,8 +193,7 @@ msgstr "来自%2$s 上 %1$s 和好友的更新！" #: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 #: actions/apitimelinefriends.php:155 actions/apitimelinegroup.php:150 #: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 -#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 #, fuzzy @@ -153,7 +210,7 @@ msgstr "API 方法未实现！" #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:119 +#: actions/apistatusesupdate.php:118 msgid "This method requires a POST." msgstr "此方法接受POST请求。" @@ -184,7 +241,7 @@ msgstr "无法保存个人信息。" #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:132 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 #: actions/designadminpanel.php:122 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -495,7 +552,14 @@ msgstr "" msgid "Allow or deny access" msgstr "" -#: actions/apioauthauthorize.php:320 lib/action.php:435 +#: actions/apioauthauthorize.php:306 +#, php-format +msgid "" +"The application %s by %s would like the " +"ability to %s your account data." +msgstr "" + +#: actions/apioauthauthorize.php:320 lib/action.php:441 msgid "Account" msgstr "帐号" @@ -556,17 +620,17 @@ msgstr "头像已更新。" msgid "No status with that ID found." msgstr "没有找到此ID的信息。" -#: actions/apistatusesupdate.php:162 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "超出长度限制。不能超过 140 个字符。" -#: actions/apistatusesupdate.php:203 +#: actions/apistatusesupdate.php:202 msgid "Not found" msgstr "未找到" -#: actions/apistatusesupdate.php:226 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -618,11 +682,6 @@ msgstr "%s 公众时间表" msgid "%s updates from everyone!" msgstr "来自所有人的 %s 消息！" -#: actions/apitimelineretweetedbyme.php:112 -#, php-format -msgid "Repeated by %s" -msgstr "" - #: actions/apitimelineretweetedtome.php:111 #, fuzzy, php-format msgid "Repeated to %s" @@ -1052,17 +1111,6 @@ msgstr "" msgid "Reset back to default" msgstr "" -#: actions/designadminpanel.php:586 actions/emailsettings.php:195 -#: actions/imsettings.php:163 actions/othersettings.php:126 -#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174 -#: actions/siteadminpanel.php:388 actions/smssettings.php:181 -#: actions/subscriptions.php:203 actions/tagother.php:154 -#: actions/useradminpanel.php:313 lib/applicationeditform.php:335 -#: lib/applicationeditform.php:336 lib/designsettings.php:256 -#: lib/groupeditform.php:202 -msgid "Save" -msgstr "保存" - #: actions/designadminpanel.php:587 lib/designsettings.php:257 msgid "Save design" msgstr "" @@ -1075,13 +1123,15 @@ msgstr "此通告未被收藏！" msgid "Add to favorites" msgstr "加入收藏" -#: actions/doc.php:69 -msgid "No such document." +#: actions/doc.php:155 +#, fuzzy, php-format +msgid "No such document \"%s\"" msgstr "没有这份文档。" -#: actions/editapplication.php:54 lib/applicationeditform.php:136 -msgid "Edit application" -msgstr "" +#: actions/editapplication.php:54 +#, fuzzy +msgid "Edit Application" +msgstr "其他选项" #: actions/editapplication.php:66 #, fuzzy @@ -1100,7 +1150,7 @@ msgid "No such application." msgstr "没有这份通告。" #: actions/editapplication.php:127 actions/newapplication.php:110 -#: actions/showapplication.php:118 lib/action.php:1189 +#: actions/showapplication.php:118 lib/action.php:1195 #, fuzzy msgid "There was a problem with your session token." msgstr "会话标识有问题，请重试。" @@ -1314,7 +1364,7 @@ msgid "Cannot normalize that email address" msgstr "无法识别此电子邮件" #: actions/emailsettings.php:331 actions/register.php:201 -#: actions/siteadminpanel.php:157 +#: actions/siteadminpanel.php:143 msgid "Not a valid email address." msgstr "不是有效的电子邮件。" @@ -1326,7 +1376,7 @@ msgstr "您已登记此电子邮件。" msgid "That email address already belongs to another user." msgstr "此电子邮件属于其他用户。" -#: actions/emailsettings.php:353 actions/imsettings.php:317 +#: actions/emailsettings.php:353 actions/imsettings.php:319 #: actions/smssettings.php:337 msgid "Couldn't insert confirmation code." msgstr "无法插入验证码。" @@ -1649,7 +1699,7 @@ msgstr "%s 组成员, 第 %d 页" msgid "A list of the users in this group." msgstr "该组成员列表。" -#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107 +#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107 msgid "Admin" msgstr "admin管理员" @@ -1841,6 +1891,11 @@ msgstr "验证码已被发送到您新增的即时通讯帐号。您必须允许 msgid "That is not your Jabber ID." msgstr "这不是您的Jabber帐号。" +#: actions/inbox.php:59 +#, fuzzy, php-format +msgid "Inbox for %1$s - page %2$d" +msgstr "%s 的收件箱" + #: actions/inbox.php:62 #, php-format msgid "Inbox for %s" @@ -2015,7 +2070,7 @@ msgstr "用户名或密码不正确。" msgid "Error setting user. You are probably not authorized." msgstr "未认证。" -#: actions/login.php:188 actions/login.php:241 lib/action.php:460 +#: actions/login.php:188 actions/login.php:241 lib/action.php:466 #: lib/logingroupnav.php:79 msgid "Login" msgstr "登录" @@ -2075,8 +2130,9 @@ msgid "No current status" msgstr "没有当前状态" #: actions/newapplication.php:52 -msgid "New application" -msgstr "" +#, fuzzy +msgid "New Application" +msgstr "没有这份通告。" #: actions/newapplication.php:64 #, fuzzy @@ -2267,8 +2323,8 @@ msgstr "连接" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1038 -#: lib/api.php:1066 lib/api.php:1176 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1039 +#: lib/api.php:1067 lib/api.php:1177 msgid "Not a supported data format." msgstr "不支持的数据格式。" @@ -2340,6 +2396,11 @@ msgstr "通告内容不正确" msgid "Login token expired." msgstr "登录" +#: actions/outbox.php:58 +#, fuzzy, php-format +msgid "Outbox for %1$s - page %2$d" +msgstr "%s 的发件箱" + #: actions/outbox.php:61 #, php-format msgid "Outbox for %s" @@ -2412,7 +2473,7 @@ msgstr "无法保存新密码。" msgid "Password saved." msgstr "密码已保存。" -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:331 msgid "Paths" msgstr "" @@ -2420,142 +2481,159 @@ msgstr "" msgid "Path and server settings for this StatusNet site." msgstr "" -#: actions/pathsadminpanel.php:140 +#: actions/pathsadminpanel.php:157 #, fuzzy, php-format msgid "Theme directory not readable: %s" msgstr "这个页面不提供您想要的媒体类型" -#: actions/pathsadminpanel.php:146 +#: actions/pathsadminpanel.php:163 #, php-format msgid "Avatar directory not writable: %s" msgstr "" -#: actions/pathsadminpanel.php:152 +#: actions/pathsadminpanel.php:169 #, php-format msgid "Background directory not writable: %s" msgstr "" -#: actions/pathsadminpanel.php:160 +#: actions/pathsadminpanel.php:177 #, php-format msgid "Locales directory not readable: %s" msgstr "" -#: actions/pathsadminpanel.php:166 +#: actions/pathsadminpanel.php:183 msgid "Invalid SSL server. The maximum length is 255 characters." msgstr "" -#: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58 +#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58 #: lib/adminpanelaction.php:311 #, fuzzy msgid "Site" msgstr "邀请" -#: actions/pathsadminpanel.php:221 +#: actions/pathsadminpanel.php:238 +#, fuzzy +msgid "Server" +msgstr "恢复" + +#: actions/pathsadminpanel.php:238 +msgid "Site's server hostname." +msgstr "" + +#: actions/pathsadminpanel.php:242 msgid "Path" msgstr "" -#: actions/pathsadminpanel.php:221 +#: actions/pathsadminpanel.php:242 #, fuzzy msgid "Site path" msgstr "新通告" -#: actions/pathsadminpanel.php:225 +#: actions/pathsadminpanel.php:246 msgid "Path to locales" msgstr "" -#: actions/pathsadminpanel.php:225 +#: actions/pathsadminpanel.php:246 msgid "Directory path to locales" msgstr "" -#: actions/pathsadminpanel.php:232 -msgid "Theme" -msgstr "" - -#: actions/pathsadminpanel.php:237 -msgid "Theme server" -msgstr "" - -#: actions/pathsadminpanel.php:241 -msgid "Theme path" -msgstr "" - -#: actions/pathsadminpanel.php:245 -msgid "Theme directory" +#: actions/pathsadminpanel.php:250 +msgid "Fancy URLs" msgstr "" #: actions/pathsadminpanel.php:252 +msgid "Use fancy (more readable and memorable) URLs?" +msgstr "" + +#: actions/pathsadminpanel.php:259 +msgid "Theme" +msgstr "" + +#: actions/pathsadminpanel.php:264 +msgid "Theme server" +msgstr "" + +#: actions/pathsadminpanel.php:268 +msgid "Theme path" +msgstr "" + +#: actions/pathsadminpanel.php:272 +msgid "Theme directory" +msgstr "" + +#: actions/pathsadminpanel.php:279 #, fuzzy msgid "Avatars" msgstr "头像" -#: actions/pathsadminpanel.php:257 +#: actions/pathsadminpanel.php:284 #, fuzzy msgid "Avatar server" msgstr "头像设置" -#: actions/pathsadminpanel.php:261 +#: actions/pathsadminpanel.php:288 #, fuzzy msgid "Avatar path" msgstr "头像已更新。" -#: actions/pathsadminpanel.php:265 +#: actions/pathsadminpanel.php:292 #, fuzzy msgid "Avatar directory" msgstr "头像已更新。" -#: actions/pathsadminpanel.php:274 +#: actions/pathsadminpanel.php:301 msgid "Backgrounds" msgstr "" -#: actions/pathsadminpanel.php:278 +#: actions/pathsadminpanel.php:305 msgid "Background server" msgstr "" -#: actions/pathsadminpanel.php:282 +#: actions/pathsadminpanel.php:309 msgid "Background path" msgstr "" -#: actions/pathsadminpanel.php:286 +#: actions/pathsadminpanel.php:313 msgid "Background directory" msgstr "" -#: actions/pathsadminpanel.php:293 +#: actions/pathsadminpanel.php:320 #, fuzzy msgid "SSL" msgstr "SMS短信" -#: actions/pathsadminpanel.php:296 actions/siteadminpanel.php:346 +#: actions/pathsadminpanel.php:323 actions/siteadminpanel.php:294 #, fuzzy msgid "Never" msgstr "恢复" -#: actions/pathsadminpanel.php:297 +#: actions/pathsadminpanel.php:324 #, fuzzy msgid "Sometimes" msgstr "通告" -#: actions/pathsadminpanel.php:298 +#: actions/pathsadminpanel.php:325 msgid "Always" msgstr "" -#: actions/pathsadminpanel.php:302 +#: actions/pathsadminpanel.php:329 msgid "Use SSL" msgstr "" -#: actions/pathsadminpanel.php:303 +#: actions/pathsadminpanel.php:330 msgid "When to use SSL" msgstr "" -#: actions/pathsadminpanel.php:308 +#: actions/pathsadminpanel.php:335 #, fuzzy msgid "SSL server" msgstr "恢复" -#: actions/pathsadminpanel.php:309 +#: actions/pathsadminpanel.php:336 msgid "Server to direct SSL requests to" msgstr "" -#: actions/pathsadminpanel.php:325 +#: actions/pathsadminpanel.php:352 #, fuzzy msgid "Save paths" msgstr "新通告" @@ -2665,7 +2743,7 @@ msgid "" "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated" msgstr "你的标签 (字母letters, 数字numbers, -, ., 和 _), 以逗号或空格分隔" -#: actions/profilesettings.php:151 actions/siteadminpanel.php:294 +#: actions/profilesettings.php:151 actions/siteadminpanel.php:280 msgid "Language" msgstr "语言" @@ -2691,7 +2769,7 @@ msgstr "自动订阅任何订阅我的更新的人(这个选项最适合机器 msgid "Bio is too long (max %d chars)." msgstr "自述过长(不能超过140字符)。" -#: actions/profilesettings.php:235 actions/siteadminpanel.php:164 +#: actions/profilesettings.php:235 actions/siteadminpanel.php:150 msgid "Timezone not selected." msgstr "未选择时区。" @@ -2959,7 +3037,7 @@ msgstr "验证码出错。" msgid "Registration successful" msgstr "注册成功。" -#: actions/register.php:114 actions/register.php:503 lib/action.php:457 +#: actions/register.php:114 actions/register.php:503 lib/action.php:463 #: lib/logingroupnav.php:85 msgid "Register" msgstr "注册" @@ -2999,7 +3077,7 @@ msgid "Same as password above. Required." msgstr "相同的密码。此项必填。" #: actions/register.php:438 actions/register.php:442 -#: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120 +#: actions/siteadminpanel.php:256 lib/accountsettingsaction.php:120 msgid "Email" msgstr "电子邮件" @@ -3159,6 +3237,11 @@ msgstr "创建" msgid "Replies to %s" msgstr "%s 的回复" +#: actions/replies.php:127 +#, fuzzy, php-format +msgid "Replies to %1$s, page %2$d" +msgstr "发送给 %1$s 的 %2$s 消息" + #: actions/replies.php:144 #, fuzzy, php-format msgid "Replies feed for %s (RSS 1.0)" @@ -3289,6 +3372,11 @@ msgid "" "signature method." msgstr "" +#: actions/showfavorites.php:79 +#, fuzzy, php-format +msgid "%1$s's favorite notices, page %2$d" +msgstr "%s 收藏的通告" + #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "无法获取收藏的通告。" @@ -3338,6 +3426,11 @@ msgstr "" msgid "%s group" msgstr "%s 组" +#: actions/showgroup.php:84 +#, fuzzy, php-format +msgid "%1$s group, page %2$d" +msgstr "%s 组成员, 第 %d 页" + #: actions/showgroup.php:218 #, fuzzy msgid "Group profile" @@ -3456,6 +3549,11 @@ msgstr "消息已发布。" msgid " tagged %s" msgstr "带 %s 标签的通告" +#: actions/showstream.php:79 +#, fuzzy, php-format +msgid "%1$s, page %2$d" +msgstr "%s 及好友" + #: actions/showstream.php:122 #, fuzzy, php-format msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" @@ -3537,203 +3635,149 @@ msgstr "用户没有个人信息。" msgid "Basic settings for this StatusNet site." msgstr "" -#: actions/siteadminpanel.php:146 +#: actions/siteadminpanel.php:132 msgid "Site name must have non-zero length." msgstr "" -#: actions/siteadminpanel.php:154 +#: actions/siteadminpanel.php:140 #, fuzzy msgid "You must have a valid contact email address." msgstr "不是有效的电子邮件" -#: actions/siteadminpanel.php:172 +#: actions/siteadminpanel.php:158 #, php-format msgid "Unknown language \"%s\"." msgstr "" -#: actions/siteadminpanel.php:179 +#: actions/siteadminpanel.php:165 msgid "Invalid snapshot report URL." msgstr "" -#: actions/siteadminpanel.php:185 +#: actions/siteadminpanel.php:171 msgid "Invalid snapshot run value." msgstr "" -#: actions/siteadminpanel.php:191 +#: actions/siteadminpanel.php:177 msgid "Snapshot frequency must be a number." msgstr "" -#: actions/siteadminpanel.php:197 +#: actions/siteadminpanel.php:183 msgid "Minimum text limit is 140 characters." msgstr "" -#: actions/siteadminpanel.php:203 +#: actions/siteadminpanel.php:189 msgid "Dupe limit must 1 or more seconds." msgstr "" -#: actions/siteadminpanel.php:253 +#: actions/siteadminpanel.php:239 msgid "General" msgstr "" -#: actions/siteadminpanel.php:256 +#: actions/siteadminpanel.php:242 #, fuzzy msgid "Site name" msgstr "新通告" -#: actions/siteadminpanel.php:257 +#: actions/siteadminpanel.php:243 msgid "The name of your site, like \"Yourcompany Microblog\"" msgstr "" -#: actions/siteadminpanel.php:261 +#: actions/siteadminpanel.php:247 msgid "Brought by" msgstr "" -#: actions/siteadminpanel.php:262 +#: actions/siteadminpanel.php:248 msgid "Text used for credits link in footer of each page" msgstr "" -#: actions/siteadminpanel.php:266 +#: actions/siteadminpanel.php:252 msgid "Brought by URL" msgstr "" -#: actions/siteadminpanel.php:267 +#: actions/siteadminpanel.php:253 msgid "URL used for credits link in footer of each page" msgstr "" -#: actions/siteadminpanel.php:271 +#: actions/siteadminpanel.php:257 #, fuzzy msgid "Contact email address for your site" msgstr "新的电子邮件地址，用于发布 %s 信息" -#: actions/siteadminpanel.php:277 +#: actions/siteadminpanel.php:263 #, fuzzy msgid "Local" msgstr "本地显示" -#: actions/siteadminpanel.php:288 +#: actions/siteadminpanel.php:274 msgid "Default timezone" msgstr "" -#: actions/siteadminpanel.php:289 +#: actions/siteadminpanel.php:275 msgid "Default timezone for the site; usually UTC." msgstr "" -#: actions/siteadminpanel.php:295 +#: actions/siteadminpanel.php:281 #, fuzzy msgid "Default site language" msgstr "首选语言" -#: actions/siteadminpanel.php:303 -#, fuzzy -msgid "URLs" -msgstr "URL 互联网地址" - -#: actions/siteadminpanel.php:306 -#, fuzzy -msgid "Server" -msgstr "恢复" - -#: actions/siteadminpanel.php:306 -msgid "Site's server hostname." -msgstr "" - -#: actions/siteadminpanel.php:310 -msgid "Fancy URLs" -msgstr "" - -#: actions/siteadminpanel.php:312 -msgid "Use fancy (more readable and memorable) URLs?" -msgstr "" - -#: actions/siteadminpanel.php:318 -#, fuzzy -msgid "Access" -msgstr "接受" - -#: actions/siteadminpanel.php:321 -#, fuzzy -msgid "Private" -msgstr "隐私" - -#: actions/siteadminpanel.php:323 -msgid "Prohibit anonymous users (not logged in) from viewing site?" -msgstr "" - -#: actions/siteadminpanel.php:327 -#, fuzzy -msgid "Invite only" -msgstr "邀请" - -#: actions/siteadminpanel.php:329 -msgid "Make registration invitation only." -msgstr "" - -#: actions/siteadminpanel.php:333 -#, fuzzy -msgid "Closed" -msgstr "阻止" - -#: actions/siteadminpanel.php:335 -msgid "Disable new registrations." -msgstr "" - -#: actions/siteadminpanel.php:341 +#: actions/siteadminpanel.php:289 msgid "Snapshots" msgstr "" -#: actions/siteadminpanel.php:344 +#: actions/siteadminpanel.php:292 msgid "Randomly during Web hit" msgstr "" -#: actions/siteadminpanel.php:345 +#: actions/siteadminpanel.php:293 msgid "In a scheduled job" msgstr "" -#: actions/siteadminpanel.php:347 +#: actions/siteadminpanel.php:295 msgid "Data snapshots" msgstr "" -#: actions/siteadminpanel.php:348 +#: actions/siteadminpanel.php:296 msgid "When to send statistical data to status.net servers" msgstr "" -#: actions/siteadminpanel.php:353 +#: actions/siteadminpanel.php:301 msgid "Frequency" msgstr "" -#: actions/siteadminpanel.php:354 +#: actions/siteadminpanel.php:302 msgid "Snapshots will be sent once every N web hits" msgstr "" -#: actions/siteadminpanel.php:359 +#: actions/siteadminpanel.php:307 msgid "Report URL" msgstr "" -#: actions/siteadminpanel.php:360 +#: actions/siteadminpanel.php:308 msgid "Snapshots will be sent to this URL" msgstr "" -#: actions/siteadminpanel.php:367 +#: actions/siteadminpanel.php:315 msgid "Limits" msgstr "" -#: actions/siteadminpanel.php:370 +#: actions/siteadminpanel.php:318 msgid "Text limit" msgstr "" -#: actions/siteadminpanel.php:370 +#: actions/siteadminpanel.php:318 msgid "Maximum number of characters for notices." msgstr "" -#: actions/siteadminpanel.php:374 +#: actions/siteadminpanel.php:322 msgid "Dupe limit" msgstr "" -#: actions/siteadminpanel.php:374 +#: actions/siteadminpanel.php:322 msgid "How long users must wait (in seconds) to post the same thing again." msgstr "" -#: actions/siteadminpanel.php:388 actions/useradminpanel.php:313 +#: actions/siteadminpanel.php:336 actions/useradminpanel.php:313 #, fuzzy msgid "Save site settings" msgstr "头像设置" @@ -3939,6 +3983,11 @@ msgstr "没有 Jabber ID。" msgid "SMS" msgstr "SMS短信" +#: actions/tag.php:68 +#, fuzzy, php-format +msgid "Notices tagged with %1$s, page %2$d" +msgstr "用户自加标签 %s - 第 %d 页" + #: actions/tag.php:86 #, fuzzy, php-format msgid "Notice feed for tag %s (RSS 1.0)" @@ -4248,6 +4297,11 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "" +#: actions/usergroups.php:64 +#, fuzzy, php-format +msgid "%1$s groups, page %2$d" +msgstr "%s 组成员, 第 %d 页" + #: actions/usergroups.php:130 #, fuzzy msgid "Search for more groups" @@ -4311,7 +4365,7 @@ msgstr "" msgid "Plugins" msgstr "" -#: actions/version.php:196 lib/action.php:741 +#: actions/version.php:196 lib/action.php:747 #, fuzzy msgid "Version" msgstr "个人" @@ -4370,47 +4424,52 @@ msgstr "无法添加信息。" msgid "Could not update message with new URI." msgstr "无法添加新URI的信息。" -#: classes/Notice.php:171 +#: classes/Notice.php:157 #, php-format msgid "DB error inserting hashtag: %s" msgstr "添加标签时数据库出错：%s" -#: classes/Notice.php:225 +#: classes/Notice.php:214 #, fuzzy msgid "Problem saving notice. Too long." msgstr "保存通告时出错。" -#: classes/Notice.php:229 +#: classes/Notice.php:218 #, fuzzy msgid "Problem saving notice. Unknown user." msgstr "保存通告时出错。" -#: classes/Notice.php:234 +#: classes/Notice.php:223 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "你在短时间里发布了过多的消息，请深呼吸，过几分钟再发消息。" -#: classes/Notice.php:240 +#: classes/Notice.php:229 #, fuzzy msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "你在短时间里发布了过多的消息，请深呼吸，过几分钟再发消息。" -#: classes/Notice.php:246 +#: classes/Notice.php:235 msgid "You are banned from posting notices on this site." msgstr "在这个网站你被禁止发布消息。" -#: classes/Notice.php:305 classes/Notice.php:330 +#: classes/Notice.php:294 classes/Notice.php:319 msgid "Problem saving notice." msgstr "保存通告时出错。" -#: classes/Notice.php:1059 +#: classes/Notice.php:790 +#, fuzzy +msgid "Problem saving group inbox." +msgstr "保存通告时出错。" + +#: classes/Notice.php:850 #, php-format msgid "DB error inserting reply: %s" msgstr "添加回复时数据库出错：%s" -#: classes/Notice.php:1441 +#: classes/Notice.php:1233 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" @@ -4467,133 +4526,133 @@ msgstr "%1$s (%2$s)" msgid "Untitled page" msgstr "无标题页" -#: lib/action.php:427 +#: lib/action.php:433 msgid "Primary site navigation" msgstr "主站导航" -#: lib/action.php:433 +#: lib/action.php:439 msgid "Home" msgstr "主页" -#: lib/action.php:433 +#: lib/action.php:439 msgid "Personal profile and friends timeline" msgstr "个人资料及朋友年表" -#: lib/action.php:435 +#: lib/action.php:441 #, fuzzy msgid "Change your email, avatar, password, profile" msgstr "修改资料" -#: lib/action.php:438 +#: lib/action.php:444 msgid "Connect" msgstr "连接" -#: lib/action.php:438 +#: lib/action.php:444 #, fuzzy msgid "Connect to services" msgstr "无法重定向到服务器：%s" -#: lib/action.php:442 +#: lib/action.php:448 #, fuzzy msgid "Change site configuration" msgstr "主站导航" -#: lib/action.php:446 lib/subgroupnav.php:105 +#: lib/action.php:452 lib/subgroupnav.php:105 msgid "Invite" msgstr "邀请" -#: lib/action.php:447 lib/subgroupnav.php:106 +#: lib/action.php:453 lib/subgroupnav.php:106 #, fuzzy, php-format msgid "Invite friends and colleagues to join you on %s" msgstr "使用这个表单来邀请好友和同事加入。" -#: lib/action.php:452 +#: lib/action.php:458 msgid "Logout" msgstr "登出" -#: lib/action.php:452 +#: lib/action.php:458 msgid "Logout from the site" msgstr "登出本站" -#: lib/action.php:457 +#: lib/action.php:463 #, fuzzy msgid "Create an account" msgstr "创建新帐号" -#: lib/action.php:460 +#: lib/action.php:466 msgid "Login to the site" msgstr "登入本站" -#: lib/action.php:463 lib/action.php:726 +#: lib/action.php:469 lib/action.php:732 msgid "Help" msgstr "帮助" -#: lib/action.php:463 +#: lib/action.php:469 #, fuzzy msgid "Help me!" msgstr "帮助" -#: lib/action.php:466 lib/searchaction.php:127 +#: lib/action.php:472 lib/searchaction.php:127 msgid "Search" msgstr "搜索" -#: lib/action.php:466 +#: lib/action.php:472 msgid "Search for people or text" msgstr "检索人或文字" -#: lib/action.php:487 +#: lib/action.php:493 #, fuzzy msgid "Site notice" msgstr "新通告" -#: lib/action.php:553 +#: lib/action.php:559 msgid "Local views" msgstr "本地显示" -#: lib/action.php:619 +#: lib/action.php:625 #, fuzzy msgid "Page notice" msgstr "新通告" -#: lib/action.php:721 +#: lib/action.php:727 #, fuzzy msgid "Secondary site navigation" msgstr "次项站导航" -#: lib/action.php:728 +#: lib/action.php:734 msgid "About" msgstr "关于" -#: lib/action.php:730 +#: lib/action.php:736 msgid "FAQ" msgstr "常见问题FAQ" -#: lib/action.php:734 +#: lib/action.php:740 msgid "TOS" msgstr "" -#: lib/action.php:737 +#: lib/action.php:743 msgid "Privacy" msgstr "隐私" -#: lib/action.php:739 +#: lib/action.php:745 msgid "Source" msgstr "来源" -#: lib/action.php:743 +#: lib/action.php:749 msgid "Contact" msgstr "联系人" -#: lib/action.php:745 +#: lib/action.php:751 #, fuzzy msgid "Badge" msgstr "呼叫" -#: lib/action.php:773 +#: lib/action.php:779 msgid "StatusNet software license" msgstr "StatusNet软件注册证" -#: lib/action.php:776 +#: lib/action.php:782 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -4602,12 +4661,12 @@ msgstr "" "**%%site.name%%** 是一个微博客服务，提供者为 [%%site.broughtby%%](%%site." "broughtbyurl%%)。" -#: lib/action.php:778 +#: lib/action.php:784 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "**%%site.name%%** 是一个微博客服务。" -#: lib/action.php:780 +#: lib/action.php:786 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4618,43 +4677,43 @@ msgstr "" "General Public License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)" "授权。" -#: lib/action.php:795 +#: lib/action.php:801 #, fuzzy msgid "Site content license" msgstr "StatusNet软件注册证" -#: lib/action.php:800 +#: lib/action.php:806 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "" -#: lib/action.php:805 +#: lib/action.php:811 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" -#: lib/action.php:808 +#: lib/action.php:814 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" -#: lib/action.php:820 +#: lib/action.php:826 msgid "All " msgstr "全部" -#: lib/action.php:825 +#: lib/action.php:831 msgid "license." msgstr "注册证" -#: lib/action.php:1124 +#: lib/action.php:1130 msgid "Pagination" msgstr "分页" -#: lib/action.php:1133 +#: lib/action.php:1139 #, fuzzy msgid "After" msgstr "« 之后" -#: lib/action.php:1141 +#: lib/action.php:1147 #, fuzzy msgid "Before" msgstr "之前 »" @@ -4694,11 +4753,25 @@ msgstr "电子邮件地址确认" msgid "Design configuration" msgstr "SMS短信确认" -#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327 +#: lib/adminpanelaction.php:322 +#, fuzzy +msgid "User configuration" +msgstr "SMS短信确认" + +#: lib/adminpanelaction.php:327 +#, fuzzy +msgid "Access configuration" +msgstr "SMS短信确认" + +#: lib/adminpanelaction.php:332 #, fuzzy msgid "Paths configuration" msgstr "SMS短信确认" +#: lib/applicationeditform.php:136 +msgid "Edit application" +msgstr "" + #: lib/applicationeditform.php:186 msgid "Icon for this application" msgstr "" @@ -5293,12 +5366,12 @@ msgstr "" msgid "kB" msgstr "" -#: lib/jabber.php:202 +#: lib/jabber.php:220 #, php-format msgid "[%s]" msgstr "" -#: lib/jabber.php:385 +#: lib/jabber.php:400 #, php-format msgid "Unknown inbox source %d." msgstr "" @@ -5740,19 +5813,19 @@ msgstr "回复" msgid "Favorites" msgstr "收藏夹" -#: lib/personalgroupnav.php:124 +#: lib/personalgroupnav.php:125 msgid "Inbox" msgstr "收件箱" -#: lib/personalgroupnav.php:125 +#: lib/personalgroupnav.php:126 msgid "Your incoming messages" msgstr "您接收的消息" -#: lib/personalgroupnav.php:129 +#: lib/personalgroupnav.php:130 msgid "Outbox" msgstr "发件箱" -#: lib/personalgroupnav.php:130 +#: lib/personalgroupnav.php:131 msgid "Your sent messages" msgstr "您发送的消息" @@ -6022,47 +6095,47 @@ msgstr "新消息" msgid "Moderate" msgstr "" -#: lib/util.php:875 +#: lib/util.php:868 msgid "a few seconds ago" msgstr "几秒前" -#: lib/util.php:877 +#: lib/util.php:870 msgid "about a minute ago" msgstr "一分钟前" -#: lib/util.php:879 +#: lib/util.php:872 #, php-format msgid "about %d minutes ago" msgstr "%d 分钟前" -#: lib/util.php:881 +#: lib/util.php:874 msgid "about an hour ago" msgstr "一小时前" -#: lib/util.php:883 +#: lib/util.php:876 #, php-format msgid "about %d hours ago" msgstr "%d 小时前" -#: lib/util.php:885 +#: lib/util.php:878 msgid "about a day ago" msgstr "一天前" -#: lib/util.php:887 +#: lib/util.php:880 #, php-format msgid "about %d days ago" msgstr "%d 天前" -#: lib/util.php:889 +#: lib/util.php:882 msgid "about a month ago" msgstr "一个月前" -#: lib/util.php:891 +#: lib/util.php:884 #, php-format msgid "about %d months ago" msgstr "%d 个月前" -#: lib/util.php:893 +#: lib/util.php:886 msgid "about a year ago" msgstr "一年前" @@ -6076,7 +6149,7 @@ msgstr "主页的URL不正确。" msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "" -#: scripts/xmppdaemon.php:301 +#: lib/xmppmanager.php:402 #, fuzzy, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "您的消息包含 %d 个字符，超出长度限制 - 不能超过 140 个字符。" diff --git a/locale/zh_TW/LC_MESSAGES/statusnet.po b/locale/zh_TW/LC_MESSAGES/statusnet.po index cbcbf12489..e01caa3c36 100644 --- a/locale/zh_TW/LC_MESSAGES/statusnet.po +++ b/locale/zh_TW/LC_MESSAGES/statusnet.po @@ -7,17 +7,73 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-21 22:36+0000\n" -"PO-Revision-Date: 2010-01-21 22:38:49+0000\n" +"POT-Creation-Date: 2010-01-27 23:58+0000\n" +"PO-Revision-Date: 2010-01-28 00:00:08+0000\n" "Language-Team: Traditional Chinese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r61339); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61595); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: zh-hant\n" "X-Message-Group: out-statusnet\n" "Plural-Forms: nplurals=1; plural=0;\n" +#: actions/accessadminpanel.php:54 lib/adminpanelaction.php:326 +#, fuzzy +msgid "Access" +msgstr "接受" + +#: actions/accessadminpanel.php:65 +#, fuzzy +msgid "Site access settings" +msgstr "線上即時通設定" + +#: actions/accessadminpanel.php:158 +#, fuzzy +msgid "Registration" +msgstr "所有訂閱" + +#: actions/accessadminpanel.php:161 +msgid "Private" +msgstr "" + +#: actions/accessadminpanel.php:163 +msgid "Prohibit anonymous users (not logged in) from viewing site?" +msgstr "" + +#: actions/accessadminpanel.php:167 +msgid "Invite only" +msgstr "" + +#: actions/accessadminpanel.php:169 +msgid "Make registration invitation only." +msgstr "" + +#: actions/accessadminpanel.php:173 +#, fuzzy +msgid "Closed" +msgstr "無此使用者" + +#: actions/accessadminpanel.php:175 +msgid "Disable new registrations." +msgstr "" + +#: actions/accessadminpanel.php:189 actions/designadminpanel.php:586 +#: actions/emailsettings.php:195 actions/imsettings.php:163 +#: actions/othersettings.php:126 actions/pathsadminpanel.php:351 +#: actions/profilesettings.php:174 actions/siteadminpanel.php:336 +#: actions/smssettings.php:181 actions/subscriptions.php:203 +#: actions/tagother.php:154 actions/useradminpanel.php:313 +#: lib/applicationeditform.php:335 lib/applicationeditform.php:336 +#: lib/designsettings.php:256 lib/groupeditform.php:202 +msgid "Save" +msgstr "" + +#: actions/accessadminpanel.php:189 +#, fuzzy +msgid "Save access settings" +msgstr "線上即時通設定" + #: actions/all.php:63 actions/public.php:97 actions/replies.php:92 #: actions/showfavorites.php:137 actions/tag.php:51 #, fuzzy @@ -33,7 +89,7 @@ msgstr "無此通知" #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:149 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 @@ -133,8 +189,7 @@ msgstr "" #: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 #: actions/apitimelinefriends.php:155 actions/apitimelinegroup.php:150 #: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 -#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 #, fuzzy @@ -151,7 +206,7 @@ msgstr "確認碼遺失" #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:119 +#: actions/apistatusesupdate.php:118 msgid "This method requires a POST." msgstr "" @@ -182,7 +237,7 @@ msgstr "無法儲存個人資料" #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:132 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 #: actions/designadminpanel.php:122 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -489,7 +544,14 @@ msgstr "" msgid "Allow or deny access" msgstr "" -#: actions/apioauthauthorize.php:320 lib/action.php:435 +#: actions/apioauthauthorize.php:306 +#, php-format +msgid "" +"The application %s by %s would like the " +"ability to %s your account data." +msgstr "" + +#: actions/apioauthauthorize.php:320 lib/action.php:441 #, fuzzy msgid "Account" msgstr "關於" @@ -550,17 +612,17 @@ msgstr "更新個人圖像" msgid "No status with that ID found." msgstr "" -#: actions/apistatusesupdate.php:162 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "" -#: actions/apistatusesupdate.php:203 +#: actions/apistatusesupdate.php:202 msgid "Not found" msgstr "" -#: actions/apistatusesupdate.php:226 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -611,11 +673,6 @@ msgstr "" msgid "%s updates from everyone!" msgstr "" -#: actions/apitimelineretweetedbyme.php:112 -#, php-format -msgid "Repeated by %s" -msgstr "" - #: actions/apitimelineretweetedtome.php:111 #, php-format msgid "Repeated to %s" @@ -1039,17 +1096,6 @@ msgstr "" msgid "Reset back to default" msgstr "" -#: actions/designadminpanel.php:586 actions/emailsettings.php:195 -#: actions/imsettings.php:163 actions/othersettings.php:126 -#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174 -#: actions/siteadminpanel.php:388 actions/smssettings.php:181 -#: actions/subscriptions.php:203 actions/tagother.php:154 -#: actions/useradminpanel.php:313 lib/applicationeditform.php:335 -#: lib/applicationeditform.php:336 lib/designsettings.php:256 -#: lib/groupeditform.php:202 -msgid "Save" -msgstr "" - #: actions/designadminpanel.php:587 lib/designsettings.php:257 msgid "Save design" msgstr "" @@ -1062,13 +1108,15 @@ msgstr "" msgid "Add to favorites" msgstr "" -#: actions/doc.php:69 -msgid "No such document." +#: actions/doc.php:155 +#, fuzzy, php-format +msgid "No such document \"%s\"" msgstr "無此文件" -#: actions/editapplication.php:54 lib/applicationeditform.php:136 -msgid "Edit application" -msgstr "" +#: actions/editapplication.php:54 +#, fuzzy +msgid "Edit Application" +msgstr "無此通知" #: actions/editapplication.php:66 msgid "You must be logged in to edit an application." @@ -1086,7 +1134,7 @@ msgid "No such application." msgstr "無此通知" #: actions/editapplication.php:127 actions/newapplication.php:110 -#: actions/showapplication.php:118 lib/action.php:1189 +#: actions/showapplication.php:118 lib/action.php:1195 msgid "There was a problem with your session token." msgstr "" @@ -1294,7 +1342,7 @@ msgid "Cannot normalize that email address" msgstr "" #: actions/emailsettings.php:331 actions/register.php:201 -#: actions/siteadminpanel.php:157 +#: actions/siteadminpanel.php:143 msgid "Not a valid email address." msgstr "此信箱無效" @@ -1306,7 +1354,7 @@ msgstr "" msgid "That email address already belongs to another user." msgstr "" -#: actions/emailsettings.php:353 actions/imsettings.php:317 +#: actions/emailsettings.php:353 actions/imsettings.php:319 #: actions/smssettings.php:337 msgid "Couldn't insert confirmation code." msgstr "無法輸入確認碼" @@ -1613,7 +1661,7 @@ msgstr "" msgid "A list of the users in this group." msgstr "" -#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107 +#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107 msgid "Admin" msgstr "" @@ -1796,6 +1844,11 @@ msgstr "確認信已寄到你的線上即時通信箱。%s送給你得訊息要 msgid "That is not your Jabber ID." msgstr "" +#: actions/inbox.php:59 +#, php-format +msgid "Inbox for %1$s - page %2$d" +msgstr "" + #: actions/inbox.php:62 #, php-format msgid "Inbox for %s" @@ -1946,7 +1999,7 @@ msgstr "使用者名稱或密碼錯誤" msgid "Error setting user. You are probably not authorized." msgstr "" -#: actions/login.php:188 actions/login.php:241 lib/action.php:460 +#: actions/login.php:188 actions/login.php:241 lib/action.php:466 #: lib/logingroupnav.php:79 msgid "Login" msgstr "登入" @@ -2004,8 +2057,9 @@ msgid "No current status" msgstr "" #: actions/newapplication.php:52 -msgid "New application" -msgstr "" +#, fuzzy +msgid "New Application" +msgstr "無此通知" #: actions/newapplication.php:64 msgid "You must be logged in to register an application." @@ -2189,8 +2243,8 @@ msgstr "連結" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1038 -#: lib/api.php:1066 lib/api.php:1176 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1039 +#: lib/api.php:1067 lib/api.php:1177 msgid "Not a supported data format." msgstr "" @@ -2260,6 +2314,11 @@ msgstr "新訊息" msgid "Login token expired." msgstr "" +#: actions/outbox.php:58 +#, php-format +msgid "Outbox for %1$s - page %2$d" +msgstr "" + #: actions/outbox.php:61 #, php-format msgid "Outbox for %s" @@ -2331,7 +2390,7 @@ msgstr "無法存取新密碼" msgid "Password saved." msgstr "" -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:331 msgid "Paths" msgstr "" @@ -2339,138 +2398,154 @@ msgstr "" msgid "Path and server settings for this StatusNet site." msgstr "" -#: actions/pathsadminpanel.php:140 +#: actions/pathsadminpanel.php:157 #, fuzzy, php-format msgid "Theme directory not readable: %s" msgstr "個人首頁位址錯誤" -#: actions/pathsadminpanel.php:146 +#: actions/pathsadminpanel.php:163 #, php-format msgid "Avatar directory not writable: %s" msgstr "" -#: actions/pathsadminpanel.php:152 +#: actions/pathsadminpanel.php:169 #, php-format msgid "Background directory not writable: %s" msgstr "" -#: actions/pathsadminpanel.php:160 +#: actions/pathsadminpanel.php:177 #, php-format msgid "Locales directory not readable: %s" msgstr "" -#: actions/pathsadminpanel.php:166 +#: actions/pathsadminpanel.php:183 msgid "Invalid SSL server. The maximum length is 255 characters." msgstr "" -#: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58 +#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58 #: lib/adminpanelaction.php:311 msgid "Site" msgstr "" -#: actions/pathsadminpanel.php:221 +#: actions/pathsadminpanel.php:238 +msgid "Server" +msgstr "" + +#: actions/pathsadminpanel.php:238 +msgid "Site's server hostname." +msgstr "" + +#: actions/pathsadminpanel.php:242 msgid "Path" msgstr "" -#: actions/pathsadminpanel.php:221 +#: actions/pathsadminpanel.php:242 #, fuzzy msgid "Site path" msgstr "新訊息" -#: actions/pathsadminpanel.php:225 +#: actions/pathsadminpanel.php:246 msgid "Path to locales" msgstr "" -#: actions/pathsadminpanel.php:225 +#: actions/pathsadminpanel.php:246 msgid "Directory path to locales" msgstr "" -#: actions/pathsadminpanel.php:232 -msgid "Theme" -msgstr "" - -#: actions/pathsadminpanel.php:237 -msgid "Theme server" -msgstr "" - -#: actions/pathsadminpanel.php:241 -msgid "Theme path" -msgstr "" - -#: actions/pathsadminpanel.php:245 -msgid "Theme directory" +#: actions/pathsadminpanel.php:250 +msgid "Fancy URLs" msgstr "" #: actions/pathsadminpanel.php:252 +msgid "Use fancy (more readable and memorable) URLs?" +msgstr "" + +#: actions/pathsadminpanel.php:259 +msgid "Theme" +msgstr "" + +#: actions/pathsadminpanel.php:264 +msgid "Theme server" +msgstr "" + +#: actions/pathsadminpanel.php:268 +msgid "Theme path" +msgstr "" + +#: actions/pathsadminpanel.php:272 +msgid "Theme directory" +msgstr "" + +#: actions/pathsadminpanel.php:279 #, fuzzy msgid "Avatars" msgstr "個人圖像" -#: actions/pathsadminpanel.php:257 +#: actions/pathsadminpanel.php:284 #, fuzzy msgid "Avatar server" msgstr "線上即時通設定" -#: actions/pathsadminpanel.php:261 +#: actions/pathsadminpanel.php:288 #, fuzzy msgid "Avatar path" msgstr "更新個人圖像" -#: actions/pathsadminpanel.php:265 +#: actions/pathsadminpanel.php:292 #, fuzzy msgid "Avatar directory" msgstr "更新個人圖像" -#: actions/pathsadminpanel.php:274 +#: actions/pathsadminpanel.php:301 msgid "Backgrounds" msgstr "" -#: actions/pathsadminpanel.php:278 +#: actions/pathsadminpanel.php:305 msgid "Background server" msgstr "" -#: actions/pathsadminpanel.php:282 +#: actions/pathsadminpanel.php:309 msgid "Background path" msgstr "" -#: actions/pathsadminpanel.php:286 +#: actions/pathsadminpanel.php:313 msgid "Background directory" msgstr "" -#: actions/pathsadminpanel.php:293 +#: actions/pathsadminpanel.php:320 msgid "SSL" msgstr "" -#: actions/pathsadminpanel.php:296 actions/siteadminpanel.php:346 +#: actions/pathsadminpanel.php:323 actions/siteadminpanel.php:294 msgid "Never" msgstr "" -#: actions/pathsadminpanel.php:297 +#: actions/pathsadminpanel.php:324 msgid "Sometimes" msgstr "" -#: actions/pathsadminpanel.php:298 +#: actions/pathsadminpanel.php:325 msgid "Always" msgstr "" -#: actions/pathsadminpanel.php:302 +#: actions/pathsadminpanel.php:329 msgid "Use SSL" msgstr "" -#: actions/pathsadminpanel.php:303 +#: actions/pathsadminpanel.php:330 msgid "When to use SSL" msgstr "" -#: actions/pathsadminpanel.php:308 +#: actions/pathsadminpanel.php:335 #, fuzzy msgid "SSL server" msgstr "線上即時通設定" -#: actions/pathsadminpanel.php:309 +#: actions/pathsadminpanel.php:336 msgid "Server to direct SSL requests to" msgstr "" -#: actions/pathsadminpanel.php:325 +#: actions/pathsadminpanel.php:352 #, fuzzy msgid "Save paths" msgstr "新訊息" @@ -2577,7 +2652,7 @@ msgid "" "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated" msgstr "" -#: actions/profilesettings.php:151 actions/siteadminpanel.php:294 +#: actions/profilesettings.php:151 actions/siteadminpanel.php:280 msgid "Language" msgstr "" @@ -2603,7 +2678,7 @@ msgstr "" msgid "Bio is too long (max %d chars)." msgstr "自我介紹過長(共140個字元)" -#: actions/profilesettings.php:235 actions/siteadminpanel.php:164 +#: actions/profilesettings.php:235 actions/siteadminpanel.php:150 msgid "Timezone not selected." msgstr "" @@ -2865,7 +2940,7 @@ msgstr "確認碼發生錯誤" msgid "Registration successful" msgstr "" -#: actions/register.php:114 actions/register.php:503 lib/action.php:457 +#: actions/register.php:114 actions/register.php:503 lib/action.php:463 #: lib/logingroupnav.php:85 msgid "Register" msgstr "" @@ -2905,7 +2980,7 @@ msgid "Same as password above. Required." msgstr "" #: actions/register.php:438 actions/register.php:442 -#: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120 +#: actions/siteadminpanel.php:256 lib/accountsettingsaction.php:120 msgid "Email" msgstr "電子信箱" @@ -3045,6 +3120,11 @@ msgstr "新增" msgid "Replies to %s" msgstr "" +#: actions/replies.php:127 +#, fuzzy, php-format +msgid "Replies to %1$s, page %2$d" +msgstr "&s的微型部落格" + #: actions/replies.php:144 #, fuzzy, php-format msgid "Replies feed for %s (RSS 1.0)" @@ -3172,6 +3252,11 @@ msgid "" "signature method." msgstr "" +#: actions/showfavorites.php:79 +#, fuzzy, php-format +msgid "%1$s's favorite notices, page %2$d" +msgstr "%s與好友" + #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "" @@ -3221,6 +3306,11 @@ msgstr "" msgid "%s group" msgstr "" +#: actions/showgroup.php:84 +#, fuzzy, php-format +msgid "%1$s group, page %2$d" +msgstr "所有訂閱" + #: actions/showgroup.php:218 #, fuzzy msgid "Group profile" @@ -3335,6 +3425,11 @@ msgstr "更新個人圖像" msgid " tagged %s" msgstr "" +#: actions/showstream.php:79 +#, fuzzy, php-format +msgid "%1$s, page %2$d" +msgstr "%s與好友" + #: actions/showstream.php:122 #, fuzzy, php-format msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" @@ -3412,198 +3507,148 @@ msgstr "" msgid "Basic settings for this StatusNet site." msgstr "" -#: actions/siteadminpanel.php:146 +#: actions/siteadminpanel.php:132 msgid "Site name must have non-zero length." msgstr "" -#: actions/siteadminpanel.php:154 +#: actions/siteadminpanel.php:140 #, fuzzy msgid "You must have a valid contact email address." msgstr "此信箱無效" -#: actions/siteadminpanel.php:172 +#: actions/siteadminpanel.php:158 #, php-format msgid "Unknown language \"%s\"." msgstr "" -#: actions/siteadminpanel.php:179 +#: actions/siteadminpanel.php:165 msgid "Invalid snapshot report URL." msgstr "" -#: actions/siteadminpanel.php:185 +#: actions/siteadminpanel.php:171 msgid "Invalid snapshot run value." msgstr "" -#: actions/siteadminpanel.php:191 +#: actions/siteadminpanel.php:177 msgid "Snapshot frequency must be a number." msgstr "" -#: actions/siteadminpanel.php:197 +#: actions/siteadminpanel.php:183 msgid "Minimum text limit is 140 characters." msgstr "" -#: actions/siteadminpanel.php:203 +#: actions/siteadminpanel.php:189 msgid "Dupe limit must 1 or more seconds." msgstr "" -#: actions/siteadminpanel.php:253 +#: actions/siteadminpanel.php:239 msgid "General" msgstr "" -#: actions/siteadminpanel.php:256 +#: actions/siteadminpanel.php:242 #, fuzzy msgid "Site name" msgstr "新訊息" -#: actions/siteadminpanel.php:257 +#: actions/siteadminpanel.php:243 msgid "The name of your site, like \"Yourcompany Microblog\"" msgstr "" -#: actions/siteadminpanel.php:261 +#: actions/siteadminpanel.php:247 msgid "Brought by" msgstr "" -#: actions/siteadminpanel.php:262 +#: actions/siteadminpanel.php:248 msgid "Text used for credits link in footer of each page" msgstr "" -#: actions/siteadminpanel.php:266 +#: actions/siteadminpanel.php:252 msgid "Brought by URL" msgstr "" -#: actions/siteadminpanel.php:267 +#: actions/siteadminpanel.php:253 msgid "URL used for credits link in footer of each page" msgstr "" -#: actions/siteadminpanel.php:271 +#: actions/siteadminpanel.php:257 #, fuzzy msgid "Contact email address for your site" msgstr "查無此使用者所註冊的信箱" -#: actions/siteadminpanel.php:277 +#: actions/siteadminpanel.php:263 #, fuzzy msgid "Local" msgstr "地點" -#: actions/siteadminpanel.php:288 +#: actions/siteadminpanel.php:274 msgid "Default timezone" msgstr "" -#: actions/siteadminpanel.php:289 +#: actions/siteadminpanel.php:275 msgid "Default timezone for the site; usually UTC." msgstr "" -#: actions/siteadminpanel.php:295 +#: actions/siteadminpanel.php:281 msgid "Default site language" msgstr "" -#: actions/siteadminpanel.php:303 -msgid "URLs" -msgstr "" - -#: actions/siteadminpanel.php:306 -msgid "Server" -msgstr "" - -#: actions/siteadminpanel.php:306 -msgid "Site's server hostname." -msgstr "" - -#: actions/siteadminpanel.php:310 -msgid "Fancy URLs" -msgstr "" - -#: actions/siteadminpanel.php:312 -msgid "Use fancy (more readable and memorable) URLs?" -msgstr "" - -#: actions/siteadminpanel.php:318 -#, fuzzy -msgid "Access" -msgstr "接受" - -#: actions/siteadminpanel.php:321 -msgid "Private" -msgstr "" - -#: actions/siteadminpanel.php:323 -msgid "Prohibit anonymous users (not logged in) from viewing site?" -msgstr "" - -#: actions/siteadminpanel.php:327 -msgid "Invite only" -msgstr "" - -#: actions/siteadminpanel.php:329 -msgid "Make registration invitation only." -msgstr "" - -#: actions/siteadminpanel.php:333 -#, fuzzy -msgid "Closed" -msgstr "無此使用者" - -#: actions/siteadminpanel.php:335 -msgid "Disable new registrations." -msgstr "" - -#: actions/siteadminpanel.php:341 +#: actions/siteadminpanel.php:289 msgid "Snapshots" msgstr "" -#: actions/siteadminpanel.php:344 +#: actions/siteadminpanel.php:292 msgid "Randomly during Web hit" msgstr "" -#: actions/siteadminpanel.php:345 +#: actions/siteadminpanel.php:293 msgid "In a scheduled job" msgstr "" -#: actions/siteadminpanel.php:347 +#: actions/siteadminpanel.php:295 msgid "Data snapshots" msgstr "" -#: actions/siteadminpanel.php:348 +#: actions/siteadminpanel.php:296 msgid "When to send statistical data to status.net servers" msgstr "" -#: actions/siteadminpanel.php:353 +#: actions/siteadminpanel.php:301 msgid "Frequency" msgstr "" -#: actions/siteadminpanel.php:354 +#: actions/siteadminpanel.php:302 msgid "Snapshots will be sent once every N web hits" msgstr "" -#: actions/siteadminpanel.php:359 +#: actions/siteadminpanel.php:307 msgid "Report URL" msgstr "" -#: actions/siteadminpanel.php:360 +#: actions/siteadminpanel.php:308 msgid "Snapshots will be sent to this URL" msgstr "" -#: actions/siteadminpanel.php:367 +#: actions/siteadminpanel.php:315 msgid "Limits" msgstr "" -#: actions/siteadminpanel.php:370 +#: actions/siteadminpanel.php:318 msgid "Text limit" msgstr "" -#: actions/siteadminpanel.php:370 +#: actions/siteadminpanel.php:318 msgid "Maximum number of characters for notices." msgstr "" -#: actions/siteadminpanel.php:374 +#: actions/siteadminpanel.php:322 msgid "Dupe limit" msgstr "" -#: actions/siteadminpanel.php:374 +#: actions/siteadminpanel.php:322 msgid "How long users must wait (in seconds) to post the same thing again." msgstr "" -#: actions/siteadminpanel.php:388 actions/useradminpanel.php:313 +#: actions/siteadminpanel.php:336 actions/useradminpanel.php:313 #, fuzzy msgid "Save site settings" msgstr "線上即時通設定" @@ -3802,6 +3847,11 @@ msgstr "查無此Jabber ID" msgid "SMS" msgstr "" +#: actions/tag.php:68 +#, fuzzy, php-format +msgid "Notices tagged with %1$s, page %2$d" +msgstr "&s的微型部落格" + #: actions/tag.php:86 #, php-format msgid "Notice feed for tag %s (RSS 1.0)" @@ -4095,6 +4145,11 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "" +#: actions/usergroups.php:64 +#, fuzzy, php-format +msgid "%1$s groups, page %2$d" +msgstr "所有訂閱" + #: actions/usergroups.php:130 msgid "Search for more groups" msgstr "" @@ -4157,7 +4212,7 @@ msgstr "" msgid "Plugins" msgstr "" -#: actions/version.php:196 lib/action.php:741 +#: actions/version.php:196 lib/action.php:747 #, fuzzy msgid "Version" msgstr "地點" @@ -4215,46 +4270,51 @@ msgstr "" msgid "Could not update message with new URI." msgstr "" -#: classes/Notice.php:171 +#: classes/Notice.php:157 #, php-format msgid "DB error inserting hashtag: %s" msgstr "" -#: classes/Notice.php:225 +#: classes/Notice.php:214 #, fuzzy msgid "Problem saving notice. Too long." msgstr "儲存使用者發生錯誤" -#: classes/Notice.php:229 +#: classes/Notice.php:218 #, fuzzy msgid "Problem saving notice. Unknown user." msgstr "儲存使用者發生錯誤" -#: classes/Notice.php:234 +#: classes/Notice.php:223 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:240 +#: classes/Notice.php:229 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:246 +#: classes/Notice.php:235 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:305 classes/Notice.php:330 +#: classes/Notice.php:294 classes/Notice.php:319 msgid "Problem saving notice." msgstr "" -#: classes/Notice.php:1059 +#: classes/Notice.php:790 +#, fuzzy +msgid "Problem saving group inbox." +msgstr "儲存使用者發生錯誤" + +#: classes/Notice.php:850 #, php-format msgid "DB error inserting reply: %s" msgstr "增加回覆時,資料庫發生錯誤: %s" -#: classes/Notice.php:1441 +#: classes/Notice.php:1233 #, php-format msgid "RT @%1$s %2$s" msgstr "" @@ -4313,129 +4373,129 @@ msgstr "%1$s的狀態是%2$s" msgid "Untitled page" msgstr "" -#: lib/action.php:427 +#: lib/action.php:433 msgid "Primary site navigation" msgstr "" -#: lib/action.php:433 +#: lib/action.php:439 msgid "Home" msgstr "主頁" -#: lib/action.php:433 +#: lib/action.php:439 msgid "Personal profile and friends timeline" msgstr "" -#: lib/action.php:435 +#: lib/action.php:441 msgid "Change your email, avatar, password, profile" msgstr "" -#: lib/action.php:438 +#: lib/action.php:444 msgid "Connect" msgstr "連結" -#: lib/action.php:438 +#: lib/action.php:444 #, fuzzy msgid "Connect to services" msgstr "無法連結到伺服器:%s" -#: lib/action.php:442 +#: lib/action.php:448 msgid "Change site configuration" msgstr "" -#: lib/action.php:446 lib/subgroupnav.php:105 +#: lib/action.php:452 lib/subgroupnav.php:105 msgid "Invite" msgstr "" -#: lib/action.php:447 lib/subgroupnav.php:106 +#: lib/action.php:453 lib/subgroupnav.php:106 #, php-format msgid "Invite friends and colleagues to join you on %s" msgstr "" -#: lib/action.php:452 +#: lib/action.php:458 msgid "Logout" msgstr "登出" -#: lib/action.php:452 +#: lib/action.php:458 msgid "Logout from the site" msgstr "" -#: lib/action.php:457 +#: lib/action.php:463 #, fuzzy msgid "Create an account" msgstr "新增帳號" -#: lib/action.php:460 +#: lib/action.php:466 msgid "Login to the site" msgstr "" -#: lib/action.php:463 lib/action.php:726 +#: lib/action.php:469 lib/action.php:732 msgid "Help" msgstr "求救" -#: lib/action.php:463 +#: lib/action.php:469 #, fuzzy msgid "Help me!" msgstr "求救" -#: lib/action.php:466 lib/searchaction.php:127 +#: lib/action.php:472 lib/searchaction.php:127 msgid "Search" msgstr "" -#: lib/action.php:466 +#: lib/action.php:472 msgid "Search for people or text" msgstr "" -#: lib/action.php:487 +#: lib/action.php:493 #, fuzzy msgid "Site notice" msgstr "新訊息" -#: lib/action.php:553 +#: lib/action.php:559 msgid "Local views" msgstr "" -#: lib/action.php:619 +#: lib/action.php:625 #, fuzzy msgid "Page notice" msgstr "新訊息" -#: lib/action.php:721 +#: lib/action.php:727 msgid "Secondary site navigation" msgstr "" -#: lib/action.php:728 +#: lib/action.php:734 msgid "About" msgstr "關於" -#: lib/action.php:730 +#: lib/action.php:736 msgid "FAQ" msgstr "常見問題" -#: lib/action.php:734 +#: lib/action.php:740 msgid "TOS" msgstr "" -#: lib/action.php:737 +#: lib/action.php:743 msgid "Privacy" msgstr "" -#: lib/action.php:739 +#: lib/action.php:745 msgid "Source" msgstr "" -#: lib/action.php:743 +#: lib/action.php:749 msgid "Contact" msgstr "好友名單" -#: lib/action.php:745 +#: lib/action.php:751 msgid "Badge" msgstr "" -#: lib/action.php:773 +#: lib/action.php:779 msgid "StatusNet software license" msgstr "" -#: lib/action.php:776 +#: lib/action.php:782 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -4444,12 +4504,12 @@ msgstr "" "**%%site.name%%**是由[%%site.broughtby%%](%%site.broughtbyurl%%)所提供的微型" "部落格服務" -#: lib/action.php:778 +#: lib/action.php:784 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "**%%site.name%%**是個微型部落格" -#: lib/action.php:780 +#: lib/action.php:786 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4457,42 +4517,42 @@ msgid "" "org/licensing/licenses/agpl-3.0.html)." msgstr "" -#: lib/action.php:795 +#: lib/action.php:801 #, fuzzy msgid "Site content license" msgstr "新訊息" -#: lib/action.php:800 +#: lib/action.php:806 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "" -#: lib/action.php:805 +#: lib/action.php:811 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" -#: lib/action.php:808 +#: lib/action.php:814 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" -#: lib/action.php:820 +#: lib/action.php:826 msgid "All " msgstr "" -#: lib/action.php:825 +#: lib/action.php:831 msgid "license." msgstr "" -#: lib/action.php:1124 +#: lib/action.php:1130 msgid "Pagination" msgstr "" -#: lib/action.php:1133 +#: lib/action.php:1139 msgid "After" msgstr "" -#: lib/action.php:1141 +#: lib/action.php:1147 #, fuzzy msgid "Before" msgstr "之前的內容»" @@ -4527,11 +4587,25 @@ msgstr "確認信箱" msgid "Design configuration" msgstr "確認信箱" -#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327 +#: lib/adminpanelaction.php:322 +#, fuzzy +msgid "User configuration" +msgstr "確認信箱" + +#: lib/adminpanelaction.php:327 +#, fuzzy +msgid "Access configuration" +msgstr "確認信箱" + +#: lib/adminpanelaction.php:332 #, fuzzy msgid "Paths configuration" msgstr "確認信箱" +#: lib/applicationeditform.php:136 +msgid "Edit application" +msgstr "" + #: lib/applicationeditform.php:186 msgid "Icon for this application" msgstr "" @@ -5111,12 +5185,12 @@ msgstr "" msgid "kB" msgstr "" -#: lib/jabber.php:202 +#: lib/jabber.php:220 #, php-format msgid "[%s]" msgstr "" -#: lib/jabber.php:385 +#: lib/jabber.php:400 #, php-format msgid "Unknown inbox source %d." msgstr "" @@ -5543,19 +5617,19 @@ msgstr "" msgid "Favorites" msgstr "" -#: lib/personalgroupnav.php:124 +#: lib/personalgroupnav.php:125 msgid "Inbox" msgstr "" -#: lib/personalgroupnav.php:125 +#: lib/personalgroupnav.php:126 msgid "Your incoming messages" msgstr "" -#: lib/personalgroupnav.php:129 +#: lib/personalgroupnav.php:130 msgid "Outbox" msgstr "" -#: lib/personalgroupnav.php:130 +#: lib/personalgroupnav.php:131 msgid "Your sent messages" msgstr "" @@ -5810,47 +5884,47 @@ msgstr "" msgid "Moderate" msgstr "" -#: lib/util.php:875 +#: lib/util.php:868 msgid "a few seconds ago" msgstr "" -#: lib/util.php:877 +#: lib/util.php:870 msgid "about a minute ago" msgstr "" -#: lib/util.php:879 +#: lib/util.php:872 #, php-format msgid "about %d minutes ago" msgstr "" -#: lib/util.php:881 +#: lib/util.php:874 msgid "about an hour ago" msgstr "" -#: lib/util.php:883 +#: lib/util.php:876 #, php-format msgid "about %d hours ago" msgstr "" -#: lib/util.php:885 +#: lib/util.php:878 msgid "about a day ago" msgstr "" -#: lib/util.php:887 +#: lib/util.php:880 #, php-format msgid "about %d days ago" msgstr "" -#: lib/util.php:889 +#: lib/util.php:882 msgid "about a month ago" msgstr "" -#: lib/util.php:891 +#: lib/util.php:884 #, php-format msgid "about %d months ago" msgstr "" -#: lib/util.php:893 +#: lib/util.php:886 msgid "about a year ago" msgstr "" @@ -5864,7 +5938,7 @@ msgstr "個人首頁位址錯誤" msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "" -#: scripts/xmppdaemon.php:301 +#: lib/xmppmanager.php:402 #, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" From fcc48155ed96bbc100db483863221dc548a22c7c Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Thu, 28 Jan 2010 01:32:48 +0100 Subject: [PATCH 132/134] L10n updates: * app -> application * number parameters when using more than one in a message --- actions/apioauthauthorize.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/actions/apioauthauthorize.php b/actions/apioauthauthorize.php index fa074c4e76..eebc926ee2 100644 --- a/actions/apioauthauthorize.php +++ b/actions/apioauthauthorize.php @@ -167,7 +167,7 @@ class ApiOauthAuthorizeAction extends ApiOauthAction if (!$result) { common_log_db_error($appUser, 'DELETE', __FILE__); - throw new ServerException(_('DB error deleting OAuth app user.')); + throw new ServerException(_('Database error deleting OAuth application user.')); return; } } @@ -193,7 +193,7 @@ class ApiOauthAuthorizeAction extends ApiOauthAction if (!$result) { common_log_db_error($appUser, 'INSERT', __FILE__); - throw new ServerException(_('DB error inserting OAuth app user.')); + throw new ServerException(_('Database error inserting OAuth application user.')); return; } @@ -303,8 +303,8 @@ class ApiOauthAuthorizeAction extends ApiOauthAction $access = ($this->app->access_type & Oauth_application::$writeAccess) ? 'access and update' : 'access'; - $msg = _("The application %s by %s would like " . - "the ability to %s your account data."); + $msg = _("The application %1$s by %2$s would like " . + "the ability to %3$s your account data."); $this->raw(sprintf($msg, $this->app->name, From 77aed28f17dbc3607502f1f47984661867d18f4f Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Thu, 28 Jan 2010 00:39:40 +0000 Subject: [PATCH 133/134] These API methods should return true for ->isReadOnly($args)! --- actions/apiaccountratelimitstatus.php | 17 ++++++++++++++++- actions/apifriendshipsexists.php | 15 +++++++++++++++ actions/apifriendshipsshow.php | 16 +++++++++++++++- actions/apigroupismember.php | 15 +++++++++++++++ actions/apigroupshow.php | 15 +++++++++++++++ actions/apihelptest.php | 15 +++++++++++++++ actions/apistatusnetconfig.php | 15 +++++++++++++++ actions/apistatusnetversion.php | 15 +++++++++++++++ actions/apiusershow.php | 15 +++++++++++++++ 9 files changed, 136 insertions(+), 2 deletions(-) diff --git a/actions/apiaccountratelimitstatus.php b/actions/apiaccountratelimitstatus.php index 1a5afd552c..f19e315bf8 100644 --- a/actions/apiaccountratelimitstatus.php +++ b/actions/apiaccountratelimitstatus.php @@ -105,7 +105,22 @@ class ApiAccountRateLimitStatusAction extends ApiBareAuthAction print json_encode($out); } - $this->endDocument($this->format); + $this->endDocument($this->format); + } + + /** + * Return true if read only. + * + * MAY override + * + * @param array $args other arguments + * + * @return boolean is read only action? + */ + + function isReadOnly($args) + { + return true; } } diff --git a/actions/apifriendshipsexists.php b/actions/apifriendshipsexists.php index c040b9f6ad..ca62b5f514 100644 --- a/actions/apifriendshipsexists.php +++ b/actions/apifriendshipsexists.php @@ -116,4 +116,19 @@ class ApiFriendshipsExistsAction extends ApiPrivateAuthAction } } + /** + * Return true if read only. + * + * MAY override + * + * @param array $args other arguments + * + * @return boolean is read only action? + */ + + function isReadOnly($args) + { + return true; + } + } diff --git a/actions/apifriendshipsshow.php b/actions/apifriendshipsshow.php index 73ecc9249a..f29e637137 100644 --- a/actions/apifriendshipsshow.php +++ b/actions/apifriendshipsshow.php @@ -87,7 +87,6 @@ class ApiFriendshipsShowAction extends ApiBareAuthAction return true; } - /** * Determines whether this API resource requires auth. Overloaded to look * return true in case source_id and source_screen_name are both empty @@ -165,4 +164,19 @@ class ApiFriendshipsShowAction extends ApiBareAuthAction } + /** + * Return true if read only. + * + * MAY override + * + * @param array $args other arguments + * + * @return boolean is read only action? + */ + + function isReadOnly($args) + { + return true; + } + } diff --git a/actions/apigroupismember.php b/actions/apigroupismember.php index 69ead0b531..97f8435614 100644 --- a/actions/apigroupismember.php +++ b/actions/apigroupismember.php @@ -119,4 +119,19 @@ class ApiGroupIsMemberAction extends ApiBareAuthAction } } + /** + * Return true if read only. + * + * MAY override + * + * @param array $args other arguments + * + * @return boolean is read only action? + */ + + function isReadOnly($args) + { + return true; + } + } diff --git a/actions/apigroupshow.php b/actions/apigroupshow.php index ef9cbf0e75..5745a81f41 100644 --- a/actions/apigroupshow.php +++ b/actions/apigroupshow.php @@ -158,4 +158,19 @@ class ApiGroupShowAction extends ApiPrivateAuthAction return null; } + /** + * Return true if read only. + * + * MAY override + * + * @param array $args other arguments + * + * @return boolean is read only action? + */ + + function isReadOnly($args) + { + return true; + } + } diff --git a/actions/apihelptest.php b/actions/apihelptest.php index 7b4017531c..d0e9e4926f 100644 --- a/actions/apihelptest.php +++ b/actions/apihelptest.php @@ -92,5 +92,20 @@ class ApiHelpTestAction extends ApiPrivateAuthAction } } + /** + * Return true if read only. + * + * MAY override + * + * @param array $args other arguments + * + * @return boolean is read only action? + */ + + function isReadOnly($args) + { + return true; + } + } diff --git a/actions/apistatusnetconfig.php b/actions/apistatusnetconfig.php index ab96f2e5f9..dc1ab8685b 100644 --- a/actions/apistatusnetconfig.php +++ b/actions/apistatusnetconfig.php @@ -138,5 +138,20 @@ class ApiStatusnetConfigAction extends ApiAction } } + /** + * Return true if read only. + * + * MAY override + * + * @param array $args other arguments + * + * @return boolean is read only action? + */ + + function isReadOnly($args) + { + return true; + } + } diff --git a/actions/apistatusnetversion.php b/actions/apistatusnetversion.php index 5109cd8062..d094807597 100644 --- a/actions/apistatusnetversion.php +++ b/actions/apistatusnetversion.php @@ -98,5 +98,20 @@ class ApiStatusnetVersionAction extends ApiPrivateAuthAction } } + /** + * Return true if read only. + * + * MAY override + * + * @param array $args other arguments + * + * @return boolean is read only action? + */ + + function isReadOnly($args) + { + return true; + } + } diff --git a/actions/apiusershow.php b/actions/apiusershow.php index a7fe0dcc1e..6c8fad49ba 100644 --- a/actions/apiusershow.php +++ b/actions/apiusershow.php @@ -123,4 +123,19 @@ class ApiUserShowAction extends ApiPrivateAuthAction } + /** + * Return true if read only. + * + * MAY override + * + * @param array $args other arguments + * + * @return boolean is read only action? + */ + + function isReadOnly($args) + { + return true; + } + } From dac2231aaa612abaaf14f32f64f8d10bf5be789f Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Thu, 28 Jan 2010 00:41:44 +0000 Subject: [PATCH 134/134] Some adjustments to the way API auth works after merging testing and 0.9.x --- lib/apiauth.php | 39 ++++++++++++++++++++++++--------------- 1 file changed, 24 insertions(+), 15 deletions(-) diff --git a/lib/apiauth.php b/lib/apiauth.php index ac5e997c78..d441014add 100644 --- a/lib/apiauth.php +++ b/lib/apiauth.php @@ -57,7 +57,6 @@ class ApiAuthAction extends ApiAction var $auth_user_password = null; var $access_token = null; var $oauth_source = null; - var $auth_user = null; /** * Take arguments for running, and output basic auth header if needed @@ -82,22 +81,27 @@ class ApiAuthAction extends ApiAction if (!empty($this->access_token)) { $this->checkOAuthRequest(); } else { - $this->checkBasicAuthUser(); + $this->checkBasicAuthUser(true); } } else { // Check to see if a basic auth user is there even // if one's not required - $this->checkBasicAuthUser(false); + if (empty($this->access_token)) { + $this->checkBasicAuthUser(false); + } } // Reject API calls with the wrong access level if ($this->isReadOnly($args) == false) { + + common_debug(get_class($this) . ' is not read-only!'); + if ($this->access != self::READ_WRITE) { - $msg = 'API resource requires read-write access, ' . - 'but you only have read access.'; + $msg = _('API resource requires read-write access, ' . + 'but you only have read access.'); $this->clientError($msg, 401, $this->format); exit; } @@ -176,7 +180,7 @@ class ApiAuthAction extends ApiAction ($this->access = self::READ_WRITE) ? 'read-write' : 'read-only' )); - return true; + return; } else { throw new OAuthException('Bad access token.'); } @@ -228,9 +232,14 @@ class ApiAuthAction extends ApiAction } else { + $user = common_check_user($this->auth_user_nickname, + $this->auth_user_password); + if (Event::handle('StartSetApiUser', array(&$user))) { - $this->auth_user = common_check_user($this->auth_user_nickname, - $this->auth_user_password); + + if (!empty($user)) { + $this->auth_user = $user; + } Event::handle('EndSetApiUser', array($user)); } @@ -239,18 +248,18 @@ class ApiAuthAction extends ApiAction $this->access = self::READ_WRITE; - if (empty($this->auth_user)) { + if (empty($this->auth_user) && $required) { // basic authentication failed list($proxy, $ip) = common_client_ip(); - common_log( - LOG_WARNING, - 'Failed API auth attempt, nickname = ' . - "$nickname, proxy = $proxy, ip = $ip." - ); - + $msg = sprintf(_('Failed API auth attempt, nickname = %1$s, ' . + 'proxy = %2$s, ip = %3$s'), + $this->auth_user_nickname, + $proxy, + $ip); + common_log(LOG_WARNING, $msg); $this->showAuthError(); exit; }